Do not use `pkg-config` all the time.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 37 insertions, 15 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 8f05ce39e5d7..8a916a6dd65a 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.148 2014/02/22 20:04:25 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.149 2014/04/07 18:35:50 vapier Exp $
+
+  07 Apr 2014; Mike Frysinger <vapier@gentoo.org> brltty-4.5-r3.ebuild,
+  brltty-5.0-r2.ebuild:
+  Do not use `pkg-config` all the time.
 
   22 Feb 2014; Christopher Brannon <teiresias@gentoo.org> -brltty-4.2.ebuild,
   -brltty-4.2-r1.ebuild, -files/brltty-4.2-fix-a2.patch,
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 22749295e09a..9b53dac54e5d 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -13,18 +13,24 @@ AUX brltty.rc 356 SHA256 24950c773d16156fed8f71be72abefa77a4c45d930e2ea53b6371a0
 AUX brltty.tmpfiles.conf 31 SHA256 45c13fe100502b1896bd758f6c59a46fa2250ce093ad719f41854911349a0a71 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7 WHIRLPOOL eb4e009f97fe75ac90c15a222ec4b85bc7888adf09e6e0ac699718376debd9907156838ff61ee9efa35a0df94419456864659c8c66f128af10e0ec7b447b2087
 DIST brltty-4.5.tar.gz 3260872 SHA256 87af9ecff2ff563f4dc62e0ca4e8d8217ee7ee57e8344508cf0096c47ff77da0 SHA512 55efa7fffef3914638bfda2df4d4369fb4b72dd19897153bba69b11960732eda583c02a578fef6919e7d620d08beda8010d4352e4d4d8fabbbefa44b3e1c8d90 WHIRLPOOL 3d677445675da3fafa64bbad0dcfb13b85de57f7c6473ceaf2cd51a7e60fee2c425f1584ccca44ce95dcaabf5b50fede0b5c1cd35c20f556921aa7c1d7859ff5
 DIST brltty-5.0.tar.xz 2213768 SHA256 e3613fa2e8c3450d7e7bee7107235344c474dc310af5adcc19761f361e8c8b92 SHA512 2a66f2fcf0ada9a499450e14c11efe2cffd1e9b465755aab60093f383c596d4f4f3be0651e6559df143fc1547a5d5be24caf485596cb8ad691b029de110f8dcc WHIRLPOOL 3f36f036f5eb6479e9c42cc79eead215d7133cfb6d2c4de3e4eaa6f776299d021c7830e32c914b7cb7686bd4d31902c0762d309702ef686ab7b37aff6ee4161a
