gentoo resync : 15.12.2019

4 files changed, 67 insertions, 0 deletions

diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
index 6c359a4dacb7..1e259a038525 100644
--- a/gnustep-apps/cenon/Manifest
+++ b/gnustep-apps/cenon/Manifest
@@ -1,6 +1,10 @@
 AUX cenon-4.0.2-check-return-value.patch 1416 BLAKE2B fa71100d4dc75119f3b853ad246ce81a9703d26fd1a90ed8a40cf34d1c472f15a94c5328e333b616d820aef9bbf7d6426b612ef1b92c118eeda90595bedbf372 SHA512 07cd48ed24fc791a5b3921cae99b4bcd9a36167b1d4c376881b82f420c7870ea2ae02aaf1cade56bc88b3f306154e60d3e64a9c2b6fe880ead317250e0ada921
 AUX cenon-4.0.2-gnustep-gui-0.24-support.patch 7456 BLAKE2B 87be676970631e905cef75c1d4f7fa4b49449c24987d561851a888e0e510d18ed645047baf8b50db42ef045fc49f2de34a7c6878b2598eca5b5ad67a14b38439 SHA512 a740fda5548284d4d6ad46d972c19b23382b6d0e4b92573c9edebe1eb362f13863bc9e8b50fcfd0c9f450fea979ba781ce3723fe692f862ed23fc0e7f02b23b7
 AUX cenon-4.0.2-install.patch 690 BLAKE2B 64eff078e98b8d4052af2801517c0712384222007eb3af343f92793a42d4f4b5fdcc347b70b8832062471b73a13eb32d811de7a26b18e0b70005d4cc57b3de1c SHA512 fece9ed365b6fa5ca2b897b64c073eb780c6270f6e7f8c7e92748c54626cda3a47872245869f4e3ba8b8fbd9ee8bf8665b0feb1574daca006f828d363e95ad21
+AUX cenon-4.0.6-install.patch 719 BLAKE2B 25fba2bfcb4489983513889331ac37e9c556cd7033fab0681cd63a37b79d2a151b0ab114b65881ce88488aa559d83204570b318a67e894a277877229d3c7adc4 SHA512 4e8dc48b32baf8b5624f567ed9b8884735831bac3a6af74828af52b8738fe94bb296e17ea7a6929fd63de36d5f74ddf00cc690151c29483d0aa7373e3cff607d
+AUX cenon-4.0.6-invalid_array_syntax.patch 828 BLAKE2B c153de2685750ced71862e292d5e754e08b6aa0593d561b02e273a504265c488565c3b30aecdc2d517ea921bcc9dbd1b269baa12caf61fd9e7b42f0ebb5f5fc5 SHA512 f6520c392c4aa54979e669927e9b6e6103446b725a4bc9809f5343f0da70b4f454b2711ecb37fcfbd63f372af045d43d6a6013c885d28581fa29801ace65d471
 DIST Cenon-4.0.2.tar.bz2 4150615 BLAKE2B 75252c6495c0cdba32f18e31674ff1c4f8e3d6c7f94b56ac763bcd7d8bcb401fe6817e0a06642dc927ff87c32956e9277a777a7744a8a33135a4e3a76aa511cc SHA512 94bf95dbdb8fbe9c21fbe80cbc33fbe376c598cf79be295cb1045a0ac888da5363f388f3f051d593ca47f6c1fcbade2825389aec5da328c59158a1e5da89db75
+DIST Cenon-4.0.6.tar.bz2 10931177 BLAKE2B 40b62313360833b7ee3677143014e7cbe90b79290e9bdd1afe01c411bd4382d792354c6529f84c89eeb2be1c0e7ac7ce5f9557148014af07f46fc223932b20d4 SHA512 7fe4847cf4b2bc2a8f46e42d9e24e35dc42d0d7688ed02ea844cac562355611c64d3a1f0a90ae379db28415b40bb2fb38c2faf8c67bcc5ef7d5512cbc7452a3a
 EBUILD cenon-4.0.2-r1.ebuild 677 BLAKE2B 6ceb3cd274d1c4f3f24713fbf6fc26a7527bd89cf905eacd3ae8b215cc6aeb040b804386ef5a11b5801007f1c3a39b717e4a2c53ddd04d2bd28a222052c82716 SHA512 f52dfb053603ecfee1a702e9e6ed28d3247401ebcc68aae84af489c9d3878bb8040a7113bbc50fe90fa8ffc1e9de190e5b9e7819aac56fe8fee434e500b36ee9
