gentoo resync : 15.01.2020

9 files changed, 12 insertions, 134 deletions

diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 01c0ca816629..cc047301e525 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/cdplayer/Manifest b/gnustep-apps/cdplayer/Manifest
index 5e67b91d6728..05cc0c8d2382 100644
--- a/gnustep-apps/cdplayer/Manifest
+++ b/gnustep-apps/cdplayer/Manifest
@@ -1,3 +1,3 @@
 DIST cdplayer-0.6.0.tar.gz 365695 BLAKE2B 3bf32a0c6ed70da3653be4dee6a59147e5d184d411f823a2d76bb67b0efe801a9cad2ca2b58529e567bafa4ef7a1726f5306870c5702de5d2c5287e5f81c3d5f SHA512 a777a8eb3b924fca7905b8063d9cbc64f1b3b5efd8f6ebcb4366c69e5c085d14cc416a25d6b389025d7ac2f80ee08e2adc742aa96c2c9f70170af22c807b7809
-EBUILD cdplayer-0.6.0.ebuild 794 BLAKE2B 0fd9ae6d5e111481293287a14b086053dff36f3f73a4d57e2b5dec18136d5bb8deba3b4660c0e4eac9dcb405f3758c69460c0631ffd3f95c3f66ce013ef3ac6c SHA512 4454f9a3d4392a6849573822a0085a36f47077e42b06ec27e3cfbfdcf415aaecb18565a60762c196953d26d84bdf253a0f7d9339e41b19b0bbefbbf8bf9fe92b
+EBUILD cdplayer-0.6.0.ebuild 771 BLAKE2B a31230ff7c2b9a8e331249b2fa967d836343721ec4c65a7acef8a79a4250ec377fcd521c0d0c9fe3acc70040bce864956207af1f02897b86706bafda82954e66 SHA512 c599329ace07a16a6dbd894b90c921ad5f8f2907a7fae8e4f8166cdfd4a704adc3d93134c5aa72094355a030feb12069bc6f801b596928e5d231d96a09d33775
 MISC metadata.xml 406 BLAKE2B 4a2fe010de2675027505344ccbeddd75371138a86edda29dd5c2bb7247bd034af9774935d194abffcca3bbe3b8ebdad0b728b1286d61fc43a21fc302ffcea396 SHA512 220c1fa1624b8498de6601dc6225e322025a50b60ceb40401ec740a74cb0c6097210e749e6724ca6c146af33e7b696590bed08b8a030af3b7b3a7f2c7a7d24b2
diff --git a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild b/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
index 673668b295a7..918d44818cf7 100644
--- a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
+++ b/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,8 +17,7 @@ DEPEND="dev-libs/libcdio
 	dev-libs/libcdio-paranoia
 	gnustep-apps/cynthiune
 	dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}
-	!gnustep-libs/cddb"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -e "s#cdda.h#paranoia/cdda.h#" \
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 45f7b198907e..7c000c2be20a 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,9 +1,6 @@
 AUX sogod.confd 117 BLAKE2B c47c8a6376967682571cd62766d0cf2422f35dc5ecbf599c616aee2cc5d6b2830ae3c4f3483924e15c59f44610eb8be656c21324f17270dd5eca6eb27780fe34 SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b
 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-r1.ebuild 2351 BLAKE2B 4e347f8f043b2166ab89a0c87ebd60cf9a186f18266d3452a3278392cc7bfe78d8aed22494b30b592a577e2107fa911c7559c4974709ca9c0a093d204b8805f1 SHA512 29cd451baa782af52ac9a956d75e1995544a2f426844ee5b2fe890c0f35cee06746faef344c51b2e0080969dc5c9b40953b1bbcb1cee7e610e2f08ad85a6003b
 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.0.7.ebuild b/gnustep-apps/sogo/sogo-4.0.7.ebuild
deleted file mode 100644
index 874bd00ce788..000000000000
--- a/gnustep-apps/sogo/sogo-4.0.7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="activesync 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
-	if use activesync; then
-		sed -e '/^SUBPROJECTS =/a\\tActiveSync \\' \
-			-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
-}
diff --git a/gnustep-apps/sogo/sogo-4.0.8.ebuild b/gnustep-apps/sogo/sogo-4.1.1-r1.ebuild
index eb6d96d450d2..70930df687f4 100644
--- a/gnustep-apps/sogo/sogo-4.0.8.ebuild
+++ b/gnustep-apps/sogo/sogo-4.1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnustep-2 user vcs-snapshot
+inherit gnustep-2 vcs-snapshot
 
 DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
 HOMEPAGE="http://www.sogo.nu"
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="activesync gnutls libressl +ssl"
 
 RDEPEND="
+	acct-user/sogo
 	dev-libs/libmemcached
 	net-misc/curl
 	net-misc/memcached
