Version bump

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 144 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index cd5772e16186..63ba4f79e812 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.92 2008/04/22 08:35:22 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.93 2008/04/22 17:48:19 rbrown Exp $
+
+*paludis-0.26.0_pre4 (22 Apr 2008)
+
+  22 Apr 2008; Richard Brown <rbrown@gentoo.org>
+  -paludis-0.26.0_pre1.ebuild, -paludis-0.26.0_pre2.ebuild,
+  +paludis-0.26.0_pre4.ebuild:
+  Version bump
 
 *paludis-0.26.0_pre3 (22 Apr 2008)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 70728ddb72a1..6f15208881ba 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,10 +1,8 @@
 DIST paludis-0.24.6.tar.bz2 1402577 RMD160 dec2d8f89566dbb35d35ce28649ab184f76448e2 SHA1 8bbf1500b7e8e383003423ae4758af1773e8b28e SHA256 1a57a6d8d24458d30699158c6e7065222ce8e581fe3546823532b26f36934bf3
-DIST paludis-0.26.0_pre1.tar.bz2 1490131 RMD160 479614eb8de04b42f2d584940a1b0ba9c05fa6e5 SHA1 d172394283a664d654c79e71cb1eea053e623103 SHA256 1be589bd2e071bc63872f91006ea7310eaa080045180c4d3d4bf88a7ce6c6350
-DIST paludis-0.26.0_pre2.tar.bz2 1495771 RMD160 ed0352185c8fc262fd0aeeda24063825f875172a SHA1 b541373713a4345afa9692dec92ebd501e777e42 SHA256 19687f98ead5df5d3ce9fb7cec1d6bcb2a6e27f57d5cf4d17676e85ef715eed3
 DIST paludis-0.26.0_pre3.tar.bz2 1497900 RMD160 fc620dce22412eac59cdb82b276cf678d41b0134 SHA1 1b1592b347ee5174512577f7f3c9567536b92aaf SHA256 50e293034c1985cc38172e11dae5636f73930fd145c86b393dc68f9578fdb30d
+DIST paludis-0.26.0_pre4.tar.bz2 1502448 RMD160 bae35b86120827c5b470848d0ddcdcda99e8bf44 SHA1 f92d4c1c4ebe0e2a489c7623067a31cc78879257 SHA256 88ca29944938236fe7a0d0c29a9dafb3de19ce7e5476a2eb96906b5f19413381
 EBUILD paludis-0.24.6.ebuild 3744 RMD160 6ebee8ffd397e0ad5a11dfd6333018463de47499 SHA1 0c0c98e242c9abf217c6b3efa82b81fa70d0b27d SHA256 ab85e925e2349490dc00b9002a0715c47ce59749fa0aab6c4e5f71f44e658956
-EBUILD paludis-0.26.0_pre1.ebuild 4551 RMD160 6a5dba73e0353b0fde19e38469ecd8accfa9c558 SHA1 f4c6c023ef24bfcc2a39f0c8164ba691f769bc19 SHA256 a983eb06358799d463e49d7c2a98d98d0ba4ce9e4f1a6bc910431eaa94d962a4
-EBUILD paludis-0.26.0_pre2.ebuild 4551 RMD160 ad10101e3355e6f15d98aa905805260cebe40122 SHA1 3fa69746be27c3e26bf9a87b3f05969780746412 SHA256 80ac7c3fe675267345af88a77c20cb4082f96eeb4cc615ae32a5128ccced8d1b
 EBUILD paludis-0.26.0_pre3.ebuild 4553 RMD160 bf1da6387067ca7d325a25edff8816873a559931 SHA1 b28b6174af4b568cd417610e81707a2c8f0f9688 SHA256 b80213571e139c27e5877f78c6670cedb71dbb003a752ee7a4a37c29344c0c6c
-MISC ChangeLog 14618 RMD160 a0f6fdef1d5f1279b4f63e21d629557d926d11ef SHA1 1eb0839bd6f1f4cc891fdb5c0185a900ebe463f8 SHA256 d7aa349efc95cd96afa3dda1e473c355d4e76a39a6d8317a8f3d44a97f56bd43
+EBUILD paludis-0.26.0_pre4.ebuild 4553 RMD160 4d371ce7faa10c71036a4b52ee320f21831c3c22 SHA1 673d919a49952af1891e1443a57b720d1aba611b SHA256 9a887f0f6ac5a618b8a0cdea5a6249e58a23a463e405b93dfe54ae2254f18ca2
+MISC ChangeLog 14810 RMD160 f4f63be6fb7aa20aa813f4f4dfc26e95b8a5d319 SHA1 f3b20781be9fe3b3c86c37f6f06f1efe15a69c76 SHA256 ab3184dc94234f7c07794a478456c674a02fb039177bdbf712677fea36a6c22e
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
diff --git a/sys-apps/paludis/paludis-0.26.0_pre2.ebuild b/sys-apps/paludis/paludis-0.26.0_pre2.ebuild
deleted file mode 100644
index d3dda6d14867..000000000000
--- a/sys-apps/paludis/paludis-0.26.0_pre2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_pre2.ebuild,v 1.1 2008/04/16 22:31:13 zlin Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="http://paludis.pioto.org/download/${P}.tar.bz2"
-
-IUSE="doc glsa inquisitio portage pink python qa ruby vim-syntax zsh-completion visibility"
-LICENSE="GPL-2 vim-syntax? ( vim )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.0.2
-	>=app-admin/eselect-news-20071201
-	>=app-shells/bash-3
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	inquisitio? ( dev-libs/pcre++ )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )
-	python? ( >=dev-lang/python-2.4 >=dev-libs/boost-1.33.1-r1 )
-	virtual/c++-tr1-functional
-	virtual/c++-tr1-memory
-	virtual/c++-tr1-type-traits"
-
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		|| ( >=app-doc/doxygen-1.5.3 <=app-doc/doxygen-1.5.1 )
-		media-gfx/imagemagick
-	)
-	python? ( dev-python/epydoc dev-python/pygments )
-	ruby? ( doc? ( dev-ruby/syntax dev-ruby/allison ) )
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/wget
-	net-misc/rsync
-	sys-apps/sandbox"
-
-# Keep this as a PDEPEND. It avoids issues when Paludis is used as the
-# default virtual/portage provider.
-PDEPEND="
-	vim-syntax? ( >=app-editors/vim-core-7 )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	replace-flags -Os -O2
-	replace-flags -O3 -O2
-
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" "-1" "-1" "/var/tmp/paludis" "paludisbuild"
-
-	FIXED_MAKEOPTS=""
-	m=$(free -m | sed -n -e '/cache:/s,^[^[:digit:]]\+[[:digit:]]\+[^[:digit:]]\+\([[:digit:]]\+\).*,\1,p')
-	j=$(echo "$MAKEOPTS" | sed -n -e 's,.*-j\([[:digit:]]\+\).*,\1,p' )
-	if [[ -n "${m}" ]] && [[ -n "${j}" ]] && (( ${j} > 1 )); then
-		if (( m < j * 512 )) ; then
-			FIXED_MAKEOPTS="-j$(( m / 512 ))"
-			[[ ${FIXED_MAKEOPTS} == "-j0" ]] && FIXED_MAKEOPTS="-j1"
-			ewarn "Your MAKEOPTS -j is too high. To stop the kernel from throwing a hissy fit"
-			ewarn "when g++ eats all your RAM, we'll use ${FIXED_MAKEOPTS} instead."
-		fi
-	fi
-}
-
-src_compile() {
-	local repositories=`echo default unpackaged $(usev cran ) | tr -s \  ,`
-	local clients=`echo default accerso adjutrix contrarius importare \
-		$(usev inquisitio ) instruo paludis reconcilio | tr -s \  ,`
-	local environments=`echo default $(usev portage ) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable pink ) \
-		$(use_enable qa ) \
-		$(use_enable ruby ) \
-		$(useq ruby && useq doc && echo --enable-ruby-doc ) \
-		$(use_enable python ) \
-		$(use_enable glsa ) \
-		$(use_enable vim-syntax vim ) \
-		$(use_enable visibility ) \
-		--with-vim-install-dir=/usr/share/vim/vimfiles \
-		--enable-sandbox \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		--with-environments=${environments} \
-		|| die "econf failed"
-
-	emake ${FIXED_MAKEOPTS} || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README ChangeLog NEWS
-
-	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
-	BASH_COMPLETION_NAME="paludis" dobashcompletion bash-completion/paludis
-	BASH_COMPLETION_NAME="accerso" dobashcompletion bash-completion/accerso
-	BASH_COMPLETION_NAME="contrarius" dobashcompletion bash-completion/contrarius
-	BASH_COMPLETION_NAME="importare" dobashcompletion bash-completion/importare
-	BASH_COMPLETION_NAME="instruo" dobashcompletion bash-completion/instruo
-	BASH_COMPLETION_NAME="reconcilio" dobashcompletion bash-completion/reconcilio
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" \
-		dobashcompletion bash-completion/qualudis
-	use inquisitio && \
-		BASH_COMPLETION_NAME="inquisitio" \
-		dobashcompletion bash-completion/inquisitio
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		doins zsh-completion/_importare
-		doins zsh-completion/_reconcilio
-		use inquisitio && doins zsh-completion/_inquisitio
-		doins zsh-completion/_paludis_packages
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	emake check || die "Make check failed"
-}
-
-pkg_postinst() {
-	# Remove the symlink created by app-admin/eselect-news
-	if [[ -L "${ROOT}/var/lib/paludis/news" ]] ; then
-		rm "${ROOT}/var/lib/paludis/news"
-	fi
-}
diff --git a/sys-apps/paludis/paludis-0.26.0_pre1.ebuild b/sys-apps/paludis/paludis-0.26.0_pre4.ebuild
index 704418cd5309..31def8892cf7 100644
--- a/sys-apps/paludis/paludis-0.26.0_pre1.ebuild
+++ b/sys-apps/paludis/paludis-0.26.0_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_pre1.ebuild,v 1.1 2008/04/13 14:14:14 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.26.0_pre4.ebuild,v 1.1 2008/04/22 17:48:19 rbrown Exp $
 
 inherit bash-completion eutils flag-o-matic