version bump, allow building without ocamlopt

Package-Manager: portage-2.1.4_rc14

5 files changed, 123 insertions, 10 deletions

diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index f0013436e0a7..d96d435eb0ea 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlgraph
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ChangeLog,v 1.5 2007/05/26 19:34:05 aballier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ChangeLog,v 1.6 2008/01/04 01:27:16 aballier Exp $
+
+*ocamlgraph-0.99b (04 Jan 2008)
+
+  04 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/ocamlgraph-0.99b-installfindlib.patch, +ocamlgraph-0.99b.ebuild:
+  version bump, allow building without ocamlopt
 
 *ocamlgraph-0.98 (26 May 2007)
 
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 2648b8f0db1b..5e0a9a34cc2f 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,9 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ocamlgraph-0.99b-installfindlib.patch 657 RMD160 0d76836ecef787ffbd60f01400e1aadcb01f6b0e SHA1 567bf97a809838ff1a3c444e9d0a3e085c1dc019 SHA256 b3a0bc51a64d1ef13d0a83e897620ead573c38c4185e46b1e0e34e58fa3f565a
+MD5 f4eada5ca32afbe565dd990d3b4e7226 files/ocamlgraph-0.99b-installfindlib.patch 657
+RMD160 0d76836ecef787ffbd60f01400e1aadcb01f6b0e files/ocamlgraph-0.99b-installfindlib.patch 657
+SHA256 b3a0bc51a64d1ef13d0a83e897620ead573c38c4185e46b1e0e34e58fa3f565a files/ocamlgraph-0.99b-installfindlib.patch 657
 DIST ocamlgraph-0.81.tar.gz 97467 RMD160 f40cd97a1b397a23eabec1c13e9f870e967cf150 SHA1 e27daea0cdee945e54ccccc307da526a1f3a9a9b SHA256 0612a7e0c421090163f20da20436a2dc37f09a3834b73c3407c919e861993adf
 DIST ocamlgraph-0.95.tar.gz 95736 RMD160 3fe83761f7757d609f8b968ffb77791966fe3b15 SHA1 3faa0730d6621ac4863778f7407ea098bcb58a43 SHA256 d247716b016b5da3fda7559f3ce223ceae1732872e4718e134c46c0779e7d64f
 DIST ocamlgraph-0.98.tar.gz 109436 RMD160 a79e81e595a9eca0793f2c3ef7c9cf1550b45bd3 SHA1 cd5ed6a0432e1efaf457c2afcf8fefb4ec671e65 SHA256 4d3db054d1cf133ef4287f2f34f296f8c1ecca6e8575aef262a8e2507368bf36
+DIST ocamlgraph-0.99b.tar.gz 175958 RMD160 72f48b2f89b2dd9025326c2ec7f7f60291b5ac95 SHA1 e6987832b55c69cc195c7c2334a1f1913fc5299b SHA256 c4a646cfd152791268d9c2716c5e1c55bf3f39e8637a85f3c3937e3dd4dafec7
 EBUILD ocamlgraph-0.81.ebuild 751 RMD160 3021a11e916b74ace8cc53939612e448adbe5cb9 SHA1 648663c6803ecde26afbd6d55304bd32aaf4adb6 SHA256 f4e3110a4c82e029fd02229d5eab94fe3ffb27e44109f074566201191be80ce8
 MD5 a95671f2957b60fffe153322389ab6f6 ocamlgraph-0.81.ebuild 751
 RMD160 3021a11e916b74ace8cc53939612e448adbe5cb9 ocamlgraph-0.81.ebuild 751
@@ -16,10 +21,14 @@ EBUILD ocamlgraph-0.98.ebuild 755 RMD160 d780b7510a98bcab37ff97f576619ed6db94c27
 MD5 a67adff9b512af5ca31ea40cc8b5ecb1 ocamlgraph-0.98.ebuild 755
 RMD160 d780b7510a98bcab37ff97f576619ed6db94c271 ocamlgraph-0.98.ebuild 755
 SHA256 0d7c62c563e86d760e09e16208eff810ede4b2df0f71a40f5d0d7f9d96c6a574 ocamlgraph-0.98.ebuild 755
