Fix from upstream for handling of the _XOPEN_SOURCE define #462116 by William Throwe.

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

4 files changed, 221 insertions, 15 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index d650fef41b03..0f0df81c8d84 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/ncurses
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.214 2013/04/28 00:56:50 vapier Exp $
+
+*ncurses-5.9-r3 (28 Apr 2013)
+
+  28 Apr 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/ncurses-5.9-xopen-source.patch, +ncurses-5.9-r3.ebuild:
+  Fix from upstream for handling of the _XOPEN_SOURCE define #462116 by William
+  Throwe.
 
   17 Jan 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
   ncurses-5.9-r2.ebuild:
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index cc7906afec0f..86fb04db676d 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -13,28 +13,30 @@ AUX ncurses-5.8-gfbsd.patch 695 SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c6
 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-rxvt-unicode-9.15.patch 3804 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 WHIRLPOOL 1e2fe441d97671b84f49388555c351b235a93704fb7fcf13c14343db569cc91f21d75b60eb635c4c1c3ad18778bcb50e5aa63d25583224ed644edff35356dd2c
+AUX ncurses-5.9-xopen-source.patch 443 SHA256 ebfe966f1b577433bb5b723b55b79a59934369d33107b37e6c7b152dc84e8d0f SHA512 69cf554cbc90b521c952c0df013984aab99773c116c5dddd447e22b04614b0fd45aca39f3ac61e388e19b976e77b3f2bc5d48a8f41af24243d0bbcb2bbd45be9 WHIRLPOOL 5c159b64a91a0a80dc5740365fd3fc9d7024d5ab30ef01386fafcb3e98119f93c25800ece2e4d8539d9a6c0785f27c92af7ab3fc895494b0f06a4788b7c26625
 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 5655 SHA256 3c20943e9c1c4865b52ff0847340e0288daa43cfd06b8ff7e1129c5b12463208 SHA512 c357cada54bb055fc25b4c47f34566875ec2b10cc144728c7bf284a874be33d7bae33bc0db6bd3f4163fdfce5ec36b581db5eab4d16016e229fea40a703364a9 WHIRLPOOL 55e264407ebd804e5f25d288af6740166259ac587671f892e1cded4d68ebde04d521edbb4f740f70dc1eed5b61206ed146dbe3efa4d5c1d071ef081994304385
+EBUILD ncurses-5.9-r3.ebuild 5725 SHA256 6ee016bc15c60b1acbfaf735274298eeb5514f3994ab1f94a111cf2d771516d5 SHA512 6370827bd4f88093a32eed19ac5005849af70c1b0b60de036ca598c67f8e81b4272abf9b1091e5f93b2cac04590b9e35f9eb9cda2b890cc61a4d956df8d586de WHIRLPOOL 629c4b48beddfac54579ed9ba9ce2c70570a2ebcec33efb0e1415ca6879f4e7ddaef9b92351aee41ea9594685858853d4560fbdd545fb1a64b7011a8b1db7610
 EBUILD ncurses-5.9.ebuild 4910 SHA256 0e95316b82ce63227e20f2653d239b289b527100459ab995efa370beeb798e3b SHA512 40f4db535eaa496460095a276979cda32b30d0f649bf0c2229e07c4ccd94e51d7de2021981474c112cccb1f4636d91ff27eda1599bb9d681d0d15d63dd6c401b WHIRLPOOL 79badbfdbf1b71dbceca73160c2623f97d8b472ff166d905d8a24ef50198e5668a90cf76f7eaa12d5c69a3e78d436e592cd0fe3dbbceaa6770905a1562fb75e3
-MISC ChangeLog 30566 SHA256 2a2137893797233bbb0d96d68b3f4da493b82b5e94be29265da5debb6eb9265f SHA512 743f14b262a8bd1dbd14e0e806b83761a4ce1a314657cc3e3b0c00986388f39a23a288f1c77f3e3f8247f5cc4eab900f439f71d623dbc3ab794b7aaa443c362d WHIRLPOOL 301ec34b43c8f1a52f962f3842369b1a684062f8f36c610ab45038dd8a2166f207c6eb4a0ba9119493f46196bfeb00f587ae6d4d852409bc777e4f03af871bd9
+MISC ChangeLog 30803 SHA256 47e3f6d38f205b7ce91d392552d6376288fba25e1047bce8c79e53b53981fe26 SHA512 80a515a8363666f642069b05b8ef2fd9e5b4eaa169176ce739e1875f371b27073e4e8b3e71f4872e61cf830c438c8e511af54f6ff15fc52d4821e61cbc2c016f WHIRLPOOL d2eb9a7ca4d6ba3232005a09be0b382897a930fa1379dcc7a55e31232353616d06ecd5b252e4a17c705022aafe31073d5680400c67d3ff36c9c9486b622f528d
 MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJRfHPYAAoJELEHsLL7fEFWK4IP/2OVuOajv3PO7SLHvP+WGSPV
