Add pkg-config initialization, add pkg-config as DEPEND as most need it anyway, bug#554686

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

4 files changed, 43 insertions, 14 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 156fbc20dd1a..3f19b5865140 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,11 @@
 # 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.178 2015/07/01 15:50:00 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.179 2015/07/18 07:21:06 alonbl Exp $
+
+  18 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/pinentry-0.9.5-build.patch, pinentry-0.9.5.ebuild:
+  Add pkg-config initialization, add pkg-config as DEPEND as most need it
+  anyway, bug#554686
 
 *pinentry-0.9.5 (01 Jul 2015)
 
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 5125df4592af..813f073cbf95 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,20 +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 704 SHA256 1f0372b02de90efce4d11eaf86435a07e01a26b3241cbf6b22dc9714f579e658 SHA512 a5fa0c62d66fc06f08ff975966e3731df929ebac972c81ed1dd2ee3e140536f729e4525156a20deeae163847f855bab980ce0a7c9c08b7c72f6e455c0ec7f008 WHIRLPOOL 1f95c70e4f26eaadead6f97ce53cfae24edb95372b2cd15a32532ee8f0fb04c85cc35b404abc3faf62aefc0cc480bb38e0ffff18a88599d86e68adcf7ab2d49c
 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 2852 SHA256 527433707b0fe9e6fbf5eb03443325044247f17a3aa147c467589285a04c07a2 SHA512 a4dcfd389161150a500a39cc4f52f2fb9217dae37f425f2c821297359a2a8d653f0ead05278d73f2d79347d6fa9aabe0ac439d2f78db59b1fe7a570987c90336 WHIRLPOOL 3c5a96113617754fa4ae370a14929888f1df20373f70224ae1b779d4fedf4b93ebc0e84d77c9e46b7e801de0c41a49c491f80b6b21c5debb5ff8d08a6ac33a85
-MISC ChangeLog 24869 SHA256 efb63aac895ee753b992ba5379cecae92a0f4b4d94a768c9ff7d418da38e9220 SHA512 df60d5695c225ea9a97277ec5290c329b3f0ec112e93353ccaf4bd88d23f48fbb6b3f0a326943f7fecb733c97685125b567eb1a8c56c8d8e8c9bb46f483dc6b1 WHIRLPOOL 2020923150e95f8587a8519a566de81e1bcedcc55ce4953426ba9d56afc04a3b49f766289b23040f56e70e17f7882e167629db2ddc6ef8a9c47977e60d6b0792
+EBUILD pinentry-0.9.5.ebuild 2880 SHA256 5e0dc9d27a0e40055bb52fe9ed04e9c26f164d4885c65ab91bddfaec73d9ebc9 SHA512 ed550e41a23ea24c303377b1a6318ab1bb14377874f88e0b3297d0d9a25bb90179ca6b1b17548584aa75d110c0d8d40e603f3c9cd6cf6e0241e53b4af57a1f01 WHIRLPOOL 74a2d0359493279692093eb313ec1d56ef14665e2a8b690667dc2db83b0b718247809eff09140559b5edffbbc4f08a4da6338e64f084f77c957ef648da1d22ab
+MISC ChangeLog 25076 SHA256 4b350ed3e2c62296a22f38c5b6ad49a5e369df23b7d716bc9f0f43a3b3056bcd SHA512 d7fd206f15074cfdd9dcf68e632016ef9f2dafb69f9fa6aebcdd9be733c4a4516530e0c87c641c672b09c5158284c26a8a78b822e258d25fc80c35543bccc7d0 WHIRLPOOL 02b1809b163263570ac76fdac5923fd35512713a3c0c8dc153769d044a2fd318059ebabcc93a82e63b99ee15b7a904b0247f01a22159aa7207358d9fa71468f6
 MISC metadata.xml 232 SHA256 0f9362f8e4539dec9b2feb1bd93d34e4dff44290f4dac44dd50f9d44de62360e SHA512 79b3d9679dd2d61479a24ef159f6a23758dad2b77679824bae7758c8f47375b4548e0adf135b3dae5c6d6eff23d134f9477a06fd29789d4fb98670431670bb01 WHIRLPOOL 2ac86da5a1d1512f358400d0616ca3baba6ad55d68ad68296975192cf4f60ed55a3faefe0c3290720d61f117e6c8b24b37cd017e8b8c21c77f977dda8d3212fa
 -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVlAv2AAoJECULev7WN52FMNkIAJykFqXlVx5LjFr9EkpqhEwe
-wA9dBq4suxQNJdzbPzVFWAnIhuOkjAGG0abzJ+xiZ0Vy2ZByaELrPnm85jGWdfAi
-w4NkGIU5l6bzakG0Dlcl5GdWIhAxg88pUVZyrCGMSuczG8ACnrilUFUrgn+oC7j0
-aiaLbCfcUDb7tELHVmYccZZvqEPIMg7I53DpfpB/PV7UQEYsEGLujHHiYuml6qNi
-xGXP6WyK7mvIFWZUk3/5aeZAzFb753Wg0wobz4IMQar4BwISQNPy6v2jO5F3U7DT
-usVV7+/TllGQkd2GBv74v3jm3oz+tzL7rtdsAZNJGOc5HjcWjSu2Rtz1u9kRgj0=
-=E2kb
+iF4EAREIAAYFAlWp/mcACgkQXYk9GL8g3FFz6AD/THtO4JH0nysbH+DgXeB8t+1C
+QDR6BV7cEDkW0hlOkL4A/3C3oGo9OsP6CD0v8+tGJGzXGr0g1OUFiWNzeCA0zB6l
+=CEXg
 -----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
new file mode 100644
index 000000000000..871cf15c0ed9
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch
@@ -0,0 +1,25 @@
+From f1818d9fe0984d81e6e74abc4f0539296d1efc4c 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
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index b71cb17..44ff395 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -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])
+-- 
+2.3.6
+
diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild
index fadb6a865f65..05d7c85ab79d 100644
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.5.ebuild,v 1.1 2015/07/01 15:50:00 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.5.ebuild,v 1.2 2015/07/18 07:21:06 alonbl Exp $
 
 EAPI=5
 
-inherit qmake-utils multilib eutils flag-o-matic toolchain-funcs
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://gnupg.org/aegypten2/index.html"
@@ -27,8 +27,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	gtk? ( virtual/pkgconfig )
-	qt4? ( virtual/pkgconfig )
+	virtual/pkgconfig
 	gnome-keyring? ( app-crypt/libsecret )
 "
 REQUIRED_USE="
@@ -42,6 +41,8 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
+	eautoreconf
 }
 
 src_configure() {