Added paludis svn version (taken from paludis overlay)

svn path=/; revision=74

6 files changed, 63 insertions, 142 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index b59f61b..899d599 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -2,6 +2,6 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  26 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
-  Added paludis for G/FBSD
+  28 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> ChangeLog:
+  Added paludis svn version (taken from paludis overlay)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 8a35fb2..4d4b58c 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX paludis-0.12.0-getfsize.patch 1859 RMD160 e4681ef1e7ce80f2849a782995034b2e2a5551b5 SHA1 e58e2f1a5b7e854a08103974b52a46a69aa8c28f SHA256 95306a82243a7a440f5c63a5841a8748e7245d1ec9f407ea64a26b12e3bf3be2
-MD5 b5421769d2bbb63930e3609b3761676b files/paludis-0.12.0-getfsize.patch 1859
-RMD160 e4681ef1e7ce80f2849a782995034b2e2a5551b5 files/paludis-0.12.0-getfsize.patch 1859
-SHA256 95306a82243a7a440f5c63a5841a8748e7245d1ec9f407ea64a26b12e3bf3be2 files/paludis-0.12.0-getfsize.patch 1859
-AUX paludis-0.12.0-tests.patch 519 RMD160 97c1dfda93fff70b60b7d86ea02cfb16fd2d6214 SHA1 231dfe51c20713bb389a0771838fbd068b3ab2fe SHA256 923479ac673779e42828f43343d387f65681f63d34ffe87345e9dac7f398d3a7
-MD5 f53f7ec8243707976c7f25f8b65ed924 files/paludis-0.12.0-tests.patch 519
-RMD160 97c1dfda93fff70b60b7d86ea02cfb16fd2d6214 files/paludis-0.12.0-tests.patch 519
-SHA256 923479ac673779e42828f43343d387f65681f63d34ffe87345e9dac7f398d3a7 files/paludis-0.12.0-tests.patch 519
-DIST paludis-0.12.0.tar.bz2 1144668 RMD160 a75b08a1387354a4e629539ad0884bf2fd585611 SHA1 5f84a6a022518946f00986df32619e381b3c3f13 SHA256 b108439321b17c315b567dc7d5a01eaaa58cff0c79723c10f2489fd09381f639
-EBUILD paludis-0.12.0.ebuild 3346 RMD160 3066b33971e4360caf7e3d734729d3533bbd39fc SHA1 632cbd43762d413db6bc47dd7a5df35a8e20ed65 SHA256 47739dca0690b2630bdb8c624e511fea6da30242560c7e8eb5399a18b1be477c
-MD5 36e02753a7baeb3566f99dd112f9b0bb paludis-0.12.0.ebuild 3346
-RMD160 3066b33971e4360caf7e3d734729d3533bbd39fc paludis-0.12.0.ebuild 3346
-SHA256 47739dca0690b2630bdb8c624e511fea6da30242560c7e8eb5399a18b1be477c paludis-0.12.0.ebuild 3346
-MISC ChangeLog 208 RMD160 4eb0d80722b1e835789f87e50db18cc3e3a36188 SHA1 353c793513a39a2c6768ea8a387cd7209ef741cc SHA256 532effe51897f41c958885936fc8c7b8c1c76ab576dae366d1be7b8da9be69c8
-MD5 0c47dfef333ee46f28a17c563d1f5e70 ChangeLog 208
-RMD160 4eb0d80722b1e835789f87e50db18cc3e3a36188 ChangeLog 208
-SHA256 532effe51897f41c958885936fc8c7b8c1c76ab576dae366d1be7b8da9be69c8 ChangeLog 208
-MD5 fab076b4a9aee28a44fc4d83a74e36e8 files/digest-paludis-0.12.0 250
-RMD160 72a48588a66832250b5abc68369e496e5cf879d3 files/digest-paludis-0.12.0 250
-SHA256 40bd137f46fa64dd6c938d572c1c7d232fe9e6c0d52f02181cafc3e511b10b5a files/digest-paludis-0.12.0 250
+EBUILD paludis-9999.ebuild 3384 RMD160 d3044012151bf59791f2f9e402b160fce3e416bb SHA1 44a01e459e0f6d0e0eea6029ee47a24f0be5e029 SHA256 58baa4770d689a250373b95d655175effe17e71e1474745fab7b8f896e7d8841
+MD5 09ac26d37a3202dc1c8b3b18e2382070 paludis-9999.ebuild 3384
+RMD160 d3044012151bf59791f2f9e402b160fce3e416bb paludis-9999.ebuild 3384
+SHA256 58baa4770d689a250373b95d655175effe17e71e1474745fab7b8f896e7d8841 paludis-9999.ebuild 3384
+MISC ChangeLog 238 RMD160 94d726955aef55321a797575222fddb11ebad1b8 SHA1 b983786f9cb142978879031e973b3d87a641b392 SHA256 f462f21da27473709e8ac153ca4b72542d438a165a333bb64b726f51543da636
+MD5 b6db20f07d9bbd183e22e6070497542c ChangeLog 238
+RMD160 94d726955aef55321a797575222fddb11ebad1b8 ChangeLog 238
+SHA256 f462f21da27473709e8ac153ca4b72542d438a165a333bb64b726f51543da636 ChangeLog 238
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-paludis-9999 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-paludis-9999 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-paludis-9999 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFkTD1GDyatLGpTbYRAgysAKCZ2tAxa42HMeE3Xe1KeeGYb3AfRQCaAjqe
-1zHY0+ifmHw124juk/4k7p4=
-=uAhG
+iD8DBQFFlAWAGDyatLGpTbYRAlEPAJ9EmPIkziFxj7ypsa/pG1srmQboxACgmbLU
+d122bGXGYye9Es0CJEPR5H4=
+=NB16
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/files/digest-paludis-0.12.0 b/sys-apps/paludis/files/digest-paludis-0.12.0
deleted file mode 100644
index 75724d3..0000000
--- a/sys-apps/paludis/files/digest-paludis-0.12.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e28736cbdca12619765937fe159108c paludis-0.12.0.tar.bz2 1144668
-RMD160 a75b08a1387354a4e629539ad0884bf2fd585611 paludis-0.12.0.tar.bz2 1144668
-SHA256 b108439321b17c315b567dc7d5a01eaaa58cff0c79723c10f2489fd09381f639 paludis-0.12.0.tar.bz2 1144668
diff --git a/sys-apps/paludis/files/paludis-0.12.0-getfsize.patch b/sys-apps/paludis/files/paludis-0.12.0-getfsize.patch
deleted file mode 100644
index d6e0858..0000000
--- a/sys-apps/paludis/files/paludis-0.12.0-getfsize.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: ebuild/builtin_fetch_bin.bash
-===================================================================
---- ebuild/builtin_fetch_bin.bash	(revision 1970)
-+++ ebuild/builtin_fetch_bin.bash	(working copy)
-@@ -26,7 +26,7 @@
-         local aa=${a##*/}
-         hasq "${aa}" ${unique_aa} || unique_aa="${unique_aa} ${aa}"
- 
--        if [[ -f "${PKGDIR}/${aa}" ]] && [[ "0" != $(stat -c '%s' "${PKGDIR}/${aa}" ) ]] ; then
-+        if [[ -f "${PKGDIR}/${aa}" ]] && [[ "0" != $(getfsize "${PKGDIR}/${aa}") ]] ; then
-             if [[ "${old_aa}" != "${aa}" ]] ; then
-                 ebuild_section "Already have ${aa}"
-                 old_aa="${aa}"
-Index: ebuild/builtin_fetch.bash
-===================================================================
---- ebuild/builtin_fetch.bash	(revision 1970)
-+++ ebuild/builtin_fetch.bash	(working copy)
-@@ -26,7 +26,7 @@
-         local aa=${a##*/}
-         hasq "${aa}" ${unique_aa} || unique_aa="${unique_aa} ${aa}"
- 
--        if [[ -f "${DISTDIR}/${aa}" ]] && [[ "0" != $(stat -c '%s' "${DISTDIR}/${aa}" ) ]] ; then
-+        if [[ -f "${DISTDIR}/${aa}" ]] && [[ "0" != $(getfsize "${DISTDIR}/${aa}") ]] ; then
-             if [[ "${old_aa}" != "${aa}" ]] ; then
-                 ebuild_section "Already have ${aa}"
-                 old_aa="${aa}"
-Index: ebuild/utils/getfsize
-===================================================================
---- ebuild/utils/getfsize	(revision 0)
-+++ ebuild/utils/getfsize	(revision 0)
-@@ -0,0 +1,5 @@
-+#!/bin/bash
-+case $(uname -s) in
-+	FreeBSD) stat -f '%z' $@ ;;
-+	*) stat -c '%s' $@ ;;
-+esac
-Index: ebuild/utils/Makefile.am
-===================================================================
---- ebuild/utils/Makefile.am	(revision 1970)
-+++ ebuild/utils/Makefile.am	(working copy)
-@@ -33,6 +33,7 @@
- 	fowners \
- 	fperms \
- 	getmtime \
-+	getfsize \
- 	newbin \
- 	newconfd \
- 	newdoc \
\ No newline at end of file
diff --git a/sys-apps/paludis/files/paludis-0.12.0-tests.patch b/sys-apps/paludis/files/paludis-0.12.0-tests.patch
deleted file mode 100644
index d831a51..0000000
--- a/sys-apps/paludis/files/paludis-0.12.0-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: paludis/args/Makefile.am
-===================================================================
---- paludis/args/Makefile.am	(revision 1970)
-+++ paludis/args/Makefile.am	(working copy)
-@@ -33,7 +33,7 @@
- libpaludisargs_la_LIBADD = \
- 	$(top_builddir)/paludis/util/libpaludisutil.la
- 
--TESTS_ENVIRONMENT = env -u PALUDIS_OPTIONS \
-+TESTS_ENVIRONMENT = env PALUDIS_OPTIONS="" \
- 	TEST_SCRIPT_DIR="$(srcdir)/" \
- 	PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- 	bash $(top_srcdir)/test/run_test.sh
\ No newline at end of file
diff --git a/sys-apps/paludis/paludis-0.12.0.ebuild b/sys-apps/paludis/paludis-9999.ebuild
index a637d93..de6f62f 100644
--- a/sys-apps/paludis/paludis-0.12.0.ebuild
+++ b/sys-apps/paludis/paludis-9999.ebuild
@@ -1,54 +1,48 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2006 Ciaran McCreesh
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.12.0.ebuild,v 1.1 2006/12/02 20:30:22 hansmi Exp $
+# $Header: $
 
