From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8z0w-0000S0-3C for garchives@archives.gentoo.org; Sun, 10 Apr 2011 18:05:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 488191C0D7; Sun, 10 Apr 2011 18:04:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 07B281C0D7 for ; Sun, 10 Apr 2011 18:04:51 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7C721B40AD for ; Sun, 10 Apr 2011 18:04:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 247CF8006D for ; Sun, 10 Apr 2011 18:04:51 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <7e110b9ed4633c50a86f9fa64b807116b140afb9.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 7e110b9ed4633c50a86f9fa64b807116b140afb9 Date: Sun, 10 Apr 2011 18:04:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 699c110e1c10cced57f2efa771fc3d61 commit: 7e110b9ed4633c50a86f9fa64b807116b140afb9 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Apr 10 17:45:18 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Apr 10 18:04:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D7e110b9e gnome-base/gnome-keyring: QAed * Handle debug manually as it is not the same as GNOME_DEBUG_CHECK * Remove CFLAGS changing code in configure.ac * Disable gcr testsuite due to weird opensc interaction --- .../gnome-keyring/gnome-keyring-3.0.0-r300.ebuild | 24 ++++++++------= --- .../gnome-keyring/gnome-keyring-3.0.0.ebuild | 23 ++++++++------= --- gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 27 +++++++++-----= ----- 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild b/g= nome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild index f537f42..ee1d720 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyrin= g-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $ =20 EAPI=3D"3" -GCONF_DEBUG=3D"yes" +GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 inherit gnome2 multilib pam virtualx @@ -29,7 +29,7 @@ fi # Hence, gtk2/3 versions are not parallel installable. RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dx11-libs/gtk+-2.90.0:3 - gnome-base/gconf + gnome-base/gconf:2 >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 @@ -40,7 +40,6 @@ RDEPEND=3D">=3Ddev-libs/glib-2.25:2 # valgrind? ( dev-util/valgrind ) DEPEND=3D"${RDEPEND} sys-devel/gettext - >=3Ddev-util/gtk-doc-am-1.9 >=3Ddev-util/intltool-0.35 >=3Ddev-util/pkgconfig-0.9 doc? ( >=3Ddev-util/gtk-doc-1.9 )" @@ -48,22 +47,15 @@ PDEPEND=3D"gnome-base/libgnome-keyring" # eautoreconf needs: # >=3Ddev-util/gtk-doc-am-1.9 =20 -DOCS=3D"AUTHORS ChangeLog NEWS README" - -# tests fail in several ways, they should be fixed in the next cycle (bu= g #340283), -# revisit then. -# UPDATE: gcr tests fail with: -# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-k= eyring-pkcs11.so: Couldn't initialize module: The device was removed or u= nplugged=20 -RESTRICT=3D"test" - pkg_setup() { + DOCS=3D"AUTHORS ChangeLog NEWS README" # XXX: Automagic libcap support G2CONF=3D"${G2CONF} $(use_enable debug) $(use_enable test tests) $(use_enable pam) $(use_with pam pam-dir $(getpam_mod_dir)) - --with-root-certs=3D${ROOT}/etc/ssl/certs/ + --with-root-certs=3D${EPREFIX}/etc/ssl/certs/ --enable-ssh-agent --enable-gpg-agent --with-gtk=3D3.0" @@ -72,13 +64,19 @@ pkg_setup() { =20 src_prepare() { # Remove silly CFLAGS - sed 's:CFLAGS=3D"$CFLAGS -Werror:CFLAGS=3D"$CFLAGS:' \ + sed -e 's:CFLAGS=3D"$CFLAGS -Werror:CFLAGS=3D"$CFLAGS:' \ + -e 's:CFLAGS=3D"$CFLAGS -g -O0:CFLAGS=3D"$CFLAGS:' \ -i configure.in configure || die "sed failed" =20 # Remove DISABLE_DEPRECATED flags sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \ -i configure.in configure || die "sed 2 failed" =20 + # 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 's/SUBDIRS =3D .*/SUBDIRS =3D/' \ + -i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed" + gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild b/gnome-= base/gnome-keyring/gnome-keyring-3.0.0.ebuild index abd488c..dae8cd3 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyrin= g-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $ =20 EAPI=3D"3" -GCONF_DEBUG=3D"yes" +GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 inherit gnome2 multilib pam virtualx @@ -27,7 +27,7 @@ fi =20 RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dx11-libs/gtk+-2.20:2 - gnome-base/gconf + gnome-base/gconf:2 >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 @@ -45,22 +45,15 @@ PDEPEND=3D"gnome-base/libgnome-keyring" # eautoreconf needs: # >=3Ddev-util/gtk-doc-am-1.9 =20 -DOCS=3D"AUTHORS ChangeLog NEWS README" - -# tests fail in several ways, they should be fixed in the next cycle (bu= g #340283), -# revisit then. -# UPDATE: tests use system-installed libraries, fail with: -# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-k= eyring-pkcs11.so: Couldn't initialize module: The device was removed or u= nplugged=20 -RESTRICT=3D"test" - pkg_setup() { + DOCS=3D"AUTHORS ChangeLog NEWS README" # XXX: Automagic libcap support G2CONF=3D"${G2CONF} $(use_enable debug) $(use_enable test tests) $(use_enable pam) $(use_with pam pam-dir $(getpam_mod_dir)) - --with-root-certs=3D${ROOT}/etc/ssl/certs/ + --with-root-certs=3D${EPREFIX}/etc/ssl/certs/ --enable-ssh-agent --enable-gpg-agent --with-gtk=3D2.0" @@ -69,13 +62,19 @@ pkg_setup() { =20 src_prepare() { # Remove silly CFLAGS - sed 's:CFLAGS=3D"$CFLAGS -Werror:CFLAGS=3D"$CFLAGS:' \ + sed -e 's:CFLAGS=3D"$CFLAGS -Werror:CFLAGS=3D"$CFLAGS:' \ + -e 's:CFLAGS=3D"$CFLAGS -g -O0:CFLAGS=3D"$CFLAGS:' \ -i configure.in configure || die "sed failed" =20 # Remove DISABLE_DEPRECATED flags sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \ -i configure.in configure || die "sed 2 failed" =20 + # 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 's/SUBDIRS =3D .*/SUBDIRS =3D/' \ + -i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed" + gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-b= ase/gnome-keyring/gnome-keyring-9999.ebuild index 72deafc..ee1d720 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyrin= g-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $ =20 EAPI=3D"3" -GCONF_DEBUG=3D"yes" +GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 inherit gnome2 multilib pam virtualx @@ -29,7 +29,7 @@ fi # Hence, gtk2/3 versions are not parallel installable. RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dx11-libs/gtk+-2.90.0:3 - gnome-base/gconf + gnome-base/gconf:2 >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 @@ -47,22 +47,15 @@ PDEPEND=3D"gnome-base/libgnome-keyring" # eautoreconf needs: # >=3Ddev-util/gtk-doc-am-1.9 =20 -DOCS=3D"AUTHORS ChangeLog NEWS README" - -# tests fail in several ways, they should be fixed in the next cycle (bu= g #340283), -# revisit then. -# UPDATE: tests use system-installed libraries, fail with: -# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-k= eyring-pkcs11.so: Couldn't initialize module: The device was removed or u= nplugged=20 -RESTRICT=3D"test" - pkg_setup() { + DOCS=3D"AUTHORS ChangeLog NEWS README" # XXX: Automagic libcap support G2CONF=3D"${G2CONF} $(use_enable debug) $(use_enable test tests) $(use_enable pam) $(use_with pam pam-dir $(getpam_mod_dir)) - --with-root-certs=3D${ROOT}/etc/ssl/certs/ + --with-root-certs=3D${EPREFIX}/etc/ssl/certs/ --enable-ssh-agent --enable-gpg-agent --with-gtk=3D3.0" @@ -70,15 +63,21 @@ pkg_setup() { } =20 src_prepare() { - gnome2_src_prepare - # Remove silly CFLAGS - sed 's:CFLAGS=3D"$CFLAGS -Werror:CFLAGS=3D"$CFLAGS:' \ + sed -e 's:CFLAGS=3D"$CFLAGS -Werror:CFLAGS=3D"$CFLAGS:' \ + -e 's:CFLAGS=3D"$CFLAGS -g -O0:CFLAGS=3D"$CFLAGS:' \ -i configure.in configure || die "sed failed" =20 # 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 's/SUBDIRS =3D .*/SUBDIRS =3D/' \ + -i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed" + + gnome2_src_prepare } =20 src_test() {