-MISC ChangeLog 1034 RMD160 3d95d69f9b762fec8fab1e603bf4333ba9df101f SHA1 bb3c5b97632adba57cc51f07238f4118475b3156 SHA256 e13ea4f613ea99ab1cc7cf593924f1dfc7f2d6f13848da7671109814f3ebe1c1
-MD5 e8e2bac3224a9bc6d289e3fc401bb3c5 ChangeLog 1034
-RMD160 3d95d69f9b762fec8fab1e603bf4333ba9df101f ChangeLog 1034
-SHA256 e13ea4f613ea99ab1cc7cf593924f1dfc7f2d6f13848da7671109814f3ebe1c1 ChangeLog 1034
+EBUILD ocamlgraph-0.99b.ebuild 1812 RMD160 871ca3cba2e58cd98ab00a47a887ffd971977196 SHA1 22c87f6733cf3f4e7a9481f78dd6f96c08c53fad SHA256 2f6b2a6371a1d4add9142cc36d0da48c25ac41a8d97edbf89571d7c5cbcc7890
+MD5 ac48bb98081d164bb7ff39ee37efef33 ocamlgraph-0.99b.ebuild 1812
+RMD160 871ca3cba2e58cd98ab00a47a887ffd971977196 ocamlgraph-0.99b.ebuild 1812
+SHA256 2f6b2a6371a1d4add9142cc36d0da48c25ac41a8d97edbf89571d7c5cbcc7890 ocamlgraph-0.99b.ebuild 1812
+MISC ChangeLog 1242 RMD160 715c518d03c1c71e4bd83c401434302f29f33fcf SHA1 583623ef4164a67e97cad3fe26d1717e355ba9dd SHA256 200e2e46c41fed4ad110db5ee1bf56fd7ff356e5fadfcc543fed30c45b4cfb93
+MD5 02b51bc75aee2e1fbf0ad36475571524 ChangeLog 1242
+RMD160 715c518d03c1c71e4bd83c401434302f29f33fcf ChangeLog 1242
+SHA256 200e2e46c41fed4ad110db5ee1bf56fd7ff356e5fadfcc543fed30c45b4cfb93 ChangeLog 1242
 MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 RMD160 30153301a2a5cca5547a6e47941aae2895837613 metadata.xml 157
@@ -33,10 +42,13 @@ SHA256 b7a6b8876fe8cfa7a92dfe344dcb87290af4746ae7ed8774052d087eedc06f27 files/di
 MD5 1c5455750aba5b4a041c5129a28ee811 files/digest-ocamlgraph-0.98 247
 RMD160 a7d397e4a0b0dde7d34486eb1af9660cb4179c9d files/digest-ocamlgraph-0.98 247
 SHA256 7a158439bf762c7a433a14f8f074926a1811bcbb7d1d1fbc68e34198a8886604 files/digest-ocamlgraph-0.98 247
