punt the non-building copies

(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)

7 files changed, 6 insertions, 394 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/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"
-}