Bypass dumb pkg-config install checks #438922 by Benjamin Peterson.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

3 files changed, 28 insertions, 12 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 05b7d924263c..c0d9f568e4bf 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.211 2012/07/29 16:50:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.212 2012/10/23 20:07:18 vapier Exp $
+
+  23 Oct 2012; Mike Frysinger <vapier@gentoo.org> ncurses-5.9-r2.ebuild:
+  Bypass dumb pkg-config install checks #438922 by Benjamin Peterson.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> ncurses-5.9-r2.ebuild:
   alpha/sparc stable wrt #413897
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 7f32b41785c6..26901f38f937 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ncurses-5.6-build.patch 265 SHA256 51cc2319ad1f854500d76ec978897f6af92d31cebb7f454c1fd649568ad4a251 SHA512 9b3643c1660237332474027293ff8718b02bf8795275b5fabf0efa96ec6dfa0f80c0e6a3a5c7c331456d2b47f1e65f9ccb0b67490ca60285e4fbc97ae5cddad8 WHIRLPOOL ea8d7a6541c1b7b4305bdca22c0bc6ce48bc53a4e1834889ff45bb76d38698559c2392307c4ff8bc9ed1f8812cc6a391155056cf9379fb14a4e9869fe064eddb
 AUX ncurses-5.6-gfbsd.patch 817 SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065 SHA512 e7aca7a38d7ef6c296ff62b4a8e87c71dc4a578126cba679bdea004aa1f284e44b877bd353d71a16cdf9ff0489216852173ebe49b85b53065ffa62ef2cee4097 WHIRLPOOL 0f454cb42f4bc3b6def9b084cddd419a1b0bcb183a3b4b0972e67b7b45ba39b7937da08df63a5e7c2a2b77e5c2f99c516f5f2f0fe0ab542508ffe0def0970b39
@@ -17,14 +17,24 @@ DIST ncurses-5.7.tar.gz 2445052 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f
 DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 WHIRLPOOL 069e98c6392ce9aca960c72a20f1a502387d33a4b237aaeaa95548024ce4d47b129eafbe0288d21c590e725fe71aaca21cacb300f11a660b7234cb39a777672a
 EBUILD ncurses-5.7-r7.ebuild 5156 SHA256 3c1f3374af972166fd9418035accd4b06702aaf4de0880cba7bdfcf3083cd598 SHA512 eb7ad4c6b3e13e46c1be8453bac8e13e2073cc04c2f640e3b776388ae4c031e7f973088a47246f011329bc4a892235f3eecd73fed467f69a47709188252b22ad WHIRLPOOL bfee437aa6d657525df005b3899d4ece1046f20cd57824add4f13200ef4c0a2d0d6e96b016d631b552e3c4cc4cb6a703f4ecc18bf4cacf80cadc6107f53a4bac
 EBUILD ncurses-5.9-r1.ebuild 5278 SHA256 a0b4642b95cef0e696c65ef4ba12324fe528777a2ee249627d33ea723146928e SHA512 bdacc83bf75a318a260edc1257d473d3200f6cb62e9e5a40f1ac65073b1b2d7fad9e3501ad975d041b32425d4194bed63733eaf743d69120849069f15dc5c234 WHIRLPOOL bd821d341991d98520da5ce4b0f8d0bf2c774ac91ab4af4ff3f318c7ac552d604cfaca23ec678565eef577b254c2d1fcc22f7f00e285ca2783db626c42a729b2
-EBUILD ncurses-5.9-r2.ebuild 5375 SHA256 cc8ce1e1ab1427ad4b8ecf07e3f1f67da6b9aa1f8ba9893e6686ac22352c9484 SHA512 0a2059317d94fd47b395389c467939f3e2b7cccf46731e3c22bb7201c4159e813d5316b62bcab4ed2a8c0725f2d588fd9e45ef6237b50c218ef936038d86ceb1 WHIRLPOOL dc534a3eb8230fb691610c8f016b0d456e0092c67e06949ca350c3d8ee07c595bd0a0fa7191f066771ac0d5051be504c34962f3b14c121fed389613c4f93712a
+EBUILD ncurses-5.9-r2.ebuild 5563 SHA256 e782c51b3e98611be6eda86bf7b9f0591908bf0362d0d61da7b22acf0c1df042 SHA512 459c505e562bbbaf88322a093da1a17ca57a31932a5314d2ffc2a8044661b033367fd9b8e9cf7ac2dc897109f95e533be50dad7981be2270b0467f87c1769c84 WHIRLPOOL 3e61a0be5392249623e1f95dc5bd1840f28e24a2e6cd2f305a200392a916a29b6089f7ab3825eb71f1fc18867f5525021a3939cec9944b43e9251c98ca9a2d1b
 EBUILD ncurses-5.9.ebuild 4910 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b SHA512 40f4db535eaa496460095a276979cda32b30d0f649bf0c2229e07c4ccd94e51d7de2021981474c112cccb1f4636d91ff27eda1599bb9d681d0d15d63dd6c401b WHIRLPOOL 79badbfdbf1b71dbceca73160c2623f97d8b472ff166d905d8a24ef50198e5668a90cf76f7eaa12d5c69a3e78d436e592cd0fe3dbbceaa6770905a1562fb75e3
