From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-402827-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RTMqF-00056j-H2
	for garchives@archives.gentoo.org; Thu, 24 Nov 2011 00:07:03 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CF4C921C066;
	Thu, 24 Nov 2011 00:06:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 8D87821C066
	for <gentoo-commits@lists.gentoo.org>; Thu, 24 Nov 2011 00:06:55 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C6DBB1B4001
	for <gentoo-commits@lists.gentoo.org>; Thu, 24 Nov 2011 00:06:54 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 559)
	id 9C67D2004B; Thu, 24 Nov 2011 00:06:53 +0000 (UTC)
From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-shells/bash: bash-4.2_p20.ebuild ChangeLog
X-VCS-Repository: gentoo-x86
X-VCS-Files: bash-4.2_p20.ebuild ChangeLog
X-VCS-Directories: app-shells/bash
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
Content-Type: text/plain; charset=utf8
Message-Id: <20111124000653.9C67D2004B@flycatcher.gentoo.org>
Date: Thu, 24 Nov 2011 00:06:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 363657f5-de44-4a44-bf93-b23a32af10c8
X-Archives-Hash: 82b1d1451c5bce8b76921a5bba736cf2

vapier      11/11/24 00:06:53

  Modified:             ChangeLog
  Added:                bash-4.2_p20.ebuild
  Log:
  Version bump.
 =20
  (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

Revision  Changes    Path
1.294                app-shells/bash/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/Ch=
angeLog?rev=3D1.294&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/Ch=
angeLog?rev=3D1.294&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/Ch=
angeLog?r1=3D1.293&r2=3D1.294

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- ChangeLog	1 Nov 2011 03:38:00 -0000	1.293
+++ ChangeLog	24 Nov 2011 00:06:53 -0000	1.294
@@ -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.293 201=
1/11/01 03:38:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.294 201=
1/11/24 00:06:53 vapier Exp $
+
+*bash-4.2_p20 (24 Nov 2011)
+
+  24 Nov 2011; Mike Frysinger <vapier@gentoo.org> +bash-4.2_p20.ebuild:
+  Version bump.
=20
   01 Nov 2011; Mike Frysinger <vapier@gentoo.org>
   files/bash-4.2-parallel-build.patch:



1.1                  app-shells/bash/bash-4.2_p20.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ba=
sh-4.2_p20.ebuild?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/bash/ba=
sh-4.2_p20.ebuild?rev=3D1.1&content-type=3Dtext/plain

Index: bash-4.2_p20.ebuild
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
# 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_p20.ebuild,v =
1.1 2011/11/24 00:06:53 vapier Exp $

EAPI=3D"1"

inherit eutils flag-o-matic toolchain-funcs multilib

# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
PLEVEL=3D${PV##*_p}
MY_PV=3D${PV/_p*}
MY_PV=3D${MY_PV/_/-}
MY_P=3D${PN}-${MY_PV}
[[ ${PV} !=3D *_p* ]] && PLEVEL=3D0
READLINE_VER=3D6.1
READLINE_PLEVEL=3D0 # both readline patches are also released as bash pat=
ches
patches() {
	local opt=3D$1 plevel=3D${2:-${PLEVEL}} pn=3D${3:-${PN}} pv=3D${4:-${MY_=
PV}}
	[[ ${plevel} -eq 0 ]] && return 1
	eval set -- {1..${plevel}}
	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
	if [[ ${opt} =3D=3D -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=3D"The standard GNU Bourne again shell"
HOMEPAGE=3D"http://tiswww.case.edu/php/chet/bash/bashtop.html"
SRC_URI=3D"mirror://gnu/bash/${MY_P}.tar.gz $(patches)
	$(patches ${READLINE_PLEVEL} readline ${READLINE_VER})"

LICENSE=3D"GPL-3"
SLOT=3D"0"
KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 =
~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE=3D"afs bashlogger examples mem-scramble +net nls plugins vanilla"

DEPEND=3D">=3Dsys-libs/ncurses-5.2-r2
	nls? ( virtual/libintl )"
RDEPEND=3D"${DEPEND}
	!<sys-apps/portage-2.1.7.16
	!<sys-apps/paludis-0.26.0_alpha5"
# we only need yacc when the .y files get patched (bash42-005)
DEPEND+=3D" virtual/yacc"

S=3D${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. honeyp=
ot) 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 ../..

	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
}

src_compile() {
	local myconf=3D

	# For descriptions of these, see config-top.h
	# bashrc/#26952 bash_logout/#90488 ssh/#24762
	append-cppflags \
		-DDEFAULT_PATH_VALUE=3D\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/us=
r/bin:/sbin:/bin\"\' \
		-DSTANDARD_UTILS_PATH=3D\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
		-DSYS_BASHRC=3D\'\"/etc/bash/bashrc\"\' \
		-DSYS_BASH_LOGOUT=3D\'\"/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=3D"${myconf} $(use_with !readline installed-readline)"
	myconf=3D"${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=3D"${LDFLAGS} -static"
	use nls || myconf=3D"${myconf} --disable-nls"

	# Force linking with system curses ... the bundled termcap lib
	# sucks bad compared to ncurses
	myconf=3D"${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=3D"${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/b=
ashrc
	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##*/} !=3D PERMISSION ]] && [[ ${f##*/} !=3D *README ]] ; th=
en
					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=3D$(readlink "${ROOT}"/bin/sh)
		local tmp=3D$(emktemp "${ROOT}"/bin)
		ln -sf "${target}" "${tmp}"
		mv -f "${tmp}" "${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
}