New version.

(Portage version: 2.1_pre6-r2)

7 files changed, 54 insertions, 62 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index 45d8cef537c5..653a31027788 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/darcs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.50 2006/03/01 20:08:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.51 2006/03/15 18:17:18 kosmikus Exp $
+
+*darcs-1.0.6 (15 Mar 2006)
+
+  15 Mar 2006; Andres Loeh <kosmikus@gentoo.org> -darcs-1.0.2.ebuild,
+  -darcs-1.0.3.ebuild, +darcs-1.0.6.ebuild:
+  New version.
 
   01 Mar 2006; Markus Rothe <corsair@gentoo.org> darcs-1.0.5.ebuild:
   Added ~ppc64; bug #124469
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index 0aa1e79e9b68..3debd6b97c3c 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -1,10 +1,36 @@
 MD5 b681f3fc82f02961911c5c17b5fdf446 ChangeLog 7068
+RMD160 d2c93fdd31b828772065555bc59de8827acb005c ChangeLog 7068
+SHA256 593808ec4941ff9a7286f58014f63c84813e6e293e76427c3834f6d562973390 ChangeLog 7068
 MD5 90f87bece03065a1f9cea89962b34258 darcs-1.0.2.ebuild 1391
+RMD160 5dfa5b3fab4a8d846a775349c8fcea03d484a462 darcs-1.0.2.ebuild 1391
+SHA256 d62dab74582993e343b68529840da87a19a6359e2162ea5f976d706f31ac4bc1 darcs-1.0.2.ebuild 1391
 MD5 0b3a84cb5b7d77858fda8034a24e9408 darcs-1.0.3.ebuild 1371
+RMD160 6f8d0b279608f68e993a7fc3f371962e3d8548b6 darcs-1.0.3.ebuild 1371
+SHA256 13cd2fd0b35fc017e6503a62dada823a4bba9bec3a3e285bf598a8eca8dea705 darcs-1.0.3.ebuild 1371
 MD5 dfdf6d8f6fc2fb544124444a213fa933 darcs-1.0.4.ebuild 1412
+RMD160 c0471e56606da1915b759bad246edbb47d640d66 darcs-1.0.4.ebuild 1412
+SHA256 23b170ba2c7b012eb9b31a7b0e2600c23dd37b7b79fbb367a4dba3f159906956 darcs-1.0.4.ebuild 1412
 MD5 6d0aa76c722d74332d4fbf5af0d09b5f darcs-1.0.5.ebuild 1751
+RMD160 bb67388c2de69e6ed66f8602a9ce8e64da301c74 darcs-1.0.5.ebuild 1751
+SHA256 05269d32a7b0349da6a6c5ba3f79b74f386680dcf7109236f6c8b0ac89907333 darcs-1.0.5.ebuild 1751
+MD5 c82e975ecf1548f56ae9a30fac9e939c darcs-1.0.6.ebuild 1728
+RMD160 e07a053c62ce8fef8bb797933614393cd2dfdd76 darcs-1.0.6.ebuild 1728
+SHA256 482da871730f249795832841e61b6db2b04a3de835a5472b3f61c9e566389e85 darcs-1.0.6.ebuild 1728
 MD5 f575d4994edef2bafd09e0c520feb65f files/digest-darcs-1.0.2 63
+RMD160 f4952dd39360334c653106995841e44ef8014174 files/digest-darcs-1.0.2 63
+SHA256 9b11da8535a26012c8e618ca5dd5a480d80f02b0c95e6c6f5367f5bd1425a80e files/digest-darcs-1.0.2 63
 MD5 7a71d24a646e5a87396a3ae6e47d67c4 files/digest-darcs-1.0.3 63
+RMD160 b34a1a1f65d7f29dc05f7f40ce55be37df8bc75b files/digest-darcs-1.0.3 63
+SHA256 aadfada8979c77282a2d866f5426e8f405458ce98b9cf884b5449ab76372391c files/digest-darcs-1.0.3 63
 MD5 da9a5baba3176cbc6ba4df0190fc4b00 files/digest-darcs-1.0.4 63
+RMD160 7a965f23f82e487b5f0b7c6201b49415acad6c46 files/digest-darcs-1.0.4 63
+SHA256 e594931d5eefc8d761090c701b769e80a803882313a564f50a36bba79f76de0f files/digest-darcs-1.0.4 63
 MD5 2bae2d256674251392dd30e47f52478f files/digest-darcs-1.0.5 63
