gentoo resync : 11.05.2021

3 files changed, 2 insertions, 47 deletions

diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 348b73ef4afe..44e2a0ab3651 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,3 @@
-DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18
 DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
-EBUILD dmidecode-3.2.ebuild 1128 BLAKE2B e4a423dfdac019c76747abd2083f7c62f5ed47289c4bd3efb3c70d3422f3bc213f60cd5521d6a14457959707e2eefc8a03680070eaf9e2e5b04f729befc1d46e SHA512 41bd73f3dce831f23380883c23dbe120865281832cb3a332f8fc7b3c0730dfa5585f7575dc781d45f74974cfc6d4a6362221d1bd8ec6e80c4df43745ddbe7433
-EBUILD dmidecode-3.3.ebuild 1134 BLAKE2B 8ed0a584bf89bffd1501fddb754b8cee75c1e213597d53aae8914f7310d48ee42217b2d702c3daad6f34b1786c65da8d7b876aa53266e9c9ba5dc5126c4543fd SHA512 d676264c7a67b1ac00a7d0161dbbd8dcfb6bb1580898c7622f7b6283ea98df13f0147d56d8a105ac552f81746616a3d8998ec439f3f763456f567a148c08803f
+EBUILD dmidecode-3.3.ebuild 1128 BLAKE2B be603a603e49f1c5fc387b0a2bcdb8eb695ace29de9c2b2fec8c806928fc23d1c2987e9fa8a7a5178fdd8dd56407c708d785722f1f43bfb56478a311b56c09f7 SHA512 0653c7174023f0d54dad6d3a933520176da90994d4d66d9634cbc7ae530256597be368ca6cbb56a9b2815262a86ceeb66501df3996f385c9fe2061892cc92b15
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.2.ebuild b/sys-apps/dmidecode/dmidecode-3.2.ebuild
deleted file mode 100644
index 32e84e47d1c8..000000000000
--- a/sys-apps/dmidecode/dmidecode-3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="https://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 x86 ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild
index 62ffcc4c4186..7bee66b73744 100644
--- a/sys-apps/dmidecode/dmidecode-3.3.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"