net-misc/aria2: Added patch from upstream/bug #134540 (thanks to Bjoern)

Some cosmetic cleanups

svn path=/sunrise/; revision=785

5 files changed, 166 insertions, 4 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index 4f9d4e2c2..369389f44 100644
--- a/net-misc/aria2/ChangeLog
+++ b/net-misc/aria2/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Aug 2006; Tiziano Müller <gentoo@dev-zero.ch>
+  +aria2-0.6.0_p1-r1.ebuild, +files/aria2-0.6.0_p1-http_header.patch:
+  Added patch from upstream/bug #134540 (thanks to Bjoern)
+  Some cosmetic cleanups
+
   31 Jul 2006; Jakub Moc <jakub@gentoo.org> aria2-0.6.0_p1.ebuild:
   Fix dependencies
 
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 630d7aeb2..06ae1ea36 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,17 +1,25 @@
+AUX aria2-0.6.0_p1-http_header.patch 2580 RMD160 5d7efad21cdcce6a1dae40e286cda6674f02f938 SHA1 a53f091570ae04246cc7636761e04b7ab9539d83 SHA256 37d5a01458b9c6de6e47661cd33e5126cb369bf5de681c84331ca4d7b80a6fdd
+MD5 e11e9e4d1769c7302806df922003ed8d files/aria2-0.6.0_p1-http_header.patch 2580
+RMD160 5d7efad21cdcce6a1dae40e286cda6674f02f938 files/aria2-0.6.0_p1-http_header.patch 2580
+SHA256 37d5a01458b9c6de6e47661cd33e5126cb369bf5de681c84331ca4d7b80a6fdd files/aria2-0.6.0_p1-http_header.patch 2580
 DIST aria2-0.5.2.tar.bz2 323937 RMD160 385bf4029f80c55600a7fcaa3d81a5355038a9f2 SHA1 a96cf3f0266b91d87d5124cf94326422800b627d SHA256 8702928be47641f553d06007594f0ab8ed7ef719edd324266779f72f6b08e4cb
 DIST aria2-0.6.0+1.tar.bz2 334435 RMD160 24eefc38e64123147140cb550d375907bae8c5e7 SHA1 0c349afa9879dd47dd42879791e4e60be5252a05 SHA256 059492b5d080d7cf5cbf812d4eca2de178399a9a23f81ecc5005da1bbe868c42
 EBUILD aria2-0.5.2.ebuild 820 RMD160 95eb2ba9550e57eb203aaddf5cfa3124c8602a20 SHA1 262ffc5c6bdcfd97371fb9a9064b1337f8840920 SHA256 ffa41ef1c71c5bbbe26cf5c9352cb5c7ae5870ac597e7793d90e0374f33cf393
 MD5 03279e5a3b8be3d35a60a326d0409ef0 aria2-0.5.2.ebuild 820
 RMD160 95eb2ba9550e57eb203aaddf5cfa3124c8602a20 aria2-0.5.2.ebuild 820
 SHA256 ffa41ef1c71c5bbbe26cf5c9352cb5c7ae5870ac597e7793d90e0374f33cf393 aria2-0.5.2.ebuild 820
+EBUILD aria2-0.6.0_p1-r1.ebuild 1186 RMD160 f95a3cdfe405c6473a471b4bdc10d70bd5fd50b3 SHA1 df1a7df742fc84e6d71676157c48f764ad77226f SHA256 ade84e8050cca1642740606b72ce5cce07ef71ae7bbe60d4127cd1929b340cb1
+MD5 a8f8995bdaa97a9b89c3ee94ce733abc aria2-0.6.0_p1-r1.ebuild 1186
+RMD160 f95a3cdfe405c6473a471b4bdc10d70bd5fd50b3 aria2-0.6.0_p1-r1.ebuild 1186
+SHA256 ade84e8050cca1642740606b72ce5cce07ef71ae7bbe60d4127cd1929b340cb1 aria2-0.6.0_p1-r1.ebuild 1186
 EBUILD aria2-0.6.0_p1.ebuild 1016 RMD160 625818315f1a6f994d2f5b747c210a5907e19a0d SHA1 d8e36362c393d0b3142130095f3ce54cbff70ebb SHA256 0ca49e3cf08a6951b33577d422daabd590e9a956f6bca55e081e745943d0565c
 MD5 c45fdb0ac1f9fa885495f651021ec76c aria2-0.6.0_p1.ebuild 1016
 RMD160 625818315f1a6f994d2f5b747c210a5907e19a0d aria2-0.6.0_p1.ebuild 1016
 SHA256 0ca49e3cf08a6951b33577d422daabd590e9a956f6bca55e081e745943d0565c aria2-0.6.0_p1.ebuild 1016
