Version bump.

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

3 files changed, 237 insertions, 15 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 9b72d043e5d8..5a3ee25ec8d8 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.325 2012/09/13 21:46:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.326 2012/11/02 18:07:22 vapier Exp $
+
+*bash-4.2_p39 (02 Nov 2012)
+
+  02 Nov 2012; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p39.ebuild:
+  Version bump.
 
   13 Sep 2012; Mike Frysinger <vapier@gentoo.org> files/bashrc:
   Add egrep/fgrep colour aliases too #434170 by Dave Kemper.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 36be571e4d21..a0b4e8dcd556 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -195,6 +195,8 @@ DIST bash42-034 1345 SHA256 01c1f332101389cedf347c7736102966722a3b213900954e5d62
 DIST bash42-035 1920 SHA256 cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df SHA512 9f294177e91600f65cfee1b9dbf59b3ad7db449a99cc1013b7c97ef6c814b51afa7a2d2516a37fcc110ff3f0b25c4b06e42094f4665e03e41650bfa69c15eaf7 WHIRLPOOL e8806743da1f16375ffd29fb7c9ae78d8966d6f7faa833025e57fb59bd290a2afdf94777e9ac51917f378312fc8ce05d72ee14525352412c5826e8a2a9909fed
 DIST bash42-036 3123 SHA256 fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa SHA512 7e114b99d8f5b210b826715c77adfdbb115e86ace35f7ff331fc6f595a4d0f689a055ccf7adfbafc057c7549f5597e4de455ab9e18a6ffeb5b4fd1d3a2aab99c WHIRLPOOL 6f4e9e9e8251b5a703bad2202301edb45546d94f452669ef681786ff5882269b70791456c7c2040731b5b7cff27c4028823592a61d46204a1271218f7e6c7b8c
 DIST bash42-037 3483 SHA256 c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674 SHA512 4466990dc3499ccde5940ddfb383052fa345d4e53fff7c8963ac7482fa280658b4516a1583486175cab2f3a5c8afbbedda8461e3cb1802031bce8db386404608 WHIRLPOOL 918dd53aea5ba7c5da2b6ef3325289d80d5c9e01aa57bd5bf9b9e6a22302865929a670ed7b20a5916237e2078aa69223c681e00c79c5db40dcf4d9ffa455b603
+DIST bash42-038 1290 SHA256 b8c9a81bdf206be58ba491dfad80373b3348af769e80aaf72f7611ddbbbe6d57 SHA512 f835bb393153310fa2e4c2d95a98c0db53a97075f8989d61cccb095db223495777e413b21e9b235391a4a0f34d935a828ff5ccf337520d5dc87d380170efb351 WHIRLPOOL 3625b8a1e17e2ec7925027b6e048262126366ec2691e7a2bdfd23f8da2eefcea6ce967382067c8d6969d1a9cc641ffcd05ab71a713a61762c43d77df01082b8a
+DIST bash42-039 1603 SHA256 f4f9300a60321a5088ae9e54052a64c4d3e876f9a3a17ca104d58fa38b9c1791 SHA512 4c5e44a623840c7efe7894f313a5691307b12aea325dbc923b48deb6ee6ac0bb2ff7afb0d2ee12ab97b04d60c1b9e2a4facc51b66c93be9fe0beda317ec7318f WHIRLPOOL e863174def546d9e9cbcdf5cfa1f735a1503a7caa10ab25a017add965cde524412e37c7fdc43ee80b6dd23676f2231093df64de1d1f41aa823e6cf5c79136531
 DIST readline51-001 2042 SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774 SHA512 94dbe326f551099aac9658e80cf5489cdecf0a06f4986b1ebf0f6b678f1e2e50e31353e459e1b71a186f17c933180bf30a821cb262708ef6425c5987eb6d66e0 WHIRLPOOL 10546875add30ab9d2c9b60f6d90dd9cc6745e02cbec1ab8913517c6bdbc3d894d97652d04de148e6423fd8666831255996d9862e8e532ad06390757859a8f64
 EBUILD bash-3.1_p17.ebuild 4642 SHA256 e8178f2c3a8505e11390721a552c28173adca3250c8195f4ad63a05a794f02a6 SHA512 4300d33061c34fcb57ee2e79bbcd57c13e024ed8a286e19d222531d89c56f3e3d5a12693aa4310c6e033ab910f78d8630abe2c46f74b614e7de4e47adb5ac3e2 WHIRLPOOL aa707d3010db8ee6670807fb19e2402b3446cde78bd2479a15ea1f514666a296ba3417bc1d065b5f38ee273e813a01c6ba88160748032b786760c142734b8b67
 EBUILD bash-3.2_p51.ebuild 5862 SHA256 2ded1efa635872ac5f01e27b390bd2d67b4e4867d52680074214ae8c3cac04ae SHA512 007f4ca53813f2e05bbe7665a8523ab5c76c1d6ad51e0b54c6f2f69e3d06430c154050257ccba648e239d233eab1c867f0f3d3d6f920b4fa8bb20d85d7976524 WHIRLPOOL 94cb8b3a0cb0d91d584957126a73b35b8bc2453e140d19b9f36e431d3fdff348347c10aa529c8b74f582a92c64da58e25ab18a1268a6f64c901287c38419a96a
