Add support to not build with ocamlopt

Package-Manager: portage-2.1.4_rc14

4 files changed, 56 insertions, 18 deletions

diff --git a/dev-ml/ocaml-sqlite3/ChangeLog b/dev-ml/ocaml-sqlite3/ChangeLog
index 0e3e44aa81d0..08fcedb0e596 100644
--- a/dev-ml/ocaml-sqlite3/ChangeLog
+++ b/dev-ml/ocaml-sqlite3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocaml-sqlite3
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ChangeLog,v 1.2 2007/12/08 00:07:11 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ChangeLog,v 1.3 2008/01/02 21:23:59 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ocaml-sqlite3-0.23.0-noocamlopt.patch, ocaml-sqlite3-0.23.0.ebuild:
+  Add support to not build with ocamlopt
 
 *ocaml-sqlite3-0.23.0 (08 Dec 2007)
 
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 7da97c4b9421..7d30106348ed 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -5,20 +5,24 @@ AUX ocaml-sqlite3-0.22.0-destdir.patch 581 RMD160 06d5d7bbb8fad3e77145a4857540fe
 MD5 1ba4c863437a6d0c341abfb62f453d42 files/ocaml-sqlite3-0.22.0-destdir.patch 581
 RMD160 06d5d7bbb8fad3e77145a4857540fe244ff115a0 files/ocaml-sqlite3-0.22.0-destdir.patch 581
 SHA256 868795cc01eb64a135637900ed0edd965b3528b95660f0005f475f27d19da580 files/ocaml-sqlite3-0.22.0-destdir.patch 581
+AUX ocaml-sqlite3-0.23.0-noocamlopt.patch 762 RMD160 9c7377173caba3ec6b2692728163a5779c2a5a10 SHA1 2876e7a37a0179acd51d6bf6f4407ee608c68160 SHA256 d6e6aa74c11bf06c9a38333f5c7aa676ccc4cbe2867ecab68edc38ce30793366
+MD5 fcfc0871081e23fff037f58f3da92f53 files/ocaml-sqlite3-0.23.0-noocamlopt.patch 762
+RMD160 9c7377173caba3ec6b2692728163a5779c2a5a10 files/ocaml-sqlite3-0.23.0-noocamlopt.patch 762
+SHA256 d6e6aa74c11bf06c9a38333f5c7aa676ccc4cbe2867ecab68edc38ce30793366 files/ocaml-sqlite3-0.23.0-noocamlopt.patch 762
 DIST ocaml-sqlite3-0.22.0.tar.bz2 46117 RMD160 a15273f2d21881774d734033669a9c6a401493c1 SHA1 fce034d888daed0d2674de09f881db46c0233eda SHA256 6b3f8b7eae5af5c4cfe5a07bdbd3019ac4c7b5c969df4938c911bee5e02c94ee
 DIST ocaml-sqlite3-0.23.0.tar.bz2 46082 RMD160 c0358b12f1e82ad30ba26c30aa7508ec6aa9316d SHA1 f4c9957030d736bc8a7864de3f032a4f15a91c77 SHA256 4faacc137bcc8c516d018bcf8495d44a62747a0facb85ac217aa00ac4e289d77
 EBUILD ocaml-sqlite3-0.22.0.ebuild 1045 RMD160 37265418e131a7ae60aa8e66f2e7fcfe441df34c SHA1 493a681754a3f37019a8803f6f1a3fbead381522 SHA256 e179dd51ddf49589a29a8539b698f24941f5b296875193b65083c716d69021f0
 MD5 1333359d1ddb737590f4ad2069b34d34 ocaml-sqlite3-0.22.0.ebuild 1045
 RMD160 37265418e131a7ae60aa8e66f2e7fcfe441df34c ocaml-sqlite3-0.22.0.ebuild 1045
 SHA256 e179dd51ddf49589a29a8539b698f24941f5b296875193b65083c716d69021f0 ocaml-sqlite3-0.22.0.ebuild 1045
