[gentoo-commits] proj/musl:master commit in: gnome-base/gnome-keyring/

[Aric Belsito]

commit:     fd29867dc894c8484840a14f4ac6f53885fad536
Author:     Rasmus Thomsen <rasmus.thomsen <AT> live <DOT> de>
AuthorDate: Wed Mar 29 14:07:46 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Mar 29 16:31:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=fd29867d

gnome-base/gnome-keyring: version bump to 3.20.0

 gnome-base/gnome-keyring/Manifest                  |  6 +-
 .../gnome-keyring/gnome-keyring-3.16.0-r99.ebuild  | 90 ----------------------
 ...18.3-r99.ebuild => gnome-keyring-3.20.0.ebuild} | 28 +++----
 3 files changed, 12 insertions(+), 112 deletions(-)

diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 361d164..3a38442 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-keyring-3.14.0-musl-add-sys_select_h.patch 504 SHA256 17abd3f7674e162c69ff0fe0138271403c4b8a67595866fff5a3272a6001ad0e SHA512 1b809e0529ad86719b6409cfb83f88bb8529c5da3ede71d5353a26123206183c05e96297c8f14658654906c9ed14505d32c6a6ef9184cc59e39877450dc81274 WHIRLPOOL b29265de7e3129bdc458c08555051c4884a800c09fb3c6e2211cf3e708c137f637a7d3d741fadeafd68a2313d26e584f9f8203743e96ccfaf62ace7759d21253
-DIST gnome-keyring-3.16.0.tar.xz 1179776 SHA256 15a3bb8c53855a4ff0dbbdfbe4ec3df206c32048f50bdc76a51f8e3e14ece1f5 SHA512 eeb5c614395dda0e046056899f9eb6f962253b48d6b668bb966328e75863010c1f653ba2d8f7ca60bdd8ff5c43f77604396f0e4c448236c5b010dd0c61ffa069 WHIRLPOOL dae5b7294b8274623cd0ccebd57b348b8b73e58bd88f32b12f982f1e0413a042e72adf69a36a21619c34c4726965031e1a5aec476d143f99315a4132bc19df8a
-DIST gnome-keyring-3.18.3.tar.xz 1205108 SHA256 3f670dd61789bdda75b9c9e31e289bf7b1d23ba012433474790081ba7dc0ed98 SHA512 123819218477cd9b617d9cc2c1d10483d9c790bb90edd5b20298a1ba38aeef10dcddf85fcb6b9b92969dd64e53caaaf825b5cbb741e57461050be4973e8c2f78 WHIRLPOOL 01fbda3232cfdb3f2f79f5718c5ad22a871b43ed75722a9ab69f2932f8afc01809b4dc5b5ea1aaf9f17ed8efe973dd12bd700831a9dd62300513d91655359ca6
-EBUILD gnome-keyring-3.16.0-r99.ebuild 2295 SHA256 c20658b31e6c9db0f4806a9b814835878e79d8f2b528778458e06d86fa6bc13b SHA512 6f13b0d62f58768cc8f55431f585ff7e1d434dae2ca24a9da58e25e5f6073069665afc403e3431ee7d30e244819d94adc954b260542788caade627c1eeaa3ee5 WHIRLPOOL 87153185f09ed95310705420ab0b6f4f8530085cf7f5ab167d089651e7974f421c8c19d4ec23c6eafff995c763ceb5c5cbebd22b708a6b76d789ebcffac120d6
-EBUILD gnome-keyring-3.18.3-r99.ebuild 2225 SHA256 979ea8397397765f5cbf65f0200b5b53272f4eb7cc732a11a34b7e9fd76a6d69 SHA512 825cb658b9dbadb6cba8df909a20c1a9dc21448b59af89289f04cfc75f4c02a8553e533128f0441cad07da472f4e81697b62b9156e5602ead02644c727530fc5 WHIRLPOOL 2a8183b30a23a19d2f66c7f3ee339d2e2b97a2bba8c1304357a574b808285e2e959af889cf8ded600c0e5f50509841b66f80691a9bc079438c0af93575b3737e
+DIST gnome-keyring-3.20.0.tar.xz 1215324 SHA256 bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99 SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b WHIRLPOOL 63ceaf842b4f9661eb732fbddec6f26dda7ae157e405eb0d0b377ff07dd01c0e0ae3b3c0dd07d2434199edb3730994231da936aaf472054ee5cb76f089439fb8
+EBUILD gnome-keyring-3.20.0.ebuild 2227 SHA256 bc537197051f520a0cd5b3d20c66568a6c317c5926106bd35302f8387b4f54c1 SHA512 17ed3ff4f54a474929a9a6d8bfcc720ac1119e6b1e2985dec535b8d52f7cf9f9743be6d95c74dafa7f69fe73bfb75bd4d4492916c18b07203c54306f49e7efc3 WHIRLPOOL 3fb8e5c9298601259b2420dadcf0307e2e39fc5c46751ba705e860d0841c3b64db2723d19ed53bfe61c7c967f46dbd21e06baeda70f0a9dbe5037b223d421b43
 MISC metadata.xml 883 SHA256 7f875d089777be10faa6f0e2e122e557ad278bbe6b924c2b21664715c8bf8b95 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a WHIRLPOOL 3d1be4bed4019ce047bda331b2342a08a91e823eff266de3f99be6f987632bb37b46321415003479325022dc41dbefc9daf3f42f68fad6787ad4f5782966322d

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r99.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r99.ebuild
deleted file mode 100644
index 0f8381d..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r99.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="amd64 arm ~mips ~ppc x86"
-
-# 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="${COMMON_DEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	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() {
-	epatch "${FILESDIR}"/${PN}-3.14.0-musl-add-sys_select_h.patch
-
-	# 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
-
-	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-3.18.3-r99.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
similarity index 78%
rename from gnome-base/gnome-keyring/gnome-keyring-3.18.3-r99.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
index 1314049..14ecc60 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r99.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
+EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 
@@ -15,23 +13,20 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="amd64 arm ~mips ~ppc x86"
+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
-COMMON_DEPEND="
+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=
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )
-
-	>=app-crypt/gnupg-2.0.28
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/pinentry[gnome-keyring]
+	selinux? ( sec-policy/selinux-gnome )
+	>=app-crypt/gnupg-2.0.28:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=app-eselect/eselect-pinentry-0.5
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt
@@ -40,14 +35,14 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	test? ( ${PYTHON_DEPS} )
 "
+PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
+PATCHES=( "${FILESDIR}/${PN}-3.14.0-musl-add-sys_select_h.patch" )
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.14.0-musl-add-sys_select_h.patch
-
 	# Disable stupid CFLAGS with debug enabled
 	sed -e 's/CFLAGS="$CFLAGS -g"//' \
 		-e 's/CFLAGS="$CFLAGS -O0"//' \
@@ -67,11 +62,8 @@ src_configure() {
 }
 
 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
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
 }
 
 pkg_postinst() {