+RMD160 f6425dd2e92816f776a1a15f640de303be13d834 files/digest-darcs-1.0.5 63
+SHA256 3e31534b49491c8cfac6afeff4bace730510bab327b44b8e4dbfb07f07b66463 files/digest-darcs-1.0.5 63
+MD5 21a9468341a0422926788eb367b45a49 files/digest-darcs-1.0.6 235
+RMD160 e46a1d8ae182ac57a92ab454338a5b06385e2ce9 files/digest-darcs-1.0.6 235
+SHA256 eada088f6174c90239d3df11a18728a2a5924c8244365600c6ebc43454d2ea13 files/digest-darcs-1.0.6 235
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
+RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
+SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
diff --git a/dev-util/darcs/darcs-1.0.2.ebuild b/dev-util/darcs/darcs-1.0.2.ebuild
deleted file mode 100644
index 62fa31ffcaaf..000000000000
--- a/dev-util/darcs/darcs-1.0.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.2.ebuild,v 1.5 2005/05/03 14:40:56 kosmikus Exp $
-
-DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
-HOMEPAGE="http://abridgegame.org/darcs"
-SRC_URI="http://abridgegame.org/darcs/${P/_rc/rc}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc"
-IUSE="doc"
-# disabled wxwindows use flag for now, as I got build errors
-
-DEPEND=">=net-misc/curl-7.10.2
-	virtual/mta
-	>=virtual/ghc-6.2
-	!>=virtual/ghc-6.4
-	doc?  ( virtual/tetex
-		dev-tex/latex2html )"
-#	wxwindows?  ( dev-haskell/wxhaskell )
-
-RDEPEND=">=net-misc/curl-7.10.2
-	virtual/mta"
-#	wxwindows?  ( dev-haskell/wxhaskell )"
-
-S=${WORKDIR}/${P/_rc/rc}
-
-src_compile() {
-	local myconf
-#	myconf="`use_with wxwindows wx`"
-	# distribution contains garbage files
-	make clean || die "make clean failed"
-	if use doc ; then
-		sed -i "s:/doc:/doc/${PF}:" GNUmakefile
-	else
-		sed -i \
-			-e 's: installdocs::' \
-			-e 's:^.*BUILDDOC.*yes.*$::' \
-			-e 's/^.*TARGETS.*\(darcs\.ps\|manual\).*$/:/' \
-			configure
-	fi
-	econf ${myconf} || die "configure failed"
-	echo 'INSTALLWHAT=installbin' >> autoconf.mk
-	make all || die "make failed"
-}
-
-src_test() {
-	make test
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "installation failed"
-}
diff --git a/dev-util/darcs/darcs-1.0.3.ebuild b/dev-util/darcs/darcs-1.0.6.ebuild
index 9eee6f9e40ae..eb33ef0c67bf 100644
--- a/dev-util/darcs/darcs-1.0.3.ebuild
+++ b/dev-util/darcs/darcs-1.0.6.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.3.ebuild,v 1.4 2005/12/24 15:21:04 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.6.ebuild,v 1.1 2006/03/15 18:17:18 kosmikus Exp $
+
+inherit base
 
 DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
 HOMEPAGE="http://abridgegame.org/darcs"
-SRC_URI="http://abridgegame.org/darcs/${P/_rc/rc}.tar.gz"
+MY_P0="${P/_rc/rc}"
+MY_P="${MY_P0/_pre/pre}"
+SRC_URI="http://abridgegame.org/darcs/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 # disabled wxwindows use flag for now, as I got build errors
 
@@ -23,7 +27,16 @@ RDEPEND=">=net-misc/curl-7.10.2
 	virtual/mta"
 #	wxwindows?  ( dev-haskell/wxhaskell )"
 
-S=${WORKDIR}/${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	base_src_unpack
+
+	# If we're going to use the CFLAGS with GHC's -optc flag then we'd better
+	# use it with -opta too or it'll break with some CFLAGS, eg -mcpu on sparc
+	sed -i 's:\($(addprefix -optc,$(CFLAGS))\):\1 $(addprefix -opta,$(CFLAGS)):' \
+		${S}/autoconf.mk.in
+}
 
 src_compile() {
 	local myconf
diff --git a/dev-util/darcs/files/digest-darcs-1.0.2 b/dev-util/darcs/files/digest-darcs-1.0.2
deleted file mode 100644
index abaf27e957a2..000000000000
--- a/dev-util/darcs/files/digest-darcs-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74c1297775986ee332bb9d79bbf2a09a darcs-1.0.2.tar.gz 765292
diff --git a/dev-util/darcs/files/digest-darcs-1.0.3 b/dev-util/darcs/files/digest-darcs-1.0.3
deleted file mode 100644
index 992383e21811..000000000000
--- a/dev-util/darcs/files/digest-darcs-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3fc141d1c91044e45ae74b74fc54728 darcs-1.0.3.tar.gz 883613
diff --git a/dev-util/darcs/files/digest-darcs-1.0.6 b/dev-util/darcs/files/digest-darcs-1.0.6
new file mode 100644
index 000000000000..95e38ce1b4da
--- /dev/null
+++ b/dev-util/darcs/files/digest-darcs-1.0.6
@@ -0,0 +1,3 @@
+MD5 8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz 963609
+RMD160 271f5f965a1ccd7428877a06349c8d9d39d74658 darcs-1.0.6.tar.gz 963609
+SHA256 8296f91934cfff4721356549db0d2f403fcc796ae424307c76afd33101090752 darcs-1.0.6.tar.gz 963609