gentoo auto-resync : 06:07:2024 - 08:06:15

15 files changed, 545 insertions, 37 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f9b82a31735e..a00cc2ff5b13 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index 590baffb579a..c22c3fb9f2c1 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,5 +1,7 @@
 AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
 AUX gnupg-pkcs11-scd-proxy.initd 685 BLAKE2B a7f38141554e98b859f8a6945c7e50f1c223157163bfa3f2dc10c291458935b95b29a8a383f937e144e4970d63e3b857bb9f6ec51143f90043f57da92f083feb SHA512 7afd4f088946f6829b19b897eb7bee67456f25a3f14d10f6fed14918327212d19cdd01028214207a4aba3abed6fb592e34333a5e2424d830af2ff1ec8d8a5e02
+DIST gnupg-pkcs11-scd-0.10.0.tar.bz2 149036 BLAKE2B 7282850ddb953a32114a3b28e9f1992dd73cc64d065c00308479276750bdfd52533c3347361d86fb6ddc8ae01fcfabe5b375501280c9bd93e6a6d4e209c63e98 SHA512 47b9afdc3552fc9a741a725c6732cd31cd2643d7483a50d26222d68d0557b700addff37d8598ee1076575b8bc1e1134a52e06b67d4f94dda7c90141a57ca4182
 DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
+EBUILD gnupg-pkcs11-scd-0.10.0.ebuild 994 BLAKE2B bd0149df0723dbc6d781f76358084dee271635f0c72ed2d4d59dd63b4b2010178d6403a6535827efd0f36e1937ea749ba5e542855f13969f91837f1e19e1d3d3 SHA512 cfe2a220ca7f9507b8d0d8b7940f1bb6871f56d1935b3e9ff5be24eac58967c4de62c868ac2c20b80e09d37eb5018efe2e932f17ffb178095188aad7134e2529
 EBUILD gnupg-pkcs11-scd-0.9.2-r1.ebuild 994 BLAKE2B 22bc5017db1ac4a54fa474752c76d1d6772bf7562fdc391570fe823e0cfe865f62e965572cc32f630121f703ab52512d85a374b7d97f37bb2d8de96df623aec9 SHA512 0f7b98601334aa9dddeef0f8cda424388187103477e4ecf24d1567dfb29797448cfb99dd519b450a87478ed579c82ddfb273967199354a86df34121f705f3ec9
 MISC metadata.xml 388 BLAKE2B c98dcab45a87ea80fb7a4ef3090cb888701bf14a9f0074a39174549ad3ec94cb5071c792562d39856e5d40b31e8dd5b9a82e00d428bf0def47ed9338d8259ba0 SHA512 7fdcbc1668e16afc5b98006196d184cdfccbacb51740b888c4f14551e9bbabe7e8cea704c3baf1f7bdbc8984f57130b141acf20d1332a96985227c9ba333c73c
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
new file mode 100644
index 000000000000..9eace6ea0546
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PKCS#11 support for GnuPG"
+HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
+SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="proxy"
+
+DEPEND="
+	dev-libs/openssl:=
+	<dev-libs/libassuan-3:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error:=
+	dev-libs/pkcs11-helper:="
+RDEPEND="
+	${DEPEND}
+	proxy? (
+		acct-group/gnupg-pkcs11
+		acct-group/gnupg-pkcs11-scd-proxy
+		acct-user/gnupg-pkcs11-scd-proxy
+	)"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable proxy)
+		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use proxy; then
+		newinitd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.initd gnupg-pkcs11-scd-proxy
+		newconfd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.confd gnupg-pkcs11-scd-proxy
+	fi
+}
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index d246814552b4..54458e2879c3 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,5 +1,5 @@
 DIST keysmith-23.08.5.tar.xz 163456 BLAKE2B b7338decbf1ccfe9f07d208decdcc1ea5133df9d7f53ff4e543c46782e5218e146e35f8d8348f8300021f7223d4edc8cf85a36ca777b00c52a5c13590c9ce12c SHA512 4c53ac7a217cd2f82cb0e270df1e4e7382d6fe3f7a7ff5008e392ae50418b6bf505f596d17c009921532bfbccba3d33f81cc934433ea63d9ba65c1187b4cba69
