Add a better META file based on debian's one. This will allow to build active-dvi.

Package-Manager: portage-2.1.5.4

4 files changed, 139 insertions, 2 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 9da9b0608973..1c980b9a1859 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/camlimages
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.11 2008/01/27 14:22:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.12 2008/06/07 20:32:41 aballier Exp $
+
+*camlimages-2.20-r1 (07 Jun 2008)
+
+  07 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/META.camlimages.in, +camlimages-2.20-r1.ebuild:
+  Add a better META file based on debian's one. This will allow to build
+  active-dvi.
 
   27 Jan 2008; Alexis Ballier <aballier@gentoo.org> camlimages-2.20.ebuild:
   fix automagics...
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 58d2fce60054..dd031e1abd32 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX META 143 RMD160 dedf7cbe1a4511c1791ae536bfd078c47c6db69b SHA1 e7777bcbc6ba245734131eb1ee9645269db7338e SHA256 2a934de5f1649633f656014b95f342029de034fd3c7a7057d6d3164201b97579
+AUX META.camlimages.in 975 RMD160 ba226648c7b9f56949e978a49aa99a5b7e19614d SHA1 d206b0aa2840eccbf36f02de8879e77569045d10 SHA256 afb925ac0c5cace2afb0b468555b9a45c4cb0727dacaa3b86e9be14ec386f288
 AUX camlimages-2.20-ocaml-3.09.diff 385 RMD160 b235b80d0e972a9c05c1f6acbdff335775c0a4e5 SHA1 c53ec44ab5c363b085eeca099d6cda7349b14a8b SHA256 5666ac67637d63fd40248ae2ead4ab6a9ab8b96139a670926ba28f186ed5027f
 DIST camlimages-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
+EBUILD camlimages-2.20-r1.ebuild 1881 RMD160 2752a49d8bd154dbe3063fd4419ed4322bb94b0d SHA1 78f05d0bc43dfba567b4db72f82acf4e0f213939 SHA256 8188f62c7f448193487978fdb3288266b6abade6d64dd2c81f0812ab23af2176
 EBUILD camlimages-2.20.ebuild 1909 RMD160 484d331efa6985cb75bc5d541ccd7bd34a6ce582 SHA1 c15af761c830dd36b7b1b55f20fccc990b96b072 SHA256 3f46c3184a2fa82b617328c64794c7c3578ed8eee7985e9c5305295615750c91
-MISC ChangeLog 2100 RMD160 175f62970fdfabd491de41816809e73cd95c354c SHA1 fa00926f595d4b9409a840f8a00d254924664108 SHA256 dd20641c7a72b7df78e992456341f6f2709b0be28004781428c37e816e844e3c
+MISC ChangeLog 2332 RMD160 daab4b5fbc7a4edb4c9aa556104ac501953b033a SHA1 a62982f5e1fb33fb2513a8e9a8e661cdcbcd5508 SHA256 295e4a48f5a6b85c01b763d9e7b9d137b094b9e445f41c030e1e0ef5f42e02c7
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhK8IIACgkQvFcC4BYPU0p/TwCgyZ1Ac58+07jRcG8+26MIwukV
+nE4AoKz0s6fkagW8EE8MV83jKA1M/7Xb
+=MhAo
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-2.20-r1.ebuild b/dev-ml/camlimages/camlimages-2.20-r1.ebuild
new file mode 100644
index 000000000000..ec31b48a171d
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-2.20-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20-r1.ebuild,v 1.1 2008/06/07 20:32:41 aballier Exp $
+
+inherit findlib eutils
+
+IUSE="gtk opengl"
+
+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 ~ppc ~x86"
+
+DEPEND=">=dev-lang/ocaml-3.09
+	gtk? ( dev-ml/lablgtk )
+	opengl? ( dev-ml/lablgl )
+	media-libs/giflib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	x11-libs/libXpm
+	>=media-libs/freetype-2
+	virtual/ghostscript"
+
+S="${WORKDIR}/${P/20/2}"
+
+pkg_setup() {
+	if ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "${PN} needs to be built with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ocaml-3.09.diff"
+}
+
+src_compile() {
+	local myconf
+
+	if !(use gtk);
+	then
+		myconf="--with-lablgtk=/dev/null --with-lablgtk2=/dev/null"
+	fi
+
+	if !(use opengl);
+	then
+		myconf="$myconf --with-lablgl=/dev/null"
+	fi
+
+	econf ${myconf} || die
+	emake -j1 || die
+	emake -j1 opt || die
+}
+
+src_test() {
+	cd "${S}/test"
+	emake || die "building test failed"
+	./test
+	./test.byt
+}
+
+src_install() {
+	# Use findlib to install properly, especially to avoid
+	# the shared library mess
+	findlib_src_preinst
+	mkdir "${T}/tmp"
+	emake CAMLDIR="${T}/tmp" \
+		LIBDIR="${T}/tmp" \
+		DESTDIR="${T}/tmp" \
+		install || die
+	sed -e "s/@VERSION@/${PV}/" "${FILESDIR}/META.camlimages.in" > "${T}/tmp/META"
+
+	ocamlfind install camlimages "${T}"/tmp/*
+}
diff --git a/dev-ml/camlimages/files/META.camlimages.in b/dev-ml/camlimages/files/META.camlimages.in
new file mode 100644
index 000000000000..94cc60b51059
--- /dev/null
+++ b/dev-ml/camlimages/files/META.camlimages.in
@@ -0,0 +1,36 @@
+version="@VERSION@"
+description = "Image manipulation library"
+
+requires="graphics"
+
+archive(byte)   ="ci_core.cma"
+archive(byte)  +="ci_freetype.cma"
+archive(byte)  +="ci_gif.cma"
+archive(byte)  +="ci_jpeg.cma"
+archive(byte)  +="ci_tiff.cma"
+archive(byte)  +="ci_bmp.cma"
+archive(byte)  +="ci_ppm.cma"
+archive(byte)  +="ci_png.cma"
+archive(byte)  +="ci_xvthumb.cma"
+archive(byte)  +="ci_xpm.cma"
+archive(byte)  +="ci_ps.cma"
+archive(byte)  +="ci_graphics.cma"
+
+archive(native) ="ci_core.cmxa"
+archive(native)+="ci_freetype.cmxa"
+archive(native)+="ci_gif.cmxa"
+archive(native)+="ci_jpeg.cmxa"
+archive(native)+="ci_tiff.cmxa"
+archive(native)+="ci_bmp.cmxa"
+archive(native)+="ci_ppm.cmxa"
+archive(native)+="ci_png.cmxa"
+archive(native)+="ci_xvthumb.cmxa"
+archive(native)+="ci_xpm.cmxa"
+archive(native)+="ci_ps.cmxa"
+archive(native)+="ci_graphics.cmxa"
+
+package "lablgtk2" (
+	requires="camlimages lablgtk2"
+	archive(byte)="ci_lablgtk2.cma"
+	archive(native)="ci_lablgtk2.cmxa"
+)