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

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

15 files changed, 39 insertions, 1037 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/Manifest b/net-misc/aria2/Manifest
index cf657f403480..6ca38c961de1 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,42 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST aria2-1.10.0.tar.bz2 1481281 RMD160 51cffce9932fee64d76966fb2748c51057170d27 SHA1 ff43cbfc51ca45d11d9e3265e9d5c319d10971f8 SHA256 dbf8e8697547b5e3ea12c9bbf3f292d38807a1c60f9121d2c4f6df9ad153038b
-DIST aria2-1.10.1.tar.bz2 1492474 RMD160 7dc234c7e391183793487084e5402f70f715f261 SHA1 7e7d2fe3e998613d224aa1b089482049877a2638 SHA256 b6b4307e12bc60216b223026d8f95d9daa6781acbc417a08750669d97e54f833
-DIST aria2-1.10.2.tar.bz2 1493065 RMD160 ed6c0ac63fbe426a5a4e431f7b9e01423bb560b0 SHA1 aa3f6ae9a39bf66cd6aca40e48f2cea286342de8 SHA256 f78670377a250c22cca9e05b79040e8b81b2bef206f152969b7e6d34c754126e
-DIST aria2-1.10.5.tar.bz2 1499411 RMD160 26fbb7883cae562776951b67f682a094917bcbcc SHA1 1a0429c38e3ae23413d08756c285322ccb57b358 SHA256 ff568d8c1847a6d174fbf53520165415c8dd6dfc5a5a213240c50530bedf668a
-DIST aria2-1.10.6.tar.bz2 1501565 RMD160 2d2667b6ac55c418f0c6055b7825ce9bd502678c SHA1 f08503332e8913f47ed33d9abe8664e1f2b098cd SHA256 9e251e4dd98409b3b462e66fed050359bf10e9dd77be35f813fcf497d3baeec6
-DIST aria2-1.10.7.tar.bz2 1433306 RMD160 4d52a95e274dfcd54d7504d8984086b0d4f8ab98 SHA1 0380b605a9af63fa0f591db35a5e43f8c975508f SHA256 55e5634d2ff45cf18f98cba2b96aa0fbc75ac7d09a5718211a1c8f77b22ef2bf
-DIST aria2-1.10.8.tar.bz2 1426257 RMD160 86b9c942a78a534a0ad9190b64ebe80b447a6a25 SHA1 0b8ad224d8a55ce920c4791a3a622156fb83bde0 SHA256 acb9b4a5e3f4166afa3446fe91932b3e97d73e0a513cfc0925f719d678cf6cb1
-DIST aria2-1.10.9.tar.bz2 1434965 RMD160 c8e3e1e35e095fb1a22c30ab7c10ac830facadef SHA1 49f647fb31622619d7c0b7786615986fb0fafb5b SHA256 51319be3006545c442fbbedb476fa7ba2fd562e0468d9c573e7f5261ea610af5
-DIST aria2-1.11.0.tar.bz2 1473997 RMD160 2dcb5cf087b33fb52864cec28ded00ee7b7b63e0 SHA1 f77abc5d2436d263cb1a0dca1b5b98c3a5c23a90 SHA256 4da95ffbf4411d258ecd82cb8bed75132e710124a87ced9e523c3b4a51026c6b
-DIST aria2-1.11.2.tar.bz2 1483973 RMD160 89558982d348aa431a8412a039550da77a28c63d SHA1 db4761fa311e6d1f9526d1ee25461c2db84750ff SHA256 4acf5f07dfe45a63f7c9e4c05daf5c900cc71a54b7e97009531735040712c82b
-DIST aria2-1.12.0.tar.bz2 1577163 RMD160 74dadcc764b55d57ae5dd8eca43b8a76f455b9ce SHA1 5bc6f07f84f6ad1d0e222d2b5c78cd3118e1a569 SHA256 6ce24076dcd4fe7247d42e7e00704cf1193c48ca7027c396b09a22d3e60c9f1e
 DIST aria2-1.12.1.tar.bz2 1590472 RMD160 dd7d97bcb5914cec9119d5972d9f13871d38b064 SHA1 ba38d558c9fe2d7ac5b09fb2a629d9a67a947008 SHA256 a8f01f211df3ecacb02cce2914f446b72e42d130691edbbbdbe99be3936ca366
