Version bump, drop old.

(Portage version: 2.1.11.24/cvs/Linux x86_64)

4 files changed, 23 insertions, 168 deletions

diff --git a/gnome-extra/gnome-dvb-daemon/ChangeLog b/gnome-extra/gnome-dvb-daemon/ChangeLog
index 57b51092c26f..6b347a22c09f 100644
--- a/gnome-extra/gnome-dvb-daemon/ChangeLog
+++ b/gnome-extra/gnome-dvb-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-dvb-daemon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/ChangeLog,v 1.15 2012/10/04 14:53:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/ChangeLog,v 1.16 2012/10/06 06:37:52 pacho Exp $
+
+*gnome-dvb-daemon-0.2.10 (06 Oct 2012)
+
+  06 Oct 2012; Pacho Ramos <pacho@gentoo.org> +gnome-dvb-daemon-0.2.10.ebuild,
+  -gnome-dvb-daemon-0.2.5.ebuild, -gnome-dvb-daemon-0.2.7.ebuild,
+  -gnome-dvb-daemon-0.2.8.ebuild:
+  Version bump, drop old.
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> gnome-dvb-daemon-0.2.9.ebuild:
   Stable for amd64, wrt bug #427544
@@ -66,4 +73,3 @@
   +gnome-dvb-daemon-0.2.2.ebuild, +metadata.xml:
   Added gnome-extra/gnome-dvb-daemon-0.22, bug 280912. Thanks to Florian
   Steinel and Wojciech Myrda.
-
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.8.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
index 358bbfd0ea93..23d5c43a4cba 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.8.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
@@ -1,34 +1,35 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.8.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild,v 1.1 2012/10/06 06:37:52 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.5"
+VALA_MIN_API_VERSION="0.16"
 
-inherit eutils python gnome2 multilib
+inherit eutils python gnome2 multilib vala
 
 DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="http://live.gnome.org/DVBDaemon"
+HOMEPAGE="https://live.gnome.org/DVBDaemon"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="nls totem vala"
 
-RDEPEND=">=dev-libs/glib-2.32.0
-	>=media-libs/gstreamer-0.10.29
-	>=media-libs/gst-plugins-good-0.10.14
-	>=media-libs/gst-plugins-bad-0.10.13
+RDEPEND=">=dev-libs/glib-2.32.0:2
+	>=media-libs/gstreamer-0.10.29:0.10
+	>=media-libs/gst-plugins-good-0.10.14:0.10
+	>=media-libs/gst-plugins-bad-0.10.13:0.10
 	>=dev-libs/libgee-0.5:0
 	>=dev-db/sqlite-3.4
 	>=media-libs/gst-rtsp-server-0.10.7
-	media-plugins/gst-plugins-dvb
-	dev-python/gst-python
-	>=dev-python/pygobject-3.0.4:3
+	media-plugins/gst-plugins-dvb:0.10
+	dev-python/gst-python:0.10
+	>=dev-python/pygobject-3.2.1:3
 	>=dev-libs/gobject-introspection-0.10.8
 	|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-	vala? ( >=dev-lang/vala-0.16:0.16 )
+	vala? ( $(vala_depend) )
 	totem? ( media-video/totem )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.8.1
@@ -43,19 +44,16 @@ pkg_setup() {
 		$(use_enable totem totem-plugin)"
 	use totem && G2CONF="${G2CONF} \
 		--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
-	# configure looks for 'valac', but we have 'valac-<version>'
-	use vala && G2CONF="${G2CONF} \
-		VALAC=${EPREFIX}/usr/bin/valac-0.16"
 
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
-	# Disable byte-compilation of Python modules.
-	echo '#!/bin/sh' > py-compile
-	gnome2_src_prepare
+	python_clean_py-compile_files
 	python_convert_shebangs -r 2 .
+	gnome2_src_prepare
+	use vala && vala_src_prepare
 }
 
 pkg_postinst() {
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.5.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.5.ebuild
deleted file mode 100644
index 6bf30e1dda79..000000000000
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.5.ebuild,v 1.3 2012/05/05 06:25:17 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils python gnome2 multilib
-
-DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="http://live.gnome.org/DVBDaemon"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="nls totem vala"
-
-RDEPEND=">=dev-libs/glib-2.28.5
-	>=media-libs/gstreamer-0.10.29
-	>=media-libs/gst-plugins-good-0.10.14
-	>=media-libs/gst-plugins-bad-0.10.13
-	>=dev-libs/libgee-0.5:0
-	>=dev-db/sqlite-3.4
-	>=media-libs/gst-rtsp-server-0.10.7
-	media-plugins/gst-plugins-dvb
-	>=dev-lang/python-2.5
-	dev-python/gst-python
-	dev-python/pygobject:3
-	>=dev-libs/gobject-introspection-0.10.8
-	|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-	vala? ( >=dev-lang/vala-0.14 )
-	totem? ( media-video/totem )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	>=sys-devel/libtool-2.2.6"
-
-pkg_setup() {
-	G2CONF="${G2CONF} \
-		$(use_enable nls)
-		$(use_enable totem totem-plugin)"
-	use totem && G2CONF="${G2CONF} \
-		--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
-	# configure looks for 'valac', but we have 'valac-<version>'
-	use vala && G2CONF="${G2CONF} \
-		VALAC=${EPREFIX}/usr/bin/valac-0.14"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Disable byte-compilation of Python modules.
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile || die
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	python_mod_optimize gnomedvb
-	if use totem; then
-		python_mod_optimize "/usr/$(get_libdir)/totem/plugins"
-	fi
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup gnomedvb
-	if use totem; then
-		python_mod_cleanup "/usr/$(get_libdir)/totem/plugins"
-	fi
-	gnome2_pkg_postrm
-}
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild
deleted file mode 100644
index cfda5cdf1abe..000000000000
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild,v 1.3 2012/05/05 06:25:17 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python gnome2 multilib
-
-DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="http://live.gnome.org/DVBDaemon"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="nls totem vala"
-
-RDEPEND=">=dev-libs/glib-2.28.5
-	>=media-libs/gstreamer-0.10.29
-	>=media-libs/gst-plugins-good-0.10.14
-	>=media-libs/gst-plugins-bad-0.10.13
-	>=dev-libs/libgee-0.5:0
-	>=dev-db/sqlite-3.4
-	>=media-libs/gst-rtsp-server-0.10.7
-	media-plugins/gst-plugins-dvb
-	dev-python/gst-python
-	dev-python/pygobject:3
-	>=dev-libs/gobject-introspection-0.10.8
-	|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-	vala? ( >=dev-lang/vala-0.14:0.14 )
-	totem? ( media-video/totem )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.18.1 )
-	>=sys-devel/libtool-2.2.6"
-
-pkg_setup() {
-	G2CONF="${G2CONF} \
-		$(use_enable nls)
-		$(use_enable totem totem-plugin)"
-	use totem && G2CONF="${G2CONF} \
-		--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
-	# configure looks for 'valac', but we have 'valac-<version>'
-	use vala && G2CONF="${G2CONF} \
-		VALAC=${EPREFIX}/usr/bin/valac-0.14"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Disable byte-compilation of Python modules.
-	echo '#!/bin/sh' > py-compile
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
-}
-
-pkg_postinst() {
-	python_mod_optimize gnomedvb
-	if use totem; then
-		python_mod_optimize "/usr/$(get_libdir)/totem/plugins"
-	fi
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup gnomedvb
-	if use totem; then
-		python_mod_cleanup "/usr/$(get_libdir)/totem/plugins"
-	fi
-	gnome2_pkg_postrm
-}