Even better pkg-config resolution, bug#554686

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

3 files changed, 48 insertions, 24 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 754c47113455..f8674ad70992 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.180 2015/07/18 07:29:19 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.181 2015/07/18 08:16:33 alonbl Exp $
+
+  18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  files/pinentry-0.9.5-build.patch:
+  Even better pkg-config resolution, bug#554686
 
   18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
   files/pinentry-0.9.5-build.patch:
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 5d4d4fd5aba1..184947bcd289 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,18 +5,18 @@ AUX pinentry-0.8.2-ncurses.patch 824 SHA256 7d5e485e2c6dcce80ab63055d24761f53ae2
 AUX pinentry-0.8.2-texi.patch 688 SHA256 47c5280fb82d0ba15338c60765c1ee37b368baf774a821f7afe85a7bf16dcbbc SHA512 4cd0b58a8719d0569d9a3c7c8258e609ccd6239436e3b981afcfb95859f8f4b898a8c29db3b310fb3611b285e58f89b09c9c9f8607a9168ee26ffc054ed9f680 WHIRLPOOL fd574ed478dcd9ff1a9306da1122f20d6f894ca055ed4f368f6796c5b41bfcff9c7842c8ed9a9b8a235ccd4031a153d9f0cf43e60e0cec16e482bcc021a21388
 AUX pinentry-0.9.0-accessibility.patch 2587 SHA256 80adf350a7fa17ab7d60b36d1d373f629c85424de96950c4156fe44e0c2691ae SHA512 2c337e71aad65af0fae7d82bacb08304e1c276cbc0cb318442669a3c711ea0be7b909a5ff9c6a5e846464d1e91645ec5a2c57d9deb5eaaa8b16ce3c5244684a8 WHIRLPOOL 02bf8215210b81f48a16a519b9207356fd32c42a42acd1eaeae9faf81e5f8b500c006a3491948b48df855b7a44cde4976753a71494ff1a1b1b407d2ed653af56
 AUX pinentry-0.9.4-actually_respect_users_pm.patch 1499 SHA256 9b9843f7e15d8bfc8f426e6a94342ef07ad6b47eb3b638fa7074c7f9fd250315 SHA512 d31e26cb4b518be597cd83bf4e771419009795315ad87fc2ac1b0d44264adaebdacdcfaa1d5a325c7f9d6bec692d7d6488b008473608cd7aa96685075c279a27 WHIRLPOOL 259d8cbcd3368e46564a78b9aaef91ab2ec5947a470c617099e2145d7757df664017704ef94654d18a63e74ebd726dddcc33be51d01d924395188329d36af400
-AUX pinentry-0.9.5-build.patch 820 SHA256 2cdd457e0bf8cd0c31342aa14ecbda6674f382838795e1befac7c1415a34766a SHA512 deb8253026d7764bdcb430a47e48d598bf3ebeac2c6360d765b042791ecb2a17e284202a64aab18769befad71de9fd3044bd0c388540a8ef1539483c00c75e42 WHIRLPOOL 5c613e22f65a69b47fa6739b3f38b11344fa22c247532af4feda3b7e870168f9d6bebdf31e7867cccbcc37e35f0b0b8371ed7045108199febd1ac0ad2dad5ce6
+AUX pinentry-0.9.5-build.patch 1632 SHA256 e78b4299eafd4cf90914f11882a19c2f26eac37efc6ffd0c639ea6a79c2e7927 SHA512 9d4f5dea925710da263546f52c685e82ddce66a52c3d2e16e52411b27a4adba07d28502af174217f138660eb8b016beb17a2e23a45edb757f49f80854f56a699 WHIRLPOOL 5fada469994b8fc155401d733a6a0f1ba226f6c4caeece77885b19608bf5649db4137ab584485965c439da8249598d1e0591e1934bf3748a0d8e1384a79f02bd
 DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
 DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727
 EBUILD pinentry-0.9.0-r3.ebuild 3136 SHA256 fbd8f91d0c28a92bc6923d19d0414f3c1b4035e6ce59eb7fdb153e5fe63f4551 SHA512 40c06d484b680507b18fdfdbbe17da15c1f41b9b7c87e8a3435b88d363f26d7ac8ec8d045c8e9f9988d110fe8ae826c249d5549974fe5bd60544718efadc4671 WHIRLPOOL 4053c9edbb0c036790166ba62ba25017eee419e43d5fadc2f561913d0a584fcb7d0b72e4da5e6a529316e06b23314bd88c17099e2fafe6c2b71a101129b7010f
 EBUILD pinentry-0.9.0.ebuild 2901 SHA256 e890a9acc471f6252fe4658e7f5b54a99525c06d5cf96681c3d0483dd9735829 SHA512 cfcd1733d69eebcf8e1c01d275edf7e50be76ddfe1fb439ebde80d7ae3f188d1f4feafa4fe471beb59a6d82aab4edf681a122f4acf74083b0e7816605faf0c7a WHIRLPOOL 5502e3e32b46d1aec265eeac5467772c95d7d404b5afe3e1a4b56333e8d581b4e8270b5cad44c66db99949229cbf6d3a38c12c7ca43174a87da6f3bc090775ff
 EBUILD pinentry-0.9.5.ebuild 2880 SHA256 5e0dc9d27a0e40055bb52fe9ed04e9c26f164d4885c65ab91bddfaec73d9ebc9 SHA512 ed550e41a23ea24c303377b1a6318ab1bb14377874f88e0b3297d0d9a25bb90179ca6b1b17548584aa75d110c0d8d40e603f3c9cd6cf6e0241e53b4af57a1f01 WHIRLPOOL 74a2d0359493279692093eb313ec1d56ef14665e2a8b690667dc2db83b0b718247809eff09140559b5edffbbc4f08a4da6338e64f084f77c957ef648da1d22ab
