gentoo resync : 15.12.2019

8 files changed, 11 insertions, 238 deletions

diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index b5c27299afa7..31e1b90d02f1 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,13 +1,5 @@
 AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7
-AUX libsmbios-2.3.0-doxygen_target.patch 305 BLAKE2B ba3e149fd8a792a1b589938fbe6cd895e30298685c4ceab61e45ff34c171126389ea0e1c15a18661ef1b4528f41587ce4bc7f5fd7f076e099894ebe19de0a5dc SHA512 f1f85f052265d88f4735a18ce0205a56256dba5416e6153291d27a4f958bbe9618401b1b70a5e462d12287490a42fe5a6e5e196091b9ec2afa01728a7910815d
-AUX libsmbios-2.3.3-doxygen_target.patch 351 BLAKE2B 100ca4d508b8441bdf6c678768fe67a8c91ee9a1d1b353bd5ba856ff1df1ea3cf503b922b9474f7b3d79a9ed504d9f9b9a10a259194c53cbb2a7a3e3fa5263f2 SHA512 d86df4b1c3ab389360d07f4fab84219bb03e270e77984996d7c53d55b4a0e5a29e2d097e79da5a49f7be0ff9118722aaa955acdbffd4d59cbefa7a1a0ad6f1c3
-AUX libsmbios-fix-pie.patch 816 BLAKE2B 73d2e9611bd672332bed58adee52cbac6285d1e07b259ffbcd3d37374b772a59355c49f231dcb4005b7897f12d847f58eed8139531f250906fd0a1db05843cfb SHA512 2567fe1dfe2e858103c3732e7059888731c207234022a24c1cd4b158253330699af6b2e90cf98881e57e0b7cb8c70a8627fe1d7eb370f2cbb3969189538baf7e
-DIST libsmbios-2.3.2.tar.gz 800862 BLAKE2B da888dbe3b3dfa10b39fbc4da90fe643982abc49f756f033d492f29d06631c722da7ec11a2b77780c06a74b7b0e3f70d5d3fc1ce895be7a7c8d136f654a22f7e SHA512 6ef3d71892e157d81fc466689b67c19b83567ee1c4893816da935cfc42738cf958f972eed811aad375fee5bb7d4a6b4e13fb1b5760cd0d7cdb5e65170ebeb129
-DIST libsmbios-2.3.3.tar.gz 801164 BLAKE2B 22d04d4071ec3111d80acbbc10dbd51c15e5f8db06575f3079654da42e33dbbfcb364e1bdc8470d2a66475159da1179cafc9ae5284be0c35c4199dc5b16a1a2e SHA512 d4ee556fc0b734827e1a0def9c9914e79130ce9f164f62a5aa752276772f9ed27874fd8a285b65e016f16f001cdfa23c7c9d228533bb8a03134db90b9cc4f96d
-DIST libsmbios-2.4.1.tar.gz 667796 BLAKE2B 119198783004215c269ae0846aad58fafcdd0ee2148e0014f77271c38511cc61430db2b81c43bbc0da507b40342c923731e06c61829f9604b84b26f7f527b37a SHA512 dd71e45f8047480a669b70efebb9bdbbea4870f96437fc45eb4088fd66331d117b29a65c45cee2e5c4628d0536072a5939eb83f1905857a85bd0567b3d1c22fb
 DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f39402368a09686b92fd1de7d85e87ea494514e85bdf1267adb6b52060a4e6bb6001714c5d891a4c0342c814942c0458af SHA512 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
