[gentoo-commits] proj/gnome:master commit in: gnome-extra/libgda/, app-misc/the-board/, dev-libs/gjs/, media-video/cheese/, ...

[Nirbheek Chauhan]

commit:     768620a1b02e0894ccad3b944001aa97e7f1a6a7
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 10:11:22 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 10:11:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=768620a1

Various packages: port to EAPI 4

---
 .../libvirt-glib/libvirt-glib-9999.ebuild          |   14 +++---
 app-misc/the-board/the-board-9999.ebuild           |    2 +-
 dev-libs/gjs/gjs-9999.ebuild                       |    4 +-
 .../gobject-introspection-9999.ebuild              |    6 +-
 dev-util/anjuta/anjuta-3.2.1.ebuild                |    5 +--
 dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild   |    4 +-
 gnome-extra/libgda/libgda-9999.ebuild              |    6 ++-
 media-sound/rhythmbox/rhythmbox-9999.ebuild        |   47 ++++----------------
 media-video/cheese/cheese-9999.ebuild              |    4 +-
 net-libs/gtk-vnc/gtk-vnc-9999.ebuild               |    8 ++--
 net-misc/spice-gtk/spice-gtk-9999.ebuild           |    2 +-
 11 files changed, 35 insertions(+), 67 deletions(-)

diff --git a/app-emulation/libvirt-glib/libvirt-glib-9999.ebuild b/app-emulation/libvirt-glib/libvirt-glib-9999.ebuild
index f164a9a..6357b16 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-9999.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 EGIT_REPO_URI="git://libvirt.org/libvirt-glib.git"
 
-inherit gnome2
+inherit python gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -22,7 +22,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="doc +introspection +vala"
+IUSE="doc +introspection python +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -39,14 +39,12 @@ pkg_setup() {
 	# NEWS, ChangeLog, are empty in git
 	# README is empty
 	DOCS="AUTHORS ChangeLog HACKING NEWS"
-	# TODO: use_with python when python.eclass is fixed
 	G2CONF="--disable-test-coverage
-		--without-python
 		VAPIGEN=$(type -P vapigen-0.14)
 		$(use_enable introspection)
-		$(use_enable vala)"
-}
+		$(use_enable vala)
+		$(use_with python)"
 
-src_prepare() {
-	gnome2_src_prepare
+	python_set_active_version 2
+	python_pkg_setup
 }

diff --git a/app-misc/the-board/the-board-9999.ebuild b/app-misc/the-board/the-board-9999.ebuild
index 26b618c..cdc0d54 100644
--- a/app-misc/the-board/the-board-9999.ebuild
+++ b/app-misc/the-board/the-board-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 

diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
index 6af992c..b9b8da2 100644
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ b/dev-libs/gjs/gjs-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.29.0.ebuild,v 1.1 2011/06/14 13:19:59 nirbheek Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
 
