Add doc USE flag to install gcrypt.pdf. Fixes bug #551398. Patch contributed by Andrew Savchenko.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x250B7AFED6379D85!

3 files changed, 96 insertions, 2 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 0238b6db5127..855ae64d6042 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.232 2015/04/19 16:06:08 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.233 2015/06/12 21:35:28 k_f Exp $
+
+*libgcrypt-1.6.3-r1 (12 Jun 2015)
+
+  12 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +libgcrypt-1.6.3-r1.ebuild:
+  Add doc USE flag to install gcrypt.pdf. Fixes bug #551398. Patch contributed
+  by Andrew Savchenko.
 
   19 Apr 2015; <jmorgan@gentoo.org> libgcrypt-1.5.4-r1.ebuild:
   ppc64 stable wrt 524308
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index c07dc43ea96f..f30c7055ee7c 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libgcrypt-1.5.0-uscore.patch 981 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601 WHIRLPOOL 6b6b1944539127c9c41fda46c54d8e331597d249ab91a0024a38d60a907a0fba114fb064c8d956c90a91e27e6ae30aa2e6dd4a3b61b2e8d771e53499b9810016
 AUX libgcrypt-1.6.0-serial-tests.patch 331 SHA256 368f31f2bfab568fac5b782851bcbcd9fdbab97240729d311a015d91c7dd2ddf SHA512 3bb833c7b5f3ad19b1856472676a0000a6837997c0ebb8eeee5ec67b0d415bde733dd98db5dd3060c03e78d5ced219e85acb40dd115aa044d526f530e8459fd2 WHIRLPOOL d219b5b4973c19b81f76d01463c152f04bb44a1f5dd6bf588bd6b24a4a199a438db43440dd71a65080b4ba90da941b0766a0499398c1a58817742f088140e264
 AUX libgcrypt-1.6.1-uscore.patch 843 SHA256 458ebc904185a5d08ef89f0c8ac797b87eec619341b4c0f8130fde2af8749459 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791 WHIRLPOOL bbadf4816e081929e8739fbbd3574bd291d9de86c4fe2344dba2c1ceb5f84d3e0bdede194efadefbcbf7409c44c218ab28f48d05b367c225b1687fced7565e15
@@ -12,6 +15,17 @@ EBUILD libgcrypt-1.5.4-r100.ebuild 1850 SHA256 ade10fcf9efb4b48f748dc24d6ecf6255
 EBUILD libgcrypt-1.5.4.ebuild 1589 SHA256 2081786054cf1b5ebaf5488de019ed88421620ddb78f7ddd807c9c60a2653b21 SHA512 05074db47b5cae00a07d77e0bba4c418bf8eb4cdc1444389a4e7853cbb8ac2757875c5f8bca3e393f4937721b1d734d2f7dbf29add1211957cbb3f2e04a76b92 WHIRLPOOL 67f0967a9ec8bf63805c4c5ab9e4ee186bedd47cb4c38c1f6fbdcd010f528ab32faf3abaad2ab167b6339a45e2ea0ae35cc0e9b99ea6582e2117839b8f0cb15b
 EBUILD libgcrypt-1.6.1-r2.ebuild 2188 SHA256 207447da3831f69f3d0caa0acfe929589543f1ba3d520ecf4f21147ff9e41885 SHA512 20e173e86f5f1fa7e86b9f4878ec1f159ab790aa9494f63e46c2ecc2d8215c4d086a728bc1ada47d6913f7f48532c6c978a4283c67b835b74950929c35a461ce WHIRLPOOL 99aba5a6c17061cc64b093c27e4a7f46b592c03daeac42182a0421dcf36915fca773a6fe9e62f0179bf8a72ef01136002377015f6680850c091baba31bedfde4
 EBUILD libgcrypt-1.6.2.ebuild 2145 SHA256 048b090e98e3840de8445a8ed8e5e55839cc06647b3ac7bc7d8fb2afc9317451 SHA512 9650d4bfe00ce214c66b5db78fca2396e6dcae4e8646b9438b55fe4bc0695454ed99d4d5e40bbfc9301e6e91fe8ead37c153929423f3a9756da7ab9e6030afb6 WHIRLPOOL 58c37f620b201fcc5d03b2921dfb51be6024f4766996afcd32a01d40351043e147009b5949ca6a289fc87df4063896586e2f9f80693f277e0071389918ae6968
