Version bump.

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

3 files changed, 196 insertions, 2 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 6bde9c6b76db..ad903563da63 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.242 2010/01/01 14:12:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.243 2010/01/05 00:52:43 vapier Exp $
+
+*bash-4.1 (05 Jan 2010)
+
+  05 Jan 2010; Mike Frysinger <vapier@gentoo.org> +bash-4.1.ebuild:
+  Version bump.
 
   01 Jan 2010; Tobias Klausmann <klausman@gentoo.org> bash-4.0_p35.ebuild:
   Stable on alpha, bug #295405
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 41e20ceb455e..ce51344598df 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -28,6 +28,7 @@ AUX dot-bashrc 551 RMD160 ab24b2c9936d008824c419206336597973e2bae9 SHA1 e3db8ebd
 DIST bash-3.1.tar.gz 2533934 RMD160 cbeda56312b3f623684b2099b711bb7592e0eda1 SHA1 766e3fd9384616d8a103f812f662fd8ec791c129 SHA256 d6952b2c38f9bf417559dd3b071860e1099ddfb8a12c0228f22afaf47f79d3b9
 DIST bash-3.2.tar.gz 2529838 RMD160 a73f790817d98be375a36def567737498e33aaf1 SHA1 fe6466c7ee98061e044dae0347ca5d1a8eab4a0d SHA256 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
 DIST bash-4.0.tar.gz 6230779 RMD160 82aba4b2cb475c2030904a9d22af6208dfa85eb3 SHA1 2bbed30879f9f424c091a846a48111c27d0b2370 SHA256 9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518
+DIST bash-4.1.tar.gz 6598300 RMD160 554c7ecb4a63da431768caed1f958c06b8fa7207 SHA1 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da
 DIST bash31-001 2708 RMD160 0d071aeade45c1706f4061774bb486d9a2ba7dae SHA1 cea61aaea659ba8e5d7552204a2a497424deaf65 SHA256 3b6d9151ca7a45dbcf43ebd1c6a647ef90c4b8eb54a245936fd6ffadc61fe727
 DIST bash31-002 7169 RMD160 9b03b62c9eb1ba2a574467c6a2950b3b933794e1 SHA1 a66b9ffb10d1fec8752353c851d9e3dc1ef7353a SHA256 ecd248b1ca027368dae967502af5b28019eeee8fa3ee8d6a0210677789658f08
 DIST bash31-003 1324 RMD160 1ee18374c2416407d1fa997ed99c5fc7f295cd62 SHA1 dc61c9dc01457c7742f429ed878fbba598b1b016 SHA256 96cb8a42162a5876b2392b76fbfc78d073f50735e1e8a14e67e03b6e9c2b215d
@@ -136,5 +137,6 @@ EBUILD bash-3.2_p48.ebuild 5986 RMD160 8e2ee1aa7d25e0ae6edb8c9939a82a316b269b97
 EBUILD bash-4.0_p28.ebuild 5648 RMD160 e18e6de1357b7c7ab54b970f7f989c1aaf1d2732 SHA1 52628f57a20a2c35871396dc255f8cc8635002dc SHA256 98181a2f0e0466b9d682cb79b18fa005e5c1f9bdae600081d0309388c9859b56
 EBUILD bash-4.0_p33.ebuild 5793 RMD160 6d6c0d44c11af3c27a9a42da20cf2a001a370dcc SHA1 59fc5a55310ab3a0823358bbca704b3f267a7ba8 SHA256 1b74572b01b0685f470949fe41e5bd03af9ad1ff01c168e7f097f3d3508b470a
 EBUILD bash-4.0_p35.ebuild 5784 RMD160 0d3f12c317794f751da33ab6e51926aafde10694 SHA1 120e55091bc67363214967fbf02fcb373905aef7 SHA256 be228bea883c3b952851959f27f206777bfe571a575ee3b6202f9db5b4517ac8
-MISC ChangeLog 38491 RMD160 b1dd98571d4b68aea0d05632d32f09ef8be69724 SHA1 4774593ef5b0552e0ef9e32643d6db0a3172c057 SHA256 7f32632fff6cd1b1258c8fb9cce313a0b52d6465f9ef259029ee2252d56ac776
+EBUILD bash-4.1.ebuild 5568 RMD160 8aa82dd92b2aed874473c03d2127bc56ab92d8f6 SHA1 3a50187e8f0b5418bbea2527b952e59f2956d8d8 SHA256 799bde021f24b96cef72174069b8111086939edb2fe0d419e699ee8b114f0a27
+MISC ChangeLog 38599 RMD160 669956f2a3430c543a7d23757a2f55752c311a24 SHA1 1d2ddf78da613cf1c5973fc0a02ed7a3744d6454 SHA256 e8798cea30cad4d810d460860e25deeb3dd32ec8e7761fe0fa2a1f59738e38e5
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
diff --git a/app-shells/bash/bash-4.1.ebuild b/app-shells/bash/bash-4.1.ebuild
new file mode 100644
index 000000000000..d6df758a8430
--- /dev/null
+++ b/app-shells/bash/bash-4.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.1.ebuild,v 1.1 2010/01/05 00:52:43 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_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
+}
+
+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
+		# 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
+}