gentoo resync : 20.03.2021

4 files changed, 3 insertions, 155 deletions

diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 87a98da78a78..5c95091fb715 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,10 +1,6 @@
 AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39fd8b29648bde3559f04b431cf0363725a9e3ed324db20fe0177cf1afff58c3436432c2fbb2de219b390d2bd830b494 SHA512 7f731a8ecd8e10de8519e91f346f73d479a31fee22a9c16ba60109e055655d54a66183a1f4a072702597a65c005fb3d17819672edd8d12396e41bb41c9231250
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
-DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
-DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
-EBUILD lablgtk-2.18.10.ebuild 1979 BLAKE2B fc3f2212c9629121a9c219783e525fa5a3ddc2aa61acc52ed03f5a4568d89e962b17151681e45d67f7a6438de86d82e28993631164ae68fecc5fda88f538a8b4 SHA512 89ec5fc71bfe6e07060c0830f07664cb2746471f6af527a1e517353fa2c467c8aae5fdc4699c7c459ec02a65b89b90bbcbd654fb0c2961e298e122391cdc280f
-EBUILD lablgtk-2.18.5.ebuild 2324 BLAKE2B c521edb7b2726f0991318bf68d08ee359822c2eb3e055b32323d530488c08f06d4287a2a08a2dbddad574a65b584da7b3fa29f9fe12d9d8884b9cbf6f34b732c SHA512 e2188b5447c8127945f43145b851d1f75fdbc29112ff7db551f30b53a720c97839e80f58ece7f80f297fb4582471df4d6d293e7935edd0a1858941c28cd0fcbc
-EBUILD lablgtk-2.18.8-r1.ebuild 1710 BLAKE2B e404ccdcd1b0329abbe678f23533243ecd31b2f6192ff3ce379c23e794a6eb25a70ec55c1a9783850f89961a4de18a2ac092ef7f2c828eb82078ca1ef7625315 SHA512 986b606bc6eeb8803852754790c5775f9666c6a9b14cea8a6f10382c789f22427c2c04c97586a6026273e9ef0d2de61703a58607786cbcf74fc130aa97eaa5ba
+EBUILD lablgtk-2.18.10.ebuild 1977 BLAKE2B 69e2e9fbd47ab6ed17142ebf8faa35b2b14d7b618b2d28421433bba6f7d9cd423585e5e19f76849cf2d8bbba6bfd25815993a55cf7c7a6db77ea1d7dafb5aa1a SHA512 f69ce8d47f79017e499e59fc8d6c87c88ddbd49a5d78dc23d5f25c66d10a81f7ebba6ff7b9afbfda9037216c288356c90ad2d1e74914da017877394502e9bfdc
 EBUILD lablgtk-3.1.1.ebuild 702 BLAKE2B 29d01d15a38b2e68e6097e2dffa2605ca8d2c010063801315f5ab79e16e600029ee03c0a1efa44b0666a13c279850754d8c14e078aaa96181edcad0b6cec1385 SHA512 0d9137f652f9babb62b147db5d574b539c55155f1450534f19d38ea4f7ec7e5df5a9c8ab6b4ea4510e5d17b43713186b0135baed44e447929eb56491c82ce94a
 MISC metadata.xml 553 BLAKE2B 90a0c974eeb82ca8d6c6634fa4c277ce2aa1352629462377178bfcab4928df5cf1cce9242b32c30447f006cab1297622c0f5ae16cab7030b23373f9bd67fd926 SHA512 dde726bb31037d7fe2490b2f578bae878c4f08a350ea732ed036ff2497c3bbf445953ff22f011a2e6e4fdf8295509fd3ef3f979c90157f35bb48c04efbde8302
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 24e25850f2ad..2a808a4b259d 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
 DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
deleted file mode 100644
index 9bef8aaa2b15..000000000000
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 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 spell svg"
-
-DESCRIPTION="Objective CAML interface for Gtk+2"
-HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1627/${P}.tar.gz"
-LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	<dev-lang/ocaml-4.09:=[ocamlopt?]
-	svg? ( >=gnome-base/librsvg-2.2:2 )
-	glade? ( >=gnome-base/libglade-2.0.1 )
-	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
-	spell? ( app-text/gtkspell:2 )
-	sourceview? ( x11-libs/gtksourceview:2.0 )
-	dev-ml/camlp4:=
-	"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_with svg rsvg) \
-		$(use_with glade) \
-		--without-gnomeui \
-		--without-panel \
-		--without-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
-
-	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
-}
diff --git a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
deleted file mode 100644
index 6bbe47119f84..000000000000
--- a/dev-ml/lablgtk/lablgtk-2.18.8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
-
-DEPEND="dev-lang/ocaml:=[ocamlopt?]
-	dev-ml/camlp4:=
-	x11-libs/gtk+:2
-	glade? ( gnome-base/libglade )
-	gnomecanvas? ( gnome-base/libgnomecanvas )
-	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
-		# relies on EOL gtkglarea
-		--without-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
-}