5 files changed, 34 insertions, 134 deletions
diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index ed2eeb57e751..bb7598e04feb 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -1,4 +1,2 @@
-DIST camlidl-1.05.tar.gz 100640 BLAKE2B 38cbcebd43ced26c44803608aabdacfbd33734357097a542ee2558223b9699d89cf7be388feba59630b10e4dc3977bffd08c669d3cf676d2136f54a6a8d52aab SHA512 e8857aca818a06f8c861e5f55dddd7e8e3ab1efae51647534460b4f092166709d86c6de1215c792a0489d668d72064ccfb7635e9a6d3854cd5a62f74541a9d18
-DIST camlidl109.tar.gz 125697 BLAKE2B c42e418525b9681a0e7042aea46fb581a1ffa93be416a9214325883407a62bcad7e8fd7a20fd997640deb42ddca394605f5569bc8f363721b8955629459ff49e SHA512 6cab1fa6bc2afba9b97874520eed2887c4fd341b59735854b120aa1ec8822710d9ebfadd1fecff56e629d4a1af7ee73befe6440c5462493f8408bdae8519a1fa
 DIST camlidl111.tar.gz 182421 BLAKE2B 5bd4bf2e2eb73f632c5e99a271e13d6a1b4b815476f2a17aaa6a05a4ccf048f4c58b099219e46d36659711f0473dbf91d484d5dcb12ee2e08327afec92a66b66 SHA512 dfd99cb10ee96de4e8a9a2ee86834a33ce10ba362aea93a061c373336db872ddf4017f2601bc47d1662de2f5699e885166dc984a213ff1c4142d41d7c99d7a21
 DIST camlidl112.tar.gz 182507 BLAKE2B 3a1e4f3f7341bb3e34397af995c660178850c9a774a44866f458cb7731e143e5e2252355c200c7d82f7d55d765749aa26105642027867623f0f6e3125f98c892 SHA512 b60b666c865bf923b1f2499238fd81232454a5d358960dd2038707bf71916d5dd7432044a01fa272e61cd2af6867aa23330f6f06398f213fd3e92072e1d784a1
diff --git a/dev-ml/camlidl/camlidl-1.05-r1.ebuild b/dev-ml/camlidl/camlidl-1.05-r1.ebuild
deleted file mode 100644
index d7cbca3f978e..000000000000
--- a/dev-ml/camlidl/camlidl-1.05-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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="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"
-
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/includes.patch"
-	"${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)"
-}
-
-src_install() {
-	libdir=$(ocamlc -where || die)
-	dodir "${libdir#${EPREFIX}}"/caml
-
-	dodir /usr/bin
-	# 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/camlidl-1.09.ebuild b/dev-ml/camlidl/camlidl-1.09.ebuild
deleted file mode 100644
index a31500fcbdb5..000000000000
--- a/dev-ml/camlidl/camlidl-1.09.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 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"
-
-S="${WORKDIR}"/${PN}-${PN}$(ver_rs 0-1 '')
-
-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}"
-
-PATCHES=(
-	"${FILESDIR}/nowarn.patch"
-	"${FILESDIR}"/${P}.parallelMake.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 depend
-	emake -j1 RANLIB="$(tc-getRANLIB)" CPP="$(tc-getPROG CPP cpp)"
-}
-
-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/camlidl-1.12.ebuild b/dev-ml/camlidl/camlidl-1.12.ebuild
index 949d6d9386a7..08e45566bf79 100644
--- a/dev-ml/camlidl/camlidl-1.12.ebuild
+++ b/dev-ml/camlidl/camlidl-1.12.ebuild
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/nowarn.patch"
+	"${FILESDIR}/${P}-destdir.patch"
 )
 
 src_prepare() {
@@ -56,7 +57,7 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/$(get_libdir)/ocaml/stublibs
 	# Install
-	emake BINDIR="${ED}/usr/bin" OCAMLLIB="${D}${libdir}" RANLIB="$(tc-getRANLIB)" install
+	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" 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/files/camlidl-1.12-destdir.patch b/dev-ml/camlidl/files/camlidl-1.12-destdir.patch
new file mode 100644
index 000000000000..6f2b14f8f583
--- /dev/null
+++ b/dev-ml/camlidl/files/camlidl-1.12-destdir.patch
@@ -0,0 +1,32 @@
+--- a/runtime/Makefile.unix	2024-06-17 10:03:13.524360767 +0200
++++ b/runtime/Makefile.unix	2024-06-17 10:03:55.768905814 +0200
+@@ -26,10 +26,10 @@
+ #	$(RANLIB) $@
+ 
+ install:
+-	cp camlidlruntime.h $(OCAMLLIB)/caml/camlidlruntime.h
+-	cp libcamlidl.a $(OCAMLLIB)/libcamlidl.a
+-	cp dllcamlidl.so $(OCAMLLIB)/stublibs/dllcamlidl.so
+-	cd $(OCAMLLIB); $(RANLIB) libcamlidl.a
++	cp camlidlruntime.h $(DESTDIR)$(OCAMLLIB)/caml/camlidlruntime.h
++	cp libcamlidl.a $(DESTDIR)$(OCAMLLIB)/libcamlidl.a
++	cp dllcamlidl.so $(DESTDIR)$(OCAMLLIB)/stublibs/dllcamlidl.so
++	cd $(DESTDIR)$(OCAMLLIB); $(RANLIB) libcamlidl.a
+ 
+ clean:
+ 	rm -f *.a *.o *.so
+--- a/lib/Makefile	2024-06-17 10:06:49.145036983 +0200
++++ b/lib/Makefile	2024-06-17 10:07:44.366441218 +0200
+@@ -40,10 +40,10 @@
+ 	$(OCAMLOPT) -a -o $(NATIVELIB) -cclib -lcamlidl $(NATIVEOBJS)
+ 
+ installbyt:
+-	cp -p $(INTERFACES) $(BYTELIB) $(OCAMLLIB)
++	cp -p $(INTERFACES) $(BYTELIB) $(DESTDIR)$(OCAMLLIB)
+ 
+ installopt:
+-	cp -p $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(OCAMLLIB)
++	cp -p $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(DESTDIR)$(OCAMLLIB)
+ 
+ .SUFFIXES: .mli .ml .cmi .cmo .cmx
+