Version bump + move into ~arch.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

3 files changed, 191 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 3218a756252c..852d2ecdffaf 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.284 2011/03/03 21:18:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.285 2011/03/06 20:43:40 vapier Exp $
+
+*bash-4.2_p7 (06 Mar 2011)
+
+  06 Mar 2011; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p7.ebuild:
+  Version bump + move into ~arch.
 
   03 Mar 2011; Mike Frysinger <vapier@gentoo.org> bash-4.2_p6.ebuild,
   +files/bash-4.2-expand-string-unsplit.patch:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e8048be28e5f..a3d206c67030 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -25,7 +25,6 @@ AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea
 AUX bash-4.0-parallel-build.patch 2237 RMD160 82aa28d48f12978cbaea7ebed987d13f5368c2c8 SHA1 c82d0c9ca049fe3c53418f4a3b399a840bbcdc90 SHA256 65db03b0c0b8e2fd917f049e9e84f7b2b234b3e9e37f395d4d8984194b392a56
 AUX bash-4.1-fbsd-eaccess.patch 843 RMD160 50e06a8ec83fa756a9749ab5011696e737731afe SHA1 9468675bdb345c01f6a285d76526e851de63a895 SHA256 42a4ee58b0d2fd529e25fcc3ca10d17bbac2c91fd8bcb191d70c788f0b55fb95
 AUX bash-4.1-parallel-build.patch 829 RMD160 371bd2d62a0b70c4305697975780165e02f2b38d SHA1 9978a6ed4668509660491799bbbc5b7d6ad2cbd9 SHA256 0da60b91e4fb2326137a4dde6d8937592b6efea45de51194ca1770127637e652
-AUX bash-4.2-expand-string-unsplit.patch 392 RMD160 3702ee5279d46e61f505494fc5397e21174fcdd9 SHA1 3b06280fef153be15553665ca71c5cf25d9e6bc1 SHA256 22f7c9898b1b9df83bbe1bf7cde7454227806ebd000ccf82c5a43080eb549034
 AUX bash-4.x-deferred-heredocs.patch 1255 RMD160 69e3554d225e5a85be3f874b0bb0139c0e24c9b9 SHA1 b8d492af021ae59c9799dfbb169842c23ed9f826 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2798 RMD160 c63f6e79fe3e5c12a42f65379aa2de1d2a6437cf SHA1 d1fb11d9b32cd6a448ce969d72949677caea436b SHA256 537fb02f97da09b91f9e3c1b7624e43dbf650536d6a6b3a18e9003a57f610c32
@@ -159,6 +158,7 @@ DIST bash42-003 6896 RMD160 9f6e560984997b595a0a6d85f751c1b8150300f0 SHA1 c18390
 DIST bash42-004 1686 RMD160 5dba7fd5c6fdfa64bf9a2696a65698482d7e7bdd SHA1 e10f0e8d3c24c10efffbca4605acb966393901ff SHA256 4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1
 DIST bash42-005 3424 RMD160 09572f3971beaaaa9be1bde5f9e7d3a6e56e5159 SHA1 c1dd32f9aab963830cb9bf5c0973eefa4d7f8881 SHA256 a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0
 DIST bash42-006 1187 RMD160 92a4c3eb612fe1e74a6ded3623d1fbd8322fe843 SHA1 4ae28b47a46850db3a5936ff0fafb9056f15329f SHA256 c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1
+DIST bash42-007 1394 RMD160 73285b61d25a7f998d52965d0615cdd547252527 SHA1 31cf0373b1d4d61540474b6f527bf7675e8773f3 SHA256 405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95
 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 5801 RMD160 454877211f4b171887e1d8c39f37cad998b261f5 SHA1 462b959afc6dcab40d162474b738bf86ecfb29b1 SHA256 335451a04cdb26ed3a67ff84c9c27ef0e72548566b9fde9fd7adc933c47958de
