diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-16 21:51:50 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-16 21:51:50 +0000 |
| commit | adac706398c49342ecb18650f302c704785a0b68 (patch) | |
| tree | 6d26146be24ab7fc8f1ba6230f20e24e5838dbe6 /net-libs/polarssl | |
| parent | Add MULTILIB_USEDEPs on all packages and remove emul-linux-x86 dependencies. ... (diff) | |
| download | gentoo-2-adac706398c49342ecb18650f302c704785a0b68.tar.gz gentoo-2-adac706398c49342ecb18650f302c704785a0b68.tar.bz2 gentoo-2-adac706398c49342ecb18650f302c704785a0b68.zip | |
Remove unnecessary dep on emul-linux-x86/multilib openssl. Disable building programs for non-native ABIs since they will be clobbered anyway.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'net-libs/polarssl')
| -rw-r--r-- | net-libs/polarssl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/polarssl/polarssl-1.3.7.ebuild | 17 |
2 files changed, 10 insertions, 13 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/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 |