20 files changed, 93 insertions, 413 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 813e1d43e13c..fee26921efbf 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index dcac5cc3fa7b..da53e8c98923 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -2,6 +2,6 @@ DIST keysmith-23.08.5.tar.xz 163456 BLAKE2B b7338decbf1ccfe9f07d208decdcc1ea5133
 DIST keysmith-24.05.2.tar.xz 171756 BLAKE2B 5059579e9529f834814a3f586dbab5aad1a5235759c0fa76a7c7cf5588bb3b2fd64ca381d0d749d88cf74446ca5a380cb6f49eebe005e34a6f184e3f8fbcf7dd SHA512 fd2964b4fc754ac71d5fc2b273e2e70671f4b8a4cdf95e340ade20a234d7ddbfc81e0a6bfbde3178b49ba94b3219a2e1169903eac4d707b1f130df7ed7478f77
 DIST keysmith-24.08.0.tar.xz 171440 BLAKE2B 6aff612d21b66f9a7d2170cc6fde009c447c0686d3aeee8a4fb043b500452cd831f45dd943da3f44965d326a373cbf220b7a6cc46285d74e4d56db4d5d1017be SHA512 10016b4d3268e5b7caa52765602ffbc2c4b7d66f2c1ff6053110781b64981f304198fc8351889251c4c32b3647648af67389d440ed625d592ada80080d0070d8
 EBUILD keysmith-23.08.5.ebuild 817 BLAKE2B 87635bdc62539282790b87ed452d712a54d7e65edfb571111c30af1b453b1526b1685da181bb3e94eddcd41f7d668d929bf3045462116f128e91d3527af276bb SHA512 76442d453006aea7e6b08b15258dc93e23200605c344827eef0f14f7f8b42eedfb30986377084980e1cde1da51223c6fcdeaf9076a82bdf639b976c0cd85f472
-EBUILD keysmith-24.05.2.ebuild 848 BLAKE2B 6c71dfcd1fc121261c564ff040f88b358d66cdb297c7ffc1e85dccb4ba9db52cb230f97b2ccf52b486940d0fe1c0fea17d5aee696ad9292bbfc82e130528f2d4 SHA512 e007747d28e1b378a3a1514027abdd08bc1cc02c337a946367c929eec76e0a07af86de7942d0192d7535a8feb96925e1b6e077b31e2fdde162621abbc62e0539
+EBUILD keysmith-24.05.2.ebuild 847 BLAKE2B 107bbe4cff40031a7f77d1772691e4ca274460074192aa7cde08e590d1e480ec939781a7a83c7c1bf5da2b4eba91881c516fc6f4ce4630207d49552964852e8b SHA512 7cfd1b29ddf09348e7e72015dc4ac75502267e5bba9e05775ff62792180fef37f9804b5b6077e2e692648b56548c058bbacb91c9dd340aae7c55d5d9bd299492
 EBUILD keysmith-24.08.0.ebuild 849 BLAKE2B 729d061e7b663e632490103ca606971dc5a2e042c371c573c50c6ed778a4a08edeb3894b4c7e1b597a94c9ec0ae6684ffb5e83d202594ca28a1fddfbb0c3b26b SHA512 a91a0f938a3a1d746fba7c2f459e56b54a438ee206208e01d184c5c1e388ff8ddf3f29c662eabed40631e443d678dc96cea4ecbbc7c41d3f9db80c92704ae8dc
 MISC metadata.xml 380 BLAKE2B 110b310586031ac53056b1502648607210ee0256858efee1d54e756e130b4e331202f8571c96f5064ccee7d63bce9c4af2b92c40389d2c7b06a4fad70be8656d SHA512 10365587bc7347003e99f0684c92fa7c7154576643eaee09e79b1bddf5aed12b6062dc426b07343c6cfbcd423ab3e77e245b3659919f75e4a4183fb56fa2fa0e
