[gentoo-commits] gentoo-x86 commit in gnome-base/libgnome-keyring: ChangeLog libgnome-keyring-3.8.0.ebuild libgnome-keyring-3.4.1.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-base/libgnome-keyring: ChangeLog libgnome-keyring-3.8.0.ebuild libgnome-keyring-3.4.1.ebuild

[Gilles Dartiguelongue (eva)]

eva         13/03/29 19:36:23

  Modified:             ChangeLog libgnome-keyring-3.8.0.ebuild
  Removed:              libgnome-keyring-3.4.1.ebuild
  Log:
  Clean up old revision, small policy fixes to 3.8 ebuild.
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

Revision  Changes    Path
1.40                 gnome-base/libgnome-keyring/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog?r1=1.39&r2=1.40

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog	28 Mar 2013 17:15:56 -0000	1.39
+++ ChangeLog	29 Mar 2013 19:36:23 -0000	1.40
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.39 2013/03/28 17:15:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.40 2013/03/29 19:36:23 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnome-keyring-3.4.1.ebuild, libgnome-keyring-3.8.0.ebuild:
+  Clean up old revision, small policy fixes to 3.8 ebuild.
 
 *libgnome-keyring-3.8.0 (28 Mar 2013)
 



1.2                  gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild?r1=1.1&r2=1.2

Index: libgnome-keyring-3.8.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgnome-keyring-3.8.0.ebuild	28 Mar 2013 17:15:56 -0000	1.1
+++ libgnome-keyring-3.8.0.ebuild	29 Mar 2013 19:36:23 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.0.ebuild,v 1.1 2013/03/28 17:15:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild,v 1.2 2013/03/29 19:36:23 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -20,9 +20,11 @@
 IUSE="debug +introspection test vala"
 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
@@ -32,16 +34,19 @@
 	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"