Dont install libpci.so anymore, but install a PIC libpci.a like Debian.

Package-Manager: portage-2.1.1_pre1-r2

6 files changed, 124 insertions, 13 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 1d82eba63fda..aa26ae4daa0d 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.74 2006/06/08 10:30:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.75 2006/06/24 20:40:45 vapier Exp $
+
+*pciutils-2.2.3-r1 (24 Jun 2006)
+
+  24 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  files/pcimodules-pciutils-2.2.0.patch, +files/pciutils-2.2.3-build.patch,
+  +pciutils-2.2.3-r1.ebuild:
+  Dont install libpci.so anymore, but install a PIC libpci.a like Debian.
 
 *pciutils-2.2.3 (08 Jun 2006)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 3a1855a33737..901e51b27271 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -9,10 +9,10 @@ AUX pcimodules-pciutils-2.1.11.diff 11005 RMD160 61cba7e1a3f571249b447ad0903efdc
 MD5 96cd1ebcf3aef8efd8f5fc672044e288 files/pcimodules-pciutils-2.1.11.diff 11005
 RMD160 61cba7e1a3f571249b447ad0903efdc7d8db0235 files/pcimodules-pciutils-2.1.11.diff 11005
 SHA256 3689e310c28b7317eece9ce120077606d321c835062dd12bc15f0246b6c3bd58 files/pcimodules-pciutils-2.1.11.diff 11005
-AUX pcimodules-pciutils-2.2.0.patch 10851 RMD160 59877f3745a201bb89146bd81f74b6b2d0b41afe SHA1 67859e44551ec8050645c1444c842d13ec277b12 SHA256 828b0e086017363e39509258b29b9b51e1f6c20cf18fc033c99c75b13ab838b8
-MD5 e0efe0164d13807ab70843adcc393df7 files/pcimodules-pciutils-2.2.0.patch 10851
-RMD160 59877f3745a201bb89146bd81f74b6b2d0b41afe files/pcimodules-pciutils-2.2.0.patch 10851
-SHA256 828b0e086017363e39509258b29b9b51e1f6c20cf18fc033c99c75b13ab838b8 files/pcimodules-pciutils-2.2.0.patch 10851
+AUX pcimodules-pciutils-2.2.0.patch 10848 RMD160 e1cf273384344a3909357d6709a043f59b5b16f9 SHA1 48b253fb55fb0de478019c856c77938f959a9bcd SHA256 194253c641b6fe89a7dd96bc707c2ac1be5a92f7b21fa55c85ff74870676de07
+MD5 ec63de606e8d84e973c1fd4aa3ec9437 files/pcimodules-pciutils-2.2.0.patch 10848
+RMD160 e1cf273384344a3909357d6709a043f59b5b16f9 files/pcimodules-pciutils-2.2.0.patch 10848
+SHA256 194253c641b6fe89a7dd96bc707c2ac1be5a92f7b21fa55c85ff74870676de07 files/pcimodules-pciutils-2.2.0.patch 10848
 AUX pciutils-2.1.11-bsd.patch 921 RMD160 f9f14c67db5abdaa1e1b11d7fd7616367e91911b SHA1 bd5321a5abccdfad905dbff04df7f031161c56cf SHA256 ba0088e82e6c121025ceafdd97dc9ee7828dbe37ce4016a151bf1f404f89138e
 MD5 05277cd33401a99ed9fe18fe614231d0 files/pciutils-2.1.11-bsd.patch 921
 RMD160 f9f14c67db5abdaa1e1b11d7fd7616367e91911b files/pciutils-2.1.11-bsd.patch 921
@@ -29,6 +29,10 @@ AUX pciutils-2.2.0-shared-lib.patch 511 RMD160 c3d4553bb5a0070f3d0904669e1aff656
 MD5 6c903c6d36593f991a2084d559b6b2cf files/pciutils-2.2.0-shared-lib.patch 511
 RMD160 c3d4553bb5a0070f3d0904669e1aff656cee74cc files/pciutils-2.2.0-shared-lib.patch 511
 SHA256 dcac8dd49d510459afa71addd6fcc3d25868061c8784c14c0bbbae215a19f3c9 files/pciutils-2.2.0-shared-lib.patch 511
+AUX pciutils-2.2.3-build.patch 863 RMD160 0d3841a3b7893d73a9e08e48b36552b778c022bd SHA1 70aaf33dde28aa1d665eea69103cc119faea8723 SHA256 e05828e160524fd6df83d07520b8dc8e683eb817b48aefe78fb39c4337675cbd
+MD5 fbd8b592c81e7303b70e017701d30bf0 files/pciutils-2.2.3-build.patch 863
+RMD160 0d3841a3b7893d73a9e08e48b36552b778c022bd files/pciutils-2.2.3-build.patch 863
+SHA256 e05828e160524fd6df83d07520b8dc8e683eb817b48aefe78fb39c4337675cbd files/pciutils-2.2.3-build.patch 863
 DIST pci.ids-20041019.bz2 86174
 DIST pci.ids-20051015.bz2 98776
 DIST pci.ids-20060608.bz2 108285 RMD160 0768e2232a6003711de498ef8e7df805d4c880c7 SHA1 ca8f12a439c422b9248c7bf81f0a228fc8f8d9fd SHA256 81418596523d437b260573d727d77130e91890f84265b58907f1175fa81224ed