+EBUILD cenon-4.0.6.ebuild 544 BLAKE2B e277f45b189b05b9a2b60093781ebdeb2fc319f1fa61a12c79d4a13c9394dbf32be3c200c16b0ee4eac1148a757946d7350906afa3c49b533ac37dbec3c7d78c SHA512 2e9c097f554ff81983c08e9e4ac6410b00c991438821b8034e05fb3500acb9edf8926bd61e87770e24c04789e4145da06b06d082021823caa01a668dd302d7eb
 MISC metadata.xml 447 BLAKE2B cb51c659c741f694f0e13e16113d92e3211b52105bdaa29754c0f3ed040dd6d37bb1873b438d779a6f26080a23a25659a349405c28e4a05f0949c8472ed8d300 SHA512 8b1bf24888d06c487d4601bd31d5184070554ecd59923a3de482b4fcce6f5130c706f68d4b35d1545be4a1fbbd76ac36f3072df1c6f5e92c03d8ee3d566b72a3
diff --git a/gnustep-apps/cenon/cenon-4.0.6.ebuild b/gnustep-apps/cenon/cenon-4.0.6.ebuild
new file mode 100644
index 000000000000..512edd10e9d2
--- /dev/null
+++ b/gnustep-apps/cenon/cenon-4.0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnustep-2
+
+S=${WORKDIR}/${PN/c/C}
+
+DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
+HOMEPAGE="http://www.cenon.info/"
+SRC_URI="http://www.cenon.zone/download/source/${P/c/C}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="Cenon"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=gnustep-libs/cenonlibrary-4.0.0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+	"${FILESDIR}"/${P}-invalid_array_syntax.patch
+	)
diff --git a/gnustep-apps/cenon/files/cenon-4.0.6-install.patch b/gnustep-apps/cenon/files/cenon-4.0.6-install.patch
new file mode 100644
index 000000000000..b4b78d6e0a6c
--- /dev/null
+++ b/gnustep-apps/cenon/files/cenon-4.0.6-install.patch
@@ -0,0 +1,20 @@
+diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
+--- Cenon.orig/GNUmakefile.postamble	2019-12-05 22:46:35.156776358 +0100
++++ Cenon/GNUmakefile.postamble	2019-12-05 22:46:50.725769361 +0100
+@@ -18,13 +18,13 @@
+ # before-install::
+ 
+ # Things to do after installing
+-after-install::
++#after-install::
+ 	# copy library
+ 	#rm -R $(GNUSTEP_LIBRARY)/$(APP_NAME)
+ 	#mkdir $(GNUSTEP_LIBRARY)/
+-	cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
++	#cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
+ 	# set permissions (rrr)
+-	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
++	#chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
+ 	#chmod -R ugo+rX $(GNUSTEP_LIBRARY)/$(APP_NAME)
+ 
+ # Things to do before uninstalling
diff --git a/gnustep-apps/cenon/files/cenon-4.0.6-invalid_array_syntax.patch b/gnustep-apps/cenon/files/cenon-4.0.6-invalid_array_syntax.patch
new file mode 100644
index 000000000000..696a5c8d1754
--- /dev/null
+++ b/gnustep-apps/cenon/files/cenon-4.0.6-invalid_array_syntax.patch
@@ -0,0 +1,20 @@
+Decsription: Fix FTBFS due to invalid syntax that only works with Clang.
+Author: Yavor Doganov <yavor@gnu.org>
+Forwarded: info@cenon.com
+Last-Update: 2018-03-12
+---
+
+--- cenon.app.orig/VHFImport/PSImport.m
++++ cenon.app/VHFImport/PSImport.m
+@@ -180,7 +180,10 @@
+         NSString        *output;
+ 
+         [task setLaunchPath: @"/bin/sh"];
+-        [task setArguments:@[@"-c", [NSString stringWithFormat:@"%@ -h | grep %@", gsPath, gsDev]] ];
++        [task setArguments:
++                [NSArray arrayWithObjects: @"-c",
++                         [NSString stringWithFormat:@"%@ -h | grep %@",
++                                   gsPath, gsDev], nil]];
+         [task setStandardOutput:pipe];
+         [task launch];
+         output = [[NSString alloc] initWithData:[file readDataToEndOfFile] encoding:NSUTF8StringEncoding];