gentoo resync : 30.05.2020

4 files changed, 2 insertions, 163 deletions

diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index c2eb63deba8a..bfe03390bf5a 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,7 +1,4 @@
 AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7
-DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f39402368a09686b92fd1de7d85e87ea494514e85bdf1267adb6b52060a4e6bb6001714c5d891a4c0342c814942c0458af SHA512 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
-EBUILD libsmbios-2.4.2-r1.ebuild 1726 BLAKE2B 47266f576042da3cf93038bce1d1307e55fa57432a1649b42d47ffaa3b68690c85facac580e5e6d6fb5967551d365acfa4fb90f52754ccc6be4a75fabaa73f00 SHA512 7f26d9f9b07df3b50065328ad3ade0e4ba844b7913fe4329dc9c4496a77aeb209347372db3cae896dffad6eb487ddbb838126527a0d30e094efa7b351d61131a
-EBUILD libsmbios-2.4.2.ebuild 1718 BLAKE2B d0410b87623df974bf7be75d627f267d2c7856de9fe6a07573cd54f366ec0ace316e9b16ebd681416ff7eebb44573df817bf8c7bb6257b3d2b3e95b538e31804 SHA512 cea44cbac9eb2b1f67c1189d0b8fdc962f003fd4b0d376c4c974038dbf327705358b524e40ffde74fa24a823af7248ecded5f1f5af63812141fc35021e4dd015
-EBUILD libsmbios-2.4.3.ebuild 1727 BLAKE2B a80a4db684b11813f2e2d47114987374e106fb6ce4667c4aa8b95173982ec68eac6d83f953fab7cf713562e08a17da127158cb3ed6cf469a2b728078eb20df48 SHA512 9ca02718c4dccb86d6d2edceddf94bdfbdb9a0e0b4ca5eb8365dd1de06ab981806983dc86bb0092b478124f636e9f989c1ba9044ee729ebe41a44dfd20e8aea6
+EBUILD libsmbios-2.4.3.ebuild 1725 BLAKE2B ee3e12ec9d4823811cf7bbfa4e1f6a23d0b8d01386767d10d7fce8af658c6a5d0cefb513ef16084896e38124395ca7d052b73a3fa3a6776d4f588639e56ed39f SHA512 b9b3fc08ba2ba3c08668e1128a9cd880dd617bcec7786ea8da95ab2d916ecc66832de9647c7f3b41d7708944b7ee60e58020be7740a011530f2994c01c974f0e
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
deleted file mode 100644
index 229a12173e15..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools flag-o-matic python-single-r1
-
-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} )"
-
-RESTRICT="!test? ( test )"
-
-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}-2.2.28-cppunit-tests.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
-
-	local myeconfargs=(
-		$(use_enable doc doxygen)
-		$(use_enable graphviz)
-		$(use_enable nls)
-		$(use_enable python)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-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_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.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
deleted file mode 100644
index 93eb8476f8c3..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools flag-o-matic python-single-r1
-
-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} )"
-
-RESTRICT="!test? ( test )"
-
-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}-2.2.28-cppunit-tests.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
-
-	local myeconfargs=(
-		$(use_enable doc doxygen)
-		$(use_enable graphviz)
-		$(use_enable nls)
-		$(use_enable python)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-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_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.3.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
index 4e9e41d7a529..f19e11df65a4 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
@@ -12,7 +12,7 @@ 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} )"