Clean up old revisions. Assign proper slot to ebuilds.

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

5 files changed, 45 insertions, 78 deletions

diff --git a/media-libs/gupnp-dlna/ChangeLog b/media-libs/gupnp-dlna/ChangeLog
index a1f78fad1447..611310b82701 100644
--- a/media-libs/gupnp-dlna/ChangeLog
+++ b/media-libs/gupnp-dlna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gupnp-dlna
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/ChangeLog,v 1.23 2013/03/28 17:42:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/ChangeLog,v 1.24 2013/03/30 22:44:35 eva Exp $
+
+  30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -gupnp-dlna-0.6.2.ebuild,
+  -gupnp-dlna-0.6.4.ebuild, gupnp-dlna-0.6.6.ebuild, gupnp-dlna-0.10.0.ebuild:
+  Clean up old revisions. Assign proper slot to ebuilds.
 
 *gupnp-dlna-0.10.0 (28 Mar 2013)
 
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.0.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.0.ebuild
index 0054a799c372..4dacd8146fd6 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.0.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.10.0.ebuild,v 1.1 2013/03/28 17:42:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.10.0.ebuild,v 1.2 2013/03/30 22:44:35 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,28 +14,49 @@ DESCRIPTION="Library that provides DLNA-related functionality for MediaServers"
 HOMEPAGE="http://gupnp.org/"
 
 LICENSE="LGPL-2"
-SLOT="0/3"
+SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
-RDEPEND=">=dev-libs/glib-2.32:2
+RDEPEND="
+	>=dev-libs/glib-2.34:2
 	>=dev-libs/libxml2-2.5:2
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
-	$(vala_depend)"
+	introspection? ( $(vala_depend) )
+"
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	# Make doc parallel installable
+	cd "${S}"/doc/gupnp-dlna
+	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 ${PN}{,-${SLOT}}.types || die
+	mv html/${PN}{,-${SLOT}}.devhelp2
 
+	cd "${S}"
+	if use introspection ; then
+		vala_src_prepare --ignore-use
+	fi
 	gnome2_src_prepare
-	vala_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
 }
 
 src_install() {
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.6.2.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.6.2.ebuild
deleted file mode 100644
index 17c033d30d5f..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.6.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.6.2.ebuild,v 1.3 2012/05/05 08:02:43 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library that provides DLNA-related functionality for MediaServers"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=dev-libs/libxml2-2.5:2
-	>=media-libs/gstreamer-0.10.32:0.10
-	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.6.4.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.6.4.ebuild
deleted file mode 100644
index c5c53de04572..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.6.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.6.4.ebuild,v 1.4 2012/05/05 08:02:43 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Library that provides DLNA-related functionality for MediaServers"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=dev-libs/libxml2-2.5:2
-	>=media-libs/gstreamer-0.10.32:0.10
-	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild
index c7ce84e49c66..5f223976498c 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild,v 1.9 2013/03/25 16:33:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild,v 1.10 2013/03/30 22:44:35 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ DESCRIPTION="Library that provides DLNA-related functionality for MediaServers"
 HOMEPAGE="http://gupnp.org/"
 
 LICENSE="LGPL-2"
-SLOT="0"
+SLOT="1.0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc +introspection"
 
@@ -30,3 +30,9 @@ pkg_setup() {
 		$(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
+
+src_compile() {
+	# gst-plugin-scanner tries to open dri
+	unset DISPLAY
+	gnome2_src_compile
+}