fix build without ocamlopt, bug #543532

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 44 insertions, 13 deletions

diff --git a/dev-ml/ocamlsdl/ChangeLog b/dev-ml/ocamlsdl/ChangeLog
index 428d2a4534ee..2d040def5f0b 100644
--- a/dev-ml/ocamlsdl/ChangeLog
+++ b/dev-ml/ocamlsdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocamlsdl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.24 2013/03/03 14:48:44 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.25 2015/03/17 15:58:49 aballier Exp $
+
+  17 Mar 2015; Alexis Ballier <aballier@gentoo.org> ocamlsdl-0.9.1.ebuild,
+  +files/ocamlopt.patch:
+  fix build without ocamlopt, bug #543532
 
   03 Mar 2013; Alexis Ballier <aballier@gentoo.org> ocamlsdl-0.9.1.ebuild:
   eapi5: define subslot and use slot deps. cosmetics.
diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index 2deb75ea2554..78b16a569ad3 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ocamlopt.patch 818 SHA256 2f225ec6233419c3fe6ee6ed7803d4a34dba053f17ed75a9539b1f7ee4293b6c SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73 WHIRLPOOL 3a965ea8fa7922b2ddccd05814dfce61e2101e80194c07ae66b43013e704065391132fb7db426fb90035714497a56d23fe0e272f60cd6837101cb30a9e001b8e
 DIST ocamlsdl-0.9.1.tar.gz 226085 SHA256 abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a WHIRLPOOL f9bf44f6d63626bbae3621100b7ed19ad6eaf392f1e9d2ef39440b17ac279b92a5156bff9cf432e3241fd5ec2419a7f002602405d13d6fb1b0bdbcd0baf233d8
-EBUILD ocamlsdl-0.9.1.ebuild 1362 SHA256 18c8e64193d850478ce05dfeb06c228b80f8d6ff65353f701ba28d9bf19e6f39 SHA512 c2d410b58f4c669d64219d826cf7925022fa5b4518fe5538d60595ab1d94d600069ba33c0f4dfd13f72554e108107cc6936c68e5345bfb6625c5c69e2622c03b WHIRLPOOL 772b947eb742c24540d1c159d0af4df207a391a0b91e15452e6a84ee476f0fa175693d9139cf48071c5d301ca81947be06a4a2690f005eb91d7d188b0ea1dd90
-MISC ChangeLog 3130 SHA256 22a8f3858e29c1bd354d7f35668cadfecd02d192957dbb07e0f86441f73288b5 SHA512 b649f7069c5a30fe2ca8e851142a7f8c23c95a357b0f30ebb5c2c881d67f0acccc8ad3618d509da70db5090c96d516239c8d2031e71659290c72492e9168788c WHIRLPOOL 2ddbd6c9fbf48427245794c2ced77a4716e6ddccbf120a5179d0fa47672fe663ad2ebb5fe07820458224a88e98fac68a1225c22fcacec2f076a312759c3458de
+EBUILD ocamlsdl-0.9.1.ebuild 1446 SHA256 958ba4be3869932dc7d202073e1f282d5cf7af762e8547baaa71c81fbf075c3a SHA512 293ad05ca2df661b0bdf7cabf1be5c29b4346c03e20a449bf08dbb7c573b477ce16061e01516a198e3159965387ef43871977ee4d36e8d3682a120b8c4caa6e1 WHIRLPOOL 33a729ff618b4d11ad20bdfc56fb66d473d1787575d383da21ecf6dd0a151f70b22ad5633a7815b23f3e7db1bedaf7959526e52d363a2060da7e3a5785c36687
+MISC ChangeLog 3273 SHA256 eaa1f059514b1c35079089af7641f7cb7ed99664e41ac25233c505829596934e SHA512 2f45a83a83b1d9e40dddfb5d62972b6d3e3973b149b1de835aaa60b0c28efb016c0a58331e09de540be19b08827478bbe39fad1fc1975df909595ccc9682eaa7 WHIRLPOOL ba853a2f113179b583526e434a88156ba35c3627037b2b0d49fd586f2764152185e85ea560b18f14ebb0ae20976b6de8a9e82814146c4cb9fc4721a48e5f999a
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlEzYs0ACgkQvFcC4BYPU0pejgCgy9J750rQObHShhWmu+QcZZKg
-bfoAoMSDtB8ykwV0yv86dYGpUcasX9N3
-=upYt
+iEYEAREIAAYFAlUITzoACgkQvFcC4BYPU0pr4QCeNwgTyMMjLT/zn1jpGl7r6RUF
+CFsAn06v+t0wbOJ+z4jAVNQO5oR9lZ8i
+=DfEh
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlsdl/files/ocamlopt.patch b/dev-ml/ocamlsdl/files/ocamlopt.patch
new file mode 100644
index 000000000000..603654dceffa
--- /dev/null
+++ b/dev-ml/ocamlsdl/files/ocamlopt.patch
@@ -0,0 +1,22 @@
+Index: ocamlsdl-0.9.1/src/Makefile
+===================================================================
+--- ocamlsdl-0.9.1.orig/src/Makefile
++++ ocamlsdl-0.9.1/src/Makefile
+@@ -17,7 +17,7 @@ gfx_MODULES    = sdlgfx
+ 
+ TARGETS  = sdl.cma $(patsubst %,sdl%.cma,$(PARTS))
+ TARGETS += libsdlstub.$(A) $(patsubst %,libsdl%stub.$(A),$(PARTS))
+-ifdef OCAMLOPT
++ifneq ($(OCAMLOPT),no)
+ TARGETS += sdl.cmxa $(patsubst %,sdl%.cmxa,$(PARTS))
+ endif
+ 
+@@ -87,7 +87,7 @@ ifdef OCAMLFIND
+ install-findlib :
+ 	$(OCAMLFIND) install sdl ../META \
+           *.cma lib*.$(A) *.cmi *.mli \
+-          $(if $(OCAMLOPT),*.cmxa sdl*.$(A) *.cmx) \
++          $(if $(filter-out $(OCAMLOPT),no),*.cmxa sdl*.$(A) *.cmx) \
+           $(if $(OCAMLMKLIB),dll*.so)
+ ifeq ($(PLATFORM),Apple)
+ 	$(RANLIB) $$($(OCAMLFIND) printconf destdir)/sdl/*.$(A)
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
index b70eda7b3b02..e3623b148c7b 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild,v 1.4 2013/03/03 14:48:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild,v 1.5 2015/03/17 15:58:49 aballier Exp $
 
 EAPI=5
 
-inherit findlib
+inherit findlib eutils
 
 DESCRIPTION="OCaml SDL Bindings"
 
@@ -14,10 +14,10 @@ LICENSE="LGPL-2"
 
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ppc x86"
-IUSE="doc opengl truetype" #noimage nomixer
+IUSE="doc +ocamlopt opengl truetype" #noimage nomixer
 
 RDEPEND="
-	>=dev-lang/ocaml-3.04:=
+	>=dev-lang/ocaml-3.12:=[ocamlopt=]
 	>=media-libs/libsdl-1.2
 	opengl? ( >=dev-ml/lablgl-0.98:= )
 	>=media-libs/sdl-mixer-1.2
@@ -26,6 +26,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/ocamlopt.patch"
+}
+
 src_configure() {
 	myconf=""
 	if use opengl; then