diff --git a/dev-ml/camlidl/camlidl-1.09.ebuild b/dev-ml/camlidl/camlidl-1.09.ebuild
index 69fd815e015e0..a31500fcbdb5c 100644
--- a/dev-ml/camlidl/camlidl-1.09.ebuild
+++ b/dev-ml/camlidl/camlidl-1.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,8 @@ DESCRIPTION="CamlIDL is a stub code generator for using C/C++ libraries from O'C
 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"
@@ -16,8 +18,6 @@ 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"
 	"${FILESDIR}"/${P}.parallelMake.patch
diff --git a/dev-ml/camlidl/camlidl-1.11.ebuild b/dev-ml/camlidl/camlidl-1.11-r1.ebuild
similarity index 92%
rename from dev-ml/camlidl/camlidl-1.11.ebuild
rename to dev-ml/camlidl/camlidl-1.11-r1.ebuild
index cf719ff1b91ab..046fe9242f7bd 100644
--- a/dev-ml/camlidl/camlidl-1.11.ebuild
+++ b/dev-ml/camlidl/camlidl-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,8 @@ DESCRIPTION="Stub code generator for OCaml"
 HOMEPAGE="https://github.com/xavierleroy/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"
@@ -16,8 +18,6 @@ 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"
 )
@@ -39,8 +39,8 @@ src_compile() {
 	ln -s Makefile.unix config/Makefile || die
 
 	# Make
-	emake depend
-	emake -j1 RANLIB="$(tc-getRANLIB)" CPP="$(tc-getPROG CPP cpp)"
+	emake depend CPP="$(tc-getPROG CPP cpp)"
+	emake -j1 RANLIB="$(tc-getRANLIB)"
 }
 
 src_test() {