mgorny 14/06/16 21:51:50 Modified: polarssl-1.3.7.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.2 net-libs/polarssl/polarssl-1.3.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/polarssl/polarssl-1.3.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/polarssl/polarssl-1.3.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/polarssl/polarssl-1.3.7.ebuild?r1=1.1&r2=1.2 Index: polarssl-1.3.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-1.3.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- polarssl-1.3.7.ebuild 12 May 2014 14:27:36 -0000 1.1 +++ polarssl-1.3.7.ebuild 16 Jun 2014 21:51:50 -0000 1.2 @@ -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 @@ 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 @@ 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 @@ 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 1.78 net-libs/polarssl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/polarssl/ChangeLog?rev=1.78&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/polarssl/ChangeLog?rev=1.78&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/polarssl/ChangeLog?r1=1.77&r2=1.78 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- ChangeLog 12 Jun 2014 17:05:03 -0000 1.77 +++ ChangeLog 16 Jun 2014 21:51:50 -0000 1.78 @@ -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 <mgo...@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 <zlog...@gentoo.org> polarssl-1.3.4.ebuild: sparc stable wrt bug #506918
