version bump, allow to build without ocamlopt, install machine independant stuff in /usr/share

Package-Manager: portage-2.1.4_rc14

4 files changed, 91 insertions, 6 deletions

diff --git a/dev-lang/confluence/ChangeLog b/dev-lang/confluence/ChangeLog
index 4088fe044870..713c0c8dca91 100644
--- a/dev-lang/confluence/ChangeLog
+++ b/dev-lang/confluence/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/confluence
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/ChangeLog,v 1.5 2006/06/20 14:34:49 kingtaco Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/confluence/ChangeLog,v 1.6 2008/01/06 20:19:37 aballier Exp $
+
+*confluence-0.10.6 (06 Jan 2008)
+
+  06 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +confluence-0.10.6.ebuild:
+  version bump, allow to build without ocamlopt, install machine independant
+  stuff in /usr/share
 
   20 Jun 2006; Mike Doty <kingtaco@gentoo.org> confluence-0.9.1.ebuild:
   ~amd64 added
diff --git a/dev-lang/confluence/Manifest b/dev-lang/confluence/Manifest
index 2398f05caaf2..aa0a165867f9 100644
--- a/dev-lang/confluence/Manifest
+++ b/dev-lang/confluence/Manifest
@@ -1,16 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST confluence-0.10.6.tar.gz 118762 RMD160 a3aaebf4f8d4e80f72d810d60388a69877b9c26b SHA1 99c99705e6eea1739b1c93c32c03b7372231dd4f SHA256 7ab76a4183dae9f2429df5cb07b0df293c50cd947e3c051a6784561e8d3b3273
 DIST confluence-0.9.1.tar.gz 224326 RMD160 adf701cd9cbb406d18743831fe8227dc66ba4980 SHA1 3a6af3b87a41b11fa76133bff20ab023001480b0 SHA256 403de0ddd82822a170dc2b59bc93a852942b108070886f981cb86e35fbfbbb52
+EBUILD confluence-0.10.6.ebuild 2010 RMD160 55bfd914863196094346be14685ac1ee737b8ae1 SHA1 68886064129ad5d4ab7bd6970705ff6288fcec3e SHA256 f2e9558b00175726acd54e0cf5786569390c20b8544a0f481d038a5fec743d2f
+MD5 d26e08e705d4cb2c49df9e7ecfbfc56f confluence-0.10.6.ebuild 2010
+RMD160 55bfd914863196094346be14685ac1ee737b8ae1 confluence-0.10.6.ebuild 2010
+SHA256 f2e9558b00175726acd54e0cf5786569390c20b8544a0f481d038a5fec743d2f confluence-0.10.6.ebuild 2010
 EBUILD confluence-0.9.1.ebuild 726 RMD160 4cfd2a59d966f91733aabc36e93d2ee8d9fad3ab SHA1 ffac01d71d5e420b479945ef8498e787e667fc38 SHA256 b127ca07c67083c1e4aa0df442b460f477432d32ed7c7e7b1ba4fd1fa2ee6d6e
 MD5 bc30d48bdb1e84608c20e881adfe7815 confluence-0.9.1.ebuild 726
 RMD160 4cfd2a59d966f91733aabc36e93d2ee8d9fad3ab confluence-0.9.1.ebuild 726
 SHA256 b127ca07c67083c1e4aa0df442b460f477432d32ed7c7e7b1ba4fd1fa2ee6d6e confluence-0.9.1.ebuild 726
