gentoo resync : 13.03.2018

3 files changed, 0 insertions, 101 deletions

diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 03553ecbe7d5..6b6cdcabb3eb 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,8 +1,5 @@
-AUX 2.12-supported-smbios-version.patch 1349 BLAKE2B 7c0ef55ab1b70945f81ad75cc536dce214e2f8f191e1568055eeedead87d0a7d4d7297fda17796665718a29651f2b4c36c6a06258db865d70ea685c433c97745 SHA512 797c05cf5a5982559b44c83080702f93046f4d9f3ffdde033f7817b6b9c0d221ffa7be311c65ead3e5cb1e836636a68c979f9472e60c83794c3f063f8f40a5f8
-DIST dmidecode-2.12.tar.bz2 55191 BLAKE2B b04ecd5d53a17a5bab60754651ddc90030f3d99c851a747983c92adf0faeec7f92ac9864d6c54cf70893aaf90db8567f60b8d0c6d9f8d4330b6981fe7f26d278 SHA512 15d5a6dca04de48267f969f6866079915964a8a3abad083b1720a4425723f9c100770d05c0d475df9609c5b54741f231a587761d1beb1ae6de4b2836d60724c4
 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
-EBUILD dmidecode-2.12-r1.ebuild 1198 BLAKE2B 089188a9d4ab38d2dbb5b9a5e47199c6fd3a692cd4628edbd898525448f9a175d5f07cddbca31347e7259b9df7d5f3eafc44084de61f49f9a9525e4060338b4f SHA512 568afe3fddf1a9c65a9ad7b2281a5a9fad174eed6e2d41a080a7b4e9e1622584324778ba4d6709b4e27f12048bf38f096c64bd55d006815c124785819fdfdaee
 EBUILD dmidecode-3.0.ebuild 1145 BLAKE2B 874b9c55f5e927b9418f7f4a41bdc97cb8c461c279007052a3bb7f182154ad7602508eb406a20c5d4e786662e1aec90d01536f5727cf0bc4e172e9f441729433 SHA512 9a361a7c80194bb062b6d27d9f06bb8446298da1a09801223ab9c52e275904486945229a769b8441c51eb0c508982ee6eae116027ef3b22bded76b9f132edada
 EBUILD dmidecode-3.1.ebuild 1150 BLAKE2B ddcc97a6acecf8eb5ba62ab5793c2e409ee89da09218c2b1d5c7bb9ac52265b4cf7971e8e01d78b28004105e63a3c4c4d99a7aa27d5df93a93e27801b4edf1c7 SHA512 650cfd9c23c74bd350ee72d08ce53c9179d93b215539e5f1d168a944ef090eb32281e9448b90a93d2892d286320cf2f0cbee6bf8b7eae4ee3520bcbd3fce563a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild b/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
deleted file mode 100644
index 03c53646f8f5..000000000000
--- a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-supported-smbios-version.patch"
-	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/files/2.12-supported-smbios-version.patch b/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
deleted file mode 100644
index 84feaca79ef9..000000000000
--- a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uNr dmidecode-2.12.ORIG/dmidecode.c dmidecode-2.12/dmidecode.c
---- dmidecode-2.12.ORIG/dmidecode.c	2014-05-06 14:24:27.703057950 +0100
-+++ dmidecode-2.12/dmidecode.c	2014-05-06 14:24:43.136058719 +0100
-@@ -69,7 +69,7 @@
- #define out_of_spec "<OUT OF SPEC>"
- static const char *bad_index = "<BAD INDEX>";
- 
--#define SUPPORTED_SMBIOS_VER 0x0207
-+#define SUPPORTED_SMBIOS_VER 0x0208
- 
- /*
-  * Type-independant Stuff
-@@ -712,7 +712,6 @@
- 		{ 0x3D, "Opteron 6200" },
- 		{ 0x3E, "Opteron 4200" },
- 		{ 0x3F, "FX" },
--
- 		{ 0x40, "MIPS" },
- 		{ 0x41, "MIPS R4000" },
- 		{ 0x42, "MIPS R4200" },
-@@ -729,7 +728,6 @@
- 		{ 0x4D, "Opteron 6300" },
- 		{ 0x4E, "Opteron 3300" },
- 		{ 0x4F, "FirePro" },
--
- 		{ 0x50, "SPARC" },
- 		{ 0x51, "SuperSPARC" },
- 		{ 0x52, "MicroSPARC II" },
-@@ -1176,7 +1174,7 @@
- 		"Socket LGA1356-3" /* 0x2C */
- 	};
- 
--	if (code >= 0x01 && code <= 0x2A)
-+	if (code >= 0x01 && code <= 0x2C)
- 		return upgrade[code - 0x01];
- 	return out_of_spec;
- }
-@@ -2236,7 +2234,7 @@
- 	if (code == 0)
- 		printf(" Unknown");
- 	else
--		printf(" %.3f V", (float)(i16)code / 1000);
-+		printf(" %.3f V", (float)code / 1000);
- }
- 
- static const char *dmi_memory_device_form_factor(u8 code)
-@@ -2338,7 +2336,7 @@
- 	{
- 		int i;
- 
--		for (i = 1; i <= 14; i++)
-+		for (i = 1; i <= 15; i++)
- 			if (code & (1 << i))
- 				printf(" %s", detail[i - 1]);
- 	}