Add echo function stderr patch.

(Portage version: 2.1.3.19)

3 files changed, 179 insertions, 1 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 1560fda615e9..382baa5787d9 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.82 2008/01/23 12:34:29 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.83 2008/02/18 09:35:06 rbrown Exp $
+
+*paludis-0.26.0_alpha9-r1 (18 Feb 2008)
+
+  18 Feb 2008; Richard Brown <rbrown@gentoo.org>
+  +files/paludis-0.26.0_alpha9-echo-functions.patch,
+  +paludis-0.26.0_alpha9-r1.ebuild:
+  Add echo function stderr patch.
 
 *paludis-0.26.0_alpha9 (23 Jan 2008)
 
diff --git a/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch b/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch
new file mode 100644
index 000000000000..2da9e1351aa1
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch
@@ -0,0 +1,27 @@
+diff --git a/paludis/util/echo_functions.bash.in b/paludis/util/echo_functions.bash.in
+Source: written by David Leverton
+Upstream: probably by next release
+Reason: http://thread.gmane.org/gmane.linux.gentoo.user/194929
+index 3a15a77..9af0cf0 100644
+--- a/paludis/util/echo_functions.bash.in
++++ b/paludis/util/echo_functions.bash.in
+@@ -49,8 +49,8 @@ paludis_ecmd()
+ {
+     local cmd="$1" hook="$2" prefix="$3" message="$4" newline="$5"
+ 
+-    echo -n "${prefix}${message}"
+-    [[ -z "${newline}" ]] && echo
++    echo -n "${prefix}${message}" >&2
++    [[ -z "${newline}" ]] && echo >&2
+ 
+     if type perform_hook &>/dev/null ; then
+         if [[ -n "${hook}" ]] ; then
+@@ -150,7 +150,7 @@ _eend()
+         msg="${COLOUR_BRACKET}[ ${COLOUR_BAD}!!${COLOUR_BRACKET} ]${COLOUR_NORMAL}"
+     fi
+ 
+-    echo -e "${PALUDIS_ENDCOL} ${msg}"
++    echo -e "${PALUDIS_ENDCOL} ${msg}" >&2
+ 
+     return ${retval}
+ }
diff --git a/sys-apps/paludis/paludis-0.26.0_alpha9-r1.ebuild b/sys-apps/paludis/paludis-0.26.0_alpha9-r1.ebuild
new file mode 100644
index 000000000000..cdfc84dfa789
--- /dev/null
+++ b/sys-apps/paludis/paludis-0.26.0_alpha9-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_alpha9-r1.ebuild,v 1.1 2008/02/18 09:35:06 rbrown Exp $
+
+inherit bash-completion eutils flag-o-matic
+
+DESCRIPTION="paludis, the other package mangler"
+HOMEPAGE="http://paludis.pioto.org/"
+SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
+
+IUSE="doc glsa inquisitio portage pink python qa ruby vim-syntax zsh-completion visibility"
+LICENSE="GPL-2 vim-syntax? ( vim )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=app-admin/eselect-1.0.2
+	>=app-admin/eselect-news-20071201
+	>=app-shells/bash-3
+	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
+	inquisitio? ( dev-libs/pcre++ )
+	glsa? ( >=dev-libs/libxml2-2.6 )
+	ruby? ( >=dev-lang/ruby-1.8 )
+	python? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
+	virtual/c++-tr1-functional
+	virtual/c++-tr1-memory
+	virtual/c++-tr1-type-traits"
+
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
+		media-gfx/imagemagick
+	)
+	python? ( dev-python/epydoc dev-python/pygments )
+	ruby? ( doc? ( dev-ruby/syntax dev-ruby/allison ) )
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/wget
+	net-misc/rsync
+	sys-apps/sandbox"
+
+# Keep this as a PDEPEND. It avoids issues when Paludis is used as the
+# default virtual/portage provider.
+PDEPEND="
+	vim-syntax? ( >=app-editors/vim-core-7 )"
+
+PROVIDE="virtual/portage"
+
+pkg_setup() {
+	replace-flags -Os -O2
+	replace-flags -O3 -O2
+
+	enewgroup "paludisbuild"
+	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
+
+	FIXED_MAKEOPTS=""
+	m=$(free -m | sed -n -e '/cache:/s,^[^[:digit:]]\+[[:digit:]]\+[^[:digit:]]\+\([[:digit:]]\+\).*,\1,p')
+	j=$(echo "$MAKEOPTS" | sed -n -e 's,.*-j\([[:digit:]]\+\).*,\1,p' )
+	if [[ -n "${m}" ]] && [[ -n "${j}" ]] && (( ${j} > 1 )); then
+		if (( m < j * 512 )) ; then
+			FIXED_MAKEOPTS="-j$(( m / 512 ))"
+			[[ ${FIXED_MAKEOPTS} == "-j0" ]] && FIXED_MAKEOPTS="-j1"
+			ewarn "Your MAKEOPTS -j is too high. To stop the kernel from throwing a hissy fit"
+			ewarn "when g++ eats all your RAM, we'll use ${FIXED_MAKEOPTS} instead."
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-echo-functions.patch"
+}
+
+src_compile() {
+	local repositories=`echo default unpackaged $(usev cran ) | tr -s \  ,`
+	local clients=`echo default accerso adjutrix contrarius importare \
+		$(usev inquisitio ) instruo paludis reconcilio | tr -s \  ,`
+	local environments=`echo default $(usev portage ) | tr -s \  ,`
+	econf \
+		$(use_enable doc doxygen ) \
+		$(use_enable pink ) \
+		$(use_enable qa ) \
+		$(use_enable ruby ) \
+		$(useq ruby && useq doc && echo --enable-ruby-doc ) \
+		$(use_enable python ) \
+		$(use_enable glsa ) \
+		$(use_enable vim-syntax vim ) \
+		$(use_enable visibility ) \
+		--with-vim-install-dir=/usr/share/vim/vimfiles \
+		--enable-sandbox \
+		--with-repositories=${repositories} \
+		--with-clients=${clients} \
+		--with-environments=${environments} \
+		|| die "econf failed"
+
+	emake ${FIXED_MAKEOPTS} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS README ChangeLog NEWS
+
+	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
+	BASH_COMPLETION_NAME="paludis" dobashcompletion bash-completion/paludis
+	BASH_COMPLETION_NAME="accerso" dobashcompletion bash-completion/accerso
+	BASH_COMPLETION_NAME="contrarius" dobashcompletion bash-completion/contrarius
+	BASH_COMPLETION_NAME="importare" dobashcompletion bash-completion/importare
+	BASH_COMPLETION_NAME="instruo" dobashcompletion bash-completion/instruo
+	BASH_COMPLETION_NAME="reconcilio" dobashcompletion bash-completion/reconcilio
+	use qa && \
+		BASH_COMPLETION_NAME="qualudis" \
+		dobashcompletion bash-completion/qualudis
+	use inquisitio && \
+		BASH_COMPLETION_NAME="inquisitio" \
+		dobashcompletion bash-completion/inquisitio
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins zsh-completion/_paludis
+		doins zsh-completion/_adjutrix
+		doins zsh-completion/_importare
+		doins zsh-completion/_reconcilio
+		use inquisitio && doins zsh-completion/_inquisitio
+		doins zsh-completion/_paludis_packages
+	fi
+}
+
+src_test() {
+	# Work around Portage bugs
+	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
+	export BASH_ENV=/dev/null
+
+	emake check || die "Make check failed"
+}
+
+pkg_postinst() {
+	# Remove the symlink created by app-admin/eselect-news
+	if [[ -L "${ROOT}/var/lib/paludis/news" ]] ; then
+		rm "${ROOT}/var/lib/paludis/news"
+	fi
+}