Version bump to 0.48.0, Cleanup & remove qa flag description.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

8 files changed, 16 insertions, 719 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 842014e2932b..952324ce2b3c 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.156 2010/04/07 04:23:19 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.157 2010/06/20 18:34:53 tanderson Exp $
+
+*paludis-0.48.0 (20 Jun 2010)
+
+  20 Jun 2010; Thomas Anderson <tanderson@gentoo.org>
+  -paludis-0.40.0.ebuild, -paludis-0.40.1.ebuild,
+  -paludis-0.42.0_alpha1.ebuild, -paludis-0.42.0.ebuild,
+  -paludis-0.42.2.ebuild, -paludis-0.42.3.ebuild, +paludis-0.48.0.ebuild,
+  metadata.xml:
+  Version bump to 0.48.0, Cleanup & remove qa flag description.
 
   07 Apr 2010; Jeremy Olexa <darkside@gentoo.org> paludis-0.40.0.ebuild,
   paludis-0.40.1.ebuild, paludis-0.42.0_alpha1.ebuild,
diff --git a/sys-apps/paludis/metadata.xml b/sys-apps/paludis/metadata.xml
index c650f2b8cc11..23bcc6d09c5b 100644
--- a/sys-apps/paludis/metadata.xml
+++ b/sys-apps/paludis/metadata.xml
@@ -14,7 +14,6 @@
     <flag name="python-bindings">Enable Python bindings. Requires a lot of RAM
           to build (~700Mbytes per job) and adds a dependency upon
           <pkg>dev-libs/boost</pkg></flag>
-    <flag name="qa">Enable QA tools</flag>
     <flag name="ruby-bindings">Enable Ruby bindings.</flag>
     <flag name="visibility">Enable visibility support (g++ &gt;=4.1)</flag>
   </use>
