Parallel install fails, upstream bug #720053; drop old; this is only being maintained by gnome team for a long time.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 13 insertions, 73 deletions

diff --git a/media-libs/gupnp-dlna/ChangeLog b/media-libs/gupnp-dlna/ChangeLog
index 7881cb5110ca..f811f0956376 100644
--- a/media-libs/gupnp-dlna/ChangeLog
+++ b/media-libs/gupnp-dlna/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2013/11/30 19:37:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/ChangeLog,v 1.28 2013/12/08 09:40:47 pacho Exp $
+
+  08 Dec 2013; Pacho Ramos <pacho@gentoo.org> -gupnp-dlna-0.10.1.ebuild,
+  gupnp-dlna-0.10.2.ebuild, metadata.xml:
+  Parallel install fails, upstream bug #720053; drop old; this is only being
+  maintained by gnome team for a long time.
 
   30 Nov 2013; Pacho Ramos <pacho@gentoo.org> gupnp-dlna-0.10.2.ebuild:
   amd64 stable, bug #478252
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.1.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.1.ebuild
deleted file mode 100644
index 635bafa7c7ee..000000000000
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.1.ebuild,v 1.1 2013/04/14 19:10:55 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Library that provides DLNA-related functionality for MediaServers"
-HOMEPAGE="http://gupnp.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+introspection"
-
-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 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# 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
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild
index c28bf6caeaba..276fbd6546e4 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.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.2.ebuild,v 1.2 2013/11/30 19:37:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gupnp-dlna/gupnp-dlna-0.10.2.ebuild,v 1.3 2013/12/08 09:40:47 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -56,3 +56,8 @@ src_configure() {
 		--disable-static \
 		$(use_enable introspection)
 }
+
+src_install() {
+	# Parallel install fails, upstream bug #720053
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
diff --git a/media-libs/gupnp-dlna/metadata.xml b/media-libs/gupnp-dlna/metadata.xml
index 35aa2813314f..da6fd63d0085 100644
--- a/media-libs/gupnp-dlna/metadata.xml
+++ b/media-libs/gupnp-dlna/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-p2p</herd>
-	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use
-			<pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-	</use>
+<herd>gnome</herd>
 </pkgmetadata>