Fix bug #76326, remove old version.

8 files changed, 74 insertions, 46 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 9dfa991fe694..87748f1169ad 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/camlimages
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.4 2004/06/25 00:01:21 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.5 2005/02/06 15:28:50 mattam Exp $
+
+*camlimages-2.20 (06 Feb 2005)
+
+  06 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> +files/META,
+  camlimages-2.11-r1.ebuild, -camlimages-2.11.ebuild, +camlimages-2.20.ebuild:
+  Removed old version, make 2.11 stable on ppc and add latest version 2.20 with
+  new install scheme.
 
   12 May 2004; David Holm <dholm@gentoo.org> camlimages-2.11-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index f62e5370e825..d6279350cf78 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,6 +1,8 @@
-MD5 35ad8c1b0c9294facc0cc4cb1b5d0628 camlimages-2.11-r1.ebuild 783
+MD5 1dbc30fd227951a48ce257692c4efd52 camlimages-2.11-r1.ebuild 703
+MD5 cf96b8d512f7f8138defbf24a2ed88e1 camlimages-2.20.ebuild 822
 MD5 c33d26e6cd547edbd0e467e3d7f312d0 camlimages-2.11.ebuild 818
 MD5 25238c54769dda1fd5df16512e0de273 ChangeLog 821
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 ad8d61cb88da56d93a4b998c5138cc85 files/digest-camlimages-2.11-r1 65
 MD5 ad8d61cb88da56d93a4b998c5138cc85 files/digest-camlimages-2.11 65
+MD5 02832829aecdd1efd15157c0916e778a files/digest-camlimages-2.20 64
diff --git a/dev-ml/camlimages/camlimages-2.11-r1.ebuild b/dev-ml/camlimages/camlimages-2.11-r1.ebuild
index 6a3dbc7651d5..ce23fd14f376 100644
--- a/dev-ml/camlimages/camlimages-2.11-r1.ebuild
+++ b/dev-ml/camlimages/camlimages-2.11-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.11-r1.ebuild,v 1.3 2004/06/25 00:01:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.11-r1.ebuild,v 1.4 2005/02/06 15:28:50 mattam Exp $
+
+inherit findlib
 
 IUSE=""
 
@@ -10,11 +12,10 @@ SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=dev-lang/ocaml-3.06"
 
-
 src_compile() {
 	econf || die
 	emake || die
@@ -22,14 +23,10 @@ src_compile() {
 }
 
 src_install() {
+	findlib_src_preinst
+
 	make CAMLDIR=${D}/usr/lib/ocaml/ \
 		LIBDIR=${D}/usr/lib/ocaml/camlimages \
 		DESTDIR=${D} \
-		OCAML_LDCONF=dummy \
 		install || die
 }
-
-pkg_postinst() {
-	ldconf="/usr/lib/ocaml/ld.conf"
-	echo /usr/lib/ocaml/camlimages >> $ldconf
-}
diff --git a/dev-ml/camlimages/camlimages-2.11.ebuild b/dev-ml/camlimages/camlimages-2.11.ebuild
deleted file mode 100644
index b90ceafcfce6..000000000000
--- a/dev-ml/camlimages/camlimages-2.11.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/camlimages/camlimages-2.11.ebuild,v 1.5 2004/06/25 00:01:21 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="Library used by active-dvi"
-HOMEPAGE="http://pauillac.inria.fr/advi/"
-SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=dev-lang/ocaml-3.06"
-
-
-src_compile() {
-	econf || die
-	emake || die
-	emake opt || die
-}
-
-src_install() {
-	ldconf="${D}/usr/lib/ocaml/ld.conf"
-	install -D /usr/lib/ocaml/ld.conf $ldconf
-	make CAMLDIR=${D}/usr/lib/ocaml/ \
-		LIBDIR=${D}/usr/lib/ocaml/camlimages \
-		DESTDIR=${D} install || die
-	install -D /usr/lib/ocaml/ld.conf $ldconf
-	echo /usr/lib/ocaml/camlimages >> $ldconf
-}
diff --git a/dev-ml/camlimages/camlimages-2.20.ebuild b/dev-ml/camlimages/camlimages-2.20.ebuild
new file mode 100644
index 000000000000..2fdd9b6099a3
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-2.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.1 2005/02/06 15:28:50 mattam Exp $
+
+inherit findlib
+
+IUSE=""
+
+DESCRIPTION="Library used by active-dvi"
+HOMEPAGE="http://pauillac.inria.fr/advi/"
+SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P/20/2}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND=">=dev-lang/ocaml-3.06"
+
+MY_S="${WORKDIR}/${P/20/2}"
+
+src_compile() {
+	cd ${MY_S}
+	econf || die
+	emake || die
+	emake opt || die
+}
+
+src_test() {
+	cd ${MY_S}/test
+	make
+	./test
+	./test.byt
+}
+
+src_install() {
+	# Use findlib to install properly, especially to avoid
+	# the shared library mess
+	findlib_src_preinst
+	mkdir ${D}/tmp
+	cd ${MY_S}
+	make CAMLDIR=${D}/tmp \
+		LIBDIR=${D}/tmp \
+		DESTDIR=${D}/tmp \
+		install || die
+	sed -e "s/VERSION/${PV}/" ${FILESDIR}/META > ${D}/tmp/META
+
+	ocamlfind install camlimages ${D}/tmp/*
+	rm -rf ${D}/tmp
+}
diff --git a/dev-ml/camlimages/files/META b/dev-ml/camlimages/files/META
new file mode 100644
index 000000000000..3fe7400f37c6
--- /dev/null
+++ b/dev-ml/camlimages/files/META
@@ -0,0 +1,5 @@
+description = "Image manipulation library"
+version = "VERSION"
+requires=""
+archive(byte) = "camlimages.cmo"
+archive(native) = "camlimages.cmx"
diff --git a/dev-ml/camlimages/files/digest-camlimages-2.11 b/dev-ml/camlimages/files/digest-camlimages-2.11
deleted file mode 100644
index 2db08049b093..000000000000
--- a/dev-ml/camlimages/files/digest-camlimages-2.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f04f0d1a78aa38a6841dc3d71e249449 camlimages-2.11.tgz 1354100
diff --git a/dev-ml/camlimages/files/digest-camlimages-2.20 b/dev-ml/camlimages/files/digest-camlimages-2.20
new file mode 100644
index 000000000000..fe2231dfb061
--- /dev/null
+++ b/dev-ml/camlimages/files/digest-camlimages-2.20
@@ -0,0 +1 @@
+MD5 d933eb58c7983f70b1a000fa01893aa4 camlimages-2.2.tgz 1385525