+sttEDTtqCoovRczfCAXohFEfy6IClZrqA2JZ26LCQlMfr8mJ5V0Tp/vPgZq8ZxZl
+s1UzRfBT55siQFchWGnMC4ZLGY935bl5MdfDj+fp0jB9514Ge5H/6gsejL+5jITu
+JJEdQ09QfJwf1SOEBmkXExoNzA8VVbL/QgAkVFkr9npnHuTMG6x7MlyX+gWRX6Ru
+1SinFQsx3M2yuvYAjDpNcrP8/0gyhiU0kJrgJ01CK8isYCMPdPU+ZSySGRdse1sa
+MQ7FQ7AGKnNrSm6SkAwXpq6B9cXH4gIVncleRlMsW2kFn3nMehJXFGzJMh13ZM29
+Naq6GrGycAEad+fDv8T2n2mdWYFKhFCTbrTihsK4f6cqKhG5tH7PS+UhzSC9QIPj
+7+bJXLKvrSr0ZHfQ75F2kuBVkmmHE4LmJSzo2PLv2DauycVIyzq4NnXWaPQ+m1+4
+Q5Rn6UGiJwgLZhZP9Sr85NwlKBLPwczi+GXoWyXjVS42VOSyzfIuAROeEBfx8AZx
+58a6x0jIfDt1V9p3UJbi9vcRGnOUPX8utVVjFlIrye0QRN14HQ7dFLoEyZ346DwM
+Z9MmowaH/uX2VGj2Lia79Of+svd5IQoVypmZNL7YZI75LEp8rDCQ5ctbrOky59bU
+YH647UTWQ0ZUJbAwQbIq
+=VUWp
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.9-xopen-source.patch b/sys-libs/ncurses/files/ncurses-5.9-xopen-source.patch
new file mode 100644
index 000000000000..4dd7817e43e5
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.9-xopen-source.patch
@@ -0,0 +1,15 @@
+fix from upstream
+
+https://bugs.gentoo.org/462116
+
+--- a/include/curses.h.in
++++ b/include/curses.h.in
+@@ -154,7 +154,7 @@ typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
+  * conflicting) when _XOPEN_SOURCE is 500 or greater.
+  */
+ #undef NCURSES_WIDECHAR
+-#if defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)
++#if defined(_XOPEN_SOURCE_EXTENDED) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500))
+ #define NCURSES_WIDECHAR
+ #endif
+ 
diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
new file mode 100644
index 000000000000..e735139e9994
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
@@ -0,0 +1,182 @@
+# 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-r3.ebuild,v 1.1 2013/04/28 00:56:50 vapier Exp $
+
+EAPI="1"
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+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 tinfo trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+#	berkdb? ( sys-libs/db )"
+RDEPEND="${DEPEND}
+	!<x11-terms/rxvt-unicode-9.06-r3"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+	epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
+	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-xopen-source.patch #462116
+}
+
+src_compile() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# when cross-compiling, we need to build up our own tic
+	# because people often don't keep matching host/target
+	# ncurses versions #249363
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
+		make_flags="-C progs tic"
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		do_compile cross --without-shared --with-normal
+	fi
+
+	make_flags=""
+	do_compile narrowc
+	use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw
+}
+do_compile() {
+	ECONF_SOURCE=${S}
+
+	mkdir "${WORKDIR}"/$1
+	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="
+		--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) \
+		--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} \
+		"$@"
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources || die
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files
+	emake ${make_flags} || die
+}
+
+src_install() {
+	# use the cross-compiled tic (if need be) #249363
+	export PATH=${WORKDIR}/cross/progs:${PATH}
+
+	# install unicode version second so that the binaries in /usr/bin
+	# support both wide and narrow
+	cd "${WORKDIR}"/narrowc
+	emake DESTDIR="${D}" install || die
+	if use unicode ; then
+		cd "${WORKDIR}"/widec
+		emake DESTDIR="${D}" install || die
+	fi
+
+	# Move libncurses{,w} into /lib
+	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
+
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
+				 xterm xterm-color xterm-xfree86
+		do
+			local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename $(dirname "${termfile}"))
+
+			if [[ -n ${termfile} ]] ; then
+				dodir /etc/terminfo/${basedir}
+				mv ${termfile} "${D}"/etc/terminfo/${basedir}/
+				dosym ../../../../etc/terminfo/${basedir}/${x} \
+					/usr/share/terminfo/${basedir}/${x}
+			fi
+		done
+
+		# Build fails to create this ...
+		dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+	doenvd "${T}"/50ncurses
+
+	use minimal && rm -r "${D}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
+}