diff --git a/app-crypt/keysmith/keysmith-24.05.2.ebuild b/app-crypt/keysmith/keysmith-24.05.2.ebuild
index 4c4f8e67ba5f..bb6b9b405e71 100644
--- a/app-crypt/keysmith/keysmith-24.05.2.ebuild
+++ b/app-crypt/keysmith/keysmith-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index eff9146a700e..eb53f162fca7 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -13,8 +13,6 @@ AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aec
 AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655dd5170a4f9f16c6a889a4303a4dc276aca09b3a213a1de3e6ab759c66790141708ec95c4393bbbe79e8fb16f SHA512 b7419d1c728eda86fbab2fbf83794ae754e3cdaec7dcdc12c2105e3a75f9903c25fe8fee48f57acf6f0a8c62d27f7934fae81c0cbd67b997541aef7060a4de46
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 141 BLAKE2B 2f6741a55551e0f8673cd78480b7775f3e9a1fedda7af110d68f7577aa2711addc7ec8cbb20a5bc13c6bab560d6e7e854ce2ef9e81bbee487a700eec6f9be1c9 SHA512 7f21497a6045d2e0ad8f6f14c275bb895ce9317764e71c5290b0846688479ce9ba49e14ef73f6debda5f6ffe730b4da28a380717b09fe0d60d102ba44efcb170
-DIST krb5-1.21.2.tar.gz 8622513 BLAKE2B 2afb3ff962a343bc07182fdab0c0ffb221632ff38baab74278cfc721ae72deacc260221470de36e420584f00b780e13221d2e511d4831bca8e1270b7f3d9e824 SHA512 4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49
 DIST krb5-1.21.3.tar.gz 9136145 BLAKE2B e909a55eaedab68e5c829bb7bbd26cec5db2d7b8d97f3b034de94d8f957003f16977ac619afee3b862f288e59f05c5e44f41e65b8883961c8b22a26e2f4733bc SHA512 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
-EBUILD mit-krb5-1.21.2.ebuild 4000 BLAKE2B 6cb733c9b3b614f2bd2c5e631fc47b2befd249dca726995d47d0a3571ca30b2ffd5f629214ef158556eb19b2fdd308dde58629f3a9001c3d65176d9e8e98377d SHA512 fbb6dd5a80c8d442047007770a49900bbede48059184c194046e34f14cd5d427702ef29b33aa9396a5a72593cb12869908865cd0f573b0aa7717b53dcac764b1
 EBUILD mit-krb5-1.21.3.ebuild 4103 BLAKE2B 0ec499985eb8595d4ccf26c7d2031094e82840df015beb61228e164b8bc8850c9fe31092b3e639bdb30b4155d2949ba6d7c298881bc6df68f8eeb9e7d97d8fab SHA512 60db771bf1a26c6ea5ef88152b4ae6412de5d20254c06ed0d902f442a5aa8621f2e58e8353fcd44c4c8425fb2b1664acf4ebdbb9d99987c2bd3d2183aa94907a
 MISC metadata.xml 886 BLAKE2B 4db2f2acb4740d9d8d4dea745ebe583e373ccf6c6e8b33206305ebadc971e3132d4f0811407755ab4d9053bf2993d763a59b9104169d90c776cc7e3fd20ea9b1 SHA512 783772b00fc4d6f1da7b074bab380ed7448af7e5bfb8ff1dcbb098ee8f5fc16ac441da300c455b016e09025c65754bf540dc27bdc13198d93740e0110d1f5dc2
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild
deleted file mode 100644
index 8f94ab10df74..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.21.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic python-any-r1 systemd toolchain-funcs multilib-minimal
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}/src
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb:= )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-alternatives/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? ( dev-util/cmocka )
-	"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}_dont_create_rundir.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# lto-type-mismatch (bug #854225)
-	filter-lto
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	AR="$(tc-getAR)" \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 438796e18716..a627d795f343 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,9 +1,6 @@
-DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
+AUX osslsigncode-2.9-missing-import.patch 995 BLAKE2B 390dc5ab00db721d3237dc5382abb21201a1c0290a4e3c14411fc18dc3cb1d7759d3fec9b2bf3b67c1d1a5ef3634f320998c1f1bae5ceab95be454aea35ad156 SHA512 6bc44fa87fbafefca70d96f1152e02f93ff417eb8ed8e46cb290f8e70699f325ac88deac7e3854e10a886e343cb94760fa25c470c9a37b3a2a698235fc369d41
 DIST osslsigncode-2.8.tar.gz 747274 BLAKE2B 62472d0830b53b2d182b37585a225f0699600bcc2bad5915a64a52b5b7c3fab6f7e936ba82e41907e41c9b0cc1f8ff5f47aa79feb8c5742b16d1fe101baf3db0 SHA512 dd7349e3a64c1d6f63379a14450c8e643c006d2824dc41ce9ecde64ba276466772c440e577aca4a805a49c7ba88aa0dcf5ea73c323abcc4945491407b20e8e96
