Version bump.

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

3 files changed, 244 insertions, 15 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 24906fe9cb33..8fdf8375965c 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.359 2014/03/31 07:00:51 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.360 2014/04/01 06:47:43 vapier Exp $
+
+*bash-4.2_p46 (01 Apr 2014)
+
+  01 Apr 2014; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p46.ebuild:
+  Version bump.
 
 *bash-4.3_p8 (31 Mar 2014)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index bb545dea8efa..34d52253e9b4 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -204,6 +204,7 @@ DIST bash42-042 1571 SHA256 faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a
 DIST bash42-043 2110 SHA256 dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57 SHA512 70503181c392faf565ef0b23a2f6d1614836ffb9c04791cc4bfb31aff7786fd5efab4072034a4cfba0035595140cf7f9461b1565e4854ec34823cbd4f5ab419d WHIRLPOOL e988a962aac3ed9cd1f105cc5c9a477aaa52defdb049be8d9cd37da40177664507c06550193855cddea3b0a9fea3a04ec027ad14eea845317ee67e1b89697076
 DIST bash42-044 1871 SHA256 10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6 SHA512 e94cf93c5760225d4ac16f9c73078c3ce9913ffe1e20ffed8fa31084a0efd3dd63762b5437221f6b570078667e3ec19d882169ffe0ba4c498e258e56f17d2511 WHIRLPOOL 23e3fd1ed1a708eead2ce463c0e5acd720accbe9727462b7fd3916b14b8eabf2339c1f7b1dc973249e075bff4fa566753ae43c540ce3ddc84b5cdd72814d568d
 DIST bash42-045 1572 SHA256 ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d SHA512 64f62b19c79eb2c581feda2b9f3c36196b3a794ee9996f6d72078fbb0b8c5878aa2d8ff3e2698cf9769e42083704dd9342bb108212d02aeb79875fad70895560 WHIRLPOOL 02fa25cf02c831675a78a5625e0ba5606b52eb9f3dbdf546cd62983d83cea7fd159b535df94b3c8d39907a7739de7459b69cde3583f28d952a54b384122d264e
+DIST bash42-046 1988 SHA256 95c1323b68c0ecc0ca09565ef2d5218625ced3957b702e04c8bcaad9e7b3816d SHA512 7e4a9d3961cb8bf8559f82684cb75fe8600a377522f582e1a9537696ceccab32d15d1045f850ea91ea8bd2cf286d79412bb47460af26bec8486d5f3137f5d54f WHIRLPOOL 68d83498307dec79bea516c7e7b03dfdff10116a716922c780c66d9017abb38cf6b32f17674490fed93b2701d8271f71f4aaeab6712b184fe4d880b818fab988
 DIST bash43-001 1617 SHA256 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 WHIRLPOOL 94d34b6ae2496b4007bf9b3af69847828179dfa90528d7fc2f9a91facc451535e2fa46120cc3ea22156974c92f2633f91423f2d43b4733f8960cde69dfff81b9
 DIST bash43-002 1594 SHA256 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 WHIRLPOOL 2d1b6679a1263f7a4325b692c3edac9f5daaa72e3f06dfa88958e70ad64c1fc74b92d8325becfff2c21dd28c002470bdaad50f57037c2676352078291bf0b0bc
 DIST bash43-003 1465 SHA256 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 WHIRLPOOL 1ef78321cfe3ca6e9f690ae3dd6a7c06bc72d2e6590bfdaa8543b0ac3ff84eae998e4a2aa44531423cab1137c974b09ac30baf5fa2746e2e5a2006cde03a2b32
