gentoo auto-resync : 18:06:2024 - 00:10:02

5 files changed, 36 insertions, 137 deletions

diff --git a/dev-ml/camlidl/Manifest b/dev-ml/camlidl/Manifest
index a4e599656078..e1d09e4e338e 100644
--- a/dev-ml/camlidl/Manifest
+++ b/dev-ml/camlidl/Manifest
@@ -1,14 +1,11 @@
 AUX META.camlidl 123 BLAKE2B ac345245b30f6df1f4ada64526e0f27b68c02311d8b426bee6eb62f91de34df868dacce3a7ba755c1924d5846790c9f90f6a46500b71fb347eea7828749f9476 SHA512 196727adb64e11b4f486419147c2d711a0d278f4f340dcec61318cd76fb816deea78e85c814f6fd4f14dae168a843fe41b0ecca3086d42387475f196519cb850
 AUX camlidl-1.09.parallelMake.patch 445 BLAKE2B c0460aba8293311fe80f77bb1838cc7134e92d5de4046c798aabbeeedcd0f6560d4c1fb00b1722c09fe4dc187abf72b3c26ce54611a1f1893a0f93872c1e2c05 SHA512 7674d4b7bbe517e212ed2d3b7e881bbfb1b6308945caf6c9e7443e1f831da3310e4f4d5c7e5e1dd9f58eb5017e55c6a3c355f561647ce2c8ac3f51ea90f3236a
+AUX camlidl-1.12-destdir.patch 1135 BLAKE2B 6636f3b94b2cf104fa4c8507ea210999aa0ae04a9cbecb3c0ac5dc833b8ad4004c35b5554ea07fce253a735a12f3dcce009401cba7c8cddb302f71bbe78ceb49 SHA512 1334c948f401ad55d9e3c750580936932b75b995871b6931a24225ef1f909149e71471edc3015b2054127f112154c4cc7ed1f9e17575e1594fe97d249598aed9
 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
-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
-EBUILD camlidl-1.05-r1.ebuild 1454 BLAKE2B 85091bfcc4b093ca6e712b9d64efb6197399278f53ad29efe17553139903e05df21235e9dff67e468f8f26330866cb456c71b0f49a9333727288493aac6bdc2c SHA512 8ad0e42cdfc979f3f4c23ac44d9572b7aa79f325c907bfcf33653b4721c58c604c1e47562070d6536ebd1addd3a0a49ef3a745754cb88086030b92a14e41ebf0
-EBUILD camlidl-1.09.ebuild 1603 BLAKE2B 55254c6df8b8b58f1e42358f9b92b63c80474848f9b4a5ed0fea4b3c1680d1190e32c6ad319270647cb13cd162c2aba6f1ec691ae64fa2d847a05e15bf8e3566 SHA512 68c16d7c504b8f31310172c62ec1a108949f8a5a56ed3c6a66b5547d39859401d543ce168d115ffca9cb84f72beaa03f07e6d19eec7b5eb574cff016e3c8cf4a
 EBUILD camlidl-1.11-r1.ebuild 1530 BLAKE2B ab9cd9cb3a9684b736106e5445557894b38b5d29f6600ad1e2367aea0a03a34641087b250115a79e9d1fdce77a5bac2a96955f16bf37d6074cd2f62286644202 SHA512 e1dfbbed6a47783015008f3d1e38f1c1d6991f044f49c7227f0b97864e0f7af96a20abcaffff9ac60d69f2ace3328580748a4025c38aae6c3134f99312f02767
-EBUILD camlidl-1.12.ebuild 1523 BLAKE2B 381244df4ceba47e1eb0546c518ca727a9157b1e50a95495ceb2b4af99e4d2068b2874872ffd5ceb0321cb601bbb7b5ff0fcf37464ebe775b0b2104946b5f3c7 SHA512 0f0475f737e6f51594c0f9e0a442dbc1138ae4d9c6fd329a7845668c0c05ba882962a488d6e02ba6ff41e6e141d8113040a6d1ee82a29c52c8d7df73d315cc48
+EBUILD camlidl-1.12.ebuild 1547 BLAKE2B e1fdff8a7d2bac9e6896110de9395989e4b791d93222fbb2d17f18d06e02e7067eb4c2796f5b3191d5d861298128b92ca4560b29944ab980160c1818493c208d SHA512 b0bf989abb6c93b35552ec9f933ddd6572a7eaef5afac027c2ce0323a6c5939229f26a9c98f43c3ccb82b806a300e5e82c7e62f9f01e88121038b2ccac4d3cb9
 MISC metadata.xml 317 BLAKE2B f3eb4e29cb3181ba1fdf25471773a30feb3e45ab69f13cf748fb7b4e562314ee735a6861ba0a5707d73947fe9ef8de3af476088d1170c80567670d373ddc0c86 SHA512 5d0e4830dce77165bf1dce20fae2b3b2a1476429e01a140e2a77b33adcb1ccf328c5c90850685862b7388753295993d958ac4db01d1d7a5fdcb7c99fc85cba1f
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
+