inherit flag-o-matic

4 files changed, 8 insertions, 68 deletions

diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1 b/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1
deleted file mode 100644
index 03ed63c325cc..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b589225945b445b0e4c5801a15b16b79 pciutils-2.1.10.tar.gz 111028
diff --git a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
deleted file mode 100644
index 5ee20874144f..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.13 2004/02/23 00:48:30 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-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 "
-
-DEPEND="virtual/glibc
-	net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/pcimodules-pciutils-2.1.8.diff
-
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" -e "s:-Werror::g" Makefile.orig > Makefile
-
-	make update-ids
-
-	if [ ! -f pci.ids ] ; then mv pci.ids.orig pci.ids ; fi
-}
-
-src_compile() {
-	make PREFIX=/usr lib/config.h || die
-
-	cd ${S}/lib
-	cp config.h config.h.orig
-	sed -e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h.orig > config.h || die
-
-	cd ${S}
-	make PREFIX=/usr || die
-}
-
-src_install () {
-	into /
-	dosbin setpci lspci pcimodules
-	doman *.8
-
-	insinto /usr/share/misc
-	doins pci.ids
-
-	dolib lib/libpci.a
-
-	insinto /usr/include/pci
-	doins lib/*.h
-}
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild
index c9d50414943b..86589c1ec923 100644
--- a/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild,v 1.7 2004/04/01 21:26:37 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild,v 1.8 2004/04/06 03:15:15 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
@@ -15,8 +15,6 @@ KEYWORDS="~x86 ~ppc sparc ~alpha ~hppa ~ia64 ~ppc64 ~amd64 ppc64 ~mips"
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -24,6 +22,7 @@ src_unpack() {
 	epatch ${FILESDIR}/pcimodules-${P}.diff
 	epatch ${FILESDIR}/${PV}-sysfs.patch #38645
 
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
 	sed -i "s:-O2:${CFLAGS}:" Makefile
 
 	./update-pciids.sh
@@ -45,11 +44,11 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin setpci lspci pcimodules update-pciids
+	dosbin setpci lspci pcimodules update-pciids || die
 	doman *.8
 
 	insinto /usr/share/misc
-	doins pci.ids
+	doins pci.ids || die
 
 	into /usr
 	dolib lib/libpci.a
diff --git a/sys-apps/pciutils/pciutils-2.1.11.ebuild b/sys-apps/pciutils/pciutils-2.1.11.ebuild
index e149ad4dbd57..612c8137154e 100644
--- a/sys-apps/pciutils/pciutils-2.1.11.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.12 2004/02/23 00:48:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11.ebuild,v 1.13 2004/04/06 03:15:15 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
-S=${WORKDIR}/${P}
 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"
@@ -16,14 +15,13 @@ KEYWORDS="x86 amd64 ppc sparc alpha hppa ia64 ~ppc64"
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
 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