-EBUILD brltty-4.5-r3.ebuild 4182 SHA256 f9ee3fa821ba2f5d390f020c610c20dc8f223184cbc4f5e8f2985e3ba5b48cc6 SHA512 9bf46d9c7ac2342f5b7ed3bc7fc8eeb1c91fbd50e844ed0edc2b89a4004f2626837f058ac2d07072696f89578dc91ad5dedf1025f055d0b130453aacf0a63f56 WHIRLPOOL 48e1b4d97f50e5e50f7847cb6ec41f6c2e06ac16d5b661ce6b2c5f22f5438c272da25e08f1d4604e0c6ba342e6c21d1fad0f6c35ec92e8ec6c4b2adf6dcb85f5
-EBUILD brltty-5.0-r2.ebuild 4231 SHA256 e0be59c0c7ace38a85da0bd67b7089498d3a97abab0bfd60cf6c0131b500deef SHA512 5b9a7bf186ecd8904acb7cf8fec6eca6a7787aa4df3c036f8ab2e53c5e25df8e9da24f2679a54f21b692a42f5e0d7010ebd8623027f210d5312f26f30f4a3a1e WHIRLPOOL 6129cbe2497dd0f6f7d933c75d96ff37d8a3eed426c975eb05f1c7f84506a3169118e80351b911d5a353abb3c851e883f09119d37ea78a6a9cfc76a6705ad436
-MISC ChangeLog 19670 SHA256 592fe9cef0891a174e4085c3ea453470a209881744faecbd68bfad9022d59d10 SHA512 ba30e5ba24cddabd26ef1329c5c3e1cac98b1c498b8d5822cc7aa519174d6e3c2a91c8f27c1ab0c788ab5179a202e43aefb3bd50d60980200c2a0cbd7957dae1 WHIRLPOOL f9e6afd14c5e677268610b9665a43dbe56f0f49dbc67514c38cf5694f135a41beb4c693eb9de5392c21be05bbb8ace928ad8b7740fea698ec9df4bf6489d65bf
+EBUILD brltty-4.5-r3.ebuild 4414 SHA256 ca6a86a5ba9689093cb0fae2cdf6c080bc942e75ff2a3a469237e174680a5d83 SHA512 2d3a17f27e33c40ce8ba4ce74795ca82ed71d4229dd40b0efa564a89831a3e5e8da6bfb2343bac97123f6339d747d65a188eadf4dc2b34ec7f6a9f275780fb7f WHIRLPOOL a4bb274038287100f4bfe22c43de7885d6661ab1ba58727f11a66030021d686998dba8ec56a09de2d890a8f2585286a3210de2c5f91922f7a936c0bee21ece7d
+EBUILD brltty-5.0-r2.ebuild 4457 SHA256 5762e928bb2d1bc57b3cb2beeaa0d499a24d2414b6cb2aa4228188928a7f17c3 SHA512 44d3fd3c169104f7f8a0a3bde011ec9592c86f30ff784d9aae3f084070fe39b0403ac532dae623e997ac5d7fb2f9ba02ffdd8c208b05948b4342f8c305699cfc WHIRLPOOL 07fe45b13c9d132ccbd3dae12e6237cc1d709d4ec52fee8f4261403f1ac45c8b8dbb5d92b7fc16c7a0ac3ba1b0010ce814240dfa49539793b2d9c781ae3ded5f
+MISC ChangeLog 19804 SHA256 4be1cf5e445718b2075f152f3a8ca3692f50b3ea85b70aedab2b2094526cda7c SHA512 95607f71355c760dde80b7b084e8f59565c5c683b6ac9934e5297a4c325c7fb4c82f1651fd4d4190aca22186d962aa5b555888265c8fd1fa534f18f2037bda85 WHIRLPOOL 0d792b2336dd03fce2816d3ae5195102447b86b9400940ccac775a3b21c94ab0986fad2b277c3653fb1393f6e5e0e2a359baa39d21652dcbe539ef9ed1223474
 MISC metadata.xml 1918 SHA256 5cdd92581b4e46c8dc3c468f51bf04dd5456dbddc1f4f88fef47879953f35d88 SHA512 0dd12af812f22da964152898a256c957e2074d1ae9eb2f8dd471f8f3cfb0016439271636759b622756d67f0eadfc5f062556ff5f85be4445c03dc5fe097814e4 WHIRLPOOL 1c232cc5d306a62507be40fd18552a284e87ae2a10e920d4cc3886ea59e4bc075a0ce9636eb15f6d59fb07bfc29cf5b503b87b8425a275b079d4e91ffdf2ec78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTCQLOAAoJEH8qFnJlIeBtP3cH/3P2vOjE/GYy+IB0TUg8S5KB
