Version bump. Add SLOT operator dependencies. Enable libaria2.

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

4 files changed, 168 insertions, 19 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index 17c7d2f4c7e4..8ef2de3cbbde 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/aria2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.90 2013/03/28 09:37:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.91 2013/10/16 20:57:56 mgorny Exp $
+
+*aria2-1.18.0 (16 Oct 2013)
+
+  16 Oct 2013; Michał Górny <mgorny@gentoo.org> +aria2-1.18.0.ebuild,
+  metadata.xml:
+  Version bump. Add SLOT operator dependencies. Enable libaria2.
 
   28 Mar 2013; Michał Górny <mgorny@gentoo.org> -aria2-1.12.1.ebuild,
   -aria2-1.14.1.ebuild, -aria2-1.15.0.ebuild, -aria2-1.16.0.ebuild,
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 318d4b23024b..a9f256e2b578 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -4,27 +4,29 @@ Hash: SHA256
 DIST aria2-1.15.2.tar.bz2 2043212 SHA256 6400431f4248f7a779ae8216ec2711b56ad7481fc659f06db1f22ed97b260836 SHA512 6fc09ba1f682d13db829a3f5881a06ea0d0d2c1622511408f149cc109a12a01b19cec34caeeac10982061e9633bbb67e9ec40c23ee39a418fec6fb604af23bbe WHIRLPOOL b9544bb5359fc22dca5ba4e5328086deb0cf7d40fc69e7528ed57f14a89b30ffa6022ab7bfbe5f2fbd150b3974272286ff2f26d011bccaf5f973ccca00f2a44e
 DIST aria2-1.16.3.tar.bz2 2082238 SHA256 989f8eb5599394681d75e18acf3d4261870cc2dce70b813ce84305dc3c9e50a2 SHA512 c9d09a8f45df6e3a472709460ec42ed5db189a72652b2dbdb515b84e1acd221bffb151baf0b2036b180e07a5b6a82350327cb6dbad9268cf5eaeed9c47abe21e WHIRLPOOL 60523ce102dac5e6e4bbd1a8eecf8fcf6059aed5e8d7b01db551e64bc9244fcd75efc14a29840ffdb84b74d5809bed494fb707eba9f5189ff613f54b4d2bf6b3
 DIST aria2-1.16.5.tar.bz2 2152749 SHA256 06aee1f296b984a8aed54ac7d7bc52eb2b4315273ec555bf3b06c10214528eed SHA512 44544daad15b0f9fb63eccff855d0775bad7131f427d7ad75326cd875392a445ca36e1f1cb1a870276d554e708dd1850b20be1b4bbcf8e7fc9874478c848a754 WHIRLPOOL e49383afd04a5d7d55152cdfb9026885cea39d843b49d864d78c372559bd3706391d2748931da5b96839a92826775292c5e925e947d500653899f8eb1d9be819
+DIST aria2-1.18.0.tar.bz2 2080003 SHA256 ad811508d5153d138de2c43228c36fa046574bf2e94e108af558db7722f6513a SHA512 bb52ef1c6963db6649fbcde2110d6ba659a7f8f5851c7f5d9bdbebbdff7e68cc5e435a8a1ae32c5e78bb812d6e84caab9d14ee8cc435c24902c6499a3df1aca8 WHIRLPOOL 0e6f022719c05991033ef4651c8d58cafcd14a6a81d7e476aa168e3d52293abe148958ed00b92552d6e9a4fb7ffd10634658e6c2820c2c8654b493ea14a4e82a
 EBUILD aria2-1.15.2.ebuild 3819 SHA256 95e6e6fe18d1a73f3b8f7a4ad7260b62ff36d13452dc987d4ccc45fa34fdae98 SHA512 3b062df87bdafa9f8b2b55e210d36ce20ca58c6646e77569ddc373a5a8649bff77686c5cbbfcbeda879fc1e0974c0c48bc30851e7359d81604f55cd861f8d82d WHIRLPOOL 128cbcbb1fda58ff973ee9de8fba0cdee802d278084ff9ab1e82fde38dded683a7dc8c7bb08f762ac6afa86afb06e6a8954dcfa80938297c044f9d68e0b4f9d4
 EBUILD aria2-1.16.3.ebuild 3917 SHA256 a194d27985425740e2a9edae87a39c0ba42f36d706a494feb793f1acecbc4245 SHA512 998121cf6d993930641d0183f8034fcc1cb70f37653fe4cbeef61c35d507a5dfc350a5d7f50aff54cea8819794dadb2d1deb24dfe0650aad7f712f38530d79ca WHIRLPOOL 2c8f24a0d67f76f38514a40b98f40ebf50d4d01c103ea26a261203e6ca5828c9c7b510a868a73a7f035169cadd32530c823d9db140d4661f286c4944228a7059
 EBUILD aria2-1.16.5.ebuild 3859 SHA256 0cbd16e06c6a712e73fbf63fefc3307e1ae6f2c193165600b7d971af3d31f9b4 SHA512 d37853988d31506fdd583aed8f7d6e510a655dce2777cc7f85a58093624bbced29a26682b5cd35763fa34f575abc0c5e8503d7f6a09f3b420c5432fdcaac0fe7 WHIRLPOOL e50f157432fb3df54f80352dda1f4a4c3562c85b60034157c34ac08688e9e5cff4ee26b5922017839ffd934b89d40949349c1a0a478127a965fe9990c943cc75
