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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

9 files changed, 20 insertions, 733 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/Manifest b/sys-apps/paludis/Manifest
index c35dd595e559..d3e3d911f623 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,23 +1,13 @@
 AUX paludis-0.44.0-gcc41-fix.patch 882 RMD160 cd71e28315bb4d7230bc319601a2b6470199e48e SHA1 c27774d405c21219b9dacab64ebf339be0fd7f9d SHA256 a316ebdb3ebd4d286889c483b460a6d1e50ceb8d0a9fe06e9968a48d50e7ee75
-DIST paludis-0.40.0.tar.bz2 1617157 RMD160 5179b1306565af122d86b9e75f95036e9dd03045 SHA1 5d45795ee3de60b1a13308f6ab2bf573d4fd6182 SHA256 ea019e9d141b7cae8f33501042477b644e2d4c8485a7e9301f207e77a5cab8df
-DIST paludis-0.40.1.tar.bz2 1621882 RMD160 c217f5055b93cd06d036c66226700e5dfed35514 SHA1 3be8e0d363cfeec8076b73e8fec3178ae0f53192 SHA256 5d71e21cb5ebd198cf446cbed0c9b0c5dbe4e5302cacf1b9012c4b59cbaa2f59
-DIST paludis-0.42.0.tar.bz2 1578684 RMD160 21c1ddaaf62f1de5a491e21ac4f7faa203cdce63 SHA1 e9630a024e14f88d4bab260c2ef46f7580f1a40b SHA256 858587dea9d009f8dd655a96f624154fbd843e77b185f791032547e6f2f71fd6
-DIST paludis-0.42.0_alpha1.tar.bz2 1617848 RMD160 eedd956e4768381f2bc7a1ed61763223777a946a SHA1 56d632edea5bf8f0b57f5340c8c3b9040cc864b7 SHA256 8ed35694104d7e9d4b74ab56f24029489d2bd542475e76e75c0cb6c1fafb475c
-DIST paludis-0.42.2.tar.bz2 1613202 RMD160 ac309423c4c4be2f25d7144bfb50ae74362568cc SHA1 aba331ae9db15d4e331492abb706c2ee354b7a8c SHA256 291a836814a9093d4a9ca3792abc881b0a25b16943251653ea1e481951091986
-DIST paludis-0.42.3.tar.bz2 1613114 RMD160 b155fb976dae6bd750567f0e371fc50f996e26be SHA1 75d9e38c11ecf01781d809a8e744245ad4005727 SHA256 e6f1dee2f2140c6032a90d9cc062f2af456c6510c0c3dc01f1db6d803daeb35f
 DIST paludis-0.44.0.tar.bz2 1707755 RMD160 c5dbabf5a7e0a5d1c0dbce1583fef43550c640c2 SHA1 5d241512f4c47e33168c6ae9745d6f59c36a3d1a SHA256 953f36b93279663683152f2dc7294009d1c262cf4482a591a02eb5126425fdb0
 DIST paludis-0.44.1.tar.bz2 1722864 RMD160 bef59da0eac5123da9d87b1ecc5ad7c1753a3e1c SHA1 7610af481132193f8b949e12d6c09700cf1b9763 SHA256 f8e37728f3661b2897b5718ef42ca8acce1bca93ecfb5d5ed03080b283a04391
 DIST paludis-0.44.2.tar.bz2 1710022 RMD160 00433e0fc7efb6e20a7a314ae4e27864811b0486 SHA1 8599c656b329b398481cc884267afbab3afb80f8 SHA256 678be1f001aadc9c72e84bfa058a4f23233b9f2c5f3df6d8c419a5348d2852c2
 DIST paludis-0.46.0.tar.bz2 1745168 RMD160 eccc2fbabc9ed0461fb91741399149c5f3cda655 SHA1 455924f0b6c17eb05dfb3ac354bae62a876e59b0 SHA256 95efcf480c1b9807dc4b0ed771b03263beb7f2a629835659d18de434d7af98b3
