gentoo auto-resync : 14:11:2024 - 03:02:32

6 files changed, 122 insertions, 76 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index afb443acdef3..ccf0b9453f22 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index 0d2d3508cb15..fe5661bcc17c 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -1,9 +1,11 @@
-DIST loop-AES-v3.8b.tar.bz2 411795 BLAKE2B 51e2c4ddd25f288c5cc5cbbbe20d79951d68bc2b7ecc91fe6eddbb829b297fe6946590512f423efcf5be3c4a1c9ce450c0cf49ed44ac6ad8eb2568468570d48f SHA512 8143649cc9616735cb9a9c8cb8b5c8a709b139e8b41aec444d56c85ef7852d103f657d0d702ffb04783963f0d0e919a6fe4e10b31cd373cd326e546caad90661
 DIST loop-AES-v3.8c.tar.bz2 419257 BLAKE2B dd7fe8e4fbc3b58e11ef5440ea81b65d9a1e92e71a81020b9664ae2387dd36da327fddab85bfc27b23ac2f546b7622526ded1424e2c6cd3659e8998f914151db SHA512 d22b4773f42d47a8f499e3234f64a880248ea6a2c7e96b598ec11d3d674fca09d989ef9bbee254b384c9fe17adb009115bcfb932081a326400120c1c4c828779
 DIST loop-AES-v3.8c.tar.bz2.sign 861 BLAKE2B aa6c3e2b1e0ab604d92ae6c09fed992f629c7f61b7b62e6d073600f72973ace430e5e0964174a40b63eb703ede4f53098c6deb8af13d663e0bb147a2138a6635 SHA512 44ca990fdf55e8c03e85139dfc07dde5ad1cbd3944060ee2c15b3ce54656b7836e7a8839d237a53361c3ba7bdafda39cbbab0f03bd1952e679d1a3a3c2f0930b
-DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3
+DIST loop-AES-v3.8e.tar.bz2 419394 BLAKE2B 6051efde9c58ecc56231cc1671ed51a238b829098b0f91fe69a63d6080e7c6c87ce9510db25661058493a0e9f51382b7391509f4d146d491a0c7d20dda4eb05c SHA512 6191dbf2c4f2312c5caa14d124353894856fa9b97807c357ff916a81e8633cd8c9eeeb23d08fb7fb532dae02e0ecf03328f48e75227714e1ad9d1fc8ce27d224
+DIST loop-AES-v3.8e.tar.bz2.sign 861 BLAKE2B b220acdbd0c9aadd27abcc7c17818d38e791d3dd9c8f007af09a7fbb3bbcd1e6045fa31a3a13d82f5acfb3da1b6a41da6b6631c130abcd665bf3aa896583cc08 SHA512 2c62886e8be40849b8aa44cd36328c121e35428398f742ea3fad1a5cf445e131fe211ed4faeae4c1d2f702a2e4a050a4a5c4ac3eb341b2b5910cb9ce79c5c184
 DIST util-linux-2.40.1.tar.sign 833 BLAKE2B 2f8537cd4f52e0c203360d081a91f17c2db13c0f6054ef02f967e8fdf03099bb8c42604864003bfb911ea7804033f4020e2f56a933667fc84ac9c4b8d01e9ed5 SHA512 ab73a27fc8601041bf7b8a088586b78c49ca83cf9c8cfe5877280c0b5c607e95695512804335a8c0ac1d243e4433595f44256407fdbfb053451b8ab40d605502
 DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923fdeb5a649a5c59d2d44888e5e741dfd95e589247355296e050d9ec8dc4334c5898453af055abcb30082af6b835a3e3 SHA512 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc
-EBUILD loop-aes-losetup-2.39.2.ebuild 1861 BLAKE2B 1274cc7ef2f6659aea9d07227943d4de8e979f37eaf67a0b5fb4bb656fc0b9688f1b51480071de7f90960a65d016223b08e4e9ccbc24a2c65a2bdb34f6e78746 SHA512 5b96d851610a51d579b4e34f616eb57ef25f5217feacb4a82954a22506c665d165634ffdd35f5aa6b70f60b47e8ab097af3c001f5ce63090e89f3989a9fc34dd
+DIST util-linux-2.40.2.tar.sign 833 BLAKE2B 10aae23d25c1364bac0034d6862df5738c7a405d52198fba1e4e9173a1b2ba9f3d994dacb881d920c3339c0f1018c7dd1c97c7752bdf0e8e634f54235c2b3f5c SHA512 e4ace52333df0c8dd7c8ffc3b813020615c456e06a6978e06c8183ec29896be5af7c25f59e65fc2c2849750d8d7b43043775b8504d6d01f626f1adf296493ce1
+DIST util-linux-2.40.2.tar.xz 8854820 BLAKE2B 8306d651f27db6665e91a937c9f1970938fec5b069636fea3c2688afddebd1a3424f0b0802a034eab049cf7692dd435cf93e82aa5f4a40cc8064d60b4ca59535 SHA512 ffe20b915a518a150401d429b0338bc7022190e4ca0ef91a6d9eea345db8c1e11ad01784163b8fcf978506f3f5cad473f29d5d4ef93a4c66a5ae0ebd9fb0c8f2
 EBUILD loop-aes-losetup-2.40.1.ebuild 2717 BLAKE2B cad51df7c0f374d95558071db227cbbc6b52e502f749dac90ad5f5bbdc88f584f32fb48e4e894591abfa9fc26cbf2aacdb481c517b0bb3baae0f4de42cac055e SHA512 deca597b8d05b7b6cb995c3ac70526c425b2d71820976e20e1c395cf8d0944711a9bd4ac00c4a20a8eb78ead0d9e1f314f9cc4cb5bf1ad982d7cb0dff9cf43f8
