version bump, make ocamlopt optional, ~amd64

Package-Manager: portage-2.1.4_rc14

4 files changed, 90 insertions, 6 deletions

diff --git a/dev-ml/ocaml-mysql/ChangeLog b/dev-ml/ocaml-mysql/ChangeLog
index 86d14227bd63..43b6b6fa7a20 100644
--- a/dev-ml/ocaml-mysql/ChangeLog
+++ b/dev-ml/ocaml-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocaml-mysql
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.5 2006/11/23 17:14:59 vivo Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.6 2008/01/03 23:24:17 aballier Exp $
+
+*ocaml-mysql-1.0.4 (03 Jan 2008)
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +ocaml-mysql-1.0.4.ebuild:
+  version bump, make ocamlopt optional, ~amd64
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
   ocaml-mysql-1.0.3-r1.ebuild:
diff --git a/dev-ml/ocaml-mysql/Manifest b/dev-ml/ocaml-mysql/Manifest
index cc728f854fce..cdbdfab142d0 100644
--- a/dev-ml/ocaml-mysql/Manifest
+++ b/dev-ml/ocaml-mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ocaml-mysql-1.0.3-head.patch 1635 RMD160 2170d145833669fa344285ee26cea5857ba9015c SHA1 5872bbfc312eec1d668b6cdd284efb950afc874e SHA256 e0352eff5ff3e81858c0163eac18afe8f8d7f5811e51a47b0d6a1d497eea58a3
 MD5 000615b1a5a0999a580efdd6dadad829 files/ocaml-mysql-1.0.3-head.patch 1635
 RMD160 2170d145833669fa344285ee26cea5857ba9015c files/ocaml-mysql-1.0.3-head.patch 1635
@@ -11,14 +14,19 @@ MD5 d136e53521c22eb8b9f2987dfd19163d files/ocaml-mysql-1.0.3-shtool.patch 744
 RMD160 acbf08fa35e2018189a2a9a659f4eb071e6f2ff5 files/ocaml-mysql-1.0.3-shtool.patch 744
 SHA256 6757ad386f37f508112cec2a2434d6452fc0c3c22132c03af3fb955df61f6989 files/ocaml-mysql-1.0.3-shtool.patch 744
 DIST ocaml-mysql-1.0.3.tar.gz 111574 RMD160 7ede797411e201a4a29d9024d9e357d177bbf8ab SHA1 30ee07f8f8c2e0a242c440e67fbdd53f8c73096b SHA256 5c58a9db3a0ec522d878a172abc7a273fc26fb70a295184642188a785a2a01f8
+DIST ocaml-mysql-1.0.4.tar.gz 119584 RMD160 57b316fdbdd26762916859d04ab0ca15c1365203 SHA1 e8b7c2d84eee9ae798cd5dcd3ba68fc64c321f9b SHA256 59d11111558986f0ed237016f9758a3cb99e2fdd0ce0dc128319a3ac2a55259e
 EBUILD ocaml-mysql-1.0.3-r1.ebuild 896 RMD160 b12a1f59305924cad367e583e1df6f581aba55be SHA1 f3cde2a8c91a395b52c1221e9369185ae499c7bc SHA256 f8633524e7d8d4c522e948db2f86ee97d2cf459dd4881921aca60400e227540b
 MD5 919864d8e9a0d1c337bf24bf3618f91e ocaml-mysql-1.0.3-r1.ebuild 896
 RMD160 b12a1f59305924cad367e583e1df6f581aba55be ocaml-mysql-1.0.3-r1.ebuild 896
 SHA256 f8633524e7d8d4c522e948db2f86ee97d2cf459dd4881921aca60400e227540b ocaml-mysql-1.0.3-r1.ebuild 896
