Add -r1 with patch to improve handling of broken profiles

Package-Manager: portage-2.1.2.3

4 files changed, 215 insertions, 2 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index ab718f890438..a0d86cf194c8 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.88 2008/03/26 10:06:23 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.89 2008/04/03 20:38:44 spb Exp $
+
+*paludis-0.26.0_alpha14-r1 (03 Apr 2008)
+
+  03 Apr 2008; Stephen Bennett <spb@gentoo.org>
+  +files/paludis-0.26.0_alpha14-broken-profiles.patch,
+  +paludis-0.26.0_alpha14-r1.ebuild:
+  Add patch from svn trunk to improve handling of broken profiles
 
 *paludis-0.26.0_alpha14 (26 Mar 2008)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 2cd1bbb09c7f..8ea2f3c4e5d9 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,3 +1,4 @@
+AUX paludis-0.26.0_alpha14-broken-profiles.patch 3468 RMD160 578a9a31b9bf60e02bbbe6a663651bd0ba5e6329 SHA1 197681c4fc1d99c4cfbf323ac5dd364cd4134985 SHA256 ae76e2a215eaac323586820195853bd5e569c09296ef005c09fc4653724cbf72
 AUX paludis-0.26.0_alpha9-echo-functions.patch 2337 RMD160 41e42deafe6191ed3557ba2a2d808bb36a9f8aa6 SHA1 2025331462b836e4823e9a0fd11c546548eab9bd SHA256 202e3cf95fb6a12791867f011d38f269b1647fd0739542aed6f3b9bdd0033415
 DIST paludis-0.24.6.tar.bz2 1402577 RMD160 dec2d8f89566dbb35d35ce28649ab184f76448e2 SHA1 8bbf1500b7e8e383003423ae4758af1773e8b28e SHA256 1a57a6d8d24458d30699158c6e7065222ce8e581fe3546823532b26f36934bf3
 DIST paludis-0.26.0_alpha11.tar.bz2 1466896 RMD160 586f29d03c94e8766efe3e153e199c3d4689c0d5 SHA1 f7a6957d50f376c4a81d8d8c49ba026bbaf82a3f SHA256 08c187d124c23ad534ded574711773fb5eb60f83bb5b7c059c1aa4b4cc5749c5
@@ -9,7 +10,8 @@ EBUILD paludis-0.24.6.ebuild 3744 RMD160 6ebee8ffd397e0ad5a11dfd6333018463de4749
 EBUILD paludis-0.26.0_alpha11.ebuild 4558 RMD160 4efd01034966b913209037e496e919ea0b66a76a SHA1 e8d0b485f95a2455d50a4c99ae67c41cc7e22f51 SHA256 c3095b0d407264355247e372f3d7ed5cb65ae09106416120a06c13f1f9c9a7e1
 EBUILD paludis-0.26.0_alpha12.ebuild 4554 RMD160 bd211c03a982781b34872bc9ca9b34e90d615d23 SHA1 aace71236db69158b025dc4371b86611f6f0da29 SHA256 f2c87512288d50fbd1d42a4fd042880cfc10563cc67dfdc4420533c5a205595a
 EBUILD paludis-0.26.0_alpha13.ebuild 4556 RMD160 3561519df5800f6a12c7125ee25f3e49f19a23b6 SHA1 69bf873374b1854b503a4ae2632f4733af373221 SHA256 63be9a4da6b968836873613be234d37d54cde736340519b29d5a59dfe80f2413
+EBUILD paludis-0.26.0_alpha14-r1.ebuild 4648 RMD160 5271a6b88b569bcaa1182c8d9348dfa33c5feb36 SHA1 ad72b2bfb9fa98d6b8df84ca1abb8cb9e4611260 SHA256 e3b19712f06efb1ae9b70432adcb06013bc94d3f0c7ae8f052b9c6dd675b9864
 EBUILD paludis-0.26.0_alpha14.ebuild 4556 RMD160 cf45b6390f073a5cfc378ab9b67e4e679ebff38d SHA1 a9a248257b9d13a96e4a2dc24e004b38e739e6c2 SHA256 85268ad049db48bc66495657e68ddbed7fb19eb7a0834c7248c689bf1aae952f
 EBUILD paludis-0.26.0_alpha9-r1.ebuild 4649 RMD160 2c423fff74824e488bd4a0569d6a37d69dab5524 SHA1 001c521d99de70b88638a26669418380bd12271e SHA256 2a65fb8b9bc00797e22ed9288c3d3ff726c167a797daae0691ec8a456c11e0fd
