gentoo resync : 28.04.2021

5 files changed, 28 insertions, 31 deletions

diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index 4c07bfe80157..9b58507bb820 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -1,7 +1,7 @@
 AUX META.camlidl 123 BLAKE2B ac345245b30f6df1f4ada64526e0f27b68c02311d8b426bee6eb62f91de34df868dacce3a7ba755c1924d5846790c9f90f6a46500b71fb347eea7828749f9476 SHA512 196727adb64e11b4f486419147c2d711a0d278f4f340dcec61318cd76fb816deea78e85c814f6fd4f14dae168a843fe41b0ecca3086d42387475f196519cb850
-AUX includes.patch 361 BLAKE2B 9e04253feb45286142c41bfa83482d9e85ed46a0e37d20f47d6d38f59c5cb5833a1aaa54cba0b241cc23efe497671d788960a294bb5305f5fa96aab4dc05a72c SHA512 e76690bba23d6ac3a4ef0f15feed6826cd203c38919b8fdf043c46c6f7311eef768c9c85b9855d217e1014b0b55086c7dfcea4c132320035aeafcb8e7de2bcd3
-AUX nowarn.patch 347 BLAKE2B 810cff7b2dbb40bac0b998a16684590747e6397195487ed4677a9dffdb778dfbc4a38599d54f5981226481fbf3e50b3f97bb4d88d7beda26a47f6b6da08fd604 SHA512 b436490d97b63ac428ddea2a473c3bf7c027331699234b875dd6215b5f39a3a6aaa5cc2ff7d841cf0ef8d012edcdff98a519437c857676fe6d8407c3610e3303
-AUX tests.patch 1061 BLAKE2B 45519125064c2be10be8e9b5e44b65c67fc70b58499d8cecb9abdcea2e312e03036c7a17861dd0a755d8773cf1b925b5a25ef962107cf6bb14a46c6dd8d6b036 SHA512 72234478b420edbebf48aaba4ab0078c35c3d8eced6634092b8ca605ba93a5791249e2f271ea656e86c62ac45561c25100a5e786f7827b8545ea4996e0f2850e
+AUX includes.patch 227 BLAKE2B 2ed714238126990a834808d8d7565e244bf942402188cc6ab93e05e1ba6e0c4de30304c7f2fb18ab52ac81aa00cd854938ebb8ca434af72c8ecdadf18b09248f SHA512 b8d27e7845706c16bcf07654b36ed17e452f4a9be0119741565977077085cf0fd43f5a69de84866b6b889dbd16432d46a34867f9b102e999d39ef438727f0cc1
+AUX nowarn.patch 214 BLAKE2B 00b4b63daefaea0d8ceb9ef919037567c2ac8a0b0aac8c6634d9656c8b4d93ae4a22edeff45dd3bbc857168119301d0ff8d04901d44c42ddd130b31f8a840340 SHA512 94f4b57f485239715b9f0478025dc0af192e815e6a03d696b47f910e786cfdb583e6205da9bead57a2a7e33e2e6f5d433095774e0e31c10949664693370ee761
+AUX tests.patch 931 BLAKE2B 0f18d35a22067f0189c413c1d52e8b8823b38bdc0024e35105b3074ace352bf47c50fa0ed3834447f7de90c7049d0bf6692c643e113d4e00cca2b1fa95103448 SHA512 436b047d232e0a8f65f87dc3a3da4ddcc4b629dab3475d8097ee29f7bf5219d5bb964407cc11ac7a9df6c31efea9e94d22dc66c4a2ad45dc1cb26938c3fb7400
 DIST camlidl-1.05.tar.gz 100640 BLAKE2B 38cbcebd43ced26c44803608aabdacfbd33734357097a542ee2558223b9699d89cf7be388feba59630b10e4dc3977bffd08c669d3cf676d2136f54a6a8d52aab SHA512 e8857aca818a06f8c861e5f55dddd7e8e3ab1efae51647534460b4f092166709d86c6de1215c792a0489d668d72064ccfb7635e9a6d3854cd5a62f74541a9d18
-EBUILD camlidl-1.05-r1.ebuild 1292 BLAKE2B 21364af50b590384377442f95c58de1ce15e78b68cda2f52cdbf772ec5bcb9583c7698dd93a82447762e3f949470122329400dd17c73df66dde372e49499018c SHA512 21da9d939f6b867b786ca80b488e080ceb6c4e29a8b3b8b65fa4d2fbd72809317ad81886a2499c91d47ae7ac16f080431952fbe6b80e755ad08630a9bc3c2a8a
+EBUILD camlidl-1.05-r1.ebuild 1295 BLAKE2B e1ffeb1e2ac477d411959ac7a6117778204d7ffd8a55915b15a85568a78b9c2bc631dbb66b1f01f1cac55fed87ea193b4a266a20d346e64c281a6db53ce58ae6 SHA512 121a78ab1da9c9a90f968bf3bacfb838c096dbbea8220e017df7fd293d72dbb709c07ebcf09d128dd5c4aa93f4dcdefb70ecaaf04d25eb4bb25850528fb45807
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
index 6dd3e9f5d3d3..06fafb20cc46 100644
--- a/dev-ml/camlidl/camlidl-1.05-r1.ebuild
+++ b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'Caml"
 HOMEPAGE="http://caml.inria.fr/camlidl/"
 SRC_URI="http://caml.inria.fr/distrib/bazar-ocaml/${P}.tar.gz"
+
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
+
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/tests.patch"
-	epatch "${FILESDIR}/includes.patch"
-	epatch "${FILESDIR}/nowarn.patch"
-}
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/includes.patch"
+	"${FILESDIR}/nowarn.patch"
+)
 
 src_compile() {
 	# Use the UNIX makefile
-	libdir=`ocamlc -where`
-	sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix
-	sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix
-	ln -s Makefile.unix config/Makefile
+	libdir=$(ocamlc -where || die)
+
+	sed -i -e "s|OCAMLLIB=.*|OCAMLLIB=${libdir}|" config/Makefile.unix || die
+	sed -i -e "s|BINDIR=.*|BINDIR=${EPREFIX}/usr/bin|" config/Makefile.unix || die
+	ln -s Makefile.unix config/Makefile || die
 
 	# Make
 	emake -j1
@@ -34,13 +36,14 @@ src_compile() {
 
 src_test() {
 	einfo "Running tests..."
-	cd tests
+	cd tests || die
 	emake CCPP="$(tc-getCXX)"
 }
 
 src_install() {
-	libdir=`ocamlc -where`
+	libdir=$(ocamlc -where || die)
 	dodir ${libdir#${EPREFIX}}/caml
+
 	dodir /usr/bin
 	# Install
 	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" install
diff --git a/dev-ml/camlidl/files/includes.patch b/dev-ml/camlidl/files/includes.patch
index 060aceefd0a5..077ba21d93da 100644
--- a/dev-ml/camlidl/files/includes.patch
+++ b/dev-ml/camlidl/files/includes.patch
@@ -1,7 +1,5 @@
-Index: camlidl-1.05/runtime/comerror.c
-===================================================================
---- camlidl-1.05.orig/runtime/comerror.c
-+++ camlidl-1.05/runtime/comerror.c
+--- a/runtime/comerror.c
++++ b/runtime/comerror.c
 @@ -22,6 +22,7 @@
  #include <caml/callback.h>
  #include <caml/fail.h>
diff --git a/dev-ml/camlidl/files/nowarn.patch b/dev-ml/camlidl/files/nowarn.patch
index 8b457cf7ed1e..3d9a5bbbf8af 100644
--- a/dev-ml/camlidl/files/nowarn.patch
+++ b/dev-ml/camlidl/files/nowarn.patch
@@ -1,7 +1,5 @@
-Index: camlidl-1.05/compiler/Makefile
-===================================================================
---- camlidl-1.05.orig/compiler/Makefile
-+++ camlidl-1.05/compiler/Makefile
+--- a/compiler/Makefile
++++ b/compiler/Makefile
 @@ -29,7 +29,7 @@ PROG=camlidl$(EXE)
  all: $(PROG)
  
diff --git a/dev-ml/camlidl/files/tests.patch b/dev-ml/camlidl/files/tests.patch
index f7272424be80..f8c4595f9fbd 100644
--- a/dev-ml/camlidl/files/tests.patch
+++ b/dev-ml/camlidl/files/tests.patch
@@ -1,7 +1,5 @@
-Index: camlidl-1.05/tests/unix.idl
-===================================================================
---- camlidl-1.05.orig/tests/unix.idl
-+++ camlidl-1.05/tests/unix.idl
+--- a/tests/unix.idl
++++ b/tests/unix.idl
 @@ -15,16 +15,16 @@ quote (C, "
  
    union process_status { int code; };