-MISC ChangeLog 1104 RMD160 989da6b1743d95f1697f89e081ee388b6b3b2731 SHA1 98e3a792ad6ef789bda910cedaa8e391f1191bd3 SHA256 8fe8ddde1c89cb27768600e9c0d722ccaa194805bc94316dd38ff0abb18df1d6
-MD5 769c076b81853dcd9581c891a60c0478 ChangeLog 1104
-RMD160 989da6b1743d95f1697f89e081ee388b6b3b2731 ChangeLog 1104
-SHA256 8fe8ddde1c89cb27768600e9c0d722ccaa194805bc94316dd38ff0abb18df1d6 ChangeLog 1104
+EBUILD ocaml-mysql-1.0.4.ebuild 1383 RMD160 74d5ad775008b0b25b13dc8a751d4114c367018b SHA1 a81882bb5d19d0ccdaaa8b591a48ad578384491c SHA256 a0b46f6661f3a05c86df92099aa80ff1d3549e00254a7a845ba09b8fcb59187d
+MD5 edea051efad4eddc1db3c46b80e187c4 ocaml-mysql-1.0.4.ebuild 1383
+RMD160 74d5ad775008b0b25b13dc8a751d4114c367018b ocaml-mysql-1.0.4.ebuild 1383
+SHA256 a0b46f6661f3a05c86df92099aa80ff1d3549e00254a7a845ba09b8fcb59187d ocaml-mysql-1.0.4.ebuild 1383
+MISC ChangeLog 1271 RMD160 1da18db78899ed5cba08c8109d1e3fa6ca1da322 SHA1 e69da1a0828f737471c488d798c56659c73c30d0 SHA256 6e5bfc77dc1fd06d3bb4be7ed05a291ab335e958e807c8f4dd2758e6382de395
+MD5 4f2b054de1e2941346e8b4223c197068 ChangeLog 1271
+RMD160 1da18db78899ed5cba08c8109d1e3fa6ca1da322 ChangeLog 1271
+SHA256 6e5bfc77dc1fd06d3bb4be7ed05a291ab335e958e807c8f4dd2758e6382de395 ChangeLog 1271
 MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 RMD160 30153301a2a5cca5547a6e47941aae2895837613 metadata.xml 157
@@ -26,3 +34,13 @@ SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 metadata
 MD5 247fbf3816b01b91e87feb51d347500a files/digest-ocaml-mysql-1.0.3-r1 253
 RMD160 ac2dc6d5edd7830826e62ef3fe831371c258dc0e files/digest-ocaml-mysql-1.0.3-r1 253
 SHA256 fb90861afc5baaa4c61704cc4ac566b3caaad994e079214feaacbf442eba014d files/digest-ocaml-mysql-1.0.3-r1 253
+MD5 d4fc570ab9fa378ce47de9c2763e785f files/digest-ocaml-mysql-1.0.4 253
+RMD160 8a611446d3d444c30fb8c889efcbfa52248de1c5 files/digest-ocaml-mysql-1.0.4 253
+SHA256 a4f33fa79bcb5623bce277ee4c637ec1e204a23f3edce75dbd1dfc7919e10d79 files/digest-ocaml-mysql-1.0.4 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd9bqwACgkQvFcC4BYPU0qB7gCgkT3nwbSUuSnxq2OoyFGwA8A7
+ca0AoKrm8NKrDEedqIi8VZYuD6PMxy+o
+=7E9t
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/ocaml-mysql/files/digest-ocaml-mysql-1.0.4 b/dev-ml/ocaml-mysql/files/digest-ocaml-mysql-1.0.4
new file mode 100644
index 000000000000..1e861035272a
--- /dev/null
+++ b/dev-ml/ocaml-mysql/files/digest-ocaml-mysql-1.0.4
@@ -0,0 +1,3 @@
+MD5 76f1282bb7299012669bf40cde78216b ocaml-mysql-1.0.4.tar.gz 119584
+RMD160 57b316fdbdd26762916859d04ab0ca15c1365203 ocaml-mysql-1.0.4.tar.gz 119584
+SHA256 59d11111558986f0ed237016f9758a3cb99e2fdd0ce0dc128319a3ac2a55259e ocaml-mysql-1.0.4.tar.gz 119584
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
new file mode 100644
index 000000000000..f62ee0e4d90f
--- /dev/null
+++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v 1.1 2008/01/03 23:24:17 aballier Exp $
+
+inherit findlib eutils
+
+EAPI="1"
+
+IUSE="doc +ocamlopt"
+
+DESCRIPTION="A package for ocaml that provides access to mysql databases."
+SRC_URI="http://raevnos.pennmush.org/code/${PN}/${P}.tar.gz"
+HOMEPAGE="http://raevnos.pennmush.org/code/ocaml-mysql/index.html"
+
+DEPEND=">=dev-lang/ocaml-3.06
+	>=virtual/mysql-4.0"
+
+RDEPEND="$DEPEND"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~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}-1.0.3-head.patch"
+	epatch "${FILESDIR}/${PN}-1.0.3-shtool-r1.patch"
+}
+
+src_compile()
+{
+	econf
+	emake all || die "make failed"
+	if use ocamlopt; then
+		emake opt || die "make opt failed"
+	fi
+}
+
+src_install()
+{
+	findlib_src_preinst
+	emake install || die "make install failed"
+
+	use doc && dohtml -r doc/html/*
+	dodoc CHANGES README VERSION
+}