Version bump.

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

3 files changed, 254 insertions, 15 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 5fe252e4381b..73faeefd50ab 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.350 2014/01/18 02:25:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.351 2014/01/31 05:42:08 vapier Exp $
+
+*bash-4.3_rc2 (31 Jan 2014)
+
+  31 Jan 2014; Mike Frysinger <vapier@gentoo.org> +bash-4.3_rc2.ebuild:
+  Version bump.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> bash-3.1_p17.ebuild,
   bash-3.2_p51.ebuild, bash-4.0_p38.ebuild, bash-4.1_p11.ebuild,
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 8d4f9e986600..68ecca6a9f02 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -39,6 +39,7 @@ DIST bash-3.2.tar.gz 2529838 SHA256 26c99025b59e30779300b68adb764f824974d267a4d7
 DIST bash-4.0.tar.gz 6230779 SHA256 9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518 SHA512 dccd099d11d649b26d5b5c2ab5fb8f33915631e1d86fba519a0464f2bd3a3289655e956cf161a0dc3671b8be193b6b065bede8a407d98af3012dd4b824711255 WHIRLPOOL b8223f5dcee9dee92b9bb0c6d09a90ea2fd71bbd0894a9927be459e0a2e2b3f0413f57062f4ba7c1f806d778bca71641df4c2892fd6224861d2cd802bebe64f8
 DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
 DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
+DIST bash-4.3-rc2.tar.gz 5223706 SHA256 9197727d5a74619f6225758a1aa40e3f5b78b278371f2398f0fd393b1bb8ac64 SHA512 67fb4173cf805630c2b458d15f6d98d31b717abcb15667f4d4a66d04228817b4a408232d2cbda0c0909f3f189ed45462edb590a85b63199b8657edeebd239805 WHIRLPOOL 2bcc570f471055ad07884ac0cce2d03f1502d281a21204a69cdcc0e0db2bfdbbc0a4edab8c94478a08a792fac17d73a216137cfde495dcc6d31f92a2c5d3c3b6
 DIST bash31-001 2708 SHA256 3b6d9151ca7a45dbcf43ebd1c6a647ef90c4b8eb54a245936fd6ffadc61fe727 SHA512 ec5aa8407afd6b4db29855ff740f880d20cd029bc27d6b996a8e4cc2982a37e5eb826216436c47f09cd45e17fb8fe55b748dcaa7a361bba8c9e59f1620b40fcb WHIRLPOOL 931e4829b48da4088f6775aa212dd8f110c2ef874a33469ddd3c1fce363a7c2407a1cf059261cbe5c625e569b6e0f11c36d416164d3d61e58831435249a50668
 DIST bash31-002 7169 SHA256 ecd248b1ca027368dae967502af5b28019eeee8fa3ee8d6a0210677789658f08 SHA512 80951d9c8abbb7ed83c85e8ed069a80305eb8c119b1f5b5a4b35e213b7ac98c4fb15e07512e028139ed60928c39f914ba675db9f068619a15a076844a46b1a2b WHIRLPOOL ab7f524e7c96efc93f58dd40bbba6d923f5c90cf87a08c8d82459e5603f89f2fb4fc8215f9b68c946fa48d652e3433e12b3f9173bae405e9773a600bac033d50
 DIST bash31-003 1324 SHA256 96cb8a42162a5876b2392b76fbfc78d073f50735e1e8a14e67e03b6e9c2b215d SHA512 37d64e5f04832d404887d1a95bf3973b66b31b7c2b6184e3edd5f92ad848bf01dc0051bfee6804069beb0b1f522b8e3a0b0407c65885f539cc8e1f1ce2a296a1 WHIRLPOOL 96a1f17b8cdacaf070d70119bb686a155e313257b38791f92883518f028670ddff8a6ff1b68a2fa835daae81887057b757248e7a8e6677786d71ebc7eb5aa6c0
@@ -207,22 +208,23 @@ 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
-MISC ChangeLog 53563 SHA256 7ac00090e31a2cff0dbe9ee27349206b7bba665b9ec583cc08f149cfad6672b3 SHA512 8037dc726a3499d316d1aafbf1a18866cf2e607a7bbf2bb152827c2101c080291ca4344ad17edd7f8f7d69cc7c56bee7a8815cef98040992091dda39ff2acdb0 WHIRLPOOL e0f416caaccf334b04e960ad4c7e53ba970a1700a987b531fab8f9d6e4cc10460c306e4e22167ec130867908425faa569f91ecb6980df5b4d2292f7300aabc06
+EBUILD bash-4.3_rc2.ebuild 6745 SHA256 83ea4a37f55f2934e36d40bb3b75ce413568c05be682e47a32c3256d4097661c SHA512 dd041ac2046df11563d281a378e88909e45e5d38aaf6745a3c89a78231baf58b4bd7270513687cbdf0c4c363c3ab399d6243f7d22ffa2ef5ce6cb99215faf3aa WHIRLPOOL 7bdb920c49fb860e5ee11d9f5028f0cdcd0a4de1b2ee1526fa1c6afa00e082f0a75885b6143b18e8c6520f804f4ee01cdd90a9f9ce1d995c9cd5da184c0a2d5b
+MISC ChangeLog 53681 SHA256 76692770664199f38b56f4eb4d28a38283ed4d49beab965ee27eedae255527b2 SHA512 d015a54c9f1abaeae63ca70f3d1d58fbe6748fd6fc7c76da7c3645e4ea5c9803f14b78ac81d2c0c770f8183a35e4ffd7cb38d0ce87549ea1ff12978d8055f206 WHIRLPOOL ad03106673cbcc537dc0e43f99cdea0205166013934964bb078f3788b2d4c926599aede1c62c16fb482d34c676772d039782035d3dc5b03098dbb8106967d1bb
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2eYXAAoJEPGu1DbS6WIA3ekQAJQU7NmiQDTXTm10bjkZRe8f
-la43W3YiUgkEKnloejF1EeZRlQ+d2Z1kmdmr6oaL8agdiOxMIFqz6L4KA5UBzzFl
-YMoLm53sHlySeR9nGmDLFTzjLNX4X0sKQizRD3bkfCptMhPeeCs5EYyAu4pMZAmO
-C6omKnAagV/P1kaQ129jFkrbbftl09zUEhAiie3BycIEAVAuy9Pj1shXHJIYdHFx
-m+fYWM+VcIGOQj9Jg5o2ZXWn7PBTEYLkJUatUyDp8SNqnYXKBZospgM2qZbgwXHi
-sChDxwhjMhBlCOQi4CFD4GXwaj+3FlPcSw1w09Y9I5rJVaIzKAvKWmmqsMoxGNxp
-WuWkmQk/2q0kqoZchZ4Y6QipKkl1T+5xji6iRN/c2qqy4gDrxx8V6472ncHNiEz+
-ltvBShImh20QeCl+ap0hlXuJd8wtOC4ZjUYdJHbh/GVY2+lYpABmhBwnBva74rx5
-KW2GNIesvGV6OSKKaW0mIrqm0lzmX14sv4Ck+7znpahFCNZx5v0CE2j9tmh5bOsT
-00YhZzrgtaTmwgxfOE0jjbJ96AXMqz4d9sZjEbOC+mLooS19GMaVRfDav4m32luo
-6IhhpO7FyFIeDGR0xKBPZTH0q8IYT8KlVQ0Qqb738jA5T/+ntFT1oUOWoI5hKVYL
-e1aEGMAwVdABQmeg76ol
-=fPnw
+iQIcBAEBCAAGBQJS6ze4AAoJEPGu1DbS6WIAzqwP/20iYqO/RtWVPtZljbIrQYeC
+83GHCgk2bqZyc9uLOGqi1Gs+cy/D9aizOYVcKDDZtTvnnjEv+Q5x23Uz29MvIIPr
+t1KVrSaW/vgVXneXqbr7v1FMqMRKOTu27wbV5aXixJIrZP/7h4rAlOhPiY5V5Y+m
+lIuCGAkSxI7VhiShFkNFjPAF+WVmNzvP6i2GduoW74afq81H/aYR/KVNgnoc7+2S
+5rzY9qXBVMIpK0vSwKTGWodxSqRdJM1+QKwqN5qFZ5JUSg9+JUso+UkdBpCp3V2K
+fFtuuLFkAM8XcYXgTWXSoKlZ8Fu07X0632A83TyskcmHskIpiQCUleHwwG+f4Qpo
+QkgVxTLDwmVVV1JAqyuIE/Ex5uC9pNMUXxrD+YqBvCRvgMpm6+6YSGxQJC4Kp7EX
+sV+OjCvRVPl2ccQFm4l3lRp2MHGl7oA+4yshiPGtIz+wa/31Zk+HKYlWdPHKY93h
+bIhm4edOUVtIZChCMpWxUiSblM1T6ttMSF2GuDFNi3RxquBN7E9uLItWRrU8QW3l
+kqAfPSaRv0dxfc5DwNDVtBs/v2kPL2+3sqGQIXoLM32Y8EPqBhcv9rbAWUcya8/z
+J7kCzxfpR1C/hJJDReHOCNFzwSrg586lUYJ3zd/xHlsUifkNzs/nFbU7AsoEhhlf
+76D1FwwCtWdJ+rtaSoMq
+=qlDw
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.3_rc2.ebuild b/app-shells/bash/bash-4.3_rc2.ebuild
new file mode 100644
index 000000000000..1890d13cbf7e
--- /dev/null
+++ b/app-shells/bash/bash-4.3_rc2.ebuild
@@ -0,0 +1,232 @@
+# 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.3_rc2.ebuild,v 1.1 2014/01/31 05:42:08 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)"
+[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+
+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}"
+	src_prepare
+}
+
+src_prepare() {
+use mem-scramble
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if [[ ${PV} != *_rc* ]] ; then
+		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
+	fi
+
+	# 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-no-readline.patch
+
+	epatch_user
+}
+
+src_configure() {
+	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 :(.
+
+	if [[ ${PV} != *_rc* ]] ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	tc-export AR #444070
+	econf \
+		--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[@]}"
+}
+
+src_compile() {
+	src_configure
+	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
+}