Fix by Kevin Pyle for parallel install failures #273489 by Peter Alfredsen.

(Portage version: 2.2_rc38/cvs/Linux x86_64)

3 files changed, 48 insertions, 2 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index ce483a4cf873..20ecc46408d0 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.165 2009/08/23 09:35:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.166 2009/08/23 09:45:38 vapier Exp $
+
+  23 Aug 2009; Mike Frysinger <vapier@gentoo.org> pciutils-3.1.4.ebuild,
+  +files/pciutils-3.1.4-install-lib.patch:
+  Fix by Kevin Pyle for parallel install failures #273489 by Peter
+  Alfredsen.
 
 *pciutils-3.1.4 (23 Aug 2009)
 
diff --git a/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch b/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch
new file mode 100644
index 000000000000..3358b01b855b
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch
@@ -0,0 +1,40 @@
+don't have the install and install-lib targets install the same files
+otherwise we can hit parallel install failures
+
+http://bugs.gentoo.org/273489
+
+patch by Kevin Pyle
+
+--- Makefile
++++ Makefile
+@@ -90,7 +90,11 @@
+ 
+ distclean: clean
+ 
+-install: all
++install-pcilib: lib/$(PCILIB)
++	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
++
++install: all install-pcilib
+ # -c is ignored on Linux, but required on FreeBSD
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
+ 	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
+@@ -99,15 +103,12 @@
+ 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
+ ifeq ($(SHARED),yes)
+-	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
+-	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
+ 	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
+ endif
+ 
+-install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC)
+-	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
++install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
++	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
+ 	$(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
+-	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
+ ifeq ($(SHARED),yes)
+ 	ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
diff --git a/sys-apps/pciutils/pciutils-3.1.4.ebuild b/sys-apps/pciutils/pciutils-3.1.4.ebuild
index f2de9bf8ba28..6ba645007a07 100644
--- a/sys-apps/pciutils/pciutils-3.1.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.4.ebuild,v 1.2 2009/08/23 09:37:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.4.ebuild,v 1.3 2009/08/23 09:45:38 vapier Exp $
 
 inherit eutils multilib
 
@@ -18,6 +18,7 @@ DEPEND="zlib? ( sys-libs/zlib )"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install-lib.patch #273489
 	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
 	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
 }