Version bump. Remove old versions.

(Portage version: 2.1.2-r10)

14 files changed, 41 insertions, 476 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 59e584e2cdcb..43cdb2cb65e3 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.47 2007/02/16 14:23:57 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.48 2007/02/24 04:24:46 pioto Exp $
+
+*paludis-0.20.0 (24 Feb 2007)
+
+  24 Feb 2007; Mike Kelly <pioto@gentoo.org>
+  -files/paludis-0.14.3-ruby-so.patch, -files/paludis-0.16.0-gcc34.patch,
+  -files/paludis-0.18.0-do_config.patch,
+  +files/paludis-0.20.0-dotfiles.patch, -paludis-0.14.3.ebuild,
+  -paludis-0.16.0.ebuild, -paludis-0.16.1.ebuild, -paludis-0.18.0.ebuild,
+  +paludis-0.20.0.ebuild:
+  Version bump. Remove old versions.
 
   16 Feb 2007; Mike Kelly <pioto@gentoo.org> paludis-0.18.1.ebuild:
   Dep on >=app-shells/bash-3.1 now (we use += in some places).
 
+*paludis-0.18.1 (08 Feb 2007)
+
   08 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> paludis-0.18.1.ebuild:
   New upstream version.
 
diff --git a/sys-apps/paludis/files/digest-paludis-0.14.3 b/sys-apps/paludis/files/digest-paludis-0.14.3
deleted file mode 100644
index abef3311bc58..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.14.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aff589c5f44889fa7db4a3f555cbff5d paludis-0.14.3.tar.bz2 1254602
-RMD160 e5a33425072ef2d71236dd78708146195ebb3008 paludis-0.14.3.tar.bz2 1254602
-SHA256 343e6dfd382a84ca80d70f6bdb226fcf94e9a26c3aa9c7e5c3b1edb48ff078d2 paludis-0.14.3.tar.bz2 1254602
diff --git a/sys-apps/paludis/files/digest-paludis-0.16.0 b/sys-apps/paludis/files/digest-paludis-0.16.0
deleted file mode 100644
index 33708c2d5e4f..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.16.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3ab53ee047702481955fe6b73046ea6 paludis-0.16.0.tar.bz2 1311995
-RMD160 34de8430d6571163563199d731acc2ea8bb6eb56 paludis-0.16.0.tar.bz2 1311995
-SHA256 d94bfbb80f2d09ce916f995664e9e15ac088847ee5d7521b1d7c6d84bac38217 paludis-0.16.0.tar.bz2 1311995
diff --git a/sys-apps/paludis/files/digest-paludis-0.16.1 b/sys-apps/paludis/files/digest-paludis-0.16.1
deleted file mode 100644
index 2e90f23de0df..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ce50b0c0eec4e8e75cb43c3aa43a7ba paludis-0.16.1.tar.bz2 1312849
-RMD160 39b7f2f1968dcc599e3eece427ad3883f891fdc1 paludis-0.16.1.tar.bz2 1312849
-SHA256 cc87600f4b49649e33fda3568958e4e9d7dfb3fe1c1bb2c490ec383b449b74f5 paludis-0.16.1.tar.bz2 1312849
diff --git a/sys-apps/paludis/files/digest-paludis-0.18.0 b/sys-apps/paludis/files/digest-paludis-0.18.0
deleted file mode 100644
index aae4021d15a6..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a16a14cba503c4c9b572a9e7665c41d1 paludis-0.18.0.tar.bz2 1324497
-RMD160 e18ce332b5fb86f4ec195b343fca3833ee27f77e paludis-0.18.0.tar.bz2 1324497
-SHA256 170d971ce18377f3705a1b400fb6f4bbb0384678be53708772da00300ab4c25c paludis-0.18.0.tar.bz2 1324497
diff --git a/sys-apps/paludis/files/digest-paludis-0.20.0 b/sys-apps/paludis/files/digest-paludis-0.20.0
new file mode 100644
index 000000000000..fa11a7711be6
--- /dev/null
+++ b/sys-apps/paludis/files/digest-paludis-0.20.0
@@ -0,0 +1,3 @@
+MD5 0637a2d688baccf2302e11b9e95cd30e paludis-0.20.0.tar.bz2 1374604
+RMD160 ec69ae0a1826f4e511efc7f23578421572ae3d36 paludis-0.20.0.tar.bz2 1374604
+SHA256 9dcc15a8f6d1a9b26afbdfa51c42cf4a4b1d264af6615e239cf5c24c75010dde paludis-0.20.0.tar.bz2 1374604
diff --git a/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch b/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch
deleted file mode 100644
index 81595a0dc439..000000000000
--- a/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: ruby/Makefile.am
-===================================================================
---- ruby/Makefile.am	(revision 2133)
-+++ ruby/Makefile.am	(revision 2165)
-@@ -84,6 +84,7 @@
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/default/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/no_config/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
-+			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/libxml/.libs\`" \
- 			| tr -d ' '` \
-@@ -207,6 +208,7 @@
- 	    $(top_builddir)/paludis/environment/default/.libs/libpaludisdefaultenvironment.so \
- 	    $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
- 	    $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so \
-+	    $(top_builddir)/paludis/repositories/.libs/libpaludisrepositories.so \
- 	    $(top_builddir)/paludis/qa/.libs/libpaludisqa.so \
- 	    $(top_builddir)/paludis/libxml/.libs/libpaludislibxml.so \
- 	    $(PCREPLUSPLUS_LIBS)
-@@ -223,6 +225,7 @@
- 	    -L$(top_builddir)/paludis/environment/default/.libs/ -lpaludisdefaultenvironment \
- 	    -L$(top_builddir)/paludis/environment/no_config/.libs/ -lpaludisnoconfigenvironment \
- 	    -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist \
-+	    -L$(top_builddir)/paludis/repositories/.libs -lpaludisrepositories \
- 	    -L$(top_builddir)/paludis/qa/.libs/ -lpaludisqa \
- 	    -L$(top_builddir)/paludis/libxml/.libs/ -lpaludislibxml \
- 	    $(PCREPLUSPLUS_LIBS)
-@@ -240,8 +243,9 @@
- 	    $(top_builddir)/paludis/util/.libs/libpaludisutil.so \
- 	    $(top_builddir)/paludis/.libs/libpaludis.so \
- 	    $(top_builddir)/paludis/environment/default/.libs/libpaludisdefaultenvironment.so \
--	    $(top_builddir)/paludis/environment/no_config/.libs/libpaldisnoconfigenvironment.so \
--	    $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so
-+	    $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
-+	    $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so \
-+	    $(top_builddir)/paludis/repositories/.libs/libpaludisrepositories.so
- 
- Paludis.so : $(OUR_OBJECTS)
- 	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -254,7 +258,8 @@
- 	    -L$(top_builddir)/paludis/.libs/ -lpaludis \
- 	    -L$(top_builddir)/paludis/environment/default/.libs/ -lpaludisdefaultenvironment \
- 	    -L$(top_builddir)/paludis/environment/no_config/.libs/ -lpaludisnoconfigenvironment \
--	    -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist
-+	    -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist \
-+	    -L$(top_builddir)/paludis/repositories/.libs -lpaludisrepositories
- 
- endif
- 
diff --git a/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch b/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch
deleted file mode 100644
index fa7257c8ccf2..000000000000
--- a/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: paludis-0.16.0/paludis/dep_list/dep_list.cc
-===================================================================
---- paludis-0.16.0.orig/paludis/dep_list/dep_list.cc
-+++ paludis-0.16.0/paludis/dep_list/dep_list.cc
-@@ -1117,7 +1117,7 @@ DepList::add_error_package(const Package
-     std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
-             _imp->merge_list_index.equal_range(p.name));
- 
--    for ( ; pp.first != pp.second ; ++pp.first)
-+    for ( ; pp.second != pp.first ; ++pp.first)
-     {
-         if (pp.first->second->kind == kind && pp.first->second->package == p)
-         {
-@@ -1156,7 +1156,7 @@ DepList::add_suggested_package(const Pac
-     std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
-             _imp->merge_list_index.equal_range(p.name));
- 
--    for ( ; pp.first != pp.second ; ++pp.first)
-+    for ( ; pp.second != pp.first ; ++pp.first)
-     {
-         if ((pp.first->second->kind == dlk_suggested || pp.first->second->kind == dlk_already_installed
-                     || pp.first->second->kind == dlk_package || pp.first->second->kind == dlk_provided
\ No newline at end of file
diff --git a/sys-apps/paludis/files/paludis-0.18.0-do_config.patch b/sys-apps/paludis/files/paludis-0.18.0-do_config.patch
deleted file mode 100644
index 586c83c01875..000000000000
--- a/sys-apps/paludis/files/paludis-0.18.0-do_config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: src/clients/paludis/do_config.cc
-===================================================================
---- src/clients/paludis/do_config.cc    (revision 2400)
-+++ src/clients/paludis/do_config.cc    (working copy)
-@@ -41,6 +41,10 @@
-             matches(m)
-         {
-         }
-+
-+        ~AmbiguousConfigTarget() throw ()
-+        {
-+        }
-     };
-
-     int
diff --git a/sys-apps/paludis/files/paludis-0.20.0-dotfiles.patch b/sys-apps/paludis/files/paludis-0.20.0-dotfiles.patch
new file mode 100644
index 000000000000..30f09a506b68
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.20.0-dotfiles.patch
@@ -0,0 +1,13 @@
+Index: paludis/merger/merger.cc
+===================================================================
+--- paludis/merger/merger.cc	(revision 2510)
++++ paludis/merger/merger.cc	(revision 2511)
+@@ -144,7 +144,7 @@
+ 
+     on_enter_dir(is_check, src);
+ 
+-    for (DirIterator d(src), d_end ; d != d_end ; ++d)
++    for (DirIterator d(src, false), d_end ; d != d_end ; ++d)
+     {
+         MergerEntryType m(entry_type(*d));
+         switch (m)
diff --git a/sys-apps/paludis/paludis-0.14.3.ebuild b/sys-apps/paludis/paludis-0.14.3.ebuild
deleted file mode 100644
index 360a41e50863..000000000000
--- a/sys-apps/paludis/paludis-0.14.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.3.ebuild,v 1.2 2007/01/14 23:12:29 kugelfang Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="contrarius cran doc glsa pink qa ruby selinux zsh-completion"
-
-COMMON_DEPEND="
-	>=app-shells/bash-3
-	selinux? ( sys-libs/libselinux )
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
-	doc? ( app-doc/doxygen media-gfx/imagemagick )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-1.0.2
-	net-misc/wget
-	net-misc/rsync
-	!mips? ( sys-apps/sandbox )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	# gcc generates bad code...
-	use amd64 && replace-flags -Os -O2
-
-	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
-		echo
-		ewarn "Stripping as-needed from LDFLAGS."
-		ewarn "You should not set this variable globally. Please read:"
-		ewarn "    http://ciaranm.org/show_post.pl?post_id=13"
-		echo
-		epause 10
-	fi
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/${P}-ruby-so.patch
-}
-
-src_compile() {
-	local repositories=`echo default $(usev cran) | tr -s \  ,`
-	local clients=`echo default $(usev contrarius) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable !mips sandbox ) \
-		$(use_enable pink) \
-		$(use_enable selinux) \
-		$(use_enable qa) \
-		$(use_enable ruby) \
-		$(use_enable glsa) \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	if use doc ; then
-		make doxygen || die "make doxygen failed"
-	fi
-}
-
-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
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
-
-	if use doc ; then
-		dohtml -r -V doc/www/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		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() {
-	if use bash-completion ; then
-		echo
-		einfo "The following bash completion scripts have been installed:"
-		einfo "  paludis"
-		einfo "  adjutrix"
-		use qa && einfo "  qualudis"
-		einfo
-		einfo "To enable these scripts, run:"
-		einfo "  eselect bashcomp enable <scriptname>"
-	fi
-
-	echo
-	einfo "Before using Paludis and before reporting issues, you should read:"
-	einfo "    http://paludis.pioto.org/faq.html"
-	echo
-}
-
diff --git a/sys-apps/paludis/paludis-0.16.0.ebuild b/sys-apps/paludis/paludis-0.16.0.ebuild
deleted file mode 100644
index a339940b21b8..000000000000
--- a/sys-apps/paludis/paludis-0.16.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.16.0.ebuild,v 1.2 2007/01/25 17:51:40 phreak Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="contrarius cran doc glsa pink qa ruby selinux zsh-completion"
-
-COMMON_DEPEND="
-	>=app-shells/bash-3
-	selinux? ( sys-libs/libselinux )
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
-	doc? ( app-doc/doxygen media-gfx/imagemagick )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-1.0.2
-	net-misc/wget
-	net-misc/rsync
-	!mips? ( sys-apps/sandbox )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	# gcc generates bad code...
-	use amd64 && replace-flags -Os -O2
-
-	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
-		echo
-		ewarn "Stripping as-needed from LDFLAGS."
-		ewarn "You should not set this variable globally. Please read:"
-		ewarn "    http://ciaranm.org/show_post.pl?post_id=13"
-		echo
-		epause 10
-	fi
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc34.patch"
-}
-
-src_compile() {
-	local repositories=`echo default $(usev cran) | tr -s \  ,`
-	local clients=`echo default $(usev contrarius) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable !mips sandbox ) \
-		$(use_enable pink) \
-		$(use_enable selinux) \
-		$(use_enable qa) \
-		$(use_enable ruby) \
-		$(use_enable glsa) \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	if use doc ; then
-		make doxygen || die "make doxygen failed"
-	fi
-}
-
-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
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
-
-	if use doc ; then
-		dohtml -r -V doc/www/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		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() {
-	if use bash-completion ; then
-		echo
-		einfo "The following bash completion scripts have been installed:"
-		einfo "  paludis"
-		einfo "  adjutrix"
-		use qa && einfo "  qualudis"
-		einfo
-		einfo "To enable these scripts, run:"
-		einfo "  eselect bashcomp enable <scriptname>"
-	fi
-
-	echo
-	einfo "Before using Paludis and before reporting issues, you should read:"
-	einfo "    http://paludis.pioto.org/faq.html"
-	echo
-}
-
diff --git a/sys-apps/paludis/paludis-0.16.1.ebuild b/sys-apps/paludis/paludis-0.16.1.ebuild
deleted file mode 100644
index d68df5f863ba..000000000000
--- a/sys-apps/paludis/paludis-0.16.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.16.1.ebuild,v 1.1 2007/01/26 21:51:27 eroyf Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="contrarius cran doc glsa pink qa ruby selinux zsh-completion"
-
-COMMON_DEPEND="
-	>=app-shells/bash-3
-	selinux? ( sys-libs/libselinux )
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
-	doc? ( app-doc/doxygen media-gfx/imagemagick )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-1.0.2
-	net-misc/wget
-	net-misc/rsync
-	!mips? ( sys-apps/sandbox )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	# gcc generates bad code...
-	use amd64 && replace-flags -Os -O2
-
-	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
-		echo
-		ewarn "Stripping as-needed from LDFLAGS."
-		ewarn "You should not set this variable globally. Please read:"
-		ewarn "    http://ciaranm.org/show_post.pl?post_id=13"
-		echo
-		epause 10
-	fi
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_compile() {
-	local repositories=`echo default $(usev cran) | tr -s \  ,`
-	local clients=`echo default $(usev contrarius) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable !mips sandbox ) \
-		$(use_enable pink) \
-		$(use_enable selinux) \
-		$(use_enable qa) \
-		$(use_enable ruby) \
-		$(use_enable glsa) \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	if use doc ; then
-		make doxygen || die "make doxygen failed"
-	fi
-}
-
-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
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
-
-	if use doc ; then
-		dohtml -r -V doc/www/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		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() {
-	if use bash-completion ; then
-		echo
-		einfo "The following bash completion scripts have been installed:"
-		einfo "  paludis"
-		einfo "  adjutrix"
-		use qa && einfo "  qualudis"
-		einfo
-		einfo "To enable these scripts, run:"
-		einfo "  eselect bashcomp enable <scriptname>"
-	fi
-
-	echo
-	einfo "Before using Paludis and before reporting issues, you should read:"
-	einfo "    http://paludis.pioto.org/faq.html"
-	echo
-}
-
diff --git a/sys-apps/paludis/paludis-0.18.0.ebuild b/sys-apps/paludis/paludis-0.20.0.ebuild
index 3c9fd2f9b12f..a664b8d183ac 100644
--- a/sys-apps/paludis/paludis-0.18.0.ebuild
+++ b/sys-apps/paludis/paludis-0.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.18.0.ebuild,v 1.2 2007/02/07 21:28:32 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.20.0.ebuild,v 1.1 2007/02/24 04:24:46 pioto Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
 IUSE="contrarius cran doc glsa inquisitio pink qa ruby selinux zsh-completion"
 
 COMMON_DEPEND="
-	>=app-shells/bash-3
+	>=app-shells/bash-3.1
 	selinux? ( sys-libs/libselinux )
 	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
 	inquisitio? ( dev-libs/pcre++ )
@@ -34,7 +34,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	>=app-admin/eselect-1.0.2
 	net-misc/wget
-	net-misc/rsync"
+	net-misc/rsync
+	!mips? ( sys-apps/sandbox )"
 
 PROVIDE="virtual/portage"
 
@@ -42,13 +43,15 @@ pkg_setup() {
 	replace-flags -Os -O2
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-dotfiles.patch"
+}
+
 src_compile() {
 	local repositories=`echo default $(usev cran) | tr -s \  ,`
 	local clients=`echo default $(usev contrarius) $(usev inquisitio) | tr -s \  ,`
-
-	# Fix bug #165824
-	epatch ${FILESDIR}/${P}-do_config.patch
-
 	econf \
 		$(use_enable doc doxygen ) \
 		$(use_enable !mips sandbox ) \
@@ -68,7 +71,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS README ChangeLog NEWS
 
 	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
@@ -114,4 +117,3 @@ pkg_postinst() {
 	einfo "    http://paludis.pioto.org/faq.html"
 	echo
 }
-