gentoo resync : 03.11.2019

6 files changed, 234 insertions, 114 deletions

diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index fa84285c7157..d4ba30f942e9 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -2,15 +2,14 @@ AUX veracrypt-1.19-execstack-fix.patch 1682 BLAKE2B ce050f900ac6504242941322b910
 AUX veracrypt-1.19-makefile-archdetect.patch 743 BLAKE2B 3eda2de96eb095cf51a806d7a8b06a79edeb03425ad6106a6ec72de0d76da8988dd953e58b4b5b321ee64d3d810ff8d312efddaabea0c8083b858430525a7ae0 SHA512 aa805312c5e3782452ac936a3772a0877e866e1116f2da56747b72a6f585538fd1e45a7c7531c426ff0245b5b3ac4964065e1196874aea4c11e91ac59bd6fffd
 AUX veracrypt-1.19-remove-packaging-from-makefile.patch 2098 BLAKE2B 7588a0de42a5e561dea67c04b0056bd483ffdac0e407a640440d0b7d2723a66368c1eeebaf10c95e31a0114acd013e4d24d138a4aebc876fae51b2da0c9bcffe SHA512 e6485ce39ca009cfabe5656b3ed81cd72ca0207d9b1c310738be60705e3c94f2364cacf393b7f1d0d3e79a1ee58794dfda1d01aaa03778597c149a9dfc5634dc
 AUX veracrypt-1.22-sysmacros-fix.patch 1190 BLAKE2B 33130133b9bf3708eed0d2fa304850e216db9918c326be1aa78d06fa6ace1566fb03928731b096948a5dd9ee47accd10698496f6b1f1626acf2c6eceeefad9df SHA512 fbb1d411755669849fc343c8dd729cb804ec70f0ff1736faf864850e496628b6697dc3e4a821f31e31462e833391c30ff7c8883d014cb5b4ff3b853c6769fc15
+AUX veracrypt-1.24-no-gui-fix.patch 1004 BLAKE2B 5a6d5a8537e284e5f8f3b18a271ed18f0719dff20fbe180c64289cf6841cb987db5132760d16329b0fe2a0d80be41647d7e5438d27b2b4991fb09940a955ae3b SHA512 6955a7c267bb4949e4873d436eeafb1009404dcd7eb6ebc5b7795a45aaf78f840eed44bad533d38775eaa416879f334c392dc2f42b3749da17fd4422b451d54b
 AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
-DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B 0d02b3c6783d233f7cc64956eef58077e8a125fd5db28c1374921d8f2ca6dc9e1cde5402917c1ed4e4a626901e24c566ee834a12e41b6bcd150b8d64851f1ebc SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164
-DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41
-DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a
 DIST VeraCrypt_1.23.tar.gz 24941166 BLAKE2B f9760342678f771192434f88a9b6c3bcc348ef312197232346731f51e972c230a4627f92fd655f7a3c7582b1f728274b7f170f885cceadce6ad53c9b404cd8d6 SHA512 433e717403560fc4f9081f528168f346ed7f14f9621b78a176c6801f14caba3d57e3228b940fb746637de29893f278ade650cf5eca63490bc236987a9db4d48d
 DIST VeraCrypt_1.24.tar.gz 25046467 BLAKE2B e8535f981d898efd797ff736a03e4a65b75bd40ed62d75e3f159932e93d9684e8601da277839b40efcd9bdda801427468386f37e9c57cd81dbc470f23693cd12 SHA512 b4a3155ec8455c51044c2aabcc785a6974d9ee740e0c77bae934a017976e715d45701811405dadfbbd9ceb2a957acbefbe15a717003c86ea38d52735de4f2e56
