[gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     b5cc8f048bc660455cfd33a9a472a72fbb408fde
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 12:11:09 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:02:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b5cc8f04

dev-libs/libpeas: QAed

	* Add glade support
	* Drop libtool requirement, it's long been unneeded
	* Drop useless WANT_AUTOMAKE
	* Need python for tests since pygobject doesn't install for python 3

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 dev-libs/libpeas/libpeas-1.0.0.ebuild |    8 +++++---
 dev-libs/libpeas/libpeas-9999.ebuild  |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.0.0.ebuild b/dev-libs/libpeas/libpeas-1.0.0.ebuild
index 8752b8d..ae70df4 100644
--- a/dev-libs/libpeas/libpeas-1.0.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.0.0.ebuild
@@ -6,7 +6,6 @@ EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
-WANT_AUTOMAKE="1.11"
 
 inherit gnome2 python virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -18,7 +17,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="doc +gtk python seed vala" # glade
+IUSE="doc +gtk glade python seed vala"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -27,13 +26,13 @@ fi
 
 RDEPEND=">=dev-libs/glib-2.23.6:2
 	>=dev-libs/gobject-introspection-0.10.1
+	glade? ( >=dev-util/glade-3.9.1:3 )
 	gtk? ( >=x11-libs/gtk+-2.90:3[introspection] )
 	python? ( >=dev-python/pygobject-2.28 )
 	seed? ( >=dev-libs/seed-2.91.91 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	>=sys-devel/libtool-2.2.6
 	doc? ( >=dev-util/gtk-doc-1.11 )
 	vala? ( >=dev-lang/vala-0.11.1:0.12 )"
 
@@ -41,6 +40,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		$(use_enable glade glade-catalog)
 		$(use_enable gtk)
 		$(use_enable python)
 		$(use_enable seed)
@@ -51,6 +51,8 @@ pkg_setup() {
 		--disable-gtk2-test-build"
 	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
 	# What do we do about gdb, valgrind, gcov, etc?
+
+	python_set_active_version 2
 }
 
 src_test() {

diff --git a/dev-libs/libpeas/libpeas-9999.ebuild b/dev-libs/libpeas/libpeas-9999.ebuild
index 8752b8d..ae70df4 100644
--- a/dev-libs/libpeas/libpeas-9999.ebuild
+++ b/dev-libs/libpeas/libpeas-9999.ebuild
@@ -6,7 +6,6 @@ EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.5"
-WANT_AUTOMAKE="1.11"
 
 inherit gnome2 python virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -18,7 +17,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="doc +gtk python seed vala" # glade
+IUSE="doc +gtk glade python seed vala"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -27,13 +26,13 @@ fi
 
 RDEPEND=">=dev-libs/glib-2.23.6:2
 	>=dev-libs/gobject-introspection-0.10.1
+	glade? ( >=dev-util/glade-3.9.1:3 )
 	gtk? ( >=x11-libs/gtk+-2.90:3[introspection] )
 	python? ( >=dev-python/pygobject-2.28 )
 	seed? ( >=dev-libs/seed-2.91.91 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	>=sys-devel/libtool-2.2.6
 	doc? ( >=dev-util/gtk-doc-1.11 )
 	vala? ( >=dev-lang/vala-0.11.1:0.12 )"
 
@@ -41,6 +40,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		$(use_enable glade glade-catalog)
 		$(use_enable gtk)
 		$(use_enable python)
 		$(use_enable seed)
@@ -51,6 +51,8 @@ pkg_setup() {
 		--disable-gtk2-test-build"
 	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
 	# What do we do about gdb, valgrind, gcov, etc?
+
+	python_set_active_version 2
 }
 
 src_test() {