Fix parallel install with locales, bug #551530.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 56 insertions, 11 deletions

diff --git a/net-libs/phodav/ChangeLog b/net-libs/phodav/ChangeLog
index 96241a194cea..d5ab8da94cae 100644
--- a/net-libs/phodav/ChangeLog
+++ b/net-libs/phodav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/phodav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.11 2015/06/08 22:01:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.12 2015/06/23 11:52:00 eva Exp $
+
+  23 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> phodav-2.0-r1.ebuild,
+  +files/phodav-2.0-slot.patch:
+  Fix parallel install with locales, bug #551530.
 
 *phodav-2.0-r1 (08 Jun 2015)
 
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index f33ff46a466e..2f904fdd9f43 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA256
 
 AUX 70-spice-webdavd.rules 159 SHA256 eb5b7af994160f4283da3e2a8c19954171818c0c26240a8f56d52f8e90a3aa22 SHA512 f9a427f0d4f4db4aa3e0c7a4f77281b405ebde3e932bf591f018f39f6094fa47f16649534b2dc45434433367f60b98d58e32e49c5b03ba1333015319de5644cc WHIRLPOOL d03a9a703a42eccecfafd064c79ea048afcad3d6a578fefb444c35b8be57b23e9304ebaf22ba44c4e56b5500d13ebd3246cc8e5a4506e8f30caf32aa000a8d23
+AUX phodav-2.0-slot.patch 1182 SHA256 a3eae464ffadc895cfdcd499e0194268847916a6743e25fd9a8e8b3964941ad9 SHA512 a0d86a8dbdf9e1a66908f88bc9a1b7d7a03f4e2e536a3306ad561a786fcb0f3fa88bb3c02578746c486c329717019de51c1401a04906200352093adfd2665382 WHIRLPOOL 9a630f19e8541bbcc4002dcbb39735bfdcd8f0932337436b531fc8bc41d6cc32ef24a17b7b2fc237ba92bc8679970f4b6912f4e036a1fc803db0099dc1d545ef
 AUX spice-webdavd.initd 461 SHA256 b5c5ed8e9c38a77542062328608c091faf04e81ffb9ba37a0e3b68e97d71cb84 SHA512 9c38481ea8d59c4abee273080e7c48804c1453669804de008a98324c47e21253cbedf7b78e734afd12f4769fe3b451972f44d1dfd53012e2af02605a7fb2b916 WHIRLPOOL bbabf3162a0a8d73d1f682849bbaab7ff448fddcf8906dcf864a4a158433259e3d70fe878b9fa7309104f8918a696f0143c1c10c3815a6cc68f5008fdcbacc57
 DIST phodav-0.4.tar.xz 272476 SHA256 5d14bfd4d733f680fca6875586308879b78a3c4892bd95a2d8dc4aabd24614b6 SHA512 f6d624fb3df945e1b5fad1d31e849949a8c784a9f48adcf35b4714605a7f181c53b878bce307f8ca868d9a66425adddb0341db21294f7f25777b62dca7a1c662 WHIRLPOOL 767b3888f870e3e4739c9432cb162cb2e595ac4ac2582abc3174b4220455adbbfdeed8f70f39477ca3557c1f93af6bb8c03d62277fca7ffe6a14d0a83ae8f1d3
 DIST phodav-2.0.tar.xz 277672 SHA256 53b42faf2d6edfb0072dbbbe9b8360d8603cca2cacd142df8d1781b9ba0cb9ed SHA512 4da0f3ef7ce2ffd89e43569ad00456f9580f4005a6830a8cc36a7787cc9e06d285326376373a0d690a1868b1c10da0f3ba49b4eb8dcff3042f5c64cbe1fe0aba WHIRLPOOL 5d1ba19f502a72a86e7dbf47ca43cd5d711241fcdb936364c98de88df57cb49db88cdd0768c133bb936c40be98107f06d8b6d8f8cb1b51d2a05e33b83d36f8a4
 EBUILD phodav-0.4.ebuild 1306 SHA256 6e2b748aca865d2a0efb74adb38bbfc89194f52e961f0bf54f3125deafcdc34d SHA512 c19ad9af292a2da0518d4cf595de4ff4b2fd51d5ec43d6666da799571c18645f184ac21baab3410ad46aceb9fa0453cb9da3829938196500fb69d6cd436a6065 WHIRLPOOL 294b48313803b9d2e8e4fbe35609534dc4eb432929e3fd5f3fc48ba15051e088a1cec37490ac61e3f1114572a159ad796d2465bb6c3ee8146dd0456696504829