-EBUILD paludis-0.40.0.ebuild 4630 RMD160 1ada2933d3e708d3c851a6f44b17bc0d91c04408 SHA1 3c7dc314d9e1a4c33b9f46803b4de01786ac2bad SHA256 c52d4ab9e0688a090dea7186311b0e9e4717bd7a7491b7423b7cca30a450011c
-EBUILD paludis-0.40.1.ebuild 4630 RMD160 2a33de6d443038d01c75527cc4b06c1150789121 SHA1 392e5ea3ab6ff169a8fd3e471d8e488cc56201af SHA256 dff70b472a6a080a564895cbdd93cde55af05b35aae788e0150a99384133c5c1
-EBUILD paludis-0.42.0.ebuild 4448 RMD160 3dfa3cc5c01fb525dc87629671c9847ae335c549 SHA1 4061ec9476569e9f73297363af3768feb8a181d1 SHA256 0b65dcd445f09caba199a9570ec3c370bac0e9a6fc03a4f8d6772c9ea26b674a
-EBUILD paludis-0.42.0_alpha1.ebuild 4637 RMD160 796123e0a13cdc2ce7abd5880e5da8ee6af8f32e SHA1 4b2f43639d88d379d8fc5a815cb7d309ba6c2cbe SHA256 3f363f6cc06b2cee1f8b0d96170cab2d2efcabe3eb014f242f985c910051dbcb
-EBUILD paludis-0.42.2.ebuild 4448 RMD160 bf6bb387bce9a36df040c72fc13bbbafdac042a4 SHA1 d56790db2ee4b84e58922f8c7e8e4ce8f6a0ab27 SHA256 de8322c1ff989c0a5782d39bf96975fe79390c89c4f7d8991ee49768f0891977
-EBUILD paludis-0.42.3.ebuild 4448 RMD160 0de332e2f103cdfc300f445b892da1875dce13c9 SHA1 7eb83d08c0caaa14d3633f00afacca01088b4050 SHA256 dda0972a1b49c6f67d49ab5f7ae82ab9174e5d797bc490ccd58bb6d5e7fa9200
+DIST paludis-0.48.0.tar.bz2 1770040 RMD160 8ae6d9f8fd61e01481028e785facc1ec51931a98 SHA1 3a31a84799f356e6f6bee2783f957850a0f05fbb SHA256 07e94cafe62a64d44835bdc665cd305a04c4a06637790ef8bce2e4640209c4bb
 EBUILD paludis-0.44.0.ebuild 4533 RMD160 8b8dd1cf6334a4bebf8050a3db988beca6675537 SHA1 cd877ed150f05385b2eb68216edc7ab9a416f871 SHA256 d5bbda36d13be60398d480af6e125fd3f724ceeaa3c83490c878cdffa3c4000a
 EBUILD paludis-0.44.1.ebuild 4445 RMD160 39e19fd09ed07afad8bd14a61d937ac48ccd1300 SHA1 da299eced3b1cb066c00a261f9cf1d125180483b SHA256 19d6d7b7ffbae4a1a3d10723773fd9f66703d3493a9fa3b82403a8f798a23501
 EBUILD paludis-0.44.2.ebuild 4445 RMD160 6e273dd1cd1b61fa4740502883c1d9d46254537c SHA1 97389b61345f2e59d5efb91290c33c26f11018a0 SHA256 2e7b4d9757dc97413956465dcd35d1eeb712a5a8933e13f05b3c20b4fa7362d5
 EBUILD paludis-0.46.0.ebuild 4445 RMD160 60ae69755f813c9f6d1ef57ecfd979c45a2c7f98 SHA1 65cc099d2715bce2bce8010b77227b2d6aac0a2e SHA256 7c46072bed6275cdfcb6203050445b6624dc1c8dacff7e2c6e9c6e0ad1e9bd4c
-MISC ChangeLog 24408 RMD160 a6b42d14d330a4457bf13188acda4c53c4be8443 SHA1 f21d5679a129020eed781cf54cb8ca9df5c9a031 SHA256 dcb64347f3f8a19621420fb7b438d8e7f72fb2840803217f31039b4c0386e71a
-MISC metadata.xml 904 RMD160 7c64a815163d3a16c9fc64d439e14bf487334c4a SHA1 0e1df6c4ecb601dabe8dda6ab6bf3b45a351ca99 SHA256 24197d2a033e795038d003b44bf57cd6e12ceba51a14cb56f896a4d82ea4bd7d
+EBUILD paludis-0.48.0.ebuild 4446 RMD160 64d6e6e99f4ec3c2a0a3a6b9fdb58573397cb14e SHA1 2ba29f625ce8803d9cb14affdfcd177e6ae26d8d SHA256 6738d198cbdb35233a11c6b99007e02ba7fdcf8640cd2053dd13e1c39c980b64
+MISC ChangeLog 24756 RMD160 ed7f256679ca5f9bb48cbae0a1018322d083867e SHA1 26605856eba7cd42e6693266e320224606b1b254 SHA256 42a09747f012e0849dcb887053f5d23f320634f7975ac94d895b9c54fb0bfbc7
+MISC metadata.xml 861 RMD160 4c6d8368d47e0fbfe913620cb63b4aa65113caca SHA1 fb898954bc301f651fe331bce5d42c553cf18039 SHA256 4ad9bb615305b17900aa992e0599ee03ac1f5ae05ac551e0551212cc18039457
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() {