Version bump. Bugfixes, adler32 checksum support via --checksum and Metalink files, SSLv3 disabled by default and --min-tls-version to select minimal SSL/TLS version. --bt-force-encryption to require full BitTorrent encryption.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 173 insertions, 17 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index 991c9a682851..d1ad752ba02d 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/aria2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.100 2014/08/29 07:14:55 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.101 2015/02/21 09:01:08 mgorny Exp $
+
+*aria2-1.18.9 (21 Feb 2015)
+
+  21 Feb 2015; Michał Górny <mgorny@gentoo.org> +aria2-1.18.9.ebuild:
+  Version bump. Bugfixes, adler32 checksum support via --checksum and Metalink
+  files, SSLv3 disabled by default and --min-tls-version to select minimal
+  SSL/TLS version. --bt-force-encryption to require full BitTorrent encryption.
 
   29 Aug 2014; Michał Górny <mgorny@gentoo.org> aria2-1.18.7.ebuild:
   Version bump for a number of bugfixes.
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index d739b49e8cb2..05b0a95c1787 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -8,30 +8,32 @@ DIST aria2-1.16.5.tar.bz2 2152749 SHA256 06aee1f296b984a8aed54ac7d7bc52eb2b43152
 DIST aria2-1.18.0.tar.bz2 2080003 SHA256 ad811508d5153d138de2c43228c36fa046574bf2e94e108af558db7722f6513a SHA512 bb52ef1c6963db6649fbcde2110d6ba659a7f8f5851c7f5d9bdbebbdff7e68cc5e435a8a1ae32c5e78bb812d6e84caab9d14ee8cc435c24902c6499a3df1aca8 WHIRLPOOL 0e6f022719c05991033ef4651c8d58cafcd14a6a81d7e476aa168e3d52293abe148958ed00b92552d6e9a4fb7ffd10634658e6c2820c2c8654b493ea14a4e82a
 DIST aria2-1.18.5.tar.bz2 2102797 SHA256 25e21f94bb278a8624e0e4e131e740d105f7d5570290053beb8ae6c33fb9ce3f SHA512 bb08305026db77c9e58d7b059d7b68a0bfbffcbdcf2898117ed37f7e23b95675c9744de50b789658cc9cad81f40ef422f0936499ccdbeb37eaa2f7281c8adff9 WHIRLPOOL 483a75d4efb28839b85de06dc18b5ed05f3e49b91f24dde189add4ce9a5912d7587b3ba2309b2a394addf7676ed121f9707da240e5c33e8a4757341f27c6efde
 DIST aria2-1.18.7.tar.bz2 2141933 SHA256 358bda2a7b1d5aca1acc4b528f32bd01f5db819c067e7a4bbfab08d23500368f SHA512 d8b70d0235eb96289ebeb4adc4c5a917785dcd15ebae884b367b3645717bc969ded9c0f520be773fc80ed5dd112fd5937bee6cb0e8c238dc39debbf8862b25a3 WHIRLPOOL 714c2d88ef5a66e3d08970aa02dfa1a2da284042faf5e6e8ad6bb6f6706c8c4ba1d44681ef0f6c58ced052debb000cebcc0266b45226f31983bb3e3790149d7c
