Update dev-libs/hidapi to EAPI 7.

3 files changed, 34 insertions, 29 deletions

diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 7d77ad6..0b06d8f 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,4 +1,5 @@
 AUX hidapi-0.8.0-hidraw-optional.patch 2382 BLAKE2B f3dc67850380c207ee3bb01969ca94c6bfa1d605cd89611d8709865882fa35064c691b536041ea358c35e845695c6ae0d7340d629f2a7671282d6c611f0d3c3e SHA512 de5fa31575ac953ac66884dfc2558289b1e957892df9ff89d3ee0d09ffe55bbf5507c74f893256e133d9d50a8594e755d6addefef543f7641f14638cab2dd7c8
+AUX hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch 300 BLAKE2B f82fe6a6e2ebfda10eb9762bbff1586346ecf8945996599a3b58658c37799d85dc573f8be54bba483f95e27177db3f421d99ac713e7012130d2e2b92252ebd87 SHA512 5b29caa5f7a9b61fffb16226cff9709a5b142c6ac36017c567ab5933b21f06cb17c78a93fa19e8c92cb1443f1cbe97c3687002845965bea2b3ef39eeaef1f4a2
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
-EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 2033 BLAKE2B 8e2092967f7233a06b937a73218d6bb0009b5d1dde5cdb2dded319d847af9f3b7261ee28db684bf7fb9b3cd635f327688ce091254f1beeb87c07ef901da87f9b SHA512 657b99d7bb44629163e0f65b69f98d3985f087133af83c2e502462d66c0bd4ad842db3df0f1d5a8a37a2aec8938839f8884183af00517d102a40eb459173ce4e
+EBUILD hidapi-0.8.0_rc1_p20140719-r1.ebuild 1930 BLAKE2B 0d9b0fe76a51fa596836ed2671bcb00831aad8a420c876b0bde0e08272af164f3cd49733a355c694eb3b670740cbdb369701673f6c3b71eb27780dc027014a96 SHA512 8c6d21b244b916183f9136546501e0070574d2acb112f759dceaac22ee739ce538e93e8f7c02d924ab0f689547a4a57a477efe29dcd4edd75840ea57961db2c3
 MISC metadata.xml 438 BLAKE2B 47c3d04f94febd58320e7c2b8fe42bedda4ba0efcca7426d434e8d79d8e4f6017b5f2cfb3be6adc1d0024c7ec4c26f474bdc8c00a73d83a2d810d1b20245d435 SHA512 f27beb2c578f443037702283d6c5aeea1a792bbd5aa2c42beaca94282581a6d687fc516c23d6de5adb3b062f758481c5bd7bb5b4bc83b781ad2bcaeb6172c366
diff --git a/dev-libs/hidapi/files/hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch b/dev-libs/hidapi/files/hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch
new file mode 100644
index 0000000..ad79a05
--- /dev/null
+++ b/dev-libs/hidapi/files/hidapi-0.8.0_rc1_p20140719-autoconf-2.70.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/750983
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+-AC_CONFIG_MACRO_DIR([m4])
+ 
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ LT_INIT
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
index 569d125..903b1fa 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
@@ -1,20 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-inherit epatch eutils versionator autotools-multilib #git-2
+inherit autotools multilib-minimal
 
 # If github is desired, the following may be used.
 #EGIT_REPO_URI="https://github.com/signal11/hidapi.git"
 #EGIT_BRANCH="master"
 EGIT_COMMIT="d17db57b9d4354752e0af42f5f33007a42ef2906"
 
-# S is only needed for the debian_package
-S=${WORKDIR}/${PN}-${DEBIAN_PV}
-
 DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
 HOMEPAGE="http://www.signal11.us/oss/hidapi/"
 SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tgz"
@@ -24,24 +19,28 @@ SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc fox static-libs udev"
+IUSE="doc fox udev"
 
 RDEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]
 	udev? ( virtual/libudev:0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
 	fox? ( x11-libs/fox )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
+PATCHES=( "${FILESDIR}"/${P}-autoconf-2.70.patch
+	  "${FILESDIR}/${PN}-0.8.0-hidraw-optional.patch" )
+
 src_prepare() {
+	default
+	
 	if ! use fox; then
 		sed -i -e 's:PKG_CHECK_MODULES(\[fox\], .*):AC_SUBST(fox_CFLAGS,[ ])AC_SUBST(fox_LIBS,[ ]):' configure.ac || die
 	fi
 
-	epatch "${FILESDIR}/${PN}-0.8.0-hidraw-optional.patch"
-
 	# Fix bashisms in the configure.ac file.
 	sed -i -e 's:\([A-Z_]\+\)+="\(.*\)":\1="${\1}\2":g' \
 		-e 's:\([A-Z_]\+\)+=`\(.*\)`:\1="${\1}\2":g' configure.ac || die
@@ -49,30 +48,24 @@ src_prepare() {
 	# Portage handles license texts itself, no need to install them
 	sed -i -e 's/LICENSE.*/ # blank/' Makefile.am || die
 
-	autotools-multilib_src_prepare
+	eautoreconf
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_native_use_enable fox testgui)
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable fox testgui) \
 		$(use_with udev)
-	)
-
-	autotools-utils_src_configure
 }
 
-src_compile() {
-	autotools-multilib_src_compile
-
+multilib_src_install_all() {
 	if use doc; then
 		doxygen doxygen/Doxyfile || die
+		HTML_DOCS=( html/. )
 	fi
-}
 
-src_install() {
-	autotools-multilib_src_install
+	einstalldocs
 
-	if use doc; then
-		dohtml -r html/.
-	fi
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }