gentoo resync : 14.12.2020

7 files changed, 56 insertions, 3 deletions

diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 20045df2193d..f6b960296d9e 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
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
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 61037a4d9e79..c4f2a890fe16 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -1,3 +1,4 @@
+AUX gnustep-gui-0.28.0-icu68.patch 386 BLAKE2B 0141baf418586ec2fac3614cc97db043b4f453a6aa59fceaec430f949ef3c7cbc5eac08b84090a1da5ec9fc309ab0730224ce667da87a815e3e424bc4667fa99 SHA512 3260b694a6fd69b6db78b09c372705e35aa86fa741d1d4c1541a51ff2457eef2adcb825f1a7a3127c3e15eced50eee7f4731eb7fec3068c69ad062cd541cd7c9
 DIST gnustep-gui-0.25.0.tar.gz 2882556 BLAKE2B 65ac762c5dcc0419d275f2418de695131f87df804350c93dfbcde3a33d7ddd3038b1a4a1fdef2a4b0bfce2a75d21b5b5b46b6837830d701884324ae3bd394b7d SHA512 568c0c9160febbd9bc563bfc7fbec024bc583a2d6ccfb54e527630f1e761a51f57f984a8b83f06cab97f85e3eec183386057fed2d551a383a16cecb60f102dc2
 DIST gnustep-gui-0.25.1.tar.gz 2888779 BLAKE2B 4d11442660b746e4667d3472dadebff93768254efbd8b7548230c5c0df6d4727d582e720ffbd61a5e79ca89735eb104ff7a88dede5932569b2c1d111a30540db SHA512 d69416c471d4f2fc9971e4aaddc5471b13854d00be6e03b78c3e89f9e7f90285c9024fc6992811296434d5dadf8ac02bcb69a1ceaa1c651461f83778165328e8
 DIST gnustep-gui-0.26.2.tar.gz 2860931 BLAKE2B f597901e3a8d3f2d9a334cdcb7f1c89d15555761dc6f99d80ae56bca3b2be553abbadc6f3616f98d45f50efe4accb7f8cd119aad1a5a7ad019572fbf0c65d9df SHA512 165106d96e933b101ca13cc8643c13626165cb2a49794b34a0e898b288c24b9c7e68115362bd363518f0abf2b21341a0746e2d331f320ab0a0685209f3406800
@@ -7,5 +8,5 @@ EBUILD gnustep-gui-0.25.0.ebuild 1333 BLAKE2B f8b5ba244df625a1b037f7fedcbd55609f
 EBUILD gnustep-gui-0.25.1.ebuild 1337 BLAKE2B b0274190c15fa9984796dd02c2b6aba443bd3a18bf520981bac7c2aca47815e864b7f403cd26dbbbe82892edbeb058c023313a40b3f3f2a66bafe1dcd332af34 SHA512 428966d3b614a7380d736f126b9adac62eba14055ae69f6dd7e9df2fad23285d87f576597ad1fa6308500b6bac65a2f578a7255ed89d6d682b71c226082c5d2b
 EBUILD gnustep-gui-0.26.2.ebuild 1337 BLAKE2B 5050246678e2f594b8837884cb553ddc28cefa440806bad3e5a85cbfd1d88ef38723311db9755bbb2c01e5611c8c4753c3bc08d78f3ed1631622261432e37661 SHA512 55b2b510492db15dfab23a8a497ef6dd93dea3c6a84ca77dad5b1a5dc17a27d9816ffb274a22758fffd43cfec866845f97635cc56c74ded006b327457dbb24aa
 EBUILD gnustep-gui-0.27.0.ebuild 1337 BLAKE2B 709492d606a37ae0be199d0160e7155321e6cf9f339da79b12bd8f4304d727dd595611bb7780418a3f72617a1129030347f5e17aeae994f95b66bee306b52c74 SHA512 c4883346b856a4652fdd3dce8ef96094f189073ac0b4a516760a06e828c05c1c7037897058b41396da7e7ae5277c63f81b7888391f618053cd1bbb48f4fd4245
-EBUILD gnustep-gui-0.28.0.ebuild 1337 BLAKE2B cea2a2f1b414a086e8f5304823e6a9175d4d7962bd1b397059c30ce21a1af988de2161a5c79aa8a2f2f6cef2e83d6f8eda9e003eb92d3ca0b06aa289eef50def SHA512 76826c2115d7083e6b165ab9201d508d1e57a74dd96ca61c97c4fce9082f3f437df6572c04d3adc505d9e6d8eab407f2336ef774a22b3543fb5448f680051832
+EBUILD gnustep-gui-0.28.0.ebuild 1381 BLAKE2B dad87d0e496caea99d247d30cd7700a92725f19e2e99e737e52c406110291c7a689f45f2ac4a4cd3092604213da5a80be46984ff66eb99fb74282c9a3e32b592 SHA512 4e19a45babc6300d469fd66644a5129dc4e3689abbce6ac3c2d523c7582862cc4c07b0aa078b2868cf98affbc425544d27fee6bf028cd8329ba18ece668f6491
 MISC metadata.xml 1544 BLAKE2B 1a590eccc9a65316966873ab9517de3798d31ffbcc19ac864665a6f96289e8483e9b05cd38d32a611de6bcafedc205ef8616214632368ba7a15e2a7793f461d6 SHA512 1c7a16c090c18044752d1033f1884b4ac49ced4f0cc97903b9c3a0b037f06072e291a9d02fd4855682233196b120b60344fedf978049a29ef9c44f0546beea4e
diff --git a/gnustep-base/gnustep-gui/files/gnustep-gui-0.28.0-icu68.patch b/gnustep-base/gnustep-gui/files/gnustep-gui-0.28.0-icu68.patch
new file mode 100644
index 000000000000..5bda307b951d
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gnustep-gui-0.28.0-icu68.patch
@@ -0,0 +1,15 @@
+--- a/Headers/Additions/GNUstepGUI/GSCharacterPanel.h.old
++++ b/Headers/Additions/GNUstepGUI/GSCharacterPanel.h
+@@ -26,6 +26,12 @@
+    Free Software Foundation, 51 Franklin Street, Fifth Floor, 
+    Boston, MA 02110-1301, USA.
+ */ 
++#ifndef TRUE
++#define TRUE 1
++#endif
++#ifndef FALSE
++#define FALSE 0
++#endif
+ 
+ #ifndef _GNUstep_H_GSCharacterPanel
+ #define _GNUstep_H_GSCharacterPanel
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.28.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.28.0.ebuild
index 9671dea99284..4b7effe4b8ff 100644
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.28.0.ebuild
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.28.0.ebuild
@@ -27,6 +27,8 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 	speech? ( app-accessibility/flite )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-icu68.patch )
+
 src_prepare() {
 	gnustep-base_src_prepare