Build and install a shared library instead of just forcing -fPIC on the static lib.

Package-Manager: portage-2.0.53_rc5

5 files changed, 104 insertions, 5 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 98f362f95109..08dded6aef3b 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.60 2005/10/16 03:17:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.61 2005/10/16 11:38:05 vapier Exp $
+
+*pciutils-2.2.0-r1 (16 Oct 2005)
+
+  16 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-2.2.0-shared-lib.patch, +pciutils-2.2.0-r1.ebuild:
+  Build and install a shared library instead of just forcing -fPIC on the
+  static lib.
 
 *pciutils-2.2.0 (16 Oct 2005)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 3b9ac9f6940f..ae4c1d555177 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b406d0fc5cae0476ec8ed088570206f0 ChangeLog 7977
+MD5 a31dae35d026223b1e9be027250ac6a3 ChangeLog 8219
 MD5 60d79fbf53038186b939f83841d5f318 files/2.1.11-scan.patch 277
 MD5 a6be9cf60dc5043160d757c9772b1e57 files/digest-pciutils-2.1.11-r5 131
 MD5 ae29f04095b43ceb06e6b0cc94653c36 files/digest-pciutils-2.2.0 130
+MD5 ae29f04095b43ceb06e6b0cc94653c36 files/digest-pciutils-2.2.0-r1 130
 MD5 c6135ce795940ebf3777592d4e6f8049 files/pcimodules-pciutils-2.1.11.diff 11026
 MD5 d3c7e97420324c1d5d1dc032fc39006e files/pcimodules-pciutils-2.2.0.patch 10872
 MD5 f8bc3cef20829127ecab494b6b9c886c files/pciutils-2.1.11-bsd.patch 1105
 MD5 6a0ae94d528195517f54f66653f8322e files/pciutils-2.1.11-gentoo-paths.patch 521
 MD5 f4d220c568a00c1ceafe6dc129ae6e95 files/pciutils-2.1.11-sysfs.patch 10374
+MD5 cf455fe33057e081ba7aaec93e481642 files/pciutils-2.2.0-shared-lib.patch 496
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 01f6c089b82c2df80e255f7fe06fc9c2 pciutils-2.1.11-r5.ebuild 2184
+MD5 d5fb12cf7e12de720f8ec09efe0320a3 pciutils-2.2.0-r1.ebuild 1549
 MD5 4f090aa4aae459880f1201a33a95b3ab pciutils-2.2.0.ebuild 1562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUcbJgIKl8Uu19MoRAtuhAJ0WyrJ31yoCqRKhbzAVN3Cnd3pHpACdG9AW
-3LG0JqZ0DuYN983/+fbWOwI=
-=ZjQD
+iD8DBQFDUjwvgIKl8Uu19MoRAthGAJsFBKZktR9BI9FX9xUZIqaxrL4vJQCffjzs
+FB33WsgrX+kRlpPQFewAC1E=
+=58dy
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.2.0-r1 b/sys-apps/pciutils/files/digest-pciutils-2.2.0-r1
new file mode 100644
index 000000000000..f8f1bd12d8e2
--- /dev/null
+++ b/sys-apps/pciutils/files/digest-pciutils-2.2.0-r1
@@ -0,0 +1,2 @@
+MD5 4b8d2ee3ad78e4d0343a74a9b0fb84a8 pci.ids-20051015.bz2 98776
+MD5 303fc4bb9669549acf65e4a714527c7e pciutils-2.2.0.tar.gz 194290
diff --git a/sys-apps/pciutils/files/pciutils-2.2.0-shared-lib.patch b/sys-apps/pciutils/files/pciutils-2.2.0-shared-lib.patch
new file mode 100644
index 000000000000..d146b536f999
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-2.2.0-shared-lib.patch
@@ -0,0 +1,27 @@
+--- pciutils/lib/Makefile
++++ pciutils/lib/Makefile
+@@ -7,6 +7,7 @@
+ INCL=internal.h pci.h config.h header.h sysdep.h types.h
+ 
+ PCILIB=libpci.a
++PCISHLIB=libpci.so
+ 
+ ifdef PCI_HAVE_PM_LINUX_SYSFS
+ OBJS += sysfs.o
+@@ -45,7 +46,15 @@
+ PCILIB=libpciutils.a
+ endif
+ 
+-all: $(PCILIB)
++all: $(PCILIB) $(PCISHLIB)
++
++SHOBJS = $(OBJS:.o=.lo)
++
++%.lo: %.c
++	$(CC) $(CFLAGS) -fPIC -c -o $@ $^
++
++$(PCISHLIB): $(SHOBJS)
++	$(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ $^ -fPIC
+ 
+ $(PCILIB): $(OBJS)
+ 	rm -f $@
diff --git a/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild b/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..7db00d25b6e2
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.2.0-r1.ebuild,v 1.1 2005/10/16 11:38:05 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+STAMP=20051015
+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"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/pcimodules-${P}.patch
+	epatch "${FILESDIR}"/${P}-shared-lib.patch
+
+	# Set Gentoo paths
+	sed -i \
+		-e '/^PREFIX=/s:=.*:=/usr:' \
+		-e '/^IDSDIR=/s:=.*:=$(PREFIX)/share/misc:' \
+		Makefile || die
+
+	# Make sure we respect $AR / $RANLIB
+	sed -i \
+		-e '/ar rcs/s:ar:$(AR):' \
+		-e 's:ranlib:$(RANLIB):' \
+		lib/Makefile \
+		|| die "sed lib/Makefile failed"
+
+	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"
+}