[patch] multilibutize net-misc/curl-7.37.0

teh.patch (text/plain), 5.49 KB, created by Greg Turner on 2014-05-22 08:13:44 UTC

--- /usr/portage/net-misc/curl/curl-7.37.0.ebuild	2014-05-20 23:56:50.000000000 -0700
+++ curl-7.37.0-r1.ebuild	2014-05-22 01:07:17.980205103 -0700
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0.ebuild,v 1.1 2014/05/21 06:56:50 blueness Exp $
+# $Header: $
 
 EAPI="5"
 
-inherit autotools eutils prefix
+inherit autotools eutils prefix multilib-minimal
 
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="http://curl.haxx.se/"
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${
 
 LICENSE="MIT"
 SLOT="0"
-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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64"
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
 IUSE="${IUSE} curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE="${IUSE} elibc_Winnt"
@@ -20,29 +20,33 @@ IUSE="${IUSE} elibc_Winnt"
 #lead to lots of false negatives, bug #285669
 RESTRICT="test"
 
-RDEPEND="ldap? ( net-nds/openldap )
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	ssl? (
-		curl_ssl_axtls?  ( net-libs/axtls  app-misc/ca-certificates )
-		curl_ssl_cyassl? ( net-libs/cyassl app-misc/ca-certificates )
+		curl_ssl_axtls?  ( net-libs/axtls[${MULTILIB_USEDEP}]  app-misc/ca-certificates )
+		curl_ssl_cyassl? ( net-libs/cyassl[${MULTILIB_USEDEP}] app-misc/ca-certificates )
 		curl_ssl_gnutls? (
 			|| (
-				( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle )
-				( =net-libs/gnutls-2.12*[nettle,static-libs?] dev-libs/nettle )
-				( =net-libs/gnutls-2.12*[-nettle,static-libs?] dev-libs/libgcrypt[static-libs?] )
+				( >=net-libs/gnutls-3[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle[${MULTILIB_USEDEP}] )
+				( =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle[${MULTILIB_USEDEP}] )
+				( =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}] dev-libs/libgcrypt[static-libs?,${MULTILIB_USEDEP}] )
 			)
 			app-misc/ca-certificates
 		)
-		curl_ssl_openssl? ( dev-libs/openssl[static-libs?] )
-		curl_ssl_nss? ( dev-libs/nss app-misc/ca-certificates )
-		curl_ssl_polarssl? ( net-libs/polarssl:= app-misc/ca-certificates )
+		curl_ssl_openssl? ( dev-libs/openssl[static-libs?,${MULTILIB_USEDEP}] )
+		curl_ssl_nss? ( dev-libs/nss[${MULTILIB_USEDEP}] app-misc/ca-certificates )
+		curl_ssl_polarssl? ( net-libs/polarssl:=[${MULTILIB_USEDEP}] app-misc/ca-certificates )
 	)
-	idn? ( net-dns/libidn[static-libs?] )
-	adns? ( net-dns/c-ares )
-	kerberos? ( virtual/krb5 )
-	metalink? ( >=media-libs/libmetalink-0.1.0 )
-	rtmp? ( media-video/rtmpdump )
-	ssh? ( net-libs/libssh2[static-libs?] )
-	sys-libs/zlib"
+	idn? ( net-dns/libidn[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.0[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 
 # Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
 #	rtmp? (
@@ -83,6 +87,8 @@ REQUIRED_USE="
 DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
 	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
 
+MULTILIB_WRAPPED_HEADERS=(/usr/include/curl/curlbuild.h)
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
@@ -96,7 +102,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	einfo "\033[1;32m**************************************************\033[00m"
 
 	# We make use of the fact that later flags override earlier ones
@@ -119,7 +125,7 @@ src_configure() {
 		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
-			if has_version ">=net-libs/gnutls-3" || has_version "=net-libs/gnutls-2.12*[nettle]"; then
+			if has_version ">=net-libs/gnutls-3[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
 				einfo "gnutls compiled with dev-libs/nettle"
 				myconf+=( --with-gnutls --with-nettle )
 			else
@@ -150,6 +156,12 @@ src_configure() {
 	fi
 	einfo "\033[1;32m**************************************************\033[00m"
 
+	if ! multilib_is_native_abi ; then
+		# See docs/FAQ, 2.1.1 native linker doesn't find openssl
+		local LDFLAGS="-L${EPREFIX}/usr/$(get_libdir) ${LDFLAGS}"
+		export LDFLAGS
+	fi
+
 	# These configuration options are organized alphabetically
 	# within each category.  This should make it easier if we
 	# ever decide to make any of them contingent on USE flags:
@@ -159,7 +171,7 @@ src_configure() {
 	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
 	# 3) --with/without options third.
 	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--enable-dict \
 		--enable-file \
 		--enable-ftp \
@@ -200,8 +212,9 @@ src_configure() {
 		"${myconf[@]}"
 }
 
-src_install() {
-	default
+multilib_src_install_all() {
+	dodoc "${DOCS[@]}"
+
 	find "${ED}" -name '*.la' -delete
 	rm -rf "${ED}"/etc/