gentoo resync : 02.06.2018

3 files changed, 47 insertions, 1 deletions

diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 704ca456567a..d4d2755638cb 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,7 +1,8 @@
+AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
 EBUILD aria2-1.33.1.ebuild 4277 BLAKE2B 8fe6f7b2df6988e9e89ae3da97d7d6561b28ac0fe4d3891147c04915158acfa806706fbb3152edb21a92ab6b7c6eb1413cdb36b03512ec45e4477e93591fc44d SHA512 5b79fa4264165da13935a75b20edb66edf315e7cb37180e0f02723209190d1c455b950844464557b7d5461d3048559a30835a8d7d067ab37cbf62d4227f221f3
-EBUILD aria2-1.34.0.ebuild 4279 BLAKE2B 9cf69f77d7c677d9e16e4df5cd996b9b890442458942f9233b012570118e45d5bc62f1b912e5f3eac2d803c9d330300d9f0ee95e6920622265ef97a86acbf2b4 SHA512 19294b11d91156db6aaea36fea044b40f76687d1fd25f6b5271a6984f441e0ab463b3e8af7ea6b9e51d000b8247a96f133da6a9e101bfbc616f99f1e88016902
+EBUILD aria2-1.34.0.ebuild 4324 BLAKE2B 9893b39ea8e7a7445ddcba77896f123ea076ef2a716e113da6dece94b0a83618b21e12c2c0733c1015dc389606b38245294ccf98f30d35c2245b433fe5becb9e SHA512 7a38eeb6f2017a5a2a18720f27ffdaeda028221f71f88cfe4074fb32962a8f4cf9c12290610788e614e8013b56acc1606b32f57e669ae9a45c2a2b3aa978b265
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
index 330ad0add544..aa58515c9fb6 100644
--- a/net-misc/aria2/aria2-1.34.0.ebuild
+++ b/net-misc/aria2/aria2-1.34.0.ebuild
@@ -63,6 +63,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-make_unique.patch
 	default
 	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
 }
diff --git a/net-misc/aria2/files/aria2-1.34.0-make_unique.patch b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
new file mode 100644
index 000000000000..448d6cfe7753
--- /dev/null
+++ b/net-misc/aria2/files/aria2-1.34.0-make_unique.patch
@@ -0,0 +1,44 @@
+From e8e04d6f22a507e8374651d3d2343cd9fb986993 Mon Sep 17 00:00:00 2001
+From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Date: Thu, 17 May 2018 18:39:44 +0900
+Subject: [PATCH] Fix build failure when InternalDHKeyExchange is used
+
+---
+ src/bignum.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/bignum.h b/src/bignum.h
+index e59ab6bbf..5fb4402bc 100644
+--- a/src/bignum.h
++++ b/src/bignum.h
+@@ -19,6 +19,8 @@
+ #include <memory>
+ #include <stdint.h>
+ 
++#include "a2functional.h"
++
+ namespace bignum {
+ 
+ template <size_t dim> class ulong {
+@@ -31,17 +33,17 @@ template <size_t dim> class ulong {
+   std::unique_ptr<char_t[]> buf_;
+ 
+ public:
+-  inline ulong() : buf_(make_unique<char_t[]>(dim)) {}
+-  inline ulong(size_t t) : buf_(make_unique<char_t[]>(dim))
++  inline ulong() : buf_(aria2::make_unique<char_t[]>(dim)) {}
++  inline ulong(size_t t) : buf_(aria2::make_unique<char_t[]>(dim))
+   {
+     memcpy(buf_.get(), (char_t*)&t, sizeof(t));
+   }
+-  inline ulong(const ulong<dim>& rhs) : buf_(make_unique<char_t[]>(dim))
++  inline ulong(const ulong<dim>& rhs) : buf_(aria2::make_unique<char_t[]>(dim))
+   {
+     memcpy(buf_.get(), rhs.buf_.get(), dim);
+   }
+   explicit inline ulong(const char_t* data, size_t size)
+-      : buf_(make_unique<char_t[]>(dim))
++      : buf_(aria2::make_unique<char_t[]>(dim))
+   {
+     if (size > dim) {
+       throw std::bad_alloc();