+DIST aria2-1.18.9.tar.bz2 2151923 SHA256 e24bca91edbe8fff52615420085317ce22faec4a0a9c34843f86dbcc2a79c4b2 SHA512 6a701f23167255a8ea135c6c9455a11d0eddf007fbcc1c3af663dd98825c0812d7db0214be963a06740e60d8b6fdae92bee5062aa4864b212b959e97ac857d74 WHIRLPOOL 0996dbbcd9828e8a977275f889e14a0e5a8fc0dc5d1a05a7550542cab27de252597389a796da98590935d02a81fdf302f9d078c8c0068af0587a2437ee01e85a
 EBUILD aria2-1.15.2.ebuild 3826 SHA256 d2f45285876f6298c2c1f75bfdc08fef248f75c07f0e02d1f5423bd20564c67e SHA512 2cb544006b118768d6b3144ecc3739313a05d731f7e61c822c354cb254722adc37aec8924f0903c4daa9794399270ee662039e2df65e26c22aae88025dd8b28f WHIRLPOOL 73ed87140daa8477bff9a4368c4c851ee9c406ab986fa162c8add447acaf2e714f695046374a21f0a13bcb31470a1113d979bd6b76aefa33370d683ad98a5d02
 EBUILD aria2-1.16.3.ebuild 3921 SHA256 59ca5309b691b8712ae788249add4d43390696b93bfc535e1c204eae08fc9a0d SHA512 978894423c1cfce1f287a468d06794e338089ebe4cc9dacea502cebc026ab51e115500645cdcd904a57f1d16fbdf1f986db88f43fd66070495bfd23e5bcfe329 WHIRLPOOL cfa23abcd9e9f30bd92cdda8de95c2f0a0f9d99177c188d426ede8e8cfa16b73f1c0bc62d0927bf21021346194cae5585b409f562479b6808ae7f33d908489c2
 EBUILD aria2-1.16.5.ebuild 3863 SHA256 24d57a230f5a186a15a31692765a2ef547ddb57e5bf18d140b0d3396ee0d86f7 SHA512 80659b321708e82348ad110ced999922f32a77afd2115bc8e1e3a5fbffdd3b73256177c101b1a2a8130b5fa312de627baf4e87ceb7b63cf3ad05ea3b514f9316 WHIRLPOOL 1dac420f5fc07a8fc35a95657e64fe1614ac0335cb7dbbb0e1d87576cfd879e119b0f397eb6e2e0c6b7819d3aa314e7d30ab80d600a316c94c9d079eb7c83670
 EBUILD aria2-1.18.0.ebuild 3984 SHA256 9a9c8d36c5de8c2e0ffd981a092a40653c1040f2d7e9a088172ffc74f04c85ff SHA512 b2e8765943cb70442f5f43a625185dd06e86024c2a43675934736bb5bbc9a14580167dd2a246a73712b2782bd501bdac466c0273aee3f524ee5621d97d419f5b WHIRLPOOL 4f74a545cc6eaf11729e8666619e8e5536a5657c7bbe056218576db8c71e1d7ecd6be694dcfe275d327d3af3cb56b891778cb339dd1e8a3939007efddb6547d5
 EBUILD aria2-1.18.5.ebuild 4249 SHA256 1e6c4faae1a98e89d128fb386c7d114e3865827105ebe4b3b48ac3b2048d15de SHA512 8dac094524af093498cc8db4edd58c80e7344857f0ef810dcb025311c564c636885e1bed6cae0e9062326dcea854be91ae7ae62c0546cd075ec486c740967033 WHIRLPOOL 1cacf4a9b8cceaf48227a1b91b7b31d279110f553d99cacf4011f9b8b9779f4bef2d15e206b2a12754d05be0a1c84bb34154a881de811c2eeb10e182059e11e2
 EBUILD aria2-1.18.7.ebuild 4185 SHA256 4f95d0a94634609ded4a797a4196b5036652130bb5fc35345b83e1d786d56d34 SHA512 c1a911aa1b2e819e07086ea43f840763261d51b87fbf1b14d62e110daeb354f8f81e162edcbc65690ba1d1db459ea189584bacd297365a36934fd8e33d9021ae WHIRLPOOL 728b475d552b292f6dea7df6133d9eef3dfdb29b80f2651af6efe8ace93a9c45e6e71a1378f8f1e338aa602b2ef144bf12822085d6b6e89434af224afe0bc54b
