Version bump.

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

4 files changed, 133 insertions, 6 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index e18e17f8d1d9..6a54374089a0 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/aria2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.79 2012/05/05 03:20:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.80 2012/05/18 09:07:49 dev-zero Exp $
+
+*aria2-1.15.0 (18 May 2012)
+
+  18 May 2012; Tiziano Müller <dev-zero@gentoo.org> +aria2-1.15.0.ebuild,
+  metadata.xml:
+  Version bump.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> aria2-1.12.1.ebuild,
   aria2-1.14.1.ebuild:
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 5a0c8c274aa3..4ddba0f69794 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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.15.0.tar.bz2 2080386 RMD160 14ef1bf3d0e199e7789cab6e4759576fba06058b SHA1 b29e498a31fdcf890ba93749a221f6022784e003 SHA256 02916b399946029674393c6a66d3544e88959610d3b2303fdd2d2365aa680be1
 DIST aria2-1.9.3.tar.bz2 1441999 RMD160 ad5f32c244acd2a5bfc19aafd78a7da886021e29 SHA1 21f429e6d3b9a3904a45dc032b9aa9146ffccc40 SHA256 364f9e5d8dcf3f12bd2683ea0d17274e0088b6dd7f869db35feba4e30ade7613
 EBUILD aria2-1.12.1.ebuild 2765 RMD160 b27cae28ed7a93991a3994d577b4bf396cb841e8 SHA1 8fc46cdd759aa8e47c442f6fb50c007d2d77ace7 SHA256 c21dedde8ade41c00b3bb1f88f7ba38933645e7bd760a50938500f37fa17eb2b
 EBUILD aria2-1.14.1.ebuild 3079 RMD160 aee96b33c60f2b3c3b76534b2aea76c084a98255 SHA1 7c972a276be842b24f571ffa12af543243849ce5 SHA256 cbcfcf7af5528c5c4250b0a3286821716005da68faa7cc3ca19b4ea48bb0c26d
+EBUILD aria2-1.15.0.ebuild 3505 RMD160 600a034fae6a8ce7c40ca1e567078289ccbce4a7 SHA1 cf30cde409e3d3da2c3136e84c727dc4293444d4 SHA256 342af068ce892fb143a98d9b3d26bdf89828e81db7083b4484fda5d61192c33c
 EBUILD aria2-1.9.3.ebuild 2617 RMD160 4d92a58ceed8ed3d36e0cb532ee5209c632319cf SHA1 f5f7a1dd3bb0cd6917c87c6a2ca44b1c68156d24 SHA256 c5fef23a1a27eadb20f1660a290c2277e1c6e65a83175f3ef1ded58c7935e245
-MISC ChangeLog 15032 RMD160 256b396acef4606b8bb72808fa3a7bc923f1c982 SHA1 aca9553f6530ba9f8b3ec4c406fb0c06064f274e SHA256 6d85deac1d8fa7ee6a1d11869427f31b6aaf11c0e982cd8c3df1cdcf43804413
-MISC metadata.xml 979 RMD160 c6e2d305178428238e62794e92e7c43dafb2a9ba SHA1 e460e5ac7756b286068ec4a30ff0bacd3dc1dc0e SHA256 1c5716c3ddae139c9059bf293d800030942fda629d5c36baba7f542e431e5ba0
+MISC ChangeLog 15171 RMD160 160da8534daeb6e56d6aca2c5b0ff71583fd8546 SHA1 a28eaa7e1e69f8728d1758a0e5477fa6efe3b4d1 SHA256 71ceb8da33edbbe6c68db47c50b5a3da38b9b7e2775d07e1aee5319ee0819e47
+MISC metadata.xml 903 RMD160 5cad2f1c62000b2a1969cadace798f9a919a1939 SHA1 2d09dc81d7c3bf6b931984cdaff02c7de52cd121 SHA256 819fe79f57eb0d27907a471355aa6fc75b2454bde3cc4dccaa81037f5a4dfe71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk+2EWsACgkQGwVqY66cHjDSjgCfUc/LCaxRdEkoOHzzMOAlB97N
+8mEAnRr7FR7WXLjTdcyZVvPrD9sp/NZe
+=u/ii
+-----END PGP SIGNATURE-----
diff --git a/net-misc/aria2/aria2-1.15.0.ebuild b/net-misc/aria2/aria2-1.15.0.ebuild
new file mode 100644
index 000000000000..38b8209f8521
--- /dev/null
+++ b/net-misc/aria2/aria2-1.15.0.ebuild
@@ -0,0 +1,110 @@
+# 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.15.0.ebuild,v 1.1 2012/05/18 09:07:49 dev-zero Exp $
+
+EAPI="4"
+
+inherit bash-completion-r1
+
+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 doc expat gnutls metalink nettle nls scripts sqlite ssl test xmlrpc"
+REQUIRED_USE="gnutls? ( ssl )"
+
+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? (
+		ssl? ( gnutls? (
+			nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) )
+		!ssl? ( nettle? ( >=dev-libs/nettle-2.4[gmp] >=dev-libs/gmp-5 )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2 ) ) )
+	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}
+	virtual/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 )"
+
+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)"
+
+	# according to upstream:
+	# * only link against one of the crypto-libs if bittorrent-support is requested
+	# * if openssl is available, it's crypto-api is used for everything, thus:
+	# * if SSL support is requested and openssl is used, disable all other
+	#   crypto libs
+	# * if no SSL support is requested or SSL via GnuTLS is requested, enable
+	#   crypto libs as requested
+	if (use bittorrent && ((use ssl && use gnutls) || use !ssl)); then
+		myconf+=" $(use_with !nettle libgcrypt) $(use_with nettle libnettle) $(use_with nettle libgmp)"
+	else
+		myconf+=" --without-libgcrypt --without-libnettle -without-libgmp"
+	fi
+
+	if use metalink || use xmlrpc ; then
+		myconf+=" $(use_with expat libexpat) $(use_with !expat libxml2)"
+	else
+		myconf+=" --without-libexpat --without-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
+	#   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) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/usr/share/doc/aria2"
+	dohtml README.html doc/aria2c.1.html
+
+	use bash-completion && dobashcomp doc/bash_completion/aria2c
+
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 1e3467f120b6..0f66f8d03876 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -8,9 +8,8 @@
   <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="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="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 using <pkg>net-libs/gnutls</pkg> for SSL or without SSL support at all.</flag>
     <flag name="metalink">Enables support for metalink</flag>
     <flag name="scripts">Install additional scripts which use aria2's xmlrpc functionality</flag>
   </use>