gentoo resync : 10.02.2019

3 files changed, 7 insertions, 76 deletions

diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index b778209535bc..b2625201715d 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -1,4 +1,3 @@
-AUX g810-led-0.2.7-Have_makefile_use_environment.patch 1831 BLAKE2B fad7b6964f1ee769fbf0f2ef2730190d962891a00775a5cc23f7b8ded695fd5d445d9a9335d059bfd4a54d89d6a71a07d1e13ac5427d1e094eb3ec7a5d67b3cf SHA512 d741baad0aa127dc0064bd1017ef27077070f2ce86a3d9b3965d39a0bd0012a8c8b0669cbee016b7bfd85a8e844fe742da8f6f33b712a95e5b5a2dbceb31f55e
-DIST g810-led-0.2.7.tar.gz 33127 BLAKE2B 1ffa28f4e21273afa805ff2ddfeae00cf4b25382f7da617016651283331d7d17faee1e6f68d00ab988c30ba1a7d4b252cf28c021999871a7fbe54c47ae3ccb23 SHA512 f67d44f1c51a29cbdfe9bb5e28f3dea5e9b08aa5e2a08cf875578d6b74e8e77f880378c825efcc3068b400131295e1fd196454b8b10143c4f5d5f77be760512a
-EBUILD g810-led-0.2.7.ebuild 1146 BLAKE2B f7ac87e51561cea85e2674060890ea8a176d57a7c3b0c7d85431905d1073f6caf7bbac5d78d9256e3929372091c6858f32cde0ae2f785b857e22ab5eac5ad480 SHA512 1812d9eaa88ba280a4e4e5a040bf3bc2e212935bfe78fcf526e951706248c7f1c854f6422c15a288768bf64189896a668087e7db98b1a95dd82c2a0745595df2
+DIST g810-led-0.3.1.tar.gz 34069 BLAKE2B ebc83e1f0908e521573f6ea812c1893e8314548dbe30cad4a8f2af171eaf7f73ba905f6e01eafe9bca6c1bf006d626086091c871c6382dcd9a58caa76173ca59 SHA512 62bf73a897f8c1c967ce64f6e352d55b08af764b2aac8ce722906cdc67db28676bc5665d1ba307f0c43360e57d53e75fa39aea29ca7aa6da2e125782ae38446c
+EBUILD g810-led-0.3.1.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
 MISC metadata.xml 610 BLAKE2B dc374b0b903c17b3418871362fbfe6bd47704f2d9d7895ffbbdfa468f98e42708d385d844cd96b04b88646f5b71f4acfae659c99f7c2fc5bcdcfbdb4eef18303 SHA512 978a7c99bf4e5f7a79e04055871645438322b950b8274512bdca9563050449ad395e40ba479ba70914aaef60bd86c3b41aab05f070e79fd7dbc61c941cb59fb8
diff --git a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch b/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch
deleted file mode 100644
index 249462bbcf0b..000000000000
--- a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/makefile b/makefile
-index 019636d..707517d 100644
---- a/makefile
-+++ b/makefile
-@@ -1,18 +1,18 @@
--CC=g++
--CFLAGS=-Wall -O2 -std=gnu++11
-+CXX?=g++
-+CXXFLAGS?=-Wall -O2
- LIB?=hidapi
- ifeq ($(LIB),libusb)
- 	CPPFLAGS=-Dlibusb
--	LDFLAGS=-lusb-1.0
-+	LIBS=-lusb-1.0
- else
- 	CPPFLAGS=-Dhidapi
--	LDFLAGS=-lhidapi-hidraw
-+	LIBS=-lhidapi-hidraw
- endif
- SYSTEMDDIR?=/usr/lib/systemd
- 
--prefix?=$(DESTDIR)/usr
--libdir?=$(prefix)/lib
--includedir?=$(prefix)/include
-+PREFIX?=$(DESTDIR)/usr
-+libdir?=$(PREFIX)/lib
-+includedir?=$(PREFIX)/include
- 
- # Program & versioning information
- PROGN=g810-led
-@@ -20,7 +20,7 @@ MAJOR=0
- MINOR=2
- MICRO=7
- 
--CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
-+CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
- APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
- LIBSRCS=src/classes/*.cpp src/classes/*.h
- 
-@@ -32,19 +32,19 @@ bin: bin/$(PROGN)
- 
- bin/$(PROGN): $(APPSRCS) $(LIBSRCS)
- 	@mkdir -p bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
- 	
--debug: CFLAGS += -g -Wextra -pedantic
-+debug: CXXFLAGS += -g -Wextra -pedantic
- debug: bin/$(PROGN)
- 
- lib/lib$(PROGN).so: $(LIBSRCS)
- 	@mkdir -p lib
--	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
- 	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
- 
- bin-linked: lib/lib$(PROGN).so
- 	@mkdir -p bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN)
- 
- lib: lib/lib$(PROGN).so
- 
diff --git a/app-misc/g810-led/g810-led-0.2.7.ebuild b/app-misc/g810-led/g810-led-0.3.1.ebuild
index 9251fa585b85..2e51fcb5d4f2 100644
--- a/app-misc/g810-led/g810-led-0.2.7.ebuild
+++ b/app-misc/g810-led/g810-led-0.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd udev eutils
 
-DESCRIPTION="Led controller for Logitech G- 213, 410, 413, 610, 810, 910 and PRO Keyboards"
+DESCRIPTION="Led controller for Logitech G- Keyboards"
 HOMEPAGE="https://github.com/MatMoul/g810-led"
 SRC_URI="https://github.com/MatMoul/g810-led/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -21,12 +21,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-DOCS=("README.md" "sample_profiles")
-
-src_prepare() {
-	eapply "${FILESDIR}/g810-led-0.2.7-Have_makefile_use_environment.patch"
-	default
-}
+DOCS=("README.md" "sample_profiles" "sample_effects")
 
 src_compile() {
 	emake LIB="$(usex hidapi hidapi libusb)"
@@ -37,7 +32,7 @@ src_install() {
 	dosym "libg810-led.so.${PV}" "/usr/$(get_libdir)/libg810-led.so"
 
 	dobin bin/g810-led
-	local boards=(213 410 413 610 910 pro)
+	local boards=(213 410 413 512 513 610 910 pro)
 	local x
 	for x in "${boards[@]}"; do
 		dosym g810-led "/usr/bin/g${x}-led"