gentoo resync : 25.09.2019

4 files changed, 16 insertions, 108 deletions

diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index be5d4952a4bd..d37f2d886626 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 080d4bc57bdb..5b076758f656 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,9 +1,7 @@
 AUX sogod.confd 117 BLAKE2B c47c8a6376967682571cd62766d0cf2422f35dc5ecbf599c616aee2cc5d6b2830ae3c4f3483924e15c59f44610eb8be656c21324f17270dd5eca6eb27780fe34 SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b
 AUX sogod.initd 681 BLAKE2B b8a55f93a0e623bb5aa13d10658aba644cb9a532d7a5c02beeee8d7e01365944531e081afe77562da8da77a42bec10a125bd386ede063ad230e0135e8bd56c03 SHA512 d6925d49c24ff6ebfd989016a5c0a707c1bc866070cbd9e4e8eca867ec81fe1ad78bd6606b13349ac7d251f62bd85f239b42f65e1d22015c38b4ad6fe9058f4e
-DIST sogo-3.2.10.tar.gz 32528115 BLAKE2B 7543f2165ed20026f00adfac7697fe6bc0e54f06b3c2ccb99fbfe0ddd14bcf8818521e161bb118789175c4245b67a8ad5dd0cd3ef71f61d34d869e1c0c2a4a93 SHA512 3dbd465592fd98968b32e251659a70306a781999bcfa9e63e142d75d7c9274edc7cbe5069881e939f0e9472f0ef8580e4e0f20059bfc97f8c69893d86c8cadf3
-DIST sogo-3.2.9.tar.gz 32443733 BLAKE2B 6a2ae4b5346bc48b9301263fe017308ee34aabcee1ce5444744b22c3af040533d98738fca29a195fd0f792d1d4470418840d0b1ff0e264c2ebc92877f420fa75 SHA512 070b3812d65598364d9204432678ea48705bf7481371e44442a13ad86d219415e24c579ad59212a7631922a527d30e69aeb17711c3abfc01960f663f4e0112a3
 DIST sogo-4.0.7.tar.gz 34455581 BLAKE2B 471ae8fc503fb2282cbd585286c0eede4e91e14bd9314a02089ffb0c69a8453538902cc26a4ebfdcacdce3d90f2d640221e1b452ad4b6a8064de89b1694eee7e SHA512 8e7eb946ab6ad8c47e6b612723675704602199b530c760ded5325f1230d89e7a812a61d9e652c7eca3050ed0bd0dd33d95faf2478f58a82dcba745cce4906675
-EBUILD sogo-3.2.10.ebuild 2083 BLAKE2B 3939ee6ada88110304d8680e374fc79df4bf07eaf15cd90034f700ac6dab55dccba6a760c4427122a646b4f7abf89441d132b3eca974ba9a88392d99990b9d23 SHA512 836b37feb3c0764782f4d63b5f9074a554f4765da4e7c0177c2227c4e091e29d93c62af13dbb30dfa9f5bc4fc87c152f6aa60839b6fd5f2d2313b58a57077a32
-EBUILD sogo-3.2.9.ebuild 2083 BLAKE2B 3939ee6ada88110304d8680e374fc79df4bf07eaf15cd90034f700ac6dab55dccba6a760c4427122a646b4f7abf89441d132b3eca974ba9a88392d99990b9d23 SHA512 836b37feb3c0764782f4d63b5f9074a554f4765da4e7c0177c2227c4e091e29d93c62af13dbb30dfa9f5bc4fc87c152f6aa60839b6fd5f2d2313b58a57077a32
+DIST sogo-4.0.8.tar.gz 34439405 BLAKE2B 603ef52d305c13e2d5d200b53143771ceb762c97f4f6e09aff31091f482bb43fa2638f88fcd676770b55da6e85c072dbf884c8cce20d2a71c8d62d0a98e30089 SHA512 7f8d7e3af2c92d7684f2ce3343fd9c079d567e2f09fc5ae1405e46b8eee460ab8e4349c03020bc8e55993472021633f9e37d3d8c3136a485dff1d32f45ba200a
 EBUILD sogo-4.0.7.ebuild 2369 BLAKE2B 3a9de101f3fceec95c90578dcfaf3d9aac54a32e64c143168257b7cc1c3da888d9a0863c7540f3fcf1ade0bae175c96d680834dc4a15ed5314c5c28bda801482 SHA512 fffe2d8466b3e6acb26996e6d57f5b99df92b952c4a9f9cfcd5c3fd8cd0ecec1a2b1a3b572da0a743b938dc02a6549d205257fc817776eabdbb958297f11765e
+EBUILD sogo-4.0.8.ebuild 2420 BLAKE2B 412c6a0933dd68543322a73a86728dad3821d24362ece1c66ecac861983ca759c1fe7ee428b01e6b22a50a5aee1bf666ffce2bd0c6db94748a89ae6c947b4c45 SHA512 3d4dd66667ecc4e7abf18cc2e253b5fc2bacf19db291fc1b71dfd2f628a95ff7ae5f5fc21a969c6938b32a83aca8e4c5220f102e992e0eff6089bb852412cd5d
 MISC metadata.xml 420 BLAKE2B 01ddf5e2497af3ba252d13d3e8b1f71ae8e96fd6166e83fbac50948ff34d5cd78f0ab5de9cfbc1381dd7ddb97eaef170428d73f6a40418690d29606ec0d1f5a2 SHA512 50781541f5c41a5fd2f2ecb5c0dc9cb8110691634471b572580cda5bcb5e8cf486edb959f95ddadb0af9cac319132030a0978f970c79d1eb23a3faeb9b5a200f
diff --git a/gnustep-apps/sogo/sogo-3.2.9.ebuild b/gnustep-apps/sogo/sogo-3.2.9.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="gnutls libressl +ssl"
-
-RDEPEND="
-	dev-libs/libmemcached
-	net-misc/curl
-	net-misc/memcached
-	>=gnustep-libs/sope-${PV}[ldap]
-	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() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
-	gnustep-base_src_prepare
-	sed -e "s/validateArgs$//" -i configure \
-		|| die "GNUstep.conf sed failed"
-
-	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}"
-}
diff --git a/gnustep-apps/sogo/sogo-3.2.10.ebuild b/gnustep-apps/sogo/sogo-4.0.8.ebuild
index 5c728f4bdae5..eb6d96d450d2 100644
--- a/gnustep-apps/sogo/sogo-3.2.10.ebuild
+++ b/gnustep-apps/sogo/sogo-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.t
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
+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= )
@@ -36,13 +37,18 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
+	enewgroup sogo
+	enewuser sogo -1 /bin/bash /var/lib/sogo sogo
 }
 
 src_prepare() {
 	gnustep-base_src_prepare
 	sed -e "s/validateArgs$//" -i configure \
-		|| die "GNUstep.conf sed failed"
+		|| die
+	if use activesync; then
+		sed -e 's/Tests\/Unit/ActiveSync &/g' \
+			-i GNUmakefile || die
+	fi
 
 	default
 }
@@ -97,4 +103,8 @@ pkg_postinst() {
 	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
 }