@@ -211,23 +213,24 @@ EBUILD bash-4.2_p28.ebuild 6167 SHA256 9ce516ae7fbe2315e35b071c91e9a72ab43f5c1a5
 EBUILD bash-4.2_p29.ebuild 6166 SHA256 57928687bafac92b8aeb0f3598a026242c04aa24e733883b738e3a65d080f1bc SHA512 4ddd3ba367df595d7b7481806c72d37d408a5484fba890eab0c3c8e912676f99f81aa5a9a71a0afe11db1d389186e15c6c0ddb2e59a37d0150a9194c23c510f0 WHIRLPOOL 9c544145c2bffcbdc5ab9b5e1d8a974f693a2f79e3ef392207c5a8a1df81bc1bfced419dbac408cbd518a6976aad748eae472edb8945255313be004443c14541
 EBUILD bash-4.2_p36.ebuild 6166 SHA256 ba80733c8fc50b4958820b5fe779cc4df4dfe6ce5b65b7b5bb3a332e46914715 SHA512 109a3231f9d13412286910547d34eb272ec64502c797428f5e9ede23a0edaa0865366250e216bbf69fd5bc67a651978b5a7fbae22e11a10d872cefd3e2c414a9 WHIRLPOOL b22ecca12116d0fe430ab1331a2e507e7d48a322c72acfc3586edaa0e939c51d834c921f083071f9430a4c60ae362f33fb055abdffdc91990eb2e6d1c69044cc
 EBUILD bash-4.2_p37.ebuild 6311 SHA256 c807f0def9dc9dcac9958cb7a9606dd9f1ce33142933dcf0f8cd3276434f86ea SHA512 f72570af7efb4e07b5b5e67fb81f6c12f8b177f75592b2b12da606371ee63001c43126a2da03ef41e140894e47935c21df3a8235e10da9131a4f3bdd51c35575 WHIRLPOOL 54c55493d4f9443e33ee97421abca38237c4027d2bfe0f5c43b04e56cf35b795ca08d33e62517b79a193045dd67b1286b05630621f47bc376e26a276322dcce4
