summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2018-02-04 08:04:31 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2018-02-04 08:04:31 +0300
commita36ba01282db267ea8c67d798806321e25bd5808 (patch)
tree31465540950b7a73af0a1e6c10ef1c3a242f6df7
parent461b4cbe51ac781bbdd79a53ae253362dc5c04f9 (diff)
paludis: whirlpool fixed by upstream
-rw-r--r--sys-apps/paludis/files/0001-use-correct-type-when-stringifying-whirlpool-checksu.patch25
-rw-r--r--sys-apps/paludis/paludis-scm.ebuild2
2 files changed, 1 insertions, 26 deletions
diff --git a/sys-apps/paludis/files/0001-use-correct-type-when-stringifying-whirlpool-checksu.patch b/sys-apps/paludis/files/0001-use-correct-type-when-stringifying-whirlpool-checksu.patch
deleted file mode 100644
index a98512c..0000000
--- a/sys-apps/paludis/files/0001-use-correct-type-when-stringifying-whirlpool-checksu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f2be6cf4d6ad2e8e19ce5ca2d58833f7af8af0c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20P=2E=20Michalik?= <lpmichalik@googlemail.com>
-Date: Mon, 10 Apr 2017 16:43:29 +0200
-Subject: [PATCH] use correct type when stringifying whirlpool checksum
-
----
- paludis/util/whirlpool.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/paludis/util/whirlpool.cc b/paludis/util/whirlpool.cc
-index 75ed86dee..5c2dd4826 100644
---- a/paludis/util/whirlpool.cc
-+++ b/paludis/util/whirlpool.cc
-@@ -455,7 +455,7 @@ Whirlpool::hexsum() const
- {
- std::stringstream result;
- result << std::hex << std::right << std::setfill('0');
-- for (unsigned long i : H)
-+ for (uint64_t i : H)
- result << std::setw(16) << from_bigendian(i);
- return result.str();
- }
---
-2.11.0
-
diff --git a/sys-apps/paludis/paludis-scm.ebuild b/sys-apps/paludis/paludis-scm.ebuild
index a08fa2d..81aaa66 100644
--- a/sys-apps/paludis/paludis-scm.ebuild
+++ b/sys-apps/paludis/paludis-scm.ebuild
@@ -77,7 +77,7 @@ src_prepare() {
# Fix the script shebang on Ruby scripts.
# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
- eapply "${FILESDIR}"/0001-use-correct-type-when-stringifying-whirlpool-checksu.patch
+# eapply "${FILESDIR}"/0001-use-correct-type-when-stringifying-whirlpool-checksu.patch
eapply "${FILESDIR}"/news_v2.patch
eapply_user