[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/

["Sam James" <sam@gentoo.org>]

commit:     32961e61fdd8aef2d28e533c01ca81d90140f7ff
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 20:54:19 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 21:08:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32961e61

dev-lang/ocaml: fix installed Portage set libdir target

Closes: https://bugs.gentoo.org/796641
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{ocaml-4.05.0-r5.ebuild => ocaml-4.05.0-r7.ebuild}    | 10 ++++++++--
 .../{ocaml-4.05.0-r6.ebuild => ocaml-4.05.0-r8.ebuild}    | 12 +++++++++---
 .../{ocaml-4.09.0-r1.ebuild => ocaml-4.09.0-r2.ebuild}    | 11 ++++++++---
 .../{ocaml-4.10.2-r1.ebuild => ocaml-4.10.2-r2.ebuild}    | 10 +++++++---
 .../{ocaml-4.11.2-r1.ebuild => ocaml-4.11.2-r2.ebuild}    | 15 ++++++++++-----
 .../{ocaml-4.12.0-r1.ebuild => ocaml-4.12.0-r2.ebuild}    | 14 +++++++++-----
 6 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
similarity index 96%
rename from dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
index 36adb282101..ebd032a4fd8 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@@ -50,6 +50,9 @@ pkg_setup() {
 
 src_prepare() {
 	EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
+
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
 	default
 }
 
@@ -133,10 +136,13 @@ src_install() {
 	dodoc Changes README.adoc
 	# Create envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
 		doenvd "${T}/99ocamldoc"
 	fi
+
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
+	doins "${T}"/ocaml.conf
 }

diff --git a/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
similarity index 95%
rename from dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
index ae3120cad72..11c811147b4 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
@@ -51,6 +51,9 @@ pkg_setup() {
 
 src_prepare() {
 	EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
+
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
 	default
 }
 
@@ -134,10 +137,13 @@ src_install() {
 	dodoc Changes README.adoc
 	# Create envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
-		doenvd "${T}/99ocamldoc"
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
+		doenvd "${T}"/99ocamldoc
 	fi
+
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
+	doins "${T}"/ocaml.conf
 }

diff --git a/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
similarity index 92%
rename from dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
rename to dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
index 14dc7a908b0..23d27276013 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
@@ -26,6 +26,8 @@ PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
 src_prepare() {
 	default
 
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
@@ -80,10 +82,13 @@ src_install() {
 	dodoc Changes README.adoc
 	# Create envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
-		doenvd "${T}/99ocamldoc"
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
+		doenvd "${T}"/99ocamldoc
 	fi
+
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
+	doins "${T}"/ocaml.conf
 }

diff --git a/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
similarity index 92%
rename from dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
rename to dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
index e1ca18aa961..7203dec65d6 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
@@ -24,6 +24,8 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
 src_prepare() {
 	default
 
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
@@ -80,11 +82,13 @@ src_install() {
 
 	# Create envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
-		doenvd "${T}/99ocamldoc"
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" || die
+		doenvd "${T}"/99ocamldoc
 	fi
 
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
+	doins "${T}"/ocaml.conf
 }

diff --git a/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
similarity index 90%
rename from dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
rename to dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index f1ad43dbf99..3ef5a4d1015 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -24,13 +24,15 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
 src_prepare() {
 	default
 
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
 	# bug #773226
-	#if use arm || use ppc || use x86 ; then
+	if use arm || use ppc || use x86 ; then
 		append-ldflags "-Wl,-z,notext"
-	#fi
+	fi
 
 	# Upstream build ignores LDFLAGS in several places.
 	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
@@ -76,10 +78,13 @@ src_install() {
 	dodoc Changes README.adoc
 	# Create envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
-		doenvd "${T}/99ocamldoc"
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
+		doenvd "${T}"/99ocamldoc
 	fi
+
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
+	doins "${T}"/ocaml.conf
 }

diff --git a/dev-lang/ocaml/ocaml-4.12.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
similarity index 90%
rename from dev-lang/ocaml/ocaml-4.12.0-r1.ebuild
rename to dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
index 137a6160e45..da99522c6e3 100644
--- a/dev-lang/ocaml/ocaml-4.12.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
@@ -23,13 +23,15 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
 src_prepare() {
 	default
 
+	cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
 	# OCaml generates textrels on 32-bit arches
 	# We can't do anything about it, but disabling it means that tests
 	# for OCaml-based packages won't fail on unexpected output
 	# bug #773226
-	#if use arm || use ppc || use x86 ; then
+	if use arm || use ppc || use x86 ; then
 		append-ldflags "-Wl,-z,notext"
-	#fi
+	fi
 
 	# Upstream build ignores LDFLAGS in several places.
 	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
@@ -83,11 +85,13 @@ src_install() {
 
 	# Create envd entry for latex input files
 	if use latex ; then
-		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" || die
-		doenvd "${T}/99ocamldoc"
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}"/99ocamldoc || die
+		doenvd "${T}"/99ocamldoc
 	fi
 
+	sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
 	# Install ocaml-rebuild portage set
 	insinto /usr/share/portage/config/sets
-	doins "${FILESDIR}/ocaml.conf"
+	doins "${T}"/ocaml.conf
 }