+EBUILD bash-4.2_p39.ebuild 6321 SHA256 d021ad20244b04d4a6b5f8f7d920aba2b2d7bc760e200d245f29860ef91bb9a2 SHA512 9484e4a61f61dcfddb420a1829a41463db2e4827e4f0bb7de47f84423f32eff0644097fcaa5b6c4b0313dc91d3ecb9f3134f4e420343540d69118612ddf571a2 WHIRLPOOL 75be42a4bebd19b2e2cfbdf3dafc6f981a7daa2a29068c1df31e76d848aa4a5c8a6ccba181e4fab72a82deddcb21e3076ef660f9e7dd1764053da54436da45d9
 EBUILD bash-4.2_p8-r1.ebuild 5549 SHA256 4ca7fc7ee535d0a034468acbe321ec37435a7790c0757b69f4a8e34fbdc0f178 SHA512 8e2c73a5e11fefc54696b4d66d0a362ded3ce5b21787b4f5fca158b36ee8d90a8344dbd44bcff66a204184b34d332b8d30bc2bf8729c4331fdd864f1c0308bcc WHIRLPOOL 97e01220b6fe2e6ccd79b1b1bada4ae554b6418b916570ea17d2b4b751c1739a7b1aba3cc2b767ac9f4e75728c569d5e51dc8dfd387e7181de430e3422da51ad
-MISC ChangeLog 49918 SHA256 f46eb770d18e24d5b18f0560b15b6e4b1ac3a2fe1de436e1c0dcdd6f095f8cb3 SHA512 ba7b3d6b3e3ab6c3e89b8366ae6fa05c89a59c7df8851d1c941a32a59011792c8fa7542f1b189ddc73bb438a112349e84832d0793ecf81e4dabddf81db2856ac WHIRLPOOL 3808472b56a9b1164242df39afbaecd7796d3d52e7860d5697feb41b5cb664bf5282a1316c184ae805f3ec3e6dc678d42c1164fb63d290456743b243165ddbd7
+MISC ChangeLog 50036 SHA256 d1c4f073103da257136ab3904ababda2ff7976cc1385b4912646196c43096a92 SHA512 576f97f46d24739c9ccf26332b7183aba5af5c06a3f36f8d9bbaab45df5779a6d691e6a35877a3e846781bab644faca53f23df37c13a928688c3f0f64f31ae27 WHIRLPOOL 0305617c2ab0812a83132fb56bc26df69ae32c93040099a0d6bb7258ceee92eaf89258959781649e36b589e19597602222464b03f87bd235fd623f690a55cfe7
 MISC metadata.xml 568 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562 SHA512 e50fd93498123511ac7460795687e694d368aaa2e7001ad752aae7bb6b67ed4746c8e171e4d5ff42e6aade0fd29d001330afdb593b8446046a98b27b113b7c5e WHIRLPOOL 83ad81f6ec56c7deaaa1d6cd18ee73621f02bedb62201d59ac44676120251e040f73c9ef238d91abf0c8c7d115a8b4b8df6ea22b533102c8daadfad755de51d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQUlTnAAoJELEHsLL7fEFWFPgP/AnFORct3Y8mEaMb588ffag+
