Convert configure flags to an array to make management easier. Fix pkg-config file install when cross-compiling or installing for the first time.

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

4 files changed, 103 insertions, 65 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 0a2c5803e6be..6053536fb870 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.217 2014/01/18 02:22:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.218 2014/04/08 03:13:11 vapier Exp $
+
+  08 Apr 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/ncurses-5.9-pkg-config.patch, ncurses-5.9-r3.ebuild:
+  Convert configure flags to an array to make management easier.  Fix pkg-config
+  file install when cross-compiling or installing for the first time.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> ncurses-5.9-r2.ebuild,
   ncurses-5.9-r3.ebuild:
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 47e45d43e797..2fbc4b8e2a53 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -12,30 +12,31 @@ AUX ncurses-5.7-tic-cross-detection.patch 1656 SHA256 afadd1db1530054cb745193723
 AUX ncurses-5.8-gfbsd.patch 695 SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2 WHIRLPOOL 6c2f865bc22a3932f6f973f7b53c5a50254505c4944c656af95c2399933c31acc5d5536d59fe9fe7c59ef537ce0d39ca19c9d0558e4aaacb7122749a575cadac
 AUX ncurses-5.8-rxvt-unicode.patch 3724 SHA256 385b6b2afe7b95e3ad172ece63ea60ee2b8db5b5c83f55209fbd319be5edf380 SHA512 bc509b6ff54fd6e90ce236285f90535c09d8a8ae75d42a320c6543214bc3311d850229f222eb8e62c10a47cd47b0e66d175bfcb86ac3c5d099ed2583518771b4 WHIRLPOOL 1787de8aed6bfd7998e7271b23ab133a015ea6264591a7ea293435c89bb1ec186396c7510a1b6b0cb80d79f916d82e0da743e192b1426db46a16121320d3c07c
 AUX ncurses-5.9-fix-clang-build.patch 1291 SHA256 0ffec4dbc7dc4a2356460c2a001b6ffbd8b060ae0afbdf3551a13575c20830d0 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1 WHIRLPOOL d5d363f6d7cdcc350b195066c8183609bd9351a48603acdae2f374af13afb23a7bd05cbac86b13d2162daf5bd895eb5acce4769fce2f0b4b8da2896e00d1f846
+AUX ncurses-5.9-pkg-config.patch 1022 SHA256 8b32d53c4a94eeb78f39c29b1e66813bdb2fd5225f96ab7c26950f96679b58fb SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6 WHIRLPOOL 9056961c1b617ca3286cc4c528a5b5da821a5472da105d82b56c925034454a600e818265627d2f17dbad5184ecf78ea4d14807838bed789ca01a85f39755b656
 AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 WHIRLPOOL 1e2fe441d97671b84f49388555c351b235a93704fb7fcf13c14343db569cc91f21d75b60eb635c4c1c3ad18778bcb50e5aa63d25583224ed644edff35356dd2c
 DIST ncurses-5.7.tar.gz 2445052 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4 SHA512 9fda7283cd50ab9d8b9181935be7c31c4ae4c974f2eee186a5dbe8c3ce5522e5c200f06af48aa22b44cdab16a22795cfc8dc36a4258e6d826b454216dfcea3c6 WHIRLPOOL 696258b29783b078bd83631fef90388fe2bcd92ed94ace55cfae44cfa08afbf4fb29c3902d17216f3f059ee78cb61f69eed64b05a33332ddd85cecade7af6af3
 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 5661 SHA256 c18ec80f17ad898717f9c802c6692aea6a86e3f93ab2b3c4277c9cab649190b8 SHA512 aae0a8d4de674bd35c75fb42cec9e3b9094ed182fc07551b8db0db011b2d3c6d43cb1aecd9519cc6c343f17345a6ec36cdf97aca325d9c8aa9f8b5cfbaab9d51 WHIRLPOOL e53bfbd3cbfd807d4a806e61f06d422fb7eb6eb7828e5facf06946392894330933cc7d8126972817c37033dd18ed831a9f6e20e76082cc7ff3e17a32b62681f5
