Add USE=tinfo to enable building of sep libtinfo for binary packages #452532 by Justin Lecher.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 37 insertions, 23 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index c0d9f568e4bf..d650fef41b03 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # 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.212 2012/10/23 20:07:18 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.213 2013/01/17 04:19:21 vapier Exp $
+
+  17 Jan 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  ncurses-5.9-r2.ebuild:
+  Add USE=tinfo to enable building of sep libtinfo for binary packages #452532
+  by Justin Lecher.
 
   23 Oct 2012; Mike Frysinger <vapier@gentoo.org> ncurses-5.9-r2.ebuild:
   Bypass dumb pkg-config install checks #438922 by Benjamin Peterson.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 26901f38f937..cc7906afec0f 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -17,24 +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 5563 SHA256 e782c51b3e98611be6eda86bf7b9f0591908bf0362d0d61da7b22acf0c1df042 SHA512 459c505e562bbbaf88322a093da1a17ca57a31932a5314d2ffc2a8044661b033367fd9b8e9cf7ac2dc897109f95e533be50dad7981be2270b0467f87c1769c84 WHIRLPOOL 3e61a0be5392249623e1f95dc5bd1840f28e24a2e6cd2f305a200392a916a29b6089f7ab3825eb71f1fc18867f5525021a3939cec9944b43e9251c98ca9a2d1b
+EBUILD ncurses-5.9-r2.ebuild 5655 SHA256 3c20943e9c1c4865b52ff0847340e0288daa43cfd06b8ff7e1129c5b12463208 SHA512 c357cada54bb055fc25b4c47f34566875ec2b10cc144728c7bf284a874be33d7bae33bc0db6bd3f4163fdfce5ec36b581db5eab4d16016e229fea40a703364a9 WHIRLPOOL 55e264407ebd804e5f25d288af6740166259ac587671f892e1cded4d68ebde04d521edbb4f740f70dc1eed5b61206ed146dbe3efa4d5c1d071ef081994304385
 EBUILD ncurses-5.9.ebuild 4910 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b SHA512 40f4db535eaa496460095a276979cda32b30d0f649bf0c2229e07c4ccd94e51d7de2021981474c112cccb1f4636d91ff27eda1599bb9d681d0d15d63dd6c401b WHIRLPOOL 79badbfdbf1b71dbceca73160c2623f97d8b472ff166d905d8a24ef50198e5668a90cf76f7eaa12d5c69a3e78d436e592cd0fe3dbbceaa6770905a1562fb75e3
-MISC ChangeLog 30377 SHA256 20b7063ec8238109293cd6a5d8a4e07380fe0a724363774c8669b07814a8ece5 SHA512 cd9477953aac29d2634e2af68651a1fc6e03bf3fd1c8c7d5ef81a025c777a7f92a5cc79621eb1d60b8111366bb208812bb75ac283e5e54de8ec5da2561c6380a WHIRLPOOL 79c343e11820e94d70ae23e2418899518d678475d3b701eb6f658a5117fdeb055c85e0f0b9cc1e427e63af5b11a261b71772a00a588432f17a88113df35e4a45
-MISC metadata.xml 320 SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779 SHA512 f25072f8c0fbe0488e2077d024c5973e5d5498ba035c5cabba054ab3385923bd48917e13a9583b31b3f3cfcdff96589c20d97d43976b133f61c23d206176bce5 WHIRLPOOL d239464c107a9287cea0b152613ce8b1c63e7af81d2f322ce8283c8cb2ededa6534d0f2dc8e75f7cf8a7a400404d044ae5cbf9e44f201ec3f9a789d69022484a
+MISC ChangeLog 30566 SHA256 2a2137893797233bbb0d96d68b3f4da493b82b5e94be29265da5debb6eb9265f SHA512 743f14b262a8bd1dbd14e0e806b83761a4ce1a314657cc3e3b0c00986388f39a23a288f1c77f3e3f8247f5cc4eab900f439f71d623dbc3ab794b7aaa443c362d WHIRLPOOL 301ec34b43c8f1a52f962f3842369b1a684062f8f36c610ab45038dd8a2166f207c6eb4a0ba9119493f46196bfeb00f587ae6d4d852409bc777e4f03af871bd9
+MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJQ93yaAAoJELEHsLL7fEFWiV4P/1BOeiUPksVZXnIl8770m+QA
+EOc72PSrZRJMhT6A+E/scAXiChOd0oAo43ARBvaD+AAwQW7dsQCdunbR5msK0h3x
+IziF/3WuPFIzuU73PtEUl5nf1QHZ6qnCVYsjChrrEelnUBws1y4oozL5Aac7NnEy
+IMm4g0NOlGQ5/BQY1ii0/VPs3QA97cHZAjSyznBeIar2JmYZX1U4pKrXMZw/jy6N
+bGXueGzugZF734eI0z/m+C2JinQ8thqgZQbcFGrz8hTJ0Ii9eewCZKxzNRVDPObN
+cvV90z7jYcj1i0FyiN3FEbbiUTgT+VB43F3h/xE8zzekFpCEv+DVFd/KO/Vt6Jlf
+TG9nTNxLw8pwv9vK9wy0ZJqbKn1bLqxEx/aMiKOTEvbhui/S/sP/gplkSa7uv6Ej
+/CGZ3BhDQQRA9kLVeER3qFjVKisqKQXIA0xPeYBqxBIs38e0FYGx084FrjlsTWc7
+LVpfNtmWU+357ukhmzIsDqZMhfgyYGCA5Dhkhe3dgbHDWfW2L17sOFUj24U4BoLc
++KcfIJPlcmH5PLuBJtkm5xTDsrFG5lDFGeSs6hWDaLSVW/kjFgJ1Hp+wtdy0mzzr
+LgRJq5b79uD28NrbRINOCwL+Y6bMx7BtxY2eDX4H7w/lFegfpQSVPDR6YwMHSzdx
+fl8lP5132TV3n+/vBsVH
+=e2hf
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index 8af9c8b8ea72..78563648f103 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -4,6 +4,11 @@
 <herd>base-system</herd>
 <use>
 	<flag name='ada'>Add bindings for the ADA programming language</flag>
+	<flag name='tinfo'>
+		Build curses library (libncurses) sep from the low-level terminfo
+		library (libtinfo) -- usually needed only for binary packages -- but
+		it is binary compatible in either mode
+	</flag>
 	<flag name='trace'>Enable test trace() support in ncurses calls</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
index 836835da6442..d065e15dc05e 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
+# Copyright 1999-2013 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.16 2012/10/23 20:07:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.17 2013/01/17 04:19:21 vapier Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="5"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm )"
 #	berkdb? ( sys-libs/db )"
@@ -107,6 +107,7 @@ do_compile() {
 		$(use_with debug expanded) \
 		$(use_with !debug macros) \
 		$(use_with trace) \
+		$(use_with tinfo termlib) \
 		${conf_abi} \
 		"$@"
 
@@ -138,8 +139,11 @@ src_install() {
 	fi
 
 	# Move libncurses{,w} into /lib
-	gen_usr_ldscript -a ncurses
-	use unicode && gen_usr_ldscript -a ncursesw
+	gen_usr_ldscript -a \
+		ncurses \
+		$(usex unicode 'ncursesw' '') \
+		$(use tinfo && usex unicode 'tinfow' '') \
+		$(usev tinfo)
 	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
 	use static-libs || find "${D}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete