stabilize

(Portage version: 2.0.51-r14)

5 files changed, 5 insertions, 138 deletions

diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.11 b/sys-apps/pciutils/files/digest-pciutils-2.1.11
deleted file mode 100644
index 5bab57abb8f5..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d40f90aaae69594790bdb8ff90b4a41 pciutils-2.1.11.tar.gz 120948
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.11-r2 b/sys-apps/pciutils/files/digest-pciutils-2.1.11-r2
deleted file mode 100644
index 5bab57abb8f5..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d40f90aaae69594790bdb8ff90b4a41 pciutils-2.1.11.tar.gz 120948
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild
deleted file mode 100644
index 6588f404e5c9..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r2.ebuild,v 1.2 2005/01/02 23:44:20 ciaranm Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~amd64 ~ia64 ~ppc64"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/pcimodules-${P}.diff
-	epatch ${FILESDIR}/${PV}-sysfs.patch #38645
-
-
-	# Unconditionally use -fPIC for libs (#55238)
-	sed -i \
-		-e "/^include/s/$/\nCFLAGS+=-fPIC/" lib/Makefile \
-		|| die "sed lib/Makefile failed"
-
-	sed -i \
-		-e "s:-O2:${CFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
-
-	# fix command line overflow which did not allow for null terminator
-	# when using  lspci -vvv (AGPx1 and AGPx2 and AGPx4) bug #41422
-	sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c \
-		|| die "sed failed on lspci.c"
-
-	./update-pciids.sh
-}
-
-src_compile() {
-	emake PREFIX=/usr lib || die "emake lib failed"
-
-	cd ${S}/lib
-	sed -i \
-		-e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h \
-		|| die "sed config.h failed"
-
-	cd ${S}
-	emake PREFIX=/usr || die "emake failed"
-
-	sed -i \
-		-e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" \
-		update-pciids lspci.8 update-pciids.8 \
-		|| die "sed failed"
-}
-
-src_install() {
-	into /
-	dosbin setpci lspci pcimodules update-pciids || die "dosbin failed"
-	doman *.8
-
-	insinto /usr/share/misc
-	doins pci.ids || die
-
-	into /usr
-	dolib lib/libpci.a
-
-	insinto /usr/include/pci
-	doins lib/*.h
-}
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
index 473b6170715d..8fc27ce4e05c 100644
--- a/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild,v 1.4 2005/01/02 23:44:20 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r3.ebuild,v 1.5 2005/01/20 16:44:25 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -70,11 +70,11 @@ src_install() {
 	doman *.8
 
 	insinto /usr/share/misc
-	doins pci.ids || die
+	doins pci.ids || die "pciids failed"
 
 	into /usr
-	dolib lib/libpci.a
+	dolib lib/libpci.a || die "libpci failed"
 
 	insinto /usr/include/pci
-	doins lib/*.h
+	doins lib/*.h || die "headers failed"
 }
diff --git a/sys-apps/pciutils/pciutils-2.1.11.ebuild b/sys-apps/pciutils/pciutils-2.1.11.ebuild
deleted file mode 100644
index 84212edcd63c..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11.ebuild,v 1.16 2005/01/02 23:44:20 ciaranm Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa ia64 ~ppc64"
-IUSE=""
-
-DEPEND="virtual/libc
-	net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/pcimodules-${P}.diff
-
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-	sed -i "s:-O2:${CFLAGS}:" Makefile
-
-	./update-pciids.sh
-}
-
-src_compile() {
-	make PREFIX=/usr lib/config.h || die
-
-	cd ${S}/lib
-	sed -i "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h || die
-
-	cd ${S}
-	make PREFIX=/usr || die
-
-	for i in update-pciids lspci.8 update-pciids.8; do
-		sed -i "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" ${i} || die
-	done
-}
-
-src_install () {
-	into /
-	dosbin setpci lspci pcimodules update-pciids
-	doman *.8
-
-	insinto /usr/share/misc
-	doins pci.ids
-
-	dolib lib/libpci.a
-
-	insinto /usr/include/pci
-	doins lib/*.h
-}