@@ -36,11 +37,6 @@ pkg_pretend() {
 	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 \
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
index 45a3429d1c0e..b44403b56b26 100644
--- a/gnustep-apps/terminal/Manifest
+++ b/gnustep-apps/terminal/Manifest
@@ -1,5 +1,5 @@
 DIST Terminal-0.9.8.tar.gz 110520 BLAKE2B 7f2f219cb76c8765b9fb4b5017834ab73a10429a8d0843a3c0b01909d54c21979867546d33c6bf07a4aed2cdbb1dc392effdf7e5e6b6f7096748e9fe9c96a13a SHA512 dc282f52662e0e65553562e6684af7ffab25afb62badee5c22c3b5d03c31a75d172b35706512e98d4fa14d68bd3643e0158c67ff61755deab77741d71bf219c0
 DIST Terminal-0.9.9.tar.gz 88762 BLAKE2B a160a5946df6e0261f7f04db4cceb11925f14c814d2c4d66fb34f2febf0efa5d8fb99834a1ba5642e5bd8f7a36d1d30ae830a83cc3c7a36657c8b50325d3c922 SHA512 456b0755ee6751eb3ef1c5e62e969b6981f7874cb358e071fc7edda93b2ebc698224c990ba4335aa62a7acefb9085723e924d1311c96ae8d34d0f8b2c7c920a3
-EBUILD terminal-0.9.8.ebuild 439 BLAKE2B 2eafd155ddaf18cae1e9e40ce7bd6dae2b5edc99dca0100c34f6b708fbe8c6c553f70e3b6e29337b4ff3a36e1edf042453c4e03b560efc894a4a4b286c5aaf14 SHA512 ff45673e19d94877e3ac86600d4d9518e2a3cf5476e5d2c43ebc520bf07af7271d798bac67e5696193574d879885d45911a298174dbc7c9c3c045caeef4ee4e5
-EBUILD terminal-0.9.9.ebuild 442 BLAKE2B c8461c571a7f7867d5488ed3d0494f385915e42b74eea620304a10d6e4082955b9819b8ab2e39a28dff01560deca0dc258b7597daad385d36285fbd88ae48a60 SHA512 3b6011f67f328d3063029a80189bbfaafa2a31c44bce2e05d2c4796e9ee178eaedc7f6ada67a3c28fd726b06909cc837fcc803e05c053966540e3c31a843e977
+EBUILD terminal-0.9.8.ebuild 370 BLAKE2B e63d55a89ccb6d2513484813f7d605096d4427fb644923507a79f2f5ca9915e1b3887be685a83f85e00eb3dc171a05105b73ab74c417e9ab16f0bae9cbf9e7f3 SHA512 9d51ececa5b8161bc67d0ff0f6af96d7cc882c30fc3f4d943c72c471e044f55a4c51d7ce6a26bb57487eeaf3f51b1c2a3b297e1bcb97cc0a18fdc06fb9487a1a
+EBUILD terminal-0.9.9.ebuild 373 BLAKE2B ed94d11d42bbc6b4f3e7601782c3a824a869ee1ea007701567627913e6edced1c056eda387cbc508919238da0256193f2a852464e3f5f105a66c856f0687dcb7 SHA512 7436654e593c5cba11862598f9522cee378dcb06531db75102d3a7f2daf2a097d647aebf635f1d820aab42f63ffbe1209462eb9e29004418fbb10e716f1d0054
 MISC metadata.xml 398 BLAKE2B 866baa4e6d912372f4f78059fba2d0244b6adb27910fd54609f2d22259159c1f8a958773e0eb2b0f94c37b34df5c2e65b96cf9ce0d5568ea31b36f5c3be64b22 SHA512 2be2b5a6ff68fad1a03fc4949ef471dc6c9a2c7c9b4401308b893b886c6af925ecf3c817a49bd9cbad3111154e64ccce2cf57cea1915220513c6d0e01a8dddf1
diff --git a/gnustep-apps/terminal/terminal-0.9.8.ebuild b/gnustep-apps/terminal/terminal-0.9.8.ebuild
index a81ab56d9e5f..9627d3a7c879 100644
--- a/gnustep-apps/terminal/terminal-0.9.8.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,6 +15,3 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE=""
-
-RDEPEND="!<x11-terms/terminal-0.6.0" #376257
-DEPEND="${RDEPEND}"
diff --git a/gnustep-apps/terminal/terminal-0.9.9.ebuild b/gnustep-apps/terminal/terminal-0.9.9.ebuild
index 274c0a67a565..5aef0b1e383e 100644
--- a/gnustep-apps/terminal/terminal-0.9.9.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnustep-2
 
@@ -15,6 +15,3 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
-
-RDEPEND="!<x11-terms/terminal-0.6.0" #376257
-DEPEND="${RDEPEND}"