modprobe.d filename style change for new modprobe.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 71 insertions, 12 deletions

diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog
index 0ce5908d6bbd..32fe21fd953a 100644
--- a/sys-apps/x86info/ChangeLog
+++ b/sys-apps/x86info/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/x86info
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.26 2009/05/14 12:21:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.27 2009/07/05 20:11:39 robbat2 Exp $
+
+*x86info-1.24-r2 (05 Jul 2009)
+
+  05 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +x86info-1.24-r2.ebuild:
+  modprobe.d filename style change for new modprobe.
 
   14 May 2009; Christian Faulhammer <fauli@gentoo.org>
   x86info-1.24-r1.ebuild:
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 2b39f22dcc63..d72fd64c15a4 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.21-pic.patch 717 RMD160 0bcba1f80eb887b5353d24ed1c142afebe7725f8 SHA1 a83df63cdd6b285f68b300872ba6d6b8fceea50b SHA256 af3dfe679472819d482df5b2c80dc8133b944787dbb13841fe22d30c1f668948
 AUX x86info-modules.conf-rc 330 RMD160 edd79a6436a85eb4361a081538de3f3e7e1c6ef1 SHA1 798919c8bda83ae89c1f3eb2e398598e37c809f2 SHA256 ca22974920a096572a7fccde55db738591f03b95a2b7b85403ab9771647824a2
 DIST x86info-1.21.tgz 59354 RMD160 6eeb9f63d11117a536282f75af871579a9472a02 SHA1 3e0071ae508d5944a21ee0fafa07edf5f45e82bd SHA256 2bb3fb33832e073452657adf9f946b2d73d32c7382382f2136750c29d2637fe1
 DIST x86info-1.24.tgz 78874 RMD160 e6d9db7933f48a27fe88724f385c568fcc7cbec2 SHA1 6401898ac768e3c7fbe2f6b69fc7ce9fc27e1118 SHA256 6cc44be6cabf32d77fde33f994899f7c917580f6595f656d6d1218cea131a575
 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
-MISC ChangeLog 3621 RMD160 98e218ef90606c11c71d9f0e29eef837928a8bd0 SHA1 b9bb02fc863e2bcef0a94d43479836179d6c49d7 SHA256 23665af38fa14886d7e529ef2ce0c50a848036db19238609bcb0e5198a3bb74d
+EBUILD x86info-1.24-r2.ebuild 1713 RMD160 604d8f5a522ee1fdb6dec9e855570fef3803f102 SHA1 c2607b1eae1d29b7b9b44508b78b7c193c4bdd29 SHA256 74713f3130a129f45203affefe813011392d1aacc2a648a244b16f44e91a909c
+MISC ChangeLog 3789 RMD160 2c9d554b9252a81db5d442eee936130a2f37aa14 SHA1 f071cfc320565ded6c22c3df9adbd9b295dd3704 SHA256 13c51341a8ed78d82447faf65f9c422e55b5110d202872d38ce29218c25881f1
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoMDNwACgkQNQqtfCuFneNMCQCfXUV7J5lUjzNxD1QOuvRdSG+H
-iVEAnjx7XOWhpABZhnGOUJRVw8GgDHE5
-=jH7C
------END PGP SIGNATURE-----
diff --git a/sys-apps/x86info/x86info-1.24-r2.ebuild b/sys-apps/x86info/x86info-1.24-r2.ebuild
new file mode 100644
index 000000000000..fa93d61c5fd1
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.24-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.24-r2.ebuild,v 1.1 2009/07/05 20:11:39 robbat2 Exp $
+
+inherit eutils toolchain-funcs
+
+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=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/1.21-pic.patch
+}
+
+src_compile() {
+	emake x86info CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+pkg_preinst() {
+	if [[ -a /etc/modules.d/x86info ]] && [[ ! -a /etc/modprobe.d/x86info ]]; then
+		elog "Moving old x86info configuration in modules.d to new"
+		elog "location in modprobe.d in /etc/"
+		mv "${ROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [[ -a /etc/modprobe.d/x86info ]] && [[ ! -a /etc/modprobe.d/x86info.conf ]]; then
+		elog "Moving old x86info configuration in modprobe.d to"
+		elog "new naming scheme with trailing .conf"
+		mv "${ROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}
+
+src_install() {
+	dobin x86info || die
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	dodoc TODO README
+	doman x86info.1
+	insinto /usr/share/doc/${PF}
+	doins -r results
+	prepalldocs
+}
+
+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"
+}