summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2021-06-13 00:35:44 +0200
committerLars Wendler <polynomial-c@gentoo.org>2021-06-13 00:37:03 +0200
commit16b8804428d68538b75e21a597ab687830787097 (patch)
treec79b593406b6b302db2eb73d51ea1646e72bd61f /app-crypt/gnupg/gnupg-2.2.28.ebuild
parentdev-perl/Type-Tiny: Version bump 1.012003 (diff)
downloadgentoo-16b8804428d68538b75e21a597ab687830787097.tar.gz
gentoo-16b8804428d68538b75e21a597ab687830787097.tar.bz2
gentoo-16b8804428d68538b75e21a597ab687830787097.zip
app-crypt/gnupg: Fixed build with USE="-ldap"
Removed "scd-shared-access" USE flag as this finally went into a release Closes: https://bugs.gentoo.org/795669 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-crypt/gnupg/gnupg-2.2.28.ebuild')
-rw-r--r--app-crypt/gnupg/gnupg-2.2.28.ebuild13
1 files changed, 3 insertions, 10 deletions
diff --git a/app-crypt/gnupg/gnupg-2.2.28.ebuild b/app-crypt/gnupg/gnupg-2.2.28.ebuild
index f03938727e39..0f4396fc3999 100644
--- a/app-crypt/gnupg/gnupg-2.2.28.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.28.ebuild
@@ -9,13 +9,12 @@ MY_P="${P/_/-}"
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
- scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
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"
-IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
# Existence of executables is checked during configuration.
DEPEND=">=dev-libs/libassuan-2.5.0
@@ -51,18 +50,12 @@ DOCS=(
PATCHES=(
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+ "${FILESDIR}/${P}-dirmngr_ldap.patch" #795669
)
src_prepare() {
default
- # Made optional because it's a non-official patch
- if use scd-shared-access ; then
- # Patch taken from
- # https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg
- eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch"
- fi
-
# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
# idea borrowed from libdbus, see
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6