From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 28 Nov 2014 16:40:21 +0000 (+0000)
Subject: add version for ocaml 4.02
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2acdb4c060078152aa01e1f603e879cf171cb7fe;p=gentoo.git

add version for ocaml 4.02

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
---

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index 18fe047d6aae..a2e775a8074b 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/findlib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.118 2014/10/27 08:40:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.119 2014/11/28 16:40:15 aballier Exp $
+
+*findlib-1.5.5-r1 (28 Nov 2014)
+
+  28 Nov 2014; Alexis Ballier <aballier@gentoo.org> +findlib-1.5.5-r1.ebuild,
+  +files/externalmeta.patch:
+  add version for ocaml 4.02
 
 *findlib-1.5.5 (27 Oct 2014)
 
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index f55298364184..5adcc42097a4 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX externalmeta.patch 525 SHA256 f608ac927267f4c52ee0ac3b139d252c448bdb07c69b9a08ad570f0d80ab321e SHA512 5e8d67e648c995a5c0f044bb422e2912a9fbe402738337b0e686b0761b94a5d7da8c03234441dbc4d524e9f8d97529b12f5e889a4838ca82635be003a6b016aa WHIRLPOOL 66bd9477ad046294381df5d3a956adf8bcaa65e764d602a5d2156650486d3a33f23ecf835921a8a5aef2af502a955c075afa806e8c72fc8ec1859c8dae4b3dfe
 DIST findlib-1.4.tar.gz 231526 SHA256 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b WHIRLPOOL 31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
 DIST findlib-1.5.5.tar.gz 240247 SHA256 aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d WHIRLPOOL f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76
 EBUILD findlib-1.4.ebuild 1639 SHA256 18ded35ad9d2cfd9284d70b03516325e0d36a81032a8f6fc9610d90010c787f6 SHA512 e6c68d7cfaec8a147c77fab113c1773ef78b31b84c0cec6e2eb069ad2d4031538996cdebaca606c1be98fe490859af6b0168957f53d68abd95ea8c6a83e8358f WHIRLPOOL 8d9c44f388ee2cf5802742736c6192a471840ce93048965b7e93e203b8073c52c497a4abe1d3ce2f827c7d470b80053e83fb006a6205758863686395c1123349
+EBUILD findlib-1.5.5-r1.ebuild 1751 SHA256 311fa6f1a50143427f77083f32436cae393c961cec49a897b3240a870059587c SHA512 cdfbc160b1129aa3646fcc1289075992191b498c41f7b9d9f90035df5b65c1c80d21c10f92afed3a1918a65e6bfd8f78a1dedafd03bb24457ebb315686886f0e WHIRLPOOL 5fb850cbfa3bff265460be85a73709a6531d54bc105df8cdd6212d8c05abc0a704ea4d3bf1c99c4bdb2823fa27a8bfd8ea6154710d96f77e09e5c643caa8e3ff
 EBUILD findlib-1.5.5.ebuild 1650 SHA256 6455c190cc1d1b939b035be284763546fe9c953e60a24cb861939122eb975ea8 SHA512 bae6f0c31fe863a5fd7ec2fbd9ae948bf726a2e39c858fcb22b0b49f1fc22d589da375eeb88db530190a4eec894fdb9e33c7c9c7ac324b9f4dfd64c4b4b58ad0 WHIRLPOOL 987c86200bbea80c22a83e5a911fee612ed74d820675c9554b3c6e72ba07ffb2d636ac01091961272701899d949352d3775657fae2a3e7c26d0439c4b1653ed1
-MISC ChangeLog 13469 SHA256 1b154282de69e220012fad9df09e38690fc005f5b4e663017a995d4feca4d8cd SHA512 ba8b90f3761fd4791d7ffb85643c16dc6533d668fc2b988974a3d35ae63230321f94a52605fd2c2a62f946bd9e016e9f33a33b8064c3e25d5b0affc00d7cf5eb WHIRLPOOL bda61893bc32263d3045acd3467880d1c01095ebcdb7fb70e6a7ca0776ee39aed63c312633f4dd94097f4da346665376e04c0cf90054b797f07df8725a158a44
+MISC ChangeLog 13639 SHA256 0fc10ab869f5eb61181c7f7f1b4995d89f40583071800503768efdebbc9f05c9 SHA512 52b775fcd6d8b061de25d2aa7b4e0655835a21b14a499828d2a8d2255f895ffe8373e4631a33855f0da7d9d8e62d69f4eb08cb0033f986bc5134b49001df4483 WHIRLPOOL 7cbc3bd6e97ca32f0c125bbd618c546079f8a541ad31a1f4f5198ca427063c59dbed22c5d251f41a3e893f112a8710e6b91127785ed7e5dd436a138d538d0bb2
 MISC metadata.xml 156 SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee SHA512 e8ee63fd086a54a8c1ff2cb6b8f976c894602e5185c08cb4853487bb266a3c30a122e1e53fa5801574093dbf087135238e1bb465ec491fce1b0d5c29274f2112 WHIRLPOOL 1bf739b8e8d41331e15ceef1b801643cd0ca79e3318e6eef7e927e8df7fa365b7893d2b4ee36db3776ce4a590fbfb1fb71fc2f1f5f66abf5ad3483840c9f4020
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlROBRQACgkQvFcC4BYPU0oE+gCgxXAI6nyX8dbO9wH2MfMgk59b
-u1oAnjk1fK8sEczXi87esyIuiIeYJQPR
-=4VXw
+iEYEAREIAAYFAlR4pXAACgkQvFcC4BYPU0omwgCgjEkLYmRMW4s3+YYtqwJHLNOx
+YOoAnRg6lGTMbTU0XGrIZyZaklpGhR/C
+=G4CZ
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/files/externalmeta.patch b/dev-ml/findlib/files/externalmeta.patch
new file mode 100644
index 000000000000..e391bf0fb1ec
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.5.5/configure
+===================================================================
+--- findlib-1.5.5.orig/configure
++++ findlib-1.5.5/configure
+@@ -515,7 +515,7 @@ fi
+ 
+ # Generate the META files now.
+ 
+-l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
++l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $lobuild $lcomplibs $lbytes"
+ 
+ for dir in site-lib-src/*; do
+     # We do not really know if $dir is a directory.
diff --git a/dev-ml/findlib/findlib-1.5.5-r1.ebuild b/dev-ml/findlib/findlib-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..061e8c929319
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.5.5-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.5.5-r1.ebuild,v 1.1 2014/11/28 16:40:15 aballier Exp $
+
+EAPI=5
+
+inherit multilib eutils
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+stublibs="${ocamlfind_destdir}/stublibs"
+
+src_prepare() {
+	epatch "${FILESDIR}/externalmeta.patch"
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		-no-custom \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt # optimized code
+	fi
+}
+
+src_install() {
+	emake prefix="${D}" install
+
+	dodir "${stublibs#${EPREFIX}}"
+
+	cd "${S}/doc"
+	dodoc QUICKSTART README DOCINFO
+	use doc && dohtml -r ref-html guide-html
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}