Version bump #270169 by Lars Wendler and fix parallel build #267613 by Peter Alfredsen.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 206 insertions, 5 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index a4aaa831326d..1caaa459c7cf 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.216 2009/04/14 01:52:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.217 2009/05/17 20:59:31 vapier Exp $
+
+*bash-4.0_p24 (17 May 2009)
+
+  17 May 2009; Mike Frysinger <vapier@gentoo.org> +bash-4.0_p24.ebuild:
+  Version bump #270169 by Lars Wendler and fix parallel build #267613 by
+  Peter Alfredsen.
 
 *bash-4.0_p17-r1 (14 Apr 2009)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e72a561847f1..ac93490447bb 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -116,6 +116,13 @@ DIST bash40-014 3709 RMD160 232aa79556b0557af200df67f0c13543b4898f6a SHA1 8e2ada
 DIST bash40-015 1914 RMD160 76fbe55d6222efd59fe0eb6f9daa7badf101dda6 SHA1 41ac5d729bdb8756c4ee59e27db1eda2d88ff0d0 SHA256 7ba0e2bedf54c80b58e0f471e7372c539e5a43d55eb3f1881f5b8fb649758814
 DIST bash40-016 3032 RMD160 1ab774b4b6ab0964c53d9a73581081b29aea1ba9 SHA1 2aba9164dda6f52872461276fa1ef175784c5535 SHA256 8f3a936e928fe78ae10df109d226f79207a5418a7eded376e880fe57a571d519
 DIST bash40-017 1496 RMD160 692f5b1537351b68c0e9ad0aa597342cd01eb0fd SHA1 b283d0079b5dfb66444ae1aa95ae37ff5803692d SHA256 2bee2afe6339b034e3a8d88bfbf922f6f4704abf0fb56041fa693075f530f021
+DIST bash40-018 2614 RMD160 bc7d056dfb661059890abb34e80c5204dbf51000 SHA1 653671824b58bf81518b042db261d5cac669ce2e SHA256 1db3bb8db0e386be938ce3ca9d3aff10edee57e696dec353fb134960ddc0e631
+DIST bash40-019 3309 RMD160 02c119daea6b2e414907e3dc386be907b3044c7d SHA1 846df69cbef5dd37addeebeb168152fe6bcee845 SHA256 5049948f077090c02286445a441cf8efa3a2d95d5660dd8acef512408b0b7475
+DIST bash40-020 2666 RMD160 874a368171e9ce773a2f17a8339ba9e622eb83ce SHA1 8bae306cfc0d176f4ebd3cfbbe8d38f38ac9f787 SHA256 1c9a9aebe316867c71fdf94f1b2d3c2b40c0d291b3d220e36785e1ac340c6784
+DIST bash40-021 1547 RMD160 057becc706b90a5c55d51baa425ee9546e3fa092 SHA1 a1c785042f92b85564deb41d142a94dd045b9dac SHA256 02472d6f8b104941a2b6d4c9ad823cb0e7cfe6e5c20f0b12ab1d7eb23c88114d
+DIST bash40-022 1592 RMD160 a9c134b260cd4bde1d2c3352b52dcf5e0f333476 SHA1 7060344931a866b07754eb0b9d49039df4132053 SHA256 045a1dc71aa1863f73ad7be00ec4e18ee3c43c20fafe58d9e2c6c51592359012
+DIST bash40-023 2148 RMD160 dbf73ebe9b63aceb61068a9f133a6d4a946af795 SHA1 e6ccdbc145f81209c04541cbfcb6ba561e7fe8ea SHA256 580b522375f762ca5ddf9dedb6431ef4a9b6e887ea25fc0ce152d747ae5ddc86
+DIST bash40-024 3049 RMD160 484c6ef4e0bbe887ecff754db18aa25e62075529 SHA1 3471e683167980dcb297bebe17f34646df560ce6 SHA256 a59ebac47efe31b951e1732e4223cc725b2748c331bec98248355c5ac53717ab
 DIST readline51-001 2042 RMD160 93dd36106f68682c4dc73a9b1ecf62bf7943fae4 SHA1 2d369ad65a8751d0a9721002c06e139afe35265b SHA256 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774
 EBUILD bash-3.1_p17.ebuild 4645 RMD160 245995f2f904f40713448e8be3677bc631eeb445 SHA1 3e6dd73b339da296b13188c54577aeb5573ebc2a SHA256 08c3ac21cb84e82d7d07d8e21a47e0551e5f771d7723cbc1e7a9eae3b380c881
 EBUILD bash-3.2_p39.ebuild 5977 RMD160 c053f7f72dbbc9831794da77d4b93c52c1aab8f3 SHA1 f65b817fa66d0c8f9e125291b5a0c1efa66ab2b2 SHA256 ca54172de85e0834ea52d81db2471d1e6d993eb17705191e0ca9e3107c1c45ee
