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 1QNpFd-00086z-4g for garchives@archives.gentoo.org; Sat, 21 May 2011 16:42:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E45EE00C2; Sat, 21 May 2011 16:41:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 18F0FE00C2 for ; Sat, 21 May 2011 16:41:56 +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 8CC061B4021 for ; Sat, 21 May 2011 16:41:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9CA5480021 for ; Sat, 21 May 2011 16:41:38 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <195dcc0febedc607891d19986e922c0ebb7d0d22.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/, gnome-base/gnome-keyring/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap-ng.patch gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ gnome-base/gnome-keyring/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 195dcc0febedc607891d19986e922c0ebb7d0d22 Date: Sat, 21 May 2011 16:41:38 +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: 48fc218a9ca6e326dc422a046f3ab5fd commit: 195dcc0febedc607891d19986e922c0ebb7d0d22 Author: Alexandre Rostovtsev gmail com> AuthorDate: Fri May 20 23:21:14 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat May 21 16:34:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D195dcc0f gnome-keyring-3.0.2 version bump + libcap automagic dep fix * Bump gnome-keyring to 3.0.2-r200 and -r300. * Correct dependency in 9999 (libcap-ng, not libcap) * Correct sed in 9999 (no Makefile.in) * Add patches to make libcap (and libcap-ng, for 9999) dependencies non-automagic. Patches submitted to upstream bug 649936 Signed-off-by: Nirbheek Chauhan gentoo.org> --- .../gnome-keyring-3.0.2-automagic-libcap.patch | 57 ++++++++++++++= +++++ .../gnome-keyring-3.1.1-automagic-libcap-ng.patch | 60 ++++++++++++++= ++++++ ...r200.ebuild =3D> gnome-keyring-3.0.2-r200.ebuild} | 15 +++-- ...r300.ebuild =3D> gnome-keyring-3.0.2-r300.ebuild} | 15 +++-- gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 14 +++-- 5 files changed, 143 insertions(+), 18 deletions(-) diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic= -libcap.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automa= gic-libcap.patch new file mode 100644 index 0000000..2947af3 --- /dev/null +++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap= .patch @@ -0,0 +1,57 @@ +From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 20 May 2011 17:53:43 -0400 +Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936) + +Backport of the patch by Saleem Abdulrasool +to gnome-keyring-3.0.x + +Signed-off-by: Alexandre Rostovtsev +--- + configure.in | 29 +++++++++++++++++++++-------- + 1 files changed, 21 insertions(+), 8 deletions(-) + +diff --git a/configure.in b/configure.in +index b2d07a7..88f7e66 100644 +--- a/configure.in ++++ b/configure.in +@@ -445,16 +445,29 @@ fi + # libcap2 + # + +-AC_CHECK_LIB([cap], [cap_get_proc], have_libcap=3D"yes", have_libcap=3D= "no") +- +-if test $have_libcap =3D yes; then +- AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library]) +- DAEMON_LIBS=3D"$DAEMON_LIBS -lcap" +-else +- AC_MSG_WARN([libcap2 (or development headers) is not installed]) ++AC_ARG_WITH([libcap], ++ [AC_HELP_STRING([--without-libcap], ++ [build without libcap2 (disables Linux capa= bilities support)])],, ++ [with_libcap=3Dauto]) ++ ++if test x"$with_libcap" !=3D x"no" ; then ++ AC_CHECK_LIB([cap], [cap_get_proc], ++ [ ++ with_libcap=3D"yes" ++ AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package,= libcap library]) ++ DAEMON_LIBS=3D"$DAEMON_LIBS -lcap" ++ ], ++ [ ++ if test x"$with_libcap" =3D x"yes" ; then ++ AC_MSG_ERROR([libcap2 support requested, but packa= ge not found]) ++ else ++ AC_MSG_WARN([libcap2 (or development headers) is n= ot installed]) ++ fi ++ with_libcap=3D"no" ++ ]) + fi + +-libcap_status=3D$have_libcap ++libcap_status=3D$with_libcap + + # -------------------------------------------------------------------- + # Debug mode +-- +1.7.5.rc3 diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic= -libcap-ng.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-aut= omagic-libcap-ng.patch new file mode 100644 index 0000000..b87bae3 --- /dev/null +++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.1.1-automagic-libcap= -ng.patch @@ -0,0 +1,60 @@ +From 8191a26b9717f0b0b8beabdc765cc3c4713b2586 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 20 May 2011 18:06:00 -0400 +Subject: [PATCH] Fix automagic libcap-ng dependency (GNOME bug #649936) + +A slight modification of the patch by Saleem Abdulrasool +. Like his patch, this is for 3.1.x. + +Signed-off-by: Alexandre Rostovtsev +--- + configure.ac | 32 ++++++++++++++++++++++---------- + 1 files changed, 22 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d9e947a..02372d8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -451,18 +451,30 @@ fi + # libcap-ng + # + +-AC_CHECK_LIB([cap-ng], [capng_clear], have_libcapng=3D"yes", have_libca= png=3D"no") +- +-if test "$have_libcapng" =3D "yes"; then +- AC_DEFINE(HAVE_LIBCAPNG, 1, [Have libcap-ng package, libcap-ng libra= ry]) +- DAEMON_LIBS=3D"$DAEMON_LIBS -lcap-ng" +-else +- have_lipcapng=3D"no" +- AC_MSG_WARN([libcap-ng (or development headers) is not installed]) ++AC_ARG_WITH([libcap-ng], ++ [AC_HELP_STRING([--without-libcap-ng], ++ [build without libcap-ng (disables Linux ca= pabilities support)])],, ++ [with_libcap_ng=3Dauto]) ++ ++if test x"$with_libcap_ng" !=3D x"no" ; then ++ AC_CHECK_LIB([cap-ng], [capng_clear], ++ [ ++ with_libcap_ng=3D"yes" ++ AC_DEFINE([HAVE_LIBCAPNG], [1], [have libcap-ng head= ers and library]) ++ DAEMON_LIBS=3D"$DAEMON_LIBS -lcap-ng" ++ ], ++ [ ++ if test x"$with_libcap_ng" =3D x"yes" ; then ++ AC_MSG_ERROR([libcap-ng support requested, but pac= kage not found]) ++ else ++ AC_MSG_WARN([libcap-ng (or development headers) is= not installed]) ++ fi ++ with_libcap_ng=3D"no" ++ ]) + fi + +-AM_CONDITIONAL(WITH_CAPS, test "$have_libcapng" =3D "yes") +-libcapng_status=3D$have_libcapng ++AM_CONDITIONAL([WITH_CAPS], [test x"$with_libcap_ng" =3D x"yes"]) ++libcapng_status=3D"$with_libcap_ng" + + # -------------------------------------------------------------------- + # Debug mode +-- +1.7.5.rc3 diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild b/g= nome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild similarity index 84% rename from gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild rename to gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild index cfe1dea..bc6d16d 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r200.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild @@ -6,7 +6,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 multilib pam virtualx +inherit autotools eutils gnome2 multilib pam virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -16,7 +16,7 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 LGPL-2" SLOT=3D"0" -IUSE=3D"debug doc pam test" +IUSE=3D"+caps debug doc pam test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -31,13 +31,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 - sys-libs/libcap - + caps? ( sys-libs/libcap ) pam? ( virtual/pam ) " # 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 )" @@ -47,10 +47,10 @@ PDEPEND=3D"gnome-base/libgnome-keyring" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README" - # XXX: Automagic libcap support G2CONF=3D"${G2CONF} $(use_enable debug) $(use_enable test tests) + $(use_with caps libcap) $(use_enable pam) $(use_with pam pam-dir $(getpam_mod_dir)) --with-root-certs=3D${EPREFIX}/etc/ssl/certs/ @@ -64,8 +64,11 @@ src_prepare() { # 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 \.\)\(.*\)/\1/' \ - -i gcr/Makefile.am gcr/Makefile.in || die "sed failed" + -i gcr/Makefile.* || die "sed failed" =20 + # https://bugzilla.gnome.org/show_bug.cgi?id=3D649936 + epatch "${FILESDIR}"/${P}-automagic-libcap.patch + eautoreconf gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild b/g= nome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild similarity index 85% rename from gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild rename to gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild index 032bc34..257766f 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.0.1-r300.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild @@ -6,7 +6,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 multilib pam virtualx +inherit autotools eutils gnome2 multilib pam virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -16,7 +16,7 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 LGPL-2" SLOT=3D"0" -IUSE=3D"debug doc pam test" +IUSE=3D"+caps debug doc pam test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -33,13 +33,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 - sys-libs/libcap - + caps? ( sys-libs/libcap ) pam? ( virtual/pam ) " # 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 )" @@ -49,10 +49,10 @@ PDEPEND=3D"gnome-base/libgnome-keyring" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README" - # XXX: Automagic libcap support G2CONF=3D"${G2CONF} $(use_enable debug) $(use_enable test tests) + $(use_with caps libcap) $(use_enable pam) $(use_with pam pam-dir $(getpam_mod_dir)) --with-root-certs=3D${EPREFIX}/etc/ssl/certs/ @@ -66,8 +66,11 @@ src_prepare() { # 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 \.\)\(.*\)/\1/' \ - -i gcr/Makefile.am gcr/Makefile.in || die "sed failed" + -i gcr/Makefile.* || die "sed failed" =20 + # https://bugzilla.gnome.org/show_bug.cgi?id=3D649936 + epatch "${FILESDIR}"/${P}-automagic-libcap.patch + eautoreconf 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 032bc34..cc9c315 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild @@ -6,7 +6,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 multilib pam virtualx +inherit autotools eutils gnome2 multilib pam virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -16,7 +16,7 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 LGPL-2" SLOT=3D"0" -IUSE=3D"debug doc pam test" +IUSE=3D"+caps debug doc pam test" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -33,13 +33,13 @@ RDEPEND=3D">=3Ddev-libs/glib-2.25:2 >=3Dsys-apps/dbus-1.0 >=3Ddev-libs/libgcrypt-1.2.2 >=3Ddev-libs/libtasn1-1 - sys-libs/libcap - + caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) " # 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 )" @@ -49,10 +49,10 @@ PDEPEND=3D"gnome-base/libgnome-keyring" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README" - # XXX: Automagic libcap support G2CONF=3D"${G2CONF} $(use_enable debug) $(use_enable test tests) + $(use_with caps libcap-ng) $(use_enable pam) $(use_with pam pam-dir $(getpam_mod_dir)) --with-root-certs=3D${EPREFIX}/etc/ssl/certs/ @@ -66,8 +66,10 @@ src_prepare() { # 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 \.\)\(.*\)/\1/' \ - -i gcr/Makefile.am gcr/Makefile.in || die "sed failed" + -i gcr/Makefile.* || die "sed failed" =20 + # https://bugzilla.gnome.org/show_bug.cgi?id=3D649936 + epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch gnome2_src_prepare } =20