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

(Portage version: 2.1.1_pre1-r2)

5 files changed, 102 insertions, 2 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/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"
+}