+MD5 51985fdb98b2269c0582c0607f8ccba8 files/digest-ocamlgraph-0.99b 250
+RMD160 a75560cc896d7d364c1956b55fe45bac9faae96a files/digest-ocamlgraph-0.99b 250
+SHA256 11fe4df7ae5bfb069eb8a2f89f39add48847b218e662b52ccb13419047dca1f1 files/digest-ocamlgraph-0.99b 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGWIu2vFcC4BYPU0oRAl2TAKCpqEdj3bok9yXTv62xMv0i+n65/gCeN4xJ
-BSq89Kuk0QYTBHCVUvqMZLM=
-=zXWe
+iEYEARECAAYFAkd9i4AACgkQvFcC4BYPU0qmhgCfUu4o1uDZFCiKo0z+/C2tMqy5
+FVsAoM1PSZksdyaQFy6lgkeLqvTZ1a5w
+=/AYF
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlgraph/files/digest-ocamlgraph-0.99b b/dev-ml/ocamlgraph/files/digest-ocamlgraph-0.99b
new file mode 100644
index 000000000000..a3d825707350
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/digest-ocamlgraph-0.99b
@@ -0,0 +1,3 @@
+MD5 21c2b980fc541d6a277f73263b322772 ocamlgraph-0.99b.tar.gz 175958
+RMD160 72f48b2f89b2dd9025326c2ec7f7f60291b5ac95 ocamlgraph-0.99b.tar.gz 175958
+SHA256 c4a646cfd152791268d9c2716c5e1c55bf3f39e8637a85f3c3937e3dd4dafec7 ocamlgraph-0.99b.tar.gz 175958
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-0.99b-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-0.99b-installfindlib.patch
new file mode 100644
index 000000000000..5c68c0c15a2d
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/ocamlgraph-0.99b-installfindlib.patch
@@ -0,0 +1,21 @@
+Index: ocamlgraph-0.99b/Makefile.in
+===================================================================
+--- ocamlgraph-0.99b.orig/Makefile.in
++++ ocamlgraph-0.99b/Makefile.in
+@@ -208,10 +208,14 @@ install-byte: 
+ install-opt: install-byte
+ 	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(OCAMLLIB)"
+ 
++ifneq ($(OCAMLOPT),no)
++INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA)
++endif
++
+ install-findlib: META
+ ifdef OCAMLFIND
+-	$(OCAMLFIND) install ocamlgraph META *.mli \
+-		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
++	$(OCAMLFIND) install ocamlgraph META src/*.mli lib/*.mli \
++		$(INSTALL_OPT) graph.cmo graph.cmi $(CMA)
+ endif
+ 
+ # documentation
diff --git a/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild b/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild
new file mode 100644
index 000000000000..3fd7912ac7af
--- /dev/null
+++ b/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild,v 1.1 2008/01/04 01:27:16 aballier Exp $
+
+inherit findlib eutils
+
+EAPI="1"
+
+DESCRIPTION="O'Caml Graph library"
+HOMEPAGE="http://www.lri.fr/~filliatr/ocamlgraph/"
+SRC_URI="http://www.lri.fr/~filliatr/ftp/ocamlgraph/${P}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND=">=dev-lang/ocaml-3.08
+	doc? ( dev-tex/hevea dev-ml/ocamlweb )
+	gtk? ( dev-ml/lablgtk )"
+IUSE="doc examples gtk +ocamlopt"
+
+ocamlgraph_need_use() {
+	if ! built_with_use --missing true $1 $2; then
+		eerror "In order to build ${PN} with your useflags you first need to build $1 with $2 useflag"
+		die "Please install $1 with $2 useflag"
+	fi
+}
+
+pkg_setup() {
+	use ocamlopt && ocamlgraph_need_use 'dev-lang/ocaml' ocamlopt
+	use gtk && ocamlgraph_need_use 'dev-ml/lablgtk' gnomecanvas
+	use ocamlopt && use gtk && ocamlgraph_need_use 'dev-lang/lablgtk' ocamlopt
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-installfindlib.patch"
+}
+
+src_compile() {
+	econf
+	emake -j1 || die "failed to build"
+
+	if use doc;	then
+		emake doc || die "making documentation failed"
+	fi
+	if use gtk; then
+		emake -j1 editor || die "compiling editor failed"
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+	emake install-findlib || die "make install failed"
+
+	if use gtk; then
+		if use ocamlopt; then
+			newbin editor/editor.opt ocamlgraph_editor || die "failed to install ocamlgraph_editor"
+		else
+			newbin editor/editor.byte ocamlgraph_editor || die "failed to install ocamlgraph_editor"
+		fi
+	fi
+	dodoc README CREDITS FAQ CHANGES
+	if use doc; then
+		dohtml doc/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}