-EBUILD ncurses-5.9-r3.ebuild 6824 SHA256 a9c4fbbb65985bc1a284d6ef2d0a98a7387b98c6c44917e3b42be22b04aa8f67 SHA512 30b5c539eae467992eaa46b6525977d2ca77679784ea8aff59233e38a28bf2102b9c2cda4b6ca13013b2374dbbba34b046d88041c0719ed4449eb52d00000166 WHIRLPOOL 393309772a89d0cfa634663409309cb1df0a0df56878e49723f7dd71c0cf6b86771662b41db2d35944771709d0a5fbb081b5d92997341ad7ef9781fd794efe87
+EBUILD ncurses-5.9-r3.ebuild 6984 SHA256 01dbdc104fc0c7b4736913c608b07c13231ce24c33ef078c8c0b4f0deee5c616 SHA512 af29dacb720587b8a6cf8d601d0ce354c025ba66c3913f6ce575bf85f9616882cbd972f39b23845e8d4f3caa0485fe4cb7879051d2e72c0d475e96db428d76dc WHIRLPOOL fcf13dc760f2448b380108efd8c9e44080f6ad0109bf6cd961b75b3d8c607fdf738ad32bbdbeb40f66ffa1b214ef7fed6c128145d679d7b893749586474add89
 EBUILD ncurses-5.9.ebuild 4910 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b SHA512 40f4db535eaa496460095a276979cda32b30d0f649bf0c2229e07c4ccd94e51d7de2021981474c112cccb1f4636d91ff27eda1599bb9d681d0d15d63dd6c401b WHIRLPOOL 79badbfdbf1b71dbceca73160c2623f97d8b472ff166d905d8a24ef50198e5668a90cf76f7eaa12d5c69a3e78d436e592cd0fe3dbbceaa6770905a1562fb75e3
-MISC ChangeLog 31367 SHA256 119e2797db9331366b31b995443d889a4280a88199b32c192e1a2adcfd09cb68 SHA512 76b05b3e731a7b7db4506ba6a1c3715426d915713f116370d064a70c0701af558eb9e06533fce127925d632827d9e0aec1d71edf05362263f88f050d947b061e WHIRLPOOL 51f49388ef11127de9fbc00e0f391b23e52723e951dc736a9f7163c437bc21cb6b91f67943258374ca9e80d844cbd7243bf622eb86f0972b37e9506ebf8b1449
+MISC ChangeLog 31631 SHA256 848db27c7db678f2516fd95bfc1c5574ddc3aa79a0e01488b15c1b8c65579bf4 SHA512 97c3b0801f7cb3cf3589cc1929289286e6493aee62d40174c23940e6e1da732fd899a9bcec13efe666faf31536079042ac09639bf46235141704bdb8aec863a0 WHIRLPOOL 7c43f547a4517ea8bf24e539abf88bd27bd2ce2648fb9d05442c720aec4bbe6d99afb38c92d5e0689bb4ce61006ccc8943410dfe5532f2c5ccca12f037b2241e
 MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2eV0AAoJEPGu1DbS6WIAAHEP/RjXHdjjkqWFvBtAwRyZZVCH
