gentoo auto-resync : 20:01:2023 - 23:41:20

6 files changed, 99 insertions, 3 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 9a9393f0ab3c..f292151ec57a 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 83e69e93cbe6..87a7b4e52ded 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -3,10 +3,12 @@ AUX lablgtk-2.18.12-Makefile.patch 556 BLAKE2B 180c2c3d62c4be521be9afbc1ff6ca924
 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 lablgtk-2.18.13.tar.gz 1073083 BLAKE2B d3be54b0194e8b67b66eee9663d121e9007f6eb1d04cf322f83dfc5ddd5c3a27ad6f19204429ea5941d9cfe97ac9583af41ae713de5552b5d11245e4216ad5c1 SHA512 41deafbf8bbb9d15950d74a053e21c65aa0d2d4044a41d048f197e744a82ebbe159d43f67092fa19a8385bf0f7da0250ef2f0a532a0810e88f695d6f1fef4c48
 DIST lablgtk-3.1.2.tar.gz 1042626 BLAKE2B 355ff285248129a063c041d3e64db33424ddbb71774128d7be980b8bd0b54cfa54b9d50b1c2f8527b8f6563836189ad72d30e4421b22d5938b888e61ada55056 SHA512 c63a492160f36685f65cb6bc0e72ff4939005acb2c65c56c0d9ba8f2112a618f24db84765e7b4416e49024048a36895028cfc5ef2c3e298dd4a309e902e34af5
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
 EBUILD lablgtk-2.18.10.ebuild 1978 BLAKE2B aec065ed8ba21ec22d432caec6f0ca68725db83b5e782cfd9b3ddd5431f921b78bcd609a962da757f6d65edeffe6e6bce678c60695b251e0847738e9b8551885 SHA512 5d6cc91fe21dba2209a83310089630d806e5a1ea02ae27af5d799766f1a1a2f8616f586a43f8a4e620394ea9bcfae90a453544c5e0bf13c687a0de0777528ef1
 EBUILD lablgtk-2.18.12.ebuild 2018 BLAKE2B 4a0ee690913b71cff0d29d80cd46df537621e8fbe54e8e94c7ea21d24022b517d19fdf66aafdd940012c98a3ca0758f9567bc005280cef7403cc8bc410cac412 SHA512 00ef3a100afc730e3d912d9d26c95580cf1e29da0a5ec670e315bd78df036270eb71141114074c51e8c65c739bb2376fbda26661669e5553aea4962b49e4a889
+EBUILD lablgtk-2.18.13.ebuild 2036 BLAKE2B 64e1cf55e5b74f3a02f55154a4eb897b9b61227504fb378ece65eb0bdceda2beae1b3a5a3fdd770f3eed0c0ef4121a9d275476c0f53bbae79fa025bfbcd02f4f SHA512 65b1e4c5953bee6f83b64c3f93095ae80e458dc7936272b00c9562488e07f89dc6ce4a43c96da45e75e7e1bdb2295e3c833685f367b7b1b9d2246c926a5a2f64
 EBUILD lablgtk-3.1.1.ebuild 703 BLAKE2B 63b744a767e6f1f238434a5e8457c0c01066992d4ced47b839e623b3a9535a15e3285b466a5477a01a17d10a4a0abb135b2d40e202288f89944029c3881e9719 SHA512 cfb13c7b8a4661174c84f6f5966b56bd6ff3c11e18b28149922329d9f8c9eb5ae4d8cc0811bfdf8f53f04b8f66f54118f457d53852bffa755c89e3ffe0612cb0
 EBUILD lablgtk-3.1.2.ebuild 809 BLAKE2B 240985d82a7da9d69c117e6d5c61d3d3e8538bc9de5684d267f5d5983bdac0a335b13e8ff66314ab38dcd94204c93175a9b2f887ac35afa1c8a96f3e8c33e32e SHA512 376d0c3f2026f8b434fd1bf2f2854df478149398680988dcc97ac859702567647ae3769db823f54eeb130de425f2add64cc29255d303460406e8807fea3c762a
 MISC metadata.xml 803 BLAKE2B 81dcea96c0622e8106473008e25574b819b522ea91f322cae81c9d9c32e1ff02759b1c0fce40d2567662abc1b373c4ea3792a4a4cc11ed346e257af840399e11 SHA512 5e6bd8af52147eb9697759509bbfff9fef9d9afc09ed924814d85903ca750122ce14723f449b4e08cd1d7f0dd2b0e75d3823164b0e7552e4d8334a7dadfc7f0d