@@ -218,23 +219,24 @@ EBUILD bash-4.0_p38.ebuild 4464 SHA256 d6aa599f3e77808c09095c892c684a5a589fa7db9
 EBUILD bash-4.1_p11.ebuild 4199 SHA256 b6163a5d4aef950e3b5dad8c2590323549072b9f8819a939eda692fefccfb38c SHA512 06b47daa5e875b03408f2acc8108d52275a4e4681a0f88b9bd89ee43fb6db3d963b54086d0039c4bae90916b5b059bfdb53288877ffe3d08a0d4a91bcde634e5 WHIRLPOOL bf23eed9aba5773e423171c89ebeff05106864a4a3507ed186d1cbfd8fe982fc53e081b389937aaa7d6ee6ea54a98ecfc618a6fe67170ac9600573054bee3a8f
 EBUILD bash-4.2_p45-r1.ebuild 6627 SHA256 4279e47b504a597dd6be4ecb6eef33c7909c8f6d226117dd0565f0d0835b7914 SHA512 76cef739863b630608ac416037d4ae273b1ee9eaeb5c65e1f5b9ea9c4d987460d9406ead515a5d85f87175b866ef194c839d1341b3cb3615b276c45cbdefec2f WHIRLPOOL 554c2b95883066936dab181f5540cfdae5f4c197bd37b34ff0a8be60398ef8e5285041e813d669cc5b4140aebf622441a35c86e0daa98d07c35bd5a332cbb211
 EBUILD bash-4.2_p45.ebuild 6525 SHA256 784442914f6f6740031598a0cf1baaec087d973e6460d76a32baa120a2794b8e SHA512 8b6c57dead7a18b429632694e5d1e35791b262cd09c3d49919287c2b07ab9e524b9a758e247a8d2706ddfae2576d19e535c9467b7ef99ed08ddb041ef60025da WHIRLPOOL 55954d5cb13b064f89305af8c5de0c7f84714afb08c0f07bf4703ef62860cf08f9e9f38ba60a4e891d5cb0f26f0e46d26e2eea553b0785bc9e82d790b6c4d111
+EBUILD bash-4.2_p46.ebuild 6624 SHA256 9df5501768621e508d782ae73457aedd0632df8ffbb6052e41214d812aaafa50 SHA512 676b2dd02b5ce9b888da71c7452b9ec4507405cee9707cb9d1a5df70890a2c7c5b6c7bb6f6237d574163ff2f59ffa3a359ecb7a34ad81021ca2b2972831a2c54 WHIRLPOOL d93ed91c0632af8d93a1ebaa4797e5123dfd8fe1c99038d577ee1ba32ce2544aec2215f5dc6c922a06c622e1c0ebb53d058cf4d080b12ae1bb08790b1cc625fd
 EBUILD bash-4.3_p8.ebuild 6797 SHA256 7ef3886c960ae87840c96c267bd6b318857ff0442a6e14df1cf1f55d2df4123b SHA512 6589d4d705dc3af927b2387c8e92015d2454ef9b579c238c81f8912019c14681522343f6c060f970fe71834f07b2b56e6fa3d9fb3ff06233090add53d7828d12 WHIRLPOOL 1c7d84ffb04f80b3e936e9158022095c1124d1c2a230ed0bd038a48a65cb5124e8831f9677cdcf00d540f2f7374fed0215cc6350b2dbddec803816200a777a37