-MISC ChangeLog 631 RMD160 821cdd9e97164d950ed068a85f38601d7313a045 SHA1 e7fd6d2d67ac52e37616563a577f4c00ce937044 SHA256 238e178111ab794d413af7f0c7c73422a3ffca01de1411f1618a53eb1e2d4f3e
-MD5 4601dc48a9b52c2fae643c80cefdb614 ChangeLog 631
-RMD160 821cdd9e97164d950ed068a85f38601d7313a045 ChangeLog 631
-SHA256 238e178111ab794d413af7f0c7c73422a3ffca01de1411f1618a53eb1e2d4f3e ChangeLog 631
+MISC ChangeLog 838 RMD160 50fb5f9744adde679bccaa62497b589e14fe0577 SHA1 69c847c7f928d5dba254a1bbc5dbad2bfc9c9a6e SHA256 2ce4a762220ea64397a84bf9257b3e52b0dcfcd0cac9e83a5e2ec51bf281297a
+MD5 7b985b15859f90f1118c02c132a52926 ChangeLog 838
+RMD160 50fb5f9744adde679bccaa62497b589e14fe0577 ChangeLog 838
+SHA256 2ce4a762220ea64397a84bf9257b3e52b0dcfcd0cac9e83a5e2ec51bf281297a ChangeLog 838
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -22,3 +30,6 @@ SHA256 d040766bfab9d109b27ee183be85b7a50815272d59d7dac18ae18109889ab02d files/di
 MD5 452b1f2b7fede5e1fc4b72c06bfec105 files/digest-aria2-0.6.0_p1 244
 RMD160 8ac3239ce47cd48d9ba811a93d512c04ea0085ab files/digest-aria2-0.6.0_p1 244
 SHA256 b7aaf849666359d80b700886663af0a222e46202366869d89287eb4b8d6a3aa5 files/digest-aria2-0.6.0_p1 244
