version bump

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 163 insertions, 3 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index e665b418de1d..c0a0e556bd15 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/camlimages
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.30 2011/02/28 18:10:41 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.31 2012/04/10 12:22:14 aballier Exp $
+
+*camlimages-4.0.1 (10 Apr 2012)
+
+  10 Apr 2012; Alexis Ballier <aballier@gentoo.org> +camlimages-4.0.1.ebuild,
+  +files/camlimages-4.0.1-libpng15.patch:
+  version bump
 
   28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> camlimages-3.0.2.ebuild:
   Use virtual/jpeg.
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index b05856baca3c..58ce012f9e18 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX camlimages-3.0.2-annot.patch 386 RMD160 05735cb525f633a67115987cd0f343811d6f035b SHA1 58c97e7dea986ef1ae9433f4fcfa9dc648507a57 SHA256 f3c4a883b344f0a54dac5ffc34341e842f76997d7d36e1e18642011e47a8053b
 AUX camlimages-3.0.2-libpng15.patch 2392 RMD160 82550e3b5eb75953b354bcebdb1cca002635792b SHA1 02922bd3cd6314c28504a2f0fe080e42277ff523 SHA256 771d38f136cf493938744eca8e5aaf0761778ce1fce58ae24d91455518e3ee29
 AUX camlimages-3.0.2-noxpm.patch 444 RMD160 cf4db800eb5c6316f0047a1b6db143b82d0b6077 SHA1 837ebb781bd5810b4c57f431915eb321a364699b SHA256 7fa917003af4bd2b541499d5d724e5e5f8d6ebcf280361544ea680394115de9f
 AUX camlimages-3.0.2-ocaml-autoconf11.patch 355 RMD160 4775a64d3021dfb4268aede3a121cf78eccfcf65 SHA1 ea69cd1dfb5aca48203584020bab3a948c896087 SHA256 b02c43105ffc90144c66dcef68f8c65dfdc39d0ba39adc8976f05d7f0d7b9668
 AUX camlimages-3.0.2-tiffread-CVE-2009-3296.patch 995 RMD160 ccf0d82e20c4c11ebe38e7331e8fcee751a78eaa SHA1 71c43011cf3005787678e0885b4904f55473ede1 SHA256 1db69c1993cba70226dfd4e179e9f4754d3d43fcb571e319d97accd91947493f
+AUX camlimages-4.0.1-libpng15.patch 2354 RMD160 6a0deaea3b853a233fc6c3e81eb883804e6b5603 SHA1 e0daec14d11a7806665bd29975c7f61256c9a103 SHA256 2a7852d67eb31055aff8225666530d808da688f98560e3c0853fc475a27dc29f
 DIST camlimages-3.0.2.tgz 1429138 RMD160 f3b741a30afc23f5d68747830bcd192402514a50 SHA1 7e33e0de1e1afb3b370140fe9c3a610a32bfb9f5 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
+DIST camlimages-4.0.1.tar.bz2 2010729 RMD160 ba5ade941a0c9b20db693ddd03e5437709a4c5b6 SHA1 b3f8e4be1f7f922016ae11cf7d303b730a28c9dc SHA256 b6a5e79abcfba1316a516f2e0290e6f06c90fa1ed94d8dcd5533a2e3d51c0c89
 EBUILD camlimages-3.0.2.ebuild 1526 RMD160 e91d60f888de572024edb898a84d0de5f6a9e12a SHA1 74edd0fea9188e2609f4e0fb085b723b627df9d7 SHA256 4309e41558a30836d35c325858362c33e02bdf790b80c11daf91af7a5e360789
-MISC ChangeLog 5147 RMD160 d42bf675f02bc9edae43e262d989a48bbbab5dd1 SHA1 b08128d0127a5d5c80586160a407dc87acc777d1 SHA256 85774b3b86896999f08083b7475834377fb7dab865bc18e1ff20abf926ce779d
+EBUILD camlimages-4.0.1.ebuild 2027 RMD160 f5ec952d7111efebdcef35ebc3d35daddab308ae SHA1 814f77fe00f6486cd500193861ad3ecc15787bdc SHA256 38cb25c11827358d98894318dacb72219d837ecf69108ffd6f5932ca0b3460ef
+MISC ChangeLog 5315 RMD160 95cd3d097d9d77eb086b3f63e4e44f9468277127 SHA1 5803aa7ab9a619e3248944f32103a8b9b017d161 SHA256 9c2ffbdbc94992e8ab8a5eda06f84e7471f10624db28d6b575cb4098e99682ab
 MISC metadata.xml 250 RMD160 598e56c53e73f20d9f66aa719a344dd151d72e00 SHA1 eb18ff902a727aa9352e813aacb53831c43a36f0 SHA256 5e4fa04a77d47a0f481ef815f7a82527865397a89ffd15b3288c7d9559644b42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk+EJfwACgkQvFcC4BYPU0pNlwCfeIEm3xcy8q4lrzEUnpA1UQjd
