new version of darcs and compatibility fix (ghc6)

5 files changed, 73 insertions, 6 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index e1d4c3121af5..5dce4fb3bc8b 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/darcs
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.4 2003/07/10 13:44:28 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.5 2003/07/31 11:25:59 kosmikus Exp $
+
+*darcs-0.9.12 (31 Jul 2003)
+
+  31 Jul 2003; Andres Loeh <kosmikus@gentoo.org> darcs-0.9.11.ebuild,
+  darcs-0.9.12.ebuild:
+  Version bump. Both 0.9.11 and 0.9.12 should compile with GHC 6 now.
 
   10 Jul 2003; Andres Loeh <kosmikus@gentoo.org> :
   Updated digest for darcs-0.9.10
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index 6eef96704fd9..fabfee453fd7 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -1,7 +1,7 @@
-MD5 2859baba17cfdfc5ca4ef1d5deb5433c darcs-0.9.11.ebuild 1515
+MD5 a21671d4cfb82ca0798062c7ac77ff2b darcs-0.9.11.ebuild 1515
 MD5 c1a97939da2bf1ee0ffa81ccd88fddd9 darcs-0.9.10.ebuild 954
-MD5 e074fd57e20b8b006364fa9db4c6749c ChangeLog 1001
-MD5 2859baba17cfdfc5ca4ef1d5deb5433c darcs-0.9.12.ebuild 1515
+MD5 4896fd70f150a892b8c91a079884f343 ChangeLog 1194
+MD5 24cd0b63c6f138ae8a8847dd5c013d2a darcs-0.9.12.ebuild 1515
 MD5 01e85de2581ad4e0d0f8486d950ce413 files/digest-darcs-0.9.10 64
 MD5 d0270de2641f6fc0928154e536151b93 files/digest-darcs-0.9.11 64
 MD5 508da1fa081ead33baec65fd69c633a0 files/digest-darcs-0.9.12 64
diff --git a/dev-util/darcs/darcs-0.9.11.ebuild b/dev-util/darcs/darcs-0.9.11.ebuild
index 6851d18d024d..fca1d066104f 100644
--- a/dev-util/darcs/darcs-0.9.11.ebuild
+++ b/dev-util/darcs/darcs-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-0.9.11.ebuild,v 1.1 2003/07/03 12:43:45 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-0.9.11.ebuild,v 1.2 2003/07/31 11:25:59 kosmikus Exp $
 
 DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
 HOMEPAGE="http://abridgegame.org/darcs"
@@ -21,9 +21,12 @@ S=${WORKDIR}/${P}
 
 src_compile() {
 	# fix typo in autoconf.mk.in
+	# I can't find a really robust way to pass CFLAGS
+	# through ghc, especially not as different ghc versions
+	# have different behaviour here; suggestions welcome
 	mv autoconf.mk.in autoconf.mk.in.orig
 	cat autoconf.mk.in.orig \
-		| sed 's:$(CFLAGS):-optc"$(CFLAGS)":' \
+		| sed "s:\$(CFLAGS)::" \
 		> autoconf.mk.in
 	sh ./configure \
 		--prefix=/usr \
diff --git a/dev-util/darcs/darcs-0.9.12.ebuild b/dev-util/darcs/darcs-0.9.12.ebuild
new file mode 100644
index 000000000000..eb7d89069864
--- /dev/null
+++ b/dev-util/darcs/darcs-0.9.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-0.9.12.ebuild,v 1.1 2003/07/31 11:25:59 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}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND=">=net-ftp/curl-7.10.2
+	>=virtual/ghc-5.04
+	doc?  ( >=app-text/tetex-2.0.2
+		dev-tex/latex2html )"
+
+RDEPEND=">=net-ftp/curl-7.10.2"
+
+S=${WORKDIR}/${P}
+
+src_compile() {
+	# fix typo in autoconf.mk.in
+	# I can't find a really robust way to pass CFLAGS
+	# through ghc, especially not as different ghc versions
+	# have different behaviour here; suggestions welcome
+	mv autoconf.mk.in autoconf.mk.in.orig
+	cat autoconf.mk.in.orig \
+		| sed "s:\$(CFLAGS)::" \
+		> autoconf.mk.in
+	sh ./configure \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man || die
+	if [ `use doc` ]; then
+		mv GNUmakefile GNUmakefile.orig
+		cat GNUmakefile.orig \
+			| sed 's:/doc:/doc/${PF}:' \
+			> GNUmakefile
+	else
+		mv GNUmakefile GNUmakefile.orig
+		cat GNUmakefile.orig \
+			| sed 's:^.*/doc.*$::' \
+			> GNUmakefile
+		mv autoconf.mk autoconf.mk.orig
+		cat autoconf.mk.orig \
+			| sed 's:darcs\.ps::' \
+			| sed 's:manual/index.html::' \
+			> autoconf.mk
+	fi		
+	make all || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
diff --git a/dev-util/darcs/files/digest-darcs-0.9.12 b/dev-util/darcs/files/digest-darcs-0.9.12
new file mode 100644
index 000000000000..d42afdf6fdc4
--- /dev/null
+++ b/dev-util/darcs/files/digest-darcs-0.9.12
@@ -0,0 +1 @@
+MD5 d19b194426d1d5bbc10145abd3c481e1 darcs-0.9.12.tar.gz 253287