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

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 54 insertions, 7 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/Manifest b/sys-apps/pciutils/Manifest
index 11443125fcaa..e7bd9087981f 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -12,6 +12,7 @@ AUX pciutils-3.0.0-build.patch 340 RMD160 b734b9bc3148f68e479fe763c182cd294ba168
 AUX pciutils-3.0.0-locale-happiness.patch 1199 RMD160 3b1bb4df333de85929748d4290ccb46923f82c81 SHA1 10b018ca036cd48528d48510b78b6d42eb8ac1cd SHA256 5e56f412bd51647cf43fa860d48a7de8d01c8185ac04940f29099194f82fccaa
 AUX pciutils-3.0.0-resolv.patch 1163 RMD160 5cfe106380413349a514db75dda37d3163404d7b SHA1 c51a69794c252ea63083a40363dbb38e84fcfbaa SHA256 1756e747cfe0801e4189e69f516115fba207564d5ff7bc0e697fac1a0aa7b242
 AUX pciutils-3.1.0-null-ptr.patch 666 RMD160 0a7c227245dda3bac4c38e30d7d5d748b6705a34 SHA1 456f68df91755e6c3d15728e965d34284ef71da6 SHA256 05beaebdcf50b75e212ec002621844e5650af32d660556d462e348370b62a98d
+AUX pciutils-3.1.4-install-lib.patch 1548 RMD160 42d82a6b4616577f60039236f60355672d6ba540 SHA1 846e763c4cf001ff10d2cbfb429ddd3a4d74a85c SHA256 ce1f27cf8d76f441e976e2379ac587553a8a790a5ea7d7f451d74d17e041357d
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
 DIST pciutils-3.0.0.tar.gz 244756 RMD160 e0ac0d4f4da0732a159520d8ca4fdea547d97230 SHA1 75436a6b88604bdd288492c4076d39edd2321b92 SHA256 df1a63315bbea8f81591fdeaed2005606eb9f675ab1f9839bea5fba02855a773
 DIST pciutils-3.0.2.tar.gz 270474 RMD160 bab0a8261267dd7be50c29984c1d813174c4a0f7 SHA1 4591785f6f70ed44e593933bb34012d83b4c3853 SHA256 ab11bd88c7e20b2bc4801df044086be69b6d728dc88cf6e73db47cdd02c46584
@@ -22,13 +23,13 @@ EBUILD pciutils-3.0.0.ebuild 1841 RMD160 0eaa5e8714ad27985809d046a44be29a3e950f6
 EBUILD pciutils-3.0.2.ebuild 1968 RMD160 02278fab3eb538911d73dcea17b87c7166256974 SHA1 39df603513905b705955cc89be1e603d1bd2476e SHA256 d07cca4805e7bd7bd2e146bf30270edf0201eeb7ef08d75e69f2e43ae41835a0
 EBUILD pciutils-3.1.0-r1.ebuild 2020 RMD160 bb1c4abc662ccfb97ea3c8f15de81f5bedf0b085 SHA1 750304d3905c1a2d019d2715d64b6f17edf72e56 SHA256 e6e0898b7bde3a9259155c0ac1722ec08c1bdf63a8aff530792678689c768fd0
 EBUILD pciutils-3.1.2.ebuild 1864 RMD160 de00ee3a1ec89d4be9398fd7e22d6162ad6e6f8b SHA1 3f9910b832413a506173617bdca6b813dababe49 SHA256 20bc559f2354967740bdc5a75ba9cb6c3614bd133662e575ab54a969f1529705
-EBUILD pciutils-3.1.4.ebuild 1772 RMD160 528c6ee59570a890f6fa24d93d24a0e392641e89 SHA1 e30ff03380a72c5610acfef800a3efc2fc5cf5ac SHA256 00d3614847935e078761ae112f7f742383607f2c30e51d274d993124bbd16b33
-MISC ChangeLog 21885 RMD160 48775cf075e6e32dc6d859949a1e5e004a476a6b SHA1 94a4a6fed9f60adabf7ae1dc3a11a450fcd7071b SHA256 1b22547c8751861728217d37106af444647a5b5667de2ab93f60cf2901a90d43
+EBUILD pciutils-3.1.4.ebuild 1825 RMD160 2cd419eb2ce3e1ac63f97e3338dce9e893bafb0c SHA1 171341beeeb6541189a1649c17186580818faf9e SHA256 cab3d4232fe65a57ee7957061b1bd1a5290020ef671e103c26edaa0fa87a92e0
+MISC ChangeLog 22082 RMD160 e6dda63e0677e0cac7f48cb7e2615c103c6ca478 SHA1 dc2fe73cc614c09dafc80af16e4ebd7700bbea97 SHA256 bfc1ab1bcdf6225a1fa3733e7623282094ecd0dbcbe851883c0d6bdd46a53f46
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqRDeIACgkQlPl3HsVfCDo3ZQCfdcx5x3dz2n3MGVLrfMSvE7BL
-/3wAoIVMIHaFRcJJerxYC91ZB8JrzeZp
-=6PGN
+iEYEARECAAYFAkqRD9MACgkQlPl3HsVfCDo51gCfQXJW1P5MoeY+En3S7vuyA7Oz
+MBUAn30rh3GHzdcMRrw7fLBXktClgcbi
+=wQta
 -----END PGP SIGNATURE-----
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
 }