@@ -47,6 +46,7 @@ pkg_setup() {
 		--disable-systemtap
 		--disable-dtrace
 		--disable-coverage"
+	python_pkg_setup
 }
 
 src_prepare() {

diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
index 6d81201..bbc0c3d 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-0.10.8.ebuild,v 1.10 2011/05/02 04:39:55 jer Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="xz"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2 python
+inherit python gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -42,6 +41,7 @@ pkg_setup() {
 		$(use_enable test tests)"
 
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {

diff --git a/dev-util/anjuta/anjuta-3.2.1.ebuild b/dev-util/anjuta/anjuta-3.2.1.ebuild
index 08aba87..63a3439 100644
--- a/dev-util/anjuta/anjuta-3.2.1.ebuild
+++ b/dev-util/anjuta/anjuta-3.2.1.ebuild
@@ -73,6 +73,7 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
 
 	G2CONF="${G2CONF}
+		VALAC=$(type -P valac-0.14)
 		--disable-static
 		--disable-schemas-compile
 		--docdir=/usr/share/doc/${PF}
@@ -85,10 +86,6 @@ pkg_setup() {
 		$(use_enable subversion plugin-subversion)
 		$(use_enable vala)"
 
-	if use vala; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
 	# Conflics with -pg in a plugin, bug #266777
 	filter-flags -fomit-frame-pointer
 

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
index 2044c84..03139c3 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GNOME_ORG_MODULE="glib"
-GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
@@ -37,6 +36,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {

diff --git a/gnome-extra/libgda/libgda-9999.ebuild b/gnome-extra/libgda/libgda-9999.ebuild
index ae702c3..cd89291 100644
--- a/gnome-extra/libgda/libgda-9999.ebuild
+++ b/gnome-extra/libgda/libgda-9999.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
 
-EAPI="3"
+EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="xz" # remove when python eclass supports EAPI 4
 PYTHON_DEPEND="2"
 
 inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
@@ -112,6 +111,9 @@ pkg_setup() {
 		--disable-default-binary"
 
 	export XDG_DATA_HOME="${T}/.local"
+
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {

diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild
index bfcde61..04ec1cb 100644
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.2 2010/07/06 15:46:43 ssuominen Exp $
 
-EAPI="3"
+EAPI="4"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
 PYTHON_USE_WITH="xml"
@@ -27,6 +27,13 @@ else
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	gnome-keyring? ( python )
+	webkit? ( python )"
+
 # FIXME: double check what to do with fm-radio plugin
 # FIXME: Zeitgeist python plugin
 # NOTE: Rhythmbox uses both gdbus and dbus-python right now
@@ -110,47 +117,11 @@ pkg_setup() {
 		G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
 	fi
 
-	if ! use udev; then
-		if use ipod; then
-			ewarn "ipod support requires udev support.  Please"
-			ewarn "re-emerge with USE=udev to enable ipod support"
-			G2CONF="${G2CONF} --without-ipod"
-		fi
-
-		if use mtp; then
-			ewarn "MTP support requires udev support.  Please"
-			ewarn "re-emerge with USE=udev to enable MTP support"
-			G2CONF="${G2CONF} --without-mtp"
-		fi
-	else
-		G2CONF="${G2CONF} $(use_with ipod) $(use_with mtp)"
-	fi
-
-	if ! use cdr ; then
-		ewarn "You have cdr USE flag disabled."
-		ewarn "You will not be able to burn CDs."
-	fi
-
-	if ! use python; then
-		if use dbus; then
-			ewarn "You need python support to use the im-status plugin"
-		fi
-
-		if use webkit; then
-			ewarn "You need python support in addition to webkit to be able to use"
-			ewarn "the context panel plugin."
-		fi
-	fi
-
-	if use gnome-keyring && ! use python; then
-		ewarn "The magnatune plugin requires USE='python gnome-keyring'"
-	fi
-
 	# --enable-vala just installs the sample vala plugin, and the configure
 	# checks are broken, so don't enable it
 	G2CONF="${G2CONF}
 		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
-		VALAC=$(type -P valac-0.12)
+		VALAC=$(type -P valac-0.14)
 		--enable-mmkeys
 		--disable-more-warnings
 		--disable-scrollkeeper

diff --git a/media-video/cheese/cheese-9999.ebuild b/media-video/cheese/cheese-9999.ebuild
index 56b0d61..c6001e2 100644
--- a/media-video/cheese/cheese-9999.ebuild
+++ b/media-video/cheese/cheese-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/projects/cheese/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +introspection vala"
+IUSE="doc +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -77,7 +77,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	# Clutter-related sandbox violations when USE="doc introspection -vala" and
+	# Clutter-related sandbox violations when USE="doc introspection" and
 	# FEATURES="-userpriv" (see bug #385917).
 	# Work around the issue with the same horrible hack as in bug #385433.
 	DISPLAY="999invalid"

diff --git a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
index 653531e..527aabe 100644
--- a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild,v 1.6 2011/10/30 17:24:14 armin76 Exp $
 
-EAPI="3"
+EAPI="4"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
 
 inherit autotools eutils base gnome.org python
 if [[ ${PV} = 9999 ]]; then
@@ -22,6 +21,7 @@ else
 	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 IUSE="examples +gtk3 +introspection python sasl +vala"
+REQUIRED_USE="vala? ( introspection )"
 
 # libview is used in examples/gvncviewer -- no need
 # TODO: review nsplugin when it will be considered less experimental
@@ -57,6 +57,7 @@ GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -81,10 +82,9 @@ src_configure() {
 	local myconf
 	myconf="
 		$(use_with examples) \
-		$(use_enable vala) \
-		$(use_enable vala introspection) \
 		$(use_enable introspection) \
 		$(use_with sasl) \
+		$(use_enable vala) \
 		VAPIGEN=$(type -P vapigen-0.14) \
 		--with-coroutine=gthread \
 		--without-libview \

diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 59c00c9..b499340 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.7.ebuild,v 1.2 2011/10/19 08:37:10 dev-zero Exp $
 
-EAPI=3
+EAPI="4"
 GCONF_DEBUG="no"
 
 inherit eutils python gnome2-utils