pacho       15/06/14 13:59:58

  Modified:             ChangeLog
  Added:                gnome-keyring-3.16.0-r1.ebuild
  Log:
  Disable gpg-agent in favor of pinentry[gnome-keyring] (#547456)
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.273                gnome-base/gnome-keyring/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.273&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.273&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?r1=1.272&r2=1.273

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- ChangeLog   9 Jun 2015 15:42:58 -0000       1.272
+++ ChangeLog   14 Jun 2015 13:59:58 -0000      1.273
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.272 
2015/06/09 15:42:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.273 
2015/06/14 13:59:58 pacho Exp $
+
+*gnome-keyring-3.16.0-r1 (14 Jun 2015)
+
+  14 Jun 2015; Pacho Ramos <pa...@gentoo.org> +gnome-keyring-3.16.0-r1.ebuild:
+  Disable gpg-agent in favor of pinentry[gnome-keyring] (#547456)
 
 *gnome-keyring-3.16.0 (09 Jun 2015)
 



1.1                  gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: gnome-keyring-3.16.0-r1.ebuild
===================================================================
# Copyright 1999-2015 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.16.0-r1.ebuild,v
 1.1 2015/06/14 13:59:58 pacho Exp $

EAPI="5"
GCONF_DEBUG="yes" # Not gnome macro but similar
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )

inherit fcaps gnome2 pam python-any-r1 versionator virtualx

DESCRIPTION="Password and keyring managing daemon"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring";

LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps debug pam selinux +ssh-agent test"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris 
~x86-solaris"

# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
        >=app-crypt/gcr-3.5.3:=[gtk]
        >=dev-libs/glib-2.38:2
        app-misc/ca-certificates
        >=dev-libs/libgcrypt-1.2.2:0=
        >=sys-apps/dbus-1.1.1
        caps? ( sys-libs/libcap-ng )
        pam? ( virtual/pam )

        app-crypt/pinentry[gnome-keyring]
        >=app-crypt/gnupg-2.0.28
"
DEPEND="${RDEPEND}
        app-text/docbook-xml-dtd:4.3
        dev-libs/libxslt
        >=dev-util/intltool-0.35
        sys-devel/gettext
        virtual/pkgconfig
        test? ( ${PYTHON_DEPS} )
"

pkg_setup() {
        use test && python-any-r1_pkg_setup
}

src_prepare() {
        # Disable stupid CFLAGS
        sed -e 's/CFLAGS="$CFLAGS -g"//' \
                -e 's/CFLAGS="$CFLAGS -O0"//' \
                -i configure.ac configure || die

        gnome2_src_prepare
}

src_configure() {
        # --disable-gpg-agent, bug #547456
        gnome2_src_configure \
                $(use_with caps libcap-ng) \
                $(use_enable pam) \
                $(use_with pam pam-dir $(getpam_mod_dir)) \
                $(use_enable selinux) \
                $(use_enable ssh-agent) \
                --enable-doc \
                --disable-gpg-agent
}

src_test() {
         # FIXME: this should be handled at eclass level
         "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die

         unset DBUS_SESSION_BUS_ADDRESS
         GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
}

pkg_postinst() {
        # cap_ipc_lock only needed if building --with-libcap-ng
        # Never install as suid root, this breaks dbus activation, see bug 
#513870
        use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
        gnome2_pkg_postinst
}




Reply via email to