Defer multilib changes, bug#513718

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 78 insertions, 24 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index dd3361927de2..0d7977364511 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.209 2014/08/08 08:57:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.210 2014/08/08 16:19:32 alonbl Exp $
+
+*libgcrypt-1.5.4-r100 (08 Aug 2014)
+
+  08 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org> +libgcrypt-1.5.4-r100.ebuild,
+  libgcrypt-1.5.4.ebuild:
+  Defer multilib changes, bug#513718
 
 *libgcrypt-1.5.4 (08 Aug 2014)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index b30bb9e4e608..08b963eaa02f 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -10,14 +10,15 @@ DIST libgcrypt-1.5.3.tar.bz2 1508530 SHA256 bcf5334e7da352c45de6aec5d2084ce9a1d3
 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
 EBUILD libgcrypt-1.5.3.ebuild 1588 SHA256 c836b286f35a00f1bdb85888c36ea608e426ed03a8192fa2c8b66102ac93e265 SHA512 2e5221a188fe232b256d398987c06ddefca8994a066ac0c3d82f8b8108252912b1af7862f05fe6dabd9f071b3a9747a4623c986e1eac9864af36eed3ab7068e0 WHIRLPOOL e4e78a3c202049a5d0cb411483d5214ce3fcb8bd5ef65135aaa41f3da45f1c2bf5963459d0ab234b75e91191649a2a6146b04c46d6ca91e294695c903b801a2f
-EBUILD libgcrypt-1.5.4.ebuild 1845 SHA256 0f7ff902e6cced943bc08e267a7c811a772b05d30bbb92886e8eee7a58ea1c2f SHA512 a0507d10070bc2ddfcb11dece3376698aa544b94109a495f4fff1040154d216da1b1e11ed6cd0e4ae93c6b22cd6d84399974301f929d8db2a462143b2ae60829 WHIRLPOOL 346139adb9a3df3987f76ae51f18c1fa3a831d2405530e225e84d4906fea431e915f53adff64d92ee2e11a24771377ab721cdb03d5622726d89fd9f21605b024
+EBUILD libgcrypt-1.5.4-r100.ebuild 1850 SHA256 ade10fcf9efb4b48f748dc24d6ecf6255ab92d3a635e96d659f94420d9fac362 SHA512 40f02e860d3e9e4fc88c9dcb329c32376fa748615615d8a1056260def2e6d8ab801e19f5a14eee5f7c1dc2ed42fb1fadb88264b70d883d64f98ee99e7e753c83 WHIRLPOOL 463fd2758436632f7a2e9bcfeb307c6e7f841468adbd84d38845a03297955d46ba37f9f84b0035071ad5dccb011511ca611100c85fa72d2f53074347c373629d
+EBUILD libgcrypt-1.5.4.ebuild 1599 SHA256 f68cb366b4d5b0e9c4d2c71f717ebdcc671ae7d2686afed31d9f1b824e45778e SHA512 ace2071d6ce197fb53633c0c4d53d3d25d1bf26684463c18802047a147639b7bb716e4d3f5dd48688b9f1bca0f838827c8ab7d970587dee5e997275b335c6bcd WHIRLPOOL 974e1a3fc578ea0928561b14c44a569d07162e3f9d2e77c3be0ef83ca54a15afa48c5e58b9588eb7c59459eb527167ab8bf1701aac459f5b1802c794f2795e8c
 EBUILD libgcrypt-1.6.1-r2.ebuild 2188 SHA256 207447da3831f69f3d0caa0acfe929589543f1ba3d520ecf4f21147ff9e41885 SHA512 20e173e86f5f1fa7e86b9f4878ec1f159ab790aa9494f63e46c2ecc2d8215c4d086a728bc1ada47d6913f7f48532c6c978a4283c67b835b74950929c35a461ce WHIRLPOOL 99aba5a6c17061cc64b093c27e4a7f46b592c03daeac42182a0421dcf36915fca773a6fe9e62f0179bf8a72ef01136002377015f6680850c091baba31bedfde4
-MISC ChangeLog 30820 SHA256 eba768fa6893214c49631200556932f756b0e9734499d6a79f28ee79b1a5f058 SHA512 be481b06d1d6f5b39f2bca1449665f56dd83f5f1d54e4eb6921d6f099ff67897ff4c98e749f4654d057d0e90f5ea9f379284aea16487264a7ba9ca5520240acb WHIRLPOOL ea1bf0b74d5f1b709f4b789ef3f51dfc071bb01a3e58940b3b59b2aadc077304317806246a5c7a472053a7ef7b744283a603c373c83f5952ad27d48a989e8dc1
+MISC ChangeLog 30999 SHA256 0c5df628cbf2721dcb814c8b7354b9f64c483f07e78761c945408cc58a1987f5 SHA512 e511e92368a789dc136f482a82431144300d348f8b83154a0d60a9065227eeb991fe937d9e57000906f65e8ca450baf513c17c4157ca8f5569eca5aff785b425 WHIRLPOOL 1e30a5ba6437f766d3beba6ffe1e2d03907bf96fd2c5f6306cd0859381943ad50f590965d4a5a913ee2440f329d9d694df3623ea1a0cef0287b819f6e868bbbd
 MISC metadata.xml 400 SHA256 ce8390ef2caf4820941fa6ab4d87a2f6d9c2823b42d845b3a5da9fa7586e63d3 SHA512 8c527cc5701fbc96dfd9c6006de8edeb5a48b8b56bb4f7b4fdbaaea159ba3e05252cd0b378085b3fedacd8352cfc2417948e4a852c32c2ae2bfd5c9b85c8bf62 WHIRLPOOL 3b5e66406ebbfb1a9f7cadccf6241ef4867f7b25513f2ef49ef02e2980b7201085752f1643a0132e98750f230ee56b5e7c786d1e6eafa51e98c5f8c04d95ba96
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlPkkQoACgkQXYk9GL8g3FFDfgD8C0RTk3s/i0h/nTmBERv08UMf
-skbChHuIufGBinGezZsA/jjA6u8Um9+7jxSCJYBwKaIH27d6gTN9dCjS7JcKSU7x
-=5dr8
+iF4EAREIAAYFAlPk+JgACgkQXYk9GL8g3FGOmwD8CFVuT3OZdntOMZ95r0FcYd4W
+gisCMu4lbe1f/br1Z/YA/RGteW+CElGgessFmI3TKG+2m5KgyN6m56bAeHKocb36
+=iQQT
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild
new file mode 100644
index 000000000000..8319a5e121d6
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.4-r100.ebuild
@@ -0,0 +1,57 @@
+# 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-r100.ebuild,v 1.1 2014/08/08 16:19:32 alonbl 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="11/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=""
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+	!dev-libs/libgcrypt:0/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
+)
+
+src_configure() {
+	local myeconfargs=(
+		--disable-padlock-support # bug 201917
+		--disable-dependency-tracking
+		--enable-noexecstack
+		--disable-O-flag-munging
+
+		# 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
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
index b95b8dbf7405..593eb6a6f753 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
@@ -1,27 +1,22 @@
 # 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.ebuild,v 1.1 2014/08/08 08:57:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild,v 1.2 2014/08/08 16:19:32 alonbl Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
 
-inherit autotools-multilib
+inherit autotools-utils
 
 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="11/11" # subslot = soname major version
+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=""
-
-RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
-	!dev-libs/libgcrypt:0/11
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
@@ -37,6 +32,7 @@ src_configure() {
 		--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)
@@ -47,11 +43,5 @@ src_configure() {
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-
-	rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die
+	autotools-utils_src_configure
 }