gentoo resync : 25.11.2020

8 files changed, 106 insertions, 10 deletions

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index be95e86aa9d6..0df8ca5f7f7f 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -1,12 +1,14 @@
 AUX externalmeta4.patch 675 BLAKE2B 14c3b5c3a2cd0b0224849cce401752c32658a5d0426c36adb65cbf324ff10a96ce007975e2cba777e70e42b3d1c4bebdf3d2874f25bb8a7b1e67bf18c814bc4d SHA512 3aee50761934b6d6a418e6ed33f4ab3fba21df12379b41d86c3f8702fe467cbfe90b5bf25dafeee6c660eb7b4228c9a0dfb7296125a96cae2acfbf8786e4fb80
 AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813d2e2fca76c1546bd883d4992c0fd14938b8be1c6c72a5597d52b92e1b324a6e59db58667493685fb3b9c SHA512 2a1e14a3eca3f95ee29e1902324469ab11f117012db60d2f34e0ab7818a44abaebd023562a6f521db7451691219461c453ba5f3fcf424e2fe65e407a11741863
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
+AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 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 1670 BLAKE2B d30d66c27d7b02378054d97678821a97c5db08548e7cf69772e2ef4a0a0db6a7a44f02277c25ca567bb8c3ffcea01e30bff845c6b5c8f6c189f53b0de7880748 SHA512 f15620a54877c0482d8a4737f4d4cf9ee04c0c04372781a45b13225b4e2ce585758439bb5e320a6ccb47258101f76878dceb556cd360789046e8a0560c7c0223
-EBUILD findlib-1.7.2.ebuild 1676 BLAKE2B 1f26f700fa8f120eb504d441f6abe0a3e42d70c09df8325f78b68721e2115140d834b1fbc51d105f39d372dc4d23a6164b735f6fb504e7ad438e4cbe57db1d64 SHA512 188b4b931a3ba8e6eb456bcf97ea5f521466f9650ae2567ad4e9104e1270ec62ec4e8b727d4dba5eb0cf19572cf04aba4740aabcbedd81d5afa29f80caa78692
-EBUILD findlib-1.7.3.ebuild 1689 BLAKE2B a78e7e68a97122107362c376017c106462c30dd6c8754702c0b24f22478dcb7ad75cc9da78b2832922402182d1037c085d37b1d401b8126735438faa5e3cdcd3 SHA512 0d107354f562ef62313afdda4f8eda424dcaaff565ae17b9e2b0b1dcee2a8a44761830c021160deb6f688fbb2d28aa8adeb287744eb89f34f3639d0a2d8ab548
-EBUILD findlib-1.8.1.ebuild 1688 BLAKE2B 42324ddabfcf8ddba5edcbdc5561a9094e71b792b995b2bdc371a6d3d9b647b4390fd973b83f3e331e9d3546cb8c05a8b2bbd65adaa732920c5b8687d61f6460 SHA512 cce3570787eb02d29190c2b900391c4166b9123838bddc4e054f13cf26fe604b68287b58a569984ce4aba184d221b2b8660e498d91c51fa66d4d8bd644e9a3a9
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD findlib-1.7.1.ebuild 1664 BLAKE2B 1af93d91835630f39c86177dfad22f82ec8f9e64ef259a27b325fb5867aecdb1ba413970d004d2e110be24ab26cccdea83e188a68d3826e721bbc69f5d49cf31 SHA512 539b7b1ec074f1c74be90a02c9f98af06129c2703249ef295dbb1210c24c10bf8b2928f7658aefd60d625e9beb68a6003e545444a826acb26f7e685605453e19
+EBUILD findlib-1.7.2.ebuild 1669 BLAKE2B f81ce1f06e38ea45989f44411a33bc5fbaed3cc0c7874750b9609d8843af38e1ab59c00a9a51903e71d09ad8ce1fb575a11d959292eede547dc7edb392ef8429 SHA512 40ad1ccd4d6073356d2bd7b98420db133e0d762679d6250774eed21eed46a37b058ff6d47224fe7a7aa60d919ae2eabc6a177a56c7a6311f1d7f1c9ed55b6358
+EBUILD findlib-1.7.3.ebuild 1682 BLAKE2B ee700751e5f7c66cd8b4e72e430d9b12dea14925cc7d5b2037cc676f8e1375e99ba27e63f5927477c3e57654227aeb5bcc75ea2308f4da4521cf8df5493d1e0b SHA512 ab52c2255948d5864d2eb27c6274b1816bc8b31a98a13c68fdf9e804d029e0a309e57d542e68ccc7dba63de7a9f070a1736d87544f4a8d534e2e9f0a344a7c38
+EBUILD findlib-1.8.1-r1.ebuild 1672 BLAKE2B 13c847cab7bbb9b4d3fb748e4d1150ed6c4e28337e4234a155b411fa10665c1ff741663089a6bb9369797e8b96bb554fbc82ceb55a57d5497eba5bf96c059351 SHA512 6a71a4b101c6787060cb9413e8a02f40fa62b0a0780fa91e64eb59badd03b3b3f1e043dd52482150e88409046a5d8da421f306d91f3d7fa64fa2e4087e994865
+EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/files/externalmeta7.patch b/dev-ml/findlib/files/externalmeta7.patch
new file mode 100644
index 000000000000..8aa9fa566e59
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta7.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.8.0/configure
+===================================================================
+--- findlib-1.8.0.orig/configure
++++ findlib-1.8.0/configure
+@@ -581,7 +581,7 @@ fi
+ 
+ # Generate the META files now.
+ 
+-l="$ldbm dynlink $lgraphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
++l="dynlink str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime"
+ 
+ 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.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
index c12ada7153a3..3dc2daf05896 100644
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # it does not compile with ocaml-4.09 (bug #708696)
 DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
index 895452b724a4..de59d46e91ac 100644
--- a/dev-ml/findlib/findlib-1.7.2.ebuild
+++ b/dev-ml/findlib/findlib-1.7.2.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # it does not compile with ocaml-4.09 (bug #708696)
 DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
index 691a2c9519aa..d77ea4b9afe4 100644
--- a/dev-ml/findlib/findlib-1.7.3.ebuild
+++ b/dev-ml/findlib/findlib-1.7.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # it does not compile with ocaml-4.09 (bug #708696)
 DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1799cc090907
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/externalmeta7.patch )
+
+src_prepare() {
+	default
+	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}}"
+
+	if use doc; then
+		cd "${S}/doc" || die
+		dodoc QUICKSTART README DOCINFO
+		docinto html
+		dodoc -r ref-html guide-html
+	fi
+}
+
+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
+}
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
index 50ebe38db17e..b2c69240deb4 100644
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index 7a38bb900964..a4f6be63adba 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>