-DIST keysmith-24.05.1.tar.xz 171436 BLAKE2B 35c290d5150d34f794606731848f5bc9f974f36cc0ab139b782adb0cc76744d74ef49d697687a5ac9b025c3d1102eff70d60875a512c45372d1cc3b5e80e2f61 SHA512 5aadf941c270f13fdc78cf9cd4e4a5682d70858163fd9542b8f02b0cd9bdb57cb6081d663e25aeddffe5e9a57e456d3d81c9dbee1bacce915f4fc242a80f29c3
+DIST keysmith-24.05.2.tar.xz 171756 BLAKE2B 5059579e9529f834814a3f586dbab5aad1a5235759c0fa76a7c7cf5588bb3b2fd64ca381d0d749d88cf74446ca5a380cb6f49eebe005e34a6f184e3f8fbcf7dd SHA512 fd2964b4fc754ac71d5fc2b273e2e70671f4b8a4cdf95e340ade20a234d7ddbfc81e0a6bfbde3178b49ba94b3219a2e1169903eac4d707b1f130df7ed7478f77
 EBUILD keysmith-23.08.5.ebuild 817 BLAKE2B 87635bdc62539282790b87ed452d712a54d7e65edfb571111c30af1b453b1526b1685da181bb3e94eddcd41f7d668d929bf3045462116f128e91d3527af276bb SHA512 76442d453006aea7e6b08b15258dc93e23200605c344827eef0f14f7f8b42eedfb30986377084980e1cde1da51223c6fcdeaf9076a82bdf639b976c0cd85f472
-EBUILD keysmith-24.05.1.ebuild 837 BLAKE2B c57e0dbe46fd1cf08ed0fd97aaab91d9ec6c19a76615abb5a3da246ab18161ce6e023454fe6b27167562946d3c8095a42f0375f70b0b09b8a2045ad3604f2a4f SHA512 6698ac1ed40a013c1401f6418f02d9088f70a9d18c3054d2570ec8bcb231e662022635b60fc62b1e02f62900df7385d1f30e3af99614cbde0b71257f7be56919
+EBUILD keysmith-24.05.2.ebuild 837 BLAKE2B c57e0dbe46fd1cf08ed0fd97aaab91d9ec6c19a76615abb5a3da246ab18161ce6e023454fe6b27167562946d3c8095a42f0375f70b0b09b8a2045ad3604f2a4f SHA512 6698ac1ed40a013c1401f6418f02d9088f70a9d18c3054d2570ec8bcb231e662022635b60fc62b1e02f62900df7385d1f30e3af99614cbde0b71257f7be56919
 MISC metadata.xml 380 BLAKE2B 110b310586031ac53056b1502648607210ee0256858efee1d54e756e130b4e331202f8571c96f5064ccee7d63bce9c4af2b92c40389d2c7b06a4fad70be8656d SHA512 10365587bc7347003e99f0684c92fa7c7154576643eaee09e79b1bddf5aed12b6062dc426b07343c6cfbcd423ab3e77e245b3659919f75e4a4183fb56fa2fa0e
diff --git a/app-crypt/keysmith/keysmith-24.05.1.ebuild b/app-crypt/keysmith/keysmith-24.05.2.ebuild
index 11a4d872b07b..11a4d872b07b 100644
--- a/app-crypt/keysmith/keysmith-24.05.1.ebuild
+++ b/app-crypt/keysmith/keysmith-24.05.2.ebuild
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 4c828402fa2b..438796e18716 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,9 +1,9 @@
-DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
 DIST osslsigncode-2.5.tar.gz 154421 BLAKE2B 44b406f8f2cbac6c89e63ea5aba98e5571e26ecd7f86695879a13199a11025d2689d3e369838cb69c0de7be6c3d06fc7d8709a57ee2132cd25348137d5094417 SHA512 aa491518e6383bad4209616e88cec46e047596afd54067d02be8e7c87030999b6dc715983214e389c2f58fb5b10350b36dfe28e6179b9893fc5266172b2dae01
+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.0.ebuild 603 BLAKE2B a220a6abfb3e99119e00523d7de4793bff91d7d87eaf8bd8841d73b3403045e6acbc1899e999913bdea5ce03f1bedbfcdfa0d831dbf1032c8427c37a8fd1d0a6 SHA512 3719b291d6364621604238ae957fa0a27124a044cd94bd49c250bb1b81759d9c780d6ddfb54ba4808aa85f8bce95dce0f689652e0218bf0527acd4f9ceb3998f
 EBUILD osslsigncode-2.5.ebuild 1292 BLAKE2B 80b51c94a60a75928f91de4fdd69c220fa8b8be8dc2716036453c5379c030e9713be79cd5fe61814c410b27e833a469068d3adcc155c08526233a51ac774a320 SHA512 bb781e77a817f1002eb89663797b0c28b31dc68844935c4e116d4eae5ff0b3d92c5afb9237f2c599b317c13e204fa464eb30571c5ed8a0d6ec1b57cfea5ed3bb
+EBUILD osslsigncode-2.8.ebuild 1438 BLAKE2B cda3e11d0be1f239f0d3526aad9a06035e4270eb6aa5147a0eb45d735847c9272b6d5c6a3b5df36349214fa5aa3fc1f1cdae483f5cd0bdd633fa73183b551bbd SHA512 9f7344dcd025531943f4b8f885a3fa771b69bbebd4038f64542892dcb0bfb9abb1af43f1cbb705eee53dca0b8b8476d9c88a0eaffa77a899abafd2ae202bef7b
 MISC metadata.xml 311 BLAKE2B 2125050abed07efbfea727f3e45728531290dc032a0a54beb102d5b8a74c07df7d291c22293107286da9563d4de5d08edb8f61cd6fd8a11abd0bd465cf31d854 SHA512 93b6f00f2ac04656afecdb12a85b1736559247eeb9855835e90b0b79437e93c10e0bb6a2324f067ba37be9293e3b41406d7901ffa32f22e462b01eef3ffa1953
