version bump, allow to build without ocamlopt

Package-Manager: portage-2.1.4_rc14

4 files changed, 81 insertions, 10 deletions

diff --git a/dev-ml/res/ChangeLog b/dev-ml/res/ChangeLog
index cb7ce3c45ab4..b059970274e0 100644
--- a/dev-ml/res/ChangeLog
+++ b/dev-ml/res/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/res
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/ChangeLog,v 1.4 2007/02/09 07:37:56 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/ChangeLog,v 1.5 2008/01/04 02:19:53 aballier Exp $
+
+*res-2.2.5 (04 Jan 2008)
+
+  04 Jan 2008; Alexis Ballier <aballier@gentoo.org> +res-2.2.5.ebuild:
+  version bump, allow to build without ocamlopt
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-ml/res/Manifest b/dev-ml/res/Manifest
index 168e649dfeb7..7180dc421af3 100644
--- a/dev-ml/res/Manifest
+++ b/dev-ml/res/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 DIST res-2.1.1.tar.bz2 32675 RMD160 4532ec4dfb794177eb5546cb35f6625735d91848 SHA1 bea734d48e322379af7942188dd12af3fc293dfa SHA256 e2c7a453eec1067d8f15dc517fc9fafeae4561a8e27acf3932cb82d0d18de683
+DIST res-2.2.5.tar.bz2 33684 RMD160 767c73c2e83e7a2f592a03ca5091ce66fb04272c SHA1 b27c7d2673a6ec989edbb8af2d46aee20e6d33fa SHA256 66baf7fad87e0d57ce1f26aebcfa28dbcfabfb398e359541f8c0335122df0ac6
 EBUILD res-2.1.1.ebuild 755 RMD160 b36d770f5e5c52c31a1a0c09b5aabf03232f3d5e SHA1 e2312094478bc14389870fccf4e3ac612e631b5e SHA256 e122f3591d456dceb4ebe1cf4a22e8b82a517f44b2baa37d564777f4b5aedb60
 MD5 071652ee7fc48f6dac03bd9c4e1bb9a6 res-2.1.1.ebuild 755
 RMD160 b36d770f5e5c52c31a1a0c09b5aabf03232f3d5e res-2.1.1.ebuild 755
 SHA256 e122f3591d456dceb4ebe1cf4a22e8b82a517f44b2baa37d564777f4b5aedb60 res-2.1.1.ebuild 755
-MISC ChangeLog 802 RMD160 98ddf6d017c11c4f86c83497d4d885fac7e19f81 SHA1 d9c0a191065dd8da237222efbb569c615d555b34 SHA256 05fbec4e27ec7709dbe10e176886a75cfcdf45b101e5950aeafd4211f3ed14f2
-MD5 267663bfa696e7ac1b39c04dd842b6df ChangeLog 802
-RMD160 98ddf6d017c11c4f86c83497d4d885fac7e19f81 ChangeLog 802
-SHA256 05fbec4e27ec7709dbe10e176886a75cfcdf45b101e5950aeafd4211f3ed14f2 ChangeLog 802
+EBUILD res-2.2.5.ebuild 1472 RMD160 498b2923adf2ed7d91dc5ebf85faf85ed22ee6c6 SHA1 6577f3028ec66c04261d70946fdb68e610cf9466 SHA256 03fb380813d8697bb9a6087e18737ae18976dbe0e3294a4277dca7130d289cd7
+MD5 718991da06289d57ad985f584e9510ac res-2.2.5.ebuild 1472
+RMD160 498b2923adf2ed7d91dc5ebf85faf85ed22ee6c6 res-2.2.5.ebuild 1472
+SHA256 03fb380813d8697bb9a6087e18737ae18976dbe0e3294a4277dca7130d289cd7 res-2.2.5.ebuild 1472
+MISC ChangeLog 947 RMD160 01505ebb721c510146e7b2174b38007ffbe989f8 SHA1 58cd7f1d391625fbe0c8d062c372658684b6c534 SHA256 b84004439aa5d4d0f2ca9ca7fe9c26437d2da24b95c519141748f7e738be624e
+MD5 19a76f47b004bf9129b437071812fe5d ChangeLog 947
+RMD160 01505ebb721c510146e7b2174b38007ffbe989f8 ChangeLog 947
+SHA256 b84004439aa5d4d0f2ca9ca7fe9c26437d2da24b95c519141748f7e738be624e ChangeLog 947
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -17,10 +22,13 @@ SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 metadata
 MD5 b11f5118f36dd636453dc9ffbb1d411a files/digest-res-2.1.1 229
 RMD160 16d0c462def645b107a318053bbe8842388c3df5 files/digest-res-2.1.1 229
 SHA256 bd9783339694ea6d99c85f3e9071f0ec055c439343f44de74f9daf5cf4a992e1 files/digest-res-2.1.1 229
