sys-apps/x86info: Use linux-info.eclas instead of elog

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 22 insertions, 26 deletions

diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog
index ab9876e2fa46..d42f5373ff80 100644
--- a/sys-apps/x86info/ChangeLog
+++ b/sys-apps/x86info/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/x86info
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.35 2012/03/30 13:20:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.36 2012/06/15 11:59:22 jlec Exp $
+
+  15 Jun 2012; Justin Lecher <jlec@gentoo.org> x86info-1.30.ebuild,
+  metadata.xml:
+  Use linux-info.eclas instead of elog
 
   30 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -x86info-1.21.ebuild,
   -x86info-1.24-r1.ebuild, -x86info-1.24-r2.ebuild, -x86info-1.25.ebuild,
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 25a52ff33730..cdee290c791c 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.21-pic.patch 717 RMD160 0bcba1f80eb887b5353d24ed1c142afebe7725f8 SHA1 a83df63cdd6b285f68b300872ba6d6b8fceea50b SHA256 af3dfe679472819d482df5b2c80dc8133b944787dbb13841fe22d30c1f668948
 AUX x86info-1.24-pic.patch 573 RMD160 877eafab4da9063a7e9b8a913014773d6c5d4486 SHA1 32f50cc4abe5dc46ebdd88be6b87ef5b6156f506 SHA256 7aeb0233c7a53b07fecbf84a848520cfdcf36a7fde6a8d00bf5684a58cba27af
 AUX x86info-1.29-parallel-make-cleanup.patch 486 RMD160 53bdfc6fce217faa5c8b9a695a433ebe948cd6ce SHA1 1774908d7927fc554983c87528f46f29a32168ef SHA256 292421927f7c53867872bf51dd309ba9a5eb7ba67d20375f7be94c47015fa9c8
 AUX x86info-modules.conf-rc 330 RMD160 edd79a6436a85eb4361a081538de3f3e7e1c6ef1 SHA1 798919c8bda83ae89c1f3eb2e398598e37c809f2 SHA256 ca22974920a096572a7fccde55db738591f03b95a2b7b85403ab9771647824a2
 DIST x86info-1.30.tgz 95727 RMD160 38a5502d4364b45fcf610bbbdf7ac4e0d05cf498 SHA1 a5c63b1f4b2bf70db0919316198f6871d940fc0c SHA256 fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428
-EBUILD x86info-1.30.ebuild 2044 RMD160 b1ad15a35e993f3b8894216b081add24fc547af7 SHA1 29a895c6c04c0ea4b86df44c6c2f90e54f1b7cd8 SHA256 4da8d42878c6e41926f3635efe3a256262ba927ac14047c2ab82f7b34c6f8b09
-MISC ChangeLog 5138 RMD160 077e6085f530a84a11fb2047c0249f9a1f15b0c8 SHA1 f28db96a06b9664a00d1dd06b2c51e29d7ee7bda SHA256 857c61625495793fa6d45e3c1920d2472308b4533415bd98ff4dd1c28ea4aae3
-MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
+EBUILD x86info-1.30.ebuild 1797 RMD160 d235bac4d4eabfb87dd7ba34a094dcdc83e69d69 SHA1 0e7b1a036efdb996f505f6693691b1c0c1a978a1 SHA256 136ed3825b6d974756f6ebecc911bcfad9cad651b0cdc8c19cfa36e1b16aebe7
+MISC ChangeLog 5257 RMD160 a5910a017b5226c596f6c48373b79a9cc2588244 SHA1 819699ff36bef42983b3c7e7a92f77d2e7bc6217 SHA256 454bbe8bc26a5d6238302542f3026290ee661e6ab3ef78a4b822235ceab4d5f6
+MISC metadata.xml 230 RMD160 99c77fbc1c34db40bd3cd33e26c0c922e249add5 SHA1 1fabaa26ac2c26bd4cfa2a86d00f3339965a0996 SHA256 8b9469a1a01abebba71b6c3be5473ee79315c3de3f22f28621a777e63eda828c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBAgAGBQJPdbMfAAoJEEdUh39IaPFNQr4H/jrQLAdDPkBwrjYGF0JPGHLc
-ZdHqxbRjcx6PjoPuc1XaWdLNMt05YaxSmIZfYjyMXWPCGtSLl7BUQ2svTnkVkvd1
-Z0Yu38yKadrXbBWIP+Yq8I2Evoph0Tsmlleq1Xsn7AfVHmv7UYGJePKBqr5Vmsc9
-07FMc8S7+Lt0A+1QcJgsFOVLpEnDoj25vm7YGG+sMnAHm+x1tJUYS4Z9CVFieAG7
-UX7FpT8rL7I8WRshxUnjnTLQyw82BV+u/gD4jjgWuB3PbK5BCerRCe+1kc4+IM74
-nZEmYvq4/uUmREsZRqSZSPoo3qHZSWlhkcZVEho9FDP2VsetmL9Uubs20speWHk=
-=6u59
+iEYEAREKAAYFAk/bI58ACgkQgAnW8HDreRYhbgCgl14OeMldbQnHeQNbog9WTKXA
+NtIAn3lcq9QJkf660lQxkW1cusQxpBtc
+=iDPo
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index 035bc6b0e2cd..e2a0d741c0f6 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
+	<herd>base-system</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild
index 09294192731a..bca78f4c1e62 100644
--- a/sys-apps/x86info/x86info-1.30.ebuild
+++ b/sys-apps/x86info/x86info-1.30.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.30.ebuild,v 1.3 2012/03/24 16:54:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.30.ebuild,v 1.4 2012/06/15 11:59:22 jlec Exp $
 
 EAPI=2
-inherit eutils toolchain-funcs flag-o-matic
+
+inherit eutils flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
 HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
@@ -17,6 +18,8 @@ IUSE=""
 RDEPEND="sys-apps/pciutils"
 DEPEND="${RDEPEND}"
 
+CONFIG_CHECK="~MTRR ~X86_CPUID"
+
 src_prepare() {
 	epatch "${FILESDIR}"/1.21-pic.patch
 	epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388
@@ -57,11 +60,3 @@ pkg_preinst() {
 		mv "${ROOT}"/etc/modprobe.d/x86info{,.conf}
 	fi
 }
-
-pkg_postinst() {
-	ewarn "Your kernel must be built with the following options"
-	ewarn "set to Y or M"
-	ewarn "     Processor type and features ->"
-	ewarn "         [*] /dev/cpu/*/msr - Model-specific register support"
-	ewarn "         [*] /dev/cpu/*/cpuid - CPU information support"
-}