* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/
@ 2011-07-26 3:17 Alexandre Restovtsev
0 siblings, 0 replies; only message in thread
From: Alexandre Restovtsev @ 2011-07-26 3:17 UTC (permalink / raw
To: gentoo-commits
commit: dd6707d4dc33b34c2515a871559ac68ce04d16f0
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 01:22:50 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 01:22:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dd6707d4
gnome-base/gnome-keyring: 3.1.1 → 3.1.4
Version bump to 3.1.4 with numerous improvements, particularly gnupg-
related. Gtk-2 support was removed by upstream. New dependency on
p11-kit.
---
.../gnome-keyring/gnome-keyring-3.1.1-r300.ebuild | 81 --------------------
....1.1-r200.ebuild => gnome-keyring-3.1.4.ebuild} | 11 +--
gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 10 +--
3 files changed, 9 insertions(+), 93 deletions(-)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r300.ebuild
deleted file mode 100644
index fd49cb3..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r300.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib pam virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
-
-# USE=valgrind is probably not a good idea for the tree
-#
-# XXX: ARGH: libgcr is slotted, but libgck is not.
-# Hence, gtk2/3 versions are not parallel installable.
-RDEPEND=">=dev-libs/glib-2.25:2
- >=x11-libs/gtk+-2.90.0:3
- gnome-base/gconf:2
- >=sys-apps/dbus-1.0
- >=dev-libs/libgcrypt-1.2.2
- >=dev-libs/libtasn1-1
- caps? ( sys-libs/libcap-ng )
- pam? ( virtual/pam )
-"
-# valgrind? ( dev-util/valgrind )
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- >=dev-util/pkgconfig-0.9
- doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
-# eautoreconf needs:
-# >=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="${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=${EPREFIX}/etc/ssl/certs/
- --enable-ssh-agent
- --enable-gpg-agent
- --with-gtk=3.0"
-# $(use_enable valgrind)
-}
-
-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 = \.\)\(.*\)/\1/' \
- -i gcr/Makefile.* || die "sed failed"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=649936
- epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
- eautoreconf
- 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.1.1-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
similarity index 94%
rename from gnome-base/gnome-keyring/gnome-keyring-3.1.1-r200.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
index b10de4f..e0d5921 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.1.1-r200.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.1.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -24,13 +24,13 @@ else
fi
# USE=valgrind is probably not a good idea for the tree
-
RDEPEND=">=dev-libs/glib-2.25:2
- >=x11-libs/gtk+-2.20:2
+ >=x11-libs/gtk+-2.90.0:3
gnome-base/gconf:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
+ dev-libs/p11-kit
caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
@@ -55,8 +55,7 @@ pkg_setup() {
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
--enable-ssh-agent
- --enable-gpg-agent
- --with-gtk=2.0"
+ --enable-gpg-agent"
# $(use_enable valgrind)
}
@@ -68,7 +67,7 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=649936
epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
- eautoreconf
+ [[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index cc9c315..e0d5921 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -24,15 +24,13 @@ else
fi
# USE=valgrind is probably not a good idea for the tree
-#
-# XXX: ARGH: libgcr is slotted, but libgck is not.
-# Hence, gtk2/3 versions are not parallel installable.
RDEPEND=">=dev-libs/glib-2.25:2
>=x11-libs/gtk+-2.90.0:3
gnome-base/gconf:2
>=sys-apps/dbus-1.0
>=dev-libs/libgcrypt-1.2.2
>=dev-libs/libtasn1-1
+ dev-libs/p11-kit
caps? ( sys-libs/libcap-ng )
pam? ( virtual/pam )
"
@@ -57,8 +55,7 @@ pkg_setup() {
$(use_with pam pam-dir $(getpam_mod_dir))
--with-root-certs=${EPREFIX}/etc/ssl/certs/
--enable-ssh-agent
- --enable-gpg-agent
- --with-gtk=3.0"
+ --enable-gpg-agent"
# $(use_enable valgrind)
}
@@ -70,6 +67,7 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=649936
epatch "${FILESDIR}"/${PN}-3.1.1-automagic-libcap-ng.patch
+ [[ ${PV} = 9999 ]] || eautoreconf
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-26 3:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-26 3:17 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-keyring/ Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox