Add echo function stderr patch.

Package-Manager: portage-2.1.3.19

4 files changed, 182 insertions, 2 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/Manifest b/sys-apps/paludis/Manifest
index 45d506af2a54..f1ebe5de0c65 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,6 +1,7 @@
 AUX paludis-0.20.0-dotfiles.patch 438 RMD160 340dac9b5cea826c4b92b5482f86652f063d8ac4 SHA1 e296be80fe7ec14d42aab3e7e405d29973bde4cd SHA256 5163a2966a946dc431d3ad59d6af72cd1f2660fc150afa94c103d2c575fdfc73
 AUX paludis-0.26.0_alpha4-news_test.patch 2093 RMD160 8b9bcfacacf339806320b45146abaf65c0b82d1f SHA1 cb30e486f1066f05c4d6c5e33e81dc3ba6756392 SHA256 817bac01bfd325a113691bbb2d5c146dec4f7373754e951faa06240c2edf4762
 AUX paludis-0.26.0_alpha5-env.patch 563 RMD160 2dc537bc64797a4d1ba255b072d71b145d4dc7d9 SHA1 91f0e895147fc5bc5381ea5ae7c0cc5cb9103599 SHA256 59227c8b36522a0577fee13eeb0f08704d68b6c31304eb59fc2db83de7c6e177
+AUX paludis-0.26.0_alpha9-echo-functions.patch 906 RMD160 25558aec0c1e23c07df6cb1598cb5de3c659bdf1 SHA1 fef7900834af768a326eef7b7fdb7f763b16fa9f SHA256 3c2e09f1d7a0b26e8b84609b646847962a96fba94d8a979df958f5c0fb17f5fc
 DIST paludis-0.24.1.tar.bz2 1400452 RMD160 dd1df850423a71d79ae9c660fbb9eed63aa23ef0 SHA1 0c0549db3d37f53e8b13f10bd50886c63f7231a1 SHA256 d41b179a73671bae09333ee0358f86ce678aa4d200a9ec401a3218d870456070
 DIST paludis-0.24.2.tar.bz2 1400236 RMD160 26128306b40b9318eff7a282ea1505646f4a32d8 SHA1 0e1778b1b33ff08132da1ba99c6145ccce057bf2 SHA256 ac4638b10e3967e593dcddf09e8931946a1b9ff43bd31a95e9e72d0b13d688ed
 DIST paludis-0.24.5.tar.bz2 1399916 RMD160 1134575f749105af9552eab3fe7fbb0ad08e4ee2 SHA1 896732075d96e71458773e6158d2f4326bffa53a SHA256 4b4de1d24858a0a78598a663818867644e54a271603ef8b35d7b2752b8852fdf
@@ -21,6 +22,7 @@ EBUILD paludis-0.26.0_alpha5-r1.ebuild 4566 RMD160 c7ea2a321cf4c8b62b2d282fc6bdc
 EBUILD paludis-0.26.0_alpha5.ebuild 4483 RMD160 fba9273b6ad3534674a15949c5a42fa0479a96e9 SHA1 a3232c39cac5810fd33a9705be3a16f815a3d708 SHA256 629c6f731649bc7a081ef7687b5df2470b6e5a0923b43001b34509f25acebbf3
 EBUILD paludis-0.26.0_alpha6.ebuild 4483 RMD160 313b8306065cb50b6de80b0d6584f25472c69d3d SHA1 ad4d0877330edf6eb561a5396db7cf1494dd272d SHA256 07f090748eadeffba8ca9e0d0f485b7bd2060aa7243e50f52f425f79668e107f
 EBUILD paludis-0.26.0_alpha7.ebuild 4565 RMD160 44f80e81d87dffd4f4b5276321f8eb3e4e079ad2 SHA1 40aa5efda2f50c98f2c1b6efb33521f25fb829b0 SHA256 6dd72508e4462e4468d8d23d03a06950068dcaafdf5d2e1729e64c0b025a871d
+EBUILD paludis-0.26.0_alpha9-r1.ebuild 4649 RMD160 2c423fff74824e488bd4a0569d6a37d69dab5524 SHA1 001c521d99de70b88638a26669418380bd12271e SHA256 2a65fb8b9bc00797e22ed9288c3d3ff726c167a797daae0691ec8a456c11e0fd
 EBUILD paludis-0.26.0_alpha9.ebuild 4554 RMD160 163ebe9c7ad0dfed46d593a08dbf3e40ff53a4d8 SHA1 bc2bab40c060c56aff2215f5916e8561f9dcf667 SHA256 aa0ff4209c58bea880b6f05a289bd2f1d4353fc020bc7d3c9650b154fa5d1b6a
-MISC ChangeLog 12287 RMD160 019a3da278a12b751e92bd314fb1161f4871a79b SHA1 b7a6f84a0e491d0ce8069275d575e15e8d9c8e34 SHA256 e42982547b545de459095807a12cec9d1e243a96e89eea79fc33800f0f785d5f
+MISC ChangeLog 12502 RMD160 90a7a0a900bb4009f50f9703bf18a7b9a6d6c391 SHA1 eff7db45415b2cd92e1f935a25f068d1dc024031 SHA256 070c0e48fba27458366e618c0e02389e094cb8baf04b1514e5bacd148cd241db
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
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
+}