[patch] Patch to add multilib support

file_511078.txt (text/plain), 2.75 KB, created by Jonathan Callen (RETIRED) on 2014-05-23 06:15:36 UTC

--- a/dev-libs/openssl/openssl-0.9.8y.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8y-r1.ebuild
@@ -4,9 +4,9 @@
 
 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
 
-EAPI="2"
+EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
 
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
 HOMEPAGE="http://www.openssl.org/"
@@ -14,11 +14,11 @@ SRC_URI="mirror://openssl/source/${P}.ta
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos sse2 test zlib"
 
-RDEPEND="gmp? ( dev-libs/gmp )
-	zlib? ( sys-libs/zlib )
+RDEPEND="gmp? ( dev-libs/gmp[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 	kerberos? ( app-crypt/mit-krb5 )
 	!=dev-libs/openssl-0.9.8*:0"
 DEPEND="${RDEPEND}
@@ -62,9 +62,11 @@ src_prepare() {
 	sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
 	sed -i '/^"debug-steve/d' Configure # 0.9.8k shipped broken
 	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	unset APPS #197996
 	unset SCRIPTS #312551
 
@@ -79,6 +81,7 @@ src_configure() {
 
 	use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
 	echoit() { echo "$@" ; "$@" ; }
+	multilib_native_use_ssl() { multilib_native_usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
 
 	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
 
@@ -86,6 +89,7 @@ src_configure() {
 	einfo "Use configuration ${sslout:-(openssl knows best)}"
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
+
 	echoit \
 	./${config} \
 		${sslout} \
@@ -97,7 +101,7 @@ src_configure() {
 		$(use_ssl !bindist rc5) \
 		enable-tlsext \
 		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(multilib_native_use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
 		$(use_ssl zlib) \
 		--prefix=/usr \
 		--openssldir=/etc/ssl \
@@ -120,16 +124,16 @@ src_configure() {
 		Makefile || die
 }
 
-src_compile() {
+multilib_src_compile() {
 	# depend is needed to use $confopts
-	emake -j1 depend || die "depend failed"
-	emake -j1 build_libs || die "make build_libs failed"
+	emake -j1 depend
+	emake -j1 build_libs
 }
 
-src_test() {
-	emake -j1 test || die "make test failed"
+multilib_src_test() {
+	emake -j1 test
 }
 
-src_install() {
-	dolib.so lib{crypto,ssl}.so.0.9.8 || die
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.0.9.8
 }