From 92f9a70ad16ee4a446deecb5cc8e573af0c89765 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 16 May 2018 09:46:23 +0000
Subject: [PATCH] aria2: bump to 1.34.0, try to fix TEST(), add TEST_REQUIRES.
 (#2559)

Also update HOMEPAGE & SOURCE_URI.
---
 ...{aria2-1.33.1.recipe => aria2-1.34.0.recipe} | 17 +++++++++++------
 ...a2-1.33.1.patchset => aria2-1.34.0.patchset} |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)
 rename net-misc/aria2/{aria2-1.33.1.recipe => aria2-1.34.0.recipe} (88%)
 rename net-misc/aria2/patches/{aria2-1.33.1.patchset => aria2-1.34.0.patchset} (91%)

diff --git a/net-misc/aria2/aria2-1.33.1.recipe b/net-misc/aria2/aria2-1.34.0.recipe
similarity index 88%
rename from net-misc/aria2/aria2-1.33.1.recipe
rename to net-misc/aria2/aria2-1.34.0.recipe
index 81fa1e91b..bdc5d1822 100644
--- a/net-misc/aria2/aria2-1.33.1.recipe
+++ b/net-misc/aria2/aria2-1.34.0.recipe
@@ -7,12 +7,12 @@ BitTorrent at the same time, while the data downloaded from HTTP(S)/FTP \
 is uploaded to the BitTorrent swarm. Using Metalink's chunk checksums, \
 aria2 automatically validates chunks of data while downloading a file like \
 BitTorrent."
-HOMEPAGE="http://aria2.sourceforge.net"
-COPYRIGHT="2006-2014 Tatsuhiro Tsujikawa"
+HOMEPAGE="https://aria2.github.io/"
+COPYRIGHT="2006-2018 Tatsuhiro Tsujikawa"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://github.com/tatsuhiro-t/aria2/releases/download/release-$portVersion/aria2-$portVersion.tar.xz"
-CHECKSUM_SHA256="2539e4844f55a1f1f5c46ad42744335266053a69162e964d9a2d80a362c75e1b"
+REVISION="1"
+SOURCE_URI="https://github.com/aria2/aria2/releases/download/release-$portVersion/aria2-$portVersion.tar.xz"
+CHECKSUM_SHA256="3a44a802631606e138a9e172a3e9f5bcbaac43ce2895c1d8e2b46f30487e77a3"
 PATCHES="aria2-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
@@ -88,6 +88,11 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+TEST_REQUIRES="
+	cmd:cppunit_config$secondaryArchSuffix
+	devel:libcppunit$secondaryArchSuffix
+	"
+
 defineDebugInfoPackage aria2$secondaryArchSuffix \
 	"$libDir"/libaria2.so.$libVersion
 
@@ -116,5 +121,5 @@ INSTALL()
 
 TEST()
 {
-	make tests
+	make check
 }
diff --git a/net-misc/aria2/patches/aria2-1.33.1.patchset b/net-misc/aria2/patches/aria2-1.34.0.patchset
similarity index 91%
rename from net-misc/aria2/patches/aria2-1.33.1.patchset
rename to net-misc/aria2/patches/aria2-1.34.0.patchset
index cbb1faf70..c90ed1167 100644
--- a/net-misc/aria2/patches/aria2-1.33.1.patchset
+++ b/net-misc/aria2/patches/aria2-1.34.0.patchset
@@ -5,10 +5,10 @@ Subject: haiku: detect libnetwork
 
 
 diff --git a/configure.ac b/configure.ac
-index 863d36f..0a66ff1 100644
+index 1ab1d32..529a00e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -720,6 +720,9 @@ case "$host" in
+@@ -653,6 +653,9 @@ case "$host" in
      EXTRALIBS="$LIBS $EXTRALIBS"
      LIBS=$save_LIBS
      ;;
@@ -29,7 +29,7 @@ Subject: check SSL_OP_NO_TLSv1_1
 
 
 diff --git a/src/LibsslTLSContext.cc b/src/LibsslTLSContext.cc
-index fb74ccc..5147cab 100644
+index 62a5577..be6d12b 100644
 --- a/src/LibsslTLSContext.cc
 +++ b/src/LibsslTLSContext.cc
 @@ -113,7 +113,9 @@ OpenSSLTLSContext::OpenSSLTLSContext(TLSSessionSide side, TLSVersion minVer)