gentoo resync : 20.03.2022

5 files changed, 163 insertions, 6 deletions

diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index d26ffd881c6a..17d2dc409d68 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,6 +1,9 @@
 AUX lablgtk-2.18.10-cflags.patch 2852 BLAKE2B 9460dc7e50572f006eca3858b485d99b39fd8b29648bde3559f04b431cf0363725a9e3ed324db20fe0177cf1afff58c3436432c2fbb2de219b390d2bd830b494 SHA512 7f731a8ecd8e10de8519e91f346f73d479a31fee22a9c16ba60109e055655d54a66183a1f4a072702597a65c005fb3d17819672edd8d12396e41bb41c9231250
+AUX lablgtk-2.18.12-cflags.patch 2105 BLAKE2B 5e72efba3b484142070aa38ea487eb8fe82018f7f8f2420a08d0acff25450c11184aa121df67447b79b4ac1146999535f34f5f794465a9cfac5f75bf8275db0e SHA512 684a905979372e18f63b68bcc418a8e8401c51931cca45440531ea58eaad583923fd37fb167709c8394f967f4987161d88ea00714f8406048269ac59c51313e8
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
+DIST lablgtk-2.18.12.tar.gz 1066997 BLAKE2B fcdc74ae444af509b2c95929ac8df556aeea21187a95433a9c67ac3d7a515054d53c4955ea2e908297065fd005099fb5df45d52311cf015f63a72780c11cccb8 SHA512 284a1234ae817c4df49809d28c103ca5e64046da5ec9ff28c6edc0ce999e9d3e6e180dd053f8b1663d4fb3b7ba19570d53b9441c8fa622add924e8d85e41b813
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
-EBUILD lablgtk-2.18.10.ebuild 1977 BLAKE2B 69e2e9fbd47ab6ed17142ebf8faa35b2b14d7b618b2d28421433bba6f7d9cd423585e5e19f76849cf2d8bbba6bfd25815993a55cf7c7a6db77ea1d7dafb5aa1a SHA512 f69ce8d47f79017e499e59fc8d6c87c88ddbd49a5d78dc23d5f25c66d10a81f7ebba6ff7b9afbfda9037216c288356c90ad2d1e74914da017877394502e9bfdc
-EBUILD lablgtk-3.1.1.ebuild 702 BLAKE2B 29d01d15a38b2e68e6097e2dffa2605ca8d2c010063801315f5ab79e16e600029ee03c0a1efa44b0666a13c279850754d8c14e078aaa96181edcad0b6cec1385 SHA512 0d9137f652f9babb62b147db5d574b539c55155f1450534f19d38ea4f7ec7e5df5a9c8ab6b4ea4510e5d17b43713186b0135baed44e447929eb56491c82ce94a
+EBUILD lablgtk-2.18.10.ebuild 1978 BLAKE2B aec065ed8ba21ec22d432caec6f0ca68725db83b5e782cfd9b3ddd5431f921b78bcd609a962da757f6d65edeffe6e6bce678c60695b251e0847738e9b8551885 SHA512 5d6cc91fe21dba2209a83310089630d806e5a1ea02ae27af5d799766f1a1a2f8616f586a43f8a4e620394ea9bcfae90a453544c5e0bf13c687a0de0777528ef1
+EBUILD lablgtk-2.18.12.ebuild 1983 BLAKE2B f5e91f7cf3f5e85cb35a3c74b13c6e00db07e9c1ea79e3e5dbacd9e79db36b0f4350d26b44b9d5496675437d03705e20cb0b5b526f01002ed96f3192332f2648 SHA512 a86cca1cd8a65d1e7af8177e345dd2b382164599a1ed1e9f3f66efecd5782d9f90a81bded3cd23caf1d017258b59478c08cedf009f34d103f3e0718d24a02f90
+EBUILD lablgtk-3.1.1.ebuild 703 BLAKE2B 63b744a767e6f1f238434a5e8457c0c01066992d4ced47b839e623b3a9535a15e3285b466a5477a01a17d10a4a0abb135b2d40e202288f89944029c3881e9719 SHA512 cfb13c7b8a4661174c84f6f5966b56bd6ff3c11e18b28149922329d9f8c9eb5ae4d8cc0811bfdf8f53f04b8f66f54118f457d53852bffa755c89e3ffe0612cb0
 MISC metadata.xml 554 BLAKE2B fa4cd61013e5b42b28de543aab15ae08dce280cfd977e2eb36abebbaf5f9258d4ff8e4e3a68e893a3b96e110d7135d298c8ffea6b083a7be60fd68799dfb33b3 SHA512 a334e51894064908b7367aa1e26f46120511bb18c1107db046589730ee00ebc5d8e2346799cfc45712a14e3303b747d6dd32c10c94246335de6f6848b112cd4a
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch
new file mode 100644
index 000000000000..aeef5c319a6d
--- /dev/null
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.12-cflags.patch
@@ -0,0 +1,76 @@
+diff -ur lablgtk-2.18.12.orig/src/Makefile lablgtk-2.18.12/src/Makefile
+--- lablgtk-2.18.12.orig/src/Makefile	2021-12-25 02:23:31.000000000 +0100
++++ lablgtk-2.18.12/src/Makefile	2022-03-04 08:12:28.151812474 +0100
+@@ -18,6 +18,7 @@
+ 
+ include $(CONFIG)
+ #GTKCFLAGS += -Werror -Wno-error=deprecated-declarations
++CFLAGS=
+ 
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
+ 	$(THINITOBJS) build.ml
+@@ -45,14 +46,13 @@
+ 
+ ifdef DEBUG
+ COMPILER += -warn-error A-52-6
+-CFLAGS = -g $(GTKCFLAGS)
++OCAMLCFLAGS = $(GTKCFLAGS)
+ CUSTOM = -custom
+ #MLLINK += -cclib -lcamlrund
+ MLBYTEFLAGS = -g -dtypes
+ else
+-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
++OCAMLCFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
+ ifneq ($(TOOLCHAIN),msvc)
+-CFLAGS += -O
+ endif
+ endif
+ 
+@@ -65,9 +65,9 @@
+ THLINK = unix.cma threads.cma
+ 
+ ifdef USE_CC
+-CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(CFLAGS)
++CCOMPILER = $(CC) -c -I"$(LIBDIR)" $(OCAMLCFLAGS) $(CFLAGS)
+ else
+-CCOMPILER = $(CAMLC) -c -ccopt '$(CFLAGS)' -verbose
++CCOMPILER = $(CAMLC) -c -ccopt '$(OCAMLCFLAGS) $(CFLAGS)' -verbose
+ endif
+ 
+ ifdef USE_GL
+@@ -123,7 +123,7 @@
+ CLIBS += liblablrsvg$(XA)
+ RSVGMLOBJS = rsvg.cmo
+ RSVGCOBJS = ml_rsvg$(XO)
+-$(RSVGCOBJS) : CFLAGS+=$(HAVE_SVGZ)
++$(RSVGCOBJS) : OCAMLCFLAGS+=$(HAVE_SVGZ)
+ endif
+ 
+ ifdef USE_GTKSPELL
+@@ -140,7 +140,7 @@
+ opt::  lablgtksourceview.cmxs
+ endif
+ 
+-ml_gtksourceview.o: CFLAGS=$(GTKSOURCEVIEWCFLAGS)
++ml_gtksourceview.o: OCAMLCFLAGS=$(GTKSOURCEVIEWCFLAGS)
+ GTKSOURCEVIEWMLOBJS = gtkSourceView.cmo gSourceView.cmo
+ GTKSOURCEVIEWCOBJS = ml_gtksourceview$(XO)
+ ml_gtksourceview.c: pango_tags.h
+@@ -179,7 +179,7 @@
+ endif
+ 
+ ifdef USE_GTKQUARTZ
+-CFLAGS += -DHAS_GTKQUARTZ
++OCAMLCFLAGS += -DHAS_GTKQUARTZ
+ endif
+ # Rules
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx .cmxs .cmxa .c $(XO) .d$(XO) .var .h .opt .def .ml4
+@@ -188,7 +188,7 @@
+ .cpp$(XO):
+ 	$(CCOMPILER) $<
+ .c.d$(XO):
+-	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(CFLAGS)' $<
++	$(CAMLC) -c -ccopt '-MT -DCAML_DLL -Fo$@ $(OCAMLCFLAGS) $(CFLAGS)' $<
+ .ml.cmo:
+ 	$(COMPILER) $(PRINCIPAL) $<
+ .mli.cmi:
diff --git a/dev-ml/lablgtk/lablgtk-2.18.10.ebuild b/dev-ml/lablgtk/lablgtk-2.18.10.ebuild
index 2a808a4b259d..4cc4a6ce36a6 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-2021 Gentoo Authors
+# Copyright 1999-2022 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.12.ebuild b/dev-ml/lablgtk/lablgtk-2.18.12.ebuild
new file mode 100644
index 000000000000..f96bd8719b9c
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://lablgtk.forge.ocamlcore.org"
+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"
+IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
+
+DEPEND=">=dev-lang/ocaml-4.05:=[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 )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+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 CFLAGS="${CFLAGS}"
+	if use ocamlopt; then
+		emake -j1 opt CFLAGS="${CFLAGS}"
+	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
+	dosym lablgtk2/liblablgtk2.a \
+		/usr/$(get_libdir)/ocaml/liblablgtk2.a
+	use sourceview && \
+		dosym lablgtk2/liblablgtksourceview2.a \
+		/usr/$(get_libdir)/ocaml/liblablgtksourceview2.a
+
+	if use examples; then
+		dodoc -r examples/
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
index 03b78cd1ce03..cd15266b9eef 100644
--- a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${DUNE_PKG_
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="3/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="+ocamlopt sourceview"
 
 BDEPEND="dev-ml/camlp5"