Version bump.

(Portage version: 2.1.5_rc4)

4 files changed, 10 insertions, 206 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 2863d11e72c4..ecbbebb29206 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,14 @@
 # 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.90 2008/04/13 14:14:14 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.91 2008/04/16 22:31:13 zlin Exp $
+
+*paludis-0.26.0_pre2 (16 Apr 2008)
+
+  16 Apr 2008; Bo Ørsted Andresen <zlin@gentoo.org>
+  -files/paludis-0.26.0_alpha14-broken-profiles.patch,
+  -paludis-0.26.0_alpha13.ebuild, -paludis-0.26.0_alpha14-r1.ebuild,
+  +paludis-0.26.0_pre2.ebuild:
+  Version bump.
 
 *paludis-0.26.0_pre1 (13 Apr 2008)
 
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
deleted file mode 100644
index 84d953b3fba9..000000000000
--- a/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index ba275a48feb6..000000000000
--- a/sys-apps/paludis/paludis-0.26.0_alpha14-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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
-}
diff --git a/sys-apps/paludis/paludis-0.26.0_alpha13.ebuild b/sys-apps/paludis/paludis-0.26.0_pre2.ebuild
index 2e1afc715f2c..d3dda6d14867 100644
--- a/sys-apps/paludis/paludis-0.26.0_alpha13.ebuild
+++ b/sys-apps/paludis/paludis-0.26.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha13.ebuild,v 1.1 2008/03/23 08:50:27 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_pre2.ebuild,v 1.1 2008/04/16 22:31:13 zlin Exp $
 
 inherit bash-completion eutils flag-o-matic