gentoo resync : 03.09.2021

4 files changed, 104 insertions, 3 deletions

diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index cd06c3dc10f8..358f369fa926 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 24ebec1acadc..b65e9fae9a02 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,5 +1,7 @@
 AUX sogod.confd 117 BLAKE2B c47c8a6376967682571cd62766d0cf2422f35dc5ecbf599c616aee2cc5d6b2830ae3c4f3483924e15c59f44610eb8be656c21324f17270dd5eca6eb27780fe34 SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b
 AUX sogod.initd 681 BLAKE2B b8a55f93a0e623bb5aa13d10658aba644cb9a532d7a5c02beeee8d7e01365944531e081afe77562da8da77a42bec10a125bd386ede063ad230e0135e8bd56c03 SHA512 d6925d49c24ff6ebfd989016a5c0a707c1bc866070cbd9e4e8eca867ec81fe1ad78bd6606b13349ac7d251f62bd85f239b42f65e1d22015c38b4ad6fe9058f4e
 DIST sogo-5.1.1.tar.gz 34263214 BLAKE2B c6a415602c931e4c703608b05036a508513eeee08d53e095ba8fa2a19ca509522ad190f8c1db78698e03818e25f221f76c097016017fc2f0aaba016043c1447e SHA512 6da4472f991da39449d8fdb05371bdc933cff8835d3501a3be475a263acb38ec10ccc43e719fb56e75fe6f5b4acd8f1f0fe3ebf1d8e734f7dbd8f28494baaff6
-EBUILD sogo-5.1.1.ebuild 2258 BLAKE2B ea57e8103a2f18ccd54ee29f8a3501d11e9ccbd54701ad51a88839328ee27330507d1ca4d69aab28bebfe012b33bfbf385d981985f7ada9ba45605cce507b68c SHA512 d33945a677daf0ebd76ab601f14f49f6ca833b3e69a1fb8dfd51e39a3a16aba6deced517785d54fc3eaddcaf0770fd8d3682be2face3cd8d833be1e6ef72f2ce
+DIST sogo-5.2.0.tar.gz 34444687 BLAKE2B e5b00bb9a5244086cd0ec39824f9afad0d84ef0b40e5257071a0184f9938ed88fc07654e1d136646cbf0aab08aab2492b17260933d441cfdb7d7baff3a618002 SHA512 d2ba521db1edb5c7b9901cc18f2901a1968627b5c1d535e999f321207906d44ced09fec3a9a02df9e6e4d4d315c742d253a60cc12c5c37970674fc6796e6743d
+EBUILD sogo-5.1.1.ebuild 2220 BLAKE2B aa6749fad8296509f4f336fa3e2c7d4e02d8fddbe98fbfab99ef478bd0c73903410e9698a53e199ebd53f2592e5a01a6171b41adaf93ecedde9504864945e2e6 SHA512 bae69e0b4a4d9644d74c3b4cd43a5a11b1716f3337d8278b5aea515e1a829d71b032bbd76de60fd69a4f0db243ad7336977269e973588f7514f85e86c136c4bb
+EBUILD sogo-5.2.0.ebuild 2220 BLAKE2B aa6749fad8296509f4f336fa3e2c7d4e02d8fddbe98fbfab99ef478bd0c73903410e9698a53e199ebd53f2592e5a01a6171b41adaf93ecedde9504864945e2e6 SHA512 bae69e0b4a4d9644d74c3b4cd43a5a11b1716f3337d8278b5aea515e1a829d71b032bbd76de60fd69a4f0db243ad7336977269e973588f7514f85e86c136c4bb
 MISC metadata.xml 528 BLAKE2B 368519c4c12f8f18491db8166cccc02ed774575baa0bc4c2501c87e84d5229b56e3975fc7c4e7eae3ceac0c80f6fd93e6f8b90b685d4fc18d02163094d57ecd2 SHA512 9b7b9e0c7f8b891458c5a8a07d98e860ae585a80d161e5429700d0c0c7ae6e007f4715e6b6c92b2c6c91670d17a24da69e7e002372d148011e577d252a24b8b0
diff --git a/gnustep-apps/sogo/sogo-5.1.1.ebuild b/gnustep-apps/sogo/sogo-5.1.1.ebuild
index 4738c446bcdd..6583d3cf3d86 100644
--- a/gnustep-apps/sogo/sogo-5.1.1.ebuild
+++ b/gnustep-apps/sogo/sogo-5.1.1.ebuild
@@ -63,8 +63,6 @@ src_configure() {
 		--with-ssl="${ssl_provider}" \
 		$(use_enable debug) \
 		$(use_enable sodium) \
-		--disable-mfa \
-		--disable-saml2 \
 		|| die "configure failed"
 }
 
diff --git a/gnustep-apps/sogo/sogo-5.2.0.ebuild b/gnustep-apps/sogo/sogo-5.2.0.ebuild
new file mode 100644
index 000000000000..6583d3cf3d86
--- /dev/null
+++ b/gnustep-apps/sogo/sogo-5.2.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnustep-2 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 +ssl sodium"
+
+RDEPEND="
+	acct-user/sogo
+	dev-libs/libmemcached
+	net-misc/curl
+	net-misc/memcached
+	>=gnustep-libs/sope-${PV}[ldap]
+	activesync? ( dev-libs/libwbxml )
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	sodium? ( dev-libs/libsodium:= )
+"
+DEPEND="${RDEPEND}
+	>=gnustep-base/gnustep-make-2.6.3"
+
+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
+
+	# saml2 requires liblasso, mfa requires liboath
+	./configure \
+		--disable-strip \
+		--prefix=/usr \
+		--with-ssl="${ssl_provider}" \
+		$(use_enable debug) \
+		$(use_enable sodium) \
+		|| 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
+}