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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C028F158086 for ; Tue, 4 Jan 2022 17:54:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D56CF2BC00E; Tue, 4 Jan 2022 17:54:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D44A2BC00E for ; Tue, 4 Jan 2022 17:54:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55917343256 for ; Tue, 4 Jan 2022 17:54:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C475D239 for ; Tue, 4 Jan 2022 17:54:36 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1641318873.2328f28b225d9b77711a08ef839a6084f17b834d.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/smlnj/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/smlnj/smlnj-110.82.ebuild dev-lang/smlnj/smlnj-110.99.2.ebuild X-VCS-Directories: dev-lang/smlnj/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 2328f28b225d9b77711a08ef839a6084f17b834d X-VCS-Branch: master Date: Tue, 4 Jan 2022 17:54:36 +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: fb4731e2-6ed0-421a-a81c-b7b37968f3d6 X-Archives-Hash: 8660926fe3d908ea8245c5120d947590 commit: 2328f28b225d9b77711a08ef839a6084f17b834d Author: Maciej Barć gentoo org> AuthorDate: Tue Jan 4 17:53:22 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Tue Jan 4 17:54:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2328f28b dev-lang/smlnj: replace sed delimeter Closes: https://bugs.gentoo.org/717016 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Maciej Barć gentoo.org> dev-lang/smlnj/smlnj-110.82.ebuild | 14 +++++++------- dev-lang/smlnj/smlnj-110.99.2.ebuild | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild index 68c776772b8d..6e3b7303f61c 100644 --- a/dev-lang/smlnj/smlnj-110.82.ebuild +++ b/dev-lang/smlnj/smlnj-110.82.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -83,11 +83,11 @@ src_prepare() { epatch "${FILESDIR}/${PN}-110.82-pax-p3.patch" default for file in mk.*; do - sed -e "/^AS/s:as:$(tc-getAS):" \ - -e "/^CC/s:gcc:$(tc-getCC):" \ - -e "/^CPP/s:gcc:$(tc-getCC):" \ - -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ - -e "/^PAXMARK/s:true:"$(usex pax-kernel "paxmark.sh" "true")":" \ + sed -e "/^AS/s|as|$(tc-getAS)|" \ + -e "/^CC/s|gcc|$(tc-getCC)|" \ + -e "/^CPP/s|gcc|$(tc-getCC)|" \ + -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \ + -e "/^PAXMARK/s|true|"$(usex pax-kernel "paxmark.sh" "true")"|" \ -i base/runtime/objs/${file} done } @@ -138,7 +138,7 @@ src_install() { DIR=/usr/${SUBDIR} for file in bin/{*,.*}; do [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ - -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file} + -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" -i ${file} done dodir ${DIR}/bin exeinto ${DIR}/bin diff --git a/dev-lang/smlnj/smlnj-110.99.2.ebuild b/dev-lang/smlnj/smlnj-110.99.2.ebuild index 98c8b3ecdf06..247d06dc4ca7 100644 --- a/dev-lang/smlnj/smlnj-110.99.2.ebuild +++ b/dev-lang/smlnj/smlnj-110.99.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -84,10 +84,10 @@ src_prepare() { default # respect CC et al. (bug 243886) - sed -e "/^AS/s:as:$(tc-getAS):" \ - -e "/^CC/s:gcc:$(tc-getCC):" \ - -e "/^CPP/s:gcc:$(tc-getCC):" \ - -e "/^CFLAGS/{s:-O[0123s]:: ; s:=:= ${CFLAGS}:}" \ + sed -e "/^AS/s|as|$(tc-getAS)|" \ + -e "/^CC/s|gcc|$(tc-getCC)|" \ + -e "/^CPP/s|gcc|$(tc-getCC)|" \ + -e "/^CFLAGS/{s|-O[0123s]|| ; s|=|= ${CFLAGS}|}" \ -i base/runtime/objs/mk.* || die sed -i "s|nm |$(tc-getNM) |g" config/chk-global-names.sh || die @@ -109,7 +109,7 @@ src_install() { for file in bin/{*,.*} ; do [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ - -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" \ + -e "s|${WORKDIR}|${EPREFIX}/${DIR}|" \ -i ${file} done