@@ -43,14 +47,18 @@ EBUILD pciutils-2.2.0-r1.ebuild 1740 RMD160 4e7f6358227393ef1d8dbf2237bfb7df35d4
 MD5 c2f1bae899506b304ed34399f0d74c8c pciutils-2.2.0-r1.ebuild 1740
 RMD160 4e7f6358227393ef1d8dbf2237bfb7df35d45475 pciutils-2.2.0-r1.ebuild 1740
 SHA256 984927b59613bf0672e011a79bb13b979c385a66dad1f6a1946e373a3abd441d pciutils-2.2.0-r1.ebuild 1740
+EBUILD pciutils-2.2.3-r1.ebuild 1344 RMD160 0ecf0baac0b734213e89ea7ad8786575e38d523d SHA1 fb3a9608cea7ffc5636e561842d918b9d01293ad SHA256 acb629cc617ef186467f1d04402e0de3f852fdb7aa5b52d6af782899bdb6d908
+MD5 8c5c50bfc6a18fa611da5baefee2ee74 pciutils-2.2.3-r1.ebuild 1344
+RMD160 0ecf0baac0b734213e89ea7ad8786575e38d523d pciutils-2.2.3-r1.ebuild 1344
+SHA256 acb629cc617ef186467f1d04402e0de3f852fdb7aa5b52d6af782899bdb6d908 pciutils-2.2.3-r1.ebuild 1344
 EBUILD pciutils-2.2.3.ebuild 1763 RMD160 90ae55db96e8c7fa3608dd384b56cde237a8b0b2 SHA1 26806e4307b5f39a13747c8d316f490bbd18edd3 SHA256 75dc1151321b998140723c4abb726d8dde5cc43855edb2f7aba26304bc368ea6
 MD5 944b99c85d87df3c2cbd8d1f78629915 pciutils-2.2.3.ebuild 1763
 RMD160 90ae55db96e8c7fa3608dd384b56cde237a8b0b2 pciutils-2.2.3.ebuild 1763
 SHA256 75dc1151321b998140723c4abb726d8dde5cc43855edb2f7aba26304bc368ea6 pciutils-2.2.3.ebuild 1763
-MISC ChangeLog 9654 RMD160 5255cde44995ae7a6843d5243737d4ff000a19d5 SHA1 c3becb45f4312b123087de07d6dcffd84de1d235 SHA256 c7fdede0e314c8ce18968872e778a0156305d3fb901145f1d6157ffc40468292
-MD5 dc66dc9262aebee80c082fcb10f1a4df ChangeLog 9654
-RMD160 5255cde44995ae7a6843d5243737d4ff000a19d5 ChangeLog 9654
-SHA256 c7fdede0e314c8ce18968872e778a0156305d3fb901145f1d6157ffc40468292 ChangeLog 9654
+MISC ChangeLog 9918 RMD160 6c6ed06f0cbffa422f9c27fd595fb3b5136d2c9c SHA1 985f0b910d4480e5961fc549c36f1988e500f23e SHA256 3d2d174349519ca60d100bd531b537ddb10f8e679746c07a98d66724f368836f
+MD5 880dc48028cba03d62af71c3cca4eec7 ChangeLog 9918
+RMD160 6c6ed06f0cbffa422f9c27fd595fb3b5136d2c9c ChangeLog 9918
+SHA256 3d2d174349519ca60d100bd531b537ddb10f8e679746c07a98d66724f368836f ChangeLog 9918
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -64,10 +72,13 @@ SHA256 f86adc6f79d48c406a7abf2b396f8717b508a48fcec817de60253167b08e5713 files/di
 MD5 b732720cadb97dd00e0795917204fb53 files/digest-pciutils-2.2.3 488
 RMD160 4a75b00875f3a50f155f90f29857e00bd3e970d7 files/digest-pciutils-2.2.3 488
 SHA256 9245c7a384f17782114ee6bcd739fded1c8c250cec9c5ebc560960bf817ffa33 files/digest-pciutils-2.2.3 488
