Diff gnupg-2.2.27 with a gnupg-2.3.1

/usr/portage/app-crypt/gnupg/gnupg-2.3.1.ebuild 2021-04-20 18:39:00.000000000 +0300
3 3

  
4 4
EAPI=7
5 5

  
6
inherit flag-o-matic systemd toolchain-funcs
6
inherit autotools flag-o-matic systemd toolchain-funcs
7 7

  
8 8
MY_P="${P/_/-}"
9 9

  
10 10
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
11 11
HOMEPAGE="https://gnupg.org/"
12
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
13
	scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
12
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
14 13

  
15 14
LICENSE="GPL-3"
16 15
SLOT="0"
17
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
18
IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
16
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
17
IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server"
19 18

  
20 19
# Existence of executables is checked during configuration.
21 20
DEPEND=">=dev-libs/libassuan-2.5.0
22
	>=dev-libs/libgcrypt-1.8.0
21
	>=dev-libs/libgcrypt-1.9.1
23 22
	>=dev-libs/libgpg-error-1.29
24 23
	>=dev-libs/libksba-1.3.4
25 24
	>=dev-libs/npth-1.2
......
28 27
	ldap? ( net-nds/openldap )
29 28
	readline? ( sys-libs/readline:0= )
30 29
	smartcard? ( usb? ( virtual/libusb:1 ) )
30
	sqlite? ( >=dev-db/sqlite-3.27 )
31 31
	ssl? ( >=net-libs/gnutls-3.0:0= )
32 32
	sys-libs/zlib
33
	tofu? ( >=dev-db/sqlite-3.7 )"
33
"
34 34

  
35 35
RDEPEND="${DEPEND}
36 36
	app-crypt/pinentry
......
44 44

  
45 45
S="${WORKDIR}/${MY_P}"
46 46

  
47
REQUIRED_USE="tofu? ( sqlite )"
48

  
47 49
DOCS=(
48 50
	ChangeLog NEWS README THANKS TODO VERSION
49 51
	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
......
51 53

  
52 54
PATCHES=(
53 55
	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
56
	"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
54 57
)
55 58

  
56 59
src_prepare() {
57 60
	default
58 61

  
59
	# Made optional because it's a non-official patch
60
	if use scd-shared-access ; then
61
		# Patch taken from
62
		# https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
63
		eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
64
	fi
62
	eautoreconf
65 63

  
66 64
	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
67 65
	# idea borrowed from libdbus, see
......
78 76
		$(use_enable bzip2)
79 77
		$(use_enable nls)
80 78
		$(use_enable smartcard scdaemon)
79
		$(use_enable sqlite)
81 80
		$(use_enable ssl gnutls)
82 81
		$(use_enable tofu)
83 82
		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
......
87 86
		--with-mailprog=/usr/libexec/sendmail
88 87
		--disable-ntbtls
89 88
		--enable-all-tests
90
		--enable-gpg
91 89
		--enable-gpgsm
92 90
		--enable-large-secmem
93 91
		CC_FOR_BUILD="$(tc-getBUILD_CC)"
......
143 141
	use tools &&
144 142
		dobin \
145 143
			tools/{convert-from-106,gpg-check-pattern} \
146
			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
144
			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
147 145
			tools/make-dns-cert
148 146

  
149 147
	dosym gpg /usr/bin/gpg2
Thank you!