diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-06 10:04:50 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-05-06 10:04:50 +0000 |
commit | 9c6938eeb8b970a4c1d25ee931c73c908ec24961 (patch) | |
tree | 8e1dd104155fd105391d0bf95c62703006286419 /gnome-base/gnome-keyring | |
parent | Version bump, make building static libs optional (diff) | |
download | gentoo-2-9c6938eeb8b970a4c1d25ee931c73c908ec24961.tar.gz gentoo-2-9c6938eeb8b970a4c1d25ee931c73c908ec24961.tar.bz2 gentoo-2-9c6938eeb8b970a4c1d25ee931c73c908ec24961.zip |
Restore alpha, arm, ia64, ppc, ppc64, sparc keywords since p11-kit is now keyworded on these arches. Drop old.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-keyring')
-rw-r--r-- | gnome-base/gnome-keyring/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild | 117 | ||||
-rw-r--r-- | gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild | 4 |
3 files changed, 8 insertions, 120 deletions
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog index c7155702c75e..75b75b98b026 100644 --- a/gnome-base/gnome-keyring/ChangeLog +++ b/gnome-base/gnome-keyring/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-keyring # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.220 2012/05/05 05:38:10 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.221 2012/05/06 10:04:50 tetromino Exp $ + + 06 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild: + Restore alpha, arm, ia64, ppc, ppc64, sparc keywords since p11-kit is now + keyworded on these arches. Drop old. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-keyring-2.32.1.ebuild, gnome-keyring-2.32.1-r1.ebuild, gnome-keyring-3.2.1.ebuild, diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild deleted file mode 100644 index e104ec20020b..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild +++ /dev/null @@ -1,117 +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/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.5 2012/05/05 05:38:10 jdhore Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 multilib pam versionator virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -IUSE="+caps debug doc pam test" -KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris" - -# USE=valgrind is probably not a good idea for the tree -RDEPEND=">=dev-libs/glib-2.25:2 - >=x11-libs/gtk+-2.90.0:3 - >=app-crypt/p11-kit-0.6 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2 - >=dev-libs/libtasn1-1 - >=sys-apps/dbus-1.0 - 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 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.9 )" -PDEPEND=">=gnome-base/libgnome-keyring-3.1.92" -# 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 - --disable-update-mime" -# $(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" - - gnome2_src_prepare -} - -src_test() { - # FIXME: /gkm/transaction/ tests fail - unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "emake check failed!" -} - -pkg_postinst() { - use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon - - gnome2_pkg_postinst -} - -# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes -# @FUNCTION: fcaps -# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file} -# @RETURN: 0 if all okay; non-zero if failure and fallback -# @DESCRIPTION: -# fcaps sets the specified capabilities in the effective and permitted set of -# the given file. In case of failure fcaps sets the given file-mode. -# Requires versionator.eclass -fcaps() { - local uid_gid=$1 - local perms=$2 - local capset=$3 - local path=$4 - local res - - chmod $perms $path && \ - chown $uid_gid $path - res=$? - - use caps || return $res - - #set the capability - setcap "$capset=ep" "$path" &> /dev/null - #check if the capabilitiy got set correctly - setcap -v "$capset=ep" "$path" &> /dev/null - res=$? - - if [ $res -ne 0 ]; then - ewarn "Failed to set capabilities. Probable reason is missing kernel support." - ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)" - ewarn "where <FS> is the filesystem to store ${path}" - if ! version_is_at_least 2.6.33 "$(uname -r)"; then - ewarn "For kernel 2.6.32 or older, you will also need to enable" - ewarn "SECURITY_FILE_CAPABILITIES." - fi - ewarn - ewarn "Falling back to suid now..." - chmod u+s ${path} - fi - return $res -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild index 2163c34994b2..529f5de089db 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.6 2012/05/05 05:38:10 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.7 2012/05/06 10:04:50 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 LGPL-2" SLOT="0" IUSE="+caps debug doc pam test" -KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris" # USE=valgrind is probably not a good idea for the tree RDEPEND=">=dev-libs/glib-2.25:2 |