gentoo resync : 02.02.2022

4 files changed, 85 insertions, 7 deletions

diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index bf6148f26b49..e1f9b3f9d1e4 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -3,5 +3,7 @@ AUX includes.patch 227 BLAKE2B 2ed714238126990a834808d8d7565e244bf942402188cc6ab
 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 1295 BLAKE2B e1ffeb1e2ac477d411959ac7a6117778204d7ffd8a55915b15a85568a78b9c2bc631dbb66b1f01f1cac55fed87ea193b4a266a20d346e64c281a6db53ce58ae6 SHA512 121a78ab1da9c9a90f968bf3bacfb838c096dbbea8220e017df7fd293d72dbb709c07ebcf09d128dd5c4aa93f4dcdefb70ecaaf04d25eb4bb25850528fb45807
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+DIST camlidl109.tar.gz 125697 BLAKE2B c42e418525b9681a0e7042aea46fb581a1ffa93be416a9214325883407a62bcad7e8fd7a20fd997640deb42ddca394605f5569bc8f363721b8955629459ff49e SHA512 6cab1fa6bc2afba9b97874520eed2887c4fd341b59735854b120aa1ec8822710d9ebfadd1fecff56e629d4a1af7ee73befe6440c5462493f8408bdae8519a1fa
+EBUILD camlidl-1.05-r1.ebuild 1454 BLAKE2B 85091bfcc4b093ca6e712b9d64efb6197399278f53ad29efe17553139903e05df21235e9dff67e468f8f26330866cb456c71b0f49a9333727288493aac6bdc2c SHA512 8ad0e42cdfc979f3f4c23ac44d9572b7aa79f325c907bfcf33653b4721c58c604c1e47562070d6536ebd1addd3a0a49ef3a745754cb88086030b92a14e41ebf0
+EBUILD camlidl-1.09.ebuild 1522 BLAKE2B 112b2859b733cf6a8792c02904ebb5846012c8cdf3c36c488442d3232d35813f928dbf9995ecaf9eb3fe44896b3a97dbeb10e206c91f6b824eb340e6de397a53 SHA512 2b8e7fd7ff2c7833b9241f87b7292d3b8bd1ac04176eb172de4482e680fa8e45a7dfbb87b192923d0c6a735d242d31024eef5d91a1a52fc3ce9b5ba0c31d74b7
+MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
index 06fafb20cc46..d7cbca3f978e 100644
--- a/dev-ml/camlidl/camlidl-1.05-r1.ebuild
+++ b/dev-ml/camlidl/camlidl-1.05-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=7
@@ -22,6 +22,14 @@ PATCHES=(
 	"${FILESDIR}/nowarn.patch"
 )
 
+src_prepare() {
+	sed -i \
+		-e "s|ar rc|$(tc-getAR) rc|g" \
+		runtime/Makefile.unix \
+		|| die
+	default
+}
+
 src_compile() {
 	# Use the UNIX makefile
 	libdir=$(ocamlc -where || die)
@@ -31,7 +39,7 @@ src_compile() {
 	ln -s Makefile.unix config/Makefile || die
 
 	# Make
-	emake -j1
+	emake -j1 RANLIB="$(tc-getRANLIB)"
 }
 
 src_test() {
@@ -42,11 +50,11 @@ src_test() {
 
 src_install() {
 	libdir=$(ocamlc -where || die)
-	dodir ${libdir#${EPREFIX}}/caml
+	dodir "${libdir#${EPREFIX}}"/caml
 
 	dodir /usr/bin
 	# Install
-	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" install
+	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" RANLIB="$(tc-getRANLIB)" install
 
 	# Add package header
 	sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" >	"${D}${libdir}/META.camlidl" || die
diff --git a/dev-ml/camlidl/camlidl-1.09.ebuild b/dev-ml/camlidl/camlidl-1.09.ebuild
new file mode 100644
index 000000000000..3857dcc1ea41
--- /dev/null
+++ b/dev-ml/camlidl/camlidl-1.09.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="https://github.com/xavierleroy/${PN}/archive/${PN}$(ver_rs 0-1 '').tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '')
+
+PATCHES=(
+	"${FILESDIR}/nowarn.patch"
+)
+
+src_prepare() {
+	sed -i \
+		-e "s|ar rc|$(tc-getAR) rc|g" \
+		runtime/Makefile.unix \
+		|| die
+	default
+}
+
+src_compile() {
+	# Use the UNIX 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 RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	einfo "Running tests..."
+	cd tests || die
+	emake CCPP="$(tc-getCXX)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	libdir=$(ocamlc -where || die)
+	dodir "${libdir#${EPREFIX}}"/caml
+
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)/ocaml/stublibs
+	# Install
+	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" RANLIB="$(tc-getRANLIB)" install
+
+	# Add package header
+	sed -e "s/@VERSION/${P}/g" "${FILESDIR}/META.camlidl" >	"${D}${libdir}/META.camlidl" || die
+
+	# Documentation
+	dodoc README Changes
+}
diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml
index bef24d2c2337..ff5a0cd1ae3d 100644
--- a/dev-ml/camlidl/metadata.xml
+++ b/dev-ml/camlidl/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 </pkgmetadata>