+EBUILD loop-aes-losetup-2.40.2.ebuild 3018 BLAKE2B 91b6edda7e196939da9de7bbbe5525c5f83312fb9e2787abe7dc8dfb4a0e93d1e195a654ef85674efc4598189bcda429a04e6f7c18a0b14dec60ba644023e344 SHA512 db8377c6421c68abbf2edaca30b690fc78418311e9d6ab9db18acb9264bc961366888e88486e6e0f14f1c1ec0b7fd3ed3a3b56cc09dfc33bb78ba704bc90089b
 MISC metadata.xml 536 BLAKE2B e791994189960de5e4314e89e827340481d01e341874b813a20bfa7adeb4d0122ae9929a688cd5c08da27a24d2461452875f70c5363a158328b13d053f275587 SHA512 e842172b0af47ca7e4ffd9c2e7c8d2013369f5090c2f037f7b8e04869924a1864015e4aef10b96b7ef38ffebbdc238e7d917b13e0be9558ed77be7109968d0f1
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.39.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.39.2.ebuild
deleted file mode 100644
index 594a38dc10d4..000000000000
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.39.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs libtool flag-o-matic
-
-MY_PV="${PV/_/-}"
-MY_P="util-linux-${MY_PV}"
-LOOPAES_P="loop-AES-v3.8b"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Loop-AES losetup utility"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
-SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
-	https://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( >=sys-libs/libselinux-2.2.2-r4 )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-
-PATCHES=(
-	"${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	append-lfs-flags
-
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-all-programs \
-		--disable-libmount-mountfd-support \
-		--disable-pylibmount \
-		--enable-libsmartcols \
-		--enable-losetup \
-		--without-ncurses \
-		--without-udev \
-		$(use_enable nls) \
-		$(use_with selinux) \
-		$(tc-has-tls || echo --disable-tls) \
-		$(use_enable static) \
-		$(use static && echo --enable-static-programs=losetup)
-}
-
-src_install() {
-	emake install DESTDIR="${T}/root"
-	newsbin "${T}/root/sbin/losetup" loop-aes-losetup
-	newman "${T}/root/usr/share/man/man8/losetup.8" loop-aes-losetup.8
-	use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
-}
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.2.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.2.ebuild
new file mode 100644
index 000000000000..ef31499c390b
--- /dev/null
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jariruusu.asc
+UTIL_LINUX_VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/karelzak.asc
+inherit autotools flag-o-matic toolchain-funcs verify-sig
+
+MY_PV="${PV/_/-}"
+MY_P="util-linux-${MY_PV}"
+LOOPAES_P="loop-AES-v3.8e"
+
+DESCRIPTION="Loop-AES losetup utility"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
+SRC_URI="
+	https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+	https://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2
+	verify-sig? (
+		https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign
+		https://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2.sign
+	)
+"
+S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="nls selinux static"
+
+RDEPEND="
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4 )
+	verify-sig? (
+		>=sec-keys/openpgp-keys-karelzak-20230517
+		>=sec-keys/openpgp-keys-jariruusu-20240521
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? (
+		app-text/po4a
+		sys-devel/gettext
+	)
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+
+PATCHES=(
+	"${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
+)
+
+src_unpack() {
+
+	# Upstream sign the decompressed .tar
+	if use verify-sig ; then
+		einfo "Unpacking ${MY_P}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign "${UTIL_LINUX_VERIFY_SIG_OPENPGP_KEY_PATH}" \
+			< <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -))
+		assert "Unpack failed"
+		verify-sig_verify_detached "${DISTDIR}"/${LOOPAES_P}.tar.bz2{,.sign}
+		unpack ${LOOPAES_P}.tar.bz2
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-lfs-flags
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-all-programs \
+		--disable-libmount-mountfd-support \
+		--disable-liblastlog2 \
+		--disable-pam-lastlog2 \
+		--disable-pylibmount \
+		--disable-uuidd \
+		--enable-libblkid \
+		--enable-libmount \
+		--enable-libsmartcols \
+		--enable-losetup \
+		--enable-mount \
+		--without-btrfs \
+		--without-libz \
+		--without-libmagic \
+		--without-ncurses \
+		--without-ncursesw \
+		--without-python \
+		--without-readline \
+		--without-systemd \
+		--without-tinfo \
+		--without-udev \
+		--without-util \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(tc-has-tls || echo --disable-tls) \
+		$(use_enable static) \
+		$(use static && echo --enable-static-programs=losetup,mount)
+}
+
+src_install() {
+	emake install DESTDIR="${T}/root"
+	newsbin "${T}/root/sbin/losetup" loop-aes-losetup
+	newbin "${T}/root/bin/mount" loop-aes-mount
+	newman "${T}/root/usr/share/man/man8/losetup.8" loop-aes-losetup.8
+	newman "${T}/root/usr/share/man/man8/mount.8" loop-aes-mount.8
+	use static && newsbin "${T}/root/bin/losetup.static" loop-aes-losetup.static
+	use static && newbin "${T}/root/bin/mount.static" loop-aes-mount.static
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index a6bc667e0db4..131e21e34622 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -7,6 +7,6 @@ DIST xca-2.7.0.tar.gz 1893082 BLAKE2B e37f622864ea20dcf9796640ab7628205823ed2bc8
 DIST xca-2.8.0.tar.gz 1955684 BLAKE2B 4ba352d023a3c7018cfb89cc6e8d9296c7a2664338ef4a3084339f96d32073065be7ec5d07e35cc9b91371e3d580872fa0d282ae10aa5bb36d0ffefa472c23d9 SHA512 14e880625f086d12cd39e55c1dc5703bdbc7cfcf683cf4706bb3fd0e2d9c2937194d3420f5e9a0a8f8fc22a24a56eaf67dc7c8eae5426e991f6737f0b6bb7a52
 EBUILD xca-2.5.0.ebuild 1421 BLAKE2B 76e7249bedc9007decfd75cb2baa5b73976350532b13329673b232cd0cdc23b0398c11592c53f756056fcf3151625952d5bfc8d9f079cbe3257a646a3dffe9cc SHA512 37aa0016f26962a5a5ee8aec1f5c0925f1b60037745906f2da2d0de9db74dea7908b0b43e22a0f08fa5e73c155e25623140fde4ca78d017488e5bef2f587995c
 EBUILD xca-2.6.0.ebuild 1372 BLAKE2B 82451f42e9bc72d13045a90ae673bb2af3464fd4a789729416ad9842ae760b17055ce153cd30c72f3324aca657259bf7887ae36ddaee579858a88e6c16fd55f1 SHA512 2b01c3ae6fe028f5843034d0ce3a42a468379f0e4f483018d05632ac820b2c38c00e97aabf38467272a24a9f1916e6e2fc2b94bb3fc17031d900920ac4a2ca3c
-EBUILD xca-2.7.0.ebuild 1595 BLAKE2B 82bc45fd0012f44dfc695c787887eb0ebccd582f5c960e4ed87996ebed76c166bf25c3f970e8491ae7c8e0fb6354ed08b1896570be6c0ef17b1f22310f01f6d8 SHA512 c7b18e72df34af310443fef119887dcf3f9cfbd04a46c87b979ab31d532f8b75edd7f5ba8b41af3c32770d66930eb8033ac6bfe39bbf1c40a9077b6b962435ca
+EBUILD xca-2.7.0.ebuild 1594 BLAKE2B 0b35f7d65f3536ef3ed93574bda6ea50aefa4ea931ed7c093dfc44eb0f1b76c24a1aada59f18288126519e2f05a08ff606e2fb4ef8ae42ffaf616087af9594d1 SHA512 a0c3f3db0a8d6df061546c40cbf87ea498d845707bcc039fe4d08dbb48d99f4272afef06670c3237713afb7966a7ac3961f901c7c4f33ffd1d01a11ff60939dd
 EBUILD xca-2.8.0.ebuild 1325 BLAKE2B 2028d91c32cf3c12898872e478da098a4aff4eb5d6920da66212d147f4f251647b1a935da2e68aeb74787fa9482dbbae776c56d082d78b8645fa435df7d62106 SHA512 aeba7997b7f2b203cc942fd70d6a6f0efdd143d47d29a7cf9f411827211511b1f3b3c0770a9dfcf89f85a14ea181618f267ee5cddebe29f9480dc9fab9fee55a
 MISC metadata.xml 304 BLAKE2B f99e5a2ed991066c1c605ca7bba6669b362e90a96e5a26258caf8d6491f8c5351cc897826bd06dda28ac67cc3813b0fa640b8fe304aeea7ea10b75fa3074d340 SHA512 b8d54115ab45ecc869066e083938a28d075f4436fef33607685e633976843023b3fe4fb65456ba04532f38c4f35b7dc109f68c59c11ad4e73f2332786fee6cf5
diff --git a/app-crypt/xca/xca-2.7.0.ebuild b/app-crypt/xca/xca-2.7.0.ebuild
index 506081611614..1847566119ae 100644
--- a/app-crypt/xca/xca-2.7.0.ebuild
+++ b/app-crypt/xca/xca-2.7.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc qt5 qt6"
 
 RDEPEND="