[gentoo-commits] proj/gnome:master commit in: gnome-base/libgnome-keyring/

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

commit:     aa1c089270db6f3a03ef9614a7f460d982177f43
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 23:28:01 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 23:43:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=aa1c0892

gnome-base/libgnome-keyring: 3.8.0 → 3.10.1

---
 ...-9999.ebuild => libgnome-keyring-3.10.1.ebuild} | 45 ++++++++--------------
 .../libgnome-keyring/libgnome-keyring-9999.ebuild  | 34 ++++++++--------
 2 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
similarity index 55%
copy from gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
copy to gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
index 31d4063..0d7f569 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,11 +7,9 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python vala
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit gnome2 python-any-r1 vala
 
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
@@ -19,48 +17,37 @@ HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 IUSE="debug +introspection test vala"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-fi
 REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 
-RDEPEND=">=sys-apps/dbus-1.0
+RDEPEND="
+	>=sys-apps/dbus-1
 	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( =dev-lang/python-2* )
-	vala? ( $(vala_depend) )"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.9 )"
-fi
-
-pkg_setup() {
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
 
 src_prepare() {
-	G2CONF="${G2CONF} $(use_enable vala)"
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 
-	# FIXME: Remove silly CFLAGS
+	# FIXME: Remove silly CFLAGS, report upstream
 	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
 		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
 		-i configure.ac configure || die "sed failed"
 }
 
+src_configure() {
+	gnome2_src_configure $(use_enable vala)
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	dbus-launch emake check || die "tests failed"

diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
index 31d4063..dfb8c37 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,8 +7,9 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python vala
+inherit gnome2 python-any-r1 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,48 +20,47 @@ HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 fi
-REQUIRED_USE="vala? ( introspection )"
 
-RDEPEND=">=sys-apps/dbus-1.0
+RDEPEND="
+	>=sys-apps/dbus-1
 	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( =dev-lang/python-2* )
-	vala? ( $(vala_depend) )"
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
 		doc? ( >=dev-util/gtk-doc-1.9 )"
 fi
 
-pkg_setup() {
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
 src_prepare() {
-	G2CONF="${G2CONF} $(use_enable vala)"
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 
-	# FIXME: Remove silly CFLAGS
+	# FIXME: Remove silly CFLAGS, report upstream
 	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
 		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
 		-i configure.ac configure || die "sed failed"
 }
 
+src_configure() {
+	gnome2_src_configure $(use_enable vala)
+}
+
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	dbus-launch emake check || die "tests failed"