diff --git a/sys-apps/paludis/paludis-0.40.0.ebuild b/sys-apps/paludis/paludis-0.40.0.ebuild
deleted file mode 100644
index 3a3e4805f5f1..000000000000
--- a/sys-apps/paludis/paludis-0.40.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.40.0.ebuild,v 1.2 2010/04/07 04:23:19 darkside 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 inquisitio portage pink python-bindings qa ruby-bindings vim-syntax visibility xml zsh-completion"
-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.2_rc1
-	>=app-shells/bash-3.2
-	inquisitio? ( dev-libs/libpcre )
-	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
-	qa? ( dev-libs/libpcre >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-
-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 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"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
-}
-
-pkg_setup() {
-	if use inquisitio || use qa; then
-		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
-	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
-
-	create-paludis-user
-}
-
-src_compile() {
-	local repositories=`echo default unpackaged | tr -s \  ,`
-	local clients=`echo default accerso adjutrix appareo 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-bindings ruby ) \
-		$(useq ruby-bindings && useq doc && echo --enable-ruby-doc ) \
-		$(use_enable python-bindings python ) \
-		$(useq python-bindings && useq doc && echo --enable-python-doc ) \
-		$(use_enable xml ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments}
-
-	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
-	use qa && \
-		BASHCOMPLETION_NAME="qualudis" \
-		dobashcompletion bash-completion/qualudis
-	use inquisitio && \
-		BASHCOMPLETION_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
-
-	if [[ `id -u` == 0 ]] ; then
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for file 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() {
-	# 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.40.1.ebuild b/sys-apps/paludis/paludis-0.40.1.ebuild
deleted file mode 100644
index 1eec5bc5be64..000000000000
--- a/sys-apps/paludis/paludis-0.40.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.40.1.ebuild,v 1.2 2010/04/07 04:23:19 darkside 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 inquisitio portage pink python-bindings qa ruby-bindings vim-syntax visibility xml zsh-completion"
-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.2_rc1
-	>=app-shells/bash-3.2
-	inquisitio? ( dev-libs/libpcre )
-	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
-	qa? ( dev-libs/libpcre >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-
-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 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"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
-}
-
-pkg_setup() {
-	if use inquisitio || use qa; then
-		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
-	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
-
-	create-paludis-user
-}
-
-src_compile() {
-	local repositories=`echo default unpackaged | tr -s \  ,`
-	local clients=`echo default accerso adjutrix appareo 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-bindings ruby ) \
-		$(useq ruby-bindings && useq doc && echo --enable-ruby-doc ) \
-		$(use_enable python-bindings python ) \
-		$(useq python-bindings && useq doc && echo --enable-python-doc ) \
-		$(use_enable xml ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments}
-
-	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
-	use qa && \
-		BASHCOMPLETION_NAME="qualudis" \
-		dobashcompletion bash-completion/qualudis
-	use inquisitio && \
-		BASHCOMPLETION_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
-
-	if [[ `id -u` == 0 ]] ; then
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for file 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() {
-	# 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.42.0.ebuild b/sys-apps/paludis/paludis-0.42.0.ebuild
deleted file mode 100644
index 6086e8112246..000000000000
--- a/sys-apps/paludis/paludis-0.42.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.42.0.ebuild,v 1.3 2010/04/07 04:23:19 darkside 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 inquisitio portage pink python-bindings ruby-bindings vim-syntax visibility xml zsh-completion"
-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.2_rc1
-	>=app-shells/bash-3.2
-	inquisitio? ( dev-libs/libpcre )
-	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-
-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 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"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
-}
-
-pkg_setup() {
-	if use inquisitio || use qa; then
-		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
-	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
-
-	create-paludis-user
-}
-
-src_compile() {
-	local repositories=`echo default unpackaged | tr -s \  ,`
-	local clients=`echo default accerso adjutrix appareo 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 ruby-bindings ruby ) \
-		$(useq ruby-bindings && useq doc && echo --enable-ruby-doc ) \
-		$(use_enable python-bindings python ) \
-		$(useq python-bindings && useq doc && echo --enable-python-doc ) \
-		$(use_enable xml ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments}
-
-	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
-	use inquisitio && \
-		BASHCOMPLETION_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
-
-	if [[ `id -u` == 0 ]] ; then
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for file 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() {
-	# 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.42.0_alpha1.ebuild b/sys-apps/paludis/paludis-0.42.0_alpha1.ebuild
deleted file mode 100644
index c33276902548..000000000000
--- a/sys-apps/paludis/paludis-0.42.0_alpha1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.42.0_alpha1.ebuild,v 1.2 2010/04/07 04:23:19 darkside 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 inquisitio portage pink python-bindings qa ruby-bindings vim-syntax visibility xml zsh-completion"
-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.2_rc1
-	>=app-shells/bash-3.2
-	inquisitio? ( dev-libs/libpcre )
-	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
-	qa? ( dev-libs/libpcre >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-
-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 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"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
-}
-
-pkg_setup() {
-	if use inquisitio || use qa; then
-		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
-	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
-
-	create-paludis-user
-}
-
-src_compile() {
-	local repositories=`echo default unpackaged | tr -s \  ,`
-	local clients=`echo default accerso adjutrix appareo 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-bindings ruby ) \
-		$(useq ruby-bindings && useq doc && echo --enable-ruby-doc ) \
-		$(use_enable python-bindings python ) \
-		$(useq python-bindings && useq doc && echo --enable-python-doc ) \
-		$(use_enable xml ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments}
-
-	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
-	use qa && \
-		BASHCOMPLETION_NAME="qualudis" \
-		dobashcompletion bash-completion/qualudis
-	use inquisitio && \
-		BASHCOMPLETION_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
-
-	if [[ `id -u` == 0 ]] ; then
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for file 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() {
-	# 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.42.2.ebuild b/sys-apps/paludis/paludis-0.42.2.ebuild
deleted file mode 100644
index 01317ed9a016..000000000000
--- a/sys-apps/paludis/paludis-0.42.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.42.2.ebuild,v 1.2 2010/04/07 04:23:19 darkside 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 inquisitio portage pink python-bindings ruby-bindings vim-syntax visibility xml zsh-completion"
-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.2_rc1
-	>=app-shells/bash-3.2
-	inquisitio? ( dev-libs/libpcre )
-	python-bindings? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
-	ruby-bindings? ( >=dev-lang/ruby-1.8 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-
-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 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"
-
-create-paludis-user() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
-}
-
-pkg_setup() {
-	if use inquisitio || use qa; then
-		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
-	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
-
-	create-paludis-user
-}
-
-src_compile() {
-	local repositories=`echo default unpackaged | tr -s \  ,`
-	local clients=`echo default accerso adjutrix appareo 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 ruby-bindings ruby ) \
-		$(useq ruby-bindings && useq doc && echo --enable-ruby-doc ) \
-		$(use_enable python-bindings python ) \
-		$(useq python-bindings && useq doc && echo --enable-python-doc ) \
-		$(use_enable xml ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments}
-
-	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
-	use inquisitio && \
-		BASHCOMPLETION_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
-
-	if [[ `id -u` == 0 ]] ; then
-		export PALUDIS_REDUCED_UID=0
-		export PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! emake check ; then
-		eerror "Tests failed. Looking for file 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() {
-	# 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.42.3.ebuild b/sys-apps/paludis/paludis-0.48.0.ebuild
index 87bc2e56e84f..dd960d7062c4 100644
--- a/sys-apps/paludis/paludis-0.42.3.ebuild
+++ b/sys-apps/paludis/paludis-0.48.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.42.3.ebuild,v 1.2 2010/04/07 04:23:19 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.48.0.ebuild,v 1.1 2010/06/20 18:34:53 tanderson Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -46,12 +46,10 @@ create-paludis-user() {
 }
 
 pkg_setup() {
-	if use inquisitio || use qa; then
-		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 inquisitio && ! 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 && \
@@ -62,6 +60,7 @@ pkg_setup() {
 	fi
 
 	create-paludis-user
+	replace-flags -O? -O2
 }
 
 src_compile() {