Version bump (bug #388971) and conditionally rebuild doc (bug #366485). Drop old versions.

(Portage version: 2.1.10.36/cvs/Linux x86_64)

14 files changed, 35 insertions, 999 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index c8ea9f7dbcba..b4e5bfef441a 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/aria2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.75 2011/08/03 14:46:00 sping Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.76 2012/01/15 13:49:06 dev-zero Exp $
+
+*aria2-1.14.1 (15 Jan 2012)
+
+  15 Jan 2012; Tiziano Müller <dev-zero@gentoo.org> -aria2-1.9.4.ebuild,
+  -aria2-1.10.0.ebuild, -aria2-1.10.1.ebuild, -aria2-1.10.2.ebuild,
+  -aria2-1.10.5.ebuild, -aria2-1.10.6.ebuild, -aria2-1.10.7.ebuild,
+  -aria2-1.10.8.ebuild, -aria2-1.10.9.ebuild, -aria2-1.11.0.ebuild,
+  -aria2-1.11.2.ebuild, -aria2-1.12.0.ebuild, +aria2-1.14.1.ebuild,
+  metadata.xml:
+  Version bump (bug #388971) and conditionally rebuild doc (bug #366485). Drop
+  old versions.
 
 *aria2-1.12.1 (03 Aug 2011)
 
diff --git a/net-misc/aria2/aria2-1.10.0.ebuild b/net-misc/aria2/aria2-1.10.0.ebuild
deleted file mode 100644
index bcd6c36b9819..000000000000
--- a/net-misc/aria2/aria2-1.10.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.0.ebuild,v 1.1 2010/07/19 09:21:48 dev-zero Exp $
-
-EAPI="2"
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.1.ebuild b/net-misc/aria2/aria2-1.10.1.ebuild
deleted file mode 100644
index cfe7e1d90c57..000000000000
--- a/net-misc/aria2/aria2-1.10.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.1.ebuild,v 1.1 2010/08/30 05:24:54 dev-zero Exp $
-
-EAPI="2"
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.2.ebuild b/net-misc/aria2/aria2-1.10.2.ebuild
deleted file mode 100644
index 693415304c21..000000000000
--- a/net-misc/aria2/aria2-1.10.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.2.ebuild,v 1.1 2010/09/01 16:27:14 dev-zero Exp $
-
-EAPI="2"
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.5.ebuild b/net-misc/aria2/aria2-1.10.5.ebuild
deleted file mode 100644
index 37682adc19e0..000000000000
--- a/net-misc/aria2/aria2-1.10.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.5.ebuild,v 1.1 2010/10/29 04:55:36 sping Exp $
-
-EAPI="2"
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.6.ebuild b/net-misc/aria2/aria2-1.10.6.ebuild
deleted file mode 100644
index 5422b3156f2e..000000000000
--- a/net-misc/aria2/aria2-1.10.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.6.ebuild,v 1.1 2010/11/05 10:59:56 sping Exp $
-
-EAPI="2"
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.7.ebuild b/net-misc/aria2/aria2-1.10.7.ebuild
deleted file mode 100644
index 1418e87f7138..000000000000
--- a/net-misc/aria2/aria2-1.10.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.7.ebuild,v 1.1 2010/12/06 10:53:36 sping Exp $
-
-EAPI="2"
-
-inherit bash-completion
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use bash-completion && dobashcompletion doc/bash_completion/aria2c
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.8.ebuild b/net-misc/aria2/aria2-1.10.8.ebuild
deleted file mode 100644
index 095a556d1cdc..000000000000
--- a/net-misc/aria2/aria2-1.10.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.8.ebuild,v 1.1 2010/12/19 13:54:59 sping Exp $
-
-EAPI="2"
-
-inherit bash-completion
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use bash-completion && dobashcompletion doc/bash_completion/aria2c
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.10.9.ebuild b/net-misc/aria2/aria2-1.10.9.ebuild
deleted file mode 100644
index 56fd874ef29e..000000000000
--- a/net-misc/aria2/aria2-1.10.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.10.9.ebuild,v 1.1 2011/01/10 14:18:03 sping Exp $
-
-EAPI="2"
-
-inherit bash-completion
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use bash-completion && dobashcompletion doc/bash_completion/aria2c
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.11.0.ebuild b/net-misc/aria2/aria2-1.11.0.ebuild
deleted file mode 100644
index ee2b942d5334..000000000000
--- a/net-misc/aria2/aria2-1.11.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.11.0.ebuild,v 1.1 2011/03/21 22:13:50 sping Exp $
-
-EAPI="2"
-
-inherit bash-completion
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use bash-completion && dobashcompletion doc/bash_completion/aria2c
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.12.0.ebuild b/net-misc/aria2/aria2-1.12.0.ebuild
deleted file mode 100644
index 37f80bb31e93..000000000000
--- a/net-misc/aria2/aria2-1.12.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.12.0.ebuild,v 1.1 2011/06/30 19:27:42 sping Exp $
-
-EAPI="2"
-
-inherit bash-completion
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-2.2.0 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use bash-completion && dobashcompletion doc/bash_completion/aria2c
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/aria2-1.11.2.ebuild b/net-misc/aria2/aria2-1.14.1.ebuild
index 2ee2efb0b222..3724e664fc59 100644
--- a/net-misc/aria2/aria2-1.11.2.ebuild
+++ b/net-misc/aria2/aria2-1.14.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.11.2.ebuild,v 1.1 2011/05/22 17:13:59 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.14.1.ebuild,v 1.1 2012/01/15 13:49:06 dev-zero Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit bash-completion
 
@@ -12,8 +12,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
+IUSE="ares bittorrent doc expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
+#IUSE="nettle"
 CDEPEND="sys-libs/zlib
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.9 )
@@ -29,17 +29,21 @@ CDEPEND="sys-libs/zlib
 	xmlrpc? (
 		!expat? ( >=dev-libs/libxml2-2.6.26 )
 		expat? ( dev-libs/expat ) )"
+#CDEPEND="bittorrent? (
+#		nettle? ( >=dev-libs/nettle-2.4 >=dev-libs/gmp-5 )
+#		!nettle? (
+#			gnutls? ( >=net-libs/gnutls-2.2.0 >=dev-libs/libgcrypt-1.2.2 )
+#			!gnutls? ( dev-libs/openssl ) ) )"
+
 DEPEND="${CDEPEND}
-	app-text/asciidoc
 	dev-util/pkgconfig
+	doc? ( app-text/asciidoc )
 	nls? ( sys-devel/gettext )
 	test? ( >=dev-util/cppunit-1.12.0 )"
 RDEPEND="${CDEPEND}
 	scripts? ( dev-lang/ruby )
 	nls? ( virtual/libiconv virtual/libintl )"
 
-RESTRICT="test"
-
 pkg_setup() {
 	if use scripts && use !xmlrpc && use !metalink; then
 		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
@@ -60,6 +64,8 @@ src_configure() {
 		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
 	fi
 
+	use doc || export ac_cv_path_ASCIIDOC=
+
 	# Note:
 	# - depends on libgcrypt only when using gnutls
 	# - if --without-libexpat or --without-libxml2 are not given, it links against
@@ -76,15 +82,17 @@ src_configure() {
 		$(use_with sqlite sqlite3) \
 		$(use_enable bittorrent) \
 		$(use_with ares libcares) \
+		--without-libnettle --without-libgmp \
 		${xmllib} \
 		${myconf}
+#		$(use_with nettle libnettle) \
+#		$(use_with nettle libgmp) \
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
 	dohtml README.html doc/aria2c.1.html
 
 	use bash-completion && dobashcompletion doc/bash_completion/aria2c
diff --git a/net-misc/aria2/aria2-1.9.4.ebuild b/net-misc/aria2/aria2-1.9.4.ebuild
deleted file mode 100644
index 20ad51c466f4..000000000000
--- a/net-misc/aria2/aria2-1.9.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.9.4.ebuild,v 1.1 2010/06/05 05:40:52 dev-zero Exp $
-
-EAPI="2"
-
-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"
-SLOT="0"
-IUSE="ares bittorrent expat gnutls metalink nls scripts sqlite ssl test xmlrpc"
-
-CDEPEND="sys-libs/zlib
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.5.0 )
-	bittorrent? (
-		gnutls? ( >=net-libs/gnutls-1.2.9 >=dev-libs/libgcrypt-1.2.2 )
-		!gnutls? ( dev-libs/openssl ) )
-	metalink? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )
-	sqlite? ( dev-db/sqlite:3 )
-	xmlrpc? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat ) )"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	scripts? ( dev-lang/ruby )
-	nls? ( virtual/libiconv virtual/libintl )"
-
-pkg_setup() {
-	if use scripts && use !xmlrpc && use !metalink; then
-		ewarn "Please also enable the 'xmlrpc' USE flag to actually use the additional scripts"
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf="--without-gnutls --without-openssl"
-	use ssl && \
-		myconf="$(use_with gnutls) $(use_with !gnutls openssl)"
-
-	local xmllib="--without-libexpat --without-libxml2"
-	if use metalink || use xmlrpc ; then
-		xmllib="$(use_with expat libexpat) $(use_with !expat libxml2)"
-	fi
-
-	# Note:
-	# - depends on libgcrypt only when using gnutls
-	# - if --without-libexpat or --without-libxml2 are not given, it links against
-	#   one of them to provide xmlrpc-functionality
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf \
-		--enable-epoll \
-		--enable-threads=posix \
-		--with-libz \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with sqlite sqlite3) \
-		$(use_enable bittorrent) \
-		$(use_with ares libcares) \
-		${xmllib} \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}/usr/share/doc/aria2"
-	dodoc ChangeLog README AUTHORS NEWS
-	dohtml README.html doc/aria2c.1.html
-
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 6e58789d425b..1e3467f120b6 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -7,7 +7,10 @@
   </maintainer>
   <use>
     <flag name="ares">Enables support for asynchronous DNS using the c-ares library</flag>
-    <flag name="bittorrent">Enables support for the bittorrent protocol</flag>
+	<flag name="bittorrent">Enables support for the bittorrent protocol</flag>
+	<!--<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> and <pkg>dev-libs/gmp</pkg>
+		for bittorrent crypto instead of <pkg>net-libs/gnutls</pkg>+<pkg>dev-libs/libgcrypt</pkg> or
+		<pkg>dev-libs/openssl</pkg>. For HTTPS either <pkg>net-libs/gnutls</pkg> or <pkg>dev-libs/openssl</pkg> is still required.</flag>-->
     <flag name="metalink">Enables support for metalink</flag>
     <flag name="scripts">Install additional scripts which use aria2's xmlrpc functionality</flag>
   </use>