-MwmcuEMdmdqH7jPYtvT5SGxrctbLwkYcF3soOh6Iwo0H0tadhTB7OVP1juZIZa5Z
-q4gzUH+/gKNoYk+DS8Bez8WPqEirHyMQ8x1xcIcG35fgmwtqjcOUvPJ2YC42DGex
-tEdaThtB0XMC1vU7oS4vbCYVWKCc9w3kZkUHqYe6k9v63LvJfj4E2TOlZLoFx2rR
-fo4Bn/1epDASjU1y1C3B02iLhEBDZFGGowqTFzP7CvEKIhzabt+rigusDPvZjfl/
-GnePQTYzFpcmFdbtQvx5op21cjusaq/IapyM2AgHTYap7lBUD3y7JbetBg6mvlk=
-=oSir
+iQIcBAEBCAAGBQJTQvALAAoJEPGu1DbS6WIAQ1oP/jm/76WMJosaCblH5Enu1Hsn
+5yNom5L50G4++O+BdCIOpHEe9TG0HVDldD+fiO7VHfNe7nZlEownAlwnysEou8EI
+RtglnH4mELSjDJ28lsxPX2zwUp+b7dm1lrMibJWXXLd1OSGl5Mq4mVve9mliycKB
+r8M1s8dVWf1yyyDzHQTacVLAGpTCkbbhcI4iOWPTH048c1ENslhKzef2q4Cpd551
+4YK9Bw3YDaVRKmxacHlvoZ/16iMg+z1PZnSumeft2Lzcg9pa8/LTvJwysqSdpoj2
+q639o4TQazPARpIBUcIsVWshorWxjfLL3/8x+6bAZ6Chkwr7s4fGW4afnKtuO4Ir
+Eu9E33lXyzMmlghJGZcHRhIy6rz2ry5DBEeWa/sY+ek7N3YwD3RIq8rZJW/Fg7AH
+N0Eip07qXivB3dm/t6fl5NcRvWElAiDexr5j11mDntxoF/PDOaKMohOfeB572OIa
+Rog6g82A5JCRwAyyuzlexAfNzMqLYh1DnmT79is0FB34gD2tOAnQaYF7fDMkEvu6
+5JHcIoaWqRDpUl+/TskHBsYf/jJSaH0/zWQkchRqqrpVtUonXIZtEriy+Gl+2DsG
+J4kDvCpFQFUXJxISfLWNgZdbLEoC6/c8SP0Kq0aQHhN6ZgcAQliNj4itUkJb3rsI
+7HLAuvysOlnipd1Hb+5t
+=b6Ac
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/brltty/brltty-4.5-r3.ebuild b/app-accessibility/brltty/brltty-4.5-r3.ebuild
index b43bc2ca3f88..872fe0450b08 100644
--- a/app-accessibility/brltty/brltty-4.5-r3.ebuild
+++ b/app-accessibility/brltty/brltty-4.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.8 2014/01/19 10:17:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.9 2014/04/07 18:35:50 vapier Exp $
 
 EAPI=5
 
@@ -50,6 +50,12 @@ src_prepare() {
 
 	java-pkg-opt-2_src_prepare
 
+	# The code runs `pkg-config` directly instead of locating a suitable
+	# pkg-config wrapper (or respecting $PKG_CONFIG).
+	sed -i \
+		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
+		aclocal.m4 configure.ac || die
+
 	# We run eautoconf instead of using eautoreconf because brltty uses
 	# a custom build system that uses autoconf without the rest of the
 	# autotools.
@@ -57,7 +63,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export AR LD
+	tc-export AR LD PKG_CONFIG
 	# override prefix in order to install into /
 	# braille terminal needs to be available as soon in the boot process as
 	# possible
diff --git a/app-accessibility/brltty/brltty-5.0-r2.ebuild b/app-accessibility/brltty/brltty-5.0-r2.ebuild
index 93b9df79ea1e..618321ee2a67 100644
--- a/app-accessibility/brltty/brltty-5.0-r2.ebuild
+++ b/app-accessibility/brltty/brltty-5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild,v 1.1 2014/02/22 19:52:12 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-5.0-r2.ebuild,v 1.2 2014/04/07 18:35:50 vapier Exp $
 
 EAPI=5
 
@@ -48,6 +48,12 @@ src_prepare() {
 
 	java-pkg-opt-2_src_prepare
 
+	# The code runs `pkg-config` directly instead of locating a suitable
+	# pkg-config wrapper (or respecting $PKG_CONFIG).
+	sed -i \
+		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
+		aclocal.m4 configure.ac || die
+
 	# We run eautoconf instead of using eautoreconf because brltty uses
 	# a custom build system that uses autoconf without the rest of the
 	# autotools.
@@ -55,7 +61,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export AR LD
+	tc-export AR LD PKG_CONFIG
 	# override prefix in order to install into /
 	# braille terminal needs to be available as soon in the boot process as
 	# possible