--- aria2-1.15.0.ebuild.orig	2012-08-09 08:39:46.000000000 -0600
+++ aria2-1.15.0.ebuild	2012-08-09 08:38:53.000000000 -0600
@@ -4,13 +4,13 @@
 
 EAPI="4"
 
-inherit bash-completion-r1
+inherit bash-completion-r1 multilib
 
 DESCRIPTION="A download utility with resuming and segmented downloading with HTTP/HTTPS/FTP/BitTorrent support."
 HOMEPAGE="http://aria2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 SLOT="0"
 IUSE="ares bittorrent doc expat gnutls metalink nettle nls scripts sqlite ssl test xmlrpc"
 REQUIRED_USE="gnutls? ( ssl )"
@@ -56,7 +56,8 @@
 src_configure() {
 	local myconf="--without-gnutls --without-openssl"
 	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
+		myconf="$(use_with gnutls) $(use_with !gnutls openssl) \
+		$(use_with !gnutls openssl-prefix "${EPREFIX}")"
 
 	# according to upstream:
 	# * only link against one of the crypto-libs if bittorrent-support is requested
@@ -72,7 +73,7 @@
 	fi
 
 	if use metalink || use xmlrpc ; then
-		myconf+=" $(use_with expat libexpat) $(use_with !expat libxml2)"
+		myconf+=" $(use_with expat libexpat) $(use_with expat libexpat-prefix "${EPREFIX}") $(use_with !expat libxml2)"
 	else
 		myconf+=" --without-libexpat --without-libxml2"
 	fi
@@ -93,15 +94,17 @@
 		$(use_enable nls) \
 		$(use_enable metalink) \
 		$(use_with sqlite sqlite3) \
+		$(use_with sqlite sqlite3-prefix "${EPREFIX}") \
 		$(use_enable bittorrent) \
 		$(use_with ares libcares) \
+		$(use_with ares libcares-prefix "${EPREFIX}") \
 		${myconf}
 }
 
 src_install() {
 	default
 
-	rm -rf "${D}/usr/share/doc/aria2"
+	rm -rf "${ED}/usr/share/doc/aria2"
 	dohtml README.html doc/aria2c.1.html
 
 	use bash-completion && dobashcomp doc/bash_completion/aria2c