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)

3 files changed, 15 insertions, 56 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index f6a17b277a8a..c27ed153473b 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -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)
 
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
deleted file mode 100644
index ae1bcca0ac9f..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.2 2012/12/17 04:46:05 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 python
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-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 +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}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( =dev-lang/python-2* )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
index cb3d9d98e744..3a22e8e30349 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.8.0.ebuild
@@ -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 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd
 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 @@ DEPEND="${RDEPEND}
 	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"