+MD5 b732720cadb97dd00e0795917204fb53 files/digest-pciutils-2.2.3-r1 488
+RMD160 4a75b00875f3a50f155f90f29857e00bd3e970d7 files/digest-pciutils-2.2.3-r1 488
+SHA256 9245c7a384f17782114ee6bcd739fded1c8c250cec9c5ebc560960bf817ffa33 files/digest-pciutils-2.2.3-r1 488
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmbK/amhnQswr0vIRAvWKAJ9CuEAFDpYrm/fCKgOLWN93K6YpywCeLHSV
-FMv2DIvp6VqMTYRvTtIV2Eo=
-=ilZp
+iD8DBQFEnaSTamhnQswr0vIRAukJAJ4/6VPG4Qc5beDIVcvCWWgEh1TzDQCgivkc
+ovGsiL6sJf/BXVfv1orcrTw=
+=DCj4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.3-r1 b/sys-apps/pciutils/files/digest-pciutils-2.2.3-r1
new file mode 100644
index 000000000000..5190675617ab
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.3-r1
@@ -0,0 +1,6 @@
+MD5 3b14976e7077587eec23c2d71cc5b022 pci.ids-20060608.bz2 108285
+RMD160 0768e2232a6003711de498ef8e7df805d4c880c7 pci.ids-20060608.bz2 108285
+SHA256 81418596523d437b260573d727d77130e91890f84265b58907f1175fa81224ed pci.ids-20060608.bz2 108285
+MD5 39747279aad46e7a6a3e1ea636d055b4 pciutils-2.2.3.tar.gz 1121334
+RMD160 429b3b21f4cb079c2f3620a4c4d14c6dc610a098 pciutils-2.2.3.tar.gz 1121334
+SHA256 e501df7734738d0625a3765498e1c4625a2fbaf408c86599eca2070c57bc4d4b pciutils-2.2.3.tar.gz 1121334
diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-2.2.0.patch b/sys-apps/pciutils/files/pcimodules-pciutils-2.2.0.patch
index 3b778cdeb51f..dcc25722b0f1 100644
--- a/sys-apps/pciutils/files/pcimodules-pciutils-2.2.0.patch
+++ b/sys-apps/pciutils/files/pcimodules-pciutils-2.2.0.patch
@@ -41,7 +41,7 @@
  # -c is ignored on Linux, but required on FreeBSD
  	$(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8
 -	$(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
-+	$(INSTALL) -c -m 755 -s lspci setpci pcimodules $(SBINDIR)
++	$(INSTALL) -c -m 755 lspci setpci pcimodules $(SBINDIR)
  	$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
  	$(INSTALL) -c -m 644 pci.ids $(IDSDIR)
 -	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
diff --git a/sys-apps/pciutils/files/pciutils-2.2.3-build.patch b/sys-apps/pciutils/files/pciutils-2.2.3-build.patch
new file mode 100644
index 000000000000..9a107a733a32
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.2.3-build.patch
@@ -0,0 +1,39 @@
+ - fix some build paths
+ - dont strip binaries
+ - build libpci.a with PIC (yes this sucks, but a non-stable ABI in
+    libpic.so sucks too and libpci.a is how Debian goes about it)
+
+--- Makefile
++++ Makefile
+@@ -7,10 +7,10 @@
+ VERSION=2.2.3
+ DATE=2006-05-05
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ SBINDIR=$(PREFIX)/sbin
+ SHAREDIR=$(PREFIX)/share
+-IDSDIR=$(SHAREDIR)
++IDSDIR=$(SHAREDIR)/misc
+ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+ INSTALL=install
+ DIRINSTALL=install -d
+--- lib/Makefile
++++ lib/Makefile
+@@ -51,10 +51,14 @@
+ 
+ all: $(PCILIB)
+ 
++AR ?= ar
++RANLIB ?= ranlib
++CFLAGS += -fPIC
++
+ $(PCILIB): $(OBJS)
+ 	rm -f $@
+-	ar rcs $@ $^
+-	ranlib $@
++	$(AR) rcs $@ $^
++	$(RANLIB) $@
+ 
+ access.o: access.c $(INCL)
+ i386-ports.o: i386-ports.c $(INCL) i386-io-hurd.h i386-io-linux.h i386-io-sunos.h
diff --git a/sys-apps/pciutils/pciutils-2.2.3-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..03f99f70428f
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.3-r1.ebuild,v 1.1 2006/06/24 20:40:45 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+STAMP=20060608
+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
+	mirror://gentoo/pci.ids-${STAMP}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/pcimodules-${PN}-2.2.0.patch
+
+	sed -i 's:wget -O:wget --connect-timeout=60 -O:' update-pciids.sh
+	ebegin "Updating pci.ids from the web"
+	if ! ./update-pciids.sh &> /dev/null ; then
+		# if we cant update, use a cached version
+		mv "${WORKDIR}"/pci.ids-${STAMP} "${S}"/pci.ids
+	fi
+	eend 0
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	emake OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/share/man
+	make install PREFIX="${D}"/usr || die
+
+	dolib lib/libpci.* || die "libpci failed"
+	insinto /usr/include/pci
+	doins lib/{config,header,pci,types}.h || die "headers failed"
+}