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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 36 insertions, 11 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/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
 }