+w4oAoJSVvIS34Pi+n935T14mbtR6UyAt
+=p9HE
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-4.0.1.ebuild b/dev-ml/camlimages/camlimages-4.0.1.ebuild
new file mode 100644
index 000000000000..414aad32fe7a
--- /dev/null
+++ b/dev-ml/camlimages/camlimages-4.0.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-4.0.1.ebuild,v 1.1 2012/04/10 12:22:14 aballier Exp $
+
+EAPI=4
+
+inherit eutils vcs-snapshot findlib multilib
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://gallium.inria.fr/camlimages/"
+SRC_URI="http://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gif gs gtk jpeg png tiff truetype X xpm zlib"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2[X?,ocamlopt]
+	gif? ( media-libs/giflib )
+	gtk? ( dev-ml/lablgtk )
+	gs? ( app-text/ghostscript-gpl )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff )
+	png? ( >=media-libs/libpng-1.4 )
+	truetype? ( >=media-libs/freetype-2 )
+	xpm? ( x11-libs/libXpm )
+	X? ( x11-apps/rgb )
+	zlib? ( sys-libs/zlib )
+	"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[latex] )
+	dev-util/omake
+	dev-ml/findlib"
+
+REQUIRED_USE="png? ( zlib )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libpng15.patch"
+}
+
+camlimages_disable_have() {
+	if ! use $1 ; then
+		sed -i -e "s/^[[:space:]]*HAVE_$2.*\$/  HAVE_$2 = false/" OMakefile || die
+		sed -i -e "s/^[[:space:]]*SUPPORT_$2.*\$/\0\n  SUPPORT_$2 = false/" OMakefile || die
+	fi
+}
+
+src_configure() {
+	camlimages_disable_have gif      GIF
+	camlimages_disable_have zlib     Z
+	camlimages_disable_have png      PNG
+	camlimages_disable_have jpeg     JPEG
+	camlimages_disable_have tiff     TIFF
+	camlimages_disable_have xpm      XPM
+	camlimages_disable_have gs       PS
+	camlimages_disable_have gtk      LABLGTK2
+	camlimages_disable_have X        GRAPHICS
+	camlimages_disable_have X        RGB_TXT
+	camlimages_disable_have truetype FREETYPE
+}
+
+src_compile() {
+	omake --force-dotomake || die
+	if use doc ; then
+		sphinx-build doc/sphinx sphinxdoc || die
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+	omake --force-dotomake DESTDIR="${D}" install || die
+	dodoc README
+	use doc && dohtml -r sphinxdoc/*
+}
diff --git a/dev-ml/camlimages/files/camlimages-4.0.1-libpng15.patch b/dev-ml/camlimages/files/camlimages-4.0.1-libpng15.patch
new file mode 100644
index 000000000000..460b3c11edf1
--- /dev/null
+++ b/dev-ml/camlimages/files/camlimages-4.0.1-libpng15.patch
@@ -0,0 +1,67 @@
+# HG changeset patch
+# User Jun Furuse <jun.furuse@gmail.com>
+# Date 1329456902 -28800
+# Node ID 4ecc49e79369d413af732c4feeab7128e2f6f11a
+# Parent  9b5cbcd07ae5a88561fbaa4eec3938af5e8b7574
+png_ptr->jmpbuf => png_jmpbuf(png_ptr)
+
+diff -r 9b5cbcd07ae5 -r 4ecc49e79369 src/pngread.c
+--- a/src/pngread.c	Tue Jan 31 22:40:50 2012 +0900
++++ b/src/pngread.c	Fri Feb 17 13:35:02 2012 +0800
+@@ -69,7 +69,7 @@
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+     fclose(fp);
+@@ -134,7 +134,7 @@
+     png_set_rows(png_ptr, info_ptr, row_pointers);
+ 
+     /* Later, we can return something */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+       /* Free all of the memory associated with the png_ptr and info_ptr */
+       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+       fclose(fp);
+@@ -243,7 +243,7 @@
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+     fclose(fp);
+@@ -302,7 +302,7 @@
+     png_set_rows(png_ptr, info_ptr, row_pointers);
+ 
+     /* Later, we can return something */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+       /* Free all of the memory associated with the png_ptr and info_ptr */
+       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+       fclose(fp);
+diff -r 9b5cbcd07ae5 -r 4ecc49e79369 src/pngwrite.c
+--- a/src/pngwrite.c	Tue Jan 31 22:40:50 2012 +0900
++++ b/src/pngwrite.c	Fri Feb 17 13:35:02 2012 +0800
+@@ -62,7 +62,7 @@
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);
+@@ -171,7 +171,7 @@
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);