--- aria2-1.9.3.ebuild.orig	2012-07-26 22:05:40.000000000 -0600
+++ aria2-1.9.3.ebuild	2012-07-26 22:02:24.000000000 -0600
@@ -2,13 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.9.3.ebuild,v 1.3 2010/05/23 14:23:01 phajdan.jr Exp $
 
-EAPI="2"
+EAPI=4
+
+inherit 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 ~x86-macos"
 SLOT="0"
 IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
 
@@ -47,11 +49,11 @@
 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 "${EPREFIX}"/usr/$(get_libdir))"
 
 	local xmllib="--without-libexpat --without-libxml2"
 	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
+		xmllib="$(use_with expat libexpat "${EPREFIX}"/usr/$(get_libdir)) $(use_with !expat libxml2)"
 	fi
 
 	# Note:
@@ -67,9 +69,9 @@
 		--with-libz \
 		$(use_enable nls) \
 		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) \
 		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
+		$(use_with ares libcares "${EPREFIX}"/usr/$(get_libdir)) \
 		${xmllib} \
 		${myconf}
 }
@@ -77,7 +79,7 @@
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	rm -rf "${D}/usr/share/doc/aria2"
+	rm -rf "${ED}/usr/share/doc/aria2"
 	dodoc ChangeLog README AUTHORS NEWS
 	dohtml README.html doc/aria2c.1.html