-EBUILD phodav-2.0-r1.ebuild 1875 SHA256 611f21b36f8b6149ff599355e16f3205024d0898f967de158c5091763fa34bb6 SHA512 5f64348ae4c059025eb32bad958ac6c2de052fc9d1c80bc2070961cde90f8c2f314916521928cd147faa48be04391df5f1ef54302f6a57968254a206a224d079 WHIRLPOOL e70c4b755e5414c5360ec4fc49822c8ecc6baa75c040c6bb71202266d1ec862e0fa993defc2cb9e32c6b5c4d38f37ef4d454b93fa082dc93314db5822dfc523e
-MISC ChangeLog 1587 SHA256 20c2fae6fd4f799b9e5b0cfad95b696f16a8a62e7b257632b83e194de0ec8e9b SHA512 5e379c9ef24f7ef7e40f4402aabbcbaf73e9adc6046fa2cd1727d5100d427aa72e1bc212f8136d81fe8192a7aa390b707ece85b6b231e5d38caf983ff5dbbc54 WHIRLPOOL 04036ae16b3bdef20be15e0e49af59b81639388cb793fed3d88694e9c004144bc4431ec7102b4275d7408a5032f8149d9d00b86c797583ec719caed6dd7064c5
+EBUILD phodav-2.0-r1.ebuild 1824 SHA256 5d1716238b4d62a15ccc22a55e940874271f6c5515f487305cbb950904dc8e90 SHA512 50cacb43d2f87e552cda0f7b240d41cde5b8902ec3efcfd975b328f5a51e8a1619745cebf2b1df79ff2fb25228dbbda6cf860c4591a26d4cfc687ec676a05a4e WHIRLPOOL 86320b976e81f9310809c50c5847348d152d3a3c2d8c4f883da67ed511d70aabc23a47b9462571e8262e0a232e75aff3794ab6d9c573c1160e3b2d5a15149c47
+MISC ChangeLog 1746 SHA256 e1752197f1a40894c46a90c822216bfbe282c01c2929e40ab820ee57c7543b2b SHA512 bdf21af70f6294ed945545a4973958dace6f7fb151704ec97a3eee25a6e839a8556dc50fe5047e313942d464913cda49b74569fac9880f39d3f06b8d4c141d3a WHIRLPOOL fd80193fd92af00f52c3850b2c6e712d227796fd0e779157818f7cfc4c41e049c36a2324e82c16d7f43ba7b49d77511180775d01b58f3d0f6d78cfb03c1b8b1b
 MISC metadata.xml 274 SHA256 6e84d747ddc74347d27f49c5cb8b35cec69a074f5cb4dbe1c12181801f436209 SHA512 06e99dded0d50805f3a1df21de0b33afdadd8967a5ff1ef0eea9ad6c535653962caf04a07244fb6c8d00413305cb0ecbebff8cc00461eda74292cd5b42c9198f WHIRLPOOL 121dc4dcaf5dacdba46280d83ede4584598aaba799f5fecf4003e7307a8d2527dc5b3f10fb5c09e280a39ca0410a800b28d3cde5139188bf7fcef9fde06f1c53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV2EMIACgkQ1fmVwcYIWAbz6gCgr4PfyhSM21wT0zqp+AoJ7a43
-Mc8AoMRGXzlj1GB1nvYDH14zAaQA43XI
-=Dyom
+iEYEAREIAAYFAlWJSGEACgkQ1fmVwcYIWAYSMgCgvmyxq6n30CUpmB0prPsFnd8D
+XKQAoLH4vVCPiGzViBd7d701HDf+O6Hd
+=EiJ4
 -----END PGP SIGNATURE-----
diff --git a/net-libs/phodav/files/phodav-2.0-slot.patch b/net-libs/phodav/files/phodav-2.0-slot.patch
new file mode 100644
index 000000000000..afbefe55c3c6
--- /dev/null
+++ b/net-libs/phodav/files/phodav-2.0-slot.patch
@@ -0,0 +1,39 @@
+From 65b410ddd9b6a797eb54c865e6365365604bc847 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
+Date: Tue, 24 Feb 2015 22:41:39 +0100
+Subject: [PATCH] Add version prefix to gettext and doc directories
+
+---
+ configure.ac              | 2 +-
+ doc/reference/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fe907e..d87524e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,7 @@ gl_WARN_ADD([-Wno-sign-compare])
+ gl_WARN_ADD([-Wno-unused-parameter])
+ gl_WARN_ADD([-Wno-missing-field-initializers])
+ 
+-GETTEXT_PACKAGE=phodav
++GETTEXT_PACKAGE=phodav-2.0
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
+ AC_SUBST(GETTEXT_PACKAGE)
+ IT_PROG_INTLTOOL([0.40.0])
+diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
+index dfad455..c89ab35 100644
+--- a/doc/reference/Makefile.am
++++ b/doc/reference/Makefile.am
+@@ -1,7 +1,7 @@
+ NULL =
+ AUTOMAKE_OPTIONS = 1.6
+ 
+-DOC_MODULE = phodav
++DOC_MODULE = phodav-2.0
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+ DOC_SOURCE_DIR = $(top_srcdir)/libphodav
+ 
+-- 
+2.4.3
+
diff --git a/net-libs/phodav/phodav-2.0-r1.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
index d06ebe7769ac..dd51d97eefea 100644
--- a/net-libs/phodav/phodav-2.0-r1.ebuild
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.1 2015/06/08 22:01:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.2 2015/06/23 11:52:00 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 systemd udev
+inherit autotools gnome2 systemd udev
 
 DESCRIPTION="WebDav server implementation using libsoup"
 HOMEPAGE="https://wiki.gnome.org/phodav"
@@ -32,9 +32,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Make doc parallel installable
 	cd "${S}"/doc/reference
-	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
-		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
-		-i Makefile.am Makefile.in || die
 	sed -e "s/\(<book.*name=\"\)${PN}/\1${PN}-${SLOT}/" \
 		-i html/${PN}.devhelp2 || die
 	mv ${PN}-docs{,-${SLOT}}.sgml || die
@@ -43,6 +40,10 @@ src_prepare() {
 	mv html/${PN}{,-${SLOT}}.devhelp2
 	cd "${S}"
 
+	# Fix locale slottability, from master
+	epatch "${FILESDIR}"/${P}-slot.patch
+	eautoreconf
+
 	gnome2_src_prepare
 }