[gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/, /, bin/

["Sam James" <sam@gentoo.org>]

commit:     c81e799a3bc8de79ade7c5e2610ed305581c73cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 03:16:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 03:40:07 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c81e799a

info: drop .lz4/.lzo for info, use sorted list

Use same ordering of suffixes as we do elsewhere for easy comparison.

(I threw in .lz4 & .lzo last-minute earlier but on reflection, it's
misleading to put it here if it's not supported yet by texinfo.)

Fixes: 800e09a4a1a630548ea8316e5c906c6f48af3105
Bug: https://bugs.gentoo.org/757525
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS                        | 2 +-
 bin/ebuild-helpers/prepinfo | 2 +-
 bin/misc-functions.sh       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 780684966..3e2a5a2d6 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Features:
   * -Wodr
 
 * ecompress, etc: Support additional compression suffixes for texinfo:
-  .xz, .lz, .lz4, .zst, .lzma (bug #757525).
+  .Z, .bz2, .lzma, .lz, .xz, .zst (bug #757525).
 
 Bug fixes:
 * Manifest: Fix Manifest.addFile() calls and add tests (bug #875860).

diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo
index 4d200d0d3..14fa38226 100755
--- a/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@ -32,7 +32,7 @@ find "${ED%/}/${infodir#/}" -type d -print0 | while read -r -d $'\0' x ; do
 		[[ -e ${f} ]] && continue 2
 	done
 
-	rm -f "${x}"/dir{,.info}{,.gz,.bz2,.xz,.lz,.zst,.lzma,.lz4}
+	rm -f "${x}"/dir{,.info}{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst}
 done
 
 exit 0

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 2fa61cf37..fc2a36fb3 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -253,7 +253,7 @@ install_qa_check() {
 	fi
 
 	# Portage regenerates this on the installed system.
-	rm -f "${ED%/}"/usr/share/info/dir{,.gz,.bz2,.xz,.lz,.zst,.lzma,.lz4} || die "rm failed!"
+	rm -f "${ED%/}"/usr/share/info/dir{,.Z,.gz,.bz2,.lzma,.lz,.xz,.zst} || die "rm failed!"
 }
 
 __dyn_instprep() {