From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 468661382C5 for ; Fri, 18 Jun 2021 21:09:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D117E0864; Fri, 18 Jun 2021 21:09:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78E6FE0864 for ; Fri, 18 Jun 2021 21:09:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F6A2335D9E for ; Fri, 18 Jun 2021 21:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46D797AC for ; Fri, 18 Jun 2021 21:09:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1624050509.32961e61fdd8aef2d28e533c01ca81d90140f7ff.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ocaml/ocaml-4.05.0-r5.ebuild dev-lang/ocaml/ocaml-4.05.0-r6.ebuild dev-lang/ocaml/ocaml-4.05.0-r7.ebuild dev-lang/ocaml/ocaml-4.05.0-r8.ebuild dev-lang/ocaml/ocaml-4.09.0-r1.ebuild dev-lang/ocaml/ocaml-4.09.0-r2.ebuild dev-lang/ocaml/ocaml-4.10.2-r1.ebuild dev-lang/ocaml/ocaml-4.10.2-r2.ebuild dev-lang/ocaml/ocaml-4.11.2-r1.ebuild dev-lang/ocaml/ocaml-4.11.2-r2.ebuild dev-lang/ocaml/ocaml-4.12.0-r1.ebuild dev-lang/ocaml/ocaml-4.12.0-r2.ebuild X-VCS-Directories: dev-lang/ocaml/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 32961e61fdd8aef2d28e533c01ca81d90140f7ff X-VCS-Branch: master Date: Fri, 18 Jun 2021 21:09:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9fdb4b87-8d6a-495f-a3d6-ec1dbe4e2262 X-Archives-Hash: 4d18766f4b51d4144491693e345de629 commit: 32961e61fdd8aef2d28e533c01ca81d90140f7ff Author: Sam James gentoo org> AuthorDate: Fri Jun 18 20:54:19 2021 +0000 Commit: Sam James gentoo 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 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 }