Support gnupg-2.1 building (#551822)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 30 insertions, 12 deletions

diff --git a/x11-libs/libcryptui/ChangeLog b/x11-libs/libcryptui/ChangeLog
index 370a90e54e13..b7b2b0f1f8e3 100644
--- a/x11-libs/libcryptui/ChangeLog
+++ b/x11-libs/libcryptui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libcryptui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/ChangeLog,v 1.21 2015/06/22 19:00:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/ChangeLog,v 1.22 2015/06/27 09:33:25 pacho Exp $
+
+  27 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/libcryptui-3.12.2-gnupg-2.1.patch, libcryptui-3.12.2.ebuild:
+  Support gnupg-2.1 building (#551822)
 
   22 Jun 2015; Pacho Ramos <pacho@gentoo.org> libcryptui-3.12.2.ebuild:
   ppc/ppc64 keyword, bug #551580
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
index e3e1db4df7e9..79989afe26cf 100644
--- a/x11-libs/libcryptui/Manifest
+++ b/x11-libs/libcryptui/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libcryptui-3.12.2-gnupg-2.1.patch 385 SHA256 84cf810545ca1a01c8b0e03f48d3a81ea94a843799411412c0ca6af3b597866c SHA512 59a51159ed7e01abb9cfb5223651c5f2e9708093a1974880796a61fdde6ae421d8efb780dbb1d5e956154502ee549b1b5c5b868f06dc0270bf295a6078923130 WHIRLPOOL 9b4cca40adc78021f92b1fc0dd47a585286f8dd820548a0ddd123212b030fa55261595cc697d59ed22e4edc4e0990d667df743932287d49350f18221f17059d7
 DIST libcryptui-3.12.2.tar.xz 1163784 SHA256 71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866 SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0 WHIRLPOOL 0e376834c74df1492a7ffea29646a4912124b46b972dc9bdc64dd40b19e3b9c43c85eec87416f8ea0995e7d164e763bf7b5da7f66c2103df3be44f6516b8e632
-EBUILD libcryptui-3.12.2.ebuild 1519 SHA256 9258846991dacaed4448a2658897cdc9f39118dfb857dfb186a611c37b22a9b2 SHA512 572e92c912d776775289d36ad962a7faa8370007971d26c38e9c4572cc452b660d841bbf4311c6bf7f40c4b97b482edefa3357f9ab8aee76e61baf808e39f4e2 WHIRLPOOL 6a732116e4ae730bdda2943bf48ba6cf79a5c9c5032d37dbc46cb311e358416ab25d62646ba9fdd6da0e0cae826d2733b8eb31121bbd026ae4c14f85f4e5840d
-MISC ChangeLog 3220 SHA256 b962fa639233c4483b14ecfccc29c4837abeaf5a5d73f2edeab40f0f42bfda38 SHA512 78022a4994cc598d091250a6fab405b336a5859805f3dec1b4de0a625b4291c19b3d887a839ea4a3ba85748d8b4465d6bbc2cc51d1bf288615345097ee815ea2 WHIRLPOOL 0f42015b9dedcf10b6b0f9ec47a00eb9b721c70272c3e8a03f4f0bce18308288d6c9667fbf11a7be54477914decdad006a457f62f5df966070fc57a20d63da61
+EBUILD libcryptui-3.12.2.ebuild 1642 SHA256 c0bc5316d21a9e1d6ad5537a53848f26bbf0f0336031f63a4a71a3bc993e19f4 SHA512 11c8e17a436307a831efbfe3b4346aba75dd6070e5176e84128b9b3ed9bd6d120d99d21973de6b41cab8f72f8cdef5e680cbec80aa615c2df274342ba4f06611 WHIRLPOOL 1437a3352bb8d26a41785a0dcc5ea8912dfabe742e10947ed000fb5f09724fd090e96a352edc548592804291e7039dfcaea404f4b49a0159b917c283384701f2
+MISC ChangeLog 3376 SHA256 b69d0e1c9b749a2ad642c079f0e734183ce91b7e5f955212593af0da34f2da22 SHA512 db49fda715b4841eae5bd33e7bb47d3a4c68e204b3c7f0688c946c888bc6b34eae55fcfe4e2364b6e17aff5e1c7ff6b94db56cdfb905af98ad0cd4922d6c9d98 WHIRLPOOL 18b27e77a50547a075d0fba23b8beee81db1967f265636ba2d732a000e60fb2021acac85b4ccbc08ad5147c6871b254a5ceb7be1c0c03dc11881fd9fc19cdef7
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWIW2UACgkQCaWpQKGI+9TtAACdEMXBqi6orV2oCwp9oBeoy/Rm
-+VcAn3A3/2+lRzQ7KO77/adMaRXMI8pW
-=Tg3s
+iEYEAREIAAYFAlWObecACgkQCaWpQKGI+9Rt0wCgg2C2W/+mv8AqoNmksw6s2afw
+ZPIAn2Tayaxhqe76RkJUnsb0pgZwFBB3
+=+Wnw
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
new file mode 100644
index 000000000000..25ad7451d311
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
@@ -0,0 +1,11 @@
+--- configure.ac~	2014-05-13 20:53:02.000000000 +0200
++++ configure.ac	2015-06-27 11:29:32.574106982 +0200
+@@ -95,7 +95,7 @@
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0"
++	accepted_versions="1.2 1.4 2.0 2.1"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
index 7acc4054af02..74399a9c33b5 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.12.2.ebuild,v 1.5 2015/06/22 19:00:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.12.2.ebuild,v 1.6 2015/06/27 09:33:25 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="User interface components for OpenPGP"
 HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
@@ -25,11 +25,9 @@ COMMON_DEPEND="
 	x11-libs/libSM
 
 	>=app-crypt/gpgme-1
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
+	>=app-crypt/gnupg-1.4
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -45,11 +43,15 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	# Support GnuPG 2.1, https://bugzilla.gnome.org/show_bug.cgi?id=745843
+	epatch "${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+
 	# FIXME: Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
 		-e 's/-Werror//' \
 		-i configure.ac configure || die "sed failed"
 
+	eautoreconf
 	gnome2_src_prepare
 }