gentoo resync : 14.12.2020

3 files changed, 37 insertions, 2 deletions

diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index ac55783465df..830e74c2757f 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,4 +1,5 @@
 AUX gnustep-base-1.26.0-no_compress_man.patch 1589 BLAKE2B 1c0096fe253c6cd0b61d09548941ddcd9de4d59fff9f6d902d613e15ba338f8434d77b8dd318d964a0e1dae0c84f850f617bb94b4c9aea490ebc282630afedac SHA512 68ab40d44eecbb8237dde1aec60a1482be4a78a591c145558c9278cef82ce3ffd4ec7584c7549c3adb247d352a8347cfac957e9b9ba28a592b2c784fa99c6114
+AUX gnustep-base-1.27.0-icu68.patch 875 BLAKE2B d622e9ee420a626f306b90239a2395153909328d31eeb656020848ffdcd9c154dcc43409477bcd88c06a1f8149fe47ebd5d8307ee0dfd427ebe9cd03445aaa41 SHA512 b4659bd5bcccbd2e1d30d4b3cf6f7040eb242aba6e62e2f411be35aa98c0f7df57a688e0314767770024fb315bcb6724749f9956dced6bcc58f46b00e66f0e95
 DIST gnustep-base-1.24.9.tar.gz 3561094 BLAKE2B a50e92ae774826082e743581425cfaab6bcbcdbf65a88df4d58988d3c6723e5d3d76d09cf57b4f9278c489e2ff0d178257e2be1c7147a284d8624f3629aaf4f4 SHA512 baaa3541edf48a5d902f706f9dad261378bf65e5d89f7308ece6a1fe55c348506df4b6d474ae17cdf0072f1e8dec1b2050d59413abe28bd001d5717c54a3ab96
 DIST gnustep-base-1.25.0.tar.gz 3528599 BLAKE2B aa86de9dc26fb48f49bdd796fc25863e8b1baa48a7c8a1536cc39497843b8d37f02e1cc72ea343795d1be6392a6679a4810ae62e6f9c5ec6c34f9ee099f32746 SHA512 0c38baa439a87557e054e37ed7b337e9f90f349fd6683551cf6482a0a53c247e2ca23b7df9ab369e8819a7d0f9f29e8a8dc639b148ec1c0223764796dbbd3608
 DIST gnustep-base-1.25.1.tar.gz 3475169 BLAKE2B 4e2d26ad5782e117f778d298add4c92d40f7c6c73d5aff9692d8eaf7cf06d6ccf6487282e03d4f86bb434d0c7c327b3d80187ca43fdc1c0ff282a246958448fc SHA512 a93c3b4c0fb7df4946ed52dc62c11dfa58f8606fc9666cc7ec7ff5e1c088b67608410b715680e801636bf5ce2caa08e172372f6cab94933459c5e870f962ab11
@@ -9,5 +10,5 @@ EBUILD gnustep-base-1.25.0.ebuild 1933 BLAKE2B 3d7143e4786c8adcee1fda9c697ce707b
 EBUILD gnustep-base-1.25.1.ebuild 1933 BLAKE2B 3d7143e4786c8adcee1fda9c697ce707be017e1828061aab229c5faf8aec747aa0411060aac896df04996b6b135e500f2441ecff1c92791ae72805d1e19264f5 SHA512 4d4a57a1ce6e104684433f9b41befb1be05b5dc55c1cb9b3c333e5324ca4ba80323e6e604e1c610161249d777ad117f4217d546a2e8b7956d5d29b361cb40057
 EBUILD gnustep-base-1.26.0-r1.ebuild 1956 BLAKE2B 3f2bda197b271d1cf643181d6eaffb480d4eca3a17ff17d3962d8bb19ce68dde0fc06889732e9e44cc8d7afa7ba92953861e26084fb88b1440be591a409f41e0 SHA512 5b5c4eafd7ce1ec7d27341c8b06a301dee200584f8178b76a01d3a94d29b1eae66983111147ac4841e25de18a577cbaea9bcce95d21d68424c4becd6565b9e63
 EBUILD gnustep-base-1.26.0.ebuild 1902 BLAKE2B e310658e9586169889f8ab45958ada974e36ef48cb59fa7de90db0b5557b7b5b52321a5ec0bf758789f7f81c4a6c06399d6467b02c9d9dd390d0dfece4594f5e SHA512 8eff2bd67c851a51aba1823d878ecf0bb468b18625d27cdd7da39899804ea780d84d6863a54abc120ac7c7f89d64fefe64a3f9da9a8b08a6f866f3bb51ee3fbc
-EBUILD gnustep-base-1.27.0.ebuild 1964 BLAKE2B 97a171342f244d88590b3386f45892ac96a5bdf91dc65f2e85147da8edfbe927e2b66a6168d42559e6a9a278ed6f3531e9c751d78001b8049521dbb3237165e2 SHA512 5855a687b5bbd1b04047bc51e33dbc5ada133f41a36ef3f1ab05dbe8aeaa93fe1464e7e3b8f43edb3d58456e5aec6d6518c7bbff5e140b0ffd946f5ac577397b
+EBUILD gnustep-base-1.27.0.ebuild 1997 BLAKE2B 9e327d4410976bb57a75a4bbaf3b3a83df2816766455d6d2460b823bd78754fb2e5d3e8a5c18727563e201f7b1a674ca3aba971500e17538b28b8a100304ee0f SHA512 60dd32e708323b4429dcef1271fa8aeeaa0bdbb3ee9396da0dc3d1f26e7dc2615d2e5c6cb62ec21652ed3b7f4afab039a6b8863d95afcce726897f5f5f92f011
 MISC metadata.xml 763 BLAKE2B 471a69f26f594d1081fcd22568ca563d6a8a3fb37c6aeead77e91805de28d2c652d0ebc7a4d9364440008ed563a083eefd1e2c9311ef9f0e95152f8ff8a7c93e SHA512 1adb2cc47580c492a91b7593731b7cd8763cd3d2e45945229346afebc2840be93855e8f62158d59663a49c775e3482bf142a3ef52e087696f7bbc8bc429178b3
diff --git a/gnustep-base/gnustep-base/files/gnustep-base-1.27.0-icu68.patch b/gnustep-base/gnustep-base/files/gnustep-base-1.27.0-icu68.patch
new file mode 100644
index 000000000000..2374d8e24976
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/gnustep-base-1.27.0-icu68.patch
@@ -0,0 +1,31 @@
+From 06fa7792a51cb970e5d010a393cb88eb127830d7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 17:18:09 +0100
+Subject: [PATCH] Fix compilation with ICU 68.
+
+---
+ Source/GSICUString.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/Source/GSICUString.h b/Source/GSICUString.h
+index a82447a51..15c21491d 100644
+--- a/Source/GSICUString.h
++++ b/Source/GSICUString.h
+@@ -2,6 +2,17 @@
+ #import <Foundation/NSException.h>
+ #include <unicode/utext.h>
+ 
++/*
++ * Define TRUE/FALSE to be used with UBool parameters, as these are no longer
++ * defined in ICU as of ICU 68.
++ */
++#ifndef TRUE
++#define TRUE 1
++#endif
++#ifndef FALSE
++#define FALSE 0
++#endif
++
+ /**
+  * Initialises a UText structure with an NSString.  If txt is NULL, then this
+  * allocates a new structure on the heap, otherwise it fills in the existing
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.27.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.27.0.ebuild
index 5c08a364b2a7..00a2ef6a004f 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.27.0.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.27.0.ebuild
@@ -28,7 +28,10 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.26.0-no_compress_man.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.0-no_compress_man.patch
+	"${FILESDIR}"/${P}-icu68.patch
+)
 
 src_configure() {
 	egnustep_env