fix build without xpm, bug #297506

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

4 files changed, 38 insertions, 6 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 7c58611da1ce..2d1d53a2f0c3 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2009/12/26 17:34:19 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.24 2010/04/12 06:16:54 aballier Exp $
+
+  12 Apr 2010; Alexis Ballier <aballier@gentoo.org> camlimages-3.0.2.ebuild,
+  +files/camlimages-3.0.2-noxpm.patch:
+  fix build without xpm, bug #297506
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> camlimages-2.20-r2.ebuild,
   camlimages-3.0.1.ebuild, camlimages-3.0.2.ebuild:
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 7f8beb8e0e9c..42e90e9eeb9f 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX META 143 RMD160 dedf7cbe1a4511c1791ae536bfd078c47c6db69b SHA1 e7777bcbc6ba245734131eb1ee9645269db7338e SHA256 2a934de5f1649633f656014b95f342029de034fd3c7a7057d6d3164201b97579
 AUX META.camlimages.in 850 RMD160 25b79bc73cdc1010ee62efe8f0ce5ae557f6cad7 SHA1 8f77fbe9f52b44bc054876040e58bc803ca54e5a SHA256 0303478d950eb12bcbc9dbab8b315830d9b60a757fb9c770fe505b609a103a66
 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-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
 DIST camlimages-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
@@ -11,6 +15,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 2060 RMD160 a6919fbe0b600dea4e80befd52cc4378c60743e4 SHA1 b33aefe88e241fbc4ea27eb92de1b0ae25cacbca SHA256 2fe138f59365de3e9be98da58fb4cb838eb2dcc256b4bce29f977c6aa035fa1f
 EBUILD camlimages-3.0.1.ebuild 1334 RMD160 2920462ba7081710b889c6b63ec6a8975e261806 SHA1 64b8af161384e3246a5c5fb15cd4e648758a0ced SHA256 731d6f76cf742fed67c4ce82c5a2ff4c33b2b52870b06f5d7720b164d51df3a6
-EBUILD camlimages-3.0.2.ebuild 1430 RMD160 0e2ed571ecee8d4a20498d80d704717aa4be9d40 SHA1 d6050cab1c5c72b33e0f4a1151d6a270dd82ced4 SHA256 3622ed1c7e4959fec9f93b548f5779b0a084c9765a2f91d3686e35b2aea86cfb
-MISC ChangeLog 4124 RMD160 99bc20b44a3bd457c78897d779aa9f4cefa805d4 SHA1 e5c59025d758d27f923e842cf7293d69cc98cc2f SHA256 d4d51f953f677d8c0848273a7eb11e966cb24aac9a4f436a0420dbbc132752d4
+EBUILD camlimages-3.0.2.ebuild 1474 RMD160 75b531e7eb88d0025cbcee3b13da237e2900a83f SHA1 905a2e00ffe0a1de175368c79cd184f661686360 SHA256 51ee6ae2413563ccbb6912698206e14d29175fedd3cc53a8dedd064a6d3084de
+MISC ChangeLog 4283 RMD160 a04a76dedc29d6ddf0dd243001e7a7ab32383ced SHA1 e678e0993edb6ec2ace9a7205a5598444bcd1807 SHA256 c415f09932facc9977cad07b96ac6b69a83bdb0d6edba0ca38265c599c99f285
 MISC metadata.xml 250 RMD160 598e56c53e73f20d9f66aa719a344dd151d72e00 SHA1 eb18ff902a727aa9352e813aacb53831c43a36f0 SHA256 5e4fa04a77d47a0f481ef815f7a82527865397a89ffd15b3288c7d9559644b42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvCutwACgkQvFcC4BYPU0qJhACeITiI8kP58TTUu0PiW06vfha0
+F0cAoJvaMbQFLXpc0chxqBKrsBRY6PAc
+=qxjr
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild
index 50020dc1b874..d464b34f2060 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
+# Copyright 1999-2010 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.4 2009/12/26 17:34:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.5 2010/04/12 06:16:54 aballier Exp $
 
 EAPI=2
 
@@ -34,6 +34,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-tiffread-CVE-2009-3296.patch"
 	epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch"
 	epatch "${FILESDIR}/${P}-annot.patch"
+	epatch "${FILESDIR}/${P}-noxpm.patch"
 	eautoreconf
 }
 
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch b/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch
new file mode 100644
index 000000000000..8c30167febe8
--- /dev/null
+++ b/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch
@@ -0,0 +1,16 @@
+Index: camlimages-3.0.2/src/Makefile.am
+===================================================================
+--- camlimages-3.0.2.orig/src/Makefile.am
++++ camlimages-3.0.2/src/Makefile.am
+@@ -185,7 +185,10 @@ CSOURCES += ftintf.c
+ AM_CFLAGS += $(INCFREETYPE)
+ endif
+ 
+-ocamlsitelib_DATA += units.cmi oXpm.cmi
++ocamlsitelib_DATA += units.cmi
++if HAVE_XPM
++ocamlsitelib_DATA += oXpm.cmi
++endif
+ if HAVE_TIFF
+ ocamlsitelib_DATA += oTiff.cmi
+ endif