gentoo resync : 11.02.2018

2 files changed, 80 insertions, 0 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 0fd045c6ae25..5265936b86c5 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -8,5 +8,6 @@ DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8
 EBUILD libgcrypt-1.5.6-r101.ebuild 1807 BLAKE2B b10e164b82bf2de4b8e97ae52f0cfcc80063ae93351a4619cc19b5f9e1fb54555ea8fb2af7694c911f403ab5f26a996253ecf8567a2817e77eb840a5dfcebb50 SHA512 81b461a531bde86040279627605780b28b006d753731a75257f2990b410cdcd61f0073724f9736bc2a52bc293fc740b5184fa0f031209940b539e2b5fd778d10
 EBUILD libgcrypt-1.8.1.ebuild 2226 BLAKE2B 1c592b509848471639c8f02c274bbe7463efc6b9891b210473522ed1e4963668143cdbfeb313d76b780f72e5a13206015ab468904140ffd37ca1ea3c00301499 SHA512 eb0d3be414ecc5585c37ba6e3b3de483224ce6eaf337504c124f492b86d9283f7a8079f61bf41780cfbe7cb96f0900a5afd397495deeecaf0b1b681e5178f9a9
 EBUILD libgcrypt-1.8.2-r1.ebuild 2273 BLAKE2B 7878583f1653512167c16eab8fcb89fed8f5834aed72278d85b02cbcd03fe63561e857aec7b720199526caf6b1ac17749db4c71d24e7702fc49de0be3b957a7e SHA512 8f2cda06efef6e1595f3a526a0b70b079c407c9ff3504ce900f8ab9f657626f142ac29fefe448d48545b863d6c5b42d3ec7dec19e1c5d61d1b6979b682c2d669
+EBUILD libgcrypt-1.8.2-r2.ebuild 2328 BLAKE2B 60c79e560013ff4cf43486436138ab83cf673a74f75c5f77dae05a76be07108033f722b276ae2d1cf7bdb5d463ab1baf0fee5c4ab29a0653b06c45e17e923923 SHA512 92311a587300e51e3be874e0ac30a1aac18ce3431cf09c95fb5a6842fbfe7fd038406ad218bb22c9f45cedd54f063276f0db991402c84d2b7b809be1bbaf29ce
 EBUILD libgcrypt-1.8.2.ebuild 2239 BLAKE2B e2796a1f88a4407527f0326e886aa699a9243c0dd4d3914f82cee6f2053b20e8637be1488c5b2ce8dc8231247b22041ae2bbf97b1a3223efbc432471503afa75 SHA512 ad2122ed2c1a68bea96b99c2397fe297c3c5afd3b86fe0732badbf767e6de677b90591d9acac84c8de8a4cd3379ebc72e77f9fedb3b87dca043b7a397f3146b5
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
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 000000000000..ccdca0790c06
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
@@ -0,0 +1,79 @@
+# 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
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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() {
+	default
+	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 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")
+
+		GPG_ERROR_CONFIG=/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
+}