-MISC ChangeLog 25266 SHA256 b8884c637af646c2c69bda5258dcf433d33060b916bf5b9dbdb112ed2b907958 SHA512 8e486be6fc95c3bcf23a7aefd4de30a394777bb3db7cd763b9796f59e06d447304db14c5d24eb8d0ef1ab491b365c3ba383b350e5b5a4db24f4602e4934cb41f WHIRLPOOL af8387ef25f3832670a357793c05a2a7d44674d9311e61b2a1066b7d6e25eba8077199b339d5da2306bf3b13639a7f462464f655ffb6579b9b1ea57ba2be480c
+MISC ChangeLog 25399 SHA256 ed2917d44a78f2f1cc75dc093b9ea3f7fab2f0702513a8972a80153b608da1d4 SHA512 afb7ac22f6d274be4535cb395d3c893199f6505396300362a9ee016b140262fa041d474414444e77715f4d62cb1e4eb86325b5a699fd4a1461e6f72ed91fbf66 WHIRLPOOL e0a785b06ac9f8cbd43dcc3f3db9b793860233c009e06e80d86acd209be74c524068b0af8faa8febcd75b69b4a33026d75446e7bb7fe1c87890b0880b7065292
 MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWqAFMACgkQXYk9GL8g3FEuzgD9HFVLjgAZUZhEfzqLRrl7+Z6T
-nq/QlDG8srmJxia+ng8A/32uFKeNV1uGrMYjTvVljWS7SAciI7zn4AnodKinn7Ts
-=m2oI
+iF4EAREIAAYFAlWqC2UACgkQXYk9GL8g3FHRagD9HQvfw3KfkZTj8fDSp522cVrP
+6E3T8gixneJ7SMuMkZQA/iKqWqVOzxu2L4/e8W4Rf4x8Q5z6yq4ujqlJVsfRuXUX
+=A0ik
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
index ca8fd56fe41e..2ef9a6779ee3 100644
--- a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
+++ b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
@@ -1,32 +1,52 @@
-From 4d60122ebe50182976088086844e11e8119ea906 Mon Sep 17 00:00:00 2001
+From 29384a828ad83644df9093bb292194d1ac6e689b Mon Sep 17 00:00:00 2001
 From: Alon Bar-Lev <alon.barlev@gmail.com>
 Date: Sat, 18 Jul 2015 10:14:49 +0300
-Subject: [PATCH] build: add pkg-config detection
+Subject: [PATCH] build: add pkg-config initialization and modify detection
+
+add PKG_PROG_PKG_CONFIG as the qt4 detection and curses detection are
+already using pkg.m4 which require proper initialization.
+
+modify the manual detection of pkg-config based on the error value of
+the PKG_PROG_PKG_CONFIG and not the manual one as there is a conflict
+between empty and 'no'.
 
 Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
 ---
- configure.ac | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b71cb17..7b9243a 100644
+index b71cb17..7afa318 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -542,6 +542,14 @@ AC_ARG_ENABLE(pinentry-qt4,
-             pinentry_qt4=$enableval, pinentry_qt4=maybe)
+@@ -85,6 +85,7 @@ AC_PROG_RANLIB
+ # for Qt and autoconf does does not allow that.
+ AC_PROG_CXX
+ AC_PROG_LN_S
++PKG_PROG_PKG_CONFIG
+ AC_CHECK_TOOL(WINDRES, windres, :)
+ AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
+                [build-aux/gitlog-to-changelog])
+@@ -430,8 +431,7 @@ AC_ARG_ENABLE(pinentry-gnome3,
  
+ dnl check for pkg-config
+ if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
+-        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-	if test x"${PKG_CONFIG}" = xno ; then
++	if test -z "${PKG_CONFIG}"; then
+ 		pinentry_gtk_2=no
+ 		pinentry_gnome_3=no
+ 	fi
+@@ -504,8 +504,7 @@ AC_ARG_ENABLE(libsecret,
  
-+dnl check for pkg-config
-+if test "$pinentry_qt4" != "no"; then
-+        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+	if test x"${PKG_CONFIG}" = xno ; then
-+		pinentry_qt4=no
-+	fi
-+fi
-+
- dnl
- dnl Checks for Qt4 libraries.  Deal correctly with $pinentry_qt4 = maybe.
- dnl
+ dnl check for pkg-config
+ if test "$libsecret" != "no"; then
+-        AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-	if test x"${PKG_CONFIG}" = xno ; then
++	if test -z "${PKG_CONFIG}" ; then
+ 		libsecret=no
+ 	fi
+ fi
 -- 
 2.3.6