gentoo resync : 25.03.2022

4 files changed, 58 insertions, 8 deletions

diff --git a/sci-misc/flashdot/Manifest b/sci-misc/flashdot/Manifest
index 8aca3fa4803c..72fda3abec54 100644
--- a/sci-misc/flashdot/Manifest
+++ b/sci-misc/flashdot/Manifest
@@ -1,5 +1,6 @@
+AUX flashdot-1.1.4-Makefile.patch 300 BLAKE2B c771a361aedb8eafd0e8e376b71889ec41a4d75330f172481890d7b39251dc09e3c1961de87acd435579031fe82206550422872c6cf54359137f246b7afed5f3 SHA512 034c946c4d1ec7905ebc370b7a59418b4e63903f684d9da4c3be3d89747b12b5f25ce786a967f66250b5095401f76541ecfee78ca205859477527c7a42e2d13c
 AUX flashdot-1.1.4-gsl-ocaml.patch 1045 BLAKE2B 43809e76d518a755cc9bb2e0a0eca1d4e54cd749081f710a34ef96bc4af201452673a25b8a5e431839d148cbab10f69638c5b98539b9d969d262026677efccdc SHA512 010edd228c29189bb07eec81ec3b0ceb968ccfa99f6cf85d1d1b2b1b8b2af040b674e75fdf57662cdbb6ca076b9ea02d5164530ef91012bb3e9ea89de9457f0b
-AUX flashdot-1.1.4-ocaml-4.09.patch 317 BLAKE2B 5ae01d53e63c0a5d9f8dc7ddb25be09229ae2d9cf444fec40b92e6d13cee212c8714aa3a8d40cdd60c20e0e19a6c5e87d869c73cd1071df0890c22e3e94d8190 SHA512 7e7f4c7cd7ce2e4c4eceb5d547f46454aca73df7ba8e96c62269c624f565656a8b2223ff966bd2c736fc27d2c69a1adbe4bed4fe72c7f659440df40f011997b3
+AUX flashdot-1.1.4-ocaml-4.09.patch 736 BLAKE2B dbef65cd2a61062b70c509970bfe9d574493c371e8ebdc81f6c1bdb15e7c38ca01938c11461e973b7285a0fc69b368f31a30b4b00027fba4e5e482ff6d5384bb SHA512 3cf6b9c4b5290c02915112646e8456b76a6931882d998647001a9c38af1aff0ee48d75617aae75f5cca442d8932dfdcb1342b5cad044f019af72bd29d64f7408
 DIST flashdot-1.1.4.tar.bz2 464763 BLAKE2B bed4b23ad21a8526714820ebf113e53a775dff39c0fcd3cdde847fb0a46ffbde5cd3f62ae2b92584ff1ad5c3b1b0a939130c3a182905b16503b60c1321a90e78 SHA512 2c7f803ca002f8a2d9205a6148c3bf602aa79c04fb67444cdfb23626706777d8463739f119ff124b58f7dc30c75750f95045fab4059540936082cfda7deea8c0