-MISC ChangeLog 879 RMD160 699ee858d46f8200e4a2ba345bdb081f3dc6927e SHA1 d65a87b0c375138e8a81d35a1da1bc1effea5ce0 SHA256 b742aa8d95de4ccbfd9d9ac8ef98cae8a5fa1291697d0217e61bd240a31d78c2
-MD5 ebb900961b9930b918dda628c7129f55 ChangeLog 879
-RMD160 699ee858d46f8200e4a2ba345bdb081f3dc6927e ChangeLog 879
-SHA256 b742aa8d95de4ccbfd9d9ac8ef98cae8a5fa1291697d0217e61bd240a31d78c2 ChangeLog 879
+MISC ChangeLog 1094 RMD160 35c6bf85ca3e776e247781d340fc3aaf6c10ddd3 SHA1 6fb475846eb3e4b87c1baf8214f9cb00b617f393 SHA256 a9447d88648f648427cf7ced58bb3a878312292de9cc2c07a3f2ff15263eeeb0
+MD5 eccf5f2f2cba7f5c4a6c54247cd835be ChangeLog 1094
+RMD160 35c6bf85ca3e776e247781d340fc3aaf6c10ddd3 ChangeLog 1094
+SHA256 a9447d88648f648427cf7ced58bb3a878312292de9cc2c07a3f2ff15263eeeb0 ChangeLog 1094
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 metadata.xml 155
+MD5 b2d492c4649d6a31bd665189cf719a68 files/digest-confluence-0.10.6 253
+RMD160 a6ec17a0235f36ad50145fc5f59c1eb340901c20 files/digest-confluence-0.10.6 253
+SHA256 6f983fa48946e435f121043169925c357f22e6bf85ee5ddd40a978f72447b2ed files/digest-confluence-0.10.6 253
 MD5 0aa69d0b7e592377854c1da71c7b3957 files/digest-confluence-0.9.1 250
 RMD160 5bfb7e03e6cbfb66bdabe98e9d2c76819a66de87 files/digest-confluence-0.9.1 250
 SHA256 71e6f4f35f478774abb334596e9c93dc01a93956497ead43075f211d304d9ed5 files/digest-confluence-0.9.1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeBN+4ACgkQvFcC4BYPU0qasgCdGqnSV260/ugf+/mTNw4zmCit
+AJwAn3WMIClZRBJ6YplPFV5nJJa7gs0o
+=3WBr
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/confluence/confluence-0.10.6.ebuild b/dev-lang/confluence/confluence-0.10.6.ebuild
new file mode 100644
index 000000000000..de2f69396274
--- /dev/null
+++ b/dev-lang/confluence/confluence-0.10.6.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-lang/confluence/confluence-0.10.6.ebuild,v 1.1 2008/01/06 20:19:37 aballier Exp $
+
+inherit eutils
+
+EAPI="1"
+
+DESCRIPTION="a functional programming language for reactive system design (digital logic, hard-real-time software)"
+HOMEPAGE="http://www.funhdl.org/wiki/doku.php?id=confluence"
+SRC_URI="http://www.funhdl.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+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}"
+	# Install non binary stuff in share...
+	sed -i -e "s:lib/confluence:share/confluence:" Makefile || die "failed to sed the makefile"
+	sed -i -e "s:lib/confluence:share/confluence:" src/cfeval/cf.ml || die "failed to sed ml files"
+	sed -i -e "s:lib/confluence:share/confluence:" src/cfeval/cfParserUtil.ml || die "failed to sed ml files"
+	if ! use ocamlopt; then
+		sed -i -e "s:cmxa:cma:" src/Makefile || die "failed to disable ocamlopt	support"
+		sed -i -e "s:cmx:cmo:" src/Makefile || die "failed to disable ocamlopt	support"
+	fi
+}
+
+src_compile() {
+	if use ocamlopt; then
+		emake -j1 PREFIX="${D}/usr" OCAMLLIB=`ocamlc -where` || die "failed to build"
+	else
+		emake -j1 OCAMLOPT="ocamlc" OCAMLC="ocamlc" PREFIX="${D}/usr" OCAMLLIB=`ocamlc -where` || die "failed to build"
+	fi
+}
+
+src_install() {
+	emake -j1 PREFIX="${D}/usr" OCAMLLIB=`ocamlc -where` install || die "install failed"
+	echo "CF_LIB=/usr/share/confluence" > "${T}/99${PN}"
+	doenvd "${T}/99${PN}"
+	dodoc NEWS
+}
diff --git a/dev-lang/confluence/files/digest-confluence-0.10.6 b/dev-lang/confluence/files/digest-confluence-0.10.6
new file mode 100644
index 000000000000..f47264b1e629
--- /dev/null
+++ b/dev-lang/confluence/files/digest-confluence-0.10.6
@@ -0,0 +1,3 @@
+MD5 5cd7420e78f0258ea33ccbb328ea67ee confluence-0.10.6.tar.gz 118762
+RMD160 a3aaebf4f8d4e80f72d810d60388a69877b9c26b confluence-0.10.6.tar.gz 118762
+SHA256 7ab76a4183dae9f2429df5cb07b0df293c50cd947e3c051a6784561e8d3b3273 confluence-0.10.6.tar.gz 118762