-voqI/0mzuG6tdI4PkTDNHma5oVkPPf9ofiXMrMohQHCuHaD02xl9bTu1i/vV0MSn
-YUTIgUfxOBQmL+Rqpn+pfhLsMp+uUudke0sHbwShWROqKBDdrPyxh4Ed/v41KJgb
-EzbyvpPqbRXfYbz0AzdRHlbiE1X5CsQs2E1abQHa3dGZG1K/YBUeXWOfEb93Oqgd
-RcLFDayG+pnp/mUSDIsJBvMiZUeeKimEvvzEjCqSJhlwCpIcojkNeYJMHA+/00Hu
-GsDI8/ZaPXmcMecYTX0R8/qV3+bxNiSFAEWscreWRxfkhhrxD6EwIXcgYbrWNvmw
-ZySkXqjo/Yen8svxcMIIJqd4tbNGObv0w7fYkOSO5c3ap0hRHedp+hzsCCfzpjGw
-FtV6abRBWpLCMl3R0ij6qsfGizMVci4cjT2tCgv+nYoDufyyE/xETISBL0XGLCf7
-AtSdchJ1EmEjF6HLoWVbDSF3PcOPf6mVlMWQdIBla2+Q4aJY2D/ciWv2w1kh2URP
-vBrp/0BGgsdtEfI/WIqUkDZiAUEMwCHEAymGBtBI2WrV6rqQxpajtNKRJk4VtMlr
-H25z6v7VyzJcd9C/9TOFjMGFwp063esSiZ6m6gu0Whuoq/qSXMQnE8tbfAoFVlJY
-WeXEjju3DmiyDMOH0Y5+
-=IBmO
+iQIcBAEBCAAGBQJTQ2lPAAoJEPGu1DbS6WIAqgEP/R3sf4Vw33FABOYCssgVfdZC
+PeN2vSuvVJmqWLGqkJc6b8MkWDRK4Wi5BAOIdk+CYBmj+7EvSgK3CFoQiRWyOI1L
+x+IahBJGOOznuUZ0/zfgEEHSRGDKKc4nlbim9YWXXDMkNl52XkLFr2ZxKbnZjoc3
+ihPL0yA5U+hOnlJEVGrN5ZyDUjBqdI3zNO+LVsofJZeKYpMjW3LgRSQcQWKf1Ksd
+HQ/MWNiqt1phJeXhbDVO2BKpVjJ34rTCPHp7TCfoO8UFDpCLfqtRJyTVi/q1Ipm7
+5bF5Xg7KRIJ5aK5Z3FeWFUGb+xR/qgguz986eMt0aCwRodPLzn4c5snDZJq3Q6Ir
+g6xh5wJLJJCpv0RO3i0SGDmrEN5pYcYyrXs8/2ynNKQjogi5AnHGHHmpa9xvUjOc
+pva6AjyNX4HZT+BloYKwDEl1bck1kiHUQ3OfolXCqotg403kKb8YUKIkqtIDfOow
+MPPkXj4qDlzEaXMkqMHvciFT7dDyKUeo7xz+Atq1YDdfPVVVOrErGrZRalOBvPHJ
+KqG1L+8ixksBfaUPPQc4rTerFqmeWAEi/iwoJ2sDLj1QOTTp8FQ7hjo014BmiEfx
+YF+fxDJNYECx1kwnRDMIL2ZKIUVugEagX2yYV+xbRQmbjQXdsqq2ZYjRsDft90BW
+nvIFs59pk29Zgyx8kwUJ
+=Y57r
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch b/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch
new file mode 100644
index 000000000000..7c3c04a449f8
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.9-pkg-config.patch
@@ -0,0 +1,26 @@
+disable the $PATH search for the PKG_CONFIG tool.  it isn't needed and just
+gets in the way when setting to a value that might not yet exist.
+
+disable the existence test for the PKG_CONFIG_LIBDIR dir.  it breaks when you
+cross-compile for an ABI that doesn't exist in the root dir (--build).
+
+--- a/configure
++++ b/configure
+@@ -3582,7 +3582,7 @@ fi
+ esac
+ 
+ test -z "$PKG_CONFIG" && PKG_CONFIG=none
+-if test "$PKG_CONFIG" != none ; then
++if false ; then
+ 
+ if test "x$prefix" != xNONE; then
+   cf_path_syntax="$prefix"
+@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C
+ 		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
+ 	fi
+ 	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
+-	if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
++	if test -n "$PKG_CONFIG_LIBDIR" ; then
+ 
+ # Check whether --enable-pc-files or --disable-pc-files was given.
+ if test "${enable_pc_files+set}" = set; then
diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
index c178d8a49521..e2ffdf2553f0 100644
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-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/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 1.4 2014/01/18 02:22:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r3.ebuild,v 1.5 2014/04/08 03:13:11 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs multilib-minimal
@@ -39,6 +39,7 @@ src_prepare() {
 	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
+	epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
 }
 
 src_configure() {
@@ -72,54 +73,59 @@ do_configure() {
 	cd "${BUILD_DIR}"-$1 || die
 	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="
-		--with-chtype=long \
-		--with-mmask-t=long \
-		--disable-ext-colors \
-		--disable-ext-mouse \
-		--without-pthread \
-		--without-reentrant \
-	"
-	# We need the basic terminfo files in /etc, bug #37026.  We will
-	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
-	# src_install() ...
-#		$(use_with berkdb hashed-db)
-	econf \
-		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
-		--with-shared \
-		--without-hashed-db \
-		$(use_with ada) \
-		$(use_with cxx) \
-		$(use_with cxx cxx-binding) \
-		$(use_with debug) \
-		$(use_with profile) \
-		$(use_with gpm) \
-		$(multilib_is_native_abi || use_with gpm gpm libgpm.so.1) \
-		--disable-termcap \
-		--enable-symlinks \
-		--with-rcs-ids \
-		--with-manpage-format=normal \
-		--enable-const \
-		--enable-colorfgbg \
-		--enable-echo \
-		--enable-pc-files \
-		$(use_enable !ada warnings) \
-		$(use_with debug assertions) \
-		$(use_enable debug leaks) \
-		$(use_with debug expanded) \
-		$(use_with !debug macros) \
-		$(use_with trace) \
-		$(use_with tinfo termlib) \
-		${conf_abi} \
-		"$@"
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# 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.
+		--enable-pc-files
+		--with-pkg-config="$(tc-getPKG_CONFIG)"
+		# This path is used to control where the .pc files are installed.
+		PKG_CONFIG_LIBDIR="/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		$(use_with debug)
+		$(use_with profile)
+		$(use_with gpm)
+		$(multilib_is_native_abi || use_with gpm gpm libgpm.so.1)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+
+		# The chtype/mmask-t settings below are to retain ABI compat
+		# with ncurses-5.4 so dont change em !
+		--with-chtype=long
+		--with-mmask-t=long
+		--disable-ext-colors
+		--disable-ext-mouse
+		--without-pthread
+		--without-reentrant
+	)
+
+	econf "${conf[@]}" "$@"
 }
 
 src_compile() {