-MISC ChangeLog 18129 SHA256 927c221e313f7e3fc622df719382f28a926406341c30918f90d685ba4b1514a6 SHA512 896d6932227fef24700455aede80756439df0d6474afc9aff04462df7d8e65d636c561ea6abc6e9eb859e0ce6961c1ca963319e1e485425e10fc75a7afd7a925 WHIRLPOOL 0e69ff56d6700925c3522c67121ab48a62dda6805b40ad443bf1f56caf2295fded6ec2aca4697bfe39fdb9a7cc405944600d7555b5316fd28256f0e8bf9d4bd2
+EBUILD aria2-1.18.9.ebuild 4185 SHA256 766e015d231389c111cfb2410124ffdb37b67b67d40ba7cf32930d70c40945f7 SHA512 4b4f30a081893ea391787a02fcd5d04f90a59c4191a7e7203db1e3264c02dc1aeefeae2e4ee0a2a34bcaae68445e8b9abcdbfcd8f21943115f403feb5b4cc45b WHIRLPOOL b2ac7b9c4e8a76234d08acd7930d4b6044d6253d5cd4213bf4a75f1b4ea1df4bbb61322d9f4bc354b2ae48f7b68f0565cc2c577d2bb035ac220a9c995fe52e2a
+MISC ChangeLog 18465 SHA256 b9a11d353bd01b6f9cd7ae09dcd2edb183fc8b753dfb8afdbe8d45c2c8febc5f SHA512 b9bc522b5ba816a88bf5322ddbe9281c6fb4a96a951028e102f9a6aad9838052b97b9a261f280b2df38fb87753ebd8618d9f0812938526ffb32c2ab846a8bd60 WHIRLPOOL 9b52af66fbd8eba98b57bf33fe6ffecacf9ed71316a9ccb2ffe8f6e15104560b65c7879f61701a4b12e3301beaebb7e58a271e4db7aacfedace3cfb30e7bdafe
 MISC metadata.xml 1193 SHA256 7fd388cd5fbffe616a01daa97df83b0b127be5e205a9be0864f4f3698d7a03e3 SHA512 79e15e355301dbb832a2b820bc84dd26e41eb92bef5ef69202983b24fe3d16b48899cd2c20c5bac5db619c0a92a4f98cabd515c19639f505cff63db58af33255 WHIRLPOOL 4be36124db8888601b1e5f650331f35aa8fd5a055a97d9fb3d23c31edb3b13c3d9a16b345d57532e608b20336cc057be28c2b7183d0eaf225ac8cbe42fef45ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUAChwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU6ElVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOD/0QAKETTd+swW+RdlCmeG29DPQ8