-EBUILD ocaml-sqlite3-0.23.0.ebuild 1053 RMD160 e1840252c19ffa0c5f028eab9b2711b6e382d379 SHA1 b6df393970aa93ffe1195c2a11ffc781a578f323 SHA256 566fefe92d895f3a8b6b45ff260a07c2fc998bec3598d6f83a15a7892da0c2ce
-MD5 57f29ef762013c42a5ce174a6476ec53 ocaml-sqlite3-0.23.0.ebuild 1053
-RMD160 e1840252c19ffa0c5f028eab9b2711b6e382d379 ocaml-sqlite3-0.23.0.ebuild 1053
-SHA256 566fefe92d895f3a8b6b45ff260a07c2fc998bec3598d6f83a15a7892da0c2ce ocaml-sqlite3-0.23.0.ebuild 1053
-MISC ChangeLog 698 RMD160 782f6d12f6503af4ee58fc2e5b51a7e511f92625 SHA1 59583425401f1d4e0995301571a6057fac9acb1d SHA256 9326c1bbcf5f79b99c2afa4dec7a461e6a2fa294fe3f58c8bbc48a95e3e85b7d
-MD5 1657248e2a4f99871f430304a9e78e9e ChangeLog 698
-RMD160 782f6d12f6503af4ee58fc2e5b51a7e511f92625 ChangeLog 698
-SHA256 9326c1bbcf5f79b99c2afa4dec7a461e6a2fa294fe3f58c8bbc48a95e3e85b7d ChangeLog 698
+EBUILD ocaml-sqlite3-0.23.0.ebuild 1506 RMD160 09c5942c7b3872373dbc0752a60765dcc42150bb SHA1 7a3fa0e3df81b168744ad3488aa468dff4a5274f SHA256 37dacab4de89ab6187c023d22f0256147b375c1bb3f890076c2649ac5e620a24
+MD5 4dad60e07cc0933187d169e6f6356dc5 ocaml-sqlite3-0.23.0.ebuild 1506
+RMD160 09c5942c7b3872373dbc0752a60765dcc42150bb ocaml-sqlite3-0.23.0.ebuild 1506
+SHA256 37dacab4de89ab6187c023d22f0256147b375c1bb3f890076c2649ac5e620a24 ocaml-sqlite3-0.23.0.ebuild 1506
+MISC ChangeLog 869 RMD160 97dc3b889989327b81cf7fdbdf5b8bf7b9f412fc SHA1 e73d2d9bab39ae8bb88eaf4b41b4cf441b51db3c SHA256 de5c99073eaa92ef73ffb6f7afc870ebba9c328323fdd44e3caee3c3e267c9e4
+MD5 bd1cd0f41122c592a612c146dfd0355c ChangeLog 869
+RMD160 97dc3b889989327b81cf7fdbdf5b8bf7b9f412fc ChangeLog 869
+SHA256 de5c99073eaa92ef73ffb6f7afc870ebba9c328323fdd44e3caee3c3e267c9e4 ChangeLog 869
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -30,9 +34,9 @@ MD5 88cf8c8d9ce1218a8fc0b820fed7b05a files/digest-ocaml-sqlite3-0.23.0 262
 RMD160 a6bada8981a2423679ecba8f0efa02f7c25a66f4 files/digest-ocaml-sqlite3-0.23.0 262
 SHA256 55d6d6af71815812355b1d15c2ed95a59c93018c225c88443c279a2e6654af12 files/digest-ocaml-sqlite3-0.23.0 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHWeBGvFcC4BYPU0oRAu5qAKCEDN0qvZxNrkflJl6WMNjXUfKipgCeM/aN
-DqpWjx2l0nezr2WGf2r7CuU=
-=kxCR
+iEYEARECAAYFAkd8APYACgkQvFcC4BYPU0oDHwCgyyCT8aqX/FpQMvtLSHHxsWb2
+pdsAoJaq82xUSURYncUKw/GpSnVcF5t2
+=f6IR
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.23.0-noocamlopt.patch b/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.23.0-noocamlopt.patch
new file mode 100644
index 000000000000..cac7e4700446
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/files/ocaml-sqlite3-0.23.0-noocamlopt.patch
@@ -0,0 +1,16 @@
+Index: ocaml-sqlite3-0.23.0/Makefile.in
+===================================================================
+--- ocaml-sqlite3-0.23.0.orig/Makefile.in
++++ ocaml-sqlite3-0.23.0/Makefile.in
+@@ -33,9 +33,9 @@ distclean: clean
+ 
+ # install rebuilds sqlite3top to point to the findlib-managed dll and not the
+ # one in .
+-install: sqlite3.cma sqlite3.cmxa sqlite3top
++install: sqlite3.cma sqlite3top
+ 	[ -f *.so ] && SO_FILES=*.so; \
+-	ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx $$SO_FILES
++	ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma $(wildcard *.cmxa *.a *.cmx) $$SO_FILES
+ 	ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma
+ 	$(INSTALL) -D sqlite3top $(DESTDIR)$(bindir)/sqlite3top
+ 
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-0.23.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-0.23.0.ebuild
index f3957044c867..e10b7f5c57c7 100644
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-0.23.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-0.23.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ocaml-sqlite3-0.23.0.ebuild,v 1.1 2007/12/08 00:07:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sqlite3/ocaml-sqlite3-0.23.0.ebuild,v 1.2 2008/01/02 21:23:59 aballier Exp $
 
 inherit findlib eutils
 
-IUSE="doc"
+EAPI="1"
+
+IUSE="doc +ocamlopt"
 
 DESCRIPTION="A package for ocaml that provides access to SQLite databases."
 SRC_URI="http://ocaml.info/ocaml_sources/${P}.tar.bz2"
@@ -19,16 +21,28 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 
+pkg_setup() {
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} 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}/${PN}-0.22.0-destdir.patch"
+	epatch "${FILESDIR}/${P}-noocamlopt.patch"
 }
 
 src_compile() {
 	econf
 	emake -j1 bytecode || die "make bytecode failed"
-	emake -j1 opt || die "make opt failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "make opt failed"
+	fi
 	if use doc; then
 		emake -j1 docs || die "make doc failed"
 	fi