-XAC9WtsnMDXxHPyBI0PYI02jFV6jF1a3wQALBRZ38ATL+dxOtB34Qh4vNXyr7E6Q
-Udw0bjQ42D8HMKcXrHxOBgb24EYilDATDiilNiEdifsAQNi6SGnD2FxMm3cr+q6+
-AYwbEBt5r/EzWkEfatGISy4eLjpwxn6GJDf7DwI9NHrNzkzcMoxxn6zKh6rRR68r
-TW4LSFZjlKeULZQe5GsjyCe1cVLy/9BswYBqv6uVg/JqTn1zUPB2RrnZt8BEeE+S
-XnYjzMuxzD1z2YaY/FubJrQNmo4VdoqJ5LsraFQYjXqg/gz/JOs05DMyfAqsq7fC
-sNxn2+4bUCxlvdDspeMWEhHD4durm8VBlL2XA7SjGFl7OOsVCIyST7ku9xIb+aLM
-CjMwWb3aAYIvXV2Bvij9ixf5xT59nhTbF/uW4lkQorBqdmMEINTAmndDKGxT7aQH
-8JYJeJAJbH68+JlG609Ndj7396roke8jG4gr8jK86FU86RqDMm4rNG5NtiHtNt35
-zPVW4+4xIwyZy2kJCU9Zn5NfSuscn9kI1bu2cVAgP9vSUJxjvKFggoxFbB6kXBUa
-6jZdKJzXxybo8VEk3pt2SbP1Tv7KIkCw3jgz44/DDtg1w/lWJMdHHDie7rqdX67H
-SqGwtZI2PrnbNbI2Zw+l
-=AeHk
+iQIcBAEBCAAGBQJQlAvyAAoJELEHsLL7fEFWJsEP/R+YiTO3GYhw3oaPzZ/BdhwI
+eIwDKQhI2ba3ITJox20emUiFz18G2T3IPcRaqi/l9yHqB7q4qax1UadwIQCHj8s5
+YJz2/C664hBjJpAOwLtKNJbfYwLOErB9A7eurN+1l3wB44K7qSyM3b3T3gk4+SAR
+g/VofJgG9UsC97JPhwxX5NdDA7XL+eIQRGjTruOlrc8mg8B8+iekgTaOHH+OKuuu
+yw5DGt0CjKFHjWJArltezQUjvlOUvgUv8uCP0jIEgbGhDbaMzPAegFKL/bHE6egm
+Cn2aFvVVqM6ChfFCim0A/5+wsKhoyQAYqTNbs3QJX2hTcqOcetbDJ7EALZKn1RSo
+7P/MrXTw06s8784KUhYndnmjKj7lpodO2OMCoE87PCbgKRqg9wg0rYh/x0FcVeF6
+0Cvc8MhHJ3c9KZlEALyFDWHSDw6y2dbfh/CvMrDvVJpVMSfxpadeG10uM2BPyyER
+juqlQFNR700wb29KXR9+B3rL7s8i8HiCaYhXerroWIvACRhBJyyhUrGS1GiKSCJg
+WH436NzKuR68hGuSeMW9vca/ADpMnDeeZR5h9L3z+Uwb+356jdPaXUsqp8ky+Z+a
+0dV2fHNkgZyoXtfMzmx4eCvZSjrPf+CApJubVkKGrPFvrln6iKyUwvFhk1x4SdDK
+b1xsIQ+fbx23x4UVNKBg
+=AUCb
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p39.ebuild b/app-shells/bash/bash-4.2_p39.ebuild
new file mode 100644
index 000000000000..6241c59a8e7e
--- /dev/null
+++ b/app-shells/bash/bash-4.2_p39.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p39.ebuild,v 1.1 2012/11/02 18:07:22 vapier Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+	readline? ( >=sys-libs/readline-6.2 )
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5"
+# we only need yacc when the .y files get patched (bash42-005)
+DEPEND+=" virtual/yacc"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+	# Clean out local libs so we know we use system ones
+	rm -rf lib/{readline,termcap}/*
+	touch lib/{readline,termcap}/Makefile.in # for config.status
+	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
+	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
+
+	epatch_user
+}
+
+src_compile() {
+	local myconf=
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf="${myconf} --disable-nls"
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=6.2
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	econf \
+		--with-installed-readline=. \
+		--with-curses \
+		$(use_with afs) \
+		$(use_enable net net-redirections) \
+		--disable-profiling \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-malloc) \
+		$(use_enable readline) \
+		$(use_enable readline history) \
+		$(use_enable readline bang-history) \
+		${myconf}
+	emake || die
+
+	if use plugins ; then
+		emake -C examples/loadables all others || die
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	dodir /bin
+	mv "${D}"/usr/bin/bash "${D}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/{bashrc,bash_logout}
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${D}"/etc/skel/.bashrc \
+		"${D}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then
+		mkdir -p "${ROOT}"/etc/bash
+		mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${ROOT}/bin/sh ]]; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${ROOT}"/bin/sh)
+		local tmp=$(emktemp "${ROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${ROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${ROOT}/bin/sh ]]; then
+		ln -sf bash "${ROOT}"/bin/sh
+	fi
+}