-MISC ChangeLog 13651 RMD160 566f0481e9b54fd231dd52748ba57754c0e8505c SHA1 5221ceec713b14e97a8baac1d85cc23fd27c8675 SHA256 9340ccf769a6a2309c84da52725e3302d859bf5653b92173fe44da55ec0ace5b
+MISC ChangeLog 13897 RMD160 e6ec8558956abd2a854d9604e8b00d4459bc7ce7 SHA1 51e1ad948b4e94d9c1ee494e0a618aa572bd1ad9 SHA256 58a0eaee39610382c37f8eea4ffa22e36117d442c41443bc6a9d488163685647
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
diff --git a/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch b/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch
new file mode 100644
index 000000000000..84d953b3fba9
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch
@@ -0,0 +1,60 @@
+Index: paludis/repositories/e/e_repository.cc
+===================================================================
+--- paludis/repositories/e/e_repository.cc	(revision 4539)
++++ paludis/repositories/e/e_repository.cc	(revision 4541)
+@@ -395,14 +395,26 @@
+ 
+                 FSEntrySequence profiles;
+                 profiles.push_back(layout->profiles_base_dir() / tokens.at(1));
+-                profiles_desc.push_back(RepositoryEInterface::ProfilesDescLine::named_create()
+-                        (k::arch(), tokens.at(0))
+-                        (k::path(), *profiles.begin())
+-                        (k::status(), tokens.at(2))
+-                        (k::profile(), tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
+-                                    params.environment, repo, repo->name(), profiles,
+-                                    (*(*erepository::EAPIData::get_instance()->eapi_from_string(
+-                                        params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]))));
++                try
++                {
++                    profiles_desc.push_back(RepositoryEInterface::ProfilesDescLine::named_create()
++                            (k::arch(), tokens.at(0))
++                            (k::path(), *profiles.begin())
++                            (k::status(), tokens.at(2))
++                            (k::profile(), tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
++                                        params.environment, repo, repo->name(), profiles,
++                                        (*(*erepository::EAPIData::get_instance()->eapi_from_string(
++                                            params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]))));
++                }
++                catch (const InternalError &)
++                {
++                    throw;
++                }
++                catch (const Exception & e)
++                {
++                    Log::get_instance()->message(ll_warning, lc_context, "Not loading profile '" +
++                            tokens.at(1) + "' due to exception '" + e.message() + "' (" + e.what() + ")");
++                }
+             }
+         }
+ 
+@@ -1027,6 +1039,7 @@
+ {
+     Context context("When setting profile by iterator:");
+ 
++    Log::get_instance()->message(ll_debug, lc_context, "Using profile '" + stringify((*iter)[k::path()]) + "'");
+     _imp->profile_ptr = (*iter)[k::profile()];
+ 
+     if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment->default_distribution()))
+Index: paludis/repositories/e/e_repository_profile.cc
+===================================================================
+--- paludis/repositories/e/e_repository_profile.cc	(revision 4539)
++++ paludis/repositories/e/e_repository_profile.cc	(revision 4541)
+@@ -182,7 +182,7 @@
+                             tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
+                 system_tag(new GeneralSetDepTag(SetName("system"), stringify(name)))
+             {
+-                Context context("When loading profiles for repository '" + stringify(name) + "':");
++                Context context("When loading profiles '" + join(dirs.begin(), dirs.end(), "' '") + "' for repository '" + stringify(name) + "':");
+                 load_environment();
+ 
+                 for (FSEntrySequence::ConstIterator d(dirs.begin()), d_end(dirs.end()) ;
diff --git a/sys-apps/paludis/paludis-0.26.0_alpha14-r1.ebuild b/sys-apps/paludis/paludis-0.26.0_alpha14-r1.ebuild
new file mode 100644
index 000000000000..ba275a48feb6
--- /dev/null
+++ b/sys-apps/paludis/paludis-0.26.0_alpha14-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_alpha14-r1.ebuild,v 1.1 2008/04/03 20:38:44 spb 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}-broken-profiles.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
+}