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 A98EE158010 for ; Sun, 5 Feb 2023 18:50:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF351E07E6; Sun, 5 Feb 2023 18:50:50 +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 DB262E07E6 for ; Sun, 5 Feb 2023 18:50:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 EB09F340955 for ; Sun, 5 Feb 2023 18:50:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 417E589C for ; Sun, 5 Feb 2023 18:50:48 +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: <1675623033.d08bd3ca926b604cd45496db04aab7cfa44dcf15.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf-wrapper/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild X-VCS-Directories: sys-devel/autoconf-wrapper/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d08bd3ca926b604cd45496db04aab7cfa44dcf15 X-VCS-Branch: master Date: Sun, 5 Feb 2023 18:50:48 +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: ab53dd9c-32fa-4cf9-812e-c549442c6876 X-Archives-Hash: 0801d8bc3511d5ce5b9a2375fafa843d commit: d08bd3ca926b604cd45496db04aab7cfa44dcf15 Author: Sam James gentoo org> AuthorDate: Sun Feb 5 18:49:10 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 5 18:50:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08bd3ca sys-devel/autoconf-wrapper: fix prefix sed Closes: https://bugs.gentoo.org/893312 Signed-off-by: Sam James gentoo.org> ...er-99999999.ebuild => autoconf-wrapper-20221207-r1.ebuild} | 11 +++++++++-- sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild similarity index 85% copy from sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild copy to sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild index 6fe1847e6d0a..0de54de36dba 100644 --- a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild @@ -16,7 +16,6 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" - #SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -25,12 +24,20 @@ fi LICENSE="GPL-2" SLOT="0" +src_prepare() { + default + + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' ac-wrapper.sh || die + fi +} + src_install() { exeinto /usr/$(get_libdir)/misc doexe ac-wrapper.sh dodir /usr/bin - local x= for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do dosym -r /usr/$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild index 6fe1847e6d0a..0de54de36dba 100644 --- a/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild @@ -16,7 +16,6 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" - #SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -25,12 +24,20 @@ fi LICENSE="GPL-2" SLOT="0" +src_prepare() { + default + + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' ac-wrapper.sh || die + fi +} + src_install() { exeinto /usr/$(get_libdir)/misc doexe ac-wrapper.sh dodir /usr/bin - local x= for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do dosym -r /usr/$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x}