-DIST osslsigncode-test-unsigned.cat 394 BLAKE2B 77a9ebd80feb7ec4f26c0899a760b6463f88ed2301fd3c65c4d72417f7d7d61f0e51c0ca87870500bec51f900aafe05216f4cec888db6c76b292760862da7d00 SHA512 3f4212a4a0822079ba46a90aa80f725d0068bc30e8be057019b2c500633d502f6d879c4ba332c54e1194c148a1fd4d7551a2ba7cb143f2fe53cef5fe94d9364c
-DIST osslsigncode-test-unsigned.ex_ 120 BLAKE2B 7036b07cfa8f7d1bcdfc1293671aaa01780bffee0339aa5b63b8db77dd2d77a75ffa51363385c2d40d62d057adf4627afa47f099f8e1206c4eeda67af01bd8fc SHA512 373592e6bffe1da907cfa464fa70d1b64c177beb7fd76325553afb0d721263d35b40508e3ede0a64bd016abb2ce97e104417fa472cd2bb0d92f5d14d5001349c
-DIST osslsigncode-test-unsigned.exe 96150 BLAKE2B fd0da9e64473fed792572606f38de8c71e285a557883ac29201b113abc533a32c80ed17330860dd30b9913302ea44433c41d21ba236789ed6d25083f5909960b SHA512 afed867e6a680d7bdfe27e537ccf6496572d79b8b8a90e1886a83d9b8a67c815a54b7bd929819a0cab7b3243c276dd676e51b267a918ace448689d4b424d948b
-DIST osslsigncode-test-unsigned.msi 9728 BLAKE2B eb253cce75c5419d1815682c10f1b10357af90317b1dfa71d3b888e5b158017b8f2b3154ae2073bed1fd5f9fd515c2006a0cb0692a70d1876221f3fe5b048f33 SHA512 3c3afa76d5a76dd7eff35b5d8e8b5a5bbcccd23f213591d3a8d0b4e5e97a8dbabb97345b7a93bb459fded5269f5ce1d7afa66baf623c8b8573f95b68fb4a93c1
-EBUILD osslsigncode-2.5.ebuild 1292 BLAKE2B 80b51c94a60a75928f91de4fdd69c220fa8b8be8dc2716036453c5379c030e9713be79cd5fe61814c410b27e833a469068d3adcc155c08526233a51ac774a320 SHA512 bb781e77a817f1002eb89663797b0c28b31dc68844935c4e116d4eae5ff0b3d92c5afb9237f2c599b317c13e204fa464eb30571c5ed8a0d6ec1b57cfea5ed3bb
+DIST osslsigncode-2.9.tar.gz 1033420 BLAKE2B 63897907102f7e3ee241d4a0436ac2c217351cbdf330c302344ad648cc5d7962ea9936b1c1ccfe6072c3188f6e49f892b323eecc0c87476071effb6d02f9e0e0 SHA512 c88d3050b0f4af5cf4ec899ac1935cd04833ed8c7690298ab1bf0c00c4e53bf5a4f9ee31940d63e29350a6babf43f212e56aa480a67745b6d715a30a8093e3a6
 EBUILD osslsigncode-2.8.ebuild 1438 BLAKE2B cda3e11d0be1f239f0d3526aad9a06035e4270eb6aa5147a0eb45d735847c9272b6d5c6a3b5df36349214fa5aa3fc1f1cdae483f5cd0bdd633fa73183b551bbd SHA512 9f7344dcd025531943f4b8f885a3fa771b69bbebd4038f64542892dcb0bfb9abb1af43f1cbb705eee53dca0b8b8476d9c88a0eaffa77a899abafd2ae202bef7b