@@ -166,13 +166,13 @@ EBUILD bash-4.0_p38.ebuild 5561 RMD160 965176e3361d1d0cac9b013152ec2eb6db274a44
 EBUILD bash-4.1_p10.ebuild 5599 RMD160 6a5c4eeb85c6bc2b6ccac227ff5f6d30a88e470b SHA1 61adef2a439365d91baea4a52c79460ffb319f03 SHA256 ebac02b1d21ceaa65556c7eda49c31933d46e3c34d6bed792d10ec4602440826
 EBUILD bash-4.1_p7.ebuild 5588 RMD160 b51148bc278822a53866104fe4c104100c6c7e95 SHA1 ed195b310adabc1a8e7d04d513c058e5dbdfe5fe SHA256 792f06f27d7d8b3186b4368ac1f54d145724120e7f369dfe92f7df1754b83faa
 EBUILD bash-4.1_p9.ebuild 5586 RMD160 f0d3d2a6f73d5ebe6979ff82e55edb1ccbb8fca2 SHA1 08f3b13848d1c00d92c5c8deb8c00885448211eb SHA256 717c934a98b0b5f564f4f06988828831de3b5b3247f49b07ed6325d476342ac3
-EBUILD bash-4.2_p6.ebuild 5395 RMD160 82e7c400cf3b9ef9991a3ce72dd8203b0f83a18c SHA1 daac6b804d4dac54e97289f81ec3b8ec8020f260 SHA256 777685eef4d3fdbd3b4b09fbe46af881f316d5aa153a04e490527f1c05d10dc4
-MISC ChangeLog 43961 RMD160 0d2020ce23d0221ec8b51693e616a2f9890e3f7a SHA1 aef38c67c0ef206351ca81819f6872fb0aa89f03 SHA256 f0f9b96bcab96f9925f2e0ff60abcb23254af20d2c2dd4a34ff90883871cdb2e
+EBUILD bash-4.2_p7.ebuild 5333 RMD160 20c5ef42b8a8e59b8d274b8741946753f7da41b3 SHA1 0983f4f76ba000af7e9d8847cf38b6ee598df4a4 SHA256 c1b79e32c3ed6c798a5c1ee44c7fc5ab64cf95b05483ce40d6a470ba2e71647a
+MISC ChangeLog 44095 RMD160 c482725acaa1b06c61a823447392e7cbf711d740 SHA1 e7c640a4093a36707f4f8280d9cbca0979fee1f4 SHA256 554afa0845621c0e0b1f950850197faee33ab09d1cd01b69af5239fffe43788d
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1wBasACgkQaC/OocHi7JY8ZwD/dZk/DqGb82OGIV88WAEFonh2
-ER/1qI6/hRVUSQF5S+YA/3MPGydp4pqED50NXFJJxmsDcTH3uiFQTHemLau1Q4i/
-=Y3O2
+iF4EAREIAAYFAk1z8fkACgkQaC/OocHi7JY7PAEAiefmGmWcUJNul5Xlco6A23ro
+s7W/EGUjhnPBd9Ly9HcA+wf6Bmg4GZypiNiHiTpGXN4MkuiVF/xY63X0BWryzySl
+=u0Gq
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.2_p7.ebuild b/app-shells/bash/bash-4.2_p7.ebuild
new file mode 100644
index 000000000000..5e3f0e2e7373
--- /dev/null
+++ b/app-shells/bash/bash-4.2_p7.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p7.ebuild,v 1.1 2011/03/06 20:43:40 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
+READLINE_VER=6.1
+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://tiswww.case.edu/php/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.7.16
+	!<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
+	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)
+	cd lib/readline
+	[[ ${READLINE_PLEVEL} -gt 0 ]] && epatch $(patches -s ${READLINE_PLEVEL} readline ${READLINE_VER})
+	cd ../..
+}
+
+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)
+
+	# 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
+}