dont build with ocamlc -annot since it appeared in ocaml 3.11, reported by Fauli

Package-Manager: portage-2.2_rc52/cvs/Linux x86_64

4 files changed, 27 insertions, 7 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 659b09b89e12..104bd73a7cd1 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/camlimages
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.20 2009/11/25 17:10:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.21 2009/11/27 09:27:42 aballier Exp $
+
+  27 Nov 2009; Alexis Ballier <aballier@gentoo.org> camlimages-3.0.2.ebuild,
+  +files/camlimages-3.0.2-annot.patch:
+  dont build with ocamlc -annot since it appeared in ocaml 3.11, reported by
+  Fauli
 
 *camlimages-3.0.2 (25 Nov 2009)
 
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 473f12120312..f0d60ee06ad5 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -6,6 +6,7 @@ AUX META.camlimages.in 850 RMD160 25b79bc73cdc1010ee62efe8f0ce5ae557f6cad7 SHA1
 AUX camlimages-2.20-ocaml-3.09.diff 385 RMD160 b235b80d0e972a9c05c1f6acbdff335775c0a4e5 SHA1 c53ec44ab5c363b085eeca099d6cda7349b14a8b SHA256 5666ac67637d63fd40248ae2ead4ab6a9ab8b96139a670926ba28f186ed5027f
 AUX camlimages-3.0.1-CVE-2009-2295.patch 4347 RMD160 e383255355958e23ccf1136eb2482868fbba403c SHA1 0285ff2fb792946443ab9e25d83472dc6a51640d SHA256 5b8c460ee211169bd65e42469a7ed3428dc4ace6a76ecd67c2c99dcf1d392ac0
 AUX camlimages-3.0.1-lablgtk.patch 1375 RMD160 537f4e3008388fad9ffcd05f8b3ddfe171940a73 SHA1 053cf492697b65532cf06d2da702482d1acbb8c9 SHA256 413efcc6b767966ea2c6abb4219f821574987bb8094a615c7575e60e7a617aea
+AUX camlimages-3.0.2-annot.patch 386 RMD160 05735cb525f633a67115987cd0f343811d6f035b SHA1 58c97e7dea986ef1ae9433f4fcfa9dc648507a57 SHA256 f3c4a883b344f0a54dac5ffc34341e842f76997d7d36e1e18642011e47a8053b
 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
 DIST camlimages-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
@@ -13,13 +14,13 @@ DIST camlimages-3.0.1.tar.gz 1320064 RMD160 fcc2be8bd98bf06a268d7247118d8f4f4bcb
 DIST camlimages-3.0.2.tgz 1429138 RMD160 f3b741a30afc23f5d68747830bcd192402514a50 SHA1 7e33e0de1e1afb3b370140fe9c3a610a32bfb9f5 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
 EBUILD camlimages-2.20-r2.ebuild 2058 RMD160 0a8f53c87d151169aeca09b8e8b63cc5627c3352 SHA1 26caa179abad9eb56cfebd84317d9c665fda5653 SHA256 df3986810fb42abb66b80d70b333ec1e0aa2978d5254c8f4f153551d7095317c
 EBUILD camlimages-3.0.1.ebuild 1332 RMD160 85e579ffdc806512066a821993b306216d6576e5 SHA1 a7faec95b95b821d5d6692782c881711573b19f6 SHA256 ead906eeb6c2959aa6136c55e156f03a1e9d1e80e417f2b426200344e9828428
-EBUILD camlimages-3.0.2.ebuild 1387 RMD160 5477af0f0a288f9527ca858a1319d258666ff329 SHA1 a06d1c8ef619d856bcf40026a1c6d269362afe65 SHA256 17fadbdff8481847576af15612ff0e91a0eeb4a24e712368ade8b68b4b337abd
-MISC ChangeLog 3573 RMD160 89f47b8d6b37a20081f5e540649b2140a9127930 SHA1 e2edd4adf82b33837d71090604280c7f2377571b SHA256 db1b6e3d8e3e14ec3d2126c7d8834f456b1b2188f25cc18de903ec2f3d365303
+EBUILD camlimages-3.0.2.ebuild 1426 RMD160 77b5a78f4f64ab990a68a2885d8ab706edb34a7c SHA1 547b7e6145aa435990c4a3369f046d3d7b452c8a SHA256 69073cb770c5c41ba623f38b2550e4ec6e536ccea0920071f23a4c5d72f9432c
+MISC ChangeLog 3775 RMD160 fd8bfa5ae0bf6ee68f6cebfb61bae7064b49276a SHA1 6546d19d7f65548136dd68f17c92e293825f47df SHA256 f952a188a1088466ab69ee8d5212e12e6a48fa371b13ca7a27233d425f2f3647
 MISC metadata.xml 234 RMD160 75062c045394f9d93ad6d830d4959666fac81241 SHA1 ff9422155c085b977935e76dbb87dc9f6ed6bb42 SHA256 d43df7cc2b17c0287287c854adb59220224c48e5f0f7c13232f61b440af6a87e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksNZRAACgkQvFcC4BYPU0ra5gCfWbbCwpL3x+S2aCf6OQpXLt2/
-3N8An33AXQyRNEprNuyyAAvatiYjFmsh
-=Cw2u
+iEYEARECAAYFAksPm5MACgkQvFcC4BYPU0qPOwCfTw5QUvvgcYFGaRvEM/vqkwJm
+eSwAoI58kma8muw9XJgac0GDzwzYyqiV
+=56hy
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild
index b8fcd2186742..33e6a7f580e6 100644
--- a/dev-ml/camlimages/camlimages-3.0.2.ebuild
+++ b/dev-ml/camlimages/camlimages-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.1 2009/11/25 17:10:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.2 2009/11/27 09:27:42 aballier Exp $
 
 EAPI=2
 
@@ -33,6 +33,7 @@ DEPEND="${DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}/${P}-tiffread-CVE-2009-3296.patch"
 	epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch"
+	epatch "${FILESDIR}/${P}-annot.patch"
 	eautoreconf
 }
 
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch b/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch
new file mode 100644
index 000000000000..b34962f12ce2
--- /dev/null
+++ b/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch
@@ -0,0 +1,13 @@
+Index: camlimages-3.0.2/src/Makefile.am
+===================================================================
+--- camlimages-3.0.2.orig/src/Makefile.am
++++ camlimages-3.0.2/src/Makefile.am
+@@ -35,7 +35,7 @@ endif
+ 
+ BUILT_SOURCES = $(OCAMLBUILTSOURCES)
+ 
+-OCAMLCFLAGS	= -warn-error A -annot
++OCAMLCFLAGS	= -warn-error A
+ LINKFLAGS	=	 
+ AM_OCAMLCFLAGS	=
+ AM_CFLAGS	= -I .. -DHAVE_CONFIG_H