diff --git a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
deleted file mode 100644
index a00e248085ce..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://github.com/mtrojnar/osslsigncode"
-SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with curl)
-}
diff --git a/app-crypt/osslsigncode/osslsigncode-2.8.ebuild b/app-crypt/osslsigncode/osslsigncode-2.8.ebuild
new file mode 100644
index 000000000000..9d9e80561854
--- /dev/null
+++ b/app-crypt/osslsigncode/osslsigncode-2.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+#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/${PN}/archive/refs/tags/${PV}.tar.gz -> ${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 )"
+# https://github.com/mtrojnar/osslsigncode/issues/140#issuecomment-1060636197
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	curl? ( net-misc/curl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${PYTHON_DEPS}
+		sys-libs/libfaketime
+	)
+"
+
+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/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index bbc0c2cdae35..5281e2b48062 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -5,4 +5,4 @@ DIST sbsigntools-0.9.4.tar.gz 57714 BLAKE2B 94797af6c98a9c13cb71e52ba6f7ff07de70
 DIST sbsigntools-0.9.5.tar.gz 57876 BLAKE2B 677f87eac9fba9185acd7e25b8d7a3682083938313f3086aaaa6871e010bd403bdda5b9a5fe931151af75a344802c964918be8feb38ec6229d9a16c5b63416b6 SHA512 3b23bdf1855132a91e2063039bd4d14c5564e9cd8f551711aa89a91646ff783afb6e318479e9cf46eedbc914a1eade142398c774d8dbfef8fd1d65cbbe60aabd
 EBUILD sbsigntools-0.9.4-r1.ebuild 1377 BLAKE2B 89ad7f2d63d6acf7f8974f412caa5913ceedda546da0dc3803fa5a4511f0743a513f74b74433d3def24112988f758e3388180b2a39dedbecab57ca09dbe3c997 SHA512 e876cb47208f4a42e3f62448ad1729b8afe8564fa880b7cc283101fb23aa256409e523b370b83e3cdd5b061280397d6ae82f5cf994954041c472b6599c722dc5
 EBUILD sbsigntools-0.9.5.ebuild 1351 BLAKE2B 5c9745022dede3d8b03d6a03fd1bbed7e7d6801e10a860e61247a7eaf9280c57cc6ace7cd43f6c6b74e4b469947ce25dab0d847df61d37e2d957efb5888940ea SHA512 e2f70ddb7b480d11067bdc72c89bd7acbef590d924ec078d09b42ce7d203a1f79efeaeb2079ba2a4bdf79b1851683d318feeb686b8e1d2f51dc265238784cfa7
-MISC metadata.xml 292 BLAKE2B 590a17ca49fb39917074648d0b2439e707a49055f7b65cc923500cfe354b51aa020c3899b14d7de263c97f281aad36c19695f54747c7652bf46ce26d7a14b5d7 SHA512 230e2b4d2b6858ab067cb5ffe9e59b93fa22abe34bbebe74f0eca9a1f96fcfb9bbe536ed34c1bf8d977e8dfc7b46a6d44feb541d3426e6ada42f35f92ac7c896
+MISC metadata.xml 411 BLAKE2B 0dabbe6e2efe5b66cc6a5083d60de549366085305ceb228d5dbe19fc4a73fca24399502d6e5a81b2e1c60c6102c0c30e7565264060924a659ecbaca2a9575771 SHA512 fc739eb411e369db594c6e1a15bc788963ac98fde6f9ddb4676f44890b32253907eb8d68b74324e41eddc21b5f5af2d00159f6f90283d8706f41d51e841ad6a7
diff --git a/app-crypt/sbsigntools/metadata.xml b/app-crypt/sbsigntools/metadata.xml
index ef5313d4212e..cf02410c2f9a 100644
--- a/app-crypt/sbsigntools/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 	</maintainer>
 	<upstream>
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 7fa44890a7b4..25201ed39078 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,4 +1,7 @@
+AUX veracrypt-1.25.9-wxGTK3.2.patch 17509 BLAKE2B f0139aa7d3859777e5f84ba18fa1f230ce1d03f554160242b9cf3a71d9734667e9e879a318c54feb5c3ce1e1d39308fc6982280f8d246900caaf448afc5bdb37 SHA512 ca14bd6e3ce01bd2ff879bcaf4f5a54b54a2dd4e1b015e457f2834add706b91358a6ed20b74551b46ec7812d08a36013189e802e5ce8e7f1e1d6e88d2d6a21fb
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
+DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
 DIST veracrypt-1.26.7.tar.gz 30322472 BLAKE2B a71adf9fa5a2aafb9694ccf7a7ac45e6e16cf8277a57f9f52e2fd0ddb2657bd1a28dd4b2c0bf9167298251b4a87ab3f0ca0a8a8424b612be0cd7a4bcc630a438 SHA512 1b0fae30e3a8eb20e1ddcf7697f5b1ce947ddc3555442a561e50fe10bd82183ff5b21dc1c06ce2024eecab869fe38616ac47931c880816f814b961bbd1dec8e2
