Remove obsolete version, add patch for ocaml-3.09 and use flags to disable building of lablgtk and lablGL bindings.

(Portage version: 2.0.51.22-r1)

6 files changed, 59 insertions, 47 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index de272a503dbf..1b86921a153a 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/camlimages
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.6 2005/02/17 21:38:03 mattam Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.7 2006/02/04 13:36:17 mattam Exp $
+
+  04 Feb 2006; Matthieu Sozeau <mattam@gentoo.org> -camlimages-2.11-r1.ebuild,
+  camlimages-2.20.ebuild, +files/camlimages-2.20-ocaml-3.09.diff:
+  Fix description and homepage (bug #118659). Remove obsolete version. Stabilize 
+  version 2.20 on x86 and ppc and add new use flags for lablgtk and lablGL bindings.
+  Also add patch for ocaml-3.09.
 
   17 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> camlimages-2.20.ebuild:
   Fix parallel builds bug
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 105e863c30a3..030515e69b18 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,7 +1,6 @@
-MD5 24b7ab6f068e75831d76cd65728decce camlimages-2.11-r1.ebuild 699
-MD5 8fe9ba93067e74a5da7e4a24d39ac7ec camlimages-2.20.ebuild 1019
-MD5 62a41274dce8266e4e06ffe9369b9d13 ChangeLog 1199
+MD5 a2f4d30ff92e9220441303989f92a0f4 camlimages-2.20.ebuild 1359
+MD5 5c6d460a6e57764c07e86e4e23181553 ChangeLog 1545
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 3b291b0ee677d79a08ea9d119ddd6413 files/META 143
-MD5 ad8d61cb88da56d93a4b998c5138cc85 files/digest-camlimages-2.11-r1 65
 MD5 02832829aecdd1efd15157c0916e778a files/digest-camlimages-2.20 64
+MD5 f8272d66ad86ec1812b000fe5ff46f8e files/camlimages-2.20-ocaml-3.09.diff 385
diff --git a/dev-ml/camlimages/camlimages-2.11-r1.ebuild b/dev-ml/camlimages/camlimages-2.11-r1.ebuild
deleted file mode 100644
index ce23fd14f376..000000000000
--- a/dev-ml/camlimages/camlimages-2.11-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.4 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}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-DEPEND=">=dev-lang/ocaml-3.06"
-
-src_compile() {
-	econf || die
-	emake || die
-	emake opt || die
-}
-
-src_install() {
-	findlib_src_preinst
-
-	make CAMLDIR=${D}/usr/lib/ocaml/ \
-		LIBDIR=${D}/usr/lib/ocaml/camlimages \
-		DESTDIR=${D} \
-		install || die
-}
diff --git a/dev-ml/camlimages/camlimages-2.20.ebuild b/dev-ml/camlimages/camlimages-2.20.ebuild
index 9acf69270cc4..0514e49c194b 100644
--- a/dev-ml/camlimages/camlimages-2.20.ebuild
+++ b/dev-ml/camlimages/camlimages-2.20.ebuild
@@ -1,25 +1,47 @@
-# 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-ml/camlimages/camlimages-2.20.ebuild,v 1.3 2005/06/22 12:02:53 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.4 2006/02/04 13:36:17 mattam Exp $
 
-inherit findlib
+inherit findlib eutils
 
-IUSE=""
+IUSE="gtk opengl"
 
-DESCRIPTION="Library used by active-dvi"
-HOMEPAGE="http://pauillac.inria.fr/advi/"
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://pauillac.inria.fr/camlimages/"
 SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P/20/2}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 x86 ppc"
 
-DEPEND=">=dev-lang/ocaml-3.06"
+DEPEND=">=dev-lang/ocaml-3.08"
 
 MY_S="${WORKDIR}/${P/20/2}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${MY_S}
+	if has_version ">=dev-lang/ocaml-3.09";
+	then
+		epatch ${FILESDIR}/${P}-ocaml-3.09.diff
+	fi
+}
+
 src_compile() {
+	local myconf
+
 	cd ${MY_S}
+
+	if !(use gtk);
+	then
+		myconf="--with-lablgtk=/dev/null --with-lablgtk2=/dev/null"
+	fi
+
+	if !(use opengl);
+	then
+		myconf="--with-lablgl=/dev/null"
+	fi
+
 	econf || die
 	emake -j1 || die
 	emake -j1 opt || die
diff --git a/dev-ml/camlimages/files/camlimages-2.20-ocaml-3.09.diff b/dev-ml/camlimages/files/camlimages-2.20-ocaml-3.09.diff
new file mode 100644
index 000000000000..833626936f48
--- /dev/null
+++ b/dev-ml/camlimages/files/camlimages-2.20-ocaml-3.09.diff
@@ -0,0 +1,18 @@
+--- tiff/tiffread.c.orig	2006-02-04 14:07:45.000000000 +0100
++++ tiff/tiffread.c	2006-02-04 14:07:56.000000000 +0100
+@@ -21,15 +21,11 @@
+ #if HAVE_TIFF
+ 
+ /* These are defined in caml/config.h */
+-#define int16 int16tiff
+-#define uint16 uint16tiff
+ #define int32 int32tiff
+ #define uint32 uint32tiff
+ 
+ #include <tiffio.h>
+ 
+-#undef int16
+-#undef uint16
+ #undef int32
+ #undef uint32
+ 
diff --git a/dev-ml/camlimages/files/digest-camlimages-2.11-r1 b/dev-ml/camlimages/files/digest-camlimages-2.11-r1
deleted file mode 100644
index 2db08049b093..000000000000
--- a/dev-ml/camlimages/files/digest-camlimages-2.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f04f0d1a78aa38a6841dc3d71e249449 camlimages-2.11.tgz 1354100