-MISC metadata.xml 311 BLAKE2B 2125050abed07efbfea727f3e45728531290dc032a0a54beb102d5b8a74c07df7d291c22293107286da9563d4de5d08edb8f61cd6fd8a11abd0bd465cf31d854 SHA512 93b6f00f2ac04656afecdb12a85b1736559247eeb9855835e90b0b79437e93c10e0bb6a2324f067ba37be9293e3b41406d7901ffa32f22e462b01eef3ffa1953
+EBUILD osslsigncode-2.9.ebuild 1039 BLAKE2B c5e0e79202f5dc663f1d9f398919f0cd5e4cde6c2300aef9d9621ad6db609dc6005860a6e1cbd91ed2fb3dc3f028035366e6cb612f593819a98fabc2dfd968a2 SHA512 ce2521f8fa9ada04a108c3e455875e180a48f2fe6a203ac4a87b593f314fd3355925aaa0466f1165416210114f6d77187b3b4cac5cd71acbc73c8864d3342c2a
+MISC metadata.xml 254 BLAKE2B d3f965a8685847a6c6207933c7b08a3fef2c01798fc4eeef77fe22bc83f52bba5762160fab942b7be6bd26f32d0f0cb96344edafb9d35bb326927e74ce9119f9 SHA512 4b6710c5c854b4a7c4c36de77cea55074b2a9fb023ebed212af1289458a2397974458608556e0fcd547a0a11a5b3fed75323323e707dfb46589340c25a2df95e
diff --git a/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
new file mode 100644
index 000000000000..4385aba12b46
--- /dev/null
+++ b/app-crypt/osslsigncode/files/osslsigncode-2.9-missing-import.patch
@@ -0,0 +1,27 @@
+From a8c1bf9838610bbb8362b1d425cdd3e2ecfecc8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Sun, 1 Sep 2024 14:59:49 +0200
+Subject: [PATCH] tests: add import for python-cryptography >= 43.0.0
+
+write_pkcs12_container method raises following error message with
+python-cryptography-43.0.0:
+
+  Error: module 'cryptography.hazmat.primitives.serialization' has no attribute 'pkcs12'
+
+Explicit import of the pkcs12 module resolves the issue.
+
+Upstream-PR: https://github.com/mtrojnar/osslsigncode/pull/407
+
+diff --git a/tests/make_certificates.py b/tests/make_certificates.py
+index 6fb03ac2..ea14a7ed 100644
+--- a/tests/make_certificates.py
++++ b/tests/make_certificates.py
+@@ -10,6 +10,8 @@
+ from cryptography.hazmat.primitives import serialization
+ from cryptography.hazmat.primitives.asymmetric import rsa
+ 
++import cryptography.hazmat.primitives.serialization.pkcs12
++
+ RESULT_PATH = os.getcwd()
+ CERTS_PATH = os.path.join(RESULT_PATH, "./Testing/certs/")
+ 
diff --git a/app-crypt/osslsigncode/metadata.xml b/app-crypt/osslsigncode/metadata.xml
index 7c529bd10048..efa2c3eb8359 100644
--- a/app-crypt/osslsigncode/metadata.xml
+++ b/app-crypt/osslsigncode/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="sourceforge">osslsigncode</remote-id>
 		<remote-id type="github">mtrojnar/osslsigncode</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild b/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
