Version bump #284353 by Lars Wendler.

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

3 files changed, 212 insertions, 11 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8cf02d0d0049..1efe871613af 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.220 2009/09/07 19:09:55 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.221 2009/09/10 00:23:58 vapier Exp $
+
+*bash-4.0_p33 (10 Sep 2009)
+
+  10 Sep 2009; Mike Frysinger <vapier@gentoo.org> +bash-4.0_p33.ebuild:
+  Version bump #284353 by Lars Wendler.
 
   07 Sep 2009; Tobias Klausmann <klausman@gentoo.org> bash-4.0_p28.ebuild:
   Stable on alpha, bug #270008
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e2155f3c9cc1..0933cbc503f8 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba
 AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
@@ -17,13 +20,9 @@ AUX bash-3.2-protos.patch 1106 RMD160 c54848169ebf937486c53af2e6f7e73a6c28285c S
 AUX bash-3.2-redisplay-cursor.patch 685 RMD160 80fd6fc3eefb4cb589132f8b462b79c3e15d4b90 SHA1 7cb2664f7dd570f46f6302e743262e696f2555d9 SHA256 4bed8131f3ee39fccefc805dbe201eb9b8ce9671b9bc607c3d2a95ac6172d1ba
 AUX bash-3.2-session-leader.patch 2098 RMD160 b298743fb54162d0caa8d409bf1f7b6f796c65f5 SHA1 ff136654614731ec3252ee5f34235138f0bf381e SHA256 533861310e7cba05f315ff56af32aaca5e4bdf7c2a450d4e616bb14fdf4a1f3d
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
-AUX bash-4.0-amp-case-segv.patch 732 RMD160 7970328c10e34e87840d39b9f51cf717f7e9bc4b SHA1 c78ecc22000d843184c1e7cee71ea6f64a4a821b SHA256 23dd71d116c2ab31e98da7f7a92e6bd5da567840f75add82e751c5c3539dbb50
-AUX bash-4.0-bar-and-piping.patch 516 RMD160 22b09fa96906ecabcec9f3aac9c8bf2f1eb8d7f1 SHA1 5ddd2e582be271679fb710a6af1e7b6adfce8937 SHA256 6dfe8353723642f09bc67479e8d857195b0bdfede3c3f41a5c8eed4146a1079b
-AUX bash-4.0-debug-trap-jobs.patch 1392 RMD160 ea7c7c48099e916d37f70a9da7c1cd2fb05f001e SHA1 ab6c3deaa913bb1d06d63f291236d07b59036de7 SHA256 ada8cc935a8c727c65e9fb1ec3865b8e0841d943a07167d0da75bc1297549c06
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
 AUX bash-4.0-parallel-build.patch 874 RMD160 0a33dd9d60b0e1b5a4fbf89f8de1934c0e8e6ecb SHA1 b5c678c4d7b33ce4d1ea126350d859dfe060d8e2 SHA256 cab2cbe41768a2a4e6c34d0b00bd92ec4e598c049e3d8ee6080b27f77ce14284
-AUX bash-4.0-redisplay-sigwinch.patch 1773 RMD160 372166ca1f310e1b570a93be6135aecfc1d5e1ee SHA1 1cada57ec2124471aa6916bf63504da7179549eb SHA256 fedef04f7a06095e10af90ecb074c245526f3e34592fa8dda2d2e203cf6bc1ef
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2796 RMD160 7d88ed1dbe1f88c8752b2301376f4702fc178375 SHA1 783fcfd8c3273184db638f5e61da1d0921426d00 SHA256 de72a331ed65585fd70353d0d36d5d69e229b7db52c7cb97aeefd8f1b148d218
 AUX dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 SHA1 9e1e6e03b033fdfcf9f2098324bac5754c26ec69 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022
@@ -125,16 +124,24 @@ DIST bash40-025 3435 RMD160 3fd64c752c3e9f32472455247de52fd08bee1182 SHA1 ccd98d
 DIST bash40-026 1433 RMD160 5edce83d4910e1fadc004f0b35b1a84d624a2dfc SHA1 39a9e0233efd5828f92ec7625643557fe628fe06 SHA256 a9bdf4409c6625561884be58026a52ccb47600407f3d5b8d0889f0585040f6cb
 DIST bash40-027 2010 RMD160 99a2ba5a9b13d80039982966f7d18533387f66b1 SHA1 50976ef737ce3c01957a058ef5b496e152ebe7ac SHA256 f65dc26bb1bacc8a66610cd5f6f2b8e70be8d8c4e397e7a5ad6f3306224b77f2
 DIST bash40-028 5567 RMD160 bc99e904e251a1f30a94359afc42ca2225fb4f29 SHA1 bb3d83b79ed357c86bf75fc41eaf06e913e84c10 SHA256 5b222cbaf3ab1c1d9b4c5956a0e28cad49660f5746af08efe174e7b474022d1a