-EBUILD libsmbios-2.3.2.ebuild 1894 BLAKE2B 1c42418d45133004c8c47570541794f74fcb07f336db9142f9ac88d814e571ac86a0af316ed9ebb68a96503d0e0a5ea3cfa1855bf1845fd62d9deb5ccbe48c57 SHA512 2b3faf9733451392aaacb4e6859b64673b41d1aa19e5a4cad815a67dfce39bac07aa3c4f7ab20104024312d830320ba1dda9d372475be7c2055b0042554a85a8
-EBUILD libsmbios-2.3.3.ebuild 1788 BLAKE2B b2798a0e24b8ca2b3d9d2125632a2286371a382417bb2ae12db5e167bd6cb2167cd7b20f20f4701d927819c739fda5b482657c81ffdb9999774ff38a9caacc9c SHA512 be969d82ec9f0d5f18b0b9c397bde36ee5eea184c1a41320cce25427f2d6eafa2d9565ad14c029222b978e20038d17071e345065cb6c2c9cf3e72f3639f4b354
-EBUILD libsmbios-2.4.1.ebuild 1716 BLAKE2B f30f7e7cf6c28b86f6340da66f566f788d9f25bbff53658ab7b5ffdfd7b36082daee2d27f8cd5990a610e9c9e989a1a369711461ac190c3377410587fe2da2e4 SHA512 aeadb26492b8710afc3151b1a1af199a33fb1a9e66b12aa5955501b1e3db1b75d98a552065b7376d038bc19ea246cef1b8af53a2245b0017c21b32dd2910f7f3
-EBUILD libsmbios-2.4.2.ebuild 1701 BLAKE2B daa5433df2c08a7f2fbc864e980a2f336035b537d89955e631858ff248e290059ff028764fae614d89b35d87ed1967ebde83fd39513998f967e729874247578e SHA512 4729d2e31e69c0e96dfb3ac9a52cdada7042b98abde5e91b73fe3480a77bf2da164bae6170a292a077312ebd42fc46031578f2c586f25e8a322ac5d06d94c0f5
+EBUILD libsmbios-2.4.2-r1.ebuild 1734 BLAKE2B 5b69e42e3d4c73b8b3c908b5fac4fcfb23c90f293086b8cbfd78b0e926a2cb27d690d2bed6f742d3b6283cdf674c919e9194c1caa504483474d0225c5b48ebf8 SHA512 d398b4fdff34365191d72f98f367513a8777370bb4c3b7898a6fcb6172b0159d2f934001cd84271bf47d5bf0540a10ab19fa75524be68483f172d51052ee4397
+EBUILD libsmbios-2.4.2.ebuild 1727 BLAKE2B 622cd90d9c74072e1eca76ab8dc5dc3258503e70037c7324c951cc5fbdaf54f9bd9814de93c3f0c125e18c2c721ba4467564e25ea864f35481e405654d76d5c6 SHA512 7133528d5f79ab4e596cdf5dc93811e31d7a05405610bc7841ed3f173093a9f4dad0c806a6111f8f52b93e6457471ce6d28b6b0ee38e96930199c3bfc8ef5f19
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/files/libsmbios-2.3.0-doxygen_target.patch b/sys-libs/libsmbios/files/libsmbios-2.3.0-doxygen_target.patch
deleted file mode 100644
index ebe6798bd731..000000000000
--- a/sys-libs/libsmbios/files/libsmbios-2.3.0-doxygen_target.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libsmbios-2.3.0/Makefile.am
-+++ libsmbios-2.3.0/Makefile.am
-@@ -89,10 +89,12 @@
- 
- 
- ########## DOCS ################
--all: doxygen
- if HAVE_DOXYGEN
-+all: doxygen
- DOXYGEN_DEPS=out/libsmbios_c/html/index.html out/libsmbios_c++/html/index.html
- doxygen: $(DOXYGEN_DEPS)
-+else
-+all:
- endif
- 
- DOT=@DOT@
diff --git a/sys-libs/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch b/sys-libs/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch
deleted file mode 100644
index 4adca14f21d8..000000000000
--- a/sys-libs/libsmbios/files/libsmbios-2.3.3-doxygen_target.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libsmbios-2.3.3/Makefile.am
-+++ libsmbios-2.3.3/Makefile.am
-@@ -89,13 +89,15 @@
- 
- 
- ########## DOCS ################
--all: doxygen
- if HAVE_DOXYGEN
-+all: doxygen
- DOXYGEN_DEPS=out/libsmbios_c/html/index.html
- if BUILD_LIBSMBIOS_CXX
- DOXYGEN_DEPS+=out/libsmbios_c++/html/index.html
- endif
- doxygen: $(DOXYGEN_DEPS)
-+else
-+all:
- endif
- 
- DOT=@DOT@
diff --git a/sys-libs/libsmbios/files/libsmbios-fix-pie.patch b/sys-libs/libsmbios/files/libsmbios-fix-pie.patch
deleted file mode 100644
index 3ab404e8ea2e..000000000000
--- a/sys-libs/libsmbios/files/libsmbios-fix-pie.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
-+++ libsmbios-2.2.19/src/bin/dellMediaDirectCtl.cpp
-@@ -183,16 +183,21 @@
- {
-     iopl(3);
- 
-+    u32 tmpebx;
-     __asm__ __volatile__ (
--           //   magic    port
--        "outb   %%al,    %%dx     \n\t"
--
-+          "movl   %%ebx,%[tmpebx]\n\t"
-+          "movl   %[ebx],%%ebx\n\t"
-+      //   magic    port
-+          "outb   %%al,    %%dx     \n\t"
-+          "movl   %%ebx,%[ebx]\n\t"
-+          "movl   %[tmpebx],%%ebx\n\t"
-         : /* output args */
-           "=a" (r->eax),
--          "=b" (r->ebx),
-+          [ebx] "=rm" (r->ebx),
-           "=c" (r->ecx),
-           "=S" (r->esi),
--          "=D" (r->edi)
-+          "=D" (r->edi),
-+          [tmpebx] "+m" (tmpebx)
-         : /* input args */
-           "0" (r->eax),
-           "1" (r->ebx),
diff --git a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild b/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
deleted file mode 100644
index d2777066e17c..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.3.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 versionator
-
-DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/files/libsmbios/"
-SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 OSL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="doc graphviz nls python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	graphviz? ( media-gfx/graphviz )
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.9.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-pie.patch"
-	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-doxygen_target.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Don't build yum-plugin - we don't need it
-	sed '/yum-plugin/d' -i Makefile.am || die
-
-	# Fix version string in build system
-	sed "/release_micro_version/s@\[1\]@[$(get_version_component_range 3)]@" \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	#Remove -O3 for bug #290097
-	replace-flags -O3 -O2
-
-	econf \
-		$(use_enable doc doxygen) \
-		$(use_enable graphviz) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use python ; then
-		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
-	fi
-
-	insinto /usr/include/
-	doins -r src/include/smbios/
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/sys-libs/libsmbios/libsmbios-2.3.3.ebuild b/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
deleted file mode 100644
index f6024bfa3475..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.3.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 versionator
-
-DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/files/libsmbios/"
-SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 OSL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="doc graphviz nls python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	graphviz? ( media-gfx/graphviz )
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.9.6 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-pie.patch"
-	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
-	"${FILESDIR}/${PN}-2.3.3-doxygen_target.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Don't build yum-plugin - we don't need it
-	sed '/yum-plugin/d' -i Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	#Remove -O3 for bug #290097
-	replace-flags -O3 -O2
-
-	econf \
-		$(use_enable doc doxygen) \
-		$(use_enable graphviz) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use python ; then
-		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
-	fi
-
-	insinto /usr/include/
-	doins -r src/include/smbios/
-	doins -r src/include/smbios_c
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}
diff --git a/sys-libs/libsmbios/libsmbios-2.4.1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
index 158c4534ba3c..7d6570c75000 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 
-inherit autotools flag-o-matic python-single-r1 versionator
+inherit autotools flag-o-matic python-single-r1
 
 DESCRIPTION="Provide access to (SM)BIOS information"
 HOMEPAGE="http://linux.dell.com/files/libsmbios/"
@@ -16,6 +16,8 @@ KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
 	nls? ( virtual/libintl )
@@ -63,7 +65,7 @@ src_install() {
 
 	if use python ; then
 		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+		python_doscript "${ED}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
 	fi
 
 	insinto /usr/include/
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
index 4a5c54da1b98..d6391e788212 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
@@ -16,6 +16,8 @@ KEYWORDS="amd64 ia64 x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/libxml2
 	sys-libs/zlib
 	nls? ( virtual/libintl )
@@ -63,7 +65,7 @@ src_install() {
 
 	if use python ; then
 		python_scriptinto /usr/sbin
-		python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+		python_doscript "${ED}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
 	fi
 
 	insinto /usr/include/