gentoo resync : 15.01.2020

5 files changed, 72 insertions, 86 deletions

diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index c0c4a455ba8c..0a046554d893 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,9 +1,8 @@
+AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a
 DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
-DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb3257aabb26b8834622abdeec29798429b84f88254a1f8b04894f5cac2ef63c2a0bfd47ad32761d8d73cd0b189 SHA512 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
 EBUILD gcr-3.20.0.ebuild 1829 BLAKE2B 4cdb4fb25af92ac581d523cb513f4e9f3ad0093e3a76f1aad302c2acf0ca504124844ff74e12cdd6e09033f773dbc73e9a6aac584372e7fc77f8539b191a947a SHA512 2600a29a8235220a14fbfaa97253d9aa879edfcb0551095e2b45aca4879d8ade80bdf7f3dbc6ec1d05fd41b5f287b885a01de88cd55104f01722dacc37db4a1c
-EBUILD gcr-3.28.0.ebuild 1870 BLAKE2B dc9b961d72d84d62909e0b5f6daeef8520dc988d809754e27d9fc647ad15df51201627251a8c5e8ad08084eef23e7491889c5c96d70a80679cc1cdb0496dfeaa SHA512 879eef0405ec069d112152c8a7c2b8c202e81a973869f6ea49589f0a7c51c9c058087b1c060575638485dd9361fdad2aebe5c7e5b71c05d82b39de5b673ca347
-EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B 3e7aa573f3ae68dcb674a7c958b5c32ec1997f31e085e244e1c2ac884d1d4877ddbd652f9a9c961e559c82c7a4dc16e4d576bd20593bda9be08723e806e8a316 SHA512 a679c598da68adb6779040719baab11643acfb7b51b912a0bead6f75d1367c47e797903e502756952589fdef0b1a1361d80adce39dd7e6b2a35dbd0d658b2c0d
-EBUILD gcr-3.34.0.ebuild 1837 BLAKE2B c7c8e60e48caaa36a40622bcb8061f1764f6e0a5e8a8e59d48231599c8e1f5e931603c0fc8be07cd8713a2e5a8f6c5a8c59a32df07b763f296f4fa8871ce005b SHA512 4194a41ad61ba70924daa7951bf7be764d88350d557eac536718ea8562b36e170c26af7c972db242eacc513e410a2b1f953394677ae4fa35aef7d0ebf6702a25
+EBUILD gcr-3.28.1.ebuild 1870 BLAKE2B 6fa9610bebbeea98214a751bf7302a759c21d584dc0e9d7bda104bc1ffdbc8d9c9879af23a0eed3e8fbbb854cf4fae77845c101ca2e643425a1b9bc8c30bc925 SHA512 575baec3c6962b1df651d74895d105a9251878eb107637ed000350bfc216201a249eef098b5f77661db82ffb53a469cd12b18b09fe1931386ef2e1eaa2120906
+EBUILD gcr-3.34.0-r1.ebuild 1903 BLAKE2B 23288de8ea7ad89cf509ccd8f52a5c25d06706727c0a6b59210a5edb24d4f245bd2c91ae236fffe867282bc0bfc8406a4e6547a74f364bba6ac46bb7de31dc7d SHA512 812b9e273dada36303997dd7e097f98a8cb3e17e7a600f1f2c990ca32cd69e17c0f0c9e2a24ea7a71c57539bb544010cae80157dfcc0c36aa3459e22ea392431
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch
new file mode 100644
index 000000000000..0678937fcc0e
--- /dev/null
+++ b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch
@@ -0,0 +1,61 @@
+From a69dc44e11270ce092babfa57fe3aab31da9619c Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@src.gnome.org>
+Date: Mon, 21 Oct 2019 12:02:05 +0200
+Subject: [PATCH] build: Use sed for .desktop variables substitution
+
+We can't do that with configure, as it leaves ${exec_prefix}.
+---
+ configure.ac   | 2 --
+ ui/Makefile.am | 6 ++++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1ba43d6..6286f16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,8 +423,6 @@ gcr/gcr-version.h
+ po/Makefile.in
+ ui/gcr.pc
+ ui/gcr-ui.pc
+-ui/gcr-prompter.desktop.in
+-ui/gcr-viewer.desktop.in
+ ui/icons/16x16/Makefile
+ ui/icons/22x22/Makefile
+ ui/icons/24x24/Makefile
+diff --git a/ui/Makefile.am b/ui/Makefile.am
+index 29c33e7..7594621 100644
+--- a/ui/Makefile.am
++++ b/ui/Makefile.am
+@@ -209,6 +209,8 @@ gcr_viewer_LDADD = \
+ viewer_desktop_in_in = ui/gcr-viewer.desktop.in.in
+ viewer_desktop_in = $(viewer_desktop_in_in:.desktop.in.in=.desktop.in)
+ viewer_desktop = $(viewer_desktop_in:.desktop.in=.desktop)
++$(viewer_desktop_in): $(viewer_desktop_in_in)
++	$(AM_V_GEN) sed 's|@bindir[@]|$(bindir)|g' $< > $@
+ $(viewer_desktop): $(viewer_desktop_in)
+ 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ 
+@@ -231,9 +233,12 @@ gcr_prompter_LDADD = \
+ prompter_desktop_in_in = ui/gcr-prompter.desktop.in.in
+ prompter_desktop_in = $(prompter_desktop_in_in:.desktop.in.in=.desktop.in)
+ prompter_desktop = $(prompter_desktop_in:.desktop.in=.desktop)
++$(prompter_desktop_in): $(prompter_desktop_in_in)
++	$(AM_V_GEN) sed 's|@libexecdir[@]|$(libexecdir)|g' $< > $@
+ $(prompter_desktop): $(prompter_desktop_in)
+ 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ 
++desktop_in_in_files = $(viewer_desktop_in_in) $(prompter_desktop_in_in)
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+ desktopdir = $(datadir)/applications
+ desktop_DATA = \
+@@ -247,6 +252,7 @@ EXTRA_DIST += \
+ 	ui/gcr.gresource.xml \
+ 	$(ui_RESOURCES) \
+ 	$(mime_DATA) \
++	$(desktop_in_in_files) \
+ 	ui/fixtures
+ 
+ CLEANFILES += \
+-- 
+2.24.1
+
diff --git a/app-crypt/gcr/gcr-3.28.0.ebuild b/app-crypt/gcr/gcr-3.28.0.ebuild
deleted file mode 100644
index 87349d2c1600..000000000000
--- a/app-crypt/gcr/gcr-3.28.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-libs/vala-common
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	dev-libs/vala-common
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 425748137ff2..868f38cc2306 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gcr/gcr-3.34.0.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index 8c1028f2f520..3c984e3e1e38 100644
--- a/app-crypt/gcr/gcr-3.34.0.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python3_{6,7,8} )
+GNOME2_EAUTORECONF="yes"
 
 inherit gnome2 python-any-r1 vala virtualx
 
@@ -38,8 +39,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
@@ -47,6 +47,10 @@ DEPEND="${COMMON_DEPEND}
 #	dev-libs/gobject-introspection-common
 #	dev-libs/vala-common
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-desktop-files.patch
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }