Version bump #418205 by Lars Wendler (Polynomial-C).

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 222 insertions, 5 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index a44e7d39d45f..db972ee2c958 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.312 2012/05/23 01:13:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.313 2012/05/30 16:06:34 vapier Exp $
+
+*bash-4.2_p29 (30 May 2012)
+
+  30 May 2012; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p29.ebuild:
+  Version bump #418205 by Lars Wendler (Polynomial-C).
 
   23 May 2012; Zac Medico <zmedico@gentoo.org> bash-4.1_p10.ebuild,
   bash-4.1_p11.ebuild, bash-4.1_p7.ebuild, bash-4.1_p9.ebuild,
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 5a598269cd52..5607e0411591 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -186,6 +186,7 @@ DIST bash42-025 3969 RMD160 538e9f2f6e9e6315d4fcfb3bc08d1aee9618c9f5 SHA1 c1362e
 DIST bash42-026 1577 RMD160 32dd5da47a149bc9369272e1e792c35e9d4a84c4 SHA1 d976cd03a3d6a0006b498dd3531a85dfe88b57c0 SHA256 e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2
 DIST bash42-027 1461 RMD160 bb7546341f7c65b016cf20d164f5ebf69107c8f0 SHA1 baad3c5f1f3c20c96bf7cd6cf932b4e8abc1f0c5 SHA256 0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42
 DIST bash42-028 1834 RMD160 71071124dd5124341bd01f8c10d577d477a731a9 SHA1 c63104992b8f95ef966dc8604f89b0bc595d0d08 SHA256 204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a
+DIST bash42-029 16812 RMD160 f1c172dcd3d384f032781bee631e422aeac1a10d SHA1 4e7cde1f18fd553035270283a6156760b4de86c5 SHA256 d0b08c0817bc5acdb28b466727622a8422ca4d61188313cf162443b7f338f581
 DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774
 EBUILD bash-3.1_p17.ebuild 4642 RMD160 c3b239d492a873c3727f743d3cd6011439863de6 SHA1 8c93c595193c4ef909c008b0aff39459184f802c SHA256 e8178f2c3a8505e11390721a552c28173adca3250c8195f4ad63a05a794f02a6
 EBUILD bash-3.2_p51.ebuild 5862 RMD160 c87e550711c01672fd2f99da2d1ae38ccad33008 SHA1 b4a0219bab848ea9090134f862257370b97650fe SHA256 2ded1efa635872ac5f01e27b390bd2d67b4e4867d52680074214ae8c3cac04ae
@@ -199,13 +200,24 @@ EBUILD bash-4.2_p20.ebuild 5968 RMD160 1b385f24c5269b83269ebb380602c0dacb737eff
 EBUILD bash-4.2_p24-r1.ebuild 6234 RMD160 a522ca323169621af8c88aebeae13a297f4d190f SHA1 0b0e337cb7ff643a80771419f3c04ac4c19f499c SHA256 fa229ba1ee9d97d82ef3c220123f3e858770b6d7dbfdf7cd1da214b280d25424
 EBUILD bash-4.2_p24.ebuild 6155 RMD160 f96e99e13eb95f66de5fe2402de761ccb92f48f0 SHA1 3951ab55deb27a55162971911b631331b331a554 SHA256 02d1f7d7e6e78219dba763c661a50b90c731b7e8f88aa9df66479fa678bb4b17
 EBUILD bash-4.2_p28.ebuild 6167 RMD160 4d1f9c36093bcccd7956fc048a3a9bae5d76346e SHA1 97c9ec08d88bb0c8ea53a0e9ddc23696000b39a1 SHA256 9ce516ae7fbe2315e35b071c91e9a72ab43f5c1a50d90697aa673b306bcf9598
+EBUILD bash-4.2_p29.ebuild 6166 RMD160 2788895de79141d220c5163954a25550b5b655cf SHA1 4799805be8b654f1dbdb42102116e1c6c5e0277f SHA256 57928687bafac92b8aeb0f3598a026242c04aa24e733883b738e3a65d080f1bc
 EBUILD bash-4.2_p8-r1.ebuild 5549 RMD160 61d5b34e0125eeb9ef17cbdb552ceae0e3754c41 SHA1 91c1346e5c9f0d0f07323b7c0ea38b9534911a94 SHA256 4ca7fc7ee535d0a034468acbe321ec37435a7790c0757b69f4a8e34fbdc0f178
-MISC ChangeLog 48345 RMD160 2b9d7e31d421719030fd386dff288f151810b5f4 SHA1 a7a4fa989c5ee06c421229fdfba350076f137f0c SHA256 e9c78c2b9d279fbab27d5440c17b0b8347b72246a796f1ebdca0d0865f0cc25a
+MISC ChangeLog 48501 RMD160 32618601ebb14b5842a9e6c7641ffdc93e920340 SHA1 2ffc61b052fd8a62b2fe76925b377fb27defe370 SHA256 0c84104cc752f9a8b559e062f5aed8c3d54fc9298613312c4b141476f65c0fcf
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+8ObUACgkQ/ejvha5XGaMeewCggs1PzZcgq0hboksUMefjtXgF
-xx4An0njzLHOjdeBXA3LteX3hIP4BdOM
-=nes6
+iQIcBAEBAgAGBQJPxkWRAAoJELEHsLL7fEFWgCoP/1JDuTtuyNrKrIQzJ/cyAEAD
+RYG/3LwVIVnSaJrQY3gk8fGgok8wFv0+l0tysVLjcUgDL+2Dj2Iu0YR2hSKchEBb
+CvpzDj4wy5qxYd1DirSQ6TuoBrRVFf2NSRWqdx8+PIQby/VSNHR+8pNk9gfD1b96
+/QctcXO7PwNuPesK9BIjv3vUJOYKDnLP3CabPN44Q+quppX3aqQ3mZd1hy44NYyJ
+2j7FDvIxAWYm5Vtz/x4UMguTWYM+V3sN72ppBrJ/l5DIm+C8U17CmuNOjcOwSabl
+EnQX+h5kO6UeM5WBOOV/2FbNmz1AJ3CaHsDVQf+cYBveeEp5APtvG7qnnHmTRJWw
+8DGVOiQC1vCBx/nfxaCavtY4VSblrUFgBz2RRfK36wQJpGu9IQciYtsdGkdoP8LS
+HZ9ppjY2NrQ1csG3aJ7l1BCWS/BiD+ES+iVUcBCSTNt9WZwCQsKDQ+r6GjVimzEH
+HsbLl2FT4qrVGgo/UQ2kQRScGfdM1bdOLkXDxL3cHxnBJ6BCns92SOjZhLYA0nq7
+suT/3MkMalQzJ8y4GzoHidB3/YaO00EfysoIRkXvmtQkoluZEGPm9sn2E2KetiUI
+YbtqRw2Zj8pF6SlaQ/YOkO6MXVJRFflLi7AhuBikFVSd0UQ8IpCo/AgP5qvlwHEx
+obhLlRGZGS8M5tSTOi+P
+=AMTP
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p29.ebuild b/app-shells/bash/bash-4.2_p29.ebuild
new file mode 100644
index 000000000000..d1005aa65ba4
--- /dev/null
+++ b/app-shells/bash/bash-4.2_p29.ebuild
@@ -0,0 +1,200 @@
+# 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_p29.ebuild,v 1.1 2012/05/30 16:06:34 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
+}
+
+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
+
+	sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+	sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc
+
+	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
+}