gentoo resync : 15.12.2019

7 files changed, 179 insertions, 0 deletions

diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 462ae83483cf..01c0ca816629 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
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];
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 5b076758f656..45f7b198907e 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -2,6 +2,8 @@ AUX sogod.confd 117 BLAKE2B c47c8a6376967682571cd62766d0cf2422f35dc5ecbf599c616a
 AUX sogod.initd 681 BLAKE2B b8a55f93a0e623bb5aa13d10658aba644cb9a532d7a5c02beeee8d7e01365944531e081afe77562da8da77a42bec10a125bd386ede063ad230e0135e8bd56c03 SHA512 d6925d49c24ff6ebfd989016a5c0a707c1bc866070cbd9e4e8eca867ec81fe1ad78bd6606b13349ac7d251f62bd85f239b42f65e1d22015c38b4ad6fe9058f4e
 DIST sogo-4.0.7.tar.gz 34455581 BLAKE2B 471ae8fc503fb2282cbd585286c0eede4e91e14bd9314a02089ffb0c69a8453538902cc26a4ebfdcacdce3d90f2d640221e1b452ad4b6a8064de89b1694eee7e SHA512 8e7eb946ab6ad8c47e6b612723675704602199b530c760ded5325f1230d89e7a812a61d9e652c7eca3050ed0bd0dd33d95faf2478f58a82dcba745cce4906675
 DIST sogo-4.0.8.tar.gz 34439405 BLAKE2B 603ef52d305c13e2d5d200b53143771ceb762c97f4f6e09aff31091f482bb43fa2638f88fcd676770b55da6e85c072dbf884c8cce20d2a71c8d62d0a98e30089 SHA512 7f8d7e3af2c92d7684f2ce3343fd9c079d567e2f09fc5ae1405e46b8eee460ab8e4349c03020bc8e55993472021633f9e37d3d8c3136a485dff1d32f45ba200a
+DIST sogo-4.1.1.tar.gz 34492410 BLAKE2B 43c15991eede15b58d22681297d7d2d8031ee189e4b843af7c44e52a915d89d30c181dc52c25e4784b0e9011f5d6f22bf070b9125491fe37360ced2b623c0f86 SHA512 e24d4b7f71eeed05dcb694ee07a03df6ac9a63d7fb9455f972add9c251f85e1418683a95de5b584b0db3a471d593c8595b343db1345fcb95235ba59a09235d5a
 EBUILD sogo-4.0.7.ebuild 2369 BLAKE2B 3a9de101f3fceec95c90578dcfaf3d9aac54a32e64c143168257b7cc1c3da888d9a0863c7540f3fcf1ade0bae175c96d680834dc4a15ed5314c5c28bda801482 SHA512 fffe2d8466b3e6acb26996e6d57f5b99df92b952c4a9f9cfcd5c3fd8cd0ecec1a2b1a3b572da0a743b938dc02a6549d205257fc817776eabdbb958297f11765e
 EBUILD sogo-4.0.8.ebuild 2420 BLAKE2B 412c6a0933dd68543322a73a86728dad3821d24362ece1c66ecac861983ca759c1fe7ee428b01e6b22a50a5aee1bf666ffce2bd0c6db94748a89ae6c947b4c45 SHA512 3d4dd66667ecc4e7abf18cc2e253b5fc2bacf19db291fc1b71dfd2f628a95ff7ae5f5fc21a969c6938b32a83aca8e4c5220f102e992e0eff6089bb852412cd5d
+EBUILD sogo-4.1.1.ebuild 2420 BLAKE2B 6a254dd340a320402e80134fedc5110966123e5defd2a4f9137347c6ced1e5cb64ef86dd3db161bcb7e94ac877f6474ea22e2b07911ea3e8a913aa7bba175405 SHA512 09403d0fa3560ae17afb4fe5f2996394b6092a1a2005d95f56b045f5461d35b1b56762d40673a96297d709f9c6b0d252969c1e8b4418d821ac9a61f5d505932d
 MISC metadata.xml 420 BLAKE2B 01ddf5e2497af3ba252d13d3e8b1f71ae8e96fd6166e83fbac50948ff34d5cd78f0ab5de9cfbc1381dd7ddb97eaef170428d73f6a40418690d29606ec0d1f5a2 SHA512 50781541f5c41a5fd2f2ecb5c0dc9cb8110691634471b572580cda5bcb5e8cf486edb959f95ddadb0af9cac319132030a0978f970c79d1eb23a3faeb9b5a200f
diff --git a/gnustep-apps/sogo/sogo-4.1.1.ebuild b/gnustep-apps/sogo/sogo-4.1.1.ebuild
new file mode 100644
index 000000000000..e7e2290ee3e0
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-4.1.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnustep-2 user vcs-snapshot
+
+DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
+HOMEPAGE="http://www.sogo.nu"
+SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="activesync gnutls libressl +ssl"
+
+RDEPEND="
+	dev-libs/libmemcached
+	net-misc/curl
+	net-misc/memcached
+	>=gnustep-libs/sope-${PV}[ldap]
+	activesync? ( dev-libs/libwbxml )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.3"
+
+pkg_pretend() {
+	if use ssl && use gnutls && use libressl ; then
+		ewarn "You have enabled both gnutls and libressl, but only"
+		ewarn "one provider can be active. Using gnutls!"
+	fi
+}
+
+pkg_setup() {
+	enewgroup sogo
+	enewuser sogo -1 /bin/bash /var/lib/sogo sogo
+}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	sed -e "s/validateArgs$//" -i configure \
+		|| die
+	if use activesync; then
+		sed -e 's/Tests\/Unit/ActiveSync &/g' \
+			-i GNUmakefile || die
+	fi
+
+	default
+}
+
+src_configure() {
+	local ssl_provider
+	if use ssl ; then
+		if use gnutls ; then
+			ssl_provider=gnutls
+		else
+			ssl_provider=ssl
+		fi
+	else
+		ssl_provider=none
+	fi
+
+	egnustep_env
+
+	./configure \
+		--disable-strip \
+		--prefix=/usr \
+		--with-ssl="${ssl_provider}" \
+		$(use_enable debug) \
+		|| die "configure failed"
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	newconfd "${FILESDIR}"/sogod.confd sogod
+	newinitd "${FILESDIR}"/sogod.initd sogod
+
+	insinto /etc/logrotate.d
+	newins Scripts/logrotate sogo
+	newdoc Apache/SOGo.conf SOGo-Apache.conf
+
+	insinto /etc/sogo
+	doins Scripts/sogo.conf
+
+	insinto /etc/cron.d
+	newins Scripts/sogo.cron sogo
+	keepdir /var/log/sogo
+
+	fowners sogo:sogo /var/log/sogo
+	fowners -R root:sogo /etc/sogo
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	elog "SOGo documentation is available online at:"
+	elog "http://www.sogo.nu/downloads/documentation.html"
+	elog
+	elog "Apache sample configuration file is available in:"
+	elog "/usr/share/doc/${PF}"
+	if use activesync; then
+		ewarn "In order to use the SOGo ActiveSync support code in production environments,"
+		ewarn "you need to get a proper usage license. Check the documentation for details."
+	fi
+}