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

[Nirbheek Chauhan]

commit:     fbf44aff2298d2e19f98156a1f989d97581436de
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 15:37:08 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 15:37:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fbf44aff

gnome-base/{lib,}gnome-keyring: 3.0.0 → 3.0.1

* Some gkm tests fail

---
 ....0.0.ebuild => gnome-keyring-3.0.1-r200.ebuild} |   14 +++-----------
 ...r300.ebuild => gnome-keyring-3.0.1-r300.ebuild} |   14 +++-----------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   14 +++-----------
 ...-3.0.0.ebuild => libgnome-keyring-3.0.1.ebuild} |    2 +-
 4 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild
similarity index 81%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild
index 012522e..cfe1dea 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild
@@ -61,24 +61,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-
 	# Disable gcr tests due to weirdness with opensc
 	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
-	sed -e '/^SUBDIRS = /,+1 c\SUBDIRS =\' \
-		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
+	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
+		-i gcr/Makefile.am gcr/Makefile.in || die "sed failed"
 
 	gnome2_src_prepare
 }
 
 src_test() {
+	# FIXME: /gkm/transaction/ tests fail
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild
similarity index 82%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild
index 5b56195..032bc34 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild
@@ -63,24 +63,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-
 	# Disable gcr tests due to weirdness with opensc
 	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
-	sed -e '/^SUBDIRS = /,+1 c\SUBDIRS =\' \
-		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
+	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
+		-i gcr/Makefile.am gcr/Makefile.in || die "sed failed"
 
 	gnome2_src_prepare
 }
 
 src_test() {
+	# FIXME: /gkm/transaction/ tests fail
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 5b56195..032bc34 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -63,24 +63,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-
 	# Disable gcr tests due to weirdness with opensc
 	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
-	sed -e '/^SUBDIRS = /,+1 c\SUBDIRS =\' \
-		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
+	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
+		-i gcr/Makefile.am gcr/Makefile.in || die "sed failed"
 
 	gnome2_src_prepare
 }
 
 src_test() {
+	# FIXME: /gkm/transaction/ tests fail
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
 }

diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.0.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.0.1.ebuild
similarity index 97%
rename from gnome-base/libgnome-keyring/libgnome-keyring-3.0.0.ebuild
rename to gnome-base/libgnome-keyring/libgnome-keyring-3.0.1.ebuild
index 445f7ab..b44c680 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.0.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.0.1.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable debug)
-		$(use_enable test tests)"
+		$(use_enable test tests full)"
 	DOCS="AUTHORS ChangeLog NEWS README"
 }