Prepare for ocaml-3.08 insertion.

10 files changed, 50 insertions, 76 deletions

diff --git a/dev-ml/ulex/ChangeLog b/dev-ml/ulex/ChangeLog
index a97095541ac5..7206a16c10dc 100644
--- a/dev-ml/ulex/ChangeLog
+++ b/dev-ml/ulex/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-ml/ulex
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ChangeLog,v 1.5 2004/06/25 00:04:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ChangeLog,v 1.6 2004/08/08 07:11:03 mattam Exp $
+
+*ulex-0.5 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -ulex-0.2-r1.ebuild,
+  -ulex-0.2.ebuild, +ulex-0.4.ebuild, +ulex-0.5.ebuild:
+  New revisions for ocaml-3.07 and 3.08.
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -ulex-0.2-r1.ebuild,
+  -ulex-0.2.ebuild:
+  Prepare for ocaml-3.08.
 
 *ulex-0.2-r1 (10 May 2004)
 
diff --git a/dev-ml/ulex/Manifest b/dev-ml/ulex/Manifest
index 2fff5680fc15..ce0dec8c879b 100644
--- a/dev-ml/ulex/Manifest
+++ b/dev-ml/ulex/Manifest
@@ -1,7 +1,7 @@
-MD5 9fe8a0cc4c334e50d1f3ab68d3000d20 ulex-0.2-r1.ebuild 802
-MD5 a8bc36cb22add31ffc14414c5deb0693 ulex-0.2.ebuild 898
-MD5 7dfded0d45e8d844b0fc83d1e5f77d6c ChangeLog 700
+MD5 38a4619bf1c036ba49b87feb07328a00 ChangeLog 1014
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 1e27715144205a1f593c9a12864846e8 files/digest-ulex-0.2 59
+MD5 4eb08e04cc3f8771b70bcf298c8831fb ulex-0.4.ebuild 785
+MD5 d0837bb9a533f95f186d82223fff5a4e ulex-0.5.ebuild 763
+MD5 8242016cc55c147692d4983648ba46d0 files/digest-ulex-0.4 59
+MD5 2a453505029c0759cfaba969ac497f19 files/digest-ulex-0.5 59
 MD5 c94ec73c168a45ea628225ed73c75e54 files/ulex-0.2-Makefile.patch 1022