-MISC ChangeLog 55471 SHA256 657ea51969d355d9f0fe3945e31151daa821b503fd0807d408d28c9be213741e SHA512 71f98f727bf190e174a7e063b5f499452012642e898363b325590e4ccd57a84e1385136c0959aa225617f172b670d73ba98cb82cdf2eab427f74a5a45f08e3f3 WHIRLPOOL 56f8b0ea7ad357f417857520e3b7da270c48dcfac1a1e6a59d7eda88fdad2569c83de53710b8701de2107b47a68e79d5ff6113551b6669da5f2d9aac306a0dfb
+MISC ChangeLog 55583 SHA256 a91de75e8df1629b792823fb057e863a8d23397bc7bf529bbe215e8ee28099ad SHA512 93d399f89a9ece87f52c7a8627ed870776f8a00dc26e3e036e318c030fc5d3e41c7e44fd74af80e97828579e757c9c92071a829296f33b10c14503566fc2e7ef WHIRLPOOL ad2db8177365670d7191b8c264207e0fc7546047d506c5c5bc5cc175b8eae711327e1a803e300d8dabcef8dabc7d1ed3af51cbb2313b123499ee5decaabcb884
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTORKkAAoJEPiazRVxLXTFAiQP/21874BWV2VxXkgUeKHT9L0L
-QEJd8cJEQ03xY6eXE+RmhR47Bv2nKVNBj/oLGm69JLz0cB0X0chZH0h+gBl831b3
-5ULsi8CM4BDg64YcTLip/iGsuJj3wmk6nlX6rHOtyU1Vhpx7zylYuYPFsZbS12Z7
-lh5c4L1rY32U8dVTJu6amx3UCIpBY4WYlEkbkCYqEmGRKO/+gC6IIkuZfVJOYXsj
-Ng0InYe/3av5+6zliqAILFzwDlc+jHwXRMcjSqHAvexwSuxOoRtzL5Ajd5e1Az9u
-U6e9iSQAdFZFvTEP+GFbH8a+OizUeVS9K8y4M9zk55bxWNYXwA6s8Tp/fWoBTV/e
-gkChlFfcD711M4MeuOXQRzQye5V14WkpnVrOkVEMs1NoZXE989TMM1xSY9b6vTTx
-mC37I9IWa+6dNHSnpmbIYBCVpG1dePpP1vdnYLrXN2Zn6fcR85QDUJCaNFk07i7f
-txfB6JsUShN8XNk4Q9NTS5Zib4uqBarmgGftrVTTMEdPQWFdmIoSHWrLbIs6ZHjN
-tRZKgMS+RE6rUNosLcGePRUrL/BezTpLHQZFljDjt9b66PGNF3QUOqPR1sLk8Gqx
-gkd/EIT3wasbHeus2IOk2eJUK8Oy2vfp64B7ZvTR/7i4wDsVUloKwZtHFc04k9Z2
-d9oIXLDL+HSDQEl9Nscn
-=eyCy
+iQIcBAEBCAAGBQJTOmEYAAoJEPGu1DbS6WIAwCUP/1uXGL9MhTO91YceoUujzeIf
+EPH78gO0AICT1IYt/fCb2MZfPSP5zuWvm1Qj5I9KpjbqduW89mvgrVnbOfxzbfTD
+69NGLk3vup3R4vvCMTsDOO5b8DCfwb7HZUtfpoGDRoObTLCCEL/6Pfg/kXQI3I1r
+ZesoFp1Ou0kXBMRS8ejU/7O79qyFHnqjAj5xGipgm+BbOfKXN/t7Gr6GHma1s2sy
+74AKK66dtZzYW/NOZabcsQBjKfifG6drM+ezVRFTk+qqLBahhtnkCJuGZOpUxULU
++VOAPPUUpGBjSs8l3B4emKSCSTsJbhXd64Uh1QhvJaWd4WZuK8N19otSA9JQr74Y
+VxXXZ5OS6uVEyUb5MC5H0lX0o9Axp7B+uhdUrBej86Heabtvw6t5dHgRxABZAqKU
+enX2uDYCZy6/cWW5yuurayPjjPpPWD3DJULQqoIM+FI3PbklsbpHK2bB9f1PB0eJ
+GPO8GTcybHytjRF5GwfhdEAXyA2xf5LxQox6+DgBp5weh357FadlULYPdB6Vdqyq
+t20bY/RpkNDYZcwSvFKGMMQFqJS17bRBcKQEDXSTGTpV6xT5e3HjWR+3e8Bys48P
+JaLwRsFp9n50pjM1NVD62tPkNoCvylLSwuWrKK2oBg9jZdd8/wx5haK5569arjP/
+e0lt2BnBQCTs2TIiirC7
+=h2PH
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p46.ebuild b/app-shells/bash/bash-4.2_p46.ebuild
new file mode 100644
index 000000000000..4c2967f2abcb
--- /dev/null
+++ b/app-shells/bash/bash-4.2_p46.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p46.ebuild,v 1.1 2014/04/01 06:47:43 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 ~arm64 ~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 "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+	fi
+
+	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+=( --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
+	tc-export AR #444070
+	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
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h examples/loadables/*.h include/*.h \
+			lib/{glob/glob.h,tilde/tilde.h}
+	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
+}