Fix bug #411351 (broken parallel install with USE=utils).

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 53 insertions, 9 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 2d6dffc838ed..ad75ed223fd6 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.222 2012/02/12 18:55:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.223 2012/05/01 00:16:34 flameeyes Exp $
+
+  01 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/avahi-0.6.30-parallel.patch, avahi-0.6.30-r3.ebuild:
+  Fix bug #411351 (broken parallel install with USE=utils).
 
   12 Feb 2012; Mike Gilbert <floppym@gentoo.org> avahi-0.6.30-r3.ebuild:
   Call python_convert_shebangs() only in correct combination of USE flags. Patch
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 90e934c7f9e7..d690d553d566 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,20 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.30-automake-1.11.2.patch 3256 RMD160 35e8343c9bfb98ebdcf3c6b05e082187fb285c2e SHA1 44cf79f51a47dde3d2d2701ca3718aa5744b52a6 SHA256 bcfd79cb5c74c2ec17d7320d9302c6946282b36e306ab16261aec0de590a5423
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 RMD160 75d049bc187c08b0ad2d76921064c087d57532ed SHA1 99a0ea57a461d0c0b3d4269adc9571d1bf85f31c SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3
+AUX avahi-0.6.30-parallel.patch 1348 RMD160 02927a7c3dcd516d157fb529f5af6b8bcdcd51b6 SHA1 10febacc3093c4d9267e9aee786278a0513205a6 SHA256 76dc507af0a6035881a0d5aaadfeea7a8aa1b598253e6671d3a5346f452b52d9
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 RMD160 3b5cda1422345d0fb43842e27dd5b4579ebebd72 SHA1 06450b5cd37b0be3319328706a0329d767219bc5 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc
 DIST avahi-0.6.30.tar.gz 1243534 RMD160 99dbc4f5711fd2962ac657811bebdb63947bd2c1 SHA1 5b77443537600a00770e4c77e3c443eeb5861d06 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-0.6.30-r1.ebuild 5557 RMD160 92be96242a0cc6f8dc8dfd10efad29324e067b42 SHA1 27e2f733b58eb2bf6330fd113c7843d0d73e085c SHA256 2d0210baa3b6b35945b7bcb6f39f8d110377b354761e36f08bac2129b411f132
-EBUILD avahi-0.6.30-r3.ebuild 5869 RMD160 0eec4cde414e051c1caa2cc91daae983cdfbe843 SHA1 69ac4ba5fd4feb0c373e9b3f415859da651f1b5e SHA256 4473b4d6cea83f8e7ba7014fa08c01933703fb8849789a789009e9d441e21e8f
-MISC ChangeLog 33531 RMD160 6a6a454d26e4dc0c6b5ace89bb4200be8dfb4e6d SHA1 509cda6dcd141f5f50e9a050c1a8036aac6eed4d SHA256 f97540eac31ce394cfc5f691865eb29dd9ef86f2dafd81a97208731e9f6035a3
+EBUILD avahi-0.6.30-r3.ebuild 5921 RMD160 f402341e3b50e4bc86fbe8e06f8a77d8118f0653 SHA1 a04c59ec85800e783ea10f2c8b43352ba2b60d1b SHA256 55c2a7dc419d718535ac11c46f3f53861740d89d077680774e2c395e7bd0a051
+MISC ChangeLog 33712 RMD160 679321ef4965f63e4f51d84d56508e9715d2217c SHA1 6e840bcbe59cd8548cc2f279110ddf8af504482a SHA256 893e0c5a7ab5f5be4fef90ddf3b8109c3c35d68ab54d31bc06e39e7bdff1279f
 MISC metadata.xml 892 RMD160 9bca92d3dc0b1ca1ebb7de98fcb6c414028ce376 SHA1 4c2a8a417838011d8a8027fd097661ab262e7bbc SHA256 37689509fa8cae032b27236bf754a0060a21c79c03faa11630f606996e6062cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk84CyQACgkQC77qH+pIQ6SPXQD6AqKTz+9E3SdD0hmJsh6RiLXW
-Mi7Jx5IXnWeuPAvV1e4BAKWA96nrYN5Nj1MwAjxibgZSuKudxL9h1IFcHH/Q3nqP
-=uEEH
+iQEcBAEBAgAGBQJPnyuBAAoJEBzRPIrUMBNCE0IH/iOrL5/lk4QVBnIiwH80cEqn
+nDfQg0TLHYLIo4a4NHad8brDlwoqG6WynPYOIRswi5yQyZJGzNraRqtn/NvJnq4m
+fHXOihhvDTH2bMKRgRnWEBSm3mUm+cETQ+JZOenO3Cgf5Ry3AwuV46gJ837cEgMe
+Gu//07MfkIBEOSBZ51JJV40bG4+VADJZmeJo6UXxt+w+UYp5DxS+yINjoL3Shhm6
+NieylCP21ZaYYig4zuw26WRUdVRPGQwskRcM/TKZ+7gAfcAJJkm2E5arlWTO7SZC
+t62D41oFAiQX8CKsQmiSjk979LyE9ebZ480g241wmdYjGeNSSItjDTLEyDxgxHE=
+=NwwH
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.30-r3.ebuild b/net-dns/avahi/avahi-0.6.30-r3.ebuild
index e280ff387ccc..f7114ea41214 100644
--- a/net-dns/avahi/avahi-0.6.30-r3.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.3 2012/02/12 18:55:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r3.ebuild,v 1.4 2012/05/01 00:16:34 flameeyes Exp $
 
 EAPI="3"
 
@@ -109,6 +109,7 @@ src_prepare() {
 	>py-compile
 
 	epatch "${FILESDIR}"/${P}-automake-1.11.2.patch #397477
+	epatch "${FILESDIR}"/${P}-parallel.patch #411351
 
 	eautoreconf
 }
diff --git a/net-dns/avahi/files/avahi-0.6.30-parallel.patch b/net-dns/avahi/files/avahi-0.6.30-parallel.patch
new file mode 100644
index 000000000000..a75f99109c6c
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.30-parallel.patch
@@ -0,0 +1,34 @@
+From cb10a844f9e91322aca91340b7adc0db19c96b36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Mon, 30 Apr 2012 17:07:41 -0700
+Subject: [PATCH] build-sys: fix parallel install in avahi-utils
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The moment install-exec-local is called, we might still not have
+created ${DESTDIR}/${bindir} so we should make sure to create it
+first, and then try to chdir into it.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ avahi-utils/Makefile.am |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
+index a644b4a..1abc79a 100644
+--- a/avahi-utils/Makefile.am
++++ b/avahi-utils/Makefile.am
+@@ -54,7 +54,8 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
+ avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+ 
+ install-exec-local:
+-	cd $(DESTDIR)/$(bindir) && \
++	$(mkdir_p) $(DESTDIR)/$(bindir) && \
++		cd $(DESTDIR)/$(bindir) && \
+ 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
+ 		$(LN_S) avahi-resolve avahi-resolve-host-name && \
+ 		$(LN_S) avahi-resolve avahi-resolve-address && \
+-- 
+1.7.8.6
+