Version bump #290394 by Lars Wendler.

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

3 files changed, 204 insertions, 6 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 1f1020c17743..f2e5da5c3ea8 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.232 2009/10/15 17:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.233 2009/10/25 05:32:54 vapier Exp $
+
+*bash-4.0_p35 (25 Oct 2009)
+
+  25 Oct 2009; Mike Frysinger <vapier@gentoo.org> +bash-4.0_p35.ebuild:
+  Version bump #290394 by Lars Wendler.
 
   15 Oct 2009; Mike Frysinger <vapier@gentoo.org>
   files/bash-4.0-parallel-build.patch:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index ce506ef31cad..331a3351d789 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -129,6 +129,8 @@ DIST bash40-030 1649 RMD160 3ccc42be8f16b84cd18fee91fd3dd46913a3f0b0 SHA1 1647a3
 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 bash40-034 2160 RMD160 d6df7474d1ab799791330883ada9f090cab1d908 SHA1 ea9f32de963e21a324c24e9c163a0b0e3cbf965f SHA256 37d2f304c5c283602bde8195a501c19ef5ade3fb5494d25ca22fe1f00cbb42f7
+DIST bash40-035 1884 RMD160 f82ce59f1134355d79248801d90fb2c8c112ad93 SHA1 79e6698a402b07450d3b9ab664f3ef5a6c53d85c SHA256 1806e4efa9b7dc796cec0acc4062cd501b2646591699c14b4899c26438c8f673
 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
@@ -136,12 +138,13 @@ EBUILD bash-3.2_p48-r1.ebuild 6151 RMD160 3c9454c27c6dc1770ef1acf5d3a6052218b6e1
 EBUILD bash-3.2_p48.ebuild 5988 RMD160 1189a2e142ef38b30b20960cccc3a997b76c3f71 SHA1 1f626a8e00abb29359ac07f7251977fedbca54b7 SHA256 7eb6f2828f2cb157d759333983d2f9a3616d2288cbbc9228a88472c278088882
 EBUILD bash-4.0_p28.ebuild 5650 RMD160 0f55e92e5d46c021890e5db07cacc8205657a0df SHA1 d41a8bc45ad133c4f4107b6e5cb5394660ef3541 SHA256 2453c1bd5f3ae77eed2c461104bec604da291d58e91c321899339f61c2cb8bd0
 EBUILD bash-4.0_p33.ebuild 5794 RMD160 6f1c342e92a726297b0307491bb94e3c2edeee39 SHA1 097a79c6d8770fc814c293fb76a65fefb0ae390f SHA256 a597aea23bc6799afde9fed119a839ed2bf49814da00f710a851648f1db68896
-MISC ChangeLog 37291 RMD160 3713d2e2acbf82645a22711806080aa52a1e49bc SHA1 7ecece392f088a970af84f87e740c17d37d561a9 SHA256 1276fcd4e4448c862cad3e5e0eea81bc924fdd0895955b0254d73b6ad1378282
+EBUILD bash-4.0_p35.ebuild 5794 RMD160 370b78abf2ae1f694f7e8ea7eb1d52683821af86 SHA1 03bfec668ecf1e7569fc4eeef9e488e21d502ff7 SHA256 2e7b311d288cc32f1c16bdafe3a4029350efdad59a20edfdb844eceff17aed11
+MISC ChangeLog 37433 RMD160 b19238bf6d5a0107967e6e948685fd6640f25474 SHA1 87ab5b9329dd4954bff2b219c1e83d3424d0dcbf SHA256 ff6a38e6c452240035bba41a1d6b98888da9a66b5574c1b4dd03fcab2604e7c5
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrXYGUACgkQlPl3HsVfCDopbACeJAEFA4cfPsKqBYCohtPE5f2b
-KDgAniod6npSwP/FTuydCsxaxB9AkOUk
-=AzB8
+iEYEARECAAYFAkrj4z8ACgkQlPl3HsVfCDqMrQCdEAJbTyV9TJ/58YNDPZKu1EmP
+gqMAn06BC4Luk8WW3lcp/uJVnJbXOoc4
+=aJgZ
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p35.ebuild b/app-shells/bash/bash-4.0_p35.ebuild
new file mode 100644
index 000000000000..ac9eefbdc0b9
--- /dev/null
+++ b/app-shells/bash/bash-4.0_p35.ebuild
@@ -0,0 +1,190 @@
+# 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_p35.ebuild,v 1.1 2009/10/25 05:32:54 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 mem-scramble +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 \
+		$(use_enable mem-scramble) \
+		$(use_with mem-scramble bash-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
+}