+DIST bash40-029 3119 RMD160 3fa4e1913738a883b65f9c4c2a3e96d573c094e3 SHA1 785b9552092cae95c5cda66794bf725f5541c142 SHA256 15f5a21f91fc19c20e2befa568364f11e72ba30e86e4c61eebb6d7544555fa66
+DIST bash40-030 1649 RMD160 3ccc42be8f16b84cd18fee91fd3dd46913a3f0b0 SHA1 1647a3e6174153745f6cf725c1d33e23b44f8b39 SHA256 7f85de6839a6180922c2fec86f4c150036fca096e43a046a117e97e50e958af3
+DIST bash40-031 1633 RMD160 d469e10d79eb3504985a30ac12270c2262a1a0c9 SHA1 7f34873548010e7183015495c1ba2d41e61f215e SHA256 603f318906ee4cd5fdc6a32360b59a5b64bcb50e393fe77d6116269ba28ffb0c
+DIST bash40-032 1154 RMD160 690c13306e4dc6166f86ba408323b92e70b60276 SHA1 f8495c7c7b22011d24864e0c425d37d3f5134b01 SHA256 ea6b4736bedcf73cbf2a2558a2c3a04e3b18064a9730ac7e0c03e15d103faade
+DIST bash40-033 1380 RMD160 2fb2d24a237de5ae109e729ea94bee76e6830f9c SHA1 fd778956d9315a48f0ddda68e7d802e48c039921 SHA256 c496f6e0329940925dbdfc002ec08b8b06dc7e6e3269ca490f99a3879d2d04f5
 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
 EBUILD bash-3.2_p48-r1.ebuild 6151 RMD160 3c9454c27c6dc1770ef1acf5d3a6052218b6e1d8 SHA1 ba75c32939f48234e856866194d42778a3268d94 SHA256 9d96156f36a972a5f972b509ca0d9122e27ae1b4c095e4489397ecf3b78d039d
 EBUILD bash-3.2_p48.ebuild 5988 RMD160 1189a2e142ef38b30b20960cccc3a997b76c3f71 SHA1 1f626a8e00abb29359ac07f7251977fedbca54b7 SHA256 7eb6f2828f2cb157d759333983d2f9a3616d2288cbbc9228a88472c278088882
-EBUILD bash-4.0_p10-r1.ebuild 5643 RMD160 9ddc369370b4ee5c7eef01fa4c65a20058c99cfb SHA1 745265b56b37d2406e0937389fe3b18b388d4ca0 SHA256 8fe6f190cfc9fc35049d30693e84a8de8ceb36bdd08b3ac8bf127aeff5461b57
-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
-EBUILD bash-4.0_p24.ebuild 5660 RMD160 efa4a9be39b74879792a39138d52fce6f7d969c2 SHA1 38d57779acf3e3f9ea77463fca422c86020f441b SHA256 bcf9a6c93480b2a54bc23d45354a0fbbbfc86854bd9413d49e188a902a08ecfe
 EBUILD bash-4.0_p28.ebuild 5661 RMD160 3d09083d5d89006de43575010a4394b03bb7fa0c SHA1 97f6ade45b4689c9048bc1811af228162d52ec03 SHA256 8ca8ed59ebf88127d25032127439a5c98865d616ee45d6b5ef81ab42ee714086
-MISC ChangeLog 35917 RMD160 70bd0dbb3309db18972987924e5609c340ad1d82 SHA1 c3915f76305bcad4bd633ece910277cb95566676 SHA256 cde03291517526feb749872c145a3e0878aa0e825d0890a73b01cd9ac304276e
+EBUILD bash-4.0_p33.ebuild 5734 RMD160 b2b9680fd16a7c9807de7a3f9a6feb9da55ba23c SHA1 09a16ff879674f13e21c273627d90136bbacaea7 SHA256 b6151ffbbd0c0360439e925a36d202009d4033ab360e33e69a936d258400efd4
+MISC ChangeLog 36057 RMD160 addc71b27239a069c6cb157498699848fab6d17e SHA1 786306f4cb4cca1d0c68071fa84eb756176aab1d SHA256 891f30a9f7763ca8b34864f5e4d0fd6a3ce355cfb98e976614cbe8f15a1da7a7
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqoRyoACgkQlPl3HsVfCDq1AwCfQLXpTA2ZznDMaq8ZOxmNrQR6
+D1EAnRQOkPwfoGzuYA/h/6thc1htqTl8
+=xhrS
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p33.ebuild b/app-shells/bash/bash-4.0_p33.ebuild
new file mode 100644
index 000000000000..c6e3a7d2cade
--- /dev/null
+++ b/app-shells/bash/bash-4.0_p33.ebuild
@@ -0,0 +1,189 @@
+# 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_p33.ebuild,v 1.1 2009/09/10 00:23:58 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 ~x86 ~sparc-fbsd ~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
+		sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
+		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
+		epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+		# 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
+}