-MD5 1e27715144205a1f593c9a12864846e8 files/digest-ulex-0.2-r1 59
diff --git a/dev-ml/ulex/files/digest-ulex-0.2 b/dev-ml/ulex/files/digest-ulex-0.2
deleted file mode 100644
index 7905d1cba24b..000000000000
--- a/dev-ml/ulex/files/digest-ulex-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dde239249b8eec4e07f546c9516da392 ulex-0.2.tar.gz 22886
diff --git a/dev-ml/ulex/files/digest-ulex-0.2-r1 b/dev-ml/ulex/files/digest-ulex-0.2-r1
deleted file mode 100644
index 7905d1cba24b..000000000000
--- a/dev-ml/ulex/files/digest-ulex-0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dde239249b8eec4e07f546c9516da392 ulex-0.2.tar.gz 22886
diff --git a/dev-ml/ulex/files/digest-ulex-0.4 b/dev-ml/ulex/files/digest-ulex-0.4
new file mode 100644
index 000000000000..a9cfcffd6b54
--- /dev/null
+++ b/dev-ml/ulex/files/digest-ulex-0.4
@@ -0,0 +1 @@
+MD5 10f32784ea8b5173f9a9ce058b452a3b ulex-0.4.tar.gz 24862
diff --git a/dev-ml/ulex/files/digest-ulex-0.5 b/dev-ml/ulex/files/digest-ulex-0.5
new file mode 100644
index 000000000000..6a6d697d01fa
--- /dev/null
+++ b/dev-ml/ulex/files/digest-ulex-0.5
@@ -0,0 +1 @@
+MD5 6aa3ca0d73f9400ec6811a19fca414eb ulex-0.5.tar.gz 25621
diff --git a/dev-ml/ulex/files/ulex-0.2-Makefile.patch b/dev-ml/ulex/files/ulex-0.2-Makefile.patch
deleted file mode 100644
index 6bf29cf81910..000000000000
--- a/dev-ml/ulex/files/ulex-0.2-Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- /home/mat/tmp/ulex-0.2/Makefile	2003-09-23 00:59:22.000000000 +0200
-+++ Makefile	2003-09-28 21:39:51.000000000 +0200
-@@ -5,18 +5,25 @@
- 
- 
- install: all
--	ocamlfind install ulex META $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+	ocamlfind install ulex META $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.mli)
- 
- uninstall:
- 	ocamlfind remove ulex
- 
--ULEXING = utf8.mli utf8.ml ulexing.mli ulexing.ml
-+ULEXING = utf8.ml ulexing.ml
- ULEX = cset.ml ulex.mli ulex.ml pa_ulex.ml
- 
--ulexing.cma: $(ULEXING)
--	ocamlc -a -o ulexing.cma $(ULEXING)
--ulexing.cmxa: $(ULEXING)
--	ocamlopt -a -o ulexing.cmxa $(ULEXING)
-+%.cmo: %.mli %.ml
-+	ocamlc -c -o $@ $+
-+
-+%.cmx: %.mli %.ml
-+	ocamlopt -c -o $@ $+
-+
-+ulexing.cma: $(ULEXING:.ml=.cmo)
-+	ocamlc -linkall -a -o ulexing.cma $+
-+
-+ulexing.cmxa: $(ULEXING:.ml=.cmx)
-+	ocamlopt -linkall -a -o ulexing.cmxa $+
- 
- pa_ulex.cma: $(ULEX)
- 	ocamlc -a -o pa_ulex.cma -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -I +camlp4 $(ULEX)
diff --git a/dev-ml/ulex/ulex-0.2.ebuild b/dev-ml/ulex/ulex-0.2.ebuild
deleted file mode 100644
index 46fce75d9b31..000000000000
--- a/dev-ml/ulex/ulex-0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.2.ebuild,v 1.4 2004/06/25 00:04:05 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="a lexer generator for unicode"
-HOMEPAGE="http://www.cduce.org/"
-SRC_URI="http://www.cduce.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND=">=dev-lang/ocaml-3.06
-	>=dev-ml/findlib-0.8"
-
-src_compile() {
-	epatch ${FILESDIR}/${P}-Makefile.patch
-	make all || die
-	make all.opt || die
-}
-
-src_install() {
-	local destdir=`ocamlfind printconf destdir`
-	dodir ${destdir}
-	cp /usr/lib/ocaml/ld.conf ${D}/usr/lib/ocaml/ld.conf
-	make OCAMLFIND_LDCONF=${D}/usr/lib/ocaml/ld.conf.wlex OCAMLFIND_DESTDIR=${D}${destdir} install || die
-	echo "/usr/lib/ocaml/site-packages/ulex" >> ${D}/usr/lib/ocaml/ld.conf
-	dodoc README CHANGES
-}
diff --git a/dev-ml/ulex/ulex-0.2-r1.ebuild b/dev-ml/ulex/ulex-0.4.ebuild
index 29d960437276..35801681caba 100644
--- a/dev-ml/ulex/ulex-0.2-r1.ebuild
+++ b/dev-ml/ulex/ulex-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.2-r1.ebuild,v 1.3 2004/06/25 00:04:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.4.ebuild,v 1.1 2004/08/08 07:11:03 mattam Exp $
 
 inherit eutils
 
@@ -14,10 +14,10 @@ KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-3.06
+!>=dev-lang/ocaml-3.08
 	>=dev-ml/findlib-0.8"
 
 src_compile() {
-	epatch ${FILESDIR}/${P}-Makefile.patch
 	make all || die
 	make all.opt || die
 }
diff --git a/dev-ml/ulex/ulex-0.5.ebuild b/dev-ml/ulex/ulex-0.5.ebuild
new file mode 100644
index 000000000000..16158d521e68
--- /dev/null
+++ b/dev-ml/ulex/ulex-0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ulex/ulex-0.5.ebuild,v 1.1 2004/08/08 07:11:03 mattam Exp $
+
+inherit eutils
+
+DESCRIPTION="a lexer generator for unicode"
+HOMEPAGE="http://www.cduce.org"
+SRC_URI="http://www.cduce.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-3.08
+	>=dev-ml/findlib-0.8"
+
+src_compile() {
+	make all || die
+	make all.opt || die
+}
+
+src_install() {
+	local destdir=`ocamlfind printconf destdir`
+	dodir ${destdir}
+	# dummy ld.conf, packages do not install C libraries
+	make OCAMLFIND_LDCONF=dummy OCAMLFIND_DESTDIR=${D}${destdir} install || die
+	dodoc README CHANGES
+}