+DIST aria2-1.14.1.tar.bz2 1636900 RMD160 e4daa218df0776a144421a1f04eb71c410ff7917 SHA1 143684b662886466b801f456d10997d3e36a0f03 SHA256 a436ffaa9fd678a498d2599f00b3885cdc4eda13953dcf715c9ac4ff95b61ab1
 DIST aria2-1.9.3.tar.bz2 1441999 RMD160 ad5f32c244acd2a5bfc19aafd78a7da886021e29 SHA1 21f429e6d3b9a3904a45dc032b9aa9146ffccc40 SHA256 364f9e5d8dcf3f12bd2683ea0d17274e0088b6dd7f869db35feba4e30ade7613
-DIST aria2-1.9.4.tar.bz2 1452539 RMD160 d5e03bf0d5aac150ba88ddf5c8da49088b19653c SHA1 e34d7bd9808b53d5790eab91028786731dd78332 SHA256 5de9cb4b166c8df4dc54f08634183f9da55a642dfeb91d40e1746e057b19ed62
-EBUILD aria2-1.10.0.ebuild 2638 RMD160 6559d04c790ba1442ddb243fad052248d9432eec SHA1 5190e5adbea7c85af70ae1e5053f8d7cae1d2f3f SHA256 9ccb0a290e907808245c94e52cbe9773e92cee8a5fe1853c94a6cf493e2f140b
-EBUILD aria2-1.10.1.ebuild 2638 RMD160 3d362aafdbc0adb07a905d683abc4030c3b6624a SHA1 4699915f484991d719bc5c1970e7e7c6a94061bd SHA256 51c031381aa32a52558631654b6330b191b7212826cf0737156621f0446cd732
-EBUILD aria2-1.10.2.ebuild 2655 RMD160 7d2dc1fceafa555f7723db3a5dff3a45c1b84e62 SHA1 21c0ba3116e7f2f68abb1d9d4b278d1a4643a661 SHA256 f534adf56e14f5e2e07d086290575beb847f84122d835964e2a45ba9a4c97fdc
-EBUILD aria2-1.10.5.ebuild 2652 RMD160 df95ce9049f0eee1f36cd8dda6a44cb601e4af88 SHA1 0c1df71284c3318c295b345c1459496e6986fffe SHA256 31783921de0d5c40dbf080317795626c860c98edc90676639e21240ba70cc9fc
-EBUILD aria2-1.10.6.ebuild 2652 RMD160 d8560329ea49ed023551928052b471668acfd62c SHA1 2a8562fc7276b1b73f8c8de503103e22d131c6c0 SHA256 ae88fa1d6da4436901a2d64c81acdaa8d6704e67bd2f0f212bdc69f372c9cf67
-EBUILD aria2-1.10.7.ebuild 2765 RMD160 0f4b1a9c81c2edfdde6e09d5dba16e554175ccae SHA1 9cbfc353a3ebeb730676694a2b94e7dfdbb6faad SHA256 d975612cbb19a2694e50b9049a415896642134a6f927e6e1cea5449d0f1ff318
-EBUILD aria2-1.10.8.ebuild 2765 RMD160 1efe98423c035149987f221c073fbe1a8e3b279f SHA1 c7a2998b9dd257b49e66891175205b62290ff68d SHA256 52da493f0146938e64f9748c4cdadd763e21b942b2d7537412c477e30fb4d743
-EBUILD aria2-1.10.9.ebuild 2765 RMD160 16e5df7897a94aa414fbae7aa20b039c0b1ee24f SHA1 f777776556d226659f97ceed1051c258506c6940 SHA256 10ef3aab648373814fa28b06a4ad3d021f58263ccb6732fcd3e6ed9ff00fa8fb
-EBUILD aria2-1.11.0.ebuild 2765 RMD160 0713179189187779286ccc8c212928e7bce814f7 SHA1 c9dae10339b090092bcec9a71b1e66b7ae71249e SHA256 f964b85960851068bf21f07004a4e901d1b7aeefa4d2c31ed0d81650acd6d60b
-EBUILD aria2-1.11.2.ebuild 2765 RMD160 02298d366393ee40bfc69821ef11972ac5a10f26 SHA1 f27077e181a5999b355424e948c6ada4ab9b8fae SHA256 de0f24beeb75ed0e8ad2e9330f8af0a3667ac6517566a06558618aa6ea2d1240
-EBUILD aria2-1.12.0.ebuild 2765 RMD160 a6484509f847dca943061b0e1c23f149e21d34f0 SHA1 492e631ad49caca06a5a21cb74fc370fe8a17a4c SHA256 dc1188f3fb45e24fc5c830c2758a5ef1c5c19a62d960683ae604b3d52a256dd6
 EBUILD aria2-1.12.1.ebuild 2765 RMD160 b5cd66bf3106be3482e19e7e95c51440e678e4e6 SHA1 873b871d8945ca86bf1fe22f601672b220e1f93b SHA256 1adf68cd6313e1e316ef1d44ab8c94716f48804505d7ba10fb11b478286182e3
