[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-06-01 Thread Sam James
commit: 3d76fd2a63cd75d1ab29fdb81cef1014c50a9eff
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun  2 03:37:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  2 03:37:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d76fd2a

app-arch/xz-utils: cater to libarchive tar harder

Closes: https://bugs.gentoo.org/933200
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.2.ebuild | 12 
 app-arch/xz-utils/xz-utils-.ebuild  | 12 
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index 1a3ca64e6cc2..a5c27989d3cc 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -116,10 +116,14 @@ multilib_src_compile() {
if use pgo ; then
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
-   local tar_pgo_args=(
-   --mtime=@2718281828
-   )
-   has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
+   local tar_pgo_args=()
+
+   if has_version -b "app-alternatives/tar[gnu]" ; then
+   tar_pgo_args+=(
+   --mtime=@2718281828
+   --sort=name
+   )
+   fi
 
if multilib_is_native_abi ; then
(

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 1a3ca64e6cc2..a5c27989d3cc 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -116,10 +116,14 @@ multilib_src_compile() {
if use pgo ; then
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
-   local tar_pgo_args=(
-   --mtime=@2718281828
-   )
-   has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
+   local tar_pgo_args=()
+
+   if has_version -b "app-alternatives/tar[gnu]" ; then
+   tar_pgo_args+=(
+   --mtime=@2718281828
+   --sort=name
+   )
+   fi
 
if multilib_is_native_abi ; then
(



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-31 Thread Sam James
commit: dcced683ec572c49cb46c52be52389aed5be1575
Author: Sam James  gentoo  org>
AuthorDate: Fri May 31 21:57:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 31 21:57:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcced683

app-arch/xz-utils: improve PGO

Capture .libs/ so we get liblzma.so and xz.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.2.ebuild | 6 +++---
 app-arch/xz-utils/xz-utils-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index aa93a8f1f0cd..1a3ca64e6cc2 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -129,12 +129,12 @@ multilib_src_compile() {
"${tar_pgo_args[@]}" \
-cf xz-pgo-test-01.tar \
{"${S}","${BUILD_DIR}"}/**/*.[cho] \
-   {"${S}","${BUILD_DIR}"}/**/*.so* \
+   {"${S}","${BUILD_DIR}"}/**/.libs/* \
{"${S}","${BUILD_DIR}"}/**/**.txt \
{"${S}","${BUILD_DIR}"}/tests/files
 
-   stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar
-   md5sum xz-pgo-test-01.tar
+   stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar || die
+   md5sum xz-pgo-test-01.tar || die
)
 
local test_variants=(

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index aa93a8f1f0cd..1a3ca64e6cc2 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -129,12 +129,12 @@ multilib_src_compile() {
"${tar_pgo_args[@]}" \
-cf xz-pgo-test-01.tar \
{"${S}","${BUILD_DIR}"}/**/*.[cho] \
-   {"${S}","${BUILD_DIR}"}/**/*.so* \
+   {"${S}","${BUILD_DIR}"}/**/.libs/* \
{"${S}","${BUILD_DIR}"}/**/**.txt \
{"${S}","${BUILD_DIR}"}/tests/files
 
-   stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar
-   md5sum xz-pgo-test-01.tar
+   stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar || die
+   md5sum xz-pgo-test-01.tar || die
)
 
local test_variants=(



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-31 Thread Sam James
commit: 18670aafe88038b15026e8d268e874cc50717f5d
Author: Sam James  gentoo  org>
AuthorDate: Fri May 31 21:47:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 31 21:47:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18670aaf

app-arch/xz-utils: fix quoting for PGO

I apparently only tested USE=-extra-filters earlier.

Thanks to matoro for reporting.

Bug: https://bugs.gentoo.org/933205
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.2.ebuild | 6 +++---
 app-arch/xz-utils/xz-utils-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index 2c99085d8f55..aa93a8f1f0cd 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -142,14 +142,14 @@ multilib_src_compile() {
# 
https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
'-0 -C none'
'-2 -C crc32'
-   $(usev extra-filters '-6 --arm --lzma2 -C 
crc64')
-   $(usev extra-filters '-6 --x86 --lzma2=lc=4 -C 
sha256')
+   "$(usev extra-filters '-6 --arm --lzma2 -C 
crc64')"
+   "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C 
sha256')"
'-7e --format=lzma'
 
# Our own variants
''
'-9e'
-   $(usev extra-filters '--x86 --lzma2=preset=9e')
+   "$(usev extra-filters '--x86 
--lzma2=preset=9e')"
)
local test_variant
for test_variant in "${test_variants[@]}" ; do

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 2c99085d8f55..aa93a8f1f0cd 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -142,14 +142,14 @@ multilib_src_compile() {
# 
https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
'-0 -C none'
'-2 -C crc32'
-   $(usev extra-filters '-6 --arm --lzma2 -C 
crc64')
-   $(usev extra-filters '-6 --x86 --lzma2=lc=4 -C 
sha256')
+   "$(usev extra-filters '-6 --arm --lzma2 -C 
crc64')"
+   "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C 
sha256')"
'-7e --format=lzma'
 
# Our own variants
''
'-9e'
-   $(usev extra-filters '--x86 --lzma2=preset=9e')
+   "$(usev extra-filters '--x86 
--lzma2=preset=9e')"
)
local test_variant
for test_variant in "${test_variants[@]}" ; do



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-31 Thread Sam James
commit: 069c1813605ee8309e9bac4fd9b9829d7d669842
Author: Sam James  gentoo  org>
AuthorDate: Fri May 31 14:29:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 31 14:29:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069c1813

app-arch/xz-utils: use has_version -b

Not that it really matters for PGO...

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.2.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index 687084d7fdae..2c99085d8f55 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -119,7 +119,7 @@ multilib_src_compile() {
local tar_pgo_args=(
--mtime=@2718281828
)
-   has_version "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
+   has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
 
if multilib_is_native_abi ; then
(

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 687084d7fdae..2c99085d8f55 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -119,7 +119,7 @@ multilib_src_compile() {
local tar_pgo_args=(
--mtime=@2718281828
)
-   has_version "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
+   has_version -b "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
 
if multilib_is_native_abi ; then
(



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-31 Thread Sam James
commit: a780f708450f5ef986336186cf49d83b7b66ed71
Author: Sam James  gentoo  org>
AuthorDate: Fri May 31 14:19:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 31 14:23:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a780f708

app-arch/xz-utils: fix PGO with USE=-extra-filters

Closes: https://bugs.gentoo.org/933205
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.2.ebuild | 6 +++---
 app-arch/xz-utils/xz-utils-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index 923a92ff82a9..43e7da134e9a 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -137,14 +137,14 @@ multilib_src_compile() {
# 
https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
'-0 -C none'
'-2 -C crc32'
-   '-6 --arm --lzma2 -C crc64'
-   '-6 --x86 --lzma2=lc=4 -C sha256'
+   $(usev extra-filters '-6 --arm --lzma2 -C 
crc64')
+   $(usev extra-filters '-6 --x86 --lzma2=lc=4 -C 
sha256')
'-7e --format=lzma'
 
# Our own variants
''
'-9e'
-   '--x86 --lzma2=preset=9e'
+   $(usev extra-filters '--x86 --lzma2=preset=9e')
)
local test_variant
for test_variant in "${test_variants[@]}" ; do

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 923a92ff82a9..43e7da134e9a 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -137,14 +137,14 @@ multilib_src_compile() {
# 
https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
'-0 -C none'
'-2 -C crc32'
-   '-6 --arm --lzma2 -C crc64'
-   '-6 --x86 --lzma2=lc=4 -C sha256'
+   $(usev extra-filters '-6 --arm --lzma2 -C 
crc64')
+   $(usev extra-filters '-6 --x86 --lzma2=lc=4 -C 
sha256')
'-7e --format=lzma'
 
# Our own variants
''
'-9e'
-   '--x86 --lzma2=preset=9e'
+   $(usev extra-filters '--x86 --lzma2=preset=9e')
)
local test_variant
for test_variant in "${test_variants[@]}" ; do



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-31 Thread Sam James
commit: 6fcd44ef37805c5c43770ca0f207d8a0bd99cb75
Author: Sam James  gentoo  org>
AuthorDate: Fri May 31 14:28:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 31 14:28:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fcd44ef

app-arch/xz-utils: fix PGO with libarchive tar

Closes: https://bugs.gentoo.org/933200
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.2.ebuild | 9 +++--
 app-arch/xz-utils/xz-utils-.ebuild  | 9 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
index 43e7da134e9a..687084d7fdae 100644
--- a/app-arch/xz-utils/xz-utils-5.6.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -116,17 +116,22 @@ multilib_src_compile() {
if use pgo ; then
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
+   local tar_pgo_args=(
+   --mtime=@2718281828
+   )
+   has_version "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
+
if multilib_is_native_abi ; then
(
shopt -s globstar
 
tar \
-   --sort=name --mtime=@2718281828 \
+   "${tar_pgo_args[@]}" \
-cf xz-pgo-test-01.tar \
{"${S}","${BUILD_DIR}"}/**/*.[cho] \
{"${S}","${BUILD_DIR}"}/**/*.so* \
{"${S}","${BUILD_DIR}"}/**/**.txt \
-   {"${S}","${BUILD_DIR}"}/tests/files \
+   {"${S}","${BUILD_DIR}"}/tests/files
 
stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar
md5sum xz-pgo-test-01.tar

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 43e7da134e9a..687084d7fdae 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -116,17 +116,22 @@ multilib_src_compile() {
if use pgo ; then
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
+   local tar_pgo_args=(
+   --mtime=@2718281828
+   )
+   has_version "app-alternatives/tar[gnu]" && tar_pgo_args+=( 
--sort=name )
+
if multilib_is_native_abi ; then
(
shopt -s globstar
 
tar \
-   --sort=name --mtime=@2718281828 \
+   "${tar_pgo_args[@]}" \
-cf xz-pgo-test-01.tar \
{"${S}","${BUILD_DIR}"}/**/*.[cho] \
{"${S}","${BUILD_DIR}"}/**/*.so* \
{"${S}","${BUILD_DIR}"}/**/**.txt \
-   {"${S}","${BUILD_DIR}"}/tests/files \
+   {"${S}","${BUILD_DIR}"}/tests/files
 
stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar
md5sum xz-pgo-test-01.tar



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-29 Thread Sam James
commit: b57579a37f3071b9e3a87ae3cc3805317996930c
Author: Sam James  gentoo  org>
AuthorDate: Wed May 29 18:33:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 29 18:36:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b57579a3

app-arch/xz-utils: drop old & masked 5.4.6-r1

We had no evidence this version was bad despite being signed by the malicious
maintainer Jia Tan so we kept it around but masked. Now that 5.4.7+ is out,
there's no value in keeping it around at all.

We can now last-rite sec-keys/openpgp-keys-jiatan which I'll do shortly.

Bug: https://bugs.gentoo.org/928134
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest |   2 -
 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 140 -
 2 files changed, 142 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 6e2325b5ff04..97458d71004e 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,7 +1,5 @@
 DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
-DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
-DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 DIST xz-5.4.7.tar.gz 2798247 BLAKE2B 
e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02
 SHA512 
82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea
 DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 
525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72
 SHA512 
00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a
 DIST xz-5.6.2.tar.gz 2355785 BLAKE2B 
d2d5f9772714b5b5993ec26c313bd27dc10d88928d9d3a1c71b78f80797e376cf065dcdd0c2c7977a83b67cbe2558140c74c5df44a9408e5a72529212c2205ad
 SHA512 
c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
deleted file mode 100644
index 23b4c36a6b58..
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   # Per tukaani.org, git.tukaani.org is a mirror of github and
-   # may be behind.
-   EGIT_REPO_URI="
-   https://github.com/tukaani-project/xz
-   https://git.tukaani.org/xz.git
-   "
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
-   https://downloads.sourceforge.net/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-29 Thread Sam James
commit: 169d529ced8652aad48e64a6e3abbd8240872da9
Author: Sam James  gentoo  org>
AuthorDate: Wed May 29 17:29:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 29 17:30:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169d529c

app-arch/xz-utils: add 5.6.2

This release is signed by the original maintainer (and future releases
going forward will be too) Lasse Collin.

I worked with him on these releases and have reproduced his tarball
with only minor differences in dates. I encourage people to do the same:
using the 'mydist' target in the Makefile is recommended to minimise 
differences.

In future, I may package libtool-vanilla like we do for autoconf-vanilla
and automake-vanilla to make comparisons easier.

Bug: https://bugs.gentoo.org/928134
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest| 2 ++
 app-arch/xz-utils/{xz-utils-.ebuild => xz-utils-5.6.2.ebuild} | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild| 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 2359a12a651f..6e2325b5ff04 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,3 +4,5 @@ DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 DIST xz-5.4.7.tar.gz 2798247 BLAKE2B 
e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02
 SHA512 
82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea
 DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 
525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72
 SHA512 
00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a
+DIST xz-5.6.2.tar.gz 2355785 BLAKE2B 
d2d5f9772714b5b5993ec26c313bd27dc10d88928d9d3a1c71b78f80797e376cf065dcdd0c2c7977a83b67cbe2558140c74c5df44a9408e5a72529212c2205ad
 SHA512 
c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82
+DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 
9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23
 SHA512 
f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
similarity index 99%
copy from app-arch/xz-utils/xz-utils-.ebuild
copy to app-arch/xz-utils/xz-utils-5.6.2.ebuild
index a92c1540f80c..923a92ff82a9 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.2.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )"
 fi
 
 src_prepare() {

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index a92c1540f80c..923a92ff82a9 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )"
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-05-29 Thread Sam James
commit: d453a7ecd664ece027933fbdc1746d054fc768b5
Author: Sam James  gentoo  org>
AuthorDate: Wed May 29 17:22:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 29 17:30:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d453a7ec

app-arch/xz-utils: add 5.4.7

This release is signed by the original maintainer (and future releases
going forward will be too) Lasse Collin.

I worked with him on these releases and have reproduced his tarball
with only minor differences in dates. I encourage people to do the same:
using the 'mydist' target in the Makefile is recommended to minimise 
differences.

In future, I may package libtool-vanilla like we do for autoconf-vanilla
and automake-vanilla to make comparisons easier.

Bug: https://bugs.gentoo.org/928134
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 +
 app-arch/xz-utils/xz-utils-5.4.7.ebuild | 140 
 2 files changed, 142 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index ec1a06d7c64c..2359a12a651f 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,3 +2,5 @@ DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d13
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
 DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
+DIST xz-5.4.7.tar.gz 2798247 BLAKE2B 
e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02
 SHA512 
82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea
+DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 
525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72
 SHA512 
00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a

diff --git a/app-arch/xz-utils/xz-utils-5.4.7.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.7.ebuild
new file mode 100644
index ..cd73493d1889
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.4.7.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
+   https://downloads.sourceforge.net/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="doc +extra-filters pgo nls static-libs"
+
+if [[ ${PV} != 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-04-15 Thread Sam James
commit: 83a27ac5162cf15e1dca6de92f2debe452024d24
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 16 01:21:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 16 01:24:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a27ac5

app-arch/xz-utils: improve USE=pgo for 

Takes a lot of inspiration from 
https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80.

IIRC at least one other distro does this for xz or gzip (was it Clear Linux?)

The testsuite could do with better coverage so supplement it by creating
a tar archive of a bunch of files made during the build, then repeatedly
compress/decompress it to gather profiling data.

That said, I don't get any binary differences at all for liblzma and xz
for my usual flags (-O3 -march=znver2 ...). I do get some small differences
for just -O2. Both tests were done with GCC 14.0.1 20240415.

It would be nice if we could drop -fprofile-partial-training and that's
perhaps the thing to try next. I see this commit as mostly a step towards
being able to do that which should let PGO give smaller binaries with -O2
at least.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index ec5227371390..d2e98e50e15a 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -106,6 +106,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
# -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
+   # TODO: revisit that now we have the tar/xz loop below?
# See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
@@ -115,6 +116,43 @@ multilib_src_compile() {
if use pgo ; then
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
 
+   if multilib_is_native_abi ; then
+   (
+   shopt -s globstar
+
+   tar \
+   --sort=name --mtime=@2718281828 \
+   -cf xz-pgo-test-01.tar \
+   {"${S}","${BUILD_DIR}"}/**/*.[cho] \
+   {"${S}","${BUILD_DIR}"}/**/*.so* \
+   {"${S}","${BUILD_DIR}"}/**/**.txt \
+   {"${S}","${BUILD_DIR}"}/tests/files \
+
+   stat --printf="xz-pgo-test-01.tar.tar size: 
%s\n" xz-pgo-test-01.tar
+   md5sum xz-pgo-test-01.tar
+   )
+
+   local test_variants=(
+   # Borrowed from ALT Linux
+   # 
https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
+   '-0 -C none'
+   '-2 -C crc32'
+   '-6 --arm --lzma2 -C crc64'
+   '-6 --x86 --lzma2=lc=4 -C sha256'
+   '-7e --format=lzma'
+
+   # Our own variants
+   ''
+   '-9e'
+   '--x86 --lzma2=preset=9e'
+   )
+   local test_variant
+   for test_variant in "${test_variants[@]}" ; do
+   "${BUILD_DIR}"/src/xz/xz -c ${test_variant} 
xz-pgo-test-01.tar | "${BUILD_DIR}"/src/xz/xz -c -d - > /dev/null
+   assert "Testing '${test_variant}' variant 
failed"
+   done
+   fi
+
if tc-is-clang; then
llvm-profdata merge "${T}"/${ABI}-pgo 
--output="${T}"/${ABI}-pgo/default.profdata || die
fi



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-04-15 Thread Sam James
commit: 05bb76fc10f59fb46bc904c01fdb89cb1c631d94
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 15 23:10:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 15 23:13:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05bb76fc

app-arch/xz-utils: fix live ebuild (drop obsolete rm)

The malicious test files were removed in an upstream commit [0]. The
git repository is currently being reviewed.

The `rm ...` would fail as a result since that happened.

[0] e93e13c8b3bec925c56e0c0b675d8000a0f7f754

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 1f42a49bc42b..ec5227371390 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -56,9 +56,6 @@ fi
 src_prepare() {
default
 
-   # Delete known-compromised test data (bug #928134)
-   rm tests/files/bad-3-corrupt_lzma2.xz 
tests/files/good-large_compressed.lzma || die
-
if [[ ${PV} ==  ]] ; then
eautopoint
eautoreconf



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-04-03 Thread Sam James
commit: 82577449b0a1fd33d3fa24de9a59c216780003c3
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  3 06:34:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  3 06:36:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82577449

app-arch/xz-utils: depend on >=sec-keys/openpgp-keys-lassecollin-20230213 for 
verify-sig

Someone reported an expired key issue when verifying 5.4.2. That might be 
because
of an old version of gemato which didn't check whether the key was expired back
when the signature was made (since fixed) or because of an old version of
openpgp-keys-lassecollin.

Add a dep to sort out the latter given it's possible.

(Note that sec-keys/openpgp-keys-lassecollin hasn't changed in quite some time,
the latest version was added over a year ago in 
81260457d76492e0e7a26241c6b594b4d35f869f.)

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 982f62b0c16d..a6187bec0743 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
 src_prepare() {

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 7c68d671d406..1f42a49bc42b 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-30 Thread Sam James
commit: efe06b01128ce829eb4e4c6a5ed5f52a342ecbc0
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 30 21:51:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 30 21:51:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe06b01

app-arch/xz-utils: delete known-bad test files in 

As I promised to do in 29d5f89b75c1ab37b3346ac41840cf8fa4b3d3a8 a moment
ago. I really doubt many people are rocking  and there's nothing known-bad
in the git repo *that can use these* but the test files are dangerous anyway
so let's just do it for completeness.

Bug: https://bugs.gentoo.org/928134
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index fbf94a267df6..7c68d671d406 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -56,6 +56,9 @@ fi
 src_prepare() {
default
 
+   # Delete known-compromised test data (bug #928134)
+   rm tests/files/bad-3-corrupt_lzma2.xz 
tests/files/good-large_compressed.lzma || die
+
if [[ ${PV} ==  ]] ; then
eautopoint
eautoreconf



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-30 Thread Sam James
commit: 29d5f89b75c1ab37b3346ac41840cf8fa4b3d3a8
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 30 21:47:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 30 21:48:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d5f89b

app-arch/xz-utils: drop 5.6.1 (noop really)

On IRC, it was pointed out that non-Gentoo users might get confused if they
see Gentoo has 5.6.1 in its repository even though it is masked.

Let's just drop it to avoid confusion. It's better to do that than risk someone
being confused - there's enough confusion out there anyway.

In a minute, I'll probably adjust the live ebuild to delete the known bad
test data too.

Bug: https://bugs.gentoo.org/928134
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 -
 app-arch/xz-utils/xz-utils-5.6.1.ebuild | 141 
 2 files changed, 143 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 1cba80db1e9c..ec1a06d7c64c 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,5 +2,3 @@ DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d13
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
 DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
-DIST xz-5.6.1.tar.gz 3045434 BLAKE2B 
b3fc3140c9655e812a03800a5ed8ac709aaafaee2ce5d3a62defdd085e643fa639de44beb64833160f4eb12829ad25b96d9f50a8c3d56d79cd5bbef71b9009b2
 SHA512 
8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda
-DIST xz-5.6.1.tar.gz.sig 566 BLAKE2B 
d515e60da078e6cb79a2c7a9daa3c8326487d7e8c0f1398d6059c53493232c3a3c21174dab5904833d0938a59fdb02f86aab05767d8cf02f8ee53981d3767fae
 SHA512 
73f50ff5ce7f9d0a3bed1bc7d9e26de2217915517d2057f0c7102374eb20de1bb8b02a2f78680aae80b55913b2ede5141a118c51a2f565c6eba6ae8406474938

diff --git a/app-arch/xz-utils/xz-utils-5.6.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
deleted file mode 100644
index b8b6290dd365..
--- a/app-arch/xz-utils/xz-utils-5.6.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   # Per tukaani.org, git.tukaani.org is a mirror of github and
-   # may be behind.
-   EGIT_REPO_URI="
-   https://github.com/tukaani-project/xz
-   https://git.tukaani.org/xz.git
-   "
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
-SLOT="0"
-IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
-
-if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-30 Thread Sam James
commit: 640c1210a12d9d169d78ec41d3c8befce683b7c6
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 30 19:40:06 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 30 19:41:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640c1210

app-arch/xz-utils: update verify-sig in live template

Just in preparation for the inevitable release from Lasse. I have no information
as to when that will be, as he is both catching up and trying to check things
very carefully.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index f3c9351bf44b..fbf94a267df6 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
# bug #272880 and bug #286068
BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
 else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc
inherit verify-sig
 
MY_P="${PN/-utils}-${PV/_}"
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-27 Thread Sam James
commit: 284af946fd4269c2ba87b4b37858dc7868947015
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 28 04:20:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 28 04:20:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284af946

app-arch/xz-utils: drop 5.4.5

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 -
 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 146 
 2 files changed, 148 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7dfe5e9a9c26..06fafaca4b3e 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,5 +1,3 @@
-DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315
 SHA512 
91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b
-DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d
 DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 DIST xz-5.6.1.tar.gz 3045434 BLAKE2B 
b3fc3140c9655e812a03800a5ed8ac709aaafaee2ce5d3a62defdd085e643fa639de44beb64833160f4eb12829ad25b96d9f50a8c3d56d79cd5bbef71b9009b2
 SHA512 
8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
deleted file mode 100644
index 4b9909c4c5ce..
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
-
-if [[ ${PV} ==  ]] ; then
-   # Per tukaani.org, git.tukaani.org is a mirror of github and
-   # may be behind.
-   EGIT_REPO_URI="
-   https://github.com/tukaani-project/xz
-   https://git.tukaani.org/xz.git
-   "
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="doc +extra-filters pgo nls static-libs"
-
-if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
-fi
-
-src_prepare() {
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   eautopoint
-   eautoreconf
-   else
-   # Allow building shared libs on Solaris/x64
-   elibtoolize
-   fi
-}
-
-multilib_src_configure() {
-   local myconf=(
-   --enable-threads
-   $(multilib_native_use_enable doc)
-   $(use_enable nls)
-   $(use_enable static-libs static)
-   )
-
-   if ! 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-24 Thread Sam James
commit: f57f2999b0f1b19eb04b2510c44c02f301b56b64
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 12:11:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 12:11:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57f2999

app-arch/xz-utils: Stabilize 5.6.1 sparc, #927693

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
index dcef14f4a400..b8b6290dd365 100644
--- a/app-arch/xz-utils/xz-utils-5.6.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-24 Thread Sam James
commit: 2236dd04e1c480733c5091e7cd555f2598ef93cd
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:38:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:38:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2236dd04

app-arch/xz-utils: Stabilize 5.6.1 ppc, #927693

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
index a5c1fba1f7eb..dcef14f4a400 100644
--- a/app-arch/xz-utils/xz-utils-5.6.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-24 Thread Sam James
commit: 96b3d7c14b5af602854e53adb2b0766cb1f9d906
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:37:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:37:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b3d7c1

app-arch/xz-utils: Stabilize 5.6.1 ppc64, #927693

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
index 26e27ad6ecb8..a5c1fba1f7eb 100644
--- a/app-arch/xz-utils/xz-utils-5.6.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-24 Thread Sam James
commit: 8fa92c6ad39a3373b0cc99aee9f58e49166d128e
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 24 11:34:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 24 11:34:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa92c6a

app-arch/xz-utils: Stabilize 5.6.1 arm, #927693

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
index 13f84f7eab24..26e27ad6ecb8 100644
--- a/app-arch/xz-utils/xz-utils-5.6.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-18 Thread Ionen Wolkens
commit: c5d21cc082a67e9b0b2701af7d0e8db51d4fea80
Author: Matoro Mahri  matoro  tk>
AuthorDate: Mon Mar 18 17:08:12 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 19 03:42:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d21cc0

app-arch/xz-utils: Stabilize 5.4.6-r1 hppa, #925410

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 39a813036b1c..50f09f3d3417 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/, app-arch/xz-utils/files/

2024-03-15 Thread Sam James
commit: 37a32112d32835c9bda70572bbd63c664a062a43
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 15 09:40:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 15 09:40:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a32112

app-arch/xz-utils: drop 5.6.0-r1

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest |   2 -
 .../xz-utils-5.6.0-ifunc-crc-workaround.patch  |  27 
 ...tils-5.6.0-logging-verbosity-threads-auto.patch |  43 --
 app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild | 146 -
 4 files changed, 218 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 2638e4d9191c..7dfe5e9a9c26 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,7 +2,5 @@ DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2b
 DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d
 DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
-DIST xz-5.6.0.tar.gz 3036813 BLAKE2B 
7b7ed5da5711fee6e53af1c72a6f4aff569d7cf986bca8cd3f3104cbb73342e81306295903a8660476d228344eb17d08e2a005230c06ac7e3d9e27bbaba0e075
 SHA512 
1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8
-DIST xz-5.6.0.tar.gz.sig 566 BLAKE2B 
6c073c620b03751fcb40f47612acf96bee67f9dd5c38aa8ccd1f140cf3183ba009b60496fe319c14d9a32bd6cc6563f142d1716d9ae1e0554f77114dc9fc8f21
 SHA512 
2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0
 DIST xz-5.6.1.tar.gz 3045434 BLAKE2B 
b3fc3140c9655e812a03800a5ed8ac709aaafaee2ce5d3a62defdd085e643fa639de44beb64833160f4eb12829ad25b96d9f50a8c3d56d79cd5bbef71b9009b2
 SHA512 
8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda
 DIST xz-5.6.1.tar.gz.sig 566 BLAKE2B 
d515e60da078e6cb79a2c7a9daa3c8326487d7e8c0f1398d6059c53493232c3a3c21174dab5904833d0938a59fdb02f86aab05767d8cf02f8ee53981d3767fae
 SHA512 
73f50ff5ce7f9d0a3bed1bc7d9e26de2217915517d2057f0c7102374eb20de1bb8b02a2f78680aae80b55913b2ede5141a118c51a2f565c6eba6ae8406474938

diff --git a/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch 
b/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch
deleted file mode 100644
index e793aac56a78..
--- a/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/925415
-https://gcc.gnu.org/PR114115
-
-Workaround a build failure with USE=pgo by disabling instrumentation of the
-crc{32,64} IFUNC resolvers.
 a/src/liblzma/check/crc32_fast.c
-+++ b/src/liblzma/check/crc32_fast.c
-@@ -135,7 +135,7 @@ typedef uint32_t (*crc32_func_type)(
- // This resolver is shared between all three dispatch methods. It serves as
- // the ifunc resolver if ifunc is supported, otherwise it is called as a
- // regular function by the constructor or first call resolution methods.
--static crc32_func_type
-+static __attribute__((no_profile_instrument_function)) crc32_func_type
- crc32_resolve(void)
- {
-   return is_arch_extension_supported()
 a/src/liblzma/check/crc64_fast.c
-+++ b/src/liblzma/check/crc64_fast.c
-@@ -98,7 +98,7 @@ typedef uint64_t (*crc64_func_type)(
- # pragma GCC diagnostic ignored "-Wunused-function"
- #endif
- 
--static crc64_func_type
-+static __attribute__((no_profile_instrument_function)) crc64_func_type
- crc64_resolve(void)
- {
-   return is_arch_extension_supported()

diff --git 
a/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch 
b/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch
deleted file mode 100644
index a203ecf2aa97..
--- 
a/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/tukaani-project/xz/commit/5c91b454c24e043ca8f2cc7d2b09bd091dafe655
-
-From 5c91b454c24e043ca8f2cc7d2b09bd091dafe655 Mon Sep 17 00:00:00 2001
-From: Jia Tan 
-Date: Tue, 27 Feb 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-09 Thread Sam James
commit: 5b2cdd1c7d1743ea2937248ccc02bca9517a5771
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  9 21:02:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  9 21:02:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2cdd1c

app-arch/xz-utils: add 5.6.1

Bug: https://bugs.gentoo.org/925415
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 +
 app-arch/xz-utils/xz-utils-5.6.1.ebuild | 141 
 2 files changed, 143 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 360a44287429..2638e4d9191c 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,3 +4,5 @@ DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 DIST xz-5.6.0.tar.gz 3036813 BLAKE2B 
7b7ed5da5711fee6e53af1c72a6f4aff569d7cf986bca8cd3f3104cbb73342e81306295903a8660476d228344eb17d08e2a005230c06ac7e3d9e27bbaba0e075
 SHA512 
1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8
 DIST xz-5.6.0.tar.gz.sig 566 BLAKE2B 
6c073c620b03751fcb40f47612acf96bee67f9dd5c38aa8ccd1f140cf3183ba009b60496fe319c14d9a32bd6cc6563f142d1716d9ae1e0554f77114dc9fc8f21
 SHA512 
2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0
+DIST xz-5.6.1.tar.gz 3045434 BLAKE2B 
b3fc3140c9655e812a03800a5ed8ac709aaafaee2ce5d3a62defdd085e643fa639de44beb64833160f4eb12829ad25b96d9f50a8c3d56d79cd5bbef71b9009b2
 SHA512 
8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda
+DIST xz-5.6.1.tar.gz.sig 566 BLAKE2B 
d515e60da078e6cb79a2c7a9daa3c8326487d7e8c0f1398d6059c53493232c3a3c21174dab5904833d0938a59fdb02f86aab05767d8cf02f8ee53981d3767fae
 SHA512 
73f50ff5ce7f9d0a3bed1bc7d9e26de2217915517d2057f0c7102374eb20de1bb8b02a2f78680aae80b55913b2ede5141a118c51a2f565c6eba6ae8406474938

diff --git a/app-arch/xz-utils/xz-utils-5.6.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
new file mode 100644
index ..f3c9351bf44b
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.6.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
+SLOT="0"
+IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+fi
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared libs on Solaris/x64
+   elibtoolize
+   fi
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-threads
+   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/files/, app-arch/xz-utils/

2024-03-04 Thread Sam James
commit: 97ebdf452e739583cb3f1d5cbcff6bb145811e2a
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:03:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:05:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ebdf45

app-arch/xz-utils: workaround USE=pgo build failure

Workaround a build failure with USE=pgo by disabling instrumentation of the
crc{32,64} IFUNC resolvers.

No revbump as it shouldn't affect runtime at all - instrumentation would kill
it immediately if at all, it's not an issue from the profiled binaries, just
the instrumentation to profile them.

Bug: https://gcc.gnu.org/PR114115
Closes: https://bugs.gentoo.org/925415
Signed-off-by: Sam James  gentoo.org>

 .../xz-utils-5.6.0-ifunc-crc-workaround.patch  | 27 ++
 app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild |  1 +
 2 files changed, 28 insertions(+)

diff --git a/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch 
b/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch
new file mode 100644
index ..e793aac56a78
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/925415
+https://gcc.gnu.org/PR114115
+
+Workaround a build failure with USE=pgo by disabling instrumentation of the
+crc{32,64} IFUNC resolvers.
+--- a/src/liblzma/check/crc32_fast.c
 b/src/liblzma/check/crc32_fast.c
+@@ -135,7 +135,7 @@ typedef uint32_t (*crc32_func_type)(
+ // This resolver is shared between all three dispatch methods. It serves as
+ // the ifunc resolver if ifunc is supported, otherwise it is called as a
+ // regular function by the constructor or first call resolution methods.
+-static crc32_func_type
++static __attribute__((no_profile_instrument_function)) crc32_func_type
+ crc32_resolve(void)
+ {
+   return is_arch_extension_supported()
+--- a/src/liblzma/check/crc64_fast.c
 b/src/liblzma/check/crc64_fast.c
+@@ -98,7 +98,7 @@ typedef uint64_t (*crc64_func_type)(
+ # pragma GCC diagnostic ignored "-Wunused-function"
+ #endif
+ 
+-static crc64_func_type
++static __attribute__((no_profile_instrument_function)) crc64_func_type
+ crc64_resolve(void)
+ {
+   return is_arch_extension_supported()

diff --git a/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
index 26708cb6aea1..7260487c61d5 100644
--- a/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
@@ -55,6 +55,7 @@ fi
 
 PATCHES=(
"${FILESDIR}"/${P}-logging-verbosity-threads-auto.patch
+   "${FILESDIR}"/${PN}-5.6.0-ifunc-crc-workaround.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-04 Thread Sam James
commit: 96f1a1b9fc0fed4c48fd59d5c9108478e7964d17
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:05:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:05:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f1a1b9

app-arch/xz-utils: drop 5.6.0

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.6.0.ebuild | 141 
 1 file changed, 141 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.6.0.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.0.ebuild
deleted file mode 100644
index f3c9351bf44b..
--- a/app-arch/xz-utils/xz-utils-5.6.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   # Per tukaani.org, git.tukaani.org is a mirror of github and
-   # may be behind.
-   EGIT_REPO_URI="
-   https://github.com/tukaani-project/xz
-   https://git.tukaani.org/xz.git
-   "
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
-SLOT="0"
-IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
-
-if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
-fi
-
-src_prepare() {
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   eautopoint
-   eautoreconf
-   else
-   # Allow building shared libs on Solaris/x64
-   elibtoolize
-   fi
-}
-
-multilib_src_configure() {
-   local myconf=(
-   --enable-threads
-   $(multilib_native_use_enable doc)
-   $(use_enable nls)
-   $(use_enable static-libs static)
-   $(use_enable cpu_flags_arm_crc32 arm64-crc32)
-   )
-
-   if ! multilib_is_native_abi ; then
-   myconf+=(
-   --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
-   )
-   fi
-
-   if ! use extra-filters ; then
-   myconf+=(
-   # LZMA1 + LZMA2 for standard .lzma & .xz files
-   --enable-encoders=lzma1,lzma2
-   --enable-decoders=lzma1,lzma2
-
-   # those are used by default, depending on preset
-   --enable-match-finders=hc3,hc4,bt4
-
-   # CRC64 is used by default, though some (old?) files 
use CRC32
-   --enable-checks=crc32,crc64
-   )
-   fi
-
-   if [[ ${CHOST} == *-solaris* ]] ; then
-   export gl_cv_posix_shell="${EPREFIX}"/bin/sh
-
-   # Undo Solaris-based defaults pointing to /usr/xpg5/bin
-   myconf+=( --disable-path-for-script )
-   fi
-
-   ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-   # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
-   # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
-   local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
-   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
-
-   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
-
-   if use pgo ; then
-   emake CFLAGS="${CFLAGS} 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-02 Thread Sam James
commit: 5b00ac4b1909a00c79f773d2bac89b404572dc4f
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 02:26:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 02:26:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b00ac4b

app-arch/xz-utils: Stabilize 5.4.6-r1 arm64, #925410

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 4d2da59f43cd..39a813036b1c 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-03-02 Thread Sam James
commit: 533d820f73222916151c895e868576618d1abc64
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  2 22:07:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  2 22:07:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=533d820f

app-arch/xz-utils: Stabilize 5.4.6-r1 ppc, #925410

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index fe16d933735d..4d2da59f43cd 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-29 Thread Sam James
commit: cbeada6b3429e2f3fa6af18a10552e4885eb5743
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Feb 29 15:16:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 29 22:13:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbeada6b

app-arch/xz-utils: stable 5.4.6-r1 for sparc, bug #925410

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 348cdfd6b974..fe16d933735d 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/, app-arch/xz-utils/files/

2024-02-28 Thread Sam James
commit: 7be3cdcb6f30cd95a7f5a754a48c664e1fad0a3f
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 28 20:51:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 28 20:52:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be3cdcb

app-arch/xz-utils: backport verbosity improvement for thread auto-adjustment

Signed-off-by: Sam James  gentoo.org>

 ...tils-5.6.0-logging-verbosity-threads-auto.patch |  43 ++
 app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild | 145 +
 2 files changed, 188 insertions(+)

diff --git 
a/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch 
b/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch
new file mode 100644
index ..a203ecf2aa97
--- /dev/null
+++ 
b/app-arch/xz-utils/files/xz-utils-5.6.0-logging-verbosity-threads-auto.patch
@@ -0,0 +1,43 @@
+https://github.com/tukaani-project/xz/commit/5c91b454c24e043ca8f2cc7d2b09bd091dafe655
+
+From 5c91b454c24e043ca8f2cc7d2b09bd091dafe655 Mon Sep 17 00:00:00 2001
+From: Jia Tan 
+Date: Tue, 27 Feb 2024 23:42:41 +0800
+Subject: [PATCH] xz: Change logging level for thread reduction to highest
+ verbosity only.
+
+Now that multi threaded encoding is the default, users do not need to
+see a warning message everytime the number of threads is reduced. On
+some machines, this could happen very often. It is not unreasonable for
+users to need to set double verbose mode to see this kind of
+information.
+
+To see these warning messages -vv or --verbose --verbose must be passed
+to set xz into the highest possible verbosity mode.
+
+These warnings had caused automated testing frameworks to fail when they
+expected no output to stderr.
+
+Thanks to Sebastian Andrzej Siewior for reporting this and for the
+initial version of the patch.
+--- a/src/xz/coder.c
 b/src/xz/coder.c
+@@ -581,7 +581,7 @@ coder_set_compression_settings(void)
+ 
+   if (memory_usage <= memory_limit) {
+   // The memory usage is now low enough.
+-  message(V_WARNING, _("Reduced the number of "
++  message(V_DEBUG, _("Reduced the number of "
+   "threads from %s to %s to not exceed "
+   "the memory usage limit of %s MiB"),
+   uint64_to_str(
+@@ -601,7 +601,7 @@ coder_set_compression_settings(void)
+   // time the soft limit will never make xz fail and never make
+   // xz change settings that would affect the compressed output.
+   if (hardware_memlimit_mtenc_is_default()) {
+-  message(V_WARNING, _("Reduced the number of threads "
++  message(V_DEBUG, _("Reduced the number of threads "
+   "from %s to one. The automatic memory usage "
+   "limit of %s MiB is still being exceeded. "
+   "%s MiB of memory is required. "
+

diff --git a/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
new file mode 100644
index ..26708cb6aea1
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-24 Thread Arthur Zamarin
commit: 4a690fadfd9b31a3b6a411c655ac4f869a83d229
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Feb 24 19:46:37 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Feb 24 19:46:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a690fad

app-arch/xz-utils: Stabilize 5.4.6-r1 amd64, #925410

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 1a348eb6824a..348cdfd6b974 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-24 Thread Sam James
commit: fa288e6dadbd4a17210a562310227558ba66d498
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 24 14:04:21 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 14:04:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa288e6d

app-arch/xz-utils: Stabilize 5.4.6-r1 x86, #925410

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 65661cb3045f..1a348eb6824a 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-24 Thread Michał Górny
commit: 4770e6a672c459e9bae90126745c5ee8e5b564c2
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb 24 10:36:49 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb 24 10:36:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4770e6a6

app-arch/xz-utils: Stabilize 5.4.6-r1 ppc64, #925410

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index e79b11aa933a..65661cb3045f 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-24 Thread Michał Górny
commit: c6c65fb2de8694c95f09969562b34bba50dc722d
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Feb 24 10:22:54 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Feb 24 10:22:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c65fb2

app-arch/xz-utils: Stabilize 5.4.6-r1 arm, #925410

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 15cea9ec02c1..e79b11aa933a 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-24 Thread Sam James
commit: a34162ecb85645cad876c4e6c7e0507a349afb9e
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 24 10:11:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 10:11:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34162ec

app-arch/xz-utils: add 5.6.0 

First stable release of the improvements mentioned in 
708e8c2d8e43ede23fdffb92b8505d35e0aeddc8.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 +
 app-arch/xz-utils/xz-utils-5.6.0.ebuild | 141 
 2 files changed, 143 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 56ebdba5daf8..f3e269689121 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -6,3 +6,5 @@ DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 
1a2106b9e43cb06ddde0f8a9fc86754fe2d335
 DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 
760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76
 SHA512 
714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7
 DIST xz-5.5.2beta.tar.gz 2995626 BLAKE2B 
3fb1c61fbe39f1a6e74729459b0f0593699ba9f380cf072d74982bd42fd67a807988dce521e85dd1437675dd19c485ad1cdba248e82ff72975cd50edd3e522f8
 SHA512 
8495d98a7a50292380cbac6ae1ce4d0709cf84bca9cd639bf9252ff18d647306ca1ac4f5b258a686bca324653c8cd31c2f4d4877a15fa7300dd82a416abe59a9
 DIST xz-5.5.2beta.tar.gz.sig 566 BLAKE2B 
b4ab96a737b607b830c507d9df42a4e0ad463bb98fb3747f1c7b953f6738ea555e96a7324e08848617752209f05d3ee3a70936972e7d866dec58d3e0db8ddfcd
 SHA512 
86acaba3d1c86134e9e68c9940c280f19d0fdd01897e7f6545fc6cf7d6a1034fe7a2a511f618af04e6da80a31fade608765d493b5f5c32d3684a2db46f196f28
+DIST xz-5.6.0.tar.gz 3036813 BLAKE2B 
7b7ed5da5711fee6e53af1c72a6f4aff569d7cf986bca8cd3f3104cbb73342e81306295903a8660476d228344eb17d08e2a005230c06ac7e3d9e27bbaba0e075
 SHA512 
1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8
+DIST xz-5.6.0.tar.gz.sig 566 BLAKE2B 
6c073c620b03751fcb40f47612acf96bee67f9dd5c38aa8ccd1f140cf3183ba009b60496fe319c14d9a32bd6cc6563f142d1716d9ae1e0554f77114dc9fc8f21
 SHA512 
2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0

diff --git a/app-arch/xz-utils/xz-utils-5.6.0.ebuild 
b/app-arch/xz-utils/xz-utils-5.6.0.ebuild
new file mode 100644
index ..f3c9351bf44b
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.6.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
+SLOT="0"
+IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+fi
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared libs on Solaris/x64
+   elibtoolize
+   fi
+}
+
+multilib_src_configure() {
+   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-24 Thread Sam James
commit: 2fc75491a0d170ef8cd743c533a436e3e71a4237
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 24 10:12:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 24 10:12:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc75491

app-arch/xz-utils: drop 5.5.1_alpha, 5.5.2_beta

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest|   4 -
 app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild | 140 -
 app-arch/xz-utils/xz-utils-5.5.2_beta.ebuild  | 141 --
 3 files changed, 285 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index f3e269689121..360a44287429 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,9 +2,5 @@ DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2b
 DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d
 DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
-DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 
1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f
 SHA512 
dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1
-DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 
760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76
 SHA512 
714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7
-DIST xz-5.5.2beta.tar.gz 2995626 BLAKE2B 
3fb1c61fbe39f1a6e74729459b0f0593699ba9f380cf072d74982bd42fd67a807988dce521e85dd1437675dd19c485ad1cdba248e82ff72975cd50edd3e522f8
 SHA512 
8495d98a7a50292380cbac6ae1ce4d0709cf84bca9cd639bf9252ff18d647306ca1ac4f5b258a686bca324653c8cd31c2f4d4877a15fa7300dd82a416abe59a9
-DIST xz-5.5.2beta.tar.gz.sig 566 BLAKE2B 
b4ab96a737b607b830c507d9df42a4e0ad463bb98fb3747f1c7b953f6738ea555e96a7324e08848617752209f05d3ee3a70936972e7d866dec58d3e0db8ddfcd
 SHA512 
86acaba3d1c86134e9e68c9940c280f19d0fdd01897e7f6545fc6cf7d6a1034fe7a2a511f618af04e6da80a31fade608765d493b5f5c32d3684a2db46f196f28
 DIST xz-5.6.0.tar.gz 3036813 BLAKE2B 
7b7ed5da5711fee6e53af1c72a6f4aff569d7cf986bca8cd3f3104cbb73342e81306295903a8660476d228344eb17d08e2a005230c06ac7e3d9e27bbaba0e075
 SHA512 
1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8
 DIST xz-5.6.0.tar.gz.sig 566 BLAKE2B 
6c073c620b03751fcb40f47612acf96bee67f9dd5c38aa8ccd1f140cf3183ba009b60496fe319c14d9a32bd6cc6563f142d1716d9ae1e0554f77114dc9fc8f21
 SHA512 
2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0

diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild 
b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
deleted file mode 100644
index 8283f1a12b3e..
--- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
-
-if [[ ${PV} ==  ]] ; then
-   # Per tukaani.org, git.tukaani.org is a mirror of github and
-   # may be behind.
-   EGIT_REPO_URI="
-   https://github.com/tukaani-project/xz
-   https://git.tukaani.org/xz.git
-   "
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-14 Thread Sam James
commit: 708e8c2d8e43ede23fdffb92b8505d35e0aeddc8
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 14 18:34:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 14 18:34:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708e8c2d

app-arch/xz-utils: add 5.5.2_beta 

With some huge speedup work in the decoder and also a licence change from
public domain -> 0BSD.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest   | 2 ++
 .../xz-utils/{xz-utils-.ebuild => xz-utils-5.5.2_beta.ebuild}| 5 +++--
 app-arch/xz-utils/xz-utils-.ebuild   | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 6b0b9ee0bbca..56ebdba5daf8 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,3 +4,5 @@ DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f
 DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 
1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f
 SHA512 
dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1
 DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 
760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76
 SHA512 
714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7
+DIST xz-5.5.2beta.tar.gz 2995626 BLAKE2B 
3fb1c61fbe39f1a6e74729459b0f0593699ba9f380cf072d74982bd42fd67a807988dce521e85dd1437675dd19c485ad1cdba248e82ff72975cd50edd3e522f8
 SHA512 
8495d98a7a50292380cbac6ae1ce4d0709cf84bca9cd639bf9252ff18d647306ca1ac4f5b258a686bca324653c8cd31c2f4d4877a15fa7300dd82a416abe59a9
+DIST xz-5.5.2beta.tar.gz.sig 566 BLAKE2B 
b4ab96a737b607b830c507d9df42a4e0ad463bb98fb3747f1c7b953f6738ea555e96a7324e08848617752209f05d3ee3a70936972e7d866dec58d3e0db8ddfcd
 SHA512 
86acaba3d1c86134e9e68c9940c280f19d0fdd01897e7f6545fc6cf7d6a1034fe7a2a511f618af04e6da80a31fade608765d493b5f5c32d3684a2db46f196f28

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-5.5.2_beta.ebuild
similarity index 95%
copy from app-arch/xz-utils/xz-utils-.ebuild
copy to app-arch/xz-utils/xz-utils-5.5.2_beta.ebuild
index 8283f1a12b3e..f3c9351bf44b 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.2_beta.ebuild
@@ -45,9 +45,9 @@ DESCRIPTION="Utils for managing LZMA compressed files"
 HOMEPAGE="https://tukaani.org/xz/;
 
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
+LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
 SLOT="0"
-IUSE="doc +extra-filters pgo nls static-libs"
+IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
@@ -71,6 +71,7 @@ multilib_src_configure() {
$(multilib_native_use_enable doc)
$(use_enable nls)
$(use_enable static-libs static)
+   $(use_enable cpu_flags_arm_crc32 arm64-crc32)
)
 
if ! multilib_is_native_abi ; then

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 8283f1a12b3e..f3c9351bf44b 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -45,9 +45,9 @@ DESCRIPTION="Utils for managing LZMA compressed files"
 HOMEPAGE="https://tukaani.org/xz/;
 
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
+LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
 SLOT="0"
-IUSE="doc +extra-filters pgo nls static-libs"
+IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
@@ -71,6 +71,7 @@ multilib_src_configure() {
$(multilib_native_use_enable doc)
$(use_enable nls)
$(use_enable static-libs static)
+   $(use_enable cpu_flags_arm_crc32 arm64-crc32)
)
 
if ! multilib_is_native_abi ; then



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-02-06 Thread Sam James
commit: b62b9e7ca8ec68c3a741690d291546a5949359e8
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Feb  6 05:16:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 22:42:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62b9e7c

app-arch/xz-utils: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../xz-utils/{xz-utils-5.4.6.ebuild => xz-utils-5.4.6-r1.ebuild}  | 8 +---
 app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild | 8 +---
 app-arch/xz-utils/xz-utils-.ebuild| 8 +---
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.6.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
similarity index 97%
rename from app-arch/xz-utils/xz-utils-5.4.6.ebuild
rename to app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 10993a19d076..15cea9ec02c1 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
fi
 }
 
-multilib_src_install() {
-   default
-
-   gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
 

diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild 
b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
fi
 }
 
-multilib_src_install() {
-   default
-
-   gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
 

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
fi
 }
 
-multilib_src_install() {
-   default
-
-   gen_usr_ldscript -a lzma
-}
-
 multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-01-26 Thread Sam James
commit: 12807e619e3f685a6e31a75bcd76a478d9e396eb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 26 12:26:27 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 26 12:26:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12807e61

app-arch/xz-utils: add 5.4.6

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 +
 app-arch/xz-utils/xz-utils-5.4.6.ebuild | 146 
 2 files changed, 148 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 1b5b5f1e0d66..6b0b9ee0bbca 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,6 @@
 DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315
 SHA512 
91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b
 DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d
+DIST xz-5.4.6.tar.gz 2889306 BLAKE2B 
f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f
 SHA512 
b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497
+DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 
808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1
 SHA512 
d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741
 DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 
1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f
 SHA512 
dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1
 DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 
760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76
 SHA512 
714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7

diff --git a/app-arch/xz-utils/xz-utils-5.4.6.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.6.ebuild
new file mode 100644
index ..10993a19d076
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.4.6.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="doc +extra-filters pgo nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+fi
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-01-26 Thread Sam James
commit: 73d757e238f49c4f16d95b1f5d5dcf3070178669
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 26 12:28:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 26 12:28:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d757e2

app-arch/xz-utils: update LICENSE for docs for >=5.5.1_alpha

For the new logo:
"""
- The XZ logo is now included in the Doxygen generated
  documentation. It is licensed under Creative Commons
  Attribution-ShareAlike 4.0.
"""

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild 
b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
index 10993a19d076..1ce7c6d3d900 100644
--- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
@@ -45,7 +45,7 @@ DESCRIPTION="Utils for managing LZMA compressed files"
 HOMEPAGE="https://tukaani.org/xz/;
 
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
+LICENSE="public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
 SLOT="0"
 IUSE="doc +extra-filters pgo nls static-libs"
 

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 10993a19d076..1ce7c6d3d900 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -45,7 +45,7 @@ DESCRIPTION="Utils for managing LZMA compressed files"
 HOMEPAGE="https://tukaani.org/xz/;
 
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
+LICENSE="public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
 SLOT="0"
 IUSE="doc +extra-filters pgo nls static-libs"
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2024-01-26 Thread Sam James
commit: 6d51fc4111bade767baa6750cacf2afaa7a2587d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 26 12:22:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 26 12:23:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d51fc41

app-arch/xz-utils: add 5.5.1_alpha (unkeyworded)

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest| 2 ++
 .../xz-utils/{xz-utils-.ebuild => xz-utils-5.5.1_alpha.ebuild}| 4 ++--
 app-arch/xz-utils/xz-utils-.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 976c7a3cbe2a..1b5b5f1e0d66 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,2 +1,4 @@
 DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315
 SHA512 
91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b
 DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d
+DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 
1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f
 SHA512 
dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1
+DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 
760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76
 SHA512 
714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
similarity index 97%
copy from app-arch/xz-utils/xz-utils-.ebuild
copy to app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
index 5d182d962669..10993a19d076 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
@@ -25,11 +25,11 @@ else
 
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
mirror://sourceforge/lzmautils/${MY_P}.tar.gz
https://tukaani.org/xz/${MY_P}.tar.gz
verify-sig? (
-   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
https://tukaani.org/xz/${MY_P}.tar.gz.sig
)
"

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 5d182d962669..10993a19d076 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -25,11 +25,11 @@ else
 
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="
-   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
mirror://sourceforge/lzmautils/${MY_P}.tar.gz
https://tukaani.org/xz/${MY_P}.tar.gz
verify-sig? (
-   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
+   
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
https://tukaani.org/xz/${MY_P}.tar.gz.sig
)
"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/files/, app-arch/xz-utils/

2023-12-27 Thread Sam James
commit: dfcc1f271fa3da8b8710c80737e85a7347f16ba0
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:55:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:55:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfcc1f27

app-arch/xz-utils: drop 5.4.2, 5.4.3, 5.4.4

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest |   6 -
 .../files/xz-utils-5.4.2-Wsign-conversion.patch|  23 
 app-arch/xz-utils/xz-utils-5.4.2.ebuild| 130 --
 app-arch/xz-utils/xz-utils-5.4.3.ebuild| 126 --
 app-arch/xz-utils/xz-utils-5.4.4.ebuild| 146 -
 5 files changed, 431 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index a204f775e53d..976c7a3cbe2a 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,8 +1,2 @@
-DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
-DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
-DIST xz-5.4.3.tar.gz 2869347 BLAKE2B 
c4192a59ca751567ebab17e08e72aa1bf0f5ca14af0b59fded1c4dff02c1b76ab30119a4138932f78f69bd4b7827071c81d6ca1c56be65491466ea061786ed78
 SHA512 
aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023
-DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 
1e3f86a2de532e77cae4c31928d57edeac81ca207e03c71523210605dc6bab76a50793697a242b232f74911c6e1872a0339ed977e2dd0d201504bd859fd3b4f4
 SHA512 
b7c7eedf4d9604ee50ec97275e5ab57e22a567402815281440ca765210c75707bd2de20e7ebfb0842725690ae19557916fc41a9fbdace5fec8190632b038292e
-DIST xz-5.4.4.tar.gz 2874706 BLAKE2B 
0ade3767651a07a6bb4d53b510d7e97239e182788c42bc3388b97c54463ccaa968e27bcb88d34697df70381eea91279615f2622b5493ae2da22632e9576d8989
 SHA512 
2e27d864c9f346e53afc549d7046385b5d35a749af15d84f69de14612657df2f0e2ce71d3be03d57adadf8fd28549ecf4ef1c214bdcd1f061b5a47239e0104e8
-DIST xz-5.4.4.tar.gz.sig 566 BLAKE2B 
9d695293fe479e07b4051f9b22af19191ec7cb5063da519769a24a08cff46819a4f29db002cea92e4af982410dd660d9b3185c8ef0908abbf13b86f89c0baa0f
 SHA512 
6f12f0b30e4e5c78238f5d758443621d4126edf5ec8d02c51f06cc27e40822f0429c2018ec567eae20d118a81295f9d31e2f9101720d289bebab15f72590e9f2
 DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315
 SHA512 
91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b
 DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d

diff --git a/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch 
b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
deleted file mode 100644
index 217cc759a904..
--- a/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/tukaani-project/xz/commit/0673c9ec98b6bae12b33dc295564514aaa26e2fc
-
-From 0673c9ec98b6bae12b33dc295564514aaa26e2fc Mon Sep 17 00:00:00 2001
-From: Lasse Collin 
-Date: Sun, 19 Mar 2023 22:45:59 +0200
-Subject: [PATCH] liblzma: Silence -Wsign-conversion in SSE2 code in
- memcmplen.h.
-
-Thanks to Christian Hesse for reporting the issue.
-Fixes: https://github.com/tukaani-project/xz/issues/44
 a/src/liblzma/common/memcmplen.h
-+++ b/src/liblzma/common/memcmplen.h
-@@ -89,7 +89,8 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2,
-   // version isn't used on x86-64.
- # define LZMA_MEMCMPLEN_EXTRA 16
-   while (len < limit) {
--  const uint32_t x = 0x ^ _mm_movemask_epi8(_mm_cmpeq_epi8(
-+  const uint32_t x = 0x ^ (uint32_t)_mm_movemask_epi8(
-+  _mm_cmpeq_epi8(
-   _mm_loadu_si128((const __m128i *)(buf1 + len)),
-   _mm_loadu_si128((const __m128i *)(buf2 + len;
- 
-

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
deleted file mode 100644
index 39a9c712d3e0..
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-12-27 Thread Sam James
commit: aafd90f5ea122fc04f55ae69a697cb206494537f
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:55:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:55:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafd90f5

app-arch/xz-utils: drop 5.2.11, 5.2.12

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest   |   4 --
 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 118 ---
 app-arch/xz-utils/xz-utils-5.2.12.ebuild | 118 ---
 3 files changed, 240 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 37e141bbd964..a204f775e53d 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,7 +1,3 @@
-DIST xz-5.2.11.tar.gz 2130684 BLAKE2B 
e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9
 SHA512 
8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
-DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 
34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860
 SHA512 
036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
-DIST xz-5.2.12.tar.gz 2190541 BLAKE2B 
9ca5ecf753ae264f542ec53b4c9a1c85466bc2a932651aafb0ae2a3ebb7d3979a9384e9a81f16173c2d6d14ca8b86e4a820191817675a5e9fd214a64cf364c98
 SHA512 
1a67112eb1cfd70352c41a1cbb5e34eacd6da2ae816f5020385772a7698b835d059843c2c30461beb15b7514e95906b2033dac6abf09248b5837270420dfe732
-DIST xz-5.2.12.tar.gz.sig 566 BLAKE2B 
93d0fb89186ccf018d17278823c2c6cc724798acfe425fd01ecf54338e53451d94b1ad951f2f1ec58171a3eb827fcd6b5d9dcb97da72c5d8545d57d9fba0597b
 SHA512 
0734e1838dd9ab7ba06675af0f4ff5866c0e5c268f0c3e2ca6f12fa8f27b41830d11063244b0039f8d8ba184efc1c1b7b9a7311c378a02abc1290d7727357cb6
 DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
 DIST xz-5.4.3.tar.gz 2869347 BLAKE2B 
c4192a59ca751567ebab17e08e72aa1bf0f5ca14af0b59fded1c4dff02c1b76ab30119a4138932f78f69bd4b7827071c81d6ca1c56be65491466ea061786ed78
 SHA512 
aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
deleted file mode 100644
index f767a84786e9..
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
-fi
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-16 Thread Sam James
commit: 51dc665cf37c6931981c81b7fdf7570ca592098a
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 16 16:21:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 16 16:21:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51dc665c

app-arch/xz-utils: Stabilize 5.4.5 hppa, #917232

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index 75837dba28f2..b14b9dda3691 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-12 Thread Arthur Zamarin
commit: c0ad3416af9f776a3b60a871d213ae8b3de41039
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 16:49:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 16:49:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ad3416

app-arch/xz-utils: Stabilize 5.4.5 ppc, #917232

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index 6fdbf2ca8f36..75837dba28f2 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-12 Thread Arthur Zamarin
commit: 1c2aaea41c1a8de8eda2283b693cdd5b6788982b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:32:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:32:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c2aaea4

app-arch/xz-utils: Stabilize 5.4.5 ppc64, #917232

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index b905ed2b9495..aaa1d13cde2e 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-12 Thread Arthur Zamarin
commit: 43ad38d217d202a77f3376f1dbabb4cea52d0f41
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:32:08 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:32:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ad38d2

app-arch/xz-utils: Stabilize 5.4.5 sparc, #917232

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index 95a5d7c1a577..6fdbf2ca8f36 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-12 Thread Arthur Zamarin
commit: fa4d6ce80c6865f46a6230ea8cddaeebafb5e8f5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:32:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:32:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4d6ce8

app-arch/xz-utils: Stabilize 5.4.5 amd64, #917232

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index aaa1d13cde2e..95a5d7c1a577 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-12 Thread Arthur Zamarin
commit: fd53981d4e40ac9a94046c04246a1bcb69529f72
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Nov 12 08:20:29 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Nov 12 08:20:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd53981d

app-arch/xz-utils: Stabilize 5.4.5 arm, #917232

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index 78c3a39603d8..b905ed2b9495 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-01 Thread Sam James
commit: fbf289c16516d56417ddaa85efea9a8d631d2968
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  1 15:36:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  1 15:36:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf289c1

app-arch/xz-utils: fix IndirectInherits (toolchain-funcs)

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.4.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.4.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
index 6efd1ac994d1..817c272e1190 100644
--- a/app-arch/xz-utils/xz-utils-5.4.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
index 6efd1ac994d1..817c272e1190 100644
--- a/app-arch/xz-utils/xz-utils-5.4.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 6efd1ac994d1..817c272e1190 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
toolchain-funcs usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-11-01 Thread Sam James
commit: 18c0059bad8b3c222150b102c489d19e4d4ab54e
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  1 15:35:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  1 15:35:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c0059b

app-arch/xz-utils: add 5.4.5

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 +
 app-arch/xz-utils/xz-utils-5.4.5.ebuild | 146 
 2 files changed, 148 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 2b78989a37fc..37e141bbd964 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -8,3 +8,5 @@ DIST xz-5.4.3.tar.gz 2869347 BLAKE2B 
c4192a59ca751567ebab17e08e72aa1bf0f5ca14af0
 DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 
1e3f86a2de532e77cae4c31928d57edeac81ca207e03c71523210605dc6bab76a50793697a242b232f74911c6e1872a0339ed977e2dd0d201504bd859fd3b4f4
 SHA512 
b7c7eedf4d9604ee50ec97275e5ab57e22a567402815281440ca765210c75707bd2de20e7ebfb0842725690ae19557916fc41a9fbdace5fec8190632b038292e
 DIST xz-5.4.4.tar.gz 2874706 BLAKE2B 
0ade3767651a07a6bb4d53b510d7e97239e182788c42bc3388b97c54463ccaa968e27bcb88d34697df70381eea91279615f2622b5493ae2da22632e9576d8989
 SHA512 
2e27d864c9f346e53afc549d7046385b5d35a749af15d84f69de14612657df2f0e2ce71d3be03d57adadf8fd28549ecf4ef1c214bdcd1f061b5a47239e0104e8
 DIST xz-5.4.4.tar.gz.sig 566 BLAKE2B 
9d695293fe479e07b4051f9b22af19191ec7cb5063da519769a24a08cff46819a4f29db002cea92e4af982410dd660d9b3185c8ef0908abbf13b86f89c0baa0f
 SHA512 
6f12f0b30e4e5c78238f5d758443621d4126edf5ec8d02c51f06cc27e40822f0429c2018ec567eae20d118a81295f9d31e2f9101720d289bebab15f72590e9f2
+DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 
647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315
 SHA512 
91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b
+DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B 
c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2
 SHA512 
4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d

diff --git a/app-arch/xz-utils/xz-utils-5.4.5.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
new file mode 100644
index ..6efd1ac994d1
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.4.5.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
usr-ldscript
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="doc +extra-filters pgo nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+fi
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared libs on Solaris/x64
+   elibtoolize
+   fi
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-threads
+   $(multilib_native_use_enable doc)
+   $(use_enable nls)
+   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-10-12 Thread Sam James
commit: 5e95594973108f1836a35efec996cfbd69e209c0
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 12 12:11:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 12 12:13:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e955949

app-arch/xz-utils: tidy up PGO bits

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.4.ebuild | 3 ++-
 app-arch/xz-utils/xz-utils-.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.4.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
index b51831556293..f5305d400724 100644
--- a/app-arch/xz-utils/xz-utils-5.4.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
@@ -107,6 +107,7 @@ multilib_src_compile() {
# -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
# See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
+   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
 
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
 
@@ -118,7 +119,7 @@ multilib_src_compile() {
fi
 
emake clean
-   emake CFLAGS="${CFLAGS} -fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo"
+   emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
fi
 }
 

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index b51831556293..f5305d400724 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -107,6 +107,7 @@ multilib_src_compile() {
# -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
# See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
+   local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
 
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
 
@@ -118,7 +119,7 @@ multilib_src_compile() {
fi
 
emake clean
-   emake CFLAGS="${CFLAGS} -fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo"
+   emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-10-12 Thread Sam James
commit: c2846b5abad0679a5e800c48999a78f4bc475648
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 12 11:28:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 12 12:04:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2846b5a

app-arch/xz-utils: add USE=pgo

Binary gets a bit smaller: 91K->83K. For decompression times, it's really
within noise, <5%. I didn't poke at compress times.

The times at https://forum.openmandriva.org/t/pgo-xz/2543 are a bit better
than what I saw (I tried with linux-6.5.tar.xz, chromium-118.0.5993.70.tar.xz).

opensuse is also doing pgo w/ xz.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/metadata.xml  |  1 +
 app-arch/xz-utils/xz-utils-5.4.4.ebuild | 23 +--
 app-arch/xz-utils/xz-utils-.ebuild  | 25 -
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 89d8ff67986f..3b217f332fdd 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -9,6 +9,7 @@
Build additional filters that are not
used in any of the default xz presets. This includes 
delta
and BCJ coders, additional match finders and SHA256 
checks.
+   Optimize the build using Profile Guided 
Optimization (PGO)


cpe:/a:tukaani:xz

diff --git a/app-arch/xz-utils/xz-utils-5.4.4.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
index 11ddc15f918b..b51831556293 100644
--- a/app-arch/xz-utils/xz-utils-5.4.4.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -47,7 +47,7 @@ HOMEPAGE="https://tukaani.org/xz/;
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="doc +extra-filters nls static-libs"
+IUSE="doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
@@ -103,6 +103,25 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
+multilib_src_compile() {
+   # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
+   # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+   local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
+
+   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
+
+   if use pgo ; then
+   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+
+   if tc-is-clang; then
+   llvm-profdata merge "${T}"/${ABI}-pgo 
--output="${T}"/${ABI}-pgo/default.profdata || die
+   fi
+
+   emake clean
+   emake CFLAGS="${CFLAGS} -fprofile-use=${T}/${ABI}-pgo 
-fprofile-dir=${T}/${ABI}-pgo"
+   fi
+}
+
 multilib_src_install() {
default
 

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 1ab617815a91..b51831556293 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -47,7 +47,7 @@ HOMEPAGE="https://tukaani.org/xz/;
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="doc +extra-filters nls static-libs"
+IUSE="doc +extra-filters pgo nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
@@ -100,13 +100,28 @@ multilib_src_configure() {
myconf+=( --disable-path-for-script )
fi
 
-   # ifunc is incompatible w/ asan
-   # 
https://github.com/tukaani-project/xz/issues/62#issuecomment-1719489932
-   is-flagq -fsanitize=address && myconf+=( --disable-ifunc )
-
ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
+multilib_src_compile() {
+   # -fprofile-partial-training because upstream note the test suite isn't 
super comprehensive
+   # See 
https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
+   local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic 
-fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo 
$(test-flags-CC -fprofile-partial-training)")
+
+   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
+
+   if use pgo ; then
+   emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
+
+   if tc-is-clang; then
+   llvm-profdata 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-09-15 Thread Sam James
commit: 3791ad536e966dab33f62614f16b224fd10bf6a2
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 15 06:55:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 15 06:57:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3791ad53

app-arch/xz-utils: disable ifunc w/ asan

See https://github.com/tukaani-project/xz/issues/62.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 11ddc15f918b..1ab617815a91 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=8
 
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs 
usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -100,6 +100,10 @@ multilib_src_configure() {
myconf+=( --disable-path-for-script )
fi
 
+   # ifunc is incompatible w/ asan
+   # 
https://github.com/tukaani-project/xz/issues/62#issuecomment-1719489932
+   is-flagq -fsanitize=address && myconf+=( --disable-ifunc )
+
ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-08-02 Thread Arthur Zamarin
commit: 338e68fc8f4b15d15d48d678c8fdb32e9d22c082
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Aug  2 19:33:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Aug  2 19:34:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338e68fc

app-arch/xz-utils: Stabilize 5.4.3 ppc, #908619

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index e795a918c799..90bd35bd9f1c 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-08-02 Thread Sam James
commit: dd9cc2b21ca28e7438959b5f548d007a0789c707
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 13:09:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 13:11:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9cc2b2

app-arch/xz-utils: add 5.4.4

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest| 2 ++
 app-arch/xz-utils/{xz-utils-.ebuild => xz-utils-5.4.4.ebuild} | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild| 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 1bef0754376d..2b78989a37fc 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -6,3 +6,5 @@ DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d13
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
 DIST xz-5.4.3.tar.gz 2869347 BLAKE2B 
c4192a59ca751567ebab17e08e72aa1bf0f5ca14af0b59fded1c4dff02c1b76ab30119a4138932f78f69bd4b7827071c81d6ca1c56be65491466ea061786ed78
 SHA512 
aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023
 DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 
1e3f86a2de532e77cae4c31928d57edeac81ca207e03c71523210605dc6bab76a50793697a242b232f74911c6e1872a0339ed977e2dd0d201504bd859fd3b4f4
 SHA512 
b7c7eedf4d9604ee50ec97275e5ab57e22a567402815281440ca765210c75707bd2de20e7ebfb0842725690ae19557916fc41a9fbdace5fec8190632b038292e
+DIST xz-5.4.4.tar.gz 2874706 BLAKE2B 
0ade3767651a07a6bb4d53b510d7e97239e182788c42bc3388b97c54463ccaa968e27bcb88d34697df70381eea91279615f2622b5493ae2da22632e9576d8989
 SHA512 
2e27d864c9f346e53afc549d7046385b5d35a749af15d84f69de14612657df2f0e2ce71d3be03d57adadf8fd28549ecf4ef1c214bdcd1f061b5a47239e0104e8
+DIST xz-5.4.4.tar.gz.sig 566 BLAKE2B 
9d695293fe479e07b4051f9b22af19191ec7cb5063da519769a24a08cff46819a4f29db002cea92e4af982410dd660d9b3185c8ef0908abbf13b86f89c0baa0f
 SHA512 
6f12f0b30e4e5c78238f5d758443621d4126edf5ec8d02c51f06cc27e40822f0429c2018ec567eae20d118a81295f9d31e2f9101720d289bebab15f72590e9f2

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
similarity index 99%
copy from app-arch/xz-utils/xz-utils-.ebuild
copy to app-arch/xz-utils/xz-utils-5.4.4.ebuild
index f2b9287eaedf..11ddc15f918b 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.4.ebuild
@@ -4,7 +4,7 @@
 # Remember: we cannot leverage autotools in this ebuild in order
 #   to avoid circular deps with autotools
 
-EAPI=7
+EAPI=8
 
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index f2b9287eaedf..11ddc15f918b 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -4,7 +4,7 @@
 # Remember: we cannot leverage autotools in this ebuild in order
 #   to avoid circular deps with autotools
 
-EAPI=7
+EAPI=8
 
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-06-17 Thread Sam James
commit: 819f094d692ecc598ec1064cf28c393ec0c458ff
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 17 15:12:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 17 15:12:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819f094d

app-arch/xz-utils: Stabilize 5.4.3 x86, #908619

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index 274521948804..e795a918c799 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-06-17 Thread Arthur Zamarin
commit: b709bc09839c526bc5a062b4842b7267e993dfb3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun 17 12:04:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun 17 12:04:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b709bc09

app-arch/xz-utils: Stabilize 5.4.3 hppa, #908619

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index 3cb3e6d6d523..274521948804 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-06-17 Thread Arthur Zamarin
commit: aa097dd7f2b98843e0c13427a57577df841b1e3b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun 17 10:41:47 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun 17 10:41:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa097dd7

app-arch/xz-utils: Stabilize 5.4.3 amd64, #908619

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index 4c0823195aba..3cb3e6d6d523 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-06-17 Thread Arthur Zamarin
commit: b82abc62e167b96f7c9fc5e59d3d6c10505c5f41
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun 17 09:03:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun 17 09:03:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82abc62

app-arch/xz-utils: Stabilize 5.4.3 ppc64, #908619

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index 40c9c3f8e91e..4c0823195aba 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-05-04 Thread Michał Górny
commit: eb354521d92f416920ccdde617232c9c3f1a272b
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May  5 03:50:31 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May  5 03:50:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb354521

app-arch/xz-utils: Correct OpenPGP key dependency

Signed-off-by: Michał Górny  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
index 00fdd1f2144b..e30876d4e174 100644
--- a/app-arch/xz-utils/xz-utils-5.4.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-05-04 Thread Sam James
commit: 95ad5353818a6da9f45e524281ed66636fcb2a44
Author: Sam James  gentoo  org>
AuthorDate: Fri May  5 02:59:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 03:08:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ad5353

app-arch/xz-utils: add 5.4.3

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 +
 app-arch/xz-utils/xz-utils-5.4.3.ebuild | 126 
 2 files changed, 128 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 7cfad6a5465a..1bef0754376d 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,3 +4,5 @@ DIST xz-5.2.12.tar.gz 2190541 BLAKE2B 
9ca5ecf753ae264f542ec53b4c9a1c85466bc2a932
 DIST xz-5.2.12.tar.gz.sig 566 BLAKE2B 
93d0fb89186ccf018d17278823c2c6cc724798acfe425fd01ecf54338e53451d94b1ad951f2f1ec58171a3eb827fcd6b5d9dcb97da72c5d8545d57d9fba0597b
 SHA512 
0734e1838dd9ab7ba06675af0f4ff5866c0e5c268f0c3e2ca6f12fa8f27b41830d11063244b0039f8d8ba184efc1c1b7b9a7311c378a02abc1290d7727357cb6
 DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
+DIST xz-5.4.3.tar.gz 2869347 BLAKE2B 
c4192a59ca751567ebab17e08e72aa1bf0f5ca14af0b59fded1c4dff02c1b76ab30119a4138932f78f69bd4b7827071c81d6ca1c56be65491466ea061786ed78
 SHA512 
aff0fe166af6df4491a6f5df2372cab100b081452461a0e8c6fd65b72af3f250f16c64d9fb8fd309141e9b9ae4e41649f48687cc29e63dd82f27f2eab19b4023
+DIST xz-5.4.3.tar.gz.sig 566 BLAKE2B 
1e3f86a2de532e77cae4c31928d57edeac81ca207e03c71523210605dc6bab76a50793697a242b232f74911c6e1872a0339ed977e2dd0d201504bd859fd3b4f4
 SHA512 
b7c7eedf4d9604ee50ec97275e5ab57e22a567402815281440ca765210c75707bd2de20e7ebfb0842725690ae19557916fc41a9fbdace5fec8190632b038292e

diff --git a/app-arch/xz-utils/xz-utils-5.4.3.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
new file mode 100644
index ..00fdd1f2144b
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.4.3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} ==  ]] ; then
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="doc +extra-filters nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+fi
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared libs on Solaris/x64
+   elibtoolize
+   fi
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-threads
+   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-05-04 Thread Sam James
commit: 9290bbfc02cba0f646c7d16601fe9b7594859f45
Author: Sam James  gentoo  org>
AuthorDate: Fri May  5 02:57:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 03:08:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9290bbfc

app-arch/xz-utils: add 5.2.12

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest   |   2 +
 app-arch/xz-utils/xz-utils-5.2.12.ebuild | 118 +++
 2 files changed, 120 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 97e4b8821b39..7cfad6a5465a 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,6 @@
 DIST xz-5.2.11.tar.gz 2130684 BLAKE2B 
e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9
 SHA512 
8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
 DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 
34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860
 SHA512 
036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
+DIST xz-5.2.12.tar.gz 2190541 BLAKE2B 
9ca5ecf753ae264f542ec53b4c9a1c85466bc2a932651aafb0ae2a3ebb7d3979a9384e9a81f16173c2d6d14ca8b86e4a820191817675a5e9fd214a64cf364c98
 SHA512 
1a67112eb1cfd70352c41a1cbb5e34eacd6da2ae816f5020385772a7698b835d059843c2c30461beb15b7514e95906b2033dac6abf09248b5837270420dfe732
+DIST xz-5.2.12.tar.gz.sig 566 BLAKE2B 
93d0fb89186ccf018d17278823c2c6cc724798acfe425fd01ecf54338e53451d94b1ad951f2f1ec58171a3eb827fcd6b5d9dcb97da72c5d8545d57d9fba0597b
 SHA512 
0734e1838dd9ab7ba06675af0f4ff5866c0e5c268f0c3e2ca6f12fa8f27b41830d11063244b0039f8d8ba184efc1c1b7b9a7311c378a02abc1290d7727357cb6
 DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa

diff --git a/app-arch/xz-utils/xz-utils-5.2.12.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.12.ebuild
new file mode 100644
index ..52e2b5940ba6
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.12.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=8
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared libs on Solaris/x64
+   elibtoolize
+   fi
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-threads
+   $(use_enable nls)
+   $(use_enable static-libs static)
+   )
+
+   if ! 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-05-04 Thread Sam James
commit: 14b29e8aec8360c2f6b9b0c65aac139cabc98c9b
Author: Sam James  gentoo  org>
AuthorDate: Fri May  5 02:48:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 03:08:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b29e8a

app-arch/xz-utils: drop 5.2.10, 5.4.1

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest   |   4 -
 app-arch/xz-utils/xz-utils-5.2.10.ebuild | 118 --
 app-arch/xz-utils/xz-utils-5.4.1.ebuild  | 122 ---
 3 files changed, 244 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 457b0d0a09cb..97e4b8821b39 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,8 +1,4 @@
-DIST xz-5.2.10.tar.gz 2123206 BLAKE2B 
fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215
 SHA512 
c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
-DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B 
ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733
 SHA512 
48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
 DIST xz-5.2.11.tar.gz 2130684 BLAKE2B 
e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9
 SHA512 
8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
 DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 
34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860
 SHA512 
036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
-DIST xz-5.4.1.tar.gz 2528617 BLAKE2B 
f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98
 SHA512 
5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
-DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B 
f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b
 SHA512 
2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c
 DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
 DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa

diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
deleted file mode 100644
index ee655f3ae8a2..
--- a/app-arch/xz-utils/xz-utils-5.2.10.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain 

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-05-04 Thread Sam James
commit: f976bf35d33045eab60b9840365fdbf9814c75f1
Author: Sam James  gentoo  org>
AuthorDate: Fri May  5 02:53:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 03:08:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f976bf35

app-arch/xz-utils: update key package in live

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index a6b8dfa60f8f..e30876d4e174 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} ==  ]] ; then
# bug #272880 and bug #286068
BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
 else
-   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+   VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
inherit verify-sig
 
MY_P="${PN/-utils}-${PV/_}"
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Sam James
commit: e42d897776840db9b1b590972495f55f99039492
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 29 20:31:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 20:31:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42d8977

app-arch/xz-utils: Stabilize 5.2.11 arm, #905288

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index a2738528ee31..ee655f3ae8a2 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Sam James
commit: 675b4c4c489efa5597653b6de9246c74fe917665
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 29 20:31:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 20:31:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675b4c4c

app-arch/xz-utils: Stabilize 5.2.11 sparc, #905288

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index 70dda9adc716..a2738528ee31 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Sam James
commit: afeedce44b39092eff0871caa86fb7558e143e8c
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 29 20:25:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 20:25:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeedce4

app-arch/xz-utils: Stabilize 5.2.11 ppc, #905288

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index bf7cb3dd4246..70dda9adc716 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Sam James
commit: 929352806c17d178613d6123ce9cdc6ef381a2e9
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 29 20:19:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 20:19:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92935280

app-arch/xz-utils: Stabilize 5.2.11 arm64, #905288

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index 407bd2027a95..bf7cb3dd4246 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Arthur Zamarin
commit: 7499d0fa6d998449ce15dd26dc4404c571453233
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 18:16:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 18:16:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7499d0fa

app-arch/xz-utils: Stabilize 5.2.11 amd64, #905288

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index b4717d2c3b2c..407bd2027a95 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Arthur Zamarin
commit: 8639240c97104e41ebd9b9cc70c6b949e20b10ad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 18:07:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 18:07:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8639240c

app-arch/xz-utils: Stabilize 5.2.11 x86, #905288

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index a87dd0936131..b4717d2c3b2c 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Arthur Zamarin
commit: efafd70dea5564aae1c7f9205454a4ac2597654c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 16:11:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 16:11:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efafd70d

app-arch/xz-utils: Stabilize 5.2.11 ppc64, #905288

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index 17fa6a8f9dca..a87dd0936131 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Arthur Zamarin
commit: ecf1a6472b18d86055542d669642b751e75578ec
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 15:22:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 15:22:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf1a647

app-arch/xz-utils: Stabilize 5.2.11 hppa, #905288

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
index f867fbc26fe7..17fa6a8f9dca 100644
--- a/app-arch/xz-utils/xz-utils-5.2.11.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-29 Thread Sam James
commit: 741278f5d90a8981fd163804378cd3bd1e5453ae
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Apr 28 12:33:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 29 08:47:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741278f5

app-arch/xz-utils: stable 5.4.2 for sparc, bug #904914

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index d33859844c75..c5051bd24210 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: c64546c51a27adb3a34e1120975251f0cd292e2f
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 22:29:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 22:29:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64546c5

app-arch/xz-utils: Stabilize 5.4.2 arm, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 45f884a806ff..d33859844c75 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: d29e5642581a4b4cac154bc718d0a1281b071e86
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 21:21:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 21:21:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d29e5642

app-arch/xz-utils: Stabilize 5.4.2 ppc, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index d366e8a34470..45f884a806ff 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: c89d1db3b65f096dd64033a46dfdae5aa77d1c94
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:32:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:32:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89d1db3

app-arch/xz-utils: Stabilize 5.4.2 ppc64, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 02a02091ddde..d366e8a34470 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: a88137b85c9a50994df404f9f6ac0ac7cf5af075
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:21:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:21:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88137b8

app-arch/xz-utils: Stabilize 5.4.2 hppa, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 9ec3a0f6c090..a48aba143ff8 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: 5e6ee6672ee2753b0a73abf90cd292ed3ba70b0a
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:21:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:21:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6ee667

app-arch/xz-utils: Stabilize 5.4.2 x86, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index a48aba143ff8..02a02091ddde 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: 292ea762341f1a533abec321b1acd15d010b88d7
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:10:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:10:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292ea762

app-arch/xz-utils: Stabilize 5.4.2 amd64, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 2fd80f067538..9ec3a0f6c090 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-04-23 Thread Sam James
commit: c63a54ea3a66a2800fe61b5b915c05bbb8fba457
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 23 20:00:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 23 20:00:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c63a54ea

app-arch/xz-utils: Stabilize 5.4.2 arm64, #904914

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 736b0038dc69..2fd80f067538 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/, app-arch/xz-utils/files/

2023-03-19 Thread Sam James
commit: 99529e3e30d71d892944629cfa1ac862d8327dc3
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 20 05:41:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 20 05:41:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99529e3e

app-arch/xz-utils: backport -Wsign-conversion fix

It's just silencing the warning.

Signed-off-by: Sam James  gentoo.org>

 .../files/xz-utils-5.4.2-Wsign-conversion.patch| 23 ++
 app-arch/xz-utils/xz-utils-5.4.2.ebuild|  4 
 2 files changed, 27 insertions(+)

diff --git a/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch 
b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
new file mode 100644
index ..217cc759a904
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
@@ -0,0 +1,23 @@
+https://github.com/tukaani-project/xz/commit/0673c9ec98b6bae12b33dc295564514aaa26e2fc
+
+From 0673c9ec98b6bae12b33dc295564514aaa26e2fc Mon Sep 17 00:00:00 2001
+From: Lasse Collin 
+Date: Sun, 19 Mar 2023 22:45:59 +0200
+Subject: [PATCH] liblzma: Silence -Wsign-conversion in SSE2 code in
+ memcmplen.h.
+
+Thanks to Christian Hesse for reporting the issue.
+Fixes: https://github.com/tukaani-project/xz/issues/44
+--- a/src/liblzma/common/memcmplen.h
 b/src/liblzma/common/memcmplen.h
+@@ -89,7 +89,8 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2,
+   // version isn't used on x86-64.
+ # define LZMA_MEMCMPLEN_EXTRA 16
+   while (len < limit) {
+-  const uint32_t x = 0x ^ _mm_movemask_epi8(_mm_cmpeq_epi8(
++  const uint32_t x = 0x ^ (uint32_t)_mm_movemask_epi8(
++  _mm_cmpeq_epi8(
+   _mm_loadu_si128((const __m128i *)(buf1 + len)),
+   _mm_loadu_si128((const __m128i *)(buf2 + len;
+ 
+

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index a6b8dfa60f8f..736b0038dc69 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -53,6 +53,10 @@ if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
+PATCHES=(
+   "${FILESDIR}"/${P}-Wsign-conversion.patch
+)
+
 src_prepare() {
default
 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-03-18 Thread Sam James
commit: 386acd3bf49abd29f414d3d809e1ec0e98ef374d
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 18 19:45:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 18 19:45:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386acd3b

app-arch/xz-utils: fix USE=-doc

Closes: https://bugs.gentoo.org/902081
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.2.ebuild | 5 -
 app-arch/xz-utils/xz-utils-.ebuild  | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 9ab5ddb785d6..a6b8dfa60f8f 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -111,7 +111,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
-   rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+
+   if use doc ; then
+   rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+   fi
 }
 
 pkg_preinst() {

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 9ab5ddb785d6..a6b8dfa60f8f 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -111,7 +111,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
-   rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+
+   if use doc ; then
+   rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+   fi
 }
 
 pkg_preinst() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-03-18 Thread Sam James
commit: 76998774417ff8ec465c25e97f891983964928a2
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 18 19:17:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 18 19:18:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76998774

app-arch/xz-utils: add 5.4.2

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest| 2 ++
 app-arch/xz-utils/{xz-utils-.ebuild => xz-utils-5.4.2.ebuild} | 3 ++-
 app-arch/xz-utils/xz-utils-.ebuild| 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 784b1f9d1564..457b0d0a09cb 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -4,3 +4,5 @@ DIST xz-5.2.11.tar.gz 2130684 BLAKE2B 
e513f99b2e28fa79f32747e21138cc13ab9340e95a
 DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 
34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860
 SHA512 
036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
 DIST xz-5.4.1.tar.gz 2528617 BLAKE2B 
f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98
 SHA512 
5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
 DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B 
f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b
 SHA512 
2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c
+DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 
3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72
 SHA512 
149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
+DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 
95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b
 SHA512 
30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
similarity index 97%
copy from app-arch/xz-utils/xz-utils-.ebuild
copy to app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 8c4479233e8d..9ab5ddb785d6 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -47,7 +47,7 @@ HOMEPAGE="https://tukaani.org/xz/;
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="+extra-filters nls static-libs"
+IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
@@ -68,6 +68,7 @@ src_prepare() {
 multilib_src_configure() {
local myconf=(
--enable-threads
+   $(multilib_native_use_enable doc)
$(use_enable nls)
$(use_enable static-libs static)
)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 8c4479233e8d..9ab5ddb785d6 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -47,7 +47,7 @@ HOMEPAGE="https://tukaani.org/xz/;
 # See top-level COPYING file as it outlines the various pieces and their 
licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="+extra-filters nls static-libs"
+IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
@@ -68,6 +68,7 @@ src_prepare() {
 multilib_src_configure() {
local myconf=(
--enable-threads
+   $(multilib_native_use_enable doc)
$(use_enable nls)
$(use_enable static-libs static)
)



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-03-18 Thread Sam James
commit: 22c0c7571aa474817571fd57b0c7be02ad6753fa
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 18 16:34:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 18 19:18:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c0c757

app-arch/xz-utils: add 5.2.11

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest   |   2 +
 app-arch/xz-utils/xz-utils-5.2.11.ebuild | 118 +++
 2 files changed, 120 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 8e72b07133e1..784b1f9d1564 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,6 @@
 DIST xz-5.2.10.tar.gz 2123206 BLAKE2B 
fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215
 SHA512 
c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B 
ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733
 SHA512 
48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
+DIST xz-5.2.11.tar.gz 2130684 BLAKE2B 
e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9
 SHA512 
8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
+DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 
34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860
 SHA512 
036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
 DIST xz-5.4.1.tar.gz 2528617 BLAKE2B 
f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98
 SHA512 
5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
 DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B 
f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b
 SHA512 
2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c

diff --git a/app-arch/xz-utils/xz-utils-5.2.11.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
new file mode 100644
index ..f867fbc26fe7
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#   to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
+   inherit git-r3 autotools
+
+   # bug #272880 and bug #286068
+   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+   inherit verify-sig
+
+   MY_P="${PN/-utils}-${PV/_}"
+   SRC_URI="
+   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+   https://tukaani.org/xz/${MY_P}.tar.gz
+   verify-sig? (
+   https://tukaani.org/xz/${MY_P}.tar.gz.sig
+   )
+   "
+
+   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/;
+
+# See top-level COPYING file as it outlines the various pieces and their 
licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+if [[ ${PV} !=  ]] ; then
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+   default
+
+   if [[ ${PV} ==  ]] ; then
+   eautopoint
+   eautoreconf
+   else
+   # Allow building shared libs on Solaris/x64
+   elibtoolize
+   fi
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --enable-threads
+   $(use_enable nls)
+   $(use_enable static-libs static)
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-02-24 Thread Sam James
commit: 2f33ba438f74acbe975a644c7979be5d9e09d5db
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 24 18:34:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 24 18:35:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f33ba43

app-arch/xz-utils: keyword for ~arm64-macos

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.10.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-5.4.1.ebuild  | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
index b7ac59e5664e..ee655f3ae8a2 100644
--- a/app-arch/xz-utils/xz-utils-5.2.10.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
@@ -28,7 +28,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index a207c01d98f6..7dd91d3d6952 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 850c3073746f..8c4479233e8d 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-02-12 Thread Sam James
commit: bf74073a1d83b63125fbd39f5169ff1027a017d4
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 13 05:43:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 13 05:46:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf74073a

app-arch/xz-utils: update verify-sig dep

Bug: https://bugs.gentoo.org/894074
Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.10.ebuild | 4 ++--
 app-arch/xz-utils/xz-utils-5.4.1.ebuild  | 2 +-
 app-arch/xz-utils/xz-utils-.ebuild   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
index fb35eaff7363..b7ac59e5664e 100644
--- a/app-arch/xz-utils/xz-utils-5.2.10.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -43,7 +43,7 @@ SLOT="0"
 IUSE="+extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
 # Tests currently do not account for smaller feature set

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index 9aa96a389d3e..a207c01d98f6 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="+extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
 src_prepare() {

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index cb694cd99a4a..850c3073746f 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -50,7 +50,7 @@ SLOT="0"
 IUSE="+extra-filters nls static-libs"
 
 if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+   BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
 fi
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-15 Thread Sam James
commit: 1ce522ed271960a3ba7674e92591c9cecc352ca7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 15 13:33:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 15 13:33:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce522ed

app-arch/xz-utils: drop 5.4.0

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   2 -
 app-arch/xz-utils/xz-utils-5.4.0.ebuild | 115 
 2 files changed, 117 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 5d376d2ef33e..8e72b07133e1 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,4 @@
 DIST xz-5.2.10.tar.gz 2123206 BLAKE2B 
fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215
 SHA512 
c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B 
ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733
 SHA512 
48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
-DIST xz-5.4.0.tar.gz 2332619 BLAKE2B 
7bcf2e48470b885ae48b1fd0d46ab504961e7c5b1358d8c57a6fe1ba32311f5ca837740cff7ba77767f0a25ef80ec68c3d43029f87af035131526cb71f961d0f
 SHA512 
29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811
-DIST xz-5.4.0.tar.gz.sig 566 BLAKE2B 
6f8a6c81c0d91cea08b218e8f8ed74cea3b471a0adb0b5aac114f85d103977052b735ce5582e4fe5354dde17a7072d776f2fd64844531c3f67e60c770ccdc10e
 SHA512 
9bebc2ad25ff63036e6cb07e9ea6767441138fd91ef59e6f068c370296a594135479477a18f086dbf06b7dda5188fa0da09c24a6b7b3e7222e4bca70104d20d2
 DIST xz-5.4.1.tar.gz 2528617 BLAKE2B 
f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98
 SHA512 
5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
 DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B 
f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b
 SHA512 
2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c

diff --git a/app-arch/xz-utils/xz-utils-5.4.0.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.0.ebuild
deleted file mode 100644
index 53811b5967ca..
--- a/app-arch/xz-utils/xz-utils-5.4.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-if [[ ${PV} !=  ]] ; then
-   BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
-fi
-
-src_prepare() {
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   eautopoint
-   eautoreconf
-   else
-   # Allow building shared libs on Solaris/x64
-   elibtoolize
-   fi
-}
-
-multilib_src_configure() {
-   local myconf=(
-   --enable-threads
-   $(use_enable nls)
-   $(use_enable static-libs static)
-   )
-
-   if ! multilib_is_native_abi ; then
-   myconf+=(
-   

[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-14 Thread Arthur Zamarin
commit: 1f292aa6ef7627d47573c127f856c7952f7bdeaa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan 14 10:00:01 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan 14 10:00:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f292aa6

app-arch/xz-utils: Stabilize 5.4.1 hppa, #890730

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index 5939c8bd0b14..9aa96a389d3e 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 4a3746c66442d74d949c1d8a2d020629d3f756c4
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 20:17:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 20:18:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3746c6

app-arch/xz-utils: Stabilize 5.4.1 sparc, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index ac486ff4971d..5939c8bd0b14 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 2a84f0ee8cc1b437e77b1c9d5be482588d8f2397
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:57:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:57:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a84f0ee

app-arch/xz-utils: Stabilize 5.4.1 ppc64, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index c6a2aebbefc9..ac486ff4971d 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 91d680edc85ea624df26ffaac59599eb50306664
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:56:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:56:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d680ed

app-arch/xz-utils: Stabilize 5.4.1 amd64, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index ae8c729caaf6..aefe8a73dd07 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 054e29528281fc3dc2827d9938d1e6e969c22aaa
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:56:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:56:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054e2952

app-arch/xz-utils: Stabilize 5.4.1 arm64, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index cb694cd99a4a..ae8c729caaf6 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 86cdb9afbcb1424bb97efbff243811ffcde52b30
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:56:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:56:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cdb9af

app-arch/xz-utils: Stabilize 5.4.1 ppc, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index 3515a80d0d29..c6a2aebbefc9 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 9fc0df3904ec1519119bf07afb12b5fec31dcea3
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:56:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:56:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc0df39

app-arch/xz-utils: Stabilize 5.4.1 x86, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index 03a9b9125fd6..3515a80d0d29 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-13 Thread Sam James
commit: 8d77d93f2efabd7fa0ac0d7206ef367a2f03b96a
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 19:56:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 19:56:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d77d93f

app-arch/xz-utils: Stabilize 5.4.1 arm, #890730

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index aefe8a73dd07..03a9b9125fd6 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
"
 
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
+   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"
fi
 
S="${WORKDIR}/${MY_P}"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-11 Thread Sam James
commit: e2a10be46742290fce106dd7fe1c4e63a754b060
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 23:02:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 23:02:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a10be4

app-arch/xz-utils: keep git.tukaani.org as a mirror for EGIT_REPO_URI

Per HOMEPAGE, it's a mirror now, not canonical source.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-5.4.1.ebuild | 7 ++-
 app-arch/xz-utils/xz-utils-.ebuild  | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index e50fa637fecd..cb694cd99a4a 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -9,7 +9,12 @@ EAPI=7
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/tukaani-project/xz;
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
inherit git-r3 autotools
 
# bug #272880 and bug #286068

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index e50fa637fecd..cb694cd99a4a 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -9,7 +9,12 @@ EAPI=7
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/tukaani-project/xz;
+   # Per tukaani.org, git.tukaani.org is a mirror of github and
+   # may be behind.
+   EGIT_REPO_URI="
+   https://github.com/tukaani-project/xz
+   https://git.tukaani.org/xz.git
+   "
inherit git-r3 autotools
 
# bug #272880 and bug #286068



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-11 Thread Sam James
commit: b5a0cb8761f93f00b0b8df5cdc41b5d930f27f4b
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 22:03:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 22:08:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a0cb87

app-arch/xz-utils: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 7780c7209f08..89d8ff67986f 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -13,5 +13,6 @@

cpe:/a:tukaani:xz
lzmautils
+   tukaani-project/xz

 



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-11 Thread Sam James
commit: 3c08292a684fe0887c8708092654a254390de584
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 22:07:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 22:08:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c08292a

app-arch/xz-utils: add 5.4.1

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest| 2 ++
 app-arch/xz-utils/{xz-utils-.ebuild => xz-utils-5.4.1.ebuild} | 2 ++
 app-arch/xz-utils/xz-utils-.ebuild| 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index b9679e514c11..5d376d2ef33e 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,3 +2,5 @@ DIST xz-5.2.10.tar.gz 2123206 BLAKE2B 
fdd9e77e21ee65482401e0e43e0b291093a227d452
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B 
ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733
 SHA512 
48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
 DIST xz-5.4.0.tar.gz 2332619 BLAKE2B 
7bcf2e48470b885ae48b1fd0d46ab504961e7c5b1358d8c57a6fe1ba32311f5ca837740cff7ba77767f0a25ef80ec68c3d43029f87af035131526cb71f961d0f
 SHA512 
29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811
 DIST xz-5.4.0.tar.gz.sig 566 BLAKE2B 
6f8a6c81c0d91cea08b218e8f8ed74cea3b471a0adb0b5aac114f85d103977052b735ce5582e4fe5354dde17a7072d776f2fd64844531c3f67e60c770ccdc10e
 SHA512 
9bebc2ad25ff63036e6cb07e9ea6767441138fd91ef59e6f068c370296a594135479477a18f086dbf06b7dda5188fa0da09c24a6b7b3e7222e4bca70104d20d2
+DIST xz-5.4.1.tar.gz 2528617 BLAKE2B 
f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98
 SHA512 
5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
+DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B 
f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b
 SHA512 
2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
similarity index 94%
copy from app-arch/xz-utils/xz-utils-.ebuild
copy to app-arch/xz-utils/xz-utils-5.4.1.ebuild
index 3bdfdbab57d8..e50fa637fecd 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -20,9 +20,11 @@ else
 
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
mirror://sourceforge/lzmautils/${MY_P}.tar.gz
https://tukaani.org/xz/${MY_P}.tar.gz
verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
https://tukaani.org/xz/${MY_P}.tar.gz.sig
)
"

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 3bdfdbab57d8..e50fa637fecd 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -20,9 +20,11 @@ else
 
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
mirror://sourceforge/lzmautils/${MY_P}.tar.gz
https://tukaani.org/xz/${MY_P}.tar.gz
verify-sig? (
+   
https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
https://tukaani.org/xz/${MY_P}.tar.gz.sig
)
"



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2023-01-11 Thread Sam James
commit: 143b532b56920d2cc2bb937ea6a642a19fe69f0d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 11 22:03:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 11 22:08:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143b532b

app-arch/xz-utils: update EGIT_REPO_URI

Per HOMEPAGE & discussion w/ upstream.

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/xz-utils-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-.ebuild 
b/app-arch/xz-utils/xz-utils-.ebuild
index 53811b5967ca..3bdfdbab57d8 100644
--- a/app-arch/xz-utils/xz-utils-.ebuild
+++ b/app-arch/xz-utils/xz-utils-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Remember: we cannot leverage autotools in this ebuild in order
@@ -9,7 +9,7 @@ EAPI=7
 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
 
 if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
+   EGIT_REPO_URI="https://github.com/tukaani-project/xz;
inherit git-r3 autotools
 
# bug #272880 and bug #286068



[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

2022-12-15 Thread Sam James
commit: cf68a57f295c019a9b2dc5c1411415dc6e2d
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 07:21:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 07:21:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf68

app-arch/xz-utils: drop 5.2.8, 5.2.9

Signed-off-by: Sam James  gentoo.org>

 app-arch/xz-utils/Manifest  |   4 --
 app-arch/xz-utils/xz-utils-5.2.8.ebuild | 118 
 app-arch/xz-utils/xz-utils-5.2.9.ebuild | 118 
 3 files changed, 240 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 111e1ec2fd9e..b9679e514c11 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,8 +1,4 @@
 DIST xz-5.2.10.tar.gz 2123206 BLAKE2B 
fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215
 SHA512 
c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B 
ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733
 SHA512 
48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
-DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 
28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676
 SHA512 
aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1
-DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B 
c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a
 SHA512 
253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2
-DIST xz-5.2.9.tar.gz 2122988 BLAKE2B 
20e8552302ef73469edaf7dbdc8ca1df8df9ddd5e4b7399509f3f9204f7d19559db7b9a5da2185cb1b379b4d22a4773b68b81a0a2acc71230cf056a9b017ef92
 SHA512 
4e13c76d7d24deeb5def85f74f08f6ee7fea1873f61bfaa6b2e8771f5a1eb42587c9fca45b3a9cbbffe0d9550f6a7be4971fcb9096f03998f642daf14d33b0ec
-DIST xz-5.2.9.tar.gz.sig 566 BLAKE2B 
0f5807e2c963aaba2a65495cbe49c80047f022c0ac0f2d1b001e1c4d434605499148e01855e586595d4b0db99cd9c81f72bef8dadf5c9a61ba4f6f5d7da85d9d
 SHA512 
871f71cf4e3ed77249fb8279301a77bd2ca174647cc4d0fe034bda349d5c52438f1aafe04294a1c260ad93d9ecda16ee8aece1655de79a898536b2a6e2a65ba8
 DIST xz-5.4.0.tar.gz 2332619 BLAKE2B 
7bcf2e48470b885ae48b1fd0d46ab504961e7c5b1358d8c57a6fe1ba32311f5ca837740cff7ba77767f0a25ef80ec68c3d43029f87af035131526cb71f961d0f
 SHA512 
29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811
 DIST xz-5.4.0.tar.gz.sig 566 BLAKE2B 
6f8a6c81c0d91cea08b218e8f8ed74cea3b471a0adb0b5aac114f85d103977052b735ce5582e4fe5354dde17a7072d776f2fd64844531c3f67e60c770ccdc10e
 SHA512 
9bebc2ad25ff63036e6cb07e9ea6767441138fd91ef59e6f068c370296a594135479477a18f086dbf06b7dda5188fa0da09c24a6b7b3e7222e4bca70104d20d2

diff --git a/app-arch/xz-utils/xz-utils-5.2.8.ebuild 
b/app-arch/xz-utils/xz-utils-5.2.8.ebuild
deleted file mode 100644
index fb35eaff7363..
--- a/app-arch/xz-utils/xz-utils-5.2.8.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#   to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://git.tukaani.org/xz.git;
-   inherit git-r3 autotools
-
-   # bug #272880 and bug #286068
-   BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-   
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-   inherit verify-sig
-
-   MY_P="${PN/-utils}-${PV/_}"
-   SRC_URI="
-   mirror://sourceforge/lzmautils/${MY_P}.tar.gz
-   https://tukaani.org/xz/${MY_P}.tar.gz
-   verify-sig? (
-   https://tukaani.org/xz/${MY_P}.tar.gz.sig
-   )
-   "
-
-   if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-   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"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/;
-
-# See top-level COPYING file as it outlines the various pieces and their 
licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"

  1   2   3   >