-MISC ChangeLog 16669 SHA256 c6d64480929756d8dbc629b6423074e9114052c34e1db413f999c44522050dc6 SHA512 fafad545f85b4450c8c3be5375de9bab645477a47ebd0dbfb0d17a5f6c93912ace8f70b6221ef9030b8a183e674ae732a16ed21b20ba0e6ba50e44bf7fa38807 WHIRLPOOL b9e022280d1b1eeff3536f6e4809f4827772e737d97e8f64bfb9af328e59a30652fe8bb70a7f46f9300463e02bc3eefb123fb4ecef4a96ef41ba93a3c02b9a87
-MISC metadata.xml 996 SHA256 09ac4a5e032f59a21f13ec72dfb63a8f0661c50a0c725ae7b594bac84378c9bd SHA512 999076b46f3fae5596bcc9e63e56996a2f3788b23711b78cd469953faab71af9779001deff04888d22725ac2c24192f5ba1a6fe12ea9aa9865d491b8b6eae7e2 WHIRLPOOL 047103dfc745a3229b8dff8b1b24a89c9d8f88463d0c8e7c57d79e6a738660207c745b2a34d298baa9020a62823cfa6181d4c773d61c426142dd85337f3c463a
+EBUILD aria2-1.18.0.ebuild 3934 SHA256 9ce5b5dabaf428e1c2a2e02600019dad202fbf6982e549eb0f7e96403927172a SHA512 f453681ce2003e2a4cb5819827b1c85853fa7856e89acfaf4b9e3cb25e983211c82e191788e5e27e1bb46022b10f1285456bcc5333ec7c7eddc07e9ee9f318d3 WHIRLPOOL 1fc5535608ed83ae59f454c4d72d21ecc76d2e8dc7e4754e66740834e958d2d3c5c214d3b8e854bc5637167c6add1396f815d1f038701e3d12464cd732c7753a
+MISC ChangeLog 16852 SHA256 a4dfa028544daa88bb32fa9fd67085719953612c458a2004e71d9cc33e2622e5 SHA512 19e4e25099e430d8eef01ff246cde8db0f2b92732818e51c016608843a77a728a693262b7fafee95ac52e5c9eff6a2b12a797b8fd7769adfad9a036421577f74 WHIRLPOOL 3d83348e5ba9bace601ab014ee3ec4f3767ef00961409501999bfedb2d4d2db4a1b95d3b3059f651511ad8b5dfc828d00b980f86fb25174f4a6dbc13446e29aa
+MISC metadata.xml 1063 SHA256 326206a9ca0524adf06c9db87fcc4f0f63b07fa5ab23b53dc56f95aee8bfe390 SHA512 f3b13e77299dc4ec6a2755b69ce0ba8350c04c4db2d6d8193018d0d7f3b9248e4740075259144d500d220c4c59e7044de82bd7ee0b0f8be027ce02037c6c5681 WHIRLPOOL f08555725f7cf1dff11ee560f9d774b5a12e2eb298f8ca74f7c8432643aec4e61ca8647137419b57b354b42e0c0231c473c03de6c7b413f88c8d06deed5974da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRVA+JXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDoWYP/34/b2rp22W8R57lvnNQlCoV
-bN5SLVm2jqDNkgs/s0WqYhx6v5Vj9sG9Lz5d2yGsuEmxQJRUFUUtstN/wNTKTwjX
-l4FVQuTNaoPURCrdCs8+InR3VF/7hSFauJnHYg6qXLewppwjzcD4sUtAWqxs51EF
-1l61Nqink2KwFSfiirXLEJBjkJobMJs84dFbO960d47LhaUu0WtopXTD/I1DAMZP
-JpdgGCwxpVnl1yfz2PecCSb2oIn2aFU/CkAoUj4/hOlLFRh6/DTvUiPPJbEeG05O
-+gHfrMSU57LgQkHSHNKfarxh0MH2Aa7Oi21j5tTjpMP+7pvaZS2rHShgF2nbzAgU
-JBNGjQ44NCx5NIQFDlcD5Fz13MAKqoF9QQObeA73MTVAw/1zKuiONDoWc7Gskmm+
-wdX97xOI8tIUqLxhwm566/OJANY/5vpfOYd4rIFFh3gDpWs7j0/PxN8uQOxnIkdz
-vSemRvNvaH41/DBDSUUPWeEbKLhy/KoYEzb7dHvuanFRQDtzxp2y/RJmewIHUaGn
-iI/Jo2v2LS0bbvIRWYN0jvvLnX1JrxTLFrcj6fOXUincB+hkf2iMiWnVEMMk1kw7
-hFbPA5WxRaJNFLFOQSWRDiaF01fsNik/5v4cEhl3otInYx1RtWmtlgwsqlKV7D+q
-QTP1NNuOX8QiXI27SBZe
-=XAXR
+iQJ8BAEBCABmBQJSXv3hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPJwP/35S0y3ztECOLyFrFkxhU/N4
+yzgXtlFUktKphFvHe5ZOPvRuoJrqo2qbr2Q9wmF4tkDQY+1OYfCjD712DntKgvmP
+kKpS1UiOTCxyV9V46ADBcmVThSN/S+dofQE4BQzYWu4GiBQyHbHoxXgYm+ZLeJ72
+NcN+BA8ihRrxF9CApvj8Il2XGMDx3RWyl2XLLT50kHH0pCzZY6smUpoRIb/z2c8n
+P6Fux9CTfSl8v75rAB6gP7eNJRSZUJCNaepGV7B61CKdGU4KWODida2JdzWOPvy7
+Jnu74mWaKuxuZ4xZgPyhPa+v6ejEnxRzPvp3/YGkIkUlmTKm+ON8Gyz/ft6H8vP9
+axTr5xDUcfDvCgwJt3/U5C4KTWqoySy0mp40lTGavL7Ri8NPfgFAtpy8lwaOuUo7
+46fYsY0RmLOHJaJ3OGhLykN+o9BtnVGxAeWvHWAVQoglHw3EUC1LZ3SPqbwdJWwJ
+J5+VXtYxafx1OTQ+jiiN6Tsx0ArxFbb48oDlbVqxeAhxQpEAHwfsIdrHc7koI71U
+lmGHriPiBfWpKIsda3G/yLTmyxM2zXCo09HgGEZXKH5hAO89485yacUkS3j5QXma
+gF5gBzjUX/k+mHCZ2AXi+xDbnXhRIZurH5BRS+FyNM3x15bbtA7mmytL9yWxDuqN
+MIZt44P4d9/4SkWWhiqx
+=XnOc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/aria2/aria2-1.18.0.ebuild b/net-misc/aria2/aria2-1.18.0.ebuild
new file mode 100644
index 000000000000..ef73513942b4
--- /dev/null
+++ b/net-misc/aria2/aria2-1.18.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-1.18.0.ebuild,v 1.1 2013/10/16 20:57:56 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 ~x86"
+SLOT="0"
+IUSE="adns bittorrent +gnutls libuv +libxml2 metalink +nettle nls sqlite scripts ssl 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= ) ) )
+	libuv? ( dev-libs/libuv:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	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 )"
+
+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)
+	)
+
+	# 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
+}
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 03456e5c75f4..7146b6cfc2bd 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="bittorrent">Enable support for the bittorrent protocol.</flag>
+		<flag name="libuv">Use <pkg>dev-libs/libuv</pkg> backend.</flag>
 		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of <pkg>dev-libs/expat</pkg>.</flag>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> and <pkg>dev-libs/gmp</pkg> for bittorrent/metalink crypto instead of <pkg>dev-libs/libgcrypt</pkg> (when <pkg>dev-libs/openssl</pkg> is not being used).</flag>
 		<flag name="metalink">Enable support for metalink.</flag>