Make phodav slotted, bug #551460. Add missing glib slot for phodav-0.4.

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

4 files changed, 42 insertions, 17 deletions

diff --git a/net-libs/phodav/ChangeLog b/net-libs/phodav/ChangeLog
index aa8f251463b0..96241a194cea 100644
--- a/net-libs/phodav/ChangeLog
+++ b/net-libs/phodav/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2015/06/07 14:07:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/ChangeLog,v 1.11 2015/06/08 22:01:37 eva Exp $
+
+*phodav-2.0-r1 (08 Jun 2015)
+
+  08 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> phodav-0.4.ebuild,
+  -phodav-2.0.ebuild, +phodav-2.0-r1.ebuild:
+  Make phodav slotted, bug #551460. Add missing glib slot for phodav-0.4.
 
 *phodav-2.0 (07 Jun 2015)
 
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index b091894503d7..f33ff46a466e 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -5,14 +5,14 @@ AUX 70-spice-webdavd.rules 159 SHA256 eb5b7af994160f4283da3e2a8c19954171818c0c26
 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 1301 SHA256 17294d0a77d5911fe745c7fb252067e1c7cd387dcb2dab4fbbd24f28bf8128c7 SHA512 c7ce99945a050f41cb62176a4e6baa7b1c8925bcb5e622e6e8a70afafceb440780a49a38829040e7c85f18983ca31fb6e670f8f8e3f0530964b6e332be8621d1 WHIRLPOOL 06cd97d533b95c7cdb1e1460fb3a9413d1f37081db89a147a610bf719cabbbdbfe291db14d3b042ffb3b6cc0f0aa27bdb72690b65ae009ea834e58a298b5dc69
-EBUILD phodav-2.0.ebuild 1339 SHA256 33bdb6059b99f9b19ca709f9319cc71654855245b1053b5f5d3555dc746c48cf SHA512 01f367986a13d8319ec10199a658663f5cc2070ff796961c9faf803e40b83e538f6a5bfaf5aa88c33926bd195e47908aeae8d793ff2ebd512e745940064fdfcc WHIRLPOOL de6ee0339b472f9a1c613d4b2e24a1806621ffac43ce565e7b9ead80c3786354c505b5beb00515cbe69e32f30376a20932016fa414c9b73e5c49c934c1b4f29e
-MISC ChangeLog 1366 SHA256 6889a671179b278427d00fbc832fc90e0e167d5dca4ccdbb03b8e4244e66f9ea SHA512 d00588f4ef50b15c2b36f633588bcaaf702a41160ecb89f5034096b4f23c4c6b0ac07053b7054027a3d8ed6fe4dc55f12bb6bd46380ec5ce9da66b4163cc4257 WHIRLPOOL 62436ed442738ed905962afe09632e1ffcf6a72f4d485d86fc4eaa1480683d7265806aaef2543041b942178a6ac6430355495bd5002960fcb024da560b0c5c86
+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
 MISC metadata.xml 274 SHA256 6e84d747ddc74347d27f49c5cb8b35cec69a074f5cb4dbe1c12181801f436209 SHA512 06e99dded0d50805f3a1df21de0b33afdadd8967a5ff1ef0eea9ad6c535653962caf04a07244fb6c8d00413305cb0ecbebff8cc00461eda74292cd5b42c9198f WHIRLPOOL 121dc4dcaf5dacdba46280d83ede4584598aaba799f5fecf4003e7307a8d2527dc5b3f10fb5c09e280a39ca0410a800b28d3cde5139188bf7fcef9fde06f1c53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV0UBkACgkQCaWpQKGI+9R3KwCfV4GlnSFfeogcpEnl2ho3qWKW
-63sAn3dizkobYyOmLWauYWKkAvtaeZmK
-=bqml
+iEYEAREIAAYFAlV2EMIACgkQ1fmVwcYIWAbz6gCgr4PfyhSM21wT0zqp+AoJ7a43
+Mc8AoMRGXzlj1GB1nvYDH14zAaQA43XI
+=Dyom
 -----END PGP SIGNATURE-----
diff --git a/net-libs/phodav/phodav-0.4.ebuild b/net-libs/phodav/phodav-0.4.ebuild
index e95f95c1640c..18a25478a02e 100644
--- a/net-libs/phodav/phodav-0.4.ebuild
+++ b/net-libs/phodav/phodav-0.4.ebuild
@@ -1,6 +1,6 @@
 # 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-0.4.ebuild,v 1.9 2015/05/15 12:55:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-0.4.ebuild,v 1.10 2015/06/08 22:01:37 eva Exp $
 
 EAPI=5
 
@@ -13,11 +13,12 @@ DESCRIPTION="WebDav server implementation using libsoup"
 HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
-SLOT="0"
+SLOT="1.0"
 KEYWORDS="~alpha amd64 arm ppc ppc64 ~x86"
 IUSE="avahi spice systemd"
 
-RDEPEND="dev-libs/glib
+RDEPEND="
+	dev-libs/glib:2
 	net-libs/libsoup:2.4
 	dev-libs/libxml2
 	avahi? ( net-dns/avahi )"
diff --git a/net-libs/phodav/phodav-2.0.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
index 3ac8b7cca90f..d06ebe7769ac 100644
--- a/net-libs/phodav/phodav-2.0.ebuild
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.1 2015/06/07 14:07:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/phodav/phodav-2.0-r1.ebuild,v 1.1 2015/06/08 22:01:37 eva Exp $
 
-EAPI=5
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -12,26 +12,44 @@ DESCRIPTION="WebDav server implementation using libsoup"
 HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
-SLOT="0"
+SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="spice systemd zeroconf"
 
 RDEPEND="
 	dev-libs/glib:2
-	>=net-libs/libsoup-2.48.0:2.4
+	>=net-libs/libsoup-2.48:2.4
 	dev-libs/libxml2
 	zeroconf? ( net-dns/avahi )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.0
 	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40.0
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+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
+	mv ${PN}-overrides{,-${SLOT}}.txt || die
+	mv ${PN}-sections{,-${SLOT}}.txt || die
+	mv html/${PN}{,-${SLOT}}.devhelp2
+	cd "${S}"
+
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
+		--program-suffix=-${SLOT} \
 		$(use_with zeroconf avahi) \
 		--with-udevdir=$(get_udevdir) \
 		--with-systemdsystemunitdir=$(systemd_get_unitdir)
@@ -48,9 +66,9 @@ src_install() {
 		if ! use systemd ; then
 			newinitd "${FILESDIR}/spice-webdavd.initd" spice-webdavd
 			udev_dorules "${FILESDIR}/70-spice-webdavd.rules"
-			rm -r "${ED}$(systemd_get_unitdir)" || die
+			rm -r "${D}$(systemd_get_unitdir)" || die
 		fi
 	else
-		rm -r "${ED}"{/usr/sbin,$(get_udevdir),$(systemd_get_unitdir)} || die
+		rm -r "${D}"{/usr/sbin,$(get_udevdir),$(systemd_get_unitdir)} || die
 	fi
 }