Version bump per bug# 400743, as earlier versions needed python2.

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

3 files changed, 77 insertions, 3 deletions

diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog
index bf729e3bc3ac..bb8bc4fa8130 100644
--- a/sys-apps/x86info/ChangeLog
+++ b/sys-apps/x86info/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/x86info
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.31 2011/05/15 18:25:40 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.32 2012/03/12 01:46:23 robbat2 Exp $
+
+*x86info-1.30 (12 Mar 2012)
+
+  12 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +x86info-1.30.ebuild:
+  Version bump per bug# 400743, as earlier versions needed python2.
 
 *x86info-1.29 (15 May 2011)
 
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 5875288e8608..d7bc48d60141 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -7,10 +7,12 @@ DIST x86info-1.21.tgz 59354 RMD160 6eeb9f63d11117a536282f75af871579a9472a02 SHA1
 DIST x86info-1.24.tgz 78874 RMD160 e6d9db7933f48a27fe88724f385c568fcc7cbec2 SHA1 6401898ac768e3c7fbe2f6b69fc7ce9fc27e1118 SHA256 6cc44be6cabf32d77fde33f994899f7c917580f6595f656d6d1218cea131a575
 DIST x86info-1.25.tgz 80716 RMD160 f002c33e7ada46f98ba3f1eec2c834de0db3d311 SHA1 3d307310b0323f314583297745efc4296e7dbe5d SHA256 4e7c9c25252142550e68a7c347bf41192fd282e30b5c0b2a1138a2465c4f7690
 DIST x86info-1.29.tgz 87526 RMD160 a3097514722e9d0b6f4f709f31f939832cc9758b SHA1 1131bbda63a8ea428326d4ba401d24f92030ef61 SHA256 9f9a36717af60194fcab2eee39f24a1fa5a01d50b848149da3b63ed39161555c
+DIST x86info-1.30.tgz 95727 RMD160 38a5502d4364b45fcf610bbbdf7ac4e0d05cf498 SHA1 a5c63b1f4b2bf70db0919316198f6871d940fc0c SHA256 fe3009850e93a9c5fa38ed6bf74d72686043329fead8f1b2be4b5943d4fc9428
 EBUILD x86info-1.21.ebuild 1180 RMD160 d6430d463de057178e2ecd39c08dd0a737c9b047 SHA1 c4f5c96ce7305d846327fc0db2aa0c7b72045ea6 SHA256 c44f5252193f6268581b0c1c2f54897bc1d2ef33fc562f917e55061eed500964
 EBUILD x86info-1.24-r1.ebuild 1484 RMD160 a46ef4efc1d7ba924207c84722b3de5bd31ca762 SHA1 6a4f597cb5e298fe08638b0d2e79229a2be602bc SHA256 a2d06cf831a63710944386edcc14ef01a281ecdd549b9dbbfe195861a7a7af64
 EBUILD x86info-1.24-r2.ebuild 1837 RMD160 514a5f7239898e03fc25387747e31ba73017cb8f SHA1 2b4856176f6a49ec6dd607cc8d14c02689e36b1b SHA256 2e038db9aa4d013721e67d91683c83e276891b26d42e6f29001662e16e867603
 EBUILD x86info-1.25.ebuild 1892 RMD160 0ba28bc00213b79baac7bbc1c95ad20f8fd04156 SHA1 c136e7b46a2923b4c028409034c77ea546193192 SHA256 40b0cf98e76eef00342f767ecc533ff0073963445d78d148ce9bf284459b9cd6
 EBUILD x86info-1.29.ebuild 2043 RMD160 f682b88ebda3cc7d9da014a2825503b9cde7789c SHA1 9020f315f0964300cfbecd162bb9843d6be25712 SHA256 9c026baf45a352f51f5a01657749b407f446143c04c2f546620fc48d42bf31db
-MISC ChangeLog 4520 RMD160 e521462077f0acf56b19b7b2e8132d8033df10af SHA1 f73357383b90187f350bdfeabdcbd7d1ba1cfb32 SHA256 c41837f22db293f3be38d2641e2dabe29abd26e66d2f612c6f03b5b2c573dfa5
+EBUILD x86info-1.30.ebuild 2043 RMD160 b82ef94d965df395500dbb54d448ab854068dabf SHA1 0627a4cef18e935b25b9575946e99746e553329f SHA256 1c37dcf9cf9e58083f2d9c0a20e1d46e992cd4f297c64d0b290e94f9badea26c
+MISC ChangeLog 4693 RMD160 b750be0f3a3711386e780f9c337d157538edac4a SHA1 78cb20f267f2b531da0b23ec892a6626912f2db3 SHA256 bc82044604a082ef9085b5bdfcc23c5f9ecd0daff2d7cbb059dadd657c1c0e3f
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild
new file mode 100644
index 000000000000..d3a09680ca0e
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30.ebuild
@@ -0,0 +1,67 @@
+# 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.1 2012/03/12 01:46:23 robbat2 Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.21-pic.patch
+	epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	epatch "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+}
+
+src_compile() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+	emake x86info lsmsr \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin x86info lsmsr || die
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	dodoc TODO README
+	doman x86info.1 lsmsr.8
+	insinto /usr/share/doc/${PF}
+	doins -r results
+	prepalldocs
+}
+
+pkg_preinst() {
+	if [ -a "${ROOT}"/etc/modules.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info ] ; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${ROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [ -a "${ROOT}"/etc/modprobe.d/x86info ] && [ ! -a "${ROOT}"/etc/modprobe.d/x86info.conf ] ; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		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"
+}