gentoo resync : 05.02.2020

4 files changed, 75 insertions, 85 deletions

diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 3ea1f7987ff5..23e3ac9901ae 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,5 +1,5 @@
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
-EBUILD lablgtk-2.18.5.ebuild 2493 BLAKE2B f24b0391939d27c8937f2f4eef36153817f26bd1428b8cd70b13ec8585c3b75d4032f95748719214cb10d07bcb880352d52d89cf933cf82320380f66c633ee94 SHA512 dec074d84bf5bfd3f1e52ac6699a7322bc7edea7577b0de6c9641abd95a150cebdeaef893552242f83bef2d2323486cd00e99ece2ffe82c7c607261f553e9511
-EBUILD lablgtk-2.18.8.ebuild 2445 BLAKE2B dff73f79f1ae0a1120c2fd4d5772f18d3c79de7d23f08491f5296a60bd9e3b80289bd8b47ae17b38249d9c328673a81ce2e932071526d3984448ec59f5ffb2c5 SHA512 b7e3fc2a10e5c01881e50a0e3694f16e9fbc9121741d75208237727f094772669deb406b3a57da70337d20f422de5089a711148c58436e0f19ce50ce512ab363
+EBUILD lablgtk-2.18.5.ebuild 2494 BLAKE2B 0cce16ca4d04aa6c39721f708bd7844f62b609d1933dc045b19d802390c8a862faeb8deb8294a4660a02cc277000ba6ed2e739e7e57758248937edd8e6dd1ca4 SHA512 23887d3bda10dc05e461c52cc920fccf11ad2d4f3ed1cad336655ce206d49f1716009e958ae118fcf4c276e7ed5fc253f4c42074274c6623076d25a3285d5448
+EBUILD lablgtk-2.18.8-r1.ebuild 1761 BLAKE2B a14d6732ebb0cd9103ce42fc55e97ecb779ab4d31dfe70c1b0b08ce086fd0348cb99497fbb5647f6f00183923c35892d688e2a76d5ae52065ee028ac01eaf31c SHA512 6030d3ae0ecb9c971f13919202db320304a5b90f5e3668ba2bc5e3bd6a943a9854149f2d16b116030e9ee8bc8715f3ead23b17877f8a9d8ed30a932f0295a55b
 MISC metadata.xml 383 BLAKE2B f59b6011af9733a217dad8be7234433c96e54f61ada270a01b2aa2195184b0d65f5358ade54d71a082029f02b6b902254781bc19bdaf94742f2a74620059ce68 SHA512 4f9bc70bee361fe4ab68962b8c1cf5423153247253e8d4f4b4f08eacbd5bbff6cb3928baa28d458eb2c6161fdd16bee3858a94ab35d8e77232b6571d88dea337
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
index 21e6a5ec8e26..2c5a03c7f115 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf $(use_enable debug) \
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
new file mode 100644
index 000000000000..bed3712e2d4b
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://lablgtk.forge.ocamlcore.org"
+SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
+SLOT="2/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples glade gnomecanvas +ocamlopt opengl sourceview spell svg"
+
+DEPEND="dev-lang/ocaml:=[ocamlopt?]
+	dev-ml/camlp4:=
+	x11-libs/gtk+:2
+	glade? ( gnome-base/libglade )
+	gnomecanvas? ( gnome-base/libgnomecanvas )
+	opengl? (
+		dev-ml/lablgl:=
+		x11-libs/gtkglarea:2
+	)
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	spell? ( app-text/gtkspell:2 )
+	svg? ( gnome-base/librsvg:2 )"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/findlib
+	virtual/pkgconfig"
+
+DOCS=( CHANGES README CHANGES.API )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with svg rsvg)
+		$(use_with glade)
+		--without-gnomeui
+		--without-panel
+		$(use_with opengl gl)
+		$(use_with spell gtkspell)
+		--without-gtksourceview
+		$(use_with sourceview gtksourceview2)
+		$(use_with gnomecanvas)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# parallel build crashes
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install () {
+	local destdir="$(ocamlfind printconf destdir || die)"
+	dodir "${destdir}/stublibs"
+	export OCAMLFIND_DESTDIR=${ED}"${destdir}"
+	export OCAMLPATH="${ED}${destdir}"
+	export OCAMLFIND_LDCONF=ignore
+
+	default
+	rm "${ED}/usr/$(get_libdir)/ocaml/ld.conf" || die
+
+	if use examples; then
+		dodoc -r examples/
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8.ebuild
deleted file mode 100644
index de5f38b12c6d..000000000000
--- a/dev-ml/lablgtk/lablgtk-2.18.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib findlib
-
-IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
-
-DESCRIPTION="Objective CAML interface for Gtk+2"
-HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
-SRC_URI="https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/${P}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
-	svg? ( >=gnome-base/librsvg-2.2:2 )
-	glade? ( >=gnome-base/libglade-2.0.1 )
-	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
-	opengl? ( >=dev-ml/lablgl-0.98:=
-		>=x11-libs/gtkglarea-1.9:2 )
-	spell? ( app-text/gtkspell:2 )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	dev-ml/camlp4:=
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with svg rsvg) \
-		$(use_with glade) \
-		--without-gnomeui \
-		--without-panel \
-		$(use_with opengl gl) \
-		$(use_with spell gtkspell) \
-		--without-gtksourceview \
-		$(use_with sourceview gtksourceview2) \
-		$(use_with gnomecanvas)
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-install_examples() {
-	insinto /usr/share/doc/${P}/examples
-	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
-
-	# Install examples for optional components
-	use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
-	use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
-	use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
-	use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
-	use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml
-
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-src_install () {
-	findlib_src_preinst
-	export OCAMLPATH="${OCAMLFIND_DESTDIR}"
-	emake install DESTDIR="${D}"
-
-	rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
-
-	dodoc CHANGES README CHANGES.API
-	use examples && install_examples
-}
-
-pkg_postinst () {
-	if use examples; then
-		elog "To run the examples you can use the lablgtk2 toplevel."
-		elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
-	fi
-}