-EBUILD flashdot-1.1.4-r1.ebuild 788 BLAKE2B bc146d68b8e3892179236564c2cc943ff27857af8881ec65eee7211a82dc61346aea494d52dee4ac72a88d6abed9e9400307187181694e314df8ec2c0bd46ab3 SHA512 864f3d728fcfd6495ce7bdbc30d0dbd0d74081c611a5398c025936928c2dbf3376e56825e2df564f70a9bbcb726b8e45e958e6ce16faf3fea0b1eca6c5fa9900
+EBUILD flashdot-1.1.4-r1.ebuild 1502 BLAKE2B 3b30ce3d0d4f9c9d373dd5461141de349bd6202b7e3893df552f104a10f6f8dc010b4b723d07554e0e2b505c8ade0f0d5b63b09a714a7a6f3e3024dcc7421224 SHA512 1789dcec6b4043c2b683d4b9545aec257e6cd3be09f83ffbc67ffe6442138f732496dd32cabe7493c08ad2692125dd9e1b3282359a86adebfb1e052c71ec924e
 MISC metadata.xml 424 BLAKE2B 70be150fc489da7cea8e4b40184d631b6fa06c436162a6431d0ffa165fa0e5731b737d99b92e163830cae3561d9291355f36b9ed39848062d829d9fbc4d9651c SHA512 216b91076c7c4c50599fba8deca5e0b5b14045ecf9aa57f07aeb044c27ef0f3961562820ae3a7cc93777be0ecd4eb974d1b7d5a5557190773193fa0a5f6515f1
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch b/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch
new file mode 100644
index 000000000000..077367bd2ab0
--- /dev/null
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch
@@ -0,0 +1,10 @@
+--- a/mathexpr/Makefile	2022-03-22 10:51:43.081062080 +0100
++++ b/mathexpr/Makefile	2022-03-22 10:53:37.226190652 +0100
+@@ -72,6 +72,6 @@
+ # Dependencies
+ depend:
+-	$(OCAMLDEP) $(OCAMLINCS) *.mli *.ml > depend
++	$(OCAMLDEP) -I $(XMLLIGHTDIR) $(OCAMLINCSLOCAL) *.mli *.ml > depend
+ 
+ include depend
+ 
diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
index 8b00b86d52b7..285a2c746e20 100644
--- a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
+++ b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch
@@ -9,3 +9,14 @@
  			fill_buff ()
  	in
  	let s = fill_buff () in
+--- a/mathexpr/mathexpr.ml	2022-03-22 12:36:30.252580025 +0100
++++ b/mathexpr/mathexpr.ml	2022-03-22 12:32:10.594137416 +0100
+@@ -2859,7 +2859,7 @@
+ 					while true do
+ 						let n = input f strbuf 0 1024 in
+ 						if n = 0 then raise Exit else
+-						Buffer.add_substring resbuf strbuf 0 n
++						Buffer.add_subbytes resbuf strbuf 0 n
+ 					done;
+ 					Buffer.contents resbuf
+ 					with Exit -> Buffer.contents resbuf
diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index 8d31eba90241..1843fa0f3f89 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.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=6
@@ -14,23 +14,51 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10[ocamlopt?]
-	dev-ml/gsl-ocaml
-	dev-ml/lablgl[glut]
-	dev-ml/ocamlsdl
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	dev-ml/gsl-ocaml:=
+	dev-ml/lablgl:=[glut]
+	dev-ml/ocamlsdl:=[opengl]
 	x11-apps/xdpyinfo"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-gsl-ocaml.patch"
+	"${FILESDIR}"/${P}-Makefile.patch
 	"${FILESDIR}"/${P}-ocaml-4.09.patch
 )
 
 src_prepare() {
 	default
-	MAKEOPTS+=" -j1 VERSION=${PV}"
+	MAKEOPTS="-j1"
 	use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
+	sed -i \
+		-e "s|^VERSION.*|VERSION := ${PV}|" \
+		Makefile \
+		|| die
+	sed -i \
+		-e 's:Gsl_matrix:Gsl.Matrix:g' \
+		-e 's:Gsl_rng:Gsl.Rng:g' \
+		-e 's:Gsl_randist:Gsl.Randist:g' \
+		-e 's:Gsl_sf:Gsl.Sf:g' \
+		-e 's:Gsl_math:Gsl.Math:g' \
+		-e 's:Gsl_vector:Gsl.Vector:g' \
+		-e 's:Gsl_permut:Gsl.Permut:g' \
+		-e 's:Gsl_linalg:Gsl.Linalg:g' \
+		-e 's:Gsl_cdf:Gsl.Cdf:g' \
+		mathexpr/mathexpr.ml \
+		mathexpr/mathexpr.mli \
+		mathexpr/random_rng.ml \
+		mathexpr/sequences.ml \
+		mathexpr/multibin.ml \
+		flashdot.ml \
+		|| die
+}
+
+src_configure() {
+	./configure --prefix=/usr || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" CALLMODE=script install
+	rm "${D}"/usr/share/doc/${PN}/copyright* || die
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }