Version bump, use findlib eclass, remove old, unused version, fixes bug #60924.

7 files changed, 47 insertions, 45 deletions

diff --git a/dev-ml/pcre-ocaml/ChangeLog b/dev-ml/pcre-ocaml/ChangeLog
index 4a0fefa996e6..363c55f17fe4 100644
--- a/dev-ml/pcre-ocaml/ChangeLog
+++ b/dev-ml/pcre-ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/pcre-ocaml
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/ChangeLog,v 1.7 2004/06/25 00:03:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/ChangeLog,v 1.8 2004/08/21 20:56:24 mattam Exp $
+
+*pcre-ocaml-5.08.1 (21 Aug 2004)
+
+  21 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -pcre-ocaml-4.26.3.ebuild,
+  pcre-ocaml-5.03.3.ebuild, +pcre-ocaml-5.08.1.ebuild:
+  Version bump, use findlib eclass, remove old, unused version.
 
   23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> pcre-ocaml-5.03.3.ebuild,
   metadata.xml:
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index 82602acda1bc..4093c978e61f 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,8 +1,9 @@
-MD5 847eac9427c12e7c366c254c932482a9 pcre-ocaml-4.33.0.ebuild 881
-MD5 16aca2a4ee7e6d639ee43ff49398e575 pcre-ocaml-4.26.3.ebuild 809
-MD5 35049ff09499d79cf04cca348b42443b ChangeLog 1202
-MD5 93b0eec0c16be7f2171bb83143a6fd14 pcre-ocaml-5.03.3.ebuild 886
+MD5 73eeffda3fb9d7b47eb9c6993d12bf68 ChangeLog 1434
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
+MD5 ea398c7808aed229e7e97857906f72c1 pcre-ocaml-5.08.1.ebuild 682
+MD5 847eac9427c12e7c366c254c932482a9 pcre-ocaml-4.33.0.ebuild 881
+MD5 8e5db79f4bd7d6422717d7e5f656994f pcre-ocaml-5.03.3.ebuild 697
 MD5 aec41ffe97cf9b0cd7d6dea307de5aaa files/digest-pcre-ocaml-4.26.3 69
 MD5 470fb9405cf453447cc8d6d579bec3c6 files/digest-pcre-ocaml-4.33.0 69
 MD5 59cbe47e1fe7bd32f076d946721a9581 files/digest-pcre-ocaml-5.03.3 69
+MD5 a42aeedb3caa89bccd455a569ef8604a files/digest-pcre-ocaml-5.08.1 69
diff --git a/dev-ml/pcre-ocaml/files/digest-pcre-ocaml-4.26.3 b/dev-ml/pcre-ocaml/files/digest-pcre-ocaml-4.26.3
deleted file mode 100644
index 3d594eaa0201..000000000000
--- a/dev-ml/pcre-ocaml/files/digest-pcre-ocaml-4.26.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef56fbb87ec9eccc953b7ba5a72c5242 pcre-ocaml-4.26.3.tar.bz2 36094
diff --git a/dev-ml/pcre-ocaml/files/digest-pcre-ocaml-5.08.1 b/dev-ml/pcre-ocaml/files/digest-pcre-ocaml-5.08.1
new file mode 100644
index 000000000000..8d9c637bb322
--- /dev/null
+++ b/dev-ml/pcre-ocaml/files/digest-pcre-ocaml-5.08.1
@@ -0,0 +1 @@
+MD5 326644e607850e691cc3d54d82f1382f pcre-ocaml-5.08.1.tar.bz2 45383
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-4.26.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-4.26.3.ebuild
deleted file mode 100644
index 768a620783fb..000000000000
--- a/dev-ml/pcre-ocaml/pcre-ocaml-4.26.3.ebuild
+++ /dev/null
@@ -1,28 +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/pcre-ocaml/pcre-ocaml-4.26.3.ebuild,v 1.8 2004/07/14 16:29:55 agriffis Exp $
-
-DESCRIPTION="Perl Compatibility Regular Expressions for OCaml"
-HOMEPAGE="http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html"
-LICENSE="LGPL-2.1"
-
-DEPEND=">=dev-lang/ocaml-3.04-r1
-	>=dev-libs/libpcre-3.9-r1"
-
-SRC_URI="http://www.ai.univie.ac.at/~markus/ocaml_sources/pcre-ocaml-4.26.3.tar.bz2"
-
-SLOT="3"
-KEYWORDS="x86"
-IUSE=""
-
-src_compile() {
-	make all opt || die
-}
-
-src_install () {
-	make OCAMLLIBPATH=${D}/usr/lib/ocaml install || die
-	mv ${D}/usr/lib/ocaml/contrib/* ${D}/usr/lib/ocaml || die
-	rmdir ${D}/usr/lib/ocaml/contrib || die
-
-	dodoc LICENSE README VERSION META
-}
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-5.03.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-5.03.3.ebuild
index 85d948d87630..b2938612b2e2 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-5.03.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-5.03.3.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-5.03.3.ebuild,v 1.5 2004/06/25 00:03:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-5.03.3.ebuild,v 1.6 2004/08/21 20:56:24 mattam Exp $
+
+inherit findlib
 
 DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
 HOMEPAGE="http://www.ai.univie.ac.at/~markus/home/ocaml_sources.html"
 LICENSE="LGPL-2.1"
 
 DEPEND=">=dev-lang/ocaml-3.06-r1
-	>=dev-libs/libpcre-4.2-r1
-	>=dev-ml/findlib-0.8"
+	>=dev-libs/libpcre-4.2-r1"
 
 SRC_URI="http://www.oefai.at/~markus/ocaml_sources/${P}.tar.bz2"
 
 SLOT="3"
-KEYWORDS="x86 ~ppc"
+
+KEYWORDS="x86 ppc"
 IUSE=""
 
 src_compile() {
@@ -21,13 +23,7 @@ src_compile() {
 }
 
 src_install () {
-	# which directory does the lib go into?
-	destdir=`ocamlfind printconf destdir`
-
-	# install
-	mkdir -p ${D}${destdir} || die
-	make	OCAMLFIND_DESTDIR=${D}${destdir} \
-		OCAMLFIND_LDCONF=dummy install || die
+	findlib_src_install
 
 	# install documentation
 	dodoc LICENSE README VERSION
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild
new file mode 100644
index 000000000000..17838c055f80
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pcre-ocaml/pcre-ocaml-5.08.1.ebuild,v 1.1 2004/08/21 20:56:24 mattam Exp $
+
+inherit findlib
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://www.oefai.at/~markus/home/ocaml_sources.html"
+SRC_URI="http://www.oefai.at/~markus/ocaml_sources/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+
+DEPEND=">=dev-lang/ocaml-3.07
+	>=dev-libs/libpcre-4.5"
+SLOT="0"
+IUSE=""
+KEYWORDS="~x86 ~ppc"
+
+src_compile() {
+	make all || die
+}
+
+src_install () {
+	findlib_src_install
+
+	# install documentation
+	dodoc LICENSE README VERSION
+}