commit: 16c71e35ff5a2c6ff4404c599d0c07d7d9a1cc5a Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> AuthorDate: Sat Mar 26 21:20:10 2016 +0000 Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> CommitDate: Sat Mar 26 21:20:10 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=16c71e35
gnome-base/gnome-keyring: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 ...ing-9999.ebuild => gnome-keyring-3.20.0.ebuild} | 37 ++++++++++++---------- gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 26 ++++++++++----- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild similarity index 66% copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild copy to gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild index efe0831..ecbd8d6 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,32 +8,31 @@ GNOME2_LA_PUNT="yes" PYTHON_COMPAT=( python2_7 ) inherit fcaps gnome2 pam python-any-r1 versionator virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi 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" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - 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" -fi +IUSE="+caps 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" -RDEPEND=" +# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 +COMMON_DEPEND=" >=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/gnupg-2.0.28 +" +RDEPEND="${COMMON_DEPEND} + app-crypt/pinentry[gnome-keyring] " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} + >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 @@ -43,11 +42,11 @@ DEPEND="${RDEPEND} " pkg_setup() { - python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup } src_prepare() { - # Disable stupid CFLAGS + # Disable stupid CFLAGS with debug enabled sed -e 's/CFLAGS="$CFLAGS -g"//' \ -e 's/CFLAGS="$CFLAGS -O0"//' \ -i configure.ac configure || die @@ -62,8 +61,7 @@ src_configure() { $(use_with pam pam-dir $(getpam_mod_dir)) \ $(use_enable selinux) \ $(use_enable ssh-agent) \ - --enable-doc \ - --enable-gpg-agent + --enable-doc } src_test() { @@ -79,4 +77,9 @@ pkg_postinst() { # 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 + + if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" + fi } diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild index efe0831..11e9a6c 100644 --- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild +++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,16 +24,22 @@ else 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" fi -RDEPEND=" +# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456 +COMMON_DEPEND=" >=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/gnupg-2.0.28 +" +RDEPEND="${COMMON_DEPEND} + app-crypt/pinentry[gnome-keyring] " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} + >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 @@ -43,11 +49,11 @@ DEPEND="${RDEPEND} " pkg_setup() { - python-any-r1_pkg_setup + use test && python-any-r1_pkg_setup } src_prepare() { - # Disable stupid CFLAGS + # Disable stupid CFLAGS with debug enabled sed -e 's/CFLAGS="$CFLAGS -g"//' \ -e 's/CFLAGS="$CFLAGS -O0"//' \ -i configure.ac configure || die @@ -62,8 +68,7 @@ src_configure() { $(use_with pam pam-dir $(getpam_mod_dir)) \ $(use_enable selinux) \ $(use_enable ssh-agent) \ - --enable-doc \ - --enable-gpg-agent + --enable-doc } src_test() { @@ -79,4 +84,9 @@ pkg_postinst() { # 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 + + if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" + fi }