Made pcimodule patch apply more cleanly.

4 files changed, 108 insertions, 26 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index a9b02a7bf0b2..2fe9a3266994 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.5 2002/08/01 23:47:25 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.6 2002/08/04 00:14:29 aliz Exp $
+
+*pciutils-2.1.10-r1 (03 Aug 2002)
+
+  03 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> pciutils-2.1.10-r1.ebuild:
+  Made pcimodule patch apply cleanly.
 
 *pciutils-2.1.10 (02 Aug 2002)
 
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1 b/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1
new file mode 100644
index 000000000000..03ed63c325cc
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1
@@ -0,0 +1 @@
+MD5 b589225945b445b0e4c5801a15b16b79 pciutils-2.1.10.tar.gz 111028
diff --git a/sys-apps/pciutils/files/pciutils-2.1.10-pcimodules.patch b/sys-apps/pciutils/files/pciutils-2.1.10-pcimodules.patch
index 33308c199002..f3d9cd4d00ae 100644
--- a/sys-apps/pciutils/files/pciutils-2.1.10-pcimodules.patch
+++ b/sys-apps/pciutils/files/pciutils-2.1.10-pcimodules.patch
@@ -1,27 +1,45 @@
---- /tmp/Makefile	Fri Aug  2 09:40:43 2002
-+++ Makefile	Fri Aug  2 09:43:40 2002
-@@ -33,7 +33,7 @@
+--- /tmp/pcimodules-pciutils-2.1.8.diff	Mon Aug  5 01:50:23 2002
++++ pcimodules-pciutils-2.1.8.diff	Mon Aug  5 02:07:38 2002
+@@ -1,11 +1,11 @@
+ diff -u --new-file pciutils-2.1.8/Makefile pciutils/Makefile
+ --- pciutils-2.1.8/Makefile	Sat May 20 07:48:08 2000
+ +++ pciutils/Makefile	Fri Nov 24 02:03:56 2000
+-@@ -32,7 +32,7 @@
++@@ -33,7 +33,7 @@
+  
+  export
  
- export
- 
--all: lib lspci setpci lspci.8 setpci.8 pci.ids
-+all: lib lspci setpci lspci.8 setpci.8 pci.ids pcimodules pcimodules.8 
- 
- lib: lib/config.h
- 	$(MAKE) -C lib all
-@@ -61,13 +61,13 @@
- install: all
- # -c is ignored on Linux, but required on FreeBSD
- 	$(DIRINSTALL) -m 755 $(ROOT)/sbin $(PREFIX)/share $(MANDIR)/man8
--	$(INSTALL) -c -m 755 -s lspci setpci $(ROOT)/sbin
-+	$(INSTALL) -c -m 755 -s lspci setpci pcimodules $(ROOT)/sbin
- 	if [ ! -f $(PREFIX)/share/pci.ids -o pci.ids -nt $(PREFIX)/share/pci.ids ] ; then \
- 		$(INSTALL) -c -m 644 pci.ids $(PREFIX)/share ; \
- 	elif [ -f $(PREFIX)/share/pci.ids ] ; then \
- 		echo "$(PREFIX)/share/pci.ids is same or newer than the version to be installed, skipping." ; \
- 	fi
--	$(INSTALL) -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8
-+	$(INSTALL) -c -m 644 lspci.8 setpci.8 pcimodules.8 $(MANDIR)/man8
- # Remove relics from old versions
- 	rm -f $(ROOT)/etc/pci.ids
+--all: lib lspci setpci lspci.8 setpci.8 pci.ids 
++-all: lib lspci setpci lspci.8 setpci.8 pci.ids
+ +all: lib lspci setpci lspci.8 setpci.8 pci.ids pcimodules pcimodules.8 
  
+  lib: lib/config.h
+@@ -28,16 +28,20 @@
+  
+  %.8: %.man
+  	M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)$(SUFFIX)/"
+-@@ -58,9 +60,9 @@
++@@ -61,13 +61,13 @@
+  install: all
+- 	# -c is ignored on Linux, but required on FreeBSD
++ # -c is ignored on Linux, but required on FreeBSD
+  	$(DIRINSTALL) -m 755 $(ROOT)/sbin $(PREFIX)/share $(MANDIR)/man8
+--       $(INSTALL) -c -m 755 -s lspci setpci $(ROOT)/sbin
+-+       $(INSTALL) -c -m 755 -s lspci setpci pcimodules $(ROOT)/sbin
+- 	$(INSTALL) -c -m 644 pci.ids $(PREFIX)/share
+--       $(INSTALL) -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8
+-+       $(INSTALL) -c -m 644 lspci.8 setpci.8 pcimodules.8 $(MANDIR)/man8
+- 	# Remove relics from old versions
++-	$(INSTALL) -c -m 755 -s lspci setpci $(ROOT)/sbin
+++	$(INSTALL) -c -m 755 -s lspci setpci pcimodules $(ROOT)/sbin
++ 	if [ ! -f $(PREFIX)/share/pci.ids -o pci.ids -nt $(PREFIX)/share/pci.ids ] ; then \
++ 		$(INSTALL) -c -m 644 pci.ids $(PREFIX)/share ; \
++ 	elif [ -f $(PREFIX)/share/pci.ids ] ; then \
++ 		echo "$(PREFIX)/share/pci.ids is same or newer than the version to be installed, skipping." ; \
++ 	fi
++-	$(INSTALL) -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8
+++	$(INSTALL) -c -m 644 lspci.8 setpci.8 pcimodules.8 $(MANDIR)/man8
++ # Remove relics from old versions
+  	rm -f $(ROOT)/etc/pci.ids
+  
+ Common subdirectories: pciutils-2.1.8/lib and pciutils/lib
diff --git a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
new file mode 100644
index 000000000000..c5ea219616b6
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.1 2002/08/04 00:14:29 aliz 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"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
+KEYWORDS="x86 ppc"
+SLOT="0"
+LICENSE="GPL-2"
+
+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
+	cd ${S}
+
+	patch -p1 -l < ${FILESDIR}/pcimodules-pciutils-2.1.8.diff
+
+#	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
+}