+EBUILD veracrypt-1.25.9-r1.ebuild 2925 BLAKE2B fca79572908028359fc9599b76f5116257112512fa0f7aba79b0b94ef5fa8d6cc61a998ec229d20df70df9554cdb8c2b749cdf49684a2493162490b6e29c4afa SHA512 d42d165a54299b965f9621630323bf8ec0ffadfb15ee46bef95201cc4655f5e4b61e2942ca98e4bb3307184be0140123afa9e38a60fc146ac234fd71c86b24ed
 EBUILD veracrypt-1.26.7.ebuild 3051 BLAKE2B 8453d8c9797e34876fa51d0f89fc96681eba70e4551eadccdc2ea88e53abdd2b580ccd1c95068d909dd06b335a19e1d7674002278d6f865d7864e79c27678b22 SHA512 a4eb612c222a8b25a751e40a8be2aa7e3d142f8cf1198268c9b01a67fc21934495c3349d0763a281727b14238f6bd712f5153fa4f69217214a2749dfcd7a530e
 MISC metadata.xml 336 BLAKE2B f4d113cb71afc4b2856216740318c9909164eddfedc6051490bc0ae487e99a0019768f8ec4954b66cae88a671eb17087ee53af8338b4cf5a18f0057ed163904a SHA512 b9cf52029a3903eb553a68673ed86b052de2953c86de3ee81b8a7c40f9475c53e95d5c582fff8527703f2194bf255b888ae25484c1718b8995fcdaaf69d157ec
diff --git a/app-crypt/veracrypt/files/veracrypt-1.25.9-wxGTK3.2.patch b/app-crypt/veracrypt/files/veracrypt-1.25.9-wxGTK3.2.patch
new file mode 100644
index 000000000000..d6ee103c4f3d
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.25.9-wxGTK3.2.patch
@@ -0,0 +1,311 @@
+diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
+index d281feb..3ac5bbb 100644
+--- a/Main/Forms/Forms.cpp
++++ b/Main/Forms/Forms.cpp
+@@ -253,7 +253,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ 	
+ 	bSizer18->SetMinSize( wxSize( 138,34 ) ); 
+ 	VolumePropertiesButton = new wxButton( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_VOLUME_PROPERTIES"), wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
++	bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+ 	gSizer1->Add( bSizer18, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+@@ -263,7 +263,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ 	
+ 	bSizer19->SetMinSize( wxSize( 138,34 ) ); 
+ 	WipeCacheButton = new wxButton( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("HK_WIPE_CACHE"), wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer19->Add( WipeCacheButton, 1, wxALL|wxALIGN_RIGHT|wxEXPAND, 5 );
++	bSizer19->Add( WipeCacheButton, 1, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+ 	gSizer1->Add( bSizer19, 0, wxALIGN_RIGHT, 5 );
+@@ -345,7 +345,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ 	
+ 	VolumeButton->SetMinSize( wxSize( -1,32 ) );
+ 	
+-	sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++	sbSizer4->Add( VolumeButton, 1, wxEXPAND|wxALL, 2 );
+ 	
+ 	
+ 	gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
+@@ -357,7 +357,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ 	MountAllDevicesButton = new wxButton( sbSizer41->GetStaticBox(), wxID_ANY, _("IDC_MOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) );
+ 	
+-	sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++	sbSizer41->Add( MountAllDevicesButton, 1, wxEXPAND|wxALL, 2 );
+ 	
+ 	
+ 	gSizer2->Add( sbSizer41, 1, wxEXPAND, 5 );
+@@ -369,7 +369,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ 	DismountAllButton = new wxButton( sbSizer42->GetStaticBox(), wxID_ANY, _("IDC_UNMOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	DismountAllButton->SetMinSize( wxSize( -1,32 ) );
+ 	
+-	sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++	sbSizer42->Add( DismountAllButton, 1, wxEXPAND|wxALL, 2 );
+ 	
+ 	
+ 	gSizer2->Add( sbSizer42, 1, wxEXPAND, 5 );
+@@ -381,7 +381,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
+ 	ExitButton = new wxButton( sbSizer43->GetStaticBox(), wxID_ANY, _("IDC_EXIT"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	ExitButton->SetMinSize( wxSize( -1,32 ) );
+ 	
+-	sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 2 );
++	sbSizer43->Add( ExitButton, 1, wxEXPAND|wxALL, 2 );
+ 	
+ 	
+ 	gSizer2->Add( sbSizer43, 1, wxEXPAND, 5 );
+@@ -586,27 +586,27 @@ WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxStrin
+ 	bSizer70->Add( 0, 0, 1, wxEXPAND, 5 );
+ 	
+ 	HelpButton = new wxButton( MainPanel, wxID_HELP, _("IDHELP"), wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer70->Add( HelpButton, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
++	bSizer70->Add( HelpButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+ 	
+ 	
+-	bSizer70->Add( 0, 0, 0, wxLEFT|wxALIGN_RIGHT, 5 );
++	bSizer70->Add( 0, 0, 0, wxLEFT, 5 );
+ 	
+ 	PreviousButton = new wxButton( MainPanel, wxID_ANY, _("PREV"), wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer70->Add( PreviousButton, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
++	bSizer70->Add( PreviousButton, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+ 	
+ 	NextButton = new wxButton( MainPanel, wxID_ANY, _("NEXT"), wxDefaultPosition, wxDefaultSize, 0|wxWANTS_CHARS );
+ 	NextButton->SetDefault();
+ 	
+-	bSizer70->Add( NextButton, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
++	bSizer70->Add( NextButton, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+ 	
+ 	
+-	bSizer70->Add( 0, 0, 0, wxLEFT|wxALIGN_RIGHT, 5 );
++	bSizer70->Add( 0, 0, 0, wxLEFT, 5 );
+ 	
+ 	CancelButton = new wxButton( MainPanel, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer70->Add( CancelButton, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
++	bSizer70->Add( CancelButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+ 	
+ 	
+-	bSizer64->Add( bSizer70, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
++	bSizer64->Add( bSizer70, 0, wxEXPAND|wxALL, 5 );
+ 	
+ 	
+ 	bSizer63->Add( bSizer64, 1, wxEXPAND, 5 );
+@@ -987,7 +987,7 @@ DeviceSelectionDialogBase::DeviceSelectionDialogBase( wxWindow* parent, wxWindow
+ 	bSizer166->Add( OKButton, 0, wxALL, 5 );
+ 	
+ 	
+-	bSizer3->Add( bSizer166, 0, wxALIGN_RIGHT|wxALL|wxEXPAND, 5 );
++	bSizer3->Add( bSizer166, 0, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+ 	this->SetSizer( bSizer3 );
+@@ -1205,7 +1205,7 @@ FavoriteVolumesDialogBase::FavoriteVolumesDialogBase( wxWindow* parent, wxWindow
+ 	gSizer5->Add( MoveDownButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+ 	
+ 	RemoveButton = new wxButton( this, wxID_ANY, _("IDC_KEYREMOVE"), wxDefaultPosition, wxDefaultSize, 0 );
+-	gSizer5->Add( RemoveButton, 0, wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
++	gSizer5->Add( RemoveButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
+ 	
+ 	RemoveAllButton = new wxButton( this, wxID_ANY, _("IDC_KEYREMOVEALL"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	gSizer5->Add( RemoveAllButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
+@@ -1694,7 +1694,7 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
+ 	FilesystemOptionsSizer->Add( MountPointTextCtrlStaticText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+ 	
+ 	MountPointTextCtrl = new wxTextCtrl( sbSizer28->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+-	FilesystemOptionsSizer->Add( MountPointTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++	FilesystemOptionsSizer->Add( MountPointTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
+ 	
+ 	MountPointButton = new wxButton( sbSizer28->GetStaticBox(), wxID_ANY, _("LINUX_SELECT"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	FilesystemOptionsSizer->Add( MountPointButton, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+@@ -1705,7 +1705,7 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
+ 	FilesystemOptionsSizer->Add( FilesystemOptionsStaticText, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 );
+ 	
+ 	FilesystemOptionsTextCtrl = new wxTextCtrl( sbSizer28->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+-	FilesystemOptionsSizer->Add( FilesystemOptionsTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
++	FilesystemOptionsSizer->Add( FilesystemOptionsTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+ 	
+ 	
+ 	FilesystemOptionsSizer->AddGrowableCol( 1 );
+@@ -1795,7 +1795,7 @@ NewSecurityTokenKeyfileDialogBase::NewSecurityTokenKeyfileDialogBase( wxWindow*
+ 	wxArrayString SecurityTokenChoiceChoices;
+ 	SecurityTokenChoice = new wxChoice( sbSizer42->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, SecurityTokenChoiceChoices, 0 );
+ 	SecurityTokenChoice->SetSelection( 0 );
+-	fgSizer7->Add( SecurityTokenChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++	fgSizer7->Add( SecurityTokenChoice, 0, wxALL|wxEXPAND, 5 );
+ 	
+ 	wxStaticText* m_staticText48;
+ 	m_staticText48 = new wxStaticText( sbSizer42->GetStaticBox(), wxID_ANY, _("IDT_TOKEN_KEYFILE_NAME"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+@@ -1804,7 +1804,7 @@ NewSecurityTokenKeyfileDialogBase::NewSecurityTokenKeyfileDialogBase( wxWindow*
+ 	fgSizer7->Add( m_staticText48, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+ 	
+ 	KeyfileNameTextCtrl = new wxTextCtrl( sbSizer42->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+-	fgSizer7->Add( KeyfileNameTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
++	fgSizer7->Add( KeyfileNameTextCtrl, 0, wxEXPAND|wxALL, 5 );
+ 	
+ 	
+ 	sbSizer42->Add( fgSizer7, 1, wxEXPAND|wxTOP, 5 );
+@@ -1995,7 +1995,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
+ 	fgSizer3->Add( m_staticText6, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+ 	
+ 	FilesystemOptionsTextCtrl = new wxTextCtrl( FilesystemSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+-	fgSizer3->Add( FilesystemOptionsTextCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
++	fgSizer3->Add( FilesystemOptionsTextCtrl, 0, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+ 	FilesystemSizer->Add( fgSizer3, 1, wxEXPAND, 5 );
+@@ -2244,7 +2244,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
+ 	fgSizer4->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
+ 	
+ 	HotkeyTextCtrl = new wxTextCtrl( sbSizer23->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+-	fgSizer4->Add( HotkeyTextCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
++	fgSizer4->Add( HotkeyTextCtrl, 0, wxALL|wxEXPAND, 5 );
+ 	
+ 	AssignHotkeyButton = new wxButton( sbSizer23->GetStaticBox(), wxID_ANY, _("IDC_HOTKEY_ASSIGN"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	fgSizer4->Add( AssignHotkeyButton, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+@@ -2314,7 +2314,7 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
+ 	OKButton = new wxButton( this, wxID_OK, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	OKButton->SetDefault();
+ 	
+-	bSizer182->Add( OKButton, 0, wxALIGN_RIGHT|wxALL, 5 );
++	bSizer182->Add( OKButton, 0, wxALL, 5 );
+ 	
+ 	CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	bSizer182->Add( CancelButton, 0, wxALL, 5 );
+@@ -2648,7 +2648,7 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
+ 	bSizer96->Add( EncryptionAlgorithmChoice, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+ 	
+ 	TestButton = new wxButton( sbSizer29->GetStaticBox(), wxID_ANY, _("TEST"), wxDefaultPosition, wxDefaultSize, 0 );
+-	bSizer96->Add( TestButton, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++	bSizer96->Add( TestButton, 0, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+ 	sbSizer29->Add( bSizer96, 0, wxEXPAND, 5 );
+@@ -2999,13 +2999,13 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	
+ 	RandomPoolSampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) );
+ 	
+-	bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT|wxALIGN_BOTTOM, 7 );
++	bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT, 7 );
+ 	
+ 	DisplayKeysCheckBox = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("IDC_DISPLAY_POOL_CONTENTS"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	bSizer126->Add( DisplayKeysCheckBox, 0, wxEXPAND|wxRIGHT, 5 );
+ 	
+ 	
+-	fgSizer5->Add( bSizer126, 1, wxEXPAND|wxALIGN_BOTTOM, 5 );
++	fgSizer5->Add( bSizer126, 1, wxEXPAND, 5 );
+ 	
+ 	wxStaticText* m_staticText28;
+ 	m_staticText28 = new wxStaticText( sbSizer31->GetStaticBox(), wxID_ANY, _("IDT_HEADER_KEY"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+@@ -3018,7 +3018,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	
+ 	HeaderKeySampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) );
+ 	
+-	fgSizer5->Add( HeaderKeySampleStaticText, 0, wxALIGN_BOTTOM|wxEXPAND|wxTOP|wxRIGHT, 2 );
++	fgSizer5->Add( HeaderKeySampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT, 2 );
+ 	
+ 	wxStaticText* m_staticText29;
+ 	m_staticText29 = new wxStaticText( sbSizer31->GetStaticBox(), wxID_ANY, _("IDT_MASTER_KEY"), wxDefaultPosition, wxDefaultSize, 0 );
+@@ -3031,7 +3031,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	
+ 	MasterKeySampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) );
+ 	
+-	fgSizer5->Add( MasterKeySampleStaticText, 0, wxEXPAND|wxALIGN_BOTTOM|wxTOP|wxRIGHT, 2 );
++	fgSizer5->Add( MasterKeySampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT, 2 );
+ 	
+ 	
+ 	sbSizer31->Add( fgSizer5, 0, wxEXPAND, 5 );
+@@ -3082,16 +3082,16 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	SizeDoneStaticText = new wxStaticText( m_panel12, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
+ 	SizeDoneStaticText->Wrap( -1 );
+ 	
+-	bSizer115->Add( SizeDoneStaticText, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 );
++	bSizer115->Add( SizeDoneStaticText, 1, wxEXPAND|wxALL, 3 );
+ 	
+ 	
+ 	m_panel12->SetSizer( bSizer115 );
+ 	m_panel12->Layout();
+ 	bSizer115->Fit( m_panel12 );
+-	bSizer108->Add( m_panel12, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
++	bSizer108->Add( m_panel12, 1, wxEXPAND|wxALL, 5 );
+ 	
+ 	
+-	gSizer6->Add( bSizer108, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++	gSizer6->Add( bSizer108, 1, wxEXPAND, 5 );
+ 	
+ 	wxBoxSizer* bSizer1081;
+ 	bSizer1081 = new wxBoxSizer( wxHORIZONTAL );
+@@ -3108,16 +3108,16 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	SpeedStaticText = new wxStaticText( m_panel121, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
+ 	SpeedStaticText->Wrap( -1 );
+ 	
+-	bSizer1151->Add( SpeedStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
++	bSizer1151->Add( SpeedStaticText, 1, wxALL|wxEXPAND, 3 );
+ 	
+ 	
+ 	m_panel121->SetSizer( bSizer1151 );
+ 	m_panel121->Layout();
+ 	bSizer1151->Fit( m_panel121 );
+-	bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
++	bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+-	gSizer6->Add( bSizer1081, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
++	gSizer6->Add( bSizer1081, 1, wxEXPAND, 5 );
+ 	
+ 	wxBoxSizer* bSizer1082;
+ 	bSizer1082 = new wxBoxSizer( wxHORIZONTAL );
+@@ -3134,7 +3134,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	TimeLeftStaticText = new wxStaticText( m_panel122, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
+ 	TimeLeftStaticText->Wrap( -1 );
+ 	
+-	bSizer1152->Add( TimeLeftStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
++	bSizer1152->Add( TimeLeftStaticText, 1, wxALL|wxEXPAND, 3 );
+ 	
+ 	
+ 	m_panel122->SetSizer( bSizer1152 );
+@@ -3143,7 +3143,7 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
+ 	bSizer1082->Add( m_panel122, 1, wxALL|wxEXPAND, 5 );
+ 	
+ 	
+-	gSizer6->Add( bSizer1082, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
++	gSizer6->Add( bSizer1082, 1, wxEXPAND, 5 );
+ 	
+ 	
+ 	sbSizer32->Add( gSizer6, 0, wxEXPAND|wxTOP, 2 );
+@@ -3362,7 +3362,7 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
+ 	#endif
+ 	PasswordTextCtrl->SetMinSize( wxSize( 232,-1 ) );
+ 	
+-	GridBagSizer->Add( PasswordTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++	GridBagSizer->Add( PasswordTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND, 5 );
+ 	
+ 	ConfirmPasswordStaticText = new wxStaticText( this, wxID_ANY, _("IDT_CONFIRM_PASSWORD"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	ConfirmPasswordStaticText->Wrap( -1 );
+@@ -3380,7 +3380,7 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
+ 	#endif
+ 	ConfirmPasswordTextCtrl->SetMinSize( wxSize( 232,-1 ) );
+ 	
+-	GridBagSizer->Add( ConfirmPasswordTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
++	GridBagSizer->Add( ConfirmPasswordTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND, 5 );
+ 	
+ 	VolumePimStaticText = new wxStaticText( this, wxID_ANY, _("IDT_PIM"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	VolumePimStaticText->Wrap( -1 );
+@@ -3396,7 +3396,7 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
+ 	#else
+ 	VolumePimTextCtrl->SetMaxLength( 7 );
+ 	#endif
+-	GridBagSizer->Add( VolumePimTextCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND, 5 );
++	GridBagSizer->Add( VolumePimTextCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxEXPAND, 5 );
+ 	
+ 	VolumePimHelpStaticText = new wxStaticText( this, wxID_ANY, _("IDC_PIM_HELP"), wxDefaultPosition, wxDefaultSize, 0 );
+ 	VolumePimHelpStaticText->Wrap( -1 );
+@@ -3677,7 +3677,7 @@ WaitDialogBase::WaitDialogBase( wxWindow* parent, wxWindowID id, const wxString&
+ 	WaitStaticText = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+ 	WaitStaticText->Wrap( -1 );
+ 	
+-	bSizer160->Add( WaitStaticText, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
++	bSizer160->Add( WaitStaticText, 0, wxALL|wxEXPAND, 5 );
+ 	
+ 	WaitProgessBar = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
+ 	WaitProgessBar->SetValue( 0 ); 
diff --git a/app-crypt/veracrypt/veracrypt-1.25.9-r1.ebuild b/app-crypt/veracrypt/veracrypt-1.25.9-r1.ebuild
new file mode 100644
index 000000000000..aaf43d2ed09c
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.25.9-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note too treecleaners: This is the last veracrypt version that
+# supports mounting truecrypt volumes. Let's give folks more time than
+# usual to figure out what to do with their existing truecrypt volumes.
+# Please do not treeclean before February 2024 unless it's necessary.
+
+WX_GTK_VER="3.2-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets xdg
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+PATCHES=( "${FILESDIR}/${P}-wxGTK3.2.patch" )
+src_configure() {
+	setup-wxwidgets
+
+	# https://bugs.gentoo.org/786741
+	# std::byte clashes with src/Common/Tcdefs.h typedef
+	append-cxxflags -std=c++14
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	./Main/veracrypt --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x /usr/share/doc/${PF}/EFI-DCS
+		HTML_DOCS=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}"/veracrypt.init veracrypt
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
+	fi
+
+	pax-mark -m "${ED}"/usr/bin/veracrypt
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index bb078dea9ccb..bba3bdd6f9da 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -5,7 +5,7 @@ DIST yubikey_manager-5.4.0.tar.gz.sig 310 BLAKE2B 933a6638b754a8d3f23486f8adeb03
 DIST yubikey_manager-5.5.1.tar.gz 215683 BLAKE2B c7c16d4eaaeff5894c4913a0da69675491434f0f48555addbb8778e0f9781c6872c4392ec81f4a142f2e1eb63bea837e394b5d33e07f497c948ead92ee89059a SHA512 67e2e5a5833f746441d91684a5b0889bd9b9b46aeaee0da875c7e6dac46db619a8436e12bd77c38e525121db8fc52736071bc141ac80c6d79e64919e100510f9
 DIST yubikey_manager-5.5.1.tar.gz.sig 310 BLAKE2B 9d5f3d18ccdde1a03a6433223677706164d559af2b270d636adb4074377deb774869d9c6d12af083388f7e907fa4b8e7b881ccd58981d2696ef017d8ec492dfe SHA512 0c436a608fe64236045019ba7db175a65f1e1d1d125049b968c484963abe138573fa31d1b8c942d9cdcaa06099029bd3c1d9057ae622e5c6358427188c454efd
 EBUILD yubikey-manager-5.2.0.ebuild 1662 BLAKE2B c18184a7e54caf9c8b0a081d7ab070f2779fb2ad50a2b7dfca8c126def4e411bc60fde4d7ec474f6453e332b8fdc8f3b5563f4b91986ed54038cee40703e739a SHA512 5612bd8f4726774b69782b15fed9398c1cbd0d6bdfdc405552f2e1dcb49a69c13c353c14e6d943e00363620d1d65bb5fada754b09de20789c1081041629ed50a
-EBUILD yubikey-manager-5.4.0-r1.ebuild 1657 BLAKE2B b8c75cf4b316aa47c4bf4b91133146abf3aba5df99aa73e086f7f12665e5b8d3dc287c507e4d3b218ddd155442665c60b589f2987a7be6eaf49793e1c7695a2d SHA512 34a71c2f5404be45ebd61930ea0a5c17592d681c368ec681e520e56df3f1b91679281dc7bfb210e3082bc35d81154a8c3a50117d22cc270acbc4ee4d53ad7400
+EBUILD yubikey-manager-5.4.0-r1.ebuild 1655 BLAKE2B 9fbddd6a0e5ec5022458f707cb1e39bd31a67244633e709d51a86be52f62f909d528f662a245c14b2c79743340e60c832af2655e5546e2c218ebde2a501bee7f SHA512 c811ed7a0079b5a30e6b4c076a5e98ba34c6c2e1d77d5ac09828b08bbf1d843a9cc3f369ceee8edf06903fcfe591c4aa53ac97d4d493751b10eb7b323b38b3d4
 EBUILD yubikey-manager-5.4.0.ebuild 1661 BLAKE2B ad28a63babbb61734ade2d895914972f8159ec558765782e99c2fcb7b8f8a3140c993080722b3a0b84e01e609301f5d632c95656b5c33e4b1d2ad68b94166e71 SHA512 9e9d58de47af7b044c0b5ef39804cbd3193fcc95e6aedd3f0a05048c59155cd5a8259bd4964d18d852a5068984f82c89eae738c07b7f28ba5bae3c87d71dae96
 EBUILD yubikey-manager-5.5.1.ebuild 1657 BLAKE2B ab5920a88e987c54175fb29aa2b669fbe1fa2d4dc647e26cce4b5c81d49fed193d06fbe9cc5562105ba08b99516e20cf0bfec55830da5f7620cb3a2d30a26bc0 SHA512 60220396478e328d4b40aa95980bdfcc25bfb51a2603441d824014f3499cfca52771eea0346b52748ec23e920a58a3546b945c82400ee46df494e39303831aaf
 MISC metadata.xml 699 BLAKE2B d5f68c348b0cefd34753dd5dc9abf9c76b46420537b06d425ed3000f1ca16ab6041c41537f73cd507db4ada88bc353d77cd30281c710ea7a0223ade8482164ef SHA512 5ae62f2ebd0a3bcc5dd037ef3b0a6cc8a57f8dcece6a077266155cb7f11fbb2868cb5fed43738411aae5797a65464365390ff4034a27cf3e1e46a4919c321574
diff --git a/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
index fc22190f735e..d9c5c0279a7d 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-5.4.0-r1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="ssl"
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/yubico.com.asc"