-EBUILD veracrypt-1.19.ebuild 1988 BLAKE2B 20e3a4725dc5b8d319a11cb44d5865afcdcc6f956ff8c3390ed225f605e01b01537db1af5aa1c82deb7c236b27eea69cbc0c29b2f2f4b770fae4514360c45a2d SHA512 b9829bad13c5ba781d9ec2e8353ed72f30a23459d3e9eaa7384a5718be051f1eeff70c3c097225c8f557c57634d7b14b5db83bb189671630c673568667e67da0
-EBUILD veracrypt-1.21.ebuild 1921 BLAKE2B 1adf1a612afa33dc2cdbed7f0bc971e84e3ec45236ee6d7d7bf317c00a6b03a57eda5b30c85f8aeb4684abbd9879b9dab40b9dc2ceb6cffe36946a74ba1544dd SHA512 1766b6db76015cc6fb6f147a8ba1f75795b7038d402c38129c60cbdb09831dd0aed2241d4ec9d403cffa8dfe38f3481085c64ae653a49362be39c08f462de1dc
-EBUILD veracrypt-1.22.ebuild 2065 BLAKE2B 98dcdbe443fae6ad4a4fa0e6086fe4c171ada85fc69f3fc9bb79d61cb512dc5f8ed6339cff5b2705a35ed7d74449bebf04dba626e63d26fb7530dbf4a9566aeb SHA512 169f927f0745dc1e6d0d6c2c6f9c25f93240b09301cb6f318a28decb4f367b35e035f5eff57d2e9902e4e8bd9a496246e580b3c2d5d57380d1aada9cc1c24ada
+DIST veracrypt-1.24_p1.tar.gz 25052008 BLAKE2B 215af344a5e57e16319d6aec5f439517f774ee92b11d11060e98708d2e5390b54965eecda55bdc56e8e5f01a945b6782a8b695f24a747dd4e7ff2346b9af96e9 SHA512 2564c6b579bc3609d93fb3e6ec12c0e9e90b6b423ce06dab8870583d6b6ce0da9d864d64da67f4d1d6096e4dd750d335c66c0eed9199ec1b38c0690090f317a6
 EBUILD veracrypt-1.23.ebuild 2190 BLAKE2B a0130f46bda8cb06bab364f9f15214d77270c0b8e7806a81768c29dd511b9473c1783220024ff09007f3831aabb1127181f0815d1f02973e744e67da30870040 SHA512 199b1a0a34a4dc06aa27e77809d74bab09e7eaeeb63cb924504437f96c496b45678bd7c6b5133302ac55a244a3bd586ffc2f88c037db850a62d49bae1891c74b
+EBUILD veracrypt-1.24-r1.ebuild 2917 BLAKE2B f7f08b118d1c2f970c036077bd60b76268842a91372bd54cb7a1b6a8beb30e3f3cbc00ef27c550c45b9ed71ee5bdb5854f4883a761e983d5a5ac4ed8fa69d011 SHA512 a3406b7867e2169a945f73d7ec03c1e93120de0a0baea1e8cf844dc878cc696bba68dbc33f26f09b02773d449eb508886e9a9dced84119abff3377b8d09fea69
+EBUILD veracrypt-1.24-r2.ebuild 2922 BLAKE2B 60b5ddea54fb39c22fecbd52ec3d3a83fe92a85af62a02f33f4a1fca78f69ac7dacc658607621c5a2a1a364bc1f571594e3a30666cbb63abc713acf2ced524a1 SHA512 2ad016f3616a4d7e33f01830c1904f6c279a5febdb7896bb923c59728beede3e130a47def2a4b2e9859f42ef4c55b16956cf3fdc4f594abfe3bfc7dc8af9a193
 EBUILD veracrypt-1.24.ebuild 2471 BLAKE2B 66f9e985f34ddc76cfbc859348630f44b758ef9284c4052b3de80e60ae106b29edda99b0b2479730242d02136ead1c71847589f9a42836c8bdd7a6485bd52d57 SHA512 e1e715570d2d2f08d64877b4f7e9a912e6b21814215fbfe6953328b05d95693e3ba08cf5f43a3bc4e0cc1f0d84ac932f51c52e0e48a68da4527030a3bfe9fd3c
+EBUILD veracrypt-1.24_p1.ebuild 2951 BLAKE2B 8fb2b50f6be34fd1c3a724c04eb5e4cfaabfadc1c0a60691d71e9baaf4a48a84022a15709baeb46c8e2f7a4f25ef0b0b0b14483998fa22c22d6df5cc76e97984 SHA512 e84df844fc0f5190af231dddc0856d4637a94aafb70c8df8c1e979136caad49134fb419ff42d10386a6a727e64e5ebaf7d0e7c9d9ad14fb28b2fe08ed0cbea48
 MISC metadata.xml 516 BLAKE2B 280399666a147f475b2a8558bb3cb47c69ea4f4ba9894ae7d61757e26262f9f618007d9a07ce41eff5e9de17559b56b173a04f6f0c81618f932249bf2794fd62 SHA512 093ddf9483158c1756586e918dcc171e3bd7ef078ef28613517e4b04017c3cff8d3ad2ca7fa44027395602ad8427314356c742c23d03083240d6446b704d87d7
diff --git a/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
new file mode 100644
index 000000000000..c4433c561d86
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.24-no-gui-fix.patch
@@ -0,0 +1,35 @@
+From 482311ef1041918d791e498744f8e0ddeebc91fe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Fri, 11 Oct 2019 18:16:41 -0400
+Subject: [PATCH v1] src/Main/Main.make: simplify the WX_CONFIG_LIBS logic
+
+Irrespective of whether we are linking against widgets statically or
+dynamically, pull in only 'base' when GUI is disabled, and
+'adv,core,base' when GUI is enabled. When GUI is disabled, the C/CXX
+flag must include '-DwxUSE_GUI=0' for this to work.
+---
+ src/Main/Main.make | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/Main/Main.make b/src/Main/Main.make
+index 0bdd951d..259a1f08 100755
+--- a/src/Main/Main.make
++++ b/src/Main/Main.make
+@@ -82,14 +82,10 @@ CXXFLAGS += -I$(BASE_DIR)/Main
+ #------ wxWidgets configuration ------
+ 
+ ifdef TC_NO_GUI
+-ifdef VC_WX_STATIC
+ WX_CONFIG_LIBS := base
+ else
+ WX_CONFIG_LIBS := adv,core,base
+ endif
+-else
+-WX_CONFIG_LIBS := adv,core,base
+-endif
+ 
+ ifeq "$(TC_BUILD_CONFIG)" "Release"
+ 
+-- 
+2.23.0
+
diff --git a/app-crypt/veracrypt/veracrypt-1.19.ebuild b/app-crypt/veracrypt/veracrypt-1.19.ebuild
deleted file mode 100644
index e2b31e79b342..000000000000
--- a/app-crypt/veracrypt/veracrypt-1.19.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
-
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://veracrypt.codeplex.com"
-SRC_URI="https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"
-
-LICENSE="Apache-2.0 truecrypt-3.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X +asm"
-RESTRICT="mirror bindist"
-
-WX_GTK_VER="3.0"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	asm? ( dev-lang/nasm )
-"
-
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
-	linux-info_pkg_setup
-
-	setup-wxwidgets
-}
-
-PATCHES=(
-	# TODO: remove in >=1.20
-	"${FILESDIR}/${P}-makefile-archdetect.patch"
-	"${FILESDIR}/${P}-execstack-fix.patch"
-	"${FILESDIR}/${P}-remove-packaging-from-makefile.patch"
-)
-
-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}"
-	)
-	use X || myemakeargs+=( NOGUI=1 )
-	use asm || myemakeargs+=( NOASM=1 )
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	"${S}/Main/veracrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	dobin Main/veracrypt
-	dodoc Readme.txt "Release/Setup Files/VeraCrypt User Guide.pdf"
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	if use X; then
-		newicon Resources/Icons/VeraCrypt-48x48.xpm veracrypt.xpm
-		make_desktop_entry ${PN} "VeraCrypt" ${PN} "System"
-	fi
-
-	pax-mark -m "${D%/}/usr/bin/veracrypt"
-}
-
-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/veracrypt/veracrypt-1.22.ebuild b/app-crypt/veracrypt/veracrypt-1.24-r1.ebuild
index c1e8355fcbf2..11c268072182 100644
--- a/app-crypt/veracrypt/veracrypt-1.22.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.24-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,10 +8,14 @@ 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"
 
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, jitterentropy, 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 truecrypt-3.0"
 SLOT="0"
-KEYWORDS="amd64"
-IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
 RESTRICT="bindist mirror"
 
 WX_GTK_VER="3.0"
@@ -30,9 +34,6 @@ DEPEND="
 "
 
 S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
-HTML_DOCS=( "${S}"/../doc/html/. )
-DOCS=( Readme.txt )
-PATCHES=( "${FILESDIR}"/${PN}-1.22-sysmacros-fix.patch )
 
 pkg_setup() {
 	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
@@ -41,7 +42,14 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-1.24-no-gui-fix.patch
+	default
+}
+
 src_compile() {
+	local TC_EXTRA_CFLAGS="${CFLAGS}"
+	local TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
 	local myemakeargs=(
 		NOSTRIP=1
 		NOTEST=1
@@ -50,16 +58,27 @@ src_compile() {
 		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" "")
 	)
 
+	# We need to explicitly disable the GUI support when linking against
+	# wxwidgets, in case it was compiled with USE=X
+	if ! use X; then
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS} -DwxUSE_GUI=0"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS} -DwxUSE_GUI=0"
+	fi
+
+	myemakeargs+=(
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS}"
+	)
+
 	emake "${myemakeargs[@]}"
 }
 
@@ -68,8 +87,16 @@ src_test() {
 }
 
 src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
 	dobin Main/veracrypt
-	use doc && einstalldocs
+	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}/${PN}.init" ${PN}
 
diff --git a/app-crypt/veracrypt/veracrypt-1.21.ebuild b/app-crypt/veracrypt/veracrypt-1.24-r2.ebuild
index dd4f4dc2c80e..726813a94849 100644
--- a/app-crypt/veracrypt/veracrypt-1.21.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.24-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,13 +8,17 @@ 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"
 
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, jitterentropy, 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 truecrypt-3.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+asm +doc X"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
 RESTRICT="bindist mirror"
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 
 RDEPEND="
 	sys-fs/lvm2
@@ -30,8 +34,6 @@ DEPEND="
 "
 
 S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
-HTML_DOCS=( "${S}"/../doc/html/. )
-DOCS=( Readme.txt )
 
 pkg_setup() {
 	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
@@ -40,7 +42,14 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-1.24-no-gui-fix.patch
+	default
+}
+
 src_compile() {
+	local TC_EXTRA_CFLAGS="${CFLAGS}"
+	local TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
 	local myemakeargs=(
 		NOSTRIP=1
 		NOTEST=1
@@ -49,13 +58,26 @@ src_compile() {
 		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" "")
+	)
+
+	# We need to explicitly disable the GUI support when linking against
+	# wxwidgets, in case it was compiled with USE=X
+	if ! use X; then
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS} -DwxUSE_GUI=0"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS} -DwxUSE_GUI=0"
+	fi
+
+	myemakeargs+=(
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS}"
 	)
-	use X || myemakeargs+=( NOGUI=1 )
-	use asm || myemakeargs+=( NOASM=1 )
 
 	emake "${myemakeargs[@]}"
 }
@@ -65,8 +87,16 @@ src_test() {
 }
 
 src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
 	dobin Main/veracrypt
-	use doc && einstalldocs
+	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}/${PN}.init" ${PN}
 
@@ -75,7 +105,7 @@ src_install() {
 		for s in 16 48 128 256; do
 			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
 		done
-		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Encryption;Encryption Tools;Utility;"
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
 	fi
 
 	pax-mark -m "${D%/}/usr/bin/veracrypt"
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p1.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p1.ebuild
new file mode 100644
index 000000000000..b9d71a087a81
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24_p1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils 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_1.24-Hotfix1.tar.gz -> ${P}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, jitterentropy, 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 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"
+
+WX_GTK_VER="3.0-gtk3"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_1.24-Hotfix1/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-1.24-no-gui-fix.patch
+	default
+}
+
+src_compile() {
+	local TC_EXTRA_CFLAGS="${CFLAGS}"
+	local TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		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" "")
+	)
+
+	# We need to explicitly disable the GUI support when linking against
+	# wxwidgets, in case it was compiled with USE=X
+	if ! use X; then
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS} -DwxUSE_GUI=0"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS} -DwxUSE_GUI=0"
+	fi
+
+	myemakeargs+=(
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	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}/${PN}.init" ${PN}
+
+	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 ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}