Backport multilib support into 1.5.4:0, for stabilization bug #524308.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 79 insertions, 5 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 243dc77fa40c..7acaefc304f4 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.222 2014/10/06 17:44:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.223 2014/10/17 18:49:52 mgorny Exp $
+
+*libgcrypt-1.5.4-r1 (17 Oct 2014)
+
+  17 Oct 2014; Michał Górny <mgorny@gentoo.org> +libgcrypt-1.5.4-r1.ebuild:
+  Backport multilib support into 1.5.4:0, for stabilization bug #524308.
 
   06 Oct 2014; Raúl Porcel <armin76@gentoo.org> libgcrypt-1.5.4.ebuild:
   arm64/m68k/s390/sh stable
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 03df5d99b0ab..e095d0d41338 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -9,16 +9,29 @@ AUX libgcrypt-multilib-syspath.patch 588 SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c
 DIST libgcrypt-1.5.4.tar.bz2 1512982 SHA256 d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33 SHA512 fe7e1d07eb10ee4ea8054bc955c35dc4b2109db645a08a6fa7757bf1e77a612e03c0838f9766086f04270b3621f34ccae0d6333f117cff204ccad9018c8a7908 WHIRLPOOL 221082d028a90235a3ddcc774b1772a8b8daec989a24b341491849e653e2ecb5cb0e3c8989a3f426524e39b28ebbe1b48532d5d9de7c54f4bdc19b450e22e4dc
 DIST libgcrypt-1.6.1.tar.bz2 2470885 SHA256 a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070 SHA512 83d502cf998736a5920df7324b7ff658041c34b2cfddccd8b96744ff940c0c84fe91fe7bfe03a69b10b9697a6f04f3007134bbc3c288b0fed78b60fc6ff15bc2 WHIRLPOOL 693de77590ea2da423e43e832f809183a50fa0e5d02d2fe46b860c6e6295d879730a300353d71e63671f498a1041b7b072af6bf4124a1a45eda787fee636a248
 DIST libgcrypt-1.6.2.tar.bz2 2476101 SHA256 de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c SHA512 86003bb61c1fd37d0e54f9b1f48a9d89adb5f623818f67392f19d0de9b28ccb911a728238f8a8d23b875afb3bf7698bbea4da7b3b3a10e049311b9b45fabe472 WHIRLPOOL e25f1035f57c182d8c5e3b608698b97cfc51472d2d39763d9d29abf0af88c751615f6d6b4ed9840fc8e9c055929cd51909c2dca01bc2ac7b37bbc0d4a09dfd29
+EBUILD libgcrypt-1.5.4-r1.ebuild 1834 SHA256 4544a57b24add509c12fa69060717138e32ea9d0bafda7a12ce9acfb596a5d66 SHA512 8e390686a0805c13adc4b8c5029b64cefd84efe5fc8ce98b15594ff53cf8b58bd8916655ff8c7d9644d1d44af64ff75a0431092bb17246e57f0022d0d53b2a25 WHIRLPOOL 6e0d0413d5f5a74d8b04ff1f2f765c40d89c6edaec782e0d8a71944fb1805c98f8ee68407a1f52719e7eb968b39fcda8af8a38c6e40aa01a85ecca643bf3654c
 EBUILD libgcrypt-1.5.4-r100.ebuild 1850 SHA256 ade10fcf9efb4b48f748dc24d6ecf6255ab92d3a635e96d659f94420d9fac362 SHA512 40f02e860d3e9e4fc88c9dcb329c32376fa748615615d8a1056260def2e6d8ab801e19f5a14eee5f7c1dc2ed42fb1fadb88264b70d883d64f98ee99e7e753c83 WHIRLPOOL 463fd2758436632f7a2e9bcfeb307c6e7f841468adbd84d38845a03297955d46ba37f9f84b0035071ad5dccb011511ca611100c85fa72d2f53074347c373629d
 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