+EBUILD aria2-1.14.1.ebuild 3036 RMD160 26989a046f7b0b16970cec16b6e2bb51e0a1c2d9 SHA1 eccb3a76753a3f822fa1fde3ac6f6d905f5c2126 SHA256 6084abf073df08a501676321352aa46be0a8b2a04b8d979ac553140a17541482
 EBUILD aria2-1.9.3.ebuild 2617 RMD160 4d92a58ceed8ed3d36e0cb532ee5209c632319cf SHA1 f5f7a1dd3bb0cd6917c87c6a2ca44b1c68156d24 SHA256 c5fef23a1a27eadb20f1660a290c2277e1c6e65a83175f3ef1ded58c7935e245
-EBUILD aria2-1.9.4.ebuild 2617 RMD160 ee987b1776c0694af84a106bf4d0b54acffd3eae SHA1 e4e6f4b1c03f2ccd35cc053ad192d21bd3008b36 SHA256 97dbea4d479f9a409a451bdbc0cf2d200d76686fcb62435703f21c99062bcaa5
-MISC ChangeLog 14185 RMD160 cf4bbff08ed883f271eb68069f28383bff59dcfb SHA1 5eee219405a19d98ddcf2cf253224a6e80e47e2e SHA256 afd9c84b568d7d7d29582ae2778a637e0f8e324cfa44265c33a03f8047871c7b
-MISC metadata.xml 668 RMD160 e02ee49a8261edad868fff6dfc30bccb6563b525 SHA1 2ac804a24522f250f106da2a74f35e71848a14b2 SHA256 3a533bd9954c4d1509c38c24640170135502d4ea0e451f4bac7d9c401c21c120
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rRIACgkQfXuS5UK5QB0n6AP/UVYLyJ0dxxijs2xAuBxLpfW6
-pgNersGGJ35ZvzYEWyXnMFKPAkJ+hMa9ei/m8F6hoizb3mxAy9vIDou6z17amFN3
-bEzg92byxGsLcRPeldIhYTXX40I6PUfr5jTSBjsCWkCVr4GF/Un8vmO04sI5Yu3T
-ilsnK9gyM/men+Z5OVo=
-=U7wc
------END PGP SIGNATURE-----
+MISC ChangeLog 14675 RMD160 5f82b0a9289bb6dda99d259724d0486c46e79ae9 SHA1 9238bbabfb95904b54a7d622b438c489d6aa05e7 SHA256 27d48ff6f7ae218161b1ed7285555adf05cae66f53d63a3fd535ef1741307635
+MISC metadata.xml 979 RMD160 c6e2d305178428238e62794e92e7c43dafb2a9ba SHA1 e460e5ac7756b286068ec4a30ff0bacd3dc1dc0e SHA256 1c5716c3ddae139c9059bf293d800030942fda629d5c36baba7f542e431e5ba0
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>