4 files changed, 120 insertions, 2 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 06669dd69112..ba055e482f0e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index e29e41c8fa2c..c7bcbdcc17f8 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,4 +1,6 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
 DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
-EBUILD veracrypt-1.25.9.ebuild 2577 BLAKE2B 18da6b6114152e215d7adbda334a33424e7f35ea0148d037c7ebece6ca589423811c422497b054077aeabab3f3b60bb69bc4d02fde8195090bbe87a1fe8a6def SHA512 cf56b42b7ef36170fb9c481113570f7d9aaf5f7ffc55979d6946ba1ac32c580a6edeaf3e3240915c1e5e8a233ce5dd96393c7c98e81aba42968b770e21b2f6f5
+DIST veracrypt-1.26.7.tar.gz 30322472 BLAKE2B a71adf9fa5a2aafb9694ccf7a7ac45e6e16cf8277a57f9f52e2fd0ddb2657bd1a28dd4b2c0bf9167298251b4a87ab3f0ca0a8a8424b612be0cd7a4bcc630a438 SHA512 1b0fae30e3a8eb20e1ddcf7697f5b1ce947ddc3555442a561e50fe10bd82183ff5b21dc1c06ce2024eecab869fe38616ac47931c880816f814b961bbd1dec8e2
+EBUILD veracrypt-1.25.9.ebuild 2856 BLAKE2B 34d91904dd2f02ba973256319ce40a906e737e36e6eea517f361c6df9d00227e264cf4de19d2e1d95ae6cbf80cd11536e522f3c19c4c6f87481385e0ba3325a8 SHA512 f826835ab6de6df6497e887c072a818584e6c7cbac21c09554d329bab734c838efa18c5cd093d6a8bcc9aca969d3e29c5ac7448cf84458d7a40b25e05886097f
+EBUILD veracrypt-1.26.7.ebuild 3052 BLAKE2B eb1fe847a722061234d69f3969a57dc5752a38336d3af1e555ae3812f9d271e678fc49f6d88dc6ccc995ea9ecd5b2e0d76f3d61277862299bba351195e8853b6 SHA512 045f0bb241020b51b9db1d7642aa2b7b60076ee4c4184d53468a614a0a351362f42366027298caf8ac0c3b5bf2c1188eca6738e4b7c44a35388e3510e6d3c8cf
 MISC metadata.xml 410 BLAKE2B db2f7b5477f9bfc3190069e1762f6af0ff585711a83a43c959918a4ea755b41a768ff44af7f2f3ffd6f3a75f3cbd3a7f71842e272e709de2cc4e05b01db063fc SHA512 a967137df23d239f00df8e0046886792bd6899f365189814cb47b4d03a3c83b69631d06997a57fa7c51fb33af8274140515a848c97e392c30131a26acab5bbdd
diff --git a/app-crypt/veracrypt/veracrypt-1.25.9.ebuild b/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
index 956ede3923c4..b2912a2b9992 100644
--- a/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
@@ -1,8 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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.0-gtk3"
 inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
 
diff --git a/app-crypt/veracrypt/veracrypt-1.26.7.ebuild b/app-crypt/veracrypt/veracrypt-1.26.7.ebuild
new file mode 100644
index 000000000000..e42be259f96c
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.26.7.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+
+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 RSA 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="
+	app-admin/sudo
+	sys-apps/pcsc-lite
+	sys-fs/fuse:0
+	sys-fs/lvm2
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	asm? ( dev-lang/yasm )
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+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() {
+	local version
+
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+
+	# Remove this when we remove veracrypt-1.25.9.ebuild from the tree.
+	for version in ${REPLACING_VERSIONS}; do
+		if ver_test "${version}" -lt "1.26.7"; then
+			ewarn "Starting with 1.26.7, TrueCrypt volumes are no longer supported."
+			ewarn "Please explore alternatives such as dm-crypt to mount truecrypt volumes."
+			ewarn "Moreover, support for RIPEMD160 and GOST89 is dropped."
+			ewarn "Volumes using these algoritms will no longer mount."
+		fi
+	done
+}