Version bump (fixes segfault with metalink), dropped old versions.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

6 files changed, 12 insertions, 112 deletions

diff --git a/net-misc/aria2/ChangeLog b/net-misc/aria2/ChangeLog
index d78688ec8dee..d9804a074769 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.27 2008/07/31 19:25:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/ChangeLog,v 1.28 2008/08/12 10:30:43 dev-zero Exp $
+
+*aria2-0.15.1_p2 (12 Aug 2008)
+
+  12 Aug 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/0.13.1_p2-missing_includes.patch, -files/0.13.1-broken_tests.patch,
+  -aria2-0.13.1_p2.ebuild, -aria2-0.15.1.ebuild, +aria2-0.15.1_p2.ebuild:
+  Version bump (fixes segfault with metalink), dropped old versions.
 
 *aria2-0.15.1 (31 Jul 2008)
 
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index bf0a7ffc2b37..c2342aac0291 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,10 +1,6 @@
-AUX 0.13.1-broken_tests.patch 694 RMD160 5e361e70f0f48297692193cc060b112c9b520a6c SHA1 bb2e44622bef34289d580b0f10b012aacf690bcb SHA256 2df247f512d786b0edcb7b63e8b1361f8a57884ba99749833cb336df1d3e0fb1
-AUX 0.13.1_p2-missing_includes.patch 858 RMD160 c6cc0473583e5a7d841a2467442ca4b75ba91480 SHA1 e23dad2f23ec5d9150401ea9334eed9de3e04a2b SHA256 c45999624221dd72b341a9112975666a3017d887580e8d39726fa503675dc38e
-DIST aria2c-0.13.1+2.tar.bz2 841811 RMD160 5dbfba62f2b226574002839f545375efa6df65b7 SHA1 b3fc62b842a54fb3e0d8d7e923fc069d55c1fec0 SHA256 5f5cc74e006e1ead5413d2c9e464700f375fe0b2c7b1c39411979e073f363c10
 DIST aria2c-0.13.2+1.tar.bz2 876561 RMD160 0e807f36ffcf9ee9f88060c044babb06a1210ef3 SHA1 58bf19d6c9948e143bf4916d69c78f9086b6b934 SHA256 62c97c47e1e65b6ee38f2e403f562315905acb1beec5d432d604c2455055db4c
-DIST aria2c-0.15.1.tar.bz2 990172 RMD160 fb3de7b96bac52030a23f4c3bc0e203b817394a8 SHA1 2a2b6a6c3abe16d38f44a9050ee80c12e0fea0c5 SHA256 0f032b59a18e3873b6c51986c55a371c037e81de61237188b80c89d1bc09e669
-EBUILD aria2-0.13.1_p2.ebuild 1811 RMD160 3df11e33b5902c559f1e73b274ed3aa9417a584a SHA1 3830aa48638140b918672a7c028dd5b4810625f7 SHA256 5ba4c5f109d66c91b23e04df06dc66b100a04eddda4172141445a528cd27d80c
+DIST aria2c-0.15.1+2.tar.bz2 990780 RMD160 b5613d673bfad6603ac33149386380c6794fdae8 SHA1 8fde4b656f6c858a38cc5693aeefd6d5d0f42a9c SHA256 e1c31ad287b72f83556909e49f81c56dc7b4a81603ffc1cec10d866c945555f6
 EBUILD aria2-0.13.2_p1.ebuild 1695 RMD160 8e6be9b4b4ab09b822bf63b3142211af87cae51a SHA1 ab155e3c3391e0c5eebe895b725f57e710aff89b SHA256 56c03af55bf70e47add7a8a2d13baac3c7b8e86d848f048a40d21b4f74636e43
