gentoo resync : 25.11.2020

4 files changed, 47 insertions, 16 deletions

diff --git a/dev-ml/ocamlsdl/Manifest b/dev-ml/ocamlsdl/Manifest
index 2a9ff6227839..3a81152fb94b 100644
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@@ -1,4 +1,5 @@
-AUX ocamlopt.patch 818 BLAKE2B 8b4f66bc97b7aa6defda38324004ac68911708358fd1f8fa736701b19982e983480d804b13ed655dfe185333a5a21c2d6deefbb6c95eaac2226303c063c53dab SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73
+AUX ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch 794 BLAKE2B 7a24e2c817b53464c8f1391084b8be3e58f3f95d22da746fbf1a1ee6abdfde8b5198a299ee8ea2fe009a6216890887548cfebf9d3e7de76dcd963a3cb2e81fbf SHA512 3e078c9fa3d22bc7d1471afe93342a5594d8128b6de6097ee67ef0762ca3827f4412fa730c066eb47c1cd25268044905b16e8805945ced2c980ff5ffc2d5b799
+AUX ocamlsdl-0.9.1-ocamlopt.patch 818 BLAKE2B 8b4f66bc97b7aa6defda38324004ac68911708358fd1f8fa736701b19982e983480d804b13ed655dfe185333a5a21c2d6deefbb6c95eaac2226303c063c53dab SHA512 02e9b226073a537f5fc95059fb840c2f4be373470dea81934bea39ed9db5f7132c24d4da81bd64a04b51b9b8ea0d4e0bbc4b0f0f0f352dd61fe74c05d815de73
 DIST ocamlsdl-0.9.1.tar.gz 226085 BLAKE2B 30ee2f12cdc83344d3a8a9d1e187415b30d5ea83cfed4ac4709a0b4350e386961123e9504fc94a2b5643bb161c65d065298e3d6d8904cb55ab5436d243dfe588 SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a
-EBUILD ocamlsdl-0.9.1.ebuild 1332 BLAKE2B 06eb79c3119c93249edc96fcb76bb4a6327ee926d15bc41003df928e679f2baed93aa65f69090c38686d010d3cebe3949710ede1bbd5c676a38418f68d79bf63 SHA512 0c473febd39a956979d25310ea1e34383fe2a80f714a4c609d6c2a1c4dc96b798eed1489e24c240b263fd79f0b4c87c9e362d81e96ca060142156fad3e4d27f6
+EBUILD ocamlsdl-0.9.1.ebuild 1405 BLAKE2B e022f8dda06d22c9929266310e881e167c72553c2272c0791c10d6953b554a383d4f269c20eedb494eaab6a741619fc709ca9e6eff4d84922fc325464e6a8495 SHA512 644a21818ba43d743226ca2bcb4259809d67e4b5b4854794f0796c587ae84eee35a932ee304006e72ebd90c4d7b7daec9c9864929f9754796a06305c78161a70
 MISC metadata.xml 245 BLAKE2B 061c12d0ba598827b52cd2af5321b8eea7e3110f1c75d694f36ceb2cb99af806bc3a7ef77ec1fd50754b6cedb70db1e1bbaeba782669b78caeeed83ca552a397 SHA512 a5af747d33959b0aa17b0427a4163fa3718edc16ecf361c27916947f769dbb6b9c3cc9d8bfb92234f4c3405bd6dc1a0a8343a7f5667c16fbfa406007bffab932
diff --git a/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch
new file mode 100644
index 000000000000..d8085a8289bc
--- /dev/null
+++ b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-fix-ocaml-4.09.0-compilation.patch
@@ -0,0 +1,28 @@
+https://sources.debian.org/patches/ocamlsdl/0.9.1-3/0002-Fix-compilation-with-OCaml-4.08.0.patch/
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 6 Sep 2019 09:35:32 +0200
+Subject: Fix compilation with OCaml 4.08.0
+
+---
+ src/sdlmouse.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sdlmouse.ml b/src/sdlmouse.ml
+index 5d3120b..39cc58d 100644
+--- a/src/sdlmouse.ml
++++ b/src/sdlmouse.ml
+@@ -49,12 +49,12 @@ external cursor_data : cursor -> cursor_data
+     = "ml_SDL_Cursor_data"
+ 
+ let string_of_bits x =
+-  let s = String.make 8 ' ' in
++  let s = Bytes.make 8 ' ' in
+   for i=0 to 7 do
+     if x land (1 lsl i) <> 0
+     then s.[7-i] <- '@'
+   done ;
+-  s
++  Bytes.to_string s
+ 
+ let pprint_cursor c =
+   let { data = data ; mask = mask } = cursor_data c in
diff --git a/dev-ml/ocamlsdl/files/ocamlopt.patch b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch
index 603654dceffa..603654dceffa 100644
--- a/dev-ml/ocamlsdl/files/ocamlopt.patch
+++ b/dev-ml/ocamlsdl/files/ocamlsdl-0.9.1-ocamlopt.patch
diff --git a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
index a18399af37b0..7f87baab89ee 100644
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit findlib eutils
+inherit findlib
 
 DESCRIPTION="OCaml SDL Bindings"
-
 HOMEPAGE="http://ocamlsdl.sourceforge.net"
 SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
 LICENSE="LGPL-2"
@@ -25,18 +24,19 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/ocamlopt.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-ocamlopt.patch"
+	"${FILESDIR}/${PN}-0.9.1-fix-ocaml-4.09.0-compilation.patch"
+)
 
 src_configure() {
 	myconf=""
 	if use opengl; then
-		destdir=`ocamlfind printconf destdir`
-		lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+		destdir=$(ocamlfind printconf destdir)
+		lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
 		if [ -z "${lablgldir}" ]; then
-			destdir=`ocamlc -where`
-			lablgldir=`find ${destdir} -name "lablgl" -or -name "lablGL"`
+			destdir=$(ocamlc -where)
+			lablgldir=$(find ${destdir} -name "lablgl" -or -name "lablGL")
 		fi
 
 		if [ ! -z "${lablgldir}" ]; then
@@ -47,8 +47,9 @@ src_configure() {
 	#use noimage && myconf="${myconf} --without-sdl-image"
 	#use nomixer && myconf="${myconf} --without-sdl-mixer"
 
-	econf $myconf \
-		`use_enable truetype sdl-ttf`
+	econf \
+		$myconf \
+		$(use_enable truetype sdl-ttf)
 }
 
 src_install() {
@@ -58,6 +59,7 @@ src_install() {
 	doinfo doc/*.info*
 
 	if use doc; then
-		dohtml doc/html/*
+		docinto html
+		dodoc doc/html/*
 	fi
 }