Version bump for gnome-3.6, now with optional vala bindings. Update license. Drop useless doc USE flag. Switch to global introspection flag. Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 44 insertions, 33 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index 8baf32822672..a9e79fa76f47 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.36 2012/05/13 18:15:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.37 2012/12/17 04:46:05 tetromino Exp $
+
+*libgnome-keyring-3.6.0 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgnome-keyring-2.32.0.ebuild, -libgnome-keyring-3.2.2.ebuild,
+  libgnome-keyring-3.4.1.ebuild, +libgnome-keyring-3.6.0.ebuild, metadata.xml:
+  Version bump for gnome-3.6, now with optional vala bindings. Update license.
+  Drop useless doc USE flag. Switch to global introspection flag. Drop old.
 
 *libgnome-keyring-3.4.1 (13 May 2012)
 
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
index 9b7cf5d0ea0b..99350bd31168 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.16 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.17 2012/12/17 04:46:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,19 +11,19 @@ inherit gnome2 eutils autotools
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc test"
+IUSE="debug test"
 
 RDEPEND=">=sys-apps/dbus-1.0
 	>=gnome-base/gnome-keyring-2.29[test?]
 	!<gnome-base/gnome-keyring-2.29"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
index f8ee7df2f6a4..ae1bcca0ac9f 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild,v 1.1 2012/05/13 18:15:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild,v 1.2 2012/12/17 04:46:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,19 +11,19 @@ inherit gnome2 python
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc +introspection test"
+IUSE="debug +introspection test"
 
 RDEPEND=">=sys-apps/dbus-1.0
 	>=gnome-base/gnome-keyring-3.1.92
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
 	test? ( =dev-lang/python-2* )"
 
 pkg_setup() {
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild
index 9d016f4d8da0..cb296d598732 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild
@@ -1,47 +1,51 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.5 2012/05/09 16:10:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild,v 1.1 2012/12/17 04:46:05 tetromino Exp $
 
-EAPI="4"
-GCONF_DEBUG="no"
+EAPI="5"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
 
-inherit gnome2
+inherit gnome2 python vala
 
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc test"
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=sys-apps/dbus-1.0
-	>=gnome-base/gnome-keyring-3.1.92[test?]"
+	>=gnome-base/gnome-keyring-3.1.92
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	test? ( =dev-lang/python-2* )
+	vala? ( $(vala_depend) )"
 
 pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests full)"
-	DOCS="AUTHORS ChangeLog NEWS README"
+	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
-	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
+	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
 		-i configure.ac configure || die "sed failed"
-
-	# FIXME: Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.ac configure || die "sed 2 failed"
 }
 
 src_test() {
diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml
index 3147d749554f..c83b6723d9e4 100644
--- a/gnome-base/libgnome-keyring/metadata.xml
+++ b/gnome-base/libgnome-keyring/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
+	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>