-EBUILD aria2-0.15.1.ebuild 1953 RMD160 bf8df60a0fe474b6f052eae9afb9cbcbd6553908 SHA1 0e40e7361653b79b05eb1eccaf0f1d6f75a6a95a SHA256 1151da7d72c89185460998c2568c222a4e1d1273f4d79fe6b7b777a73cec0599
-MISC ChangeLog 6842 RMD160 2039997bf96da9dda4721dccb0f9dfdf79dc6b69 SHA1 b4dce609c9895af72622567bbd42edd1e44664f5 SHA256 b219e07f5226d375fc11117f3b1528edb9264d2aef60d82531d791187c3ec393
+EBUILD aria2-0.15.1_p2.ebuild 1956 RMD160 b3b37a0cb898a6d827adf55c650b23c005803c68 SHA1 5f50211c08c3a09a4fc0d3c18733087f8edaa85f SHA256 4ae060ee876c778defba3cf0aa57444f8b06e9b416272934a0d1e55c4528ecb1
+MISC ChangeLog 7148 RMD160 0355430adf641f9e216cd1c053f82420e9fb19cb SHA1 176144c49ebfc40d8a7c9c8b55d4b86f5c019bb6 SHA256 0d417b1a9df7a66836d35a22cfbab3e0b0ef5a866391ffe494117238dd96da0e
 MISC metadata.xml 514 RMD160 f7e23c006b279021d7dd94d4a46706c3c005f2ad SHA1 d8e85ddaf037f803ab3b4845b23f54272ced3161 SHA256 9e58ee27cf928c68b592d3126bb677b2c5bf2b9a404ad564b2fe8ae35e668581
diff --git a/net-misc/aria2/aria2-0.13.1_p2.ebuild b/net-misc/aria2/aria2-0.13.1_p2.ebuild
deleted file mode 100644
index 936fd703d4bb..000000000000
--- a/net-misc/aria2/aria2-0.13.1_p2.ebuild
+++ /dev/null
@@ -1,66 +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.13.1_p2.ebuild,v 1.1 2008/05/19 11:35:25 dev-zero Exp $
-
-inherit eutils
-
-MY_P="aria2c-${PV/_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"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="ares bittorrent expat 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? (
-		!expat? ( >=dev-libs/libxml2-2.6.26 )
-		expat? ( dev-libs/expat )
-	)"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/0.13.1-broken_tests.patch" \
-		"${FILESDIR}/${PV}-missing_includes.patch"
-}
-
-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
-	# - links only against libxml2 and libexpat when metalink is enabled
-	econf \
-		$(use_enable nls) \
-		$(use_enable metalink) \
-		$(use_with expat libexpat) \
-		$(use_with !expat libxml2) \
-		$(use_enable bittorrent) \
-		--without-ares \
-		$(use_with ares libcares) \
-		${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.15.1.ebuild b/net-misc/aria2/aria2-0.15.1_p2.ebuild
index 4119ff6156ca..1a01d9dbb0ed 100644
--- a/net-misc/aria2/aria2-0.15.1.ebuild
+++ b/net-misc/aria2/aria2-0.15.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.15.1.ebuild,v 1.1 2008/07/31 19:25:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria2/aria2-0.15.1_p2.ebuild,v 1.1 2008/08/12 10:30:43 dev-zero Exp $
 
 MY_P="aria2c-${PV/_p/+}"
 
diff --git a/net-misc/aria2/files/0.13.1-broken_tests.patch b/net-misc/aria2/files/0.13.1-broken_tests.patch
deleted file mode 100644
index 20ab607e9bc4..000000000000
--- a/net-misc/aria2/files/0.13.1-broken_tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/HttpHeaderTest.cc.orig	2008-03-15 22:53:10.000000000 +0100
-+++ test/HttpHeaderTest.cc	2008-03-15 22:53:36.000000000 +0100
-@@ -37,9 +37,9 @@
-     
-     SharedHandle<Range> range = httpHeader.getRange();
-     
--    CPPUNIT_ASSERT_EQUAL(9223372036854775800LL, range->getStartByte());
--    CPPUNIT_ASSERT_EQUAL(9223372036854775801LL, range->getEndByte());
--    CPPUNIT_ASSERT_EQUAL(9223372036854775807LL, range->getEntityLength());
-+    CPPUNIT_ASSERT_EQUAL((int64_t)9223372036854775800LL, range->getStartByte());
-+    CPPUNIT_ASSERT_EQUAL((int64_t)9223372036854775801LL, range->getEndByte());
-+    CPPUNIT_ASSERT_EQUAL((int64_t)9223372036854775807LL, range->getEntityLength());
-   }
- }
- 
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
deleted file mode 100644
index 8d57a33c7578..000000000000
--- a/net-misc/aria2/files/0.13.1_p2-missing_includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 {
-