Version bump. Remove old.

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

4 files changed, 24 insertions, 128 deletions

diff --git a/net-misc/rygel/ChangeLog b/net-misc/rygel/ChangeLog
index ad0db882b8e9..c759a65bbb5c 100644
--- a/net-misc/rygel/ChangeLog
+++ b/net-misc/rygel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rygel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/ChangeLog,v 1.20 2012/03/25 09:04:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/ChangeLog,v 1.21 2012/04/07 11:15:44 eva Exp $
+
+*rygel-0.14.0 (07 Apr 2012)
+
+  07 Apr 2012; Gilles Dartiguelongue <eva@gentoo.org> -rygel-0.10.4.ebuild,
+  -rygel-0.12.4.ebuild, -rygel-0.12.5.ebuild, +rygel-0.14.0.ebuild:
+  Version bump. Remove old.
 
   25 Mar 2012; Pacho Ramos <pacho@gentoo.org> rygel-0.12.7.ebuild:
   Add missing RDEPEND on x11-misc/shared-mime-info, bug #409481 by Stefan
diff --git a/net-misc/rygel/rygel-0.10.4.ebuild b/net-misc/rygel/rygel-0.10.4.ebuild
deleted file mode 100644
index a72c74816111..000000000000
--- a/net-misc/rygel/rygel-0.10.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.10.4.ebuild,v 1.3 2011/09/15 21:26:58 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="http://live.gnome.org/Rygel"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X nls +sqlite tracker transcode"
-
-# The deps for tracker? and transcode? are just the earliest available
-# version at the time of writing this ebuild
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libgee-0.5.2:0
-	>=media-libs/gupnp-dlna-0.5
-	>=media-libs/gstreamer-0.10.28
-	>=media-libs/gst-plugins-base-0.10.28
-	>=net-libs/gssdp-0.9.2
-	<net-libs/gssdp-0.10.9999
-	>=net-libs/gupnp-0.13.4
-	>=net-libs/gupnp-av-0.7
-	>=net-libs/libsoup-2.26:2.4
-	>=sys-libs/e2fsprogs-libs-1.41.3
-	sqlite? ( >=dev-db/sqlite-3.5:3 )
-	tracker? ( >=app-misc/tracker-0.8.17 )
-	transcode? (
-		>=media-libs/gst-plugins-bad-0.10.14
-		>=media-plugins/gst-plugins-twolame-0.10.12
-		>=media-plugins/gst-plugins-ffmpeg-0.10.5
-	)
-	X? ( >=x11-libs/gtk+-2.90.3:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-"
-# Maintainer only
-#	>=dev-lang/vala-0.11.6
-#	>=net-libs/gupnp-vala-0.7.5
-#   dev-libs/libxslt
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-gst-launch-plugin
-		$(use_enable nls)
-		$(use_enable sqlite media-export-plugin)
-		$(use_enable tracker tracker-plugin)
-		$(use_with X ui)"
-}
diff --git a/net-misc/rygel/rygel-0.12.5.ebuild b/net-misc/rygel/rygel-0.12.5.ebuild
deleted file mode 100644
index 17f26b9ebf4b..000000000000
--- a/net-misc/rygel/rygel-0.12.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.12.5.ebuild,v 1.1 2011/11/08 21:06:10 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="http://live.gnome.org/Rygel"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X nls +sqlite tracker transcode"
-
-# The deps for tracker? and transcode? are just the earliest available
-# version at the time of writing this ebuild
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libgee-0.5.2:0
-	>=media-libs/gupnp-dlna-0.5
-	>=media-libs/gstreamer-0.10.28
-	>=media-libs/gst-plugins-base-0.10.28
-	>=net-libs/gssdp-0.11
-	>=net-libs/gupnp-0.17.1
-	>=net-libs/gupnp-av-0.9
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/e2fsprogs-libs-1.41.3
-	sqlite? ( >=dev-db/sqlite-3.5:3 )
-	tracker? ( >=app-misc/tracker-0.8.17 )
-	transcode? (
-		>=media-libs/gst-plugins-bad-0.10.14
-		>=media-plugins/gst-plugins-twolame-0.10.12
-		>=media-plugins/gst-plugins-ffmpeg-0.10.5
-	)
-	X? ( >=x11-libs/gtk+-2.90.3:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-"
-# Maintainer only
-#	>=dev-lang/vala-0.11.6
-#	>=net-libs/gupnp-vala-0.9
-#   dev-libs/libxslt
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-gst-launch-plugin
-		--enable-mediathek-plugin
-		$(use_enable nls)
-		$(use_enable sqlite media-export-plugin)
-		$(use_enable tracker tracker-plugin)
-		$(use_with X ui)"
-}
diff --git a/net-misc/rygel/rygel-0.12.4.ebuild b/net-misc/rygel/rygel-0.14.0.ebuild
index 926225492c1c..9b936a490c69 100644
--- a/net-misc/rygel/rygel-0.12.4.ebuild
+++ b/net-misc/rygel/rygel-0.14.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.12.4.ebuild,v 1.1 2011/10/16 13:59:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rygel/rygel-0.14.0.ebuild,v 1.1 2012/04/07 11:15:44 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Rygel"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X nls +sqlite tracker transcode"
+IUSE="X nls +sqlite tracker test transcode"
 
 # The deps for tracker? and transcode? are just the earliest available
 # version at the time of writing this ebuild
@@ -22,13 +22,14 @@ RDEPEND="
 	>=dev-libs/glib-2.26:2
 	>=dev-libs/libgee-0.5.2:0
 	>=media-libs/gupnp-dlna-0.5
-	>=media-libs/gstreamer-0.10.28
-	>=media-libs/gst-plugins-base-0.10.28
+	>=media-libs/gstreamer-0.10.35
+	>=media-libs/gst-plugins-base-0.10.35
 	>=net-libs/gssdp-0.11
 	>=net-libs/gupnp-0.17.1
 	>=net-libs/gupnp-av-0.9
 	>=net-libs/libsoup-2.34:2.4
 	>=sys-libs/e2fsprogs-libs-1.41.3
+	x11-misc/shared-mime-info
 	sqlite? ( >=dev-db/sqlite-3.5:3 )
 	tracker? ( >=app-misc/tracker-0.8.17 )
 	transcode? (
@@ -44,8 +45,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 "
 # Maintainer only
-#	>=dev-lang/vala-0.11.6
-#	>=net-libs/gupnp-vala-0.9
+#	>=dev-lang/vala-0.14.1
+#	>=net-libs/gupnp-vala-0.10.2
 #   dev-libs/libxslt
 
 pkg_setup() {
@@ -55,6 +56,15 @@ pkg_setup() {
 		--enable-mediathek-plugin
 		$(use_enable nls)
 		$(use_enable sqlite media-export-plugin)
+		$(use_enable test tests)
 		$(use_enable tracker tracker-plugin)
 		$(use_with X ui)"
 }
+
+src_install() {
+	gnome2_src_install
+	# Autostart file is not placed correctly, bug #402745
+	insinto /etc/xdg/autostart
+	doins "${D}"/usr/share/applications/rygel.desktop
+	rm "${D}"/usr/share/applications/rygel.desktop
+}