gentoo resync : 21.09.2018

3 files changed, 64 insertions, 2 deletions

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index cf3922ad578a..904196781387 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1,8 +1,9 @@
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33e646f71ced61c5411ddc871ff42fb61d5e89d068441e72c33a99927a27cad206068eab70563db94d21f4aa9516e69da8c34d0e78c46f15b1561b2170d8d5ff SHA512 58c8acc766751b6f9122821b5958ef3756c4802e91ed7ed8915c54eb7c8c960c46734a8d76cc200c064e0dab5a1f0008f99a5dd4a1c51ecda7983bb84ef6d645
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
 AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2483 BLAKE2B 6bff0828e0678e269dc129be03f9bf1135933abefdb9190de5fe6afd214b9caa8b4283f65f30853b3ae118c5ade021a174fa164cee606b635f6587deabf47581 SHA512 802ee218e2c005760a8260271791df0891ef6392bec4fbbb5936df5a84db888b0b6f36055d0760c4929cb442adcc1433a363fa93eae6c163f296166028684daf
 DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3477 BLAKE2B 371dc9d92c3f07dde0c4adb5d8964a1d8e8200daeb0bb097cb04d4f31356109d5760222612be40ded76494df3ff2476b7ed765e83de32e12192a879cf5092238 SHA512 a3ffee8d55f0f9608ce8e64eacc3560b38f0cd899f443ede1c2bf3fa39bcffdad87e15529654312e3c58ddf5074f118f4e6d15f5f925961bfd4f4d6c4fedea43
+EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3526 BLAKE2B a38d02662aa047b7f9d505391a25be856d50267c9d917a9df7342b1afaec5122f22a4649d0ac8adfb2259eb0c01bbab1681c138280db191782711d4bd32436ef SHA512 b657555a4f49c09b9c06570dd9927a136b1341ef8ae5cd209ec73ce45a62e33fcd15fbf90b8a870f6a68f071b3e322e03fcd17f8fdfc04b1579a64b19bfea0cb
 EBUILD aegisub-9999.ebuild 3041 BLAKE2B 4c9adee1e3a308b1e7470d6badc8f9af87f68a7ca09d589328a591634f4286123d972c2a8a61859881cdedebcb73dd81a22c74fa5410caac102a2327cf7684b0 SHA512 d2231b788ff67fd79db1c8a353cd87d5e9959f496b80b88cd7ec89f380756b3defe3f0c69a703828b00d63020276fbe749618a555912724c65077914bafe0a9d
 MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
index 34d509212bae..d5b623eb234e 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -59,6 +59,8 @@ PATCHES=(
 	"${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch"
 	"${FILESDIR}/${PV}/${P}-support-system-gtest.patch"
 	"${FILESDIR}/${PV}/${P}-fix-icu59-build.patch"
+	"${FILESDIR}/${PV}/${P}-fix-icu62-build.patch"
+
 )
 
 aegisub_check_compiler() {
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch
new file mode 100644
index 000000000000..47508951e452
--- /dev/null
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch
@@ -0,0 +1,59 @@
+From d4461f65be5aa440506bd23e90e71aaf8f0ebada Mon Sep 17 00:00:00 2001
+From: sidneys <sidneys.github.io@outlook.com>
+Date: Sat, 31 Mar 2018 02:57:19 +0200
+Subject: [PATCH] fix(updated-macos-build): prefix icu method calls
+ (icu::BreakIterator, icu::Locale, icu::UnicodeString)
+
+---
+ libaegisub/common/character_count.cpp | 6 +++---
+ src/utils.cpp                         | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libaegisub/common/character_count.cpp b/libaegisub/common/character_count.cpp
+index 0b8c70b31..1276f74fb 100644
+--- a/libaegisub/common/character_count.cpp
++++ b/libaegisub/common/character_count.cpp
+@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
+ 	static std::once_flag token;
+ 	std::call_once(token, [&] {
+ 		UErrorCode status = U_ZERO_ERROR;
+-		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
++		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
+ 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
+ 	});
+ 
+@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
+ 
+ 	size_t count = 0;
+ 	auto pos = character_bi.first();
+-	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
++	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
+ 		if (!mask)
+ 			++count;
+ 		else {
+@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
+ 	auto& bi = get_break_iterator(&str[0], str.size());
+ 
+ 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
+-		if (end == BreakIterator::DONE)
++		if (end == icu::BreakIterator::DONE)
+ 			return str.size();
+ 		if (n == 0)
+ 			return pos;
+diff --git a/src/utils.cpp b/src/utils.cpp
+index 876c4c011..2416aa7a2 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
+ }
+ 
+ wxString LocalizedLanguageName(wxString const& lang) {
+-	Locale iculoc(lang.c_str());
++	icu::Locale iculoc(lang.c_str());
+ 	if (!iculoc.isBogus()) {
+-		UnicodeString ustr;
++		icu::UnicodeString ustr;
+ 		iculoc.getDisplayName(iculoc, ustr);
+ #ifdef _MSC_VER
+ 		return wxString(ustr.getBuffer());
+