Version bump, make it work when python3 is main interpreter, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

2 files changed, 19 insertions, 9 deletions

diff --git a/gnome-extra/gnome-dvb-daemon/ChangeLog b/gnome-extra/gnome-dvb-daemon/ChangeLog
index e154793a04d3..83146ad17ef4 100644
--- a/gnome-extra/gnome-dvb-daemon/ChangeLog
+++ b/gnome-extra/gnome-dvb-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-dvb-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/ChangeLog,v 1.9 2011/12/29 17:44:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/ChangeLog,v 1.10 2011/12/31 19:05:25 pacho Exp $
+
+*gnome-dvb-daemon-0.2.7 (31 Dec 2011)
+
+  31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +gnome-dvb-daemon-0.2.7.ebuild,
+  -gnome-dvb-daemon-0.2.2.ebuild:
+  Version bump, make it work when python3 is main interpreter, remove old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> gnome-dvb-daemon-0.2.5.ebuild:
   amd64 stable, bug 393007
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild
index bd72eabb5bc2..12b795e5fd0e 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.2.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2011 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.2.ebuild,v 1.6 2011/10/20 01:14:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.7.ebuild,v 1.1 2011/12/31 19:05:25 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.5"
 
 inherit eutils python gnome2 multilib
 
@@ -22,12 +24,11 @@ RDEPEND=">=dev-libs/glib-2.28.5
 	>=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-2.28.4:2
+	dev-python/pygobject:3
 	>=dev-libs/gobject-introspection-0.10.8
 	|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
-	vala? ( >=dev-lang/vala-0.12 )
+	vala? ( >=dev-lang/vala-0.14:0.14 )
 	totem? ( media-video/totem )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5.8.1
@@ -42,16 +43,19 @@ 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.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
-
+	echo '#!/bin/sh' > py-compile
 	gnome2_src_prepare
+	python_convert_shebangs -r 2 .
 }
 
 pkg_postinst() {