diff --git a/dev-ml/lablgtk/lablgtk-2.18.13.ebuild b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild
new file mode 100644
index 000000000000..07846bc44b8d
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 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}"/${PN}-2.18.12-cflags.patch
+	"${FILESDIR}"/${PN}-2.18.12-Makefile.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/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 2a51639d33d2..6be13f55a3c5 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,6 +1,7 @@
+AUX ocamlnet-4.1.9-shuffle.patch 390 BLAKE2B 2cdb5c3674cf74df8d7a5f9b6aa2cdca3aa7daee1336470c42e4eff08e1a434122f486b9999402ab0b4e32d2ccb58f38912e4ed61881a7b7e100d12e2fcfbc6c SHA512 e022d43cac713471b4db397e17aaffbcc837d0a798932bc0b67971185c1fd3e155586f02ee7ff6b72945660bd7381042ce2c02dde8dedb4d2321297e869a1444
 AUX ocamlnet-4.1.9-unboundLexer.patch 284 BLAKE2B 8d934f1aa24d19f3065dd4501c6656c78e53f373028e315b2fb969bab495e3f94fb80af33cac6f5da92ab0c185d7537d0d9d07be0abd8cd618708e9b400323a4 SHA512 9110449c98975c5894fffad28372a0daae48de7cf7a775b43ad14989e99840a49d1b5170317b36fb9ed303a2c1fa9ff0a52d569d1bdd74879c8ee1f29bdfdbc3
 DIST ocamlnet-4.1.8.tar.gz 4620065 BLAKE2B 8f84ce4d79de5f4a1f26d4e45f68327042b0adc22717e56eeaca03ee6371e9251c01e8736d3afe5c00a1c65ef0286d56a04c57e80377402bb19ff87955ae98d9 SHA512 e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815
 DIST ocamlnet-4.1.9.tar.gz 4628747 BLAKE2B 40e41edee79ba5957d297506cdf1b907adc8d44a33f25f25b8b1a18487f5ec379fb328c86d6283f7da7cedd8d35b80809e1cd5224522d51afa3e5f2402ac8663 SHA512 a251724deb35e756c81d2d3ac836d413b659acdce6c0acf479a4fca48934ab62ad399a884197d00dbb7e7558132a56be1c8efd553c0a644d329418272f809a46
 EBUILD ocamlnet-4.1.8-r1.ebuild 1636 BLAKE2B 96ff9aeb5b1012aa0544a36ac7c3cccb24cf23e79911118b2fe0d7cabd3fd6ad435503ffe43e05e1d1ecedb8821649b2720b2040c9b074fd6ac8017c3167336e SHA512 ff2b81572d3dd298af654bd9bc43d55c951b0f8f6a417521b1cec8d489cbd6d0b1f407194d93b2d8176b08fdc374051557bc47c1df6e4d2040be3e7a633373e6
-EBUILD ocamlnet-4.1.9-r1.ebuild 1786 BLAKE2B 0fb0d5f2fced29d5ba11191fd17154dd6de0b3562ffb163e0104b91e281fa46f2d9022f9d2fad42e5a65a375b1fa6be9998d0b6dab9bdb076cd016b6fed13670 SHA512 639930978abfe4b981013fc14d3762dded345208c3c02bed5ee16ceaef5f5052822918f83ad158d6b81567f98cb496d87ba22ca71151f7f6093769382ef9adab
+EBUILD ocamlnet-4.1.9-r1.ebuild 1821 BLAKE2B 43f21c47ee2ca7baa674787f6452e21b2376a8488de6042499b8779ded92c2a63b87b36d159a39876975a9970984517b58d89068cce311c5617f48a31fa29ea7 SHA512 c32ba5271cd3e6a94a8a5d2ecac01e2cbb6102020e3bf68de523c50fe19d184e016182a508e984a300ab86efde173f7fdc54e2d5caaab6fa535eb179f90a08bd
 MISC metadata.xml 406 BLAKE2B 765eb184895dcb4d3769fc590facc0435ca84a33a1954b8c33b2f1f40f775fd165aa7e1d86b3f874a8c83c8020c094f73d3174d46d94c1c455d54069ff431414 SHA512 911bd8206d13c92e78ceb3ea00c71ddebc1ab83459bd2d209f2209b81e7952b69ee6ee53003806c8c674dd083c300cd0b243ccfc7449c2a8678a3d459c434879
diff --git a/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch
new file mode 100644
index 000000000000..6b7026faf1e0
--- /dev/null
+++ b/dev-ml/ocamlnet/files/ocamlnet-4.1.9-shuffle.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.rules	2023-01-20 22:52:47.530898157 +0100
++++ b/Makefile.rules	2023-01-20 22:53:09.370565670 +0100
+@@ -210,7 +210,7 @@
+ # Set NODEP to "@true" in order to disable "depend".
+ 
+ depend: $(DEP_FILES)
+-	$(NODEP) $(OCAMLDEP) *.ml *.mli >$@ || { rm -f $@; exit 1; }
++	$(NODEP) $(OCAMLDEP) -ml-synonym .mll *.ml *.mli >$@ || { rm -f $@; exit 1; }
+ 
+ .PHONY: clean
+ clean:: genclean
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
index 0029b1219894..60b4eea78ebf 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-unboundLexer.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-unboundLexer.patch
+	"${FILESDIR}"/${P}-shuffle.patch
+)
 
 ocamlnet_use_with() {
 	if use $1; then