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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 19 insertions, 81 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/Manifest b/media-libs/gupnp-dlna/Manifest
index c91597b6ab0c..721a5e1a01eb 100644
--- a/media-libs/gupnp-dlna/Manifest
+++ b/media-libs/gupnp-dlna/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gupnp-dlna-0.10.1.tar.xz 310876 SHA256 c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b SHA512 2f79d353d8a6005a9998144c999425ccef873af4f094e8a550a6100a70c3faac4e49eddc26c9fd01ba5979b5a03ad8660b97d72276da1b53977f935e928f0bb9 WHIRLPOOL b2ee43567d5929909652272dea0d94883bec97b4f8d90b0e33e82343d9f045134d5e863f28f57f696f5ff7b29890eb53671d9e6cfe375f8ea141c9535c93d47f
 DIST gupnp-dlna-0.10.2.tar.xz 314088 SHA256 158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3 SHA512 b4a889e77022339a25ba532c3160e590c080a732de9fd6961d4109ab310937dec531b9a92ba6d6a7918f3b96bf70b85e068cda116d33c58bc55f015809889402 WHIRLPOOL 67d6c135429c0b30c4464907025065c3666fb7433538e13117cc5b83e42ebc04f227b4e692a5a334c3cd47e2c2d8ac4ea89791a05e72d81af835c4d47af49a51
 DIST gupnp-dlna-0.6.6.tar.xz 263936 SHA256 82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047 SHA512 6e38b5ed22ad8d23b75f2ff4b87034ff188bca0c29c7983e6ff8241c5259a4a9a68340e3ec5c87c8f5a654cbdc14177310181f183c78735b54666bfa6c34d29c WHIRLPOOL 694c1af49d61707a149bd36d8c213a71299fc04617c7fadff509d068377df79b4e6c195ac20d90dd44bd90f9a54e8c61e1d43741dac0026e87a03dbd3650423d
-EBUILD gupnp-dlna-0.10.1.ebuild 1640 SHA256 5154d0e64ac9df9cf13d99e7f4f2420a74a533e7818856b6fb3e61199bbb5f9c SHA512 c514f4ce3d02efed49af0bdef2998226e8f98e6c1dd9e20af92e043622bfc72a7f5a06098d34bd484b2e066e96e6eda37c3a82e4793718d84a737234b6aa4162 WHIRLPOOL cdda9330c8b1bd68c5f1082318c7a4147d523cf24483b6e4563c9f7e189dbdafbec597e546530d8ee2e6d714ff2fe5d401bd9b578792e5fa106ff75c58cf2d20
-EBUILD gupnp-dlna-0.10.2.ebuild 1542 SHA256 d6735f8f3b6ba6f9c5789fce114771769eb499c8bd5d8e349c0a9f4a9af9e19a SHA512 354ac209911e965180d429455d879b0ddfc6d5cf73bba8c8fe85ecdf003d2caad51d888a183b44312d024c162af40723a179a8f2b3f429737d68de807d92de12 WHIRLPOOL 707536f5b2a202b80d3223f90d95364f55bf0deb0d3b0633d97cf0245cd8e94ccf3bd09df94bfc534284a7db2d9dee1799050c94b2400bbcd1333a00824607af
+EBUILD gupnp-dlna-0.10.2.ebuild 1656 SHA256 ca6f0266d249144d04310a6144faa7330e3f7c218e16852022f423739907b4fa SHA512 3a6d17bf8074dd29634b8a467e4464a4fa7b376b283473d97dc9266df584a505eb2aff1b85445852b132ca4c108199d631c693e0648ff549c3c2be52e18178f0 WHIRLPOOL 154af72fce9e24fbeccef491481dffa39aedaec8062051697aa78152e6e7429f84f82f49d1177a0d367eebf19f2d93b9e88285bf3d946efe2cba4b558aa644e3
 EBUILD gupnp-dlna-0.6.6.ebuild 1000 SHA256 4f5969230001b35071d23bc4fd3f94be99037855fc667521a62f66e9305dbab2 SHA512 d87549ecae4d47c3c7e76c54871ceba7f42a8c07812e2d63bacd0130499cebbff869e0583e1292414c0f3f1dbea9849f78e28f015878d190ec740b411e733acc WHIRLPOOL e1dc0a4ee95545492ab58c4328933842eae3f0a37c26f27e3e1727da66aa109e31cb9aa6326b0a72405acce7da216d8d000a8c0ae8abf6016011a2168cb635c8
-MISC ChangeLog 4058 SHA256 c5b37207f8b132b57a102684aff98f41b01c00912bfab977f687752f76bb8f42 SHA512 7f4b7a233fd31f2e5027b7a3b0bf14d29ca83ce14145e3bb45976685a2bc942068fc24de6070c511d72270810e30d9cb4044e9392165939bdd18a8963b938077 WHIRLPOOL 8b0cb206d8b011bb3cc2e3d015b10a58faacb9655c7705d1084e61a498a9eaa7867b316bdd5e4e4922cd70410e4945f8e22e2237550ef92e6d306ade7014e632
-MISC metadata.xml 299 SHA256 5d73340e4c94ad040c573dc8d7de512cc797efc51a89de8d7aaead52e3b17ee0 SHA512 e8b66ab9ee35794679ea90fde928c8fb578e7bd5d1b9f2002fb865a094b4b9ce6413fee3c1f2060b4f91565df20051cb61982896e775e6325a457fe3b831cf8a WHIRLPOOL acc64a1a2a5ceafaaa064efb2db9daaa823ad337e552964574f3aa61b6dad0e47c1534c40080385d58906b2166d02f56041ed1112f9aa4613db9a738f425f321
+MISC ChangeLog 4295 SHA256 a057ae5a8a8d0523f99a3926f9285605b1646662477c47158c1f853c7b7ad269 SHA512 3043b2bc0ddcd65df8a9dd39c16bf5d385d6b86aa4cfe97498ac490d8b13710d9cc3322444ed6edeeef118a568bffe7ef21cf2b6caf5d8f88bb269faca96a921 WHIRLPOOL 479b4b088e47a2d941b3a58f670192354a816d0e31d21cdfd39cd147363c23125a33cfa8bbd10560033b9effa2f93e2d70fe0cecb3b5b5bc9a8b16d0751e0d07
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKaPooACgkQCaWpQKGI+9RXVgCfVERLuQrzHgtS3LFih4bPmwSz
-+ScAn0NCaBeqVLH6mZjyCAjY7nSJN307
-=/o/V
+iEYEAREIAAYFAlKkPqEACgkQCaWpQKGI+9SrUwCfTMFVjDpZmwgEuZbMU05Ipdod
+q0EAniEG2TYo7cqF2Dc0bH3vO+9doW0w
+=oKTQ
 -----END PGP SIGNATURE-----
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>