commit: 8a828978763bf24ad1e4e5326788db90fbc00879 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 26 06:18:30 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 }
