gentoo resync : 15.01.2020

2 files changed, 75 insertions, 0 deletions

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index f19a3a7fe144..8d3e6c096f4e 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -4,7 +4,9 @@ AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c84
 DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24bb8daff4a58d0002d7962ab19c5635ebb0551f29f99f37f1e08acd8eaa4dcd99d213438ff7a77cfc36ddadedd1 SHA512 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
 DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
 DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
+DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
 EBUILD findlib-1.7.1.ebuild 1624 BLAKE2B f3717993b9faf6f698b3a04be49842982e4b449255762dc0892de4a99cb89d5480f23e3e40399a9c194c8a16cf4913a16bbcf8726b461d9acec592e1ef2177f9 SHA512 43e039f0884d02e67d5514dd9d64f1cc1dbf2440ffbe86f1ee0f0ccf33ff0d8dc3b09c2a1d37ac882db3abc1b1254cc0c061ec31e9b2a456ab62e852347dcdcc
 EBUILD findlib-1.7.2.ebuild 1633 BLAKE2B 53a3707037ac924c4fb6028af71c1197e27eb5a935ae49d4da4c4753d42dfdb4f004b32a22b9888a3612453536e06eb2624048af58a8d6c32886389ef7078cb0 SHA512 3bd5ffc13a77e485728633c6a3505cf34bf818be2f979a19a5225edd93939d825a8b14f62626e339f3b4776dbbeddb7d908a28c9086e381a087ecb852d7d7f01
 EBUILD findlib-1.7.3.ebuild 1646 BLAKE2B f03a39014effdfc32f0ed37f0218d988db2582bcc300d2af924b510cbf6d54dd90921ce06e095ded6dd368a50e46845afa616c13abb50f2fb74a5cbeaa79b63a SHA512 0d3146cf06181812b02010e6d32201f5c888f5186fd2a748352a157b3d7a96e016d56ffde7bb7c8af9729abb024aa0f88e4905c129278ab002ba32397ae8d77a
+EBUILD findlib-1.8.1.ebuild 1694 BLAKE2B a18e8bcfb91e765708053d00264866b1414604eb54a6a20a02a7f49672af621033e702bae837ebb1d880aaee4c52dbd120c0ea21e5cee61de5be125662bf2517 SHA512 8500c3dff3026ba1c5d94ae698b6eba34cee1a6f8c8349546b028d1f1e4e8fd4099c1e64ddf64fb1ae08021959e363c7f1e572fc6201b614efa8cbf23ced5279
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
new file mode 100644
index 000000000000..235cc886cff2
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.8.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i 's/\$llabltk \$lcamlp4 \$lobuild//' configure || die "Unable to make meta external."
+	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+	export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+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
+}