+MD5 b48c73b793acc89b30f373de8141f807 files/digest-res-2.2.5 229
+RMD160 2df48bbde635aa9b71caf077a4c229a259869d98 files/digest-res-2.2.5 229
+SHA256 a744b9cbf62e2c0eca2e823e1e8f6898e231db40eefed8fa2bab917b3375de15 files/digest-res-2.2.5 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFFzCTaAiZjviIA2XgRAgYGAJ9b0/6FE68efqG3ciyRm9iv2h8dSQCbBoun
-69mouxq8EVsYfUn+qp7489M=
-=gHbs
+iEYEARECAAYFAkd9l9YACgkQvFcC4BYPU0roOgCgjiZZagP6JWdG2L/HUgFTD+ZN
+kfwAn28kMTph91nRm/w35M3Q12ZtMA4P
+=2cou
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/res/files/digest-res-2.2.5 b/dev-ml/res/files/digest-res-2.2.5
new file mode 100644
index 000000000000..685673a7bb50
--- /dev/null
+++ b/dev-ml/res/files/digest-res-2.2.5
@@ -0,0 +1,3 @@
+MD5 6990499f7fa6dbc555c30e1324f66f28 res-2.2.5.tar.bz2 33684
+RMD160 767c73c2e83e7a2f592a03ca5091ce66fb04272c res-2.2.5.tar.bz2 33684
+SHA256 66baf7fad87e0d57ce1f26aebcfa28dbcfabfb398e359541f8c0335122df0ac6 res-2.2.5.tar.bz2 33684
diff --git a/dev-ml/res/res-2.2.5.ebuild b/dev-ml/res/res-2.2.5.ebuild
new file mode 100644
index 000000000000..adff88d0804c
--- /dev/null
+++ b/dev-ml/res/res-2.2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/res/res-2.2.5.ebuild,v 1.1 2008/01/04 02:19:53 aballier Exp $
+
+inherit findlib eutils
+
+EAPI="1"
+
+DESCRIPTION="Resizable Array and Buffer modules for O'Caml"
+HOMEPAGE="http://ocaml.info/home/ocaml_sources.html"
+SRC_URI="http://www.ocaml.info/ocaml_sources/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+
+DEPEND=">=dev-lang/ocaml-3.07"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples +ocamlopt"
+
+
+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_compile() {
+	cd "${S}/lib"
+	emake -j1 byte-code-library || die "failed to build byte code library"
+	if use ocamlopt; then
+		emake -j1 native-code-library || die "failed to built nativde code library"
+	fi
+
+	if use doc; then
+		emake htdoc || die "failed to build documentation"
+	fi
+}
+
+src_install () {
+	use ocamlopt || export OCAMLFIND_INSTFLAGS="-optional"
+	findlib_src_install
+
+	# install documentation
+	dodoc README TODO VERSION Changes
+
+	if use doc; then
+		dohtml lib/doc/res/html/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}