Fix for parallel install jobs, see bug #228937

Package-Manager: portage-2.1.4.4

4 files changed, 41 insertions, 15 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 926b6b86933c..63ab28384301 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.147 2008/08/06 19:31:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.148 2008/08/12 20:11:13 phosphan Exp $
+
+  12 Aug 2008; Patrick Kursawe <phosphan@gentoo.org>
+  +files/parallel-install-1.0.19.patch, sane-backends-1.0.19-r2.ebuild:
+  Fix for parallel install jobs, see bug #228937
 
   06 Aug 2008; Markus Meier <maekke@gentoo.org>
   sane-backends-1.0.19-r1.ebuild:
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 6f02c4ff1a43..13aa9aecafd4 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
 AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e SHA1 daa5e62c01370c788a25448472fc9d5b55abaf9f SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203
 AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
+AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
 AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
 AUX udev-rule-5.patch 1462 RMD160 116e50bff2d00238946595136de535bdd0a747ff SHA1 cdbb5db3fe6c8e5660d86be7391e345ea242ba43 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d
 DIST sane-1.0.16-brother-driver.diff.bz2 8224 RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f SHA1 2f0cf77d8bbb98b9bb6cc1f56a86f662fa9bda48 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
@@ -15,13 +13,6 @@ DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441
 EBUILD sane-backends-1.0.17.ebuild 3715 RMD160 ce9a3f8f62466f8bb6f540ae0bab66b5adebaf9c SHA1 4897bf1ed36264466820b64fce2e752be71f9c5d SHA256 dd6e223773d9076b89510b87936ade27f74ea2b577e38bce1909073cbaba80d2
 EBUILD sane-backends-1.0.18-r6.ebuild 4246 RMD160 4e823524e867fc1bf701a7905272dcc5d95587b9 SHA1 0f02468ddd8e4d215b35b6cce8ead36e5f41cdec SHA256 92ca0cc05ce40e781329f710cd91f1ded94b544e4b217f837269d7929ba55041
 EBUILD sane-backends-1.0.19-r1.ebuild 4343 RMD160 7f06420141da9faec29a5df6936b6da9732661c9 SHA1 4e1245a4aa749e29c7785f3d9d59bf9e909c5722 SHA256 42e29cf86547e9d4b77389ddb6efe4c1b1ca78ceae943c147aee4d0dd7829558
-EBUILD sane-backends-1.0.19-r2.ebuild 4399 RMD160 826e0f1c8ba6b4546540333eddc0b5a01357f330 SHA1 36225d405beed1e3a9ea8a5b8d4ca13b7a1bd876 SHA256 b63193d89901e723a4c80d34d36a03949799720334db4c6103ce1fffbe8c6e14
-MISC ChangeLog 24848 RMD160 4135fa994d2df7ace8c2587d84275ed8a841a08e SHA1 38340fbf3a1ccda74d2a81c639062fe152ad6198 SHA256 91692ad0d068b571788ecfbe221d1b9b8d4b6786dbf65f3e8017175bfac0e4fa
+EBUILD sane-backends-1.0.19-r2.ebuild 4448 RMD160 8b4cfc2aa1d79d3dda953cf868f200a3096b8dfa SHA1 8d1e2f6709cc98457c114fc4c1fee2776651e246 SHA256 1a882fed767c270e3ff26afdcad8cecc0d7c3450b5f3d48c74e4d3a3239f3c97
+MISC ChangeLog 25025 RMD160 ddd7adaaa40fb8dffa49b425d1efb7789b765fe3 SHA1 8e08c78de5ec4cbb0251d86a6374ce59de378ec7 SHA256 340660f425ee9c5e22f677120e8c56feeebe31931c0e11beff65f987f7200da5
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiZ/FAACgkQkKaRLQcq0GLN1ACeKscWJG3aA999hP2zR8r1m81M
-AtUAn0ek3N3xLlctUlVRbInMMlPC9RWW
-=NtE5
------END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/files/parallel-install-1.0.19.patch b/media-gfx/sane-backends/files/parallel-install-1.0.19.patch
new file mode 100644
index 000000000000..bc26ef53a389
--- /dev/null
+++ b/media-gfx/sane-backends/files/parallel-install-1.0.19.patch
@@ -0,0 +1,30 @@
+--- backend/Makefile.in	2008-08-12 21:50:12.000000000 +0200
++++ backend/Makefile.in.new	2008-08-12 21:58:24.000000000 +0200
+@@ -234,8 +234,10 @@
+ 
+ install: $(INSTALL_LOCKPATH) install-be@BE_INSTALL_FLAVOR@ install-libsane install-becfg
+ 
+-install-be:
++install-paths:
+ 	$(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(libsanedir) $(DESTDIR)$(configdir)
++
++install-be: install-paths
+ 	@# Install all backends in $(prefix)/lib/sane/
+ 	@list="$(LIBS)"; for be in $$list; do \
+ 	  echo installing $${be} in $(DESTDIR)$(libsanedir)/$${be}...; \
+@@ -267,13 +269,13 @@
+ 	  cp -p .libs/libsane-$${be}.so $(DESTDIR)$(BEOS_ADDONDIR)/$${be} || exit 1; \
+ 	done
+ 
+-install-libsane:
++install-libsane: install-paths
+ 	@echo installing libsane.la in $(DESTDIR)$(libdir)/libsane.la...
+ 	@$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la \
+           $(DESTDIR)$(libdir)/libsane.la >/dev/null
+ 	@$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libdir)
+ 
+-install-becfg:
++install-becfg: install-paths
+ 	@list="$(CONFIGS)"; for cfg in $$list; do \
+ 	  if test ! -r $${cfg}; then continue; fi; \
+ 	  if test -f $(DESTDIR)$(configdir)/$${cfg}; then \
diff --git a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
index ff5a78cda482..6a1b4b8ca980 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild,v 1.1 2008/08/01 15:18:23 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.19-r2.ebuild,v 1.2 2008/08/12 20:11:13 phosphan Exp $
 
 inherit eutils
 
@@ -100,7 +100,8 @@ src_unpack() {
 	fi
 	epatch "${FILESDIR}"/udev-rule-5.patch
 	epatch "${FILESDIR}"/fujitsu_DBG_LEVEL.patch
-	epatch "${FILESDIR}"/epson2fixes-"${PV}".patch
+	epatch "${FILESDIR}/epson2fixes-${PV}".patch
+	epatch "${FILESDIR}/parallel-install-${PV}".patch
 	cat >> backend/dll.conf.in <<-EOF
 	# Add support for the HP-specific backend.  Needs net-print/hplip installed.
 	hpaio