Version bump.

(Portage version: 2.1.5_rc7)

4 files changed, 33 insertions, 63 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index 385fda6552f4..267b522225dc 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/aria2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.23 2008/03/15 22:39:12 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.24 2008/05/19 11:35:25 dev-zero Exp $
+
+*aria2-0.13.1_p2 (19 May 2008)
+
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/0.13.1_p2-missing_includes.patch, -aria2-0.12.1_p1.ebuild,
+  -aria2-0.13.1.ebuild, +aria2-0.13.1_p2.ebuild:
+  Version bump.
 
 *aria2-0.13.1 (15 Mar 2008)
 
diff --git a/net-misc/aria2/aria2-0.12.1_p1.ebuild b/net-misc/aria2/aria2-0.12.1_p1.ebuild
deleted file mode 100644
index 335a4c3e1721..000000000000
--- a/net-misc/aria2/aria2-0.12.1_p1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.12.1_p1.ebuild,v 1.1 2008/02/16 23:01:13 dev-zero Exp $
-
-inherit eutils
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-MY_P=${P/_p/+}
-
-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}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ares bittorrent gnutls metalink nls ssl test"
-
-CDEPEND="ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl ) )
-	ares? ( >=net-dns/c-ares-1.3.1 )
-	bittorrent? ( gnutls? ( dev-libs/libgcrypt ) )
-	metalink? ( >=dev-libs/libxml2-2.6.26 )"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	ewarn "This version can NOT resume downloads started/stopped with prior versions,"
-	ewarn "you'll have to finish them using the old version."
-	ebeep 5
-}
-
-src_compile() {
-	use ssl && \
-		myconf="${myconf} $(use_with gnutls) $(use_with !gnutls openssl)"
-
-	# Note:
-	# - we don't have ares, only libcares
-	# - depends on libgcrypt only when using openssl
-	econf \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_enable bittorrent) \
-		--without-ares \
-		$(use_with ares libcares) \
-		$(use_with metalink libxml2) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README AUTHORS TODO NEWS
-}
diff --git a/net-misc/aria2/aria2-0.13.1.ebuild b/net-misc/aria2/aria2-0.13.1_p2.ebuild
index 3ab8f314c343..936fd703d4bb 100644
--- a/net-misc/aria2/aria2-0.13.1.ebuild
+++ b/net-misc/aria2/aria2-0.13.1_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.13.1.ebuild,v 1.1 2008/03/15 22:39:12 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.13.1_p2.ebuild,v 1.1 2008/05/19 11:35:25 dev-zero Exp $
 
 inherit eutils
 
@@ -35,7 +35,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PV}-broken_tests.patch"
+	epatch "${FILESDIR}/0.13.1-broken_tests.patch" \
+		"${FILESDIR}/${PV}-missing_includes.patch"
 }
 
 src_compile() {
diff --git a/net-misc/aria2/files/0.13.1_p2-missing_includes.patch b/net-misc/aria2/files/0.13.1_p2-missing_includes.patch
new file mode 100644
index 000000000000..8d57a33c7578
--- /dev/null
+++ b/net-misc/aria2/files/0.13.1_p2-missing_includes.patch
@@ -0,0 +1,22 @@
+diff -Naur aria2c-0.13.1+2.orig/src/IteratableChunkChecksumValidator.cc aria2c-0.13.1+2/src/IteratableChunkChecksumValidator.cc
+--- aria2c-0.13.1+2.orig/src/IteratableChunkChecksumValidator.cc	2008-05-19 13:19:49.000000000 +0200
++++ aria2c-0.13.1+2/src/IteratableChunkChecksumValidator.cc	2008-05-19 13:20:22.000000000 +0200
+@@ -46,6 +46,7 @@
+ #include "Logger.h"
+ #include "messageDigest.h"
+ #include <cerrno>
++#include <cstring>
+ 
+ namespace aria2 {
+ 
+diff -Naur aria2c-0.13.1+2.orig/src/MessageDigestHelper.cc aria2c-0.13.1+2/src/MessageDigestHelper.cc
+--- aria2c-0.13.1+2.orig/src/MessageDigestHelper.cc	2008-05-19 13:19:49.000000000 +0200
++++ aria2c-0.13.1+2/src/MessageDigestHelper.cc	2008-05-19 13:25:42.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include "DefaultDiskWriter.h"
+ #include "Util.h"
+ #include <cerrno>
++#include <cstring>
+ 
+ namespace aria2 {
+