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

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

[Sam James]

commit:     e5082f67594c738c7a9e00364993d7df486b9d54
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 23:04:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 23:05:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5082f67

app-arch/xz-utils: add 5.2.9

No verify-sig yet but the sources have been verified manually (diff
is tiny too).

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/xz-utils/xz-utils-5.2.9.ebuild | 118 ++++++++++++++++++++++++++++++++
 profiles/base/package.use.mask          |   4 ++
 2 files changed, 122 insertions(+)

diff --git a/app-arch/xz-utils/xz-utils-5.2.9.ebuild b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
new file mode 100644
index 000000000000..92b43d373c4c
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
@@ -0,0 +1,118 @@
+# 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} == 9999 ]] ; 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} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; 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+=(
+			--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_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 059d9ef6ee5b..87a20408384f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-11-30)
+# Upstream is down but source has been manually verified.
+=app-arch/xz-utils-5.2.9 verify-sig
+
 # John Helmert III <ajak@gentoo.org> (2022-11-29)
 # sys-apps/ucspi-ssl is last rited
 mail-mta/netqmail pop3

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

[Sam James]

commit:     18411a4939cabbeb81cfc4222151c4225ca7edf3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 17:41:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 17:41:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18411a49

app-arch/xz-utils: add sig for 5.2.9

As noted before, this was manually verified, but it's now available, so unmask
verify-sig for 5.2.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/xz-utils/Manifest     | 2 +-
 profiles/base/package.use.mask | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 1863b2b55260..fa7b0867a962 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -3,6 +3,6 @@ DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b
 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 1982 BLAKE2B dfe54fdcba19d247b9365ac1419b05f779bd27e7d1e369b68c277751e17adc1bf607867e3a3f4f5d5be0949c0eeffe94c9aff52b5af1e3a0c258d48c1cab40a7 SHA512 9ec508f1be8bdbfbb61abd83bc034eeb369a282d6495e6cced4cfa28c339d0c24bd1925b049a450e4fc3d3bdd44be6d080233ad529ca24fccead534f930d62e2
+DIST xz-5.2.9.tar.gz.sig 566 BLAKE2B 0f5807e2c963aaba2a65495cbe49c80047f022c0ac0f2d1b001e1c4d434605499148e01855e586595d4b0db99cd9c81f72bef8dadf5c9a61ba4f6f5d7da85d9d SHA512 871f71cf4e3ed77249fb8279301a77bd2ca174647cc4d0fe034bda349d5c52438f1aafe04294a1c260ad93d9ecda16ee8aece1655de79a898536b2a6e2a65ba8
 DIST xz-5.3.4alpha.tar.gz 2216390 BLAKE2B 0ed5828645b665bd5b18187ac051419258cf3790ffc1868ddd0989bf722c844c7acc3acfd75fa49ba2a4a03da6d105e09e35287ff518a57af5e18b61046ff901 SHA512 5b81d16d2a4547a638421147ec1018fb2a1f413c6ad73e82def47a371c8a3959a382c58296789a9c5ea1efe6e763bbe559c10d10d1d2cc2ebbc06298b8136cf7
 DIST xz-5.3.4alpha.tar.gz.sig 566 BLAKE2B ddb49538c1a2e1eee2166b07cdd828dd58934d39f08a9631d2370d61c6ad34ae1be32038f0e9fd8f39e68fc291c07657b04e80b50ade86c3feb589e623662081 SHA512 b44ccb8ccac7082410156b04f8dafb07a619b4f246ea3cbd1a51564330d3cf497f4caf5afe730102cb382d6bad0cdd859ab032e048e8f0ee395940400b5c85ce

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 87a20408384f..059d9ef6ee5b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,10 +6,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Sam James <sam@gentoo.org> (2022-11-30)
-# Upstream is down but source has been manually verified.
-=app-arch/xz-utils-5.2.9 verify-sig
-
 # John Helmert III <ajak@gentoo.org> (2022-11-29)
 # sys-apps/ucspi-ssl is last rited
 mail-mta/netqmail pop3