-MISC ChangeLog 30234 SHA256 e5f88f77c4c00603ef5bed3b15905325629b2afd7502844cf0deaa3a07b63b6e SHA512 c29352f740929c2d96cfd68b99a13ae986e1e482f378426c535beccd9b74413796cca0d66146cb3522d20504162a6565f98f465dab22e26738a5b53a8c00ff24 WHIRLPOOL ed1d2af514e3059834c5983477151f039f1d20b262c7cee313b523d18859f8f1a659b944b7de0b1d6e11e3417dccc9efb00e9339f8d57453ca0e1b90ff5d737d
+MISC ChangeLog 30377 SHA256 20b7063ec8238109293cd6a5d8a4e07380fe0a724363774c8669b07814a8ece5 SHA512 cd9477953aac29d2634e2af68651a1fc6e03bf3fd1c8c7d5ef81a025c777a7f92a5cc79621eb1d60b8111366bb208812bb75ac283e5e54de8ec5da2561c6380a WHIRLPOOL 79c343e11820e94d70ae23e2418899518d678475d3b701eb6f658a5117fdeb055c85e0f0b9cc1e427e63af5b11a261b71772a00a588432f17a88113df35e4a45
 MISC metadata.xml 320 SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779 SHA512 f25072f8c0fbe0488e2077d024c5973e5d5498ba035c5cabba054ab3385923bd48917e13a9583b31b3f3cfcdff96589c20d97d43976b133f61c23d206176bce5 WHIRLPOOL d239464c107a9287cea0b152613ce8b1c63e7af81d2f322ce8283c8cb2ededa6534d0f2dc8e75f7cf8a7a400404d044ae5cbf9e44f201ec3f9a789d69022484a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVacUACgkQuQc30/atMkDLhwCeIpCReQNerjsb+f+IXbREh6H8
-yqwAoL/aEzif2DPDTinTSQyIOce5ztVB
-=INyC
+iQIcBAEBCAAGBQJQhvj5AAoJELEHsLL7fEFWnmEP/0zovgXGUMOauHTP2WZgVlWU
+O+MOfa1pddmVmO/TuD8pvKJSIu5np0SGg+Yth/I9RjQUWCXALgwQXII2k8A/Ftal
+WJmfdnqBsNvWy2cPHFPnppojPtLORtHMf7bMu0D0zUe784JvPXLP6YS2kFh4vARL
+sDzpE2KbRRNOfLIzT/y6upwHOUuObMXpGSIjxohj0wYpI04WFC73a1d8HFJPLhLy
+PrFGspdWJKycqSUBqLj+o2XISvJq0zggS843rheXZWOOjuK3jHCe6IqnJjXdbO6y
+fkAgUkQkDnKdVaZQZEZWWvJK4d+Qj0Qf2RgcKnu1ZTeG6lU1F7BYfoXZNaiG/oqa
+mTZA4xzYAgPRCx2ifWkaKNRHjoo6273gjlb2RNpRtlp8mk+M7gXjYo7fcS1UvBz4
+mpcqSCFtm01qQ7HLrg2XxOphk54F86FXbE5WgFtYWNCvVjm3Fa9hRaf43dEiy9vG
+2EAijNAW2JXvVvQfQboamZG9KeKJLlEUw2dAwUs/3qVA5U3AHtlC9dU1eaal79jx
+78mjuqrp8t11ID7Mh/4BYeCbHNbwptDyfYyy3DMRcXMD+HR2TYidO/H5qyOVrvDD
+NxAlXbsjDPFTbPP5FLpx6cgRIJkduGf5lsuNIcfo9L0Ut4kNL9Cjs+DhlQlnn+eV
+6ab1/npd04eUHqoBEJWV
+=zUbb
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
index 82890594441e..836835da6442 100644
--- a/sys-libs/ncurses/ncurses-5.9-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.15 2012/07/29 16:50:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.16 2012/10/23 20:07:18 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -32,9 +32,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
 	epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
 	epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
-	sed -i \
-		-e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \
-		misc/Makefile.in || die
 }
 
 src_compile() {
@@ -66,6 +63,12 @@ do_compile() {
 	cd "${WORKDIR}"/$1
 	shift
 
+	# ncurses is dumb and doesn't install .pc files unless pkg-config
+	# is also installed.  Force the tests to go our way.  Note that it
+	# doesn't actually use pkg-config ... it just looks for set vars.
+	tc-export PKG_CONFIG
+	export PKG_CONFIG_LIBDIR="/usr/$(get_libdir)/pkgconfig"
+
 	# The chtype/mmask-t settings below are to retain ABI compat
 	# with ncurses-5.4 so dont change em !
 	local conf_abi="