diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-30 13:20:40 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-03-30 13:20:40 +0000 |
commit | 4b2e4379010905b09d52f219a6bc12080f5dbcdd (patch) | |
tree | 27e4217d1a949a9607ed875f1b9c8a8b166f0312 /sys-apps/x86info | |
parent | Build with ppds as it is just 2 files anyway and debian does the same. Fixes ... (diff) | |
download | historical-4b2e4379010905b09d52f219a6bc12080f5dbcdd.tar.gz historical-4b2e4379010905b09d52f219a6bc12080f5dbcdd.tar.bz2 historical-4b2e4379010905b09d52f219a6bc12080f5dbcdd.zip |
punt the non-building copies
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/x86info')
-rw-r--r-- | sys-apps/x86info/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/x86info/Manifest | 26 | ||||
-rw-r--r-- | sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch | 92 | ||||
-rw-r--r-- | sys-apps/x86info/x86info-1.21.ebuild | 48 | ||||
-rw-r--r-- | sys-apps/x86info/x86info-1.24-r1.ebuild | 57 | ||||
-rw-r--r-- | sys-apps/x86info/x86info-1.24-r2.ebuild | 63 | ||||
-rw-r--r-- | sys-apps/x86info/x86info-1.25.ebuild | 66 | ||||
-rw-r--r-- | sys-apps/x86info/x86info-1.29.ebuild | 67 |
8 files changed, 16 insertions, 410 deletions
diff --git a/sys-apps/x86info/ChangeLog b/sys-apps/x86info/ChangeLog index 375a62492d15..ab9876e2fa46 100644 --- a/sys-apps/x86info/ChangeLog +++ b/sys-apps/x86info/ChangeLog @@ -1,6 +1,11 @@ # 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.34 2012/03/24 16:54:37 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/ChangeLog,v 1.35 2012/03/30 13:20:39 ssuominen Exp $ + + 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, + -files/x86info-1.25-parallel-make-cleanup.patch, -x86info-1.29.ebuild: + old 24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> x86info-1.30.ebuild: x86 stable wrt bug #407917 diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest index 136b0e2ad134..25a52ff33730 100644 --- a/sys-apps/x86info/Manifest +++ b/sys-apps/x86info/Manifest @@ -1,28 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 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.25-parallel-make-cleanup.patch 2387 RMD160 eea33c1d6037ef9532ce235e1e70bd9f7574ad7e SHA1 15be4fa8ee32781232a52563ab523bc8369c7e4a SHA256 e105328a509a11f97904173f701cb93182c464df484caa5db7b9367833ccb8f6 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.21.tgz 59354 RMD160 6eeb9f63d11117a536282f75af871579a9472a02 SHA1 3e0071ae508d5944a21ee0fafa07edf5f45e82bd SHA256 2bb3fb33832e073452657adf9f946b2d73d32c7382382f2136750c29d2637fe1 -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 EBUILD x86info-1.30.ebuild 2044 RMD160 b1ad15a35e993f3b8894216b081add24fc547af7 SHA1 29a895c6c04c0ea4b86df44c6c2f90e54f1b7cd8 SHA256 4da8d42878c6e41926f3635efe3a256262ba927ac14047c2ab82f7b34c6f8b09 -MISC ChangeLog 4909 RMD160 bb41423a6342e6a7374f85da2162d4b81b626c73 SHA1 dc6665172886ea8e3de3c95b13fa6f7717e557fc SHA256 3a56ced3b4510dcc88b731c1a4745bc9be89ae05748276ba09992ec98c3487f7 +MISC ChangeLog 5138 RMD160 077e6085f530a84a11fb2047c0249f9a1f15b0c8 SHA1 f28db96a06b9664a00d1dd06b2c51e29d7ee7bda SHA256 857c61625495793fa6d45e3c1920d2472308b4533415bd98ff4dd1c28ea4aae3 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREKAAYFAk9t/FMACgkQuUQtlDBCeQKmmgCgg8ZrL25093oiPTH90RV4opfB -avsAmwaF4dqXmnx2i3UlbFD9sVqcX86U -=Mhgl +iQEcBAEBAgAGBQJPdbMfAAoJEEdUh39IaPFNQr4H/jrQLAdDPkBwrjYGF0JPGHLc +ZdHqxbRjcx6PjoPuc1XaWdLNMt05YaxSmIZfYjyMXWPCGtSLl7BUQ2svTnkVkvd1 +Z0Yu38yKadrXbBWIP+Yq8I2Evoph0Tsmlleq1Xsn7AfVHmv7UYGJePKBqr5Vmsc9 +07FMc8S7+Lt0A+1QcJgsFOVLpEnDoj25vm7YGG+sMnAHm+x1tJUYS4Z9CVFieAG7 +UX7FpT8rL7I8WRshxUnjnTLQyw82BV+u/gD4jjgWuB3PbK5BCerRCe+1kc4+IM74 +nZEmYvq4/uUmREsZRqSZSPoo3qHZSWlhkcZVEho9FDP2VsetmL9Uubs20speWHk= +=6u59 -----END PGP SIGNATURE----- diff --git a/sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch deleted file mode 100644 index 97cfccd18b33..000000000000 --- a/sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -Nuar --exclude '*.rej' --exclude '*.orig' x86info-1.25.orig/Makefile x86info-1.25/Makefile ---- x86info-1.25.orig/Makefile 2009-10-30 15:59:46.000000000 +0000 -+++ x86info-1.25/Makefile 2009-11-04 05:16:10.983250367 +0000 -@@ -2,15 +2,25 @@ - # -Wstrict-overflow=5 - CC = gcc - -+.PRECIOUS: %.d -+ - SHELL = /bin/sh - - --.c.o: -- $(CC) $(CFLAGS) -MMD -o $@ -c $< -- @cp $*.d $*.P; \ -+%.d: %.c -+ $(CC) $(CFLAGS) -E -MMD -MF $@ $< >/dev/null -+ -+%.d: %.h -+ $(CC) $(CFLAGS) -E -MMD -MF $@ $< >/dev/null -+ -+%.P: %.d -+ cat $< >$@.tmp ; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -- -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \ -- rm -f $*.d -+ -e '/^$$/ d' -e 's/$$/ :/' < $@.tmp >> $@.tmp ; \ -+ mv $@.tmp $@ -+ -+.c.o: -+ $(CC) $(CFLAGS) -o $@ -c $< - - .S.o: - $(CC) $(CFLAGS) -o $@ -c $< -@@ -22,7 +32,8 @@ - LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h - - %.h: %.regs scripts/createheader.py -- python scripts/createheader.py $< `basename $< .regs` >$@ -+ python scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \ -+ mv $@.tmp $@ - - LSMSR_SRC =\ - lsmsr.c\ -@@ -30,11 +41,12 @@ - havecpuid.c - - LSMSR_OBJS = $(LSMSR_SRC:%.c=%.o) -+LSMSR_DEPS = $(patsubst %.h,%.P,$(patsubst %.c,%.P,$(LSMSR_SRC))) $(patsubst %.h,%.P,$(LSMSR_TMP_HEADERS)) - --lsmsr: $(LSMSR_TMP_HEADERS) $(LSMSR_OBJS) -- $(CC) $(CFLAGS) -o lsmsr $(LSMSR_OBJS) -+lsmsr: $(LSMSR_TMP_HEADERS) $(LSMSR_OBJS) $(LSMSR_DEPS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o lsmsr $(LSMSR_OBJS) - ---include $(LSMSR_SRC:%.c=%.P) -+-include $(LSMSR_DEPS) - - X86INFO_SRC =\ - AMD/identify.c\ -@@ -89,12 +101,12 @@ - bench/MHz.c - - X86INFO_OBJS = $(X86INFO_SRC:%.c=%.o) -+X86INFO_DEPS = $(patsubst %.h,%.P,$(patsubst %.c,%.P,$(X86INFO_SRC))) $(patsubst %.h,%.P,$(LSMSR_TMP_HEADERS)) - --x86info: $(X86INFO_OBJS) -- $(CC) $(CFLAGS) -o x86info $(X86INFO_OBJS) -- ---include $(X86INFO_SRC:%.c=%.P) -+x86info: $(X86INFO_OBJS) $(X86INFO_DEPS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o x86info $(X86INFO_OBJS) - -+-include $(X86INFO_DEPS) - - nodes: - scripts/makenodes -@@ -113,6 +125,7 @@ - @find . -name "*.o" -exec rm {} \; - @find . -name "*~" -exec rm {} \; - @find . -name "*.P" -exec rm {} \; -+ @find . -name "*.d" -exec rm {} \; - @rm -f x86info x86info.exe - @rm -f lsmsr $(LSMSR_TMP_HEADERS) - -@@ -121,3 +134,6 @@ - - sparse: - sparse $(X86INFO_SRC) -+ -+deps-headers: $(LSMSR_TMP_HEADERS) -+deps: deps-headers $(LSMSR_DEPS) $(X86INFO_DEPS) diff --git a/sys-apps/x86info/x86info-1.21.ebuild b/sys-apps/x86info/x86info-1.21.ebuild deleted file mode 100644 index 7eee566f65fc..000000000000 --- a/sys-apps/x86info/x86info-1.21.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.21.ebuild,v 1.3 2008/04/17 21:44:14 ken69267 Exp $ - -inherit eutils - -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 CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - dobin x86info || die - - insinto /etc/modules.d - newins "${FILESDIR}"/x86info-modules.conf-rc x86info - - dodoc TODO README ChangeLog - 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" -} diff --git a/sys-apps/x86info/x86info-1.24-r1.ebuild b/sys-apps/x86info/x86info-1.24-r1.ebuild deleted file mode 100644 index 25da9fac628b..000000000000 --- a/sys-apps/x86info/x86info-1.24-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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-r1.ebuild,v 1.4 2009/05/14 12:21:43 fauli 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.d/x86info" "${ROOT}/etc/modprobe.d/x86info" - fi -} - -src_install() { - dobin x86info || die - - insinto /etc/modprobe.d - newins "${FILESDIR}"/x86info-modules.conf-rc x86info - - 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" -} diff --git a/sys-apps/x86info/x86info-1.24-r2.ebuild b/sys-apps/x86info/x86info-1.24-r2.ebuild deleted file mode 100644 index d80bc3fa9d60..000000000000 --- a/sys-apps/x86info/x86info-1.24-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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.3 2009/08/15 23:41:13 vapier 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="" - -RDEPEND="" -DEPEND="sys-apps/sed" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.21-pic.patch - epatch "${FILESDIR}"/${P}-pic.patch #270388 - sed -i -e 's:$(CFLAGS) -o x86:$(LDFLAGS) $(CFLAGS) -o x86:' \ - Makefile || die "I don't want your LDFLAGS." -} - -src_compile() { - emake x86info CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} ${CPPFLAGS}" || die "emake failed" -} - -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_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" -} diff --git a/sys-apps/x86info/x86info-1.25.ebuild b/sys-apps/x86info/x86info-1.25.ebuild deleted file mode 100644 index e310e725fecc..000000000000 --- a/sys-apps/x86info/x86info-1.25.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.25.ebuild,v 1.2 2010/02/07 19:42:28 maekke Exp $ - -EAPI=2 -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="" - -RDEPEND="" -DEPEND="sys-apps/sed" # used in the makefile - -src_prepare() { - epatch "${FILESDIR}"/1.21-pic.patch - epatch "${FILESDIR}"/${PN}-1.24-pic.patch #270388 - epatch "${FILESDIR}"/${PN}-1.25-parallel-make-cleanup.patch -} - -src_compile() { - emake deps \ - || die "emake deps failed" - 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" -} diff --git a/sys-apps/x86info/x86info-1.29.ebuild b/sys-apps/x86info/x86info-1.29.ebuild deleted file mode 100644 index b9802d5a8c53..000000000000 --- a/sys-apps/x86info/x86info-1.29.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/x86info/x86info-1.29.ebuild,v 1.1 2011/05/15 18:25:40 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" -} |