Upstream fixed the bugs without version bump.

Package-Manager: portage-2.1.4.4

4 files changed, 9 insertions, 61 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index 3aab3fafcd0e..b89e8cac2277 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2008/03/01 10:19:18 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.22 2008/03/03 13:01:43 dev-zero Exp $
+
+  03 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/0.13.0-misc_non_async_bugs.patch, aria2-0.13.0.ebuild:
+  Upstream fixed the bugs without version bump.
 
 *aria2-0.13.0 (01 Mar 2008)
 
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index d2e5c5eca30c..6149a5dd1008 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,7 +1,6 @@
-AUX 0.13.0-misc_non_async_bugs.patch 1342 RMD160 6f3061abf06c3fb9d76a017b75447bbd5eb8988d SHA1 2b12417ad9510c7d8f7723f08aec46fb43975954 SHA256 1d8e894c233f5284d39033dd3f27ab5b522286bb7c97270592f360c96c192d13
 DIST aria2-0.12.1+1.tar.bz2 720951 RMD160 4eeddc52c51461d0c162ec33acfc144962ae6c6a SHA1 f8a6acc1f720aaee1d55a46aa99ddd5341d28679 SHA256 c0887e80f722c2a1e40555e7395926218890003ec2b79c346453e09396bd8f5a
-DIST aria2c-0.13.0.tar.bz2 831518 RMD160 156f348f227ee0ef02fefb5da98c6a3dc263e91f SHA1 4a931aa48551e7de81c663691367f482721890be SHA256 4c9784d4af114a9810acefdb43512ccbee0bcbb7a4288ba9742d36f197c72579
+DIST aria2c-0.13.0.tar.bz2 831639 RMD160 019d770f2b0410eeadf471cf37c0ff6d823ac916 SHA1 918726c4b3708ca265bfb75ccc3a5a2e536d0202 SHA256 7acae977071f152dfa52bc2bf35ebedf6abadd7da06eeced5b45d9f3afca6914
 EBUILD aria2-0.12.1_p1.ebuild 1683 RMD160 be0b591686df896f1a6471e7f0610d3130b20df5 SHA1 78519b8165bdb0c1940728377f10493a1927fb39 SHA256 3f4232aa9eeea722d6b57003cfe6c169513804276bb0077ceb7d66f6eea6868e
-EBUILD aria2-0.13.0.ebuild 1767 RMD160 c7e3f06b41b9d9c6a1131663b9fc7669fd698540 SHA1 1fd47bb4106759816a89d6bff8fc88f34c97bef6 SHA256 59daf3e561bae5efc43d08a9371552814c9ede2c433465b20edec66b899c5464
-MISC ChangeLog 5741 RMD160 888324a1faa0c8f2397762e258c0fd6afcfc386a SHA1 f4068c6a943a082f221866d9e5fdca0f3833be24 SHA256 e77b23a95c5ae4752f90a63105f39e9b6cb19e221cecc4d3f07d933d63d96b56
+EBUILD aria2-0.13.0.ebuild 1654 RMD160 2168f6a3479813669a0403406d959e3448c438d2 SHA1 6e70b51f0eb4b1608f80a03e09b3f46064709c96 SHA256 c7ca0c3d7d19840820ac6f1dec0c90c3b14ded35017607de8df06073b9702cdc
+MISC ChangeLog 5907 RMD160 4bde9ddaa7e0f125e631c9e8fc6de6dc1642f289 SHA1 80cafcf666c7141def2c6f7cc0b7b08b8fd7f08f SHA256 926a8cda51622e03d730e6b9ef91e51b7a1e18c58dbaf22eb08f52fbf8394db3
 MISC metadata.xml 265 RMD160 c85123965668b23f1811316632fbfb72fd63a999 SHA1 8ad7e73978d73e5186d894119c85a29968801ebb SHA256 cd689fe179b5312728a09b08357517439bcfb056b7ca2a8056ad12fbd2a8ec39
diff --git a/net-misc/aria2/aria2-0.13.0.ebuild b/net-misc/aria2/aria2-0.13.0.ebuild
index 1b0be22d8c65..a51903c26739 100644
--- a/net-misc/aria2/aria2-0.13.0.ebuild
+++ b/net-misc/aria2/aria2-0.13.0.ebuild
@@ -1,8 +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.0.ebuild,v 1.1 2008/03/01 10:19:18 dev-zero Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.13.0.ebuild,v 1.2 2008/03/03 13:01:43 dev-zero Exp $
 
 MY_P="aria2c-${PV/_p/+}"
 
@@ -31,13 +29,6 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-misc_non_async_bugs.patch"
-}
-
 src_compile() {
 	use ssl && \
 		myconf="${myconf} $(use_with gnutls) $(use_with !gnutls openssl)"
diff --git a/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch b/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch
deleted file mode 100644
index cb4989c87749..000000000000
--- a/net-misc/aria2/files/0.13.0-misc_non_async_bugs.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur aria2c-0.13.0.orig/src/NameResolver.cc aria2c-0.13.0/src/NameResolver.cc
---- aria2c-0.13.0.orig/src/NameResolver.cc	2008-02-13 16:17:08.000000000 +0100
-+++ aria2c-0.13.0/src/NameResolver.cc	2008-03-01 10:52:16.000000000 +0100
-@@ -35,10 +35,10 @@
- #include "NameResolver.h"
- #include <cstring>
- 
--namespace aria2 {
--
- #ifdef ENABLE_ASYNC_DNS
- 
-+namespace aria2 {
-+
- #ifdef HAVE_LIBCARES1_5
- void callback(void* arg, int status, int timeouts, struct hostent* host)
- #else
-@@ -97,6 +97,8 @@
- #include "DlAbortEx.h"
- #include "message.h"
- 
-+namespace aria2 {
-+
- void NameResolver::resolve(const std::string& hostname)
- {
-   memset(&_addr, 0, sizeof(in_addr));
-@@ -109,7 +111,7 @@
-   struct addrinfo* res;
-   int ec;
-   if((ec = getaddrinfo(hostname.c_str(), 0, &ai, &res)) != 0) {
--    throw new DlAbortEx(EX_RESOLVE_HOSTNAME,
-+    throw DlAbortEx(EX_RESOLVE_HOSTNAME,
- 			hostname.c_str(), gai_strerror(ec));
-   }
-   _addr = ((struct sockaddr_in*)res->ai_addr)->sin_addr;
-diff -Naur aria2c-0.13.0.orig/src/NameResolver.h aria2c-0.13.0/src/NameResolver.h
---- aria2c-0.13.0.orig/src/NameResolver.h	2008-02-13 16:17:08.000000000 +0100
-+++ aria2c-0.13.0/src/NameResolver.h	2008-03-01 10:46:40.000000000 +0100
-@@ -124,6 +124,8 @@
- 
- #else // ENABLE_ASYNC_DNS
- 
-+namespace aria2 {
-+
- class NameResolver {
- private:
-   struct in_addr _addr;