Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/veracrypt/
Date: Sat, 17 Apr 2021 13:18:15
Message-Id: 1618665477.61e89d81530d193643b990a1af21a6c145e4da0a.soap@gentoo
1 commit: 61e89d81530d193643b990a1af21a6c145e4da0a
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 17 13:17:57 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 17 13:17:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e89d81
7
8 app-crypt/veracrypt: Port to EAPI 7
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 app-crypt/veracrypt/veracrypt-1.24_p8.ebuild | 36 +++++++++++++---------------
14 1 file changed, 16 insertions(+), 20 deletions(-)
15
16 diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
17 index 91bc89eb3f7..e4a53800c6d 100644
18 --- a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
19 +++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
20 @@ -1,15 +1,17 @@
21 # Copyright 1999-2021 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=6
25 +EAPI=7
26
27 WX_GTK_VER="3.0-gtk3"
28 -inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
29 +inherit desktop linux-info pax-utils toolchain-funcs wxwidgets
30
31 MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
32 +
33 DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
34 HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
35 SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
36 +S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
37
38 # The modules not linked against in Linux include (but not limited to):
39 # libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
40 @@ -26,20 +28,15 @@ RDEPEND="
41 sys-fs/fuse:0
42 x11-libs/wxGTK:${WX_GTK_VER}[X?]
43 app-admin/sudo
44 - dev-libs/pkcs11-helper
45 -"
46 -DEPEND="
47 - ${RDEPEND}
48 + dev-libs/pkcs11-helper"
49 +DEPEND="${RDEPEND}"
50 +BDEPEND="
51 virtual/pkgconfig
52 - asm? ( dev-lang/yasm )
53 -"
54 -
55 -S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
56 + asm? ( dev-lang/yasm )"
57
58 -pkg_setup() {
59 - local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
60 - linux-info_pkg_setup
61 +CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
62
63 +src_configure() {
64 setup-wxwidgets
65 }
66
67 @@ -67,32 +64,31 @@ src_compile() {
68 }
69
70 src_test() {
71 - "${S}/Main/veracrypt" --text --test || die "tests failed"
72 + ./Main/veracrypt --text --test || die "tests failed"
73 }
74
75 src_install() {
76 local DOCS=( Readme.txt )
77 - local HTML_DOCS=( )
78
79 dobin Main/veracrypt
80 if use doc; then
81 DOCS+=( "${S}"/../doc/EFI-DCS )
82 - docompress -x "/usr/share/doc/${PF}/EFI-DCS"
83 - HTML_DOCS+=( "${S}"/../doc/html/. )
84 + docompress -x /usr/share/doc/${PF}/EFI-DCS
85 + HTML_DOCS=( "${S}"/../doc/html/. )
86 fi
87 einstalldocs
88
89 - newinitd "${FILESDIR}/${PN}.init" ${PN}
90 + newinitd "${FILESDIR}"/veracrypt.init veracrypt
91
92 if use X; then
93 local s
94 for s in 16 48 128 256; do
95 newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
96 done
97 - make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
98 + make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
99 fi
100
101 - pax-mark -m "${D%/}/usr/bin/veracrypt"
102 + pax-mark -m "${ED}"/usr/bin/veracrypt
103 }
104
105 pkg_postinst() {