@@ -125,12 +132,13 @@ EBUILD bash-4.0_p10-r1.ebuild 5643 RMD160 9ddc369370b4ee5c7eef01fa4c65a20058c99c
 EBUILD bash-4.0_p10.ebuild 6230 RMD160 0cbd5c35482c601757ac4a73710a675fd3f6351b SHA1 b24e7f108bd10b56dc80fa6c34fc70417612b3de SHA256 8037f550138f948b83946c5d49633e84e9c17c1248834856156f4222c251d86c
 EBUILD bash-4.0_p17-r1.ebuild 5648 RMD160 c83adb9c8b3c8cd4ff2ee9b56797c992cc4e86e6 SHA1 61bd4ddefb0145d685145bd33ec2264e3fc3dce7 SHA256 6a33af89e89548c0671ec416ebe41b9cd707164c17b4bccac6779ebe36445086
 EBUILD bash-4.0_p17.ebuild 5532 RMD160 7fc209d153ffeeb0e29e1f12bbfe71748e69f5d8 SHA1 140a2ec331f365c22cc1ab0ce7b6990dd464a8af SHA256 b712cfde5fa006a7d67130db7ebe50bba4b1535163c50bbb6226d748f5eb4561
-MISC ChangeLog 35291 RMD160 b624a809cdb663f8f827072fa7dad818b8fe6838 SHA1 7d4c55a7012d71ecdd86425afee53cb337fcd915 SHA256 32c8a4ee488853a210caa1b99fa80879371a70ffe5d8733f05268fb687be42aa
+EBUILD bash-4.0_p24.ebuild 5598 RMD160 152b649fc9e495ca347c68cc77ef03818f52801c SHA1 626dbaeccbaf34e86789706bcaba953998db0c96 SHA256 77d20bd8ba9d35a4814508e15df70b547887cb90c1fad479d415dfb487711e32
+MISC ChangeLog 35485 RMD160 5ab8f88a7aede018c8604785efca7db1632030eb SHA1 ae529ad17a45d84cb549df90880d9bdde9751324 SHA256 7f3d1bada2181561f32fba654e2ccd60180ccd9fc7bcd38333e53b5380bbe150
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknj7HAACgkQn/5bYzqsSmHbNQCeOXFhj63u8T5QuHkFYk4+K7MF
-Lx4AnRVvVO572uAiuUgybROV2wAIUM9W
-=7pNM
+iEYEARECAAYFAkoQeroACgkQn/5bYzqsSmHKaQCfVktYN1lYc3X8UwRbD3MLdHi7
+8kkAn15ULQhGJYlmEdlpv7eDEVa4NB0K
+=VjBz
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p24.ebuild b/app-shells/bash/bash-4.0_p24.ebuild
new file mode 100644
index 000000000000..bbde94e00464
--- /dev/null
+++ b/app-shells/bash/bash-4.0_p24.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p24.ebuild,v 1.1 2009/05/17 20:59:31 vapier Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+READLINE_VER=6.0
+READLINE_PLEVEL=0 # both readline patches are also released as bash patches
+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://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
+SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)
+	$(patches ${READLINE_PLEVEL} readline ${READLINE_VER})"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="afs bashlogger examples +net nls plugins vanilla"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+	nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!<sys-apps/portage-2.1.5
+	!<sys-apps/paludis-0.26.0_alpha5"
+
+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
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	cd lib/readline
+	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
+	cd ../..
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
+		epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
+		epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
+		# Log bash commands to syslog #91327
+		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."
+			ebeep
+			epause
+			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
+		fi
+		sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
+	fi
+}
+
+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
+
+	# Always use the buildin readline, else if we update readline
+	# bash gets borked as readline is usually not binary compadible
+	# between minor versions.
+	#myconf="${myconf} $(use_with !readline installed-readline)"
+	myconf="${myconf} --without-installed-readline"
+
+	# 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"
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses
+	myconf="${myconf} --with-curses"
+
+	use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	econf \
+		$(use_with afs) \
+		$(use_enable net net-redirections) \
+		--disable-profiling \
+		--without-gnu-malloc \
+		${myconf} || die
+	emake || die "make failed"
+
+	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)
+		ln -sf "${target}" "${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
+}