deleted file mode 100644
index c0d1773bcf38..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} )
-inherit cmake python-any-r1
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/releases/download/${PV}/${P}.tar.gz"
-
-for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
-	SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )"
-done
-unset test_file
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:=
-	curl? ( net-misc/curl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test ; then
-		local test_file
-		for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do
-			cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die
-		done
-		unset test_file
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package curl CURL)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test -j1
-}
diff --git a/app-crypt/osslsigncode/osslsigncode-2.9.ebuild b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
new file mode 100644
index 000000000000..7974b492fea1
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit bash-completion-r1 cmake python-any-r1
+
+DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
+HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
+SRC_URI="
+	https://github.com/mtrojnar/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/openssl-3:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing-import.patch"
+)
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/cryptography[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_test() {
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	mv "${D}$(get_bashcompdir)/${PN}"{.bash,} || die #927196
+}
diff --git a/app-crypt/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index 8d98f8417ffe..49ffac922009 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -1,6 +1,4 @@
 AUX pgpdump-0.32-respect-ldflags.patch 998 BLAKE2B fefa545f3c2d1d3ed3baa5a9d2b84b9b32745626883e9b8056fff045ceb0d06a490f5068782dbda07e4956429a2d2f31865c9c0e55b91bd9aa613f9ce6016537 SHA512 ed333769ded8acbec36d34bc86d935705294d96854e84af4673d44ed3d04f5272d2c1bba38b2742afeb02b2a307a983ff61566433ad1546769e6a68f2318e760
-DIST pgpdump-0.35.tar.gz 77580 BLAKE2B 2c0b8d69bccf37a0d9a192273f901c52d74fa2423f32084a9ddda9c70c2055a0b594113b486cb9bcd8e9566cef781938186400dc139e9e00439db067b38307cb SHA512 03579d7d89d98f19f50c9722c063f059904887f7ca7da3eb99a4aadc6c5361b5161c891767a93087bfb42641aa2e24a9ad6560b1e4396370217afec61a988015
 DIST pgpdump-0.36.tar.gz 77084 BLAKE2B 35fb10acd70ca4e2408bc8fdc2cbebe37d2b1ecbd96fdb847688fe1c15ef78e993bddb30015da42847ab50d2dea6ba44d97d958f395095725947120119c10aaf SHA512 0e8917893ff824b4fcb1656727f3bb120b1772259047f50f56931750ac74548eddb89a75baeaa2da4e39db8045af0db3c4f5ccbcda7e129ca4949c0abf7d4dd2
-EBUILD pgpdump-0.35.ebuild 522 BLAKE2B cafad7d5119fd195102e94eca4cb7882b1fc901a1953bab07a0e9288765ffadcdf34f019ae8e0f4d0d329b89d191d29f3475f919420bec061056dfbd0858d12b SHA512 fa043ec5cbf6416b915fe25c03ea6425494784516e7b4ef85ad320acff3035cae6b4922fa8e4a41899e3038d3da82a412a81eb9cc62e028cf26a71ede2bc53f0
 EBUILD pgpdump-0.36.ebuild 522 BLAKE2B cc2c490850625ebf4c326efa49dcacb84f931b5d7bc1de78aea3bb611a188c2e12c1bbe891172021dbed367f55206ce7abebf98fe93d66a57d4bd012b4c4a579 SHA512 80eef09d6407be07a1aa9e34ad8815d13ecb0aee0e49c768d9023c236a8524560bd970a6edfb4756f97a2ea067d78ec03def2b4f833381fe6fbc28cd94cf2cb7
 MISC metadata.xml 254 BLAKE2B c39b24370eb9491088f6f7a71340e8308caeada31bf26e230402746b603099e096a8b8f80b88deabebc07f9d3055c3111da87220137814482042e50309a45f65 SHA512 fa4f3d885634d2a414f4824bd250e03bcd17fbff0832f84ca03bc27e4564e772ec0e25b4de6968117f71b1f0a9461e91ac1d80adc84d679e2c83148c12a635fa
diff --git a/app-crypt/pgpdump/pgpdump-0.35.ebuild b/app-crypt/pgpdump/pgpdump-0.35.ebuild
deleted file mode 100644
index 82da34560146..000000000000
--- a/app-crypt/pgpdump/pgpdump-0.35.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A PGP packet visualizer"
-HOMEPAGE="https://www.mew.org/~kazu/proj/pgpdump/"
-SRC_URI="https://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc sparc x86"
-
-DEPEND="app-arch/bzip2
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
-)
-
-src_install() {
-	dobin pgpdump
-	doman pgpdump.1
-	dodoc CHANGES README.md
-}
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index a403d324a65c..21aa1cd442a3 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -3,6 +3,5 @@ AUX pius-3.0.0-Fix-typos-132.patch 1277 BLAKE2B 8c35c09224472a7a1b1c4deabe0df916
 AUX pius-3.0.0-Minor-fixes-for-pius-report-137.patch 2744 BLAKE2B bf738bdf20e33d547ba149f25eaeef01c24471c4f5472dbece4ad5e72446ede919cac5351096f8796f3d67f13a0258dab45b4648e2bdba2a0e33dac1a844078d SHA512 4978309350025e818e8950dde21509b3a2feba5dd650720ca83b00e23cff93926c3f35eab028a15ef69750c619fcb23d62ef910e89e57a4f8072923316d4146f
 AUX pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch 1909 BLAKE2B 60440079520ff12664c89fa42a0ee4cdf9fa5f9a69fa6293f5eaf3fd9a438a669aa50b84ac78701f6ae91c67486588c5403ac89bc08b32697c1550b513ebfe08 SHA512 faf77cf23cb1e2e7b214e70dc955e8683f08195175228e299955bcf4eae07c5fd147959a0f526be42960df2607deed9ac3f15e4abac0484d415fe2acaf4b3ef7
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
-EBUILD pius-3.0.0-r1.ebuild 878 BLAKE2B 772efbfd8f7686fbe5b85c6ddc081ff65361aaab33d5692fa6c289b09a216d1d148c904a7cc2257b966c32ace0f476bc8b09c0c27e222bf2b5043ef41285afbc SHA512 90aa67428e566853084af6392c2dfd61623670d5fb241c35bf468e36e5b43aa8b363c864603a1224cec3e74f32baf9f3550f2679d53fa1be45fc5680eeeeb8dd
-EBUILD pius-3.0.0-r2.ebuild 882 BLAKE2B 2c66026df993d284ff62cd0a1cddf8ff938360e61ff37f9159561c7ba6ec2d2e30324b0545d9827512dd7630eeae82e1ab2b0583e5b7c2ee76930bdf67102f62 SHA512 8e9b2025854a46cc88f4637ebd93dd767b8f110ab72c3c72ee293dd4ea9d11cd3c1859987c00980501961c80fdd8cd41f9581af2231a1ae8a9cc9e561b0fed0e
+EBUILD pius-3.0.0-r2.ebuild 852 BLAKE2B fdc3902b51ce694e2385d1ca53b7e766f7346d520f2d6e9db44439f527ebcf537e2a86d7ae1dffce66d0b6d7e73b2b8fb946c14070b9d2a976886da3e4d4a2c0 SHA512 30ec60a4bed6e92196b765f081ece3c7629ec977dd25e7bb19f5b77484dce6a6f446383eb9fea8ef3a3cbdd6b58a70886f9fcff0d278873dbd0cd8fcb9647b83
 MISC metadata.xml 617 BLAKE2B b533989d903736fe7a748115dea44f03e4c1e3513354540553453157f4c9bdbebf4819c2cdfb3e52b923c5af6099bdfcb8e6563e11b44954bf2969249c5e8c79 SHA512 64b55d05a7595aeb413cc25c19c58c0df3a662cbc31ab7793dce2d6cc9b0cdd50ec6c0b3b31d1035e8abfa0a3ba4eaffc2b908d6c09f977c3e13e5bf1cca912e
