use epatch instead

8 files changed, 15 insertions, 180 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 67a8035e5be3..1218e910136c 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.10 2003/02/12 12:43:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.11 2003/03/11 06:13:56 seemant Exp $
 
   12 Feb 2003; Guy Martin <gmsoft@gentoo.org> pciutils-2.1.10-r1.ebuild :
   Added hppa to keywords.
@@ -14,6 +14,12 @@
 
 *pciutils-2.1.10 (02 Aug 2002)
 
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> pciutils-2.1.10-r1.ebuild,
+  pciutils-2.1.10.ebuild, pciutils-2.1.10.ebuild, pciutils-2.1.9-r1.ebuild,
+  pciutils-2.1.9-r1.ebuild, pciutils-2.1.9-r2.ebuild,
+  pciutils-2.1.9-r2.ebuild:
+  use epatch instead
+
   02 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> pciutils-2.1.10.ebuild:
   Version bump. Updates the pci.ids before compiling.
 
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.10 b/sys-apps/pciutils/files/digest-pciutils-2.1.10
deleted file mode 100644
index de6cdace75c7..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b589225945b445b0e4c5801a15b16b79 pciutils-2.1.10.tar.gz 111028
-MD5 7be1fd73b14feb79499c5117a3d05385 pcimodules-pciutils-2.1.8.diff.gz 4489
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.9-r1 b/sys-apps/pciutils/files/digest-pciutils-2.1.9-r1
deleted file mode 100644
index 81273457a9db..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.9-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f3a604c137f5ff77461efed44a4b53a pciutils-2.1.9.tar.gz 100222
-MD5 7be1fd73b14feb79499c5117a3d05385 pcimodules-pciutils-2.1.8.diff.gz 4489
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.9-r2 b/sys-apps/pciutils/files/digest-pciutils-2.1.9-r2
deleted file mode 100644
index 81273457a9db..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.9-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2f3a604c137f5ff77461efed44a4b53a pciutils-2.1.9.tar.gz 100222
-MD5 7be1fd73b14feb79499c5117a3d05385 pcimodules-pciutils-2.1.8.diff.gz 4489
diff --git a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
index 1f1a7e198638..c1f2d74c9fd4 100644
--- a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2003 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.8 2003/02/13 16:09:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.9 2003/03/11 06:13:56 seemant Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various utilities dealing with the PCI bus"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-KEYWORDS="x86 ppc sparc alpha hppa"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha hppa"
 
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-RDEPEND="virtual/glibc"
-
 src_unpack() {
-	unpack ${P}.tar.gz
-#	gunzip -c ${DISTDIR}/pcimodules-pciutils-2.1.8.diff.gz >> ${S}/pcimodules-pciutils-2.1.8.diff
+	unpack ${A}
 	cd ${S}
 
-	patch -p1 -l < ${FILESDIR}/pcimodules-pciutils-2.1.8.diff
-
-#	patch -p0 < ${FILESDIR}/${P}-pcimodules.patch
+	epatch ${FILESDIR}/pcimodules-pciutils-2.1.8.diff
 
 	cp Makefile Makefile.orig
 	sed -e "s:-O2:${CFLAGS}:" -e "s:-Werror::g" Makefile.orig > Makefile
diff --git a/sys-apps/pciutils/pciutils-2.1.10.ebuild b/sys-apps/pciutils/pciutils-2.1.10.ebuild
deleted file mode 100644
index f26ae722d90c..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.5 2003/02/13 16:09:33 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various utilities dealing with the PCI bus"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz
-	ftp://ftp.yggdrasil.com/pub/dist/device_control/pcimodules/pcimodules-pciutils-2.1.8.diff.gz"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-KEYWORDS="x86 ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	net-misc/wget"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	# this patch does apply cleanly to pciutils-2.1.9
-	# add pcimodules utility
-	gunzip -c ${DISTDIR}/pcimodules-pciutils-2.1.8.diff.gz | patch -p1
-	einfo "errors are expected"
-
-	patch -p0 < ${FILESDIR}/${P}-pcimodules.patch
-
-	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.9-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.9-r1.ebuild
deleted file mode 100644
index 01feaf2f3d84..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.9-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 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.9-r1.ebuild,v 1.6 2003/02/13 16:09:38 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various utilities dealing with the PCI bus"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz
-		ftp://ftp.yggdrasil.com/pub/dist/device_control/pcimodules/pcimodules-pciutils-2.1.8.diff.gz"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	# this patch does apply cleanly to pciutils-2.1.9
-	# add pcimodules utility
-	gunzip -c ${DISTDIR}/pcimodules-pciutils-2.1.8.diff.gz | patch -p1
-
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-}
-
-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.9-r2.ebuild b/sys-apps/pciutils/pciutils-2.1.9-r2.ebuild
deleted file mode 100644
index 104f3f864c22..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.9-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 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.9-r2.ebuild,v 1.9 2003/02/13 16:09:44 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various utilities dealing with the PCI bus"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz
-	ftp://ftp.yggdrasil.com/pub/dist/device_control/pcimodules/pcimodules-pciutils-2.1.8.diff.gz"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-KEYWORDS="x86 ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	# this patch does apply cleanly to pciutils-2.1.9
-	# add pcimodules utility
-	gunzip -c ${DISTDIR}/pcimodules-pciutils-2.1.8.diff.gz | patch -p1
-
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" -e "s:-Werror::g" Makefile.orig > Makefile
-}
-
-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
-}