Add paludis 0.74.0. Drop older versions

(Portage version: 2.1.10.56/cvs/Linux x86_64)

7 files changed, 10 insertions, 701 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 32da501cf7a6..c28df407ec20 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.216 2012/03/02 16:05:47 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.217 2012/04/21 20:08:36 dagger Exp $
+
+  21 Apr 2012; Robert Piasek <dagger@gentoo.org> -paludis-0.58.5.ebuild,
+  -paludis-0.60.4.ebuild, -paludis-0.62.2.ebuild, -paludis-0.64.0.ebuild,
+  -paludis-0.64.3.ebuild, +paludis-0.74.0.ebuild:
+  Add version 0.74.0. Drop older versions
 
 *paludis-0.72.2 (02 Mar 2012)
 
diff --git a/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch b/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch
deleted file mode 100644
index 8691f7c8d598..000000000000
--- a/sys-apps/paludis/files/paludis-0.44.0-gcc41-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 35402f6a25d9439c310216ed1f7c55222dde3db3
-Author: David Leverton <levertond@googlemail.com>
-Date:   Tue Jan 12 22:34:02 2010 +0000
-
-    Fix gcc 4.1 build
-
-diff --git a/paludis/ipc_output_manager.cc b/paludis/ipc_output_manager.cc
-index 939b979..907cb0e 100644
---- a/paludis/ipc_output_manager.cc
-+++ b/paludis/ipc_output_manager.cc
-@@ -410,8 +410,10 @@ const std::tr1::shared_ptr<OutputManager>
- OutputManagerFromIPC::operator() (const Action & a)
- {
-     if (! _imp->result)
--        _imp->result.reset(new IPCOutputManager(_imp->read_fd, _imp->write_fd,
--                    CreateOutputManagerForPackageIDActionInfo(_imp->id, a, _imp->exclusivity)));
-+    {
-+        CreateOutputManagerForPackageIDActionInfo info(_imp->id, a, _imp->exclusivity);
-+        _imp->result.reset(new IPCOutputManager(_imp->read_fd, _imp->write_fd, info));
-+    }
-     return _imp->result;
- }
- 
diff --git a/sys-apps/paludis/paludis-0.58.5.ebuild b/sys-apps/paludis/paludis-0.58.5.ebuild
deleted file mode 100644
index 9a3bf596ffa2..000000000000
--- a/sys-apps/paludis/paludis-0.58.5.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.58.5.ebuild,v 1.3 2011/07/08 11:00:19 ssuominen Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.2.13
-	>=app-shells/bash-3.2
-	>=sys-devel/gcc-4.4
-	dev-libs/libpcre
-	sys-apps/file
-	pbins? ( >=app-arch/libarchive-2.8.4 )
-	python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
-		media-gfx/imagemagick
-		python-bindings? ( dev-python/epydoc dev-python/pygments )
-		ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
-	)
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
-	vim-syntax? ( >=app-editors/vim-core-7 )
-	app-admin/eselect-package-manager"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
-	if ! built_with_use dev-libs/libpcre cxx ; then
-		eerror "Paludis needs dev-libs/libpcre built with C++ support"
-		eerror "Please build dev-libs/libpcre with USE=cxx support"
-		die "Rebuild dev-libs/libpcre with USE=cxx"
-	fi
-
-	if use python-bindings && \
-		! built_with_use --missing true dev-libs/boost python; then
-		eerror "With USE python-bindings you need boost build with the python"
-		eerror "use flag."
-		die "Rebuild dev-libs/boost with USE python"
-	fi
-
-	if use pbins && \
-		built_with_use app-arch/libarchive xattr; then
-		eerror "With USE pbins you need libarchive build without the xattr"
-		eerror "use flag."
-		die "Rebuild app-arch/libarchive without USE xattr"
-	fi
-
-	if id paludisbuild >/dev/null 2>/dev/null ; then
-		if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
-			eerror "The 'paludisbuild' user is now expected to be a member of the"
-			eerror "'tty' group. You should add the user to this group before"
-			eerror "upgrading Paludis."
-			die "Please add paludisbuild to tty group"
-		fi
-	fi
-
-	create-paludis-user
-}
-
-src_compile() {
-	local repositories=`echo default unavailable unpackaged | tr -s \  ,`
-	local clients=`echo default accerso adjutrix appareo cave importare inquisitio instruo paludis reconcilio | tr -s \  ,`
-	local environments=`echo default $(usev portage ) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable pbins ) \
-		$(use_enable pink ) \
-		$(use_enable ruby-bindings ruby ) \
-		$(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
-		$(use_enable python-bindings python ) \
-		$(use python-bindings && use doc && echo --enable-python-doc ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		$(use_enable xml ) \
-		$(use_enable search-index ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
-
-	BASHCOMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
-	BASHCOMPLETION_NAME="paludis" dobashcompletion bash-completion/paludis
-	BASHCOMPLETION_NAME="accerso" dobashcompletion bash-completion/accerso
-	BASHCOMPLETION_NAME="importare" dobashcompletion bash-completion/importare
-	BASHCOMPLETION_NAME="instruo" dobashcompletion bash-completion/instruo
-	BASHCOMPLETION_NAME="reconcilio" dobashcompletion bash-completion/reconcilio
-	BASHCOMPLETION_NAME="inquisitio" dobashcompletion bash-completion/inquisitio
-	BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
-	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
-		doins zsh-completion/_inquisitio
-		doins zsh-completion/_paludis_packages
-		doins zsh-completion/_cave
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	if [[ `id -u` == 0 ]] ; then
-		# hate
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for files for you to add to your bug report..."
-		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
-			eerror "    $a"
-		done
-		die "Make check failed"
-	fi
-}
-
-pkg_postinst() {
-	pm_is_paludis=false
-	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
-		pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
-	fi
-
-	if ! $pm_is_paludis ; then
-		elog "If you are using paludis or cave as your primary package manager,"
-		elog "you should consider running:"
-		elog "    eselect package-manager set paludis"
-	fi
-}
diff --git a/sys-apps/paludis/paludis-0.60.4.ebuild b/sys-apps/paludis/paludis-0.60.4.ebuild
deleted file mode 100644
index 754de0d2a9c0..000000000000
--- a/sys-apps/paludis/paludis-0.60.4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.60.4.ebuild,v 1.3 2011/07/08 11:00:19 ssuominen Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.2.13
-	>=app-shells/bash-3.2
-	>=sys-devel/gcc-4.4
-	dev-libs/libpcre
-	sys-apps/file
-	pbins? ( >=app-arch/libarchive-2.8.4 )
-	python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
-	!prebuilt-documentation? (
-		>=app-text/asciidoc-8.6.3
-		app-text/xmlto
-	)
-	doc? (
-		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
-		media-gfx/imagemagick
-		python-bindings? ( dev-python/epydoc dev-python/pygments )
-		ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
-	)
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
-	vim-syntax? ( >=app-editors/vim-core-7 )
-	app-admin/eselect-package-manager"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
-	if ! built_with_use dev-libs/libpcre cxx ; then
-		eerror "Paludis needs dev-libs/libpcre built with C++ support"
-		eerror "Please build dev-libs/libpcre with USE=cxx support"
-		die "Rebuild dev-libs/libpcre with USE=cxx"
-	fi
-
-	if use python-bindings && \
-		! built_with_use --missing true dev-libs/boost python; then
-		eerror "With USE python-bindings you need boost build with the python"
-		eerror "use flag."
-		die "Rebuild dev-libs/boost with USE python"
-	fi
-
-	if use pbins && \
-		built_with_use app-arch/libarchive xattr; then
-		eerror "With USE pbins you need libarchive build without the xattr"
-		eerror "use flag."
-		die "Rebuild app-arch/libarchive without USE xattr"
-	fi
-
-	if id paludisbuild >/dev/null 2>/dev/null ; then
-		if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
-			eerror "The 'paludisbuild' user is now expected to be a member of the"
-			eerror "'tty' group. You should add the user to this group before"
-			eerror "upgrading Paludis."
-			die "Please add paludisbuild to tty group"
-		fi
-	fi
-
-	create-paludis-user
-
-	# 'paludis' tries to exec() itself after an upgrade
-	if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
-		eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
-		eerror "'cave' to upgrade."
-		die "Can't use 'paludis' to upgrade Paludis"
-	fi
-}
-
-src_compile() {
-	local repositories=`echo default unavailable unpackaged | tr -s \  ,`
-	local clients=`echo default accerso appareo cave instruo | tr -s \  ,`
-	local environments=`echo default $(usev portage ) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable pbins ) \
-		$(use_enable pink ) \
-		$(use_enable ruby-bindings ruby ) \
-		$(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
-		$(use_enable prebuilt-documentation ) \
-		$(use_enable python-bindings python ) \
-		$(use python-bindings && use doc && echo --enable-python-doc ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		$(use_enable xml ) \
-		$(use_enable search-index ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
-
-	BASHCOMPLETION_NAME="accerso" dobashcompletion bash-completion/accerso
-	BASHCOMPLETION_NAME="instruo" dobashcompletion bash-completion/instruo
-	BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_cave
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	if [[ `id -u` == 0 ]] ; then
-		# hate
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for files for you to add to your bug report..."
-		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
-			eerror "    $a"
-		done
-		die "Make check failed"
-	fi
-}
-
-pkg_postinst() {
-	pm_is_paludis=false
-	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
-		pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
-	fi
-
-	if ! $pm_is_paludis ; then
-		elog "If you are using paludis or cave as your primary package manager,"
-		elog "you should consider running:"
-		elog "    eselect package-manager set paludis"
-	fi
-}
diff --git a/sys-apps/paludis/paludis-0.62.2.ebuild b/sys-apps/paludis/paludis-0.62.2.ebuild
deleted file mode 100644
index 350d958dd964..000000000000
--- a/sys-apps/paludis/paludis-0.62.2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.62.2.ebuild,v 1.3 2011/11/11 20:12:44 vapier Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.2.13
-	>=app-shells/bash-3.2
-	>=sys-devel/gcc-4.4
-	dev-libs/libpcre
-	sys-apps/file
-	pbins? ( >=app-arch/libarchive-2.8.4 )
-	python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
-	!prebuilt-documentation? (
-		>=app-text/asciidoc-8.6.3
-		app-text/xmlto
-	)
-	doc? (
-		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
-		media-gfx/imagemagick
-		python-bindings? ( dev-python/epydoc dev-python/pygments )
-		ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
-	)
-	dev-util/pkgconfig
-	dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
-	vim-syntax? ( >=app-editors/vim-core-7 )
-	app-admin/eselect-package-manager"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
-	if ! built_with_use dev-libs/libpcre cxx ; then
-		eerror "Paludis needs dev-libs/libpcre built with C++ support"
-		eerror "Please build dev-libs/libpcre with USE=cxx support"
-		die "Rebuild dev-libs/libpcre with USE=cxx"
-	fi
-
-	if ! built_with_use dev-cpp/gtest threads ; then
-		eerror "Paludis needs dev-cpp/gtest built with threads support"
-		eerror "Please build dev-cpp/gtest with USE=threads support"
-		die "Rebuild dev-cpp/gtest with USE threads"
-	fi
-
-	if use python-bindings && \
-		! built_with_use --missing true dev-libs/boost python; then
-		eerror "With USE python-bindings you need boost build with the python"
-		eerror "use flag."
-		die "Rebuild dev-libs/boost with USE python"
-	fi
-
-	if use pbins && \
-		built_with_use app-arch/libarchive xattr; then
-		eerror "With USE pbins you need libarchive build without the xattr"
-		eerror "use flag."
-		die "Rebuild app-arch/libarchive without USE xattr"
-	fi
-
-	if id paludisbuild >/dev/null 2>/dev/null ; then
-		if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
-			eerror "The 'paludisbuild' user is now expected to be a member of the"
-			eerror "'tty' group. You should add the user to this group before"
-			eerror "upgrading Paludis."
-			die "Please add paludisbuild to tty group"
-		fi
-	fi
-
-	create-paludis-user
-
-	# 'paludis' tries to exec() itself after an upgrade
-	if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
-		eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
-		eerror "'cave' to upgrade."
-		die "Can't use 'paludis' to upgrade Paludis"
-	fi
-}
-
-src_compile() {
-	local repositories=`echo default unavailable unpackaged | tr -s \  ,`
-	local clients=`echo default accerso appareo cave instruo | tr -s \  ,`
-	local environments=`echo default $(usev portage ) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable pbins ) \
-		$(use_enable pink ) \
-		$(use_enable ruby-bindings ruby ) \
-		$(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
-		$(use_enable prebuilt-documentation ) \
-		$(use_enable python-bindings python ) \
-		$(use python-bindings && use doc && echo --enable-python-doc ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		$(use_enable xml ) \
-		$(use_enable search-index ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
-
-	BASHCOMPLETION_NAME="accerso" dobashcompletion bash-completion/accerso
-	BASHCOMPLETION_NAME="instruo" dobashcompletion bash-completion/instruo
-	BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_cave
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	if [[ `id -u` == 0 ]] ; then
-		# hate
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for files for you to add to your bug report..."
-		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
-			eerror "    $a"
-		done
-		die "Make check failed"
-	fi
-}
-
-pkg_postinst() {
-	pm_is_paludis=false
-	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
-		pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
-	fi
-
-	if ! $pm_is_paludis ; then
-		elog "If you are using paludis or cave as your primary package manager,"
-		elog "you should consider running:"
-		elog "    eselect package-manager set paludis"
-	fi
-}
diff --git a/sys-apps/paludis/paludis-0.64.3.ebuild b/sys-apps/paludis/paludis-0.64.3.ebuild
deleted file mode 100644
index 4931fd8ae208..000000000000
--- a/sys-apps/paludis/paludis-0.64.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.64.3.ebuild,v 1.2 2011/11/11 20:12:43 vapier Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.2.13
-	>=app-shells/bash-3.2
-	>=sys-devel/gcc-4.4
-	dev-libs/libpcre
-	sys-apps/file
-	pbins? ( >=app-arch/libarchive-2.8.4 )
-	python-bindings? ( >=dev-lang/python-2.6 >=dev-libs/boost-1.41.0 )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	search-index? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${COMMON_DEPEND}
-	!prebuilt-documentation? (
-		>=app-text/asciidoc-8.6.3
-		app-text/xmlto
-	)
-	doc? (
-		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
-		media-gfx/imagemagick
-		python-bindings? ( dev-python/epydoc dev-python/pygments )
-		ruby-bindings? ( dev-ruby/syntax dev-ruby/allison )
-	)
-	dev-util/pkgconfig
-	dev-cpp/gtest"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/sandbox"
-
-# Keep syntax as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
-	vim-syntax? ( >=app-editors/vim-core-7 )
-	app-admin/eselect-package-manager"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-}
-
-pkg_setup() {
-	if ! built_with_use dev-libs/libpcre cxx ; then
-		eerror "Paludis needs dev-libs/libpcre built with C++ support"
-		eerror "Please build dev-libs/libpcre with USE=cxx support"
-		die "Rebuild dev-libs/libpcre with USE=cxx"
-	fi
-
-	if ! built_with_use dev-cpp/gtest threads ; then
-		eerror "Paludis needs dev-cpp/gtest built with threads support"
-		eerror "Please build dev-cpp/gtest with USE=threads support"
-		die "Rebuild dev-cpp/gtest with USE threads"
-	fi
-
-	if use python-bindings && \
-		! built_with_use --missing true dev-libs/boost python; then
-		eerror "With USE python-bindings you need boost build with the python"
-		eerror "use flag."
-		die "Rebuild dev-libs/boost with USE python"
-	fi
-
-	if use pbins && \
-		built_with_use app-arch/libarchive xattr; then
-		eerror "With USE pbins you need libarchive build without the xattr"
-		eerror "use flag."
-		die "Rebuild app-arch/libarchive without USE xattr"
-	fi
-
-	if id paludisbuild >/dev/null 2>/dev/null ; then
-		if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
-			eerror "The 'paludisbuild' user is now expected to be a member of the"
-			eerror "'tty' group. You should add the user to this group before"
-			eerror "upgrading Paludis."
-			die "Please add paludisbuild to tty group"
-		fi
-	fi
-
-	create-paludis-user
-
-	# 'paludis' tries to exec() itself after an upgrade
-	if [[ "${PKGMANAGER}" == paludis-0.[012345]* ]] && [[ -z "${CAVE}" ]] ; then
-		eerror "The 'paludis' client has been removed in Paludis 0.60. You must use"
-		eerror "'cave' to upgrade."
-		die "Can't use 'paludis' to upgrade Paludis"
-	fi
-}
-
-src_compile() {
-	local repositories=`echo default unavailable unpackaged | tr -s \  ,`
-	local environments=`echo default $(usev portage ) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable pbins ) \
-		$(use_enable pink ) \
-		$(use_enable ruby-bindings ruby ) \
-		$(use ruby-bindings && use doc && echo --enable-ruby-doc ) \
-		$(use_enable prebuilt-documentation ) \
-		$(use_enable python-bindings python ) \
-		$(use python-bindings && use doc && echo --enable-python-doc ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		$(use_enable xml ) \
-		$(use_enable search-index ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-environments=${environments} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS
-
-	BASHCOMPLETION_NAME="cave" dobashcompletion bash-completion/cave
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_cave
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	if [[ `id -u` == 0 ]] ; then
-		# hate
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for files for you to add to your bug report..."
-		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
-			eerror "    $a"
-		done
-		die "Make check failed"
-	fi
-}
-
-pkg_postinst() {
-	pm_is_paludis=false
-	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
-		pm_is_paludis=$( source ${ROOT}/etc/env.d/50package-manager ; [[ ${PACKAGE_MANAGER} == paludis ]] && echo true || echo false )
-	fi
-
-	if ! $pm_is_paludis ; then
-		elog "If you are using paludis or cave as your primary package manager,"
-		elog "you should consider running:"
-		elog "    eselect package-manager set paludis"
-	fi
-}
diff --git a/sys-apps/paludis/paludis-0.64.0.ebuild b/sys-apps/paludis/paludis-0.74.0.ebuild
index 96c58e02376c..977e1a55fa5d 100644
--- a/sys-apps/paludis/paludis-0.64.0.ebuild
+++ b/sys-apps/paludis/paludis-0.74.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.64.0.ebuild,v 1.3 2011/11/11 20:12:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.74.0.ebuild,v 1.1 2012/04/21 20:08:36 dagger Exp $
 
 inherit bash-completion eutils
 
 DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
+HOMEPAGE="http://paludis.exherbo.org/"
+SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
 
 IUSE="doc pbins portage pink prebuilt-documentation python-bindings ruby-bindings search-index vim-syntax visibility xml zsh-completion"
 LICENSE="GPL-2 vim-syntax? ( vim )"