Version bump.

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

3 files changed, 211 insertions, 2 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index e9b474b86863..43ba5e6962e1 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.214 2009/03/23 18:34:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.215 2009/04/08 06:21:16 vapier Exp $
+
+*bash-4.0_p17 (08 Apr 2009)
+
+  08 Apr 2009; Mike Frysinger <vapier@gentoo.org> +bash-4.0_p17.ebuild:
+  Version bump.
 
   23 Mar 2009; Fabian Groffen <grobian@gentoo.org> bash-3.1_p17.ebuild,
   bash-3.2_p39.ebuild, bash-3.2_p48.ebuild, bash-3.2_p48-r1.ebuild,
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 5c59e762b8df..5352dd4cbc55 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
@@ -104,6 +107,13 @@ DIST bash40-007 6920 RMD160 5a1bd8f24e3a33155ac9194d9c9efe2c12849713 SHA1 477d2a
 DIST bash40-008 1196 RMD160 4dea0c385ec38af6613d07032aa504afb0d9eec8 SHA1 e7f336204810905118a1689329b38df3abdc9522 SHA256 87db24c00f83db7bdeab585dfecc76cc6ce6fd9269fce0ac7197771f3005d8fc
 DIST bash40-009 1821 RMD160 886a6139a25346bb1703a7dca51a4f905f4f1951 SHA1 8f6f4d6ea5371805897f9435ab0dfe98318bc26b SHA256 0047c240617a4aa633bb699f93a4fa9caf77051f2bb85fc2e9c6c899d1df7e2b
 DIST bash40-010 2152 RMD160 0a505d7fa2a2f576a46b6716d7f172098a303392 SHA1 b6ae8581201f10e4a2a87da077880bf65a0a5a9a SHA256 f2416f6b45ff3d9a315e41b3da023eb727f53e7dd6e8a07e88d1f2a005ee4816
+DIST bash40-011 1383 RMD160 e1bb7d468eeef37e0167c0bef476f33dbce43650 SHA1 ab4daf25d8acf6793d7e60cbaa1fb2731cdd057b SHA256 ffc81429efe88958356684c27a914d832c1cacb16ca6881192832ee3a18354d4
+DIST bash40-012 1459 RMD160 d0b5e71481991a80ba6a1d75779890838e49051e SHA1 c9215c1a8a5f30fe92fabfbbebd98b9c298dbf66 SHA256 b2c4d6e9c12a8695bc177798b9857b9dbc85a035ad83fce401e668a2de1183f3
+DIST bash40-013 4629 RMD160 0ab5d07aba9303a2c69da8e76dbb12837984cf65 SHA1 2662229353256fa133bc96868c125855222e6007 SHA256 760ccaf9d1f3be5d81e6bc1f8201820b42a2cdcd2a561cb0fb021b4c241e4c3a
+DIST bash40-014 3709 RMD160 232aa79556b0557af200df67f0c13543b4898f6a SHA1 8e2ada4c483ad219b479531e54e285576ef5c547 SHA256 13edc4c691768672f680b4f266bdd1c12e7b247349eba4d30d0bd923cca1c39a
+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 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
@@ -111,5 +121,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_p10-r1.ebuild 5643 RMD160 9ddc369370b4ee5c7eef01fa4c65a20058c99cfb SHA1 745265b56b37d2406e0937389fe3b18b388d4ca0 SHA256 8fe6f190cfc9fc35049d30693e84a8de8ceb36bdd08b3ac8bf127aeff5461b57
 EBUILD bash-4.0_p10.ebuild 6230 RMD160 0cbd5c35482c601757ac4a73710a675fd3f6351b SHA1 b24e7f108bd10b56dc80fa6c34fc70417612b3de SHA256 8037f550138f948b83946c5d49633e84e9c17c1248834856156f4222c251d86c
-MISC ChangeLog 34949 RMD160 db42c758c38e527e08d30638a233e079b64425aa SHA1 d1a2769465b4d58de27a024ca1b30cfe68f4a9e2 SHA256 6b70e517428f093988051f308a5e124f5fd0dddce9a63c73991a5f0b33d8897e
+EBUILD bash-4.0_p17.ebuild 5532 RMD160 7fc209d153ffeeb0e29e1f12bbfe71748e69f5d8 SHA1 140a2ec331f365c22cc1ab0ce7b6990dd464a8af SHA256 b712cfde5fa006a7d67130db7ebe50bba4b1535163c50bbb6226d748f5eb4561
+MISC ChangeLog 35066 RMD160 fd08658f6618b3e1ec61a66d86dbd16e31ee6c99 SHA1 cc019f18160edee810d1f4a86a14dc0e36c7d204 SHA256 b7f2d86f400fc6f7f552485323b151f18454097f046925f5ad0f2f1e328fcf76
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkncQmIACgkQn/5bYzqsSmEhCwCgw0Bv5ZPFXQsHthWJ+aGzu4dG
+o2sAoMR6Gv5Is9Ii0SFdcR3U0PXpMnt4
+=HXVp
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0_p17.ebuild b/app-shells/bash/bash-4.0_p17.ebuild
new file mode 100644
index 000000000000..23f32fe3f490
--- /dev/null
+++ b/app-shells/bash/bash-4.0_p17.ebuild
@@ -0,0 +1,186 @@
+# 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_p17.ebuild,v 1.1 2009/04/08 06:21:16 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
+	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
+}