+EBUILD libgcrypt-1.6.3-r1.ebuild 2347 SHA256 52353dd779762ad96c7e4168f65be45afab7456be7e98db04cf965742736bf62 SHA512 c2ea968802653defbd1bba46987987e8fb032539c4a15d2b496cd84d551640c9d3122fccd93419f413aa5fe73dbe1218e49e745af93bd0359a73d0c2cc4bc0b3 WHIRLPOOL 8cd0877413b521eead09bb4ecf52ee28cc5fcb494be41e17ce97e66e53a92db9f3cbaa0ed5df49de08755700b12cbe4263a21a5999e415f0ee5b64a22c260d3c
 EBUILD libgcrypt-1.6.3.ebuild 2118 SHA256 e0aa8d23c6788d722ab9832620df220b91f951fd21a4d4ae124c7e8d005cf4dd SHA512 d5d3da0aebfd7d0acd08086c4a67921b58092947d5c1209f959401df1d6b618e371a5bf3001b3e1f489f6d1e0c9ffcbacaeb01a480be5120c3a188b45ff1b648 WHIRLPOOL 7fba0d15593e9f411603c363a4acafc0086074405fdef451cef696ad153bf34cf02b91f0335fbc2f373e4047160c9606058c9e7d74c84981e7bd94b9ed9afc4c
-MISC ChangeLog 33657 SHA256 5a37f15167ca470aba7208d5116d9218f75ff7ce9635de8f3e24ffe5a767f0b2 SHA512 e40ce9b6c70ce524073322ec1497c4ecc0149f3be8275e2254e2db068d6eb9bc7a737925eb47cef100ec3a1cdbd4c145112ba599d14ac37c5551aaba83385a3c WHIRLPOOL 2c361b8fad17f198b06768e743f740ec0f5535698604cb3700ffd0ff974530621c0e0c04b8df280065f6592ebb42f18218e109e1ec36ba1d6bbdf8396bab7855
+MISC ChangeLog 33875 SHA256 ec4adf18996d0854e00596d235a2f32a88b341c7055af169bda97176c3e4116c SHA512 9a3a5334d394f24157993bd409f160cd28f8c09ac0839513cf97f5485a31cdc9a15e1bb578420b4e30151dff23bdc64bd8aa6158b70d74eb45755df4f6d6d80e WHIRLPOOL 68e65c22c6e7f4d12d6930cfcfa66c52ba7140ebe6172e049c1006a359b0940dc74869fe4a71ac9a462ad819813dd060839badb3400ebaf3b31f6230d35143bb
 MISC metadata.xml 400 SHA256 ce8390ef2caf4820941fa6ab4d87a2f6d9c2823b42d845b3a5da9fa7586e63d3 SHA512 8c527cc5701fbc96dfd9c6006de8edeb5a48b8b56bb4f7b4fdbaaea159ba3e05252cd0b378085b3fedacd8352cfc2417948e4a852c32c2ae2bfd5c9b85c8bf62 WHIRLPOOL 3b5e66406ebbfb1a9f7cadccf6241ef4867f7b25513f2ef49ef02e2980b7201085752f1643a0132e98750f230ee56b5e7c786d1e6eafa51e98c5f8c04d95ba96
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAEBCAAGBQJVe1CEAAoJECULev7WN52FAscIAMY6Oxg+m2fr2GnNJrxpJbmH
+wxx9EtifOmE7mcEWutkaxQz68JC6cleThrAGlJw/DSBoDYdyvkP7MxYRXhAwWhX7
+RBxnsdQ0ZeKA+hS9nchFXcGViwYu0Q7RYLB2ekRqNitMwKPoz+vW1U/BS/RnjHsz
+0Xe51hTpI34A87yGxGmdWPZE+KKkgHFHGEwxHUQ7aerESm3wPY6uQuiQtPQHHGQZ
+3quHOuAB7Gc4TZ2sOJ6HLvuqWhhgexF/iKLuf3c5/q1HA/JHYEze7/FALucAJ3La
+Gtbp84WoOs1MxHCCYRnHHBG2NFmHRpPbt0ktXmEmJCRSGm8a70WWolLAiLfdt3k=
+=ElVs
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..5c4923bcde38
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r1.ebuild,v 1.1 2015/06/12 21:35:28 k_f Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+WANT_AUTOMAKE=1.14
+
+inherit autotools-multilib flag-o-matic
+
+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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${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? ( sys-apps/texinfo )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+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-padlock-support # bug 201917
+		--disable-dependency-tracking
+		--enable-noexecstack
+		--disable-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")
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && emake -C "${BUILD_DIR}/doc" gcrypt.pdf
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc "${BUILD_DIR}/doc/gcrypt.pdf"
+}