-MISC ChangeLog 32361 SHA256 4c4a89e5ff57fc9115fbbb210cd880ba6802ee17c4b72719a83f94204036b700 SHA512 d1036461d6d938129500d09dbe0f78bdfbc9f471ba50b191d6bc0f3d75b864928c4572cd03cf66f60b3acf3eef4d4e505f8e02f6e1f2ea8a22c657b873c64873 WHIRLPOOL 62e720e191518b0d97d868094e19e85d9d01876f6a3e7a6ce593b85aec80117e552e0adbc483f190a9e8e2ba92b4d4b1ba4b6a7e54fa1b5c09313cb8a63129ce
+MISC ChangeLog 32547 SHA256 63af4f932f99c5037893244f1e15d89e5b232d7299fbd2fdbc9576fb64551161 SHA512 eaedb1508b6699e9ad33808eb6ead21975545adf75ce281596b881e00339a648e6c81ecf7767f2683d00dda688caf44d22c221e486271dce8106f2974efa110a WHIRLPOOL cba0d1900ee10485ae07dcc0d73be730e554055f591533551289b4edc4a116c0b544d5e63637389312e99a780fe4b47617f1df2669250ae32d7ed2148078b164
 MISC metadata.xml 400 SHA256 ce8390ef2caf4820941fa6ab4d87a2f6d9c2823b42d845b3a5da9fa7586e63d3 SHA512 8c527cc5701fbc96dfd9c6006de8edeb5a48b8b56bb4f7b4fdbaaea159ba3e05252cd0b378085b3fedacd8352cfc2417948e4a852c32c2ae2bfd5c9b85c8bf62 WHIRLPOOL 3b5e66406ebbfb1a9f7cadccf6241ef4867f7b25513f2ef49ef02e2980b7201085752f1643a0132e98750f230ee56b5e7c786d1e6eafa51e98c5f8c04d95ba96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQy1R8ACgkQuQc30/atMkDD6ACgodElmjij8wcpYkhcCSOKIoqG
-PLsAnA8bXmNnuQiBa8j8kyr8b0ol0/ir
-=eelh
+iQJ8BAEBCABmBQJUQWTYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyy8QANFWy5D8+6QS2qq6PDUFaAsG
+eGh9OqGzkExxzciqdKxvwpXlPPz5u/M4Z4ckBYjIR0Q6k0/Y1CGO95Kak6Xzv4Pa
+T82ZIYYVUU9/PJrPa/m92QTWMO/FQ5RTEqYStzvdxM0sPNsNPOm+9fgjou6FkHzu
+UwaijqVCMlPAlVHWQSTMqwmEKv5EPQGerDuZ1GEq+ap1bOu3cd+pTt5ygEuSPWsB
+tn1sQZIDK9pRp8WghWTqSuaNpiH4YjLDk1oeWF5m4ZZgLNoP9mSy/CjHfxzBwiYU
+1FtMXAd02v7y1TEAcAQmB1RGTBxUc7Am/ORwU1MA2nLGhnTpQ74JxHAuUS9kyITw
+qyD8sAqcnQJeJx25egjrVUqdq+2JpnEFCOILtMmCWSxqoFADIGf3yVtsbwXM96Mr
+v7GGnuToxtSHjC5qQGkYrHd9DJRW0BK2WSUigNGvfZjC5KVfNPp4wHxBWwFvBtXQ
+JmwnzrLnG58CLRxxdGEsVFi/bszrIH9t8HJBdf4V91o85Fx3v5vtdUkVHIdgKwHC
+lwUnvF3YZeGMTgTOqrRUUznpgzn+w4t9ufvkst7Hr/enmVAppKuUc3QPfaMgc+Ui
+ZtWLTghgJ3GNimEZzs7D9NNLQXZJ1htCcWw/lG+djrgU2KEzeSWnbJnRxSzrCceF
+Gv9PX4mkt8M+swVWGbTW
+=CTlt
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..e474cd445e11
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4-r1.ebuild,v 1.1 2014/10/17 18:49:52 mgorny Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-multilib
+
+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/11" # 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+	!dev-libs/libgcrypt:11
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_configure() {
+	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-multilib_src_configure
+}