Updating liguros repo21.1.2

3 files changed, 10 insertions, 79 deletions

diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
index 415b2535faa7..00af3da8eeb1 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r2.ebuild
@@ -3,19 +3,16 @@
 
 EAPI=7
 
-inherit multilib
-
 DESCRIPTION="OCaml tool to find/use non-standard packages"
 HOMEPAGE="https://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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt tk"
 
-DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
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 7547ce832d5a..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="https://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
-}
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index 0ebdbd8af882..b245899f8b6d 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/ocamlfind</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>