-i18vjzmfRgElVvEvo9ms5Rol1/Lyhc9AoWT3GuhNpMiT6Zqp9SxEHjupgA+4NzyS
-q9e+bwxzfNiOaLmRAS5LJMdjCf8u1FQwgiD6V5yp8wZpXRJw4DuBnbHceDkuKBv1
-/bqdjIPJHG2xhUGRZHfQPbbQaJ37UCJvWieB+hFivRjhiwp4nU53FijvMM7HyzqP
-mCrGqbw+Ld/hgI50ztHeYcTKuwfVvEUfoZD0quXYypuna6ytVfMNFSGfjVMj74J7
-10WaR6b1cIEkEjRgI8Hj4zXdnhMwMmlrUuG9DuZn1y+dSVuesiBWb0ieLVIRYO/X
-HW+/VraK9/tiNuGMX+PodtAax/xeEigNoVjMYiG37THAybzLyaczLuIikue07+01
-dQIdCTumzJDxCEN+llKzUglOJO87+45KpqzFi5uo9a3m64Xb2qVH/RF+syKNT6Wz
-cNmyLWdzb5PfvtmIrVIohRHgiqlxrvdeirvNbm0ULsAKEmEi8vFuDPI2Ter2lL0x
-iVAiVDnC0T5JBYij3w5OOiN05ZvzkqO5qtRLDNkgoqH897cwR7jsVncdVsq3BKMe
-uh7WKQodqhcXRnmqPGAz9HYmxw5RrpaT0Svqc0gYLl9rILsf6U9/QN3SAB/kfIw4
-O6VEfpZDt27V6QKb4/17
-=L+UL
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOQEP/jMhxW5N4ub7bT0cPKh2Yqsx
+oAwGMu8VDaO62M4K89j3gz5i7HWJefrezmeQwGvIp0cz+8sH6Iof6ikamo0+AxYS
+aaU65AxO6QM+bC6RY6n5BvNwTDTBjjNhCWpnixgniOj79bPiaokeaZNE+7cqCMif
+aMw75zbhGXKdb1K7uFDie1K9JOF7iInL3IB9xKE5k0tBIl7pIx6RnfGAXbUB/6In
+4kur4e9i64Uxg6tcqTpd18MyxVMjSaoUweoSahK5fObbByFCmBqomViwBYsCOCmq
+fnssK2G+zyLqphMm4xvQWXL/FNfYKyL30oyeMVfrq/nngQ4nS41HHOmZHxG8PedL
+IMWRTeL1uW7iR4YHxe1AFVTbU6j5PA/rpkn9wnDg+WyxTTZwPUzZY14KZxcygqJw
+nmG78WS4LDzXnD1lkKQtTqiXlXYtkcSvmtvjAGMmcID63VJSng+Xc7MXTo0D+FU0
+AI8gkWBP3LuHl3btcPuIk9QP0PGGcVy1dNK8d0KWNxYklOUTG+ZG8CsH5nI+BN+K
+8snxZ24wwnhB/C+Jeli7ADhfkitQuTo/KX9721a0tAoUmAmnjYG6UxfsQWPWqodn
+GQJiHqA6T0ZTeBFvxbPlY4sYZoKmxKf+y0ySpcZmDpK4oyKEEGHRFYxIKdqVmpmo
+6ByyZWYxIA/8SBz4SjBP
+=iv2u
 -----END PGP SIGNATURE-----
diff --git a/net-misc/aria2/aria2-1.18.9.ebuild b/net-misc/aria2/aria2-1.18.9.ebuild
new file mode 100644
index 000000000000..a231b6c57773
--- /dev/null
+++ b/net-misc/aria2/aria2-1.18.9.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.18.9.ebuild,v 1.1 2015/02/21 09:01:08 mgorny Exp $
+
+EAPI="5"
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="http://aria2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssl tcmalloc test xmlrpc"
+
+CDEPEND="sys-libs/zlib:0=
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
+		!gnutls? ( dev-libs/openssl:0= ) )
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	bittorrent? (
+		ssl? (
+			gnutls? (
+				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
+				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+		!ssl? (
+			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-5:0= )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( dev-libs/libuv:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+
+REQUIRED_USE="jemalloc? ( !tcmalloc )
+	tcmalloc? ( !jemalloc )"
+
+pkg_setup() {
+	if use scripts && use !xmlrpc && use !metalink; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	epatch_user
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with sqlite sqlite3)
+		$(use_with adns libcares)
+		$(use_with libuv)
+		$(use_with jemalloc)
+		$(use_with tcmalloc)
+	)
+
+	# SSL := gnutls / openssl
+	# USE=ssl
+	#  + USE=gnutls -> gnutls
+	#  + USE=-gnutls -> openssl
+
+	if use ssl; then
+		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
+	else
+		myconf+=( --without-gnutls --without-openssl )
+	fi
+
+	# message-digest := nettle / gcrypt / openssl
+	# bignum := nettle+gmp / gcrypt / openssl
+	# bittorrent := message-digest + bignum
+	# USE=bittorrent
+	#  + USE=(ssl -gnutls) -> openssl
+	#  + USE=nettle -> nettle+gmp
+	#  + USE=-nettle -> gcrypt
+
+	if use !bittorrent || use ssl && use !gnutls; then
+		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
+	else
+		myconf+=( $(use_with !nettle libgcrypt)
+			$(use_with nettle libnettle) $(use_with nettle libgmp) )
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - 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 "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc/aria2 \
+		"${D}"/usr/share/doc/${PF}/README{,.html}
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc || use metalink; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}