diff --git a/app-crypt/pius/pius-3.0.0-r1.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild
deleted file mode 100644
index cf60ccbe13a5..000000000000
--- a/app-crypt/pius/pius-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
-SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=app-crypt/gnupg-2.0.0"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Fix-typos-132.patch"
-	"${FILESDIR}/${P}-pius-keyring-mgr-Fix-constants-134.patch"
-	"${FILESDIR}/${P}-Fix-typo-in-readme-135.patch"
-	"${FILESDIR}/${P}-Minor-fixes-for-pius-report-137.patch"
-)
-
-python_test() {
-	${EPYTHON} -m unittest discover -s test/* -v || die
-}
diff --git a/app-crypt/pius/pius-3.0.0-r2.ebuild b/app-crypt/pius/pius-3.0.0-r2.ebuild
index 184aaf851b53..c6f48e76ca35 100644
--- a/app-crypt/pius/pius-3.0.0-r2.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r2.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
 DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
+HOMEPAGE="https://github.com/jaymzh/pius"
 SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/pkcrack/Manifest b/app-crypt/pkcrack/Manifest
index f0429adf1589..c7ca263dfdfe 100644
--- a/app-crypt/pkcrack/Manifest
+++ b/app-crypt/pkcrack/Manifest
@@ -1,6 +1,5 @@
 AUX pkcrack-1.2.2-build.patch 2539 BLAKE2B 54ce5effd250832aaf04977b4baa9a212cc80cf1fb4b50a7629314a7e716c2ced9a758f20631c0c783e25611ece51d19048880b9f63790140a8914a9661f1214 SHA512 48b71bc2d5aa850603eb1872c200465e655fcb527323ebc9d1728311fcf9fa15722f7b80a6809c7960ec0f4fcf3d4e65561880f61feb4dcbe35dedf15c198f20
 AUX pkcrack-1.2.2-gcc14-build.patch 361 BLAKE2B 0e358e97ea4358735a851218bbf2c1d89987f020b13189e0f71cb0a0f512a1b998b7d833d269b0f6ed90c3fc3ab88aacf5b3b6ebe7b638e45a6f2e0365f78433 SHA512 28ad5b3b0d5b0d69192998c32da8c69808b35ead5bf0f35601a40c9199daf1ec6637a0041e5a45bef7cbb2c207ad555e8a45c97a64b6a091d58e5200397edf78
 DIST pkcrack-1.2.2.tar.gz 174208 BLAKE2B fed476a9d681bb9e565d05ef636f58d6643c4f8897725c56b66e64123e9435f9bf28e550f0249794e81e9f968683ab81c19baa1ee51478e1b91509e8e318725a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200
-EBUILD pkcrack-1.2.2-r1.ebuild 1077 BLAKE2B 3ec1a3eac544c67659276c412dfe9311643aa1f6d6c8489413ea4beb0d226e2cec08834a0de1e9daee0a96be7e5ff8717c0cf4ebabff4489f50a75aefbb1077b SHA512 2d18e8fe2dac4a843ce79de13669d378bb535e773245369c39cf9d99396ccfd37d152a83b44bcd622534ff6ce4fc504c28ce0f01773b6479cf9cc95dae54e3cb
 EBUILD pkcrack-1.2.2-r2.ebuild 1137 BLAKE2B d3d518f5d8a25cbfd65b71962527fffa8f3ad2d6cd1a0169d6fdb4a05db860efa3b43d5d663ba7ab75b7ff8cb8e32d735860a2cda0f61d746cfc883a924f24d0 SHA512 2986c8ad1b95afc37650b4ea7a01d323859ffef777de71ef2b29db093b320b5d2dc236fe60be41540ef3520b26d4f4a78052f14dfc4cd806caaf7a4e51e500e5
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
deleted file mode 100644
index 202b59ce9a9f..000000000000
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="PkZip cipher breaker"
-HOMEPAGE="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack.html"
-SRC_URI="https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/${P}.tar.gz"
-
-LICENSE="pkcrack"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!<app-text/html-xml-utils-5.3"
-BDEPEND="test? ( app-arch/zip[crypt] )"
-
-DOCS=(
-	doc/KNOWN_BUGS
-	doc/appnote.iz.txt
-	doc/README.W32
-	doc/pkzip.ps.gz
-	doc/CHANGES
-	doc/LIESMICH
-	doc/README.html
-	doc/README
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-src_compile() {
-	cd src
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
-}
-
-src_test() {
-	cd test
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" all
-}
-
-src_install() {
-	einstalldocs
-	cd src
-	dobin pkcrack zipdecrypt findkey makekey
-	newbin extract "${PN}-extract"
-}
-
-pkg_postinst() {
-	ewarn "Due to file collision, extract utility was renamed to ${PN}-extract,"
-	ewarn "see bug#247394"
-}
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index f89369257dc2..e794a4124dfb 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -1,9 +1,7 @@
-AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb9263142404e495de64c8fa5cca8c1a1b4319a7d677ed930c02a6147e71f90f9a9ff0be4e80049c8540148191df170d7124be62f43c1d2c5515 SHA512 1b1fab8bdcfac682d0927075a0614ae888a1b23382ce8484b2ab9eac316f46a907bbd872615553201c5ccbf1d8f677491612956075bffacced0d408defad9e07
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
 AUX rotix-0.83-meson-build.patch 1235 BLAKE2B 84af034797a8a309d13925f734097e5c1ee4b0348bb2a9d1412bff7e72f27d263624a3f2b8f44264a816fdfaee9a9e6d12bc2c9c5babde2124e8ec1d4b0c6b99 SHA512 de8f0d07d434c834384934b4f9e6e3390e206ac63e436e7ba038b5e772ef71c2494868b326c365d5b7fa78fb6d07a0627ea75e9e93c9c2924f4e6d1ae310cbf1
 AUX rotix-0.83-nl.po-charset.patch 807 BLAKE2B d8482b4244facbff9cc37975edb3ee0613ba90fee69b6ec67c7a04e3812ce05701a3e38038e12ddf1bff2699de8be2d9cba713448e444feb9cfd972c77b9e3d4 SHA512 468e616e8b97b42652abdf7b9f2082233b0084cb971b2fd7dbb26e020777531f5aea758910738270bed3923ba4ce7930d5edcd42f976d549468bd0b08d4bcf7f
 DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
-EBUILD rotix-0.83-r1.ebuild 800 BLAKE2B 720423e54f7e829944a9a958ad4868e80ec32cfc9cdd6e6ce992ec2363433a78a6d290c29ee10d26ff51db663c33a0af8d7930b7447bfe9b8cb9f4d095e3a443 SHA512 cdb690a367fdcb20c0446ef57a69dfbbbd89d174182c9d5897ef7e4c010ea18a7d3f5cbd2b2da69cd69c7f6937fad004e762fa6a954a2d32873d06f6744fb6ce
 EBUILD rotix-0.83-r3.ebuild 863 BLAKE2B ceec77c69511e48a53dc886c4d13adf9f24aa687d6a58803f9700d43b94c775fe079e00f7f95df3a81be3d6fb16c22bd09c16acf68a9561b756453ec660b9eea SHA512 e348817ac1343209fa592f32b6d24974498685c159490fa6e704c4ec4f26fa66e0fab8e568d4eeadf3c62450b335ee77b38bc996f97db3f7ae60a0c6fb1dc0e6
 MISC metadata.xml 248 BLAKE2B b4fe04f63894c1e80ba5c13119bbe5b1eb8dbbbfe86a5d0cfe4fb2998c1b045523c2039787212e05e1ed08ebbbfd83386de86de00fc38e7d4e946bcbad117502 SHA512 7e1ead3f76b507b555179148f9c10a3fa3401df81bf4461d456b3255e9844ed4e706d2788761587b086a5e89b430c1149856733a142f3f58ecbe55c2f2ccad8e
diff --git a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch b/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
deleted file mode 100644
index ab23372e768f..000000000000
--- a/app-crypt/rotix/files/0.83-respect-CFLAGS-and-dont-strip.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rotix-0.83/Makefile
-===================================================================
---- rotix-0.83.orig/Makefile
-+++ rotix-0.83/Makefile
-@@ -22,12 +22,6 @@
- 
- include Makefile.settings
- 
--ifdef DEBUG
--CFLAGS += -g3
--else
--CFLAGS += -O3
--endif
--
- ifdef I18N
- CFLAGS += -DPACKAGE=\"${PACKAGE}\" -D LOCALEDIR=\"${LOCALE}\"
- endif
-@@ -39,12 +33,7 @@ endif
- all : rotix po
- 
- rotix : rot.o help.o rotix.o
--	$(CC) -Wall $(CFLAGS) -o rotix rot.o help.o rotix.o
--ifdef STRIP
--ifndef DEBUG
--	$(STRIP) rotix
--endif
--endif
-+	$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o rotix rot.o help.o rotix.o
- 
- ifdef I18N
- CFLAGS += -D I18N=1
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
deleted file mode 100644
index 31d10f900b4b..000000000000
--- a/app-crypt/rotix/rotix-0.83-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://github.com/shemminga/rotix"
-SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/0.83-respect-CFLAGS-and-dont-strip.patch
-	"${FILESDIR}"/rotix-0.83-locale.patch
-	"${FILESDIR}"/rotix-0.83-interix.patch
-)
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	use elibc_glibc || append-flags -lintl
-	econf --i18n=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}