gentoo resync : 09.03.2018

2 files changed, 21 insertions, 20 deletions

diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 1af1a05d089b..26d8103e52e8 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,10 +2,10 @@ AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e28009
 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.0.tar.xz 830840 BLAKE2B 1ddbddd5c9837a44cfbd97bdb1862a90137ba6caf7c19fe4cdde1e7dceef1a6f2c9bcba6329a5dde6736d6b252e37cbb100ba9f555d0dc15a0946fb1717c7f3b SHA512 944df2dde0df8a02d4c5a84ff6e535e112e6d72b81177c8faba7c45b349ec8c8b2149439c4dc6ea834c5eedad1ac59d8bf073a3d48bf7caccc73d0317f00e216
 DIST libsmbios-2.3.2.tar.gz 800862 BLAKE2B da888dbe3b3dfa10b39fbc4da90fe643982abc49f756f033d492f29d06631c722da7ec11a2b77780c06a74b7b0e3f70d5d3fc1ce895be7a7c8d136f654a22f7e SHA512 6ef3d71892e157d81fc466689b67c19b83567ee1c4893816da935cfc42738cf958f972eed811aad375fee5bb7d4a6b4e13fb1b5760cd0d7cdb5e65170ebeb129
 DIST libsmbios-2.3.3.tar.gz 801164 BLAKE2B 22d04d4071ec3111d80acbbc10dbd51c15e5f8db06575f3079654da42e33dbbfcb364e1bdc8470d2a66475159da1179cafc9ae5284be0c35c4199dc5b16a1a2e SHA512 d4ee556fc0b734827e1a0def9c9914e79130ce9f164f62a5aa752276772f9ed27874fd8a285b65e016f16f001cdfa23c7c9d228533bb8a03134db90b9cc4f96d
-EBUILD libsmbios-2.3.0-r1.ebuild 1825 BLAKE2B 18f23c34caa95ecf756ad2662b5425ca22156c2a2862f7508cc28ff2b62b60e18e9d04b6636ddc5d8521243f85233af6d2dc3c7fd4fdc1c386b6652746aa4311 SHA512 62b0a7bca4d2c04f529f379eaaf3e8b68bf8932f8bd9700be223a25a98040d26ce1a075dcbeef254cf5da784fc088abe32af8f75ca0e15527da4d2f9b10bee41
+DIST libsmbios-2.4.1.tar.gz 667796 BLAKE2B 119198783004215c269ae0846aad58fafcdd0ee2148e0014f77271c38511cc61430db2b81c43bbc0da507b40342c923731e06c61829f9604b84b26f7f527b37a SHA512 dd71e45f8047480a669b70efebb9bdbbea4870f96437fc45eb4088fd66331d117b29a65c45cee2e5c4628d0536072a5939eb83f1905857a85bd0567b3d1c22fb
 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 1721 BLAKE2B 9283623af15e10736a53b0916159e80bc4539a838a0c352353a2e3d47797641a9dbfe0afa5750f3d550d571a219deaa4bba142193d1fd5d35b079efa33e5ce30 SHA512 92d3f1ff5b9ba0fb79321ba675689928a01f1fb97b8834f0360d4c34a7d305f5650f4947d64965c3936ea1fa307ad822bdb50710dbbfdaa10e550139cb725848
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.1.ebuild
index 9c7ce6e794e9..b69287953702 100644
--- a/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
-inherit autotools eutils flag-o-matic python-single-r1
+inherit autotools flag-o-matic python-single-r1 versionator
 
 DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="http://linux.dell.com/libsmbios/main/index.html"
-SRC_URI="http://linux.dell.com/libsmbios/download/libsmbios/${P}/${P}.tar.xz
-	http://linux.dell.com/libsmbios/download/libsmbios/old/${P}/${P}.tar.xz"
+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"
+KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="doc graphviz nls python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -29,9 +28,7 @@ DEPEND="${RDEPEND}
 	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() {
@@ -51,12 +48,14 @@ 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) \
+	local myeconfargs=(
+		$(use_enable doc doxygen)
+		$(use_enable graphviz)
+		$(use_enable nls)
+		$(use_enable python)
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -64,13 +63,15 @@ 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,rbu-bios-update,sys-info}
+		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
 
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	einstalldocs
 
-	use static-libs || prune_libtool_files --all
+	if ! use static-libs ; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
 }