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 CDC2E15806E for ; Fri, 26 May 2023 06:23:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4739E0897; Fri, 26 May 2023 06:23:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 9350BE088C for ; Fri, 26 May 2023 06:23:31 +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 7EB27340F76 for ; Fri, 26 May 2023 06:23:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5B31A73 for ; Fri, 26 May 2023 06:23:28 +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: <1685081910.8a828978763bf24ad1e4e5326788db90fbc00879.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/prefix-toolkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/prefix-toolkit/Manifest app-portage/prefix-toolkit/prefix-toolkit-9.ebuild X-VCS-Directories: app-portage/prefix-toolkit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8a828978763bf24ad1e4e5326788db90fbc00879 X-VCS-Branch: master Date: Fri, 26 May 2023 06:23:28 +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: 8d43e9db-818c-4b7f-aab3-1f0c06ea6246 X-Archives-Hash: b676dad6ebf71097bfaeddacf0c7e660 commit: 8a828978763bf24ad1e4e5326788db90fbc00879 Author: Sam James gentoo org> AuthorDate: Fri May 26 06:18:30 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 26 06:18:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a828978 app-portage/prefix-toolkit: drop crime-against-ebuild (don't self-extract files) I've tried my best at a faithful conversion at https://gitweb.gentoo.org/proj/prefix/prefix-toolkit.git/ with the ebuilds, extracted contents from them, and original commit authorship & messages (w/ cherry-picked reference to ::gentoo commits). There's also a 'naive-conversion' branch with just me doing the extraction. Closes: https://bugs.gentoo.org/866962 Signed-off-by: Sam James gentoo.org> app-portage/prefix-toolkit/Manifest | 1 + app-portage/prefix-toolkit/prefix-toolkit-9.ebuild | 25 +++------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app-portage/prefix-toolkit/Manifest b/app-portage/prefix-toolkit/Manifest new file mode 100644 index 000000000000..da79406b5d2b --- /dev/null +++ b/app-portage/prefix-toolkit/Manifest @@ -0,0 +1 @@ +DIST prefix-toolkit-9.tar.bz2 8642 BLAKE2B b81a2c5af56e123b74434512660783273a5af1ea3c193e97c48f4bcf84eaafce3b95df432f5571ef049f56a7f2fefa7a1da603a14bc3a3cef9465559e519e948 SHA512 45f7718e5ef72f05a6bd5ef3bdda3f62076c925b414bd8f2ca54207deb515adab37612c571e5e92b2a1ec400b3780043804814e1c1243f8ace90dca6a1ad2035 diff --git a/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild index a06537c1ebf4..50fe30e95cef 100644 --- a/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild +++ b/app-portage/prefix-toolkit/prefix-toolkit-9.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Utilities for users of Gentoo Prefix" HOMEPAGE="https://prefix.gentoo.org/" -SRC_URI="" +SRC_URI="https://gitweb.gentoo.org/proj/prefix/prefix-toolkit.git/snapshot/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" @@ -41,23 +41,10 @@ RDEPEND="${DEPEND} ) " -S="${WORKDIR}" - -my_unpack() { - local infile=$1 - local outfile=${2:-${infile}} - ebegin "extracting ${outfile}" - sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \ - > "${outfile}" || die "Failed to unpack ${outfile}" - eend $? -} - src_unpack() { + default + if use prefix-stack ; then - my_unpack prefix-stack.bash_login - my_unpack prefix-stack.bashrc - my_unpack prefix-stack.envd.99stack - my_unpack prefix-stack-ccwrap local editor pager for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano do @@ -68,12 +55,6 @@ src_unpack() { [[ -x ${pager} ]] || continue done printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback - else - my_unpack prefix-stack-setup - fi - if use prefix; then - # does not make sense on vanilla Gentoo - my_unpack startprefix fi }