gentoo (leap year) resync : 29.02.2020

3 files changed, 39 insertions, 43 deletions

diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index 8309d0440ac7..af41ac5fac5c 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,5 +1,5 @@
 AUX g15tools.patch 2929 BLAKE2B cc88ba441a27b7cc2e256712536304f7a1d3667b04fc1e2583dea994321df8a59ad295a6cecc76cf5633a5f6994cb674e7a7f3f8eaf2c0d86dad35b3e7d0c8df SHA512 2cd1b1f54ea8d4cc2a322c657cce6b8252b9425df6ad031401d6187ff82472fc3fb974734cfefe80b85b3e1a3532b26a5685b5aa9ff42ca7453ec55892834e41
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
-EBUILD libg15-1.2.7-r1.ebuild 577 BLAKE2B 7c691bd1a18b975f94b304fba02b5893e214a484c99e3d98cc2210fc8083590fc549ff38b2d50fa1cb49a6d3564b39a95381adb1ef89a88fbc4170cea0af9d38 SHA512 4f69993a3fe66ba8642eea1d8bb3aa9e6b1e86f579ed91c163fb1db2d8b6241ab2586d0cafbab3dc030128a170085d8eb2ce8975fee3afb55f4a4ac6cb10f343
-EBUILD libg15-9999.ebuild 979 BLAKE2B 023afc75bd44fe0e05ea3dd313e3df3b27d282f4b26ca56c682715c17c362695e5e4d7d9266bf43eae06a88d96639830ee1d7bc6ef1a1b84eddfd7856a9ed642 SHA512 8acc39a8dd1b341bb727d6958a253236880f0e240cbc57ae70285b6304ce431926400137c419289a9a2285fde6965c9a9771ac1a55c9836934d3e8afdad5759c
+EBUILD libg15-1.2.7-r1.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
+EBUILD libg15-9999.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15/libg15-1.2.7-r1.ebuild b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
index 5ec490f2e523..3e7892e8cce0 100644
--- a/dev-libs/libg15/libg15-1.2.7-r1.ebuild
+++ b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
@@ -1,29 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools subversion
+	ESVN_PROJECT=g15tools/trunk
+	ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+else
+	KEYWORDS="amd64 ppc ppc64 x86"
+	SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+fi
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
 HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
 
-DEPEND="=virtual/libusb-0*"
-RDEPEND=${DEPEND}
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS README ChangeLog )
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
 
 src_configure() {
-	econf \
-		--disable-static
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libg15/libg15-9999.ebuild b/dev-libs/libg15/libg15-9999.ebuild
index a2faa8211176..3e7892e8cce0 100644
--- a/dev-libs/libg15/libg15-9999.ebuild
+++ b/dev-libs/libg15/libg15-9999.ebuild
@@ -1,51 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-ESVN_PROJECT=g15tools/trunk
-ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+EAPI=7
 
-inherit subversion base eutils autotools
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools subversion
+	ESVN_PROJECT=g15tools/trunk
+	ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+else
+	KEYWORDS="amd64 ppc ppc64 x86"
+	SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+fi
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
 HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-[[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-DEPEND="=virtual/libusb-0*"
-RDEPEND=${DEPEND}
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}"/g15tools.patch )
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-	fi
-}
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_wc_info
-	fi
-	base_src_prepare
-	if [[ ${PV} = *9999* ]]; then
-		eautoreconf
-	fi
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }