dev-libs/libgcrypt: sync, bug #629410

Bug: https://bugs.gentoo.org/629410
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

3 files changed, 95 insertions, 24 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index b7f70512f7..d3ba22bb09 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,20 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST libgcrypt-1.8.1.tar.bz2 2967344 SHA256 7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3 SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e WHIRLPOOL 42221344abb9e6f75048bdb9aaec4f8ffe032ddaa5f6bd16dd9c218f937fd52f26b13d088806c6684f6cc6b85b768b8bb04f89255641d82e40db6cd678d62617
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAlo9G5cACgkQKfsOnscZ
-7iCA/BAAg2za+4oHGp4u09ja56QN0AjDruRrOoNL/IDqEh91/XVbDHRRM/oVf/B1
-s6sCGi/4/oSAoAWa8B8W8YIMP+tx1xwydlmuAv3/w0gqJslRDX+geg7imsk8LBsU
-tiXIbH1H8e+bJdF+X/KlJiDfFl8Yo+CtrcWFVZZ9I3hAFx7JXiAH42vfbs1iKJwM
-6qfNV+VfG1xtyUscqUXpERNq6qRbgU+bJRW/bqvzbGvPGmgnjTKpdOW6WHZ3ysbr
-JJjtQEWfE+3tEPRw4lcXPTpZWlz3IUMxlduR8eKvOlbWmtYNZaGv3tz7EYBjffzl
-blQw5Y+3ql7wn7zgOo4rsl3ThbqVvGnaGnOkUkwKZst1ghcDo7JNNt2+hSfu8XzO
-p+FjWxbAIeE9uZMag2SWXpjT51ImBjdbal4wbwoZN/WFXm7uH1N6gsaiI8DWj0Zk
-GQwk73Qgisj7PYQWOd9WwHDzTCSIaP0+nWH6vUFg6KpJ9lUbEPVSQ08gcBiqm0LB
-9mF5kHUcrJ6Qt0GQ8JITdj+GJpjjjp8oC09tGf6gmSeCR6n9LKlYwlzMbKC2Q7K5
-5i1PMTdcu1NBpGkylyjh/Ph1EkZE7CPOavCJH8TNCrWRX3UhQNWgeqIBkLT1GJMw
-9i0m+8u+ctmP/8i7i9Uk51FnswocLFPSCSsO4BVzgkBVOnk0oEk=
-=QZRx
------END PGP SIGNATURE-----
+DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
+DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
new file mode 100644
index 0000000000..a4fd7956f7
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	# missing attribute(sysv_abi) for Cygwin?
+	[[ ${CHOST} == *-cygwin* ]] && rm -f mpi/*/*.S
+	default
+	# always use -no-undefined even if upstream is not convinced yet
+	sed -i -e 's/^no_undefined\s*=\s*$/& -no-undefined/' src/Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		$(use_enable o-flag-munging)
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+		# no cygwin patch yet
+		$([[ ${CHOST} == *-cygwin* ]] && \
+			echo "gcry_cv_gcc_win64_platform_as_ok=no")
+
+		GPG_ERROR_CONFIG="${EPREFIX}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 6d1eb56e4d..9b7e9f273f 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>k_f@gentoo.org</email>
-        <name>Kristian Fiskerstrand</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
+<use>
+<flag name="o-flag-munging">Enable O-flag mangling during build</flag>
+</use>
 </pkgmetadata>