-WANT_AUTOMAKE=1.9
-
-inherit bash-completion flag-o-matic eutils autotools
+inherit subversion bash-completion eutils flag-o-matic
 
 DESCRIPTION="paludis, the other package mangler"
 HOMEPAGE="http://paludis.berlios.de/"
-SRC_URI="http://download.berlios.de/paludis/${P}.tar.bz2"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="doc pink selinux qa ruby glsa"
+IUSE="contrarius cran doc gems glsa pink qa ruby selinux zsh-completion"
 
-DEPEND="
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
+COMMON_DEPEND="
 	>=app-shells/bash-3
-	>=sys-devel/autoconf-2.59
-	=sys-devel/automake-1.9*
-	doc? ( app-doc/doxygen )
 	selinux? ( sys-libs/libselinux )
-	qa? (
-		dev-libs/pcre++
-		>=dev-libs/libxml2-2.6
-		app-crypt/gnupg
-		dev-util/pkgconfig )
-	glsa? (
-		>=dev-libs/libxml2-2.6
-		dev-util/pkgconfig )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-RDEPEND="
+	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
+	glsa? ( >=dev-libs/libxml2-2.6 )
+	ruby? ( >=dev-lang/ruby-1.8 )
+	gems? (
+		dev-libs/libyaml
+		dev-ruby/rubygems
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/libebt
+	>=dev-cpp/libwrapiter-1.0.0
+	sys-devel/autoconf:2.5
+	sys-devel/automake:1.9
+	doc? ( app-doc/doxygen media-gfx/imagemagick )
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
 	>=app-admin/eselect-1.0.2
-	>=app-shells/bash-3
 	net-misc/wget
 	net-misc/rsync
-	qa? (
-		dev-libs/pcre++
-		>=dev-libs/libxml2-2.6
-		app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	!mips? ( !x86-fbsd? ( sys-apps/sandbox ) )
-	selinux? ( sys-libs/libselinux )
-	ruby? ( >=dev-lang/ruby-1.8 )"
+	!mips? ( sys-apps/sandbox )"
 
 PROVIDE="virtual/portage"
 
+ESVN_REPO_URI="svn://svn.pioto.org/paludis/trunk"
+ESVN_BOOTSTRAP="./autogen.bash"
+
 pkg_setup() {
 	use amd64 && replace-flags -Os -O2
 	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
@@ -63,31 +57,28 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-getfsize.patch
+	if subversion_wc_info && [[ "${ESVN_WC_URL}" != "${ESVN_REPO_URI}" ]]
+	then
+		die "SVN repo has moved. Please remove ${ESVN_STORE_DIR}/paludis" \
+			"and try again."
+	fi
 
-	eautomake
+	subversion_src_unpack
 }
 
 src_compile() {
-	local myconf=""
-	if use mips || use x86-fbsd; then
-		myconf="--disable-sandbox"
-	else
-		myconf="--enable-sandbox"
-	fi
-
+	local repositories=`echo default $(usev cran) $(usev gems) | tr -s \  ,`
+	local clients=`echo default $(usev contrarius) | tr -s \  ,`
 	econf \
 		$(use_enable doc doxygen ) \
-		${myconf} \
+		$(use_enable !mips sandbox ) \
 		$(use_enable pink) \
 		$(use_enable selinux) \
-		$(use_enable glsa) \
 		$(use_enable qa) \
 		$(use_enable ruby) \
-		--disable-gtk --disable-gtk-tests \
+		$(use_enable glsa) \
+		--with-repositories=${repositories} \
+		--with-clients=${clients} \
 		|| die "econf failed"
 
 	emake || die "emake failed"
@@ -106,7 +97,14 @@ src_install() {
 		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
 
 	if use doc ; then
-		dohtml -r -V doc/html/
+		dohtml -r -V doc/www/*
+	fi
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins zsh-completion/_paludis
+		doins zsh-completion/_adjutrix
+		doins zsh-completion/_paludis_packages
 	fi
 }
 
@@ -134,8 +132,4 @@ pkg_postinst() {
 	einfo "Before using Paludis and before reporting issues, you should read:"
 	einfo "    http://paludis.berlios.de/KnownIssues.html"
 	echo
-	einfo "Paludis 0.12.0 has various new cache options. Read:"
-	einfo "    http://paludis.berlios.de/CacheFiles.html"
-	echo
 }
-