gentoo resync : 18.12.2020

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 8e023fa8d803..03cec4dd980d 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,6 +3,5 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
 AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
 AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r1.ebuild 1668 BLAKE2B 84307716d465e5d10b0df3f37ddd5a7533dd07bce02827d7c5fa2fafd1be51d26be90f4cccb78c1add70d00865fd812380a7cacd9445973ee7695f2272ed212e SHA512 e94c9836cb19b1eb59b33f7570b9104d697d73ca6af00d3a0986f7823ca726cc6106bf6f124aa9955e283bc9810ad85f32186345357f03438936f6d54323ca59
-EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
+EBUILD findlib-1.8.1-r1.ebuild 1666 BLAKE2B dc1031afd592e0b82a11768991bc6c13d2034ce0354d8659d18397366e3eb4d5bbac50b1f62d0b944ec3e298cdd2ffe3134d10a16a9d2c2f53d8528188fc44a1 SHA512 ea9348133fa3c07f312121ea5a02e255cf5848ee6bc149972cf548df0531fb87e4c388d72e7134d0afdb61908d29390b6182aec36fe244dea51b6e3d3585dad7
 MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
index 6880e1c5c7a4..9c3988c304ea 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+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:= )"
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
deleted file mode 100644
index b2c69240deb4..000000000000
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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 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
-}