+MD5 452b1f2b7fede5e1fc4b72c06bfec105 files/digest-aria2-0.6.0_p1-r1 244
+RMD160 8ac3239ce47cd48d9ba811a93d512c04ea0085ab files/digest-aria2-0.6.0_p1-r1 244
+SHA256 b7aaf849666359d80b700886663af0a222e46202366869d89287eb4b8d6a3aa5 files/digest-aria2-0.6.0_p1-r1 244
diff --git a/net-misc/aria2/aria2-0.6.0_p1-r1.ebuild b/net-misc/aria2/aria2-0.6.0_p1-r1.ebuild
new file mode 100644
index 000000000..59f28cf2d
--- /dev/null
+++ b/net-misc/aria2/aria2-0.6.0_p1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="aria2 - The high speed download utility"
+HOMEPAGE="http://aria2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/+}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bittorrent gnutls metalink nls ssl"
+
+COMMON_DEPEND="ssl? (
+			gnutls? ( net-libs/gnutls )
+			!gnutls? ( dev-libs/openssl )
+		)
+		bittorrent? ( gnutls? ( dev-libs/libgcrypt ) )
+		metalink? ( >=dev-libs/libxml2-2.6.26 )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( virtual/libiconv virtual/libintl )"
+
+S="${WORKDIR}/${P/_p/+}"
+
+src_unpack() {
+	unpack ${A}
+	# Patch comes from upstream,
+	# expected to be removed in the next patch-level
+	cd "${S}/src"
+	epatch "${FILESDIR}/${P}-http_header.patch"
+}
+
+src_compile() {
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+	econf \
+		$(use_enable nls) \
+		$(use_enable metalink) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin src/aria2c
+	dodoc README AUTHORS TODO NEWS
+}
diff --git a/net-misc/aria2/files/aria2-0.6.0_p1-http_header.patch b/net-misc/aria2/files/aria2-0.6.0_p1-http_header.patch
new file mode 100644
index 000000000..cb03dda40
--- /dev/null
+++ b/net-misc/aria2/files/aria2-0.6.0_p1-http_header.patch
@@ -0,0 +1,92 @@
+*** HttpHeader.cc	2006-03-23 01:21:11.000000000 +0900
+--- HttpHeader.cc	2006-08-02 00:51:31.000000000 +0900
+***************
+*** 20,37 ****
+   */
+  /* copyright --> */
+  #include "HttpHeader.h"
+  
+  void HttpHeader::put(const string& name, const string& value) {
+!   multimap<string, string>::value_type vt(name, value);
+    table.insert(vt);
+  }
+  
+  bool HttpHeader::defined(const string& name) const {
+!   return table.count(name) == 1;
+  }
+  
+  string HttpHeader::getFirst(const string& name) const {
+!   multimap<string, string>::const_iterator itr = table.find(name);
+    if(itr == table.end()) {
+      return "";
+    } else {
+--- 20,38 ----
+   */
+  /* copyright --> */
+  #include "HttpHeader.h"
++ #include "Util.h"
+  
+  void HttpHeader::put(const string& name, const string& value) {
+!   multimap<string, string>::value_type vt(Util::toLower(name), value);
+    table.insert(vt);
+  }
+  
+  bool HttpHeader::defined(const string& name) const {
+!   return table.count(Util::toLower(name)) >= 1;
+  }
+  
+  string HttpHeader::getFirst(const string& name) const {
+!   multimap<string, string>::const_iterator itr = table.find(Util::toLower(name));
+    if(itr == table.end()) {
+      return "";
+    } else {
+***************
+*** 41,66 ****
+  
+  Strings HttpHeader::get(const string& name) const {
+    Strings v;
+!   for(multimap<string, string>::const_iterator itr = table.find(name); itr != table.end(); itr++) {
+      v.push_back((*itr).second);
+    }
+    return v;
+  }
+  
+  int HttpHeader::getFirstAsInt(const string& name) const {
+!   multimap<string, string>::const_iterator itr = table.find(name);
+!   if(itr == table.end()) {
+!     return 0;
+!   } else {
+!     return (int)strtol((*itr).second.c_str(), NULL, 10);
+!   }
+  }
+  
+  long long int HttpHeader::getFirstAsLLInt(const string& name) const {
+!   multimap<string, string>::const_iterator itr = table.find(name);
+!   if(itr == table.end()) {
+      return 0;
+    } else {
+!     return strtoll((*itr).second.c_str(), NULL, 10);
+    }
+  }
+--- 42,62 ----
+  
+  Strings HttpHeader::get(const string& name) const {
+    Strings v;
+!   for(multimap<string, string>::const_iterator itr = table.find(Util::toLower(name)); itr != table.end(); itr++) {
+      v.push_back((*itr).second);
+    }
+    return v;
+  }
+  
+  int HttpHeader::getFirstAsInt(const string& name) const {
+!   return (int)getFirstAsLLInt(name);
+  }
+  
+  long long int HttpHeader::getFirstAsLLInt(const string& name) const {
+!   string value = getFirst(name);
+!   if(value == "") {
+      return 0;
+    } else {
+!     return strtoll(value.c_str(), NULL, 10);
+    }
+  }
diff --git a/net-misc/aria2/files/digest-aria2-0.6.0_p1-r1 b/net-misc/aria2/files/digest-aria2-0.6.0_p1-r1
new file mode 100644
index 000000000..6230f0422
--- /dev/null
+++ b/net-misc/aria2/files/digest-aria2-0.6.0_p1-r1
@@ -0,0 +1,3 @@
+MD5 5a41813ce7d6a9c2c4bb56641ee08f4e aria2-0.6.0+1.tar.bz2 334435
+RMD160 24eefc38e64123147140cb550d375907bae8c5e7 aria2-0.6.0+1.tar.bz2 334435
+SHA256 059492b5d080d7cf5cbf812d4eca2de178399a9a23f81ecc5005da1bbe868c42 aria2-0.6.0+1.tar.bz2 334435