Remove unnecessary dep on emul-linux-x86/multilib openssl. Disable building programs for non-native ABIs since they will be clobbered anyway.

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

3 files changed, 28 insertions, 21 deletions

diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog
index a0be4e3d06d8..318dbb27e0d4 100644
--- a/net-libs/polarssl/ChangeLog
+++ b/net-libs/polarssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/polarssl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.77 2014/06/12 17:05:03 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.78 2014/06/16 21:51:50 mgorny Exp $
+
+  16 Jun 2014; Michał Górny <mgorny@gentoo.org> polarssl-1.3.7.ebuild:
+  Remove unnecessary dep on emul-linux-x86/multilib openssl. Disable building
+  programs for non-native ABIs since they will be clobbered anyway.
 
   12 Jun 2014; Mikle Kolyada <zlogene@gentoo.org> polarssl-1.3.4.ebuild:
   sparc stable wrt bug #506918
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index bed22dbd0ce3..ced7144353d6 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -12,15 +12,25 @@ DIST polarssl-1.3.7-gpl.tgz 1610166 SHA256 6beef0281160bf07fefefd6b412dd1ce4c392
 EBUILD polarssl-1.3.4.ebuild 2467 SHA256 7608548df9bdc715a47c972b5f4dcdf4c8f80cba486941437b4e604f252f6795 SHA512 29eb9030829a5c5271e6106aaca78d919975f5e0ffe1b6cfe1eeb18d431281b8a95ec52e080870e6f8de314dbb40a73c449501d4488fc78377414bc0f47edfc9 WHIRLPOOL 6fab53c00f92df893ba2aab45a5e3e6f7875d1eeb199b38f7d158b74871625429252f8edf47b8733e5b26fb2ef01ae8fc658bd8166dd152adc91a3484d2d9628
 EBUILD polarssl-1.3.5.ebuild 2199 SHA256 5abd4959d641df70ba3625c0e8dd4f6922e5c1283938b27be2dffdc6ff9de368 SHA512 d92e897ac468b77ac7e18e2d89f067a68b01ada60154c8cc51728c2d92db4462459d01db608c26cb2c83eb42348ca22cb28bab302b6fb239ef8e2e196d8dbe7b WHIRLPOOL ee6e04efc3a439136397dd4255f02f1fd1770130cc9e09a15be3d042420bd1349f4189c002c73e0230246a0c9811cb6def2ad267b24d68e4c15444609f25c6bd
 EBUILD polarssl-1.3.6.ebuild 2183 SHA256 675e5d459e49e083202cc94d5faeed7a003aa347a8c9a54bdcab4f2688bbea0e SHA512 2d7bbb5f9539a6431f8b4c00210322b4d3f25c5ce1223f026f5efdf4bd66d645baaea1d124a20eb8161f67c9e28a6d1091a131c3b96c0307c8fa82e96a2461e3 WHIRLPOOL 456fd7291f97d9ef0e1892096bd77f8f581be1887342464aabef5205212130471ff1fff585cbffa8c1088b5692e92005374170e28dcc7fa67a1f4bd8ccf8e7e3
-EBUILD polarssl-1.3.7.ebuild 2369 SHA256 3ff38745dff4f8c23e22f0f6e31ba1a3f566974a8ffd0fcd35635aaaf4fa5cb4 SHA512 bcc00ad0078eb5a59ee8f4ea17461553dc90a7653fdf1b6883021e6ef2093470409a1ac20bc899a560809e414d7e1ddf384d262f9480886c9facb6fa0bb779cd WHIRLPOOL dfb9709ce495d5d9bdd33496487912d444316c42fd328cba1919c6c5960f3926c37134eb87c0d50060d4daa83417aba743e31aa0d22e69139869b5b928f300b1
-MISC ChangeLog 9836 SHA256 da32453f7ae960cd64d943d06e024272c6bb6bc0e3fd19ccd0aa04ce1cf1d0c9 SHA512 8ffb573bca8aeb6053db2e4965447b9c01fd5926009eb3f224201ef0161c35688409f11183afb3253199b889b61e63bd613fa2f61d995435c6a75790543092e0 WHIRLPOOL 2f6321a0ff789a9c32c330f5b4e010733502e8ceb610d33197e93c6c3eaf7778a94ae7d217823aaad16ac42afc25393f54d05195a0d14001014af3d68ebb5b98
+EBUILD polarssl-1.3.7.ebuild 2295 SHA256 49e97089d9b719044ea0673bd2a2c9eca42ad6455253df64d7fd59ce4964ee89 SHA512 09af66d775bedb56a07177569216b7d84335f398cc0c13e71c76ead779909395ffcac52f8e6578c9db5f71250a1e5ddc904c31990630bb86da6d283c3ea4ceb7 WHIRLPOOL 84096a214599493d10b8be532d1e5168ae90da33ec479d6a7c0706dafb76efc8dbfb2989ca690d66d5d0cd417d7ec28d41e38d3fa3843bde7a950c39fbaebfb9
+MISC ChangeLog 10055 SHA256 b65c7e17ca8ad9d46be877c5a16cb4151cbcccffeedbcc2db68238323748361e SHA512 9da938d35d308f384717709b5c0396771b02deaba39c269782546d23b63c65083c9bc28aa4102bfd6d1ae78a307f3b9ee831d34097bf1cf43f156f8fc8a0544f WHIRLPOOL 0d20c6c9a096d00822f27f97af8d69cee760d8f3edc1697e704eada35f895d9bc2239fab6a73d1b6948466fe420c8f21a6ed9e22ec719de5a2f00eab469ed0e9
 MISC metadata.xml 685 SHA256 0105b478e4b38b5acabf7452fe926df41ef48967f04b26cf9c7aacab38ae1f9c SHA512 4f8bfd590668543b57ad54358e37ce1fda2186f38fea31caa85bdc67e4911f29ba473292cb91ddca2d0342c52caf1b68861483168b31c0617fcc4ecc090b107a WHIRLPOOL e687881ad644fb52492cc4ec6649be93cf61bee444b85cb97a18faeedc12cf43a5d5de209b94aebbc6476e6eb2b7d8dabf462f0ac1f2b176bcff01d756581225
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iJwEAQEIAAYFAlOZ3wQACgkQG9wOWsQutdauSgP/cbqYQ1KwEaNKhBFcb/h0DI64
-6ACZbfHlAzn9TyQoupMaOSXQzJk9KaEkw5IGSoJ6iJtkrOLvL9yv9EqD447lTy2o
-Xi5N5wSrSFLbkmhD6se7Im3r3BNCYUVcEHQqz35PIbD5kq4Oar3qB9FjLMxwASNR
-NB5TnHwgiBnnLN0semE=
-=mXs3
+iQJ8BAEBCABmBQJTn2b3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOD+cQAJxce7iyOdYRFw1FDsVCr4Y8
+Ukd1lT4MYnzqsCqBDG/Yx7G19chVMqepz5i5mZEsGh7xjO4T3kmHybGQYEWdzf1y
+OFlyhqk8km9+FqOfWOY42VOrebIwp53M/sH/cx1tq1jR3B63ONsH3BoPB9NJBA8y
+SbO7WRuVtjNX+392uEhiw9tYNEnQO/nD2ISLQilDtkXLVRUNxKGdKCGZUxzdbD7h
+elV7MggkXgOeFquY0DyfzX9K5WJS/fafY4ipB7JSRqGh0tczE/0VYn1P99dbYkIf
+UCJwMzdicPv6nHWwM0DdKShtIZgGJ/SjM6RG/tH009rjAXsPALqHAT2nVy4xb2Dk
+s13P1NeAqPyf/jfwZZZzx4fZVHdgN3y4X2DxbmE8xJyiN5u5PO11JJzjhMh8D1sf
+TeTJ5okT8gGhPDo6G3yfHN+ju1yv7OQ0EX6MbdTzHwbjiVmj9DOKu4d9NXMmtfnI
+LiTXB1Hq4nfytxBW3bDsNvik5kgC0NANlUq+4P/oKmwn/o/iuhy42+OUE/QkqkbM
+u4gQYqgBoK7N2EHZRxDpSiYSrnWadqtjpq4eoBunt9FAdy/Bjyq8d/UkUpLSIbVS
+7PMlnt5BJM+k9b8IdOwO09buUY9lA2H+UGNBT8JXzVL62srvlkDK5M19P3puDhZW
+zz8dN1N8wW0clyryAMne
+=zadL
 -----END PGP SIGNATURE-----
diff --git a/net-libs/polarssl/polarssl-1.3.7.ebuild b/net-libs/polarssl/polarssl-1.3.7.ebuild
index da59abcec4cc..526cc7972e0e 100644
--- a/net-libs/polarssl/polarssl-1.3.7.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-1.3.7.ebuild,v 1.1 2014/05/12 14:27:36 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-1.3.7.ebuild,v 1.2 2014/06/16 21:51:50 mgorny Exp $
 
 EAPI=5
 
@@ -16,15 +16,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86
 IUSE="doc havege programs sse2 static-libs test zlib"
 
 RDEPEND="
-	programs? (
-		dev-libs/openssl:0
-		amd64? ( abi_x86_32? (
-			|| (
-				dev-libs/openssl:0[abi_x86_32]
-				app-emulation/emul-linux-x86-baselibs
-			)
-		) )
-	)
+	programs? ( dev-libs/openssl:0 )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@@ -46,7 +38,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable programs PROGRAMS)
+		$(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
+			|| echo -DENABLE_PROGRAMS=OFF)
 		$(cmake-utils_use_enable zlib ZLIB_SUPPORT)
 		$(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
 		$(cmake-utils_use_enable test TESTING)
@@ -82,7 +75,7 @@ multilib_src_install_all() {
 		local p e
 		for p in "${ED%/}"/usr/bin/* ; do
 			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/polarssl_`basename "${p}"` || die
+				mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die
 			fi
 		done
 		for e in aes hash pkey ssl test ; do