gentoo resync : 22.12.2021

16 files changed, 240 insertions, 85 deletions

diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index a98f8cca041a..5f2bf7938c14 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index f2124dde65f8..c2825426f960 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,3 +1,5 @@
+AUX gworkspace-0.9.4-ImageViewerProtocol.patch 5624 BLAKE2B fdb61a9ac90d264dfc8e35729d4b20d201cee34634188caeff41660183405c9ed6f30aa25008d9f438d89da3795f7605330003b4d4553f25899fa651c4eb0ceb SHA512 2209941ad0aa46845b50372749560a8b940169cb72685deb4d7cba005b487a31717991982f277100272b42e83bf426f127dc99667c071c6dcff8679ccd495179
 DIST gworkspace-0.9.4.tar.gz 3855909 BLAKE2B 5a636ccfb4fa79acd91bce34d3b5fe8a6d7bccc3f2f1f5a3d9f19c8a91743ec19c2eae0930e81807c6a5f098761b65f17e86a3edc44da155c50c903284ea2b20 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7
+EBUILD gworkspace-0.9.4-r1.ebuild 935 BLAKE2B cdcb31c463bdb004f94ca69577d4627737883e017e66fdbe4691b8bedbcfc107282058d1f779e7c775df6a64c2ea61a6dfb48bf4e28ae4effb99d80a29cbdc60 SHA512 8e99501f13dc6d1905d9ca7e41ad5e0f03aeb6c3a0eb5c9cdfb955f73842ab5bfcc76d396bcbfcb4bbee61630d568c833bec7a143ab725cca427a6e0ee9d29f8
 EBUILD gworkspace-0.9.4.ebuild 877 BLAKE2B c7d08f264f2984e9a439332ae869d2d3a712d206139cd609f45d72c28d51ffad872746a1d82dba9aeb581b9f19d6b8268e79e6f2ab22a740465534dd63341a7d SHA512 b1b2fa6096b78e3dc1713da29966e720a37927d45766130a90be609112b973a1a57b74b9bb4089f7df9f56279be7a5a7de906fac5139efb38e95783251a8319e
 MISC metadata.xml 580 BLAKE2B 69183b63130865b14df3c4a8cffa3278e81b9daef6f5495489cd1d80bf3ee06ee38daca9acdd9c0bbb20e9242f175a69b00b5bf5a542c2ea7c90ddf974645cf1 SHA512 4dd48119a2940260a326a78e2d860b98b10575d4e55772647c46beaca04581bf46ffc8ed1342458a6c1bcb2a35f5ced435997a0cd5f677c79fd154e83b64a5e4
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch b/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch
new file mode 100644
index 000000000000..d2bfd54e60bf
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.9.4-ImageViewerProtocol.patch
@@ -0,0 +1,186 @@
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.h gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.h	2016-06-07 18:13:08.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.h	2021-12-06 14:18:12.024085590 +0100
+@@ -1,8 +1,9 @@
+ /* ImageViewer.h
+  *  
+- * Copyright (C) 2004-2016 Free Software Foundation, Inc.
++ * Copyright (C) 2004-2020 Free Software Foundation, Inc.
+  *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ *          Riccardo Mottola <rm@gnu.org>
+  * Date: January 2004
+  *
+  * This file is part of the GNUstep Inspector application
+@@ -36,6 +37,7 @@
+ @class NSWorkspace;
+ @class ProgressView;
+ @class ImageResizer;
++
+ @protocol ContentInspectorProtocol
+ 
+ - (void)contentsReadyAt:(NSString *)path;
+@@ -51,7 +53,7 @@
+ 
+ @end
+ 
+-@interface ImageViewer : NSView <ContentViewersProtocol>
++@interface ImageViewer : NSView <ContentViewersProtocol, ImageViewerProtocol>
+ {
+   NSArray *extsarr;
+   BOOL valid;	
+@@ -76,9 +78,9 @@
+   NSWorkspace *ws;
+ }
+ 
+-- (void)setResizer:(id)anObject;
++- (oneway void)setResizer:(id)anObject;
+ 
+-- (void)imageReady:(NSDictionary *)imginfo;
++- (oneway void)imageReady:(NSDictionary *)imginfo;
+ 
+ - (void)editFile:(id)sender;
+ 
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.m gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.m
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/ImageViewer.m	2016-06-07 18:13:08.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/ImageViewer.m	2021-12-06 14:18:12.024085590 +0100
+@@ -198,7 +198,7 @@
+   }
+ }
+ 
+-- (void)setResizer:(id)anObject
++- (oneway void)setResizer:(id)anObject
+ {
+     NSSize imsize = [imview bounds].size;
+ 
+@@ -207,6 +207,7 @@
+     [anObject setProtocolForProxy: @protocol(ImageResizerProtocol)];
+     resizer = (ImageResizer *)anObject;
+     RETAIN (resizer);
++    [resizer setProxy: self];
+     [self addSubview: progView]; 
+     [progView start];    
+     [resizer readImageAtPath: imagePath setSize: imsize];
+@@ -214,7 +215,7 @@
+ 
+ 
+ 
+-- (void)imageReady:(NSDictionary *)imginfo
++- (oneway void)imageReady:(NSDictionary *)imginfo
+ {
+   NSData *imgdata;
+   BOOL imgok;
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.h gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.h	2016-06-01 18:35:46.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.h	2021-12-06 14:18:12.024085590 +0100
+@@ -1,9 +1,10 @@
+ /* Resizer.m
+ h
+  *  
+- * Copyright (C) 2005-2016 Free Software Foundation, Inc.
++ * Copyright (C) 2005-2020 Free Software Foundation, Inc.
+  *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ *          Riccardo Mottola <rm@gnu.org>
+  * Date: May 2016
+  *
+  * This file is part of the GNUstep Inspector application
+@@ -23,14 +24,15 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+  */
+ 
+-
+-NSConnection *serverConnection;
++#import "ContentViewersProtocol.h"
+ 
+ @interface ImageResizer : NSObject
+ {
+-
++  id <ImageViewerProtocol> imageViewerProxy;
+ }
+ 
++- (void)setProxy:(id <ImageViewerProtocol>)ivp;
++
+ - (void)readImageAtPath:(NSString *)path
+                 setSize:(NSSize)imsize;
+ 
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.m gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.m
+--- gworkspace-0.9.4.orig/Inspector/ContentViewers/ImageViewer/Resizer.m	2016-06-07 17:28:36.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewers/ImageViewer/Resizer.m	2021-12-06 14:18:45.928073537 +0100
+@@ -33,24 +33,13 @@
+   do { if (GW_DEBUG_LOG) \
+     NSLog(format , ## args); } while (0)
+ 
+-@protocol ImageViewerProtocol
+-
+-- (oneway void)setResizer:(id)anObject;
+-
+-- (oneway void)imageReady:(NSDictionary *)dict;
+-
+-@end
+-
+-
+-
+-
+-
+ @implementation ImageResizer
+ 
+ + (void)connectWithPorts:(NSArray *)portArray
+ {
+   NSAutoreleasePool *pool;
+   ImageResizer *serverObject;
++  NSConnection *serverConnection;
+ 
+   pool = [[NSAutoreleasePool alloc] init];
+ 
+@@ -77,6 +66,11 @@
+ 
+ #define MIX_LIM 16
+ 
++- (void)setProxy:(id <ImageViewerProtocol>)ivp
++{
++  imageViewerProxy = ivp;
++}
++
+ - (void)readImageAtPath:(NSString *)path
+                 setSize:(NSSize)imsize
+ {
+@@ -191,7 +185,7 @@
+     
+     RELEASE (srcImage);
+   }
+-  [(id <ImageViewerProtocol>)[serverConnection rootProxy] imageReady: info];
++  [imageViewerProxy imageReady: info];
+   RELEASE (arp);
+ }
+ 
+diff -Naur gworkspace-0.9.4.orig/Inspector/ContentViewersProtocol.h gworkspace-0.9.4/Inspector/ContentViewersProtocol.h
+--- gworkspace-0.9.4.orig/Inspector/ContentViewersProtocol.h	2010-06-16 19:45:53.000000000 +0200
++++ gworkspace-0.9.4/Inspector/ContentViewersProtocol.h	2021-12-06 14:18:12.025085590 +0100
+@@ -1,8 +1,9 @@
+ /* ContentViewersProtocol.h
+  *  
+- * Copyright (C) 2004 Free Software Foundation, Inc.
++ * Copyright (C) 2004-2020 Free Software Foundation, Inc.
+  *
+- * Author: Enrico Sersale <enrico@imago.ro>
++ * Authors: Enrico Sersale <enrico@imago.ro>
++ *          Riccardo Mottola <rm@gnu.org>
+  * Date: January 2004
+  *
+  * This file is part of the GNUstep GWorkspace application
+@@ -48,4 +49,12 @@
+ 
+ @end 
+ 
++/* Proxy for DO connection */
+ 
++@protocol ImageViewerProtocol
++
++- (oneway void)setResizer:(id)anObject;
++
++- (oneway void)imageReady:(NSDictionary *)dict;
++
++@end
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..774ee0d4ccf5
--- /dev/null
+++ b/gnustep-apps/gworkspace/gworkspace-0.9.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+DESCRIPTION="A workspace manager for GNUstep"
+HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+gwmetadata"
+
+DEPEND=">=gnustep-base/gnustep-gui-0.25.0
+	gwmetadata? (
+		>=gnustep-apps/systempreferences-1.0.1_p24791
+		>=dev-db/sqlite-3.2.8
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ImageViewerProtocol.patch )
+
+src_configure() {
+	local myconf=""
+	use kernel_linux && myconf="${myconf} --with-inotify"
+	use gwmetadata && myconf="${myconf} --enable-gwmetadata"
+
+	egnustep_env
+	econf ${myconf}
+}
+
+src_install() {
+	egnustep_env
+	egnustep_install
+
+	if use doc;
+	then
+		dodir /usr/share/doc/${PF}
+		cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
+	fi
+}
diff --git a/gnustep-apps/projectcenter/Manifest b/gnustep-apps/projectcenter/Manifest
index 8b75361488bf..4a74cd289f65 100644
--- a/gnustep-apps/projectcenter/Manifest
+++ b/gnustep-apps/projectcenter/Manifest
@@ -1,4 +1,3 @@
 DIST ProjectCenter-0.6.2.tar.gz 492409 BLAKE2B d34bd88c0a1b0cae86886a8f2ff322e595d002112c82883f14af66d2a33d2c66fbebee4b8f03ef8049aa054d255c88d594b2f0ffc5982fdbcf84d6ed97670d7d SHA512 91e6712fa03fcb7b6e8239f64ddf89dabb1b4c54f4799204e8e535c9c6ad430a5e98644e28af5b9727a0b5b57a866b4e0837f09e8aedfac863673508a7c67a78
-EBUILD projectcenter-0.6.2-r1.ebuild 413 BLAKE2B 4adc1a21a7f4be393024a80ba3a75d0ba721da21c00d7646ab2d35339f407c972dbe5bfed08d2812d1e8fe7a2ec622f226ddb9fe5e3c21435967a63322a826a1 SHA512 afca54b074b5d3c9880b8a290adc2234566d8e384f1aaad5034a5d6c0fd5f3b6cacc303d487fd81ccb24b035b09379d4ebe89fac2a241afe0f78b42d282ec84e
-EBUILD projectcenter-0.6.2.ebuild 441 BLAKE2B 88d2fc9dc6c92d5ff09946e1c7a86d2e977d729e28d79ebf362a3302dea42a75eb08e784f95401528003758e6cf406fdab7063e119b89ad524308a350538c1a2 SHA512 615782aaae9328279c3fa823b87a969ba9c0e6a4e3f8b5ca24e7237fdd3515be4d4372451cc9031d438f4758f56b5240d4b83bc9c3f9fee29edcce57cf98f4a1
+EBUILD projectcenter-0.6.2-r1.ebuild 410 BLAKE2B c116d2bd5a5b6b6b807e063c97e908e99439a0dbc311dfd5f829017f00e9b5ea60660785b430aa0e99e6207a94fb9c7e204f4c0dfef0d7b0b2fe7ef99b321627 SHA512 2737ad7a8cf568dc9c1224eec212fe225613c93f2c4199521dc2cdc56ffdc37332f5cc6220c6b6e8205cdf606c798ffbafa36e98290c87074baf7c1e74816bef
 MISC metadata.xml 558 BLAKE2B 18b3791fcc46bab9b9a086a5c5d0c97bbcb8391136fd9a720812f9045aba64d211112e1c1113100e21a5dffded5a47572015844e4f194efb376321be1b6baa96 SHA512 463b37621ec56b9eb4647470b65c243e5f9bf17ae2e070776d31717623c5f72360e06d9cf6fbbe4ae0935f983311ada93596b0840a56425a055e6fa67948065e
diff --git a/gnustep-apps/projectcenter/projectcenter-0.6.2-r1.ebuild b/gnustep-apps/projectcenter/projectcenter-0.6.2-r1.ebuild
index 431153812750..8af1bd9a0c5b 100644
--- a/gnustep-apps/projectcenter/projectcenter-0.6.2-r1.ebuild
+++ b/gnustep-apps/projectcenter/projectcenter-0.6.2-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An IDE for GNUstep"
 HOMEPAGE="http://www.gnustep.org/experience/ProjectCenter.html"
 SRC_URI="http://ftpmain.gnustep.org/pub/gnustep/dev-apps/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild b/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild
deleted file mode 100644
index 36b7e9692d73..000000000000
--- a/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/projectc/ProjectC}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An IDE for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/ProjectCenter.html"
-SRC_URI="http://ftpmain.gnustep.org/pub/gnustep/dev-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-devel/gdb-6.0"
diff --git a/gnustep-apps/systempreferences/Manifest b/gnustep-apps/systempreferences/Manifest
index 3177fe934afb..af17c6be3259 100644
--- a/gnustep-apps/systempreferences/Manifest
+++ b/gnustep-apps/systempreferences/Manifest
@@ -1,4 +1,3 @@
 DIST SystemPreferences-1.2.0.tar.gz 309496 BLAKE2B 5257ad38e9178967b70d074923dfea2b67eaf14db3fcdb5b53d7634735601d8aa2719efa568f368b26bb0029fe8b65b07e2fb9377386c4b77ddb63e9bc5a6a2b SHA512 22972ac0e51a19276375786759c2b7445691b2a0db4195a448ff1a68871561400fe1f4e194228e903f28d45416db3a00792b320f2749863300ea9117e7e99fbe
-EBUILD systempreferences-1.2.0-r1.ebuild 450 BLAKE2B 426b1486caae3d6c9b147e254bdef5ad81836d14807525a102eb44bb6475ee516d6dfcca3219c75e12a053d2715e786b583d14219f0c9387625d5b32adb38d5f SHA512 7c04a982d1054d86c68dd6b0af49f0a4ce31775f51694d2de79bc0a93cc9168764bd657a905e0a5e41129c3bdef0852a3935fb82429f28ecd732314361e1a15b
-EBUILD systempreferences-1.2.0.ebuild 450 BLAKE2B 469da5ac45988f855e822c60a208d3d1ef171bb89897f6c6de11c5d07211f7edeb611d74087706aec9fe6a0b531673613519ed900a03f425e579b4d97da179c2 SHA512 22890c3dcfe9e150ab69470df411c70d7dbb64bca1d6b06d82b733563c7ad0a760afd3af407b4d97de939b949b53c1ac77f1e93c2e7f7b75c3ac3fc2c051408d
+EBUILD systempreferences-1.2.0-r1.ebuild 447 BLAKE2B 7b248fd246306d09796da6de533ebaeb1bf5e6c7d28fae486b14ffa98a5f6f043c2459f15bf4aa754f8f3a9457fb1db47957c4f7caf0118b7242c66b3051b52d SHA512 97dad760f964299a1f6fd7c4b45e25bc60d56c996186ea989470d9fe41548874f3d347beab8868c4e5e0ff081ce182b349444f53bf35a4c08a2e276fa109659a
 MISC metadata.xml 258 BLAKE2B 2d5066672e93f52c887e0733cf4d05470fafb0128f75c44259fd046360f67f2d9571ddd143a8f6352477c39bacd8fcf6e1d8b6554b623a64fa230d4f3ed90653 SHA512 490a494189a1a1826ef34c2997b7032f80527568f07eecd4aabcc343aa8c7c142ea5423e1f874f288177aee6058e5342ae5805b644e15be12fa8bb280a43e905
diff --git a/gnustep-apps/systempreferences/systempreferences-1.2.0-r1.ebuild b/gnustep-apps/systempreferences/systempreferences-1.2.0-r1.ebuild
index ce8a8a434c9f..12264dbc89e4 100644
--- a/gnustep-apps/systempreferences/systempreferences-1.2.0-r1.ebuild
+++ b/gnustep-apps/systempreferences/systempreferences-1.2.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
 HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild b/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
deleted file mode 100644
index 7fe54791a5f4..000000000000
--- a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=SystemPreferences-${PV}
-DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
-HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/textedit/Manifest b/gnustep-apps/textedit/Manifest
index 402a2a9285b8..1ed0f4545c6c 100644
--- a/gnustep-apps/textedit/Manifest
+++ b/gnustep-apps/textedit/Manifest
@@ -1,6 +1,5 @@
 AUX textedit-0.95_pre20100427-gcc47.patch 1138 BLAKE2B c1d070e651a162a95f538bcd5ce67068d0c95e12f984c33f7e18dd2c1bda3eb514748930cf88fa20214680eecbdccce5261b0a3451433ef76771fe22241c73bc SHA512 d270ae159399c6a3c3bf8dc815aaf0cbc294151944ff08fe8691093fc8fa26332ec75a86afece97c3b73abb68660cc0e5fbe7ef1145b0a155aeda347c6c3c13e
 AUX textedit-0.95_pre20100427-nsinvalidargument.patch 706 BLAKE2B 3946e4e16f6de2312e779a9f0e16502d5a98d4581cf82e929212af171932ca1280311d837bda2cb5ae97e979211f66a9199f5aa063ad1078ab6f62bfeba2be2b SHA512 251418c683a8b29f47ddd8c67d59573673931576de6455b1365003f51f9c7a3ff53b4e3041e78fe0ed8eeaec62dd730a3c4da13cf30de9b0fea64423fc943f18
 DIST textedit-0.95_pre20100427.tar.gz 131332 BLAKE2B 443c54e243ca23bc1805778e912847f02bd118a9859a61f0c959a4cdeeba91f77daeb53f45f2de4d83defa421d11f3f5ae0c15585ee6ffbbe8dbb108f9a1b6e1 SHA512 df46ce1d0eb61ee776a0c4318f743f365d4d632ec0bbf9d04d1e6afbd35456f4a396fcafcac70e924475ccb2bb8dbbbf7dea18a68014f9634212c2803db59596
-EBUILD textedit-0.95_pre20100427-r1.ebuild 492 BLAKE2B 33ff3374977443a0b681bc7fbee29fa00b0e08046c344c63b640bdd5890e2e38f72fc12cb2e8caf02718a00199f2e422a5b0ee7f6a3fc25091f492904c995d5e SHA512 ce9e827ab863bc827dfd1597f9074d038cc31774786647c04d23c0d2b45809ee4b4619b5962a70e00df209a359cc6569791bcff3aa0a000742e35ef62d10a6ae
-EBUILD textedit-0.95_pre20100427-r2.ebuild 467 BLAKE2B 6a9e0297fd7224f689e135fbe69bb8d530195019f89e644768d841d9a60941cfe6a7eb7c5425cd8d37f4e3bbcb3d52dd7eb6b3199c0e40b8a10a9b15856b50c0 SHA512 9a3585281931f80cf5aa190b28a8ea5013ddab3ccd524ddf41cb02656c99c4e081dbe2655ec7d0baa7ca548b990574b9a88d0c70c6f620af1fe4e35f073cd13c
+EBUILD textedit-0.95_pre20100427-r2.ebuild 465 BLAKE2B c36766304383d716c139ee58d87686f73fd404695994ea46853faed484246e93ac70bf2639303109b4a8f17f81a7729ab569b8bd023e968f6ae3a78529ffc40a SHA512 eda64fc22fa3bb4d1af22ab422ac7e0c903b98f278472ad8f4902b22d0a3cb7ecf1c72c789c9243e599d84a7bd781ff0540364f9f5f7c496df072a0d6eeca086
 MISC metadata.xml 395 BLAKE2B 83a8301002b2b61158c44fa965bd7cf399bf81384df27f80b4d1e0eddeb42e52c15c46f0fa9542f9bdba3db44d48cdea872afeabe1a90d62f06fecb263c15493 SHA512 869ec585f8e5613b96abf5d8cb0e774e57a2d56327f704a023216db1dcfc8c6c637d7b00ea44e1ca4548a1db1933736341ce36008302f5318d43dff6d9983018
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
deleted file mode 100644
index 0b096dcb94e3..000000000000
--- a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch gnustep-2
-
-S=${WORKDIR}/TextEdit
-
-DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
-HOMEPAGE="http://www.nongnu.org/backbone/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	epatch "${FILESDIR}"/${P}-nsinvalidargument.patch
-}
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427-r2.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427-r2.ebuild
index e1b6b1a0f082..da31d5286796 100644
--- a/gnustep-apps/textedit/textedit-0.95_pre20100427-r2.ebuild
+++ b/gnustep-apps/textedit/textedit-0.95_pre20100427-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
 HOMEPAGE="http://www.nongnu.org/backbone/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/gnustep-apps/zipper/Manifest b/gnustep-apps/zipper/Manifest
index 21537a561644..249673985bfa 100644
--- a/gnustep-apps/zipper/Manifest
+++ b/gnustep-apps/zipper/Manifest
@@ -1,4 +1,3 @@
 DIST Zipper-1.5.tar.gz 81557 BLAKE2B cbd3201de2ba8edd10d3d9a4a748ab559ce1aeafb95ee68ef2a9f2b978d1e08585f519bd557676932a0a4e38a7b401150d6b80d91296df281fc50295cee47e77 SHA512 4b3353c0513f6fb4431778d03a4f980a592d19bbb3dcaface5c618b88a9c76bb7d067cca38fe20ccafc6c3636cd6b2e17b2a2e273673b2ba1153faa6f68ef348
-EBUILD zipper-1.5-r1.ebuild 404 BLAKE2B d5f86580a7dc7796449c760de004e4908a62d1f5c19aa2c5546945312de582309fd084c70a9156e0464c0829afa924cb1afc3cfd5280c9d04d904ffe367c5cce SHA512 9a5e75f8233ab644373fdfbf8f480a7606adc6c5c5d57a1b205ba795ede081b7447109c42a0bd93fa1e6f0e071f728fa43023b57a2921a071bfbb25e0fc9d1a3
-EBUILD zipper-1.5.ebuild 404 BLAKE2B 362dfbf5f987f411b201eca82451a2897dd27541f7e55154bcdac788329b2bfe10d52111136292a519f7b6195260e875a94582a3f5d2bb7782e612ddcfa12930 SHA512 5493ee9bf5e35cd7f77976d191ced6ae4d24ed612d4d4517388eae418073d5db09743fd4998d171d94b28e8d65fbc31b3b897c6c9c72ab0de9751f0c0e9800a8
+EBUILD zipper-1.5-r1.ebuild 401 BLAKE2B 2f06b50b5696538c6a342b96564979407937966a36ffde6d919d3cf9aba59dfdfc76f407b502cbf5873a6e5f2a7246f90b48748b88c117581d4d6abff4f15770 SHA512 6b41ce62a1202db9df0eec2caa2b377543d54acaa1cce9295d074dace032bf59d27e80a50f2c9073e97d552cff29147f2553a22c25a35d0b49a5b238f43f67f2
 MISC metadata.xml 254 BLAKE2B e0f44b5b45dfaee5d78327c0a786de9629c29eb26b6ef1e06e499f8ebc1c72c0d0cee20d68992fe79df2498d1664a49f2bae19b5a115b97896300d741cb4a0d1 SHA512 48119cf18eaf9e217ca2203ccbfcd28aa8c6d2f7de7b21e347ba3c4d5f23147908620d158fab2bf0b0211670d091949b5ee3bed0044d4c86656703d20bdc6ee1
diff --git a/gnustep-apps/zipper/zipper-1.5-r1.ebuild b/gnustep-apps/zipper/zipper-1.5-r1.ebuild
index 2edb247fc9a5..57f7fe38345b 100644
--- a/gnustep-apps/zipper/zipper-1.5-r1.ebuild
+++ b/gnustep-apps/zipper/zipper-1.5-r1.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://gap.nongnu.org/zipper"
 SRC_URI="https://savannah.nongnu.org/download/gap/${P/z/Z}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/gnustep-apps/zipper/zipper-1.5.ebuild b/gnustep-apps/zipper/zipper-1.5.ebuild
deleted file mode 100644
index 92dcaebe97af..000000000000
--- a/gnustep-apps/zipper/zipper-1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/z/Z}
-
-DESCRIPTION="Zipper is a tool for inspecting and extracting compressed archives"
-HOMEPAGE="http://gap.nongnu.org/zipper"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/z/Z}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""