gentoo resync : 20.03.2022

5 files changed, 19 insertions, 120 deletions

diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 14c5552f2e6d..a9b96b88482c 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,8 +1,5 @@
-AUX radicale-r2.init.d 544 BLAKE2B f3dbbc1502c9d6bc23b0bd737f9bd492d52ad4e16e2be87674190c6639b4ad2ee6e263e8c718f7f90d853f5d199ebaf02f3445711466194a1a1aa35fd7c2cff8 SHA512 1d4635559dec861b8c6f03fef2302ebedc3a37a160ef6073220dc4b8b85f6ffa9146d078794013449344c9ab5f61c7bd29ec5d41a95d28060a276b210cdad270
 AUX radicale-r3.init.d 531 BLAKE2B 2462a6a9cc3377d82f53f4add662f17dbb06c497876348baed61f12a0be4e1636ecf08059fa4d0d139bbc4e4e9476ff5db2436b23a780a9182ad59488fe1b934 SHA512 37d40c036cc76c12a37677bf14781582b754d17cfc25e56b642235b1ea8d7fd557550a4da595fd539349d33902a70810ebeacda00396767f3b2d12f48c6111e1
 AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
-DIST radicale-2.1.12.tar.gz 123828 BLAKE2B 38ffb264b1f8e185642e0236821bd1a7714c34306f4d67d181a9130c7955b9f3a616547fa04a15781c2587bbdc5e7ea1eeab9da65790b72fb78cd83d78b0fd43 SHA512 98b5c1e6c71928859de9f497b7e968e56c659e9e5d8c559d4359718511d67a23d4daa9adca679f5f732ad531cb04d184b022cf2684fa5fdbfe24a35c92813968
-DIST radicale-3.0.6.tar.gz 123817 BLAKE2B fa4b70c9920d518df6c939395eca857c237a75218b90ada45564f2d84266d65df12898e4efbb52905829948061e10e72b5442943fd5061a28447330ae8d491e8 SHA512 e9741547395fae8886ad84b6807422ebb196f5293d484f5f6136498058576cff697e28c117216f151d56494af83593347ceee40a6efa21272b803d0f301a396d
-EBUILD radicale-2.1.12-r1.ebuild 1756 BLAKE2B 91a5a0410c19eada8ae327d96e01420714d6ba5d2af62aecd324e25af24489f847a5cf788b2542a3ff7aa6edfdf8848a43430b1a682dc78b43faed95456fa017 SHA512 d59e1836243cb2541b0752835cc85b06778807c676a6e1e6f0b054cfd63ca3c5bf5704f23dffb19416502d53ee5f429484c67f065a4bfc899d1b68152228a41b
-EBUILD radicale-3.0.6-r4.ebuild 2019 BLAKE2B a4ffea0ad8bfb9b0e89d9fc9d441f8567b262937c3629f6562814f5b4be10a3e9ca4c6d7d387bdd9a40cbb9b0c275cb6aa9f8e5dcc8e0f645707bc1b3fa9f8f3 SHA512 697b6d2ede097de41b9ff70d12e430d6f329bc68a7b01052d4987ea6881b0086666f3738d566657884dcff095a382132431b179b2c7697ed5603d6a33f8b9415
-MISC metadata.xml 329 BLAKE2B 3321ffedd6ebe3b039cf8dd24979e5b882086adfc9b6ba639abb3506997c8e372d22b22ab95545e3850b9c3e33565e9b2642b9685209830322dd4025b91e1f1e SHA512 24c5261de2945f2ad31b6fa9267375c8ea25eee3f937fa0c1551e4d68638952ff7766e87f3a95a174ac4ecaaad3420a18a109d920a7ce3a3c278e6321eec2e47
+DIST radicale-3.1.5.tar.gz 136725 BLAKE2B 574032fc9a4010db2de0066758093b74fb29e43c3e8f3328441c92af99827a5f4174ac3ddbc2573083642af4c68073c470ce64ae7689b537a72aa0b813b641b8 SHA512 0febad350e970e4f0ef8199472bb94a81a2a412be2b55c1baee16967b39bf9a5f7b9e8aa7c95a19beedf2f8b2d871382aa0727803432575bff248bc0137adce3
+EBUILD radicale-3.1.5.ebuild 2042 BLAKE2B bedce290b9a0ca7d954b4859a67929699d0ceebeaf04352a23c5adb202565d915848a16bf34cc08e68a75c7da05ea97a5ac3bbbc90b9f417223fc92f6e2b50b8 SHA512 d20433b22735284b225eaca5e537b3299a807b039bf2a23f887e206dcd411631747638e4bc77fd5bd73d3195308144b5497295b6a4787721d7503a702a0cac4e
+MISC metadata.xml 499 BLAKE2B e8aa182ad9b9388d6bbb527bff646b1e816343ddcbc95f8a9ee2eede2272f6470e1d543745c8ab9b907259c3b880332fb6d281e9771ea63696812956195bb277 SHA512 bb9b0a207af851714831c2aca9d020bcc728094c82ad15d519578e31499ff1999741279725ab6c306a25f0e4ccfd8399e39f2b42ca4eb821e677395aea8be842
diff --git a/www-apps/radicale/files/radicale-r2.init.d b/www-apps/radicale/files/radicale-r2.init.d
deleted file mode 100644
index 23da22d7fc9e..000000000000
--- a/www-apps/radicale/files/radicale-r2.init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/run/radicale.pid
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting radicale"
-		start-stop-daemon --start --quiet --background \
-		--user radicale \
-		--umask 0027 \
-		--stderr-logger /usr/bin/logger \
-		--pidfile ${PIDFILE} --make-pidfile \
-		--exec /usr/bin/radicale --foreground
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping radicale"
-		start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/www-apps/radicale/metadata.xml b/www-apps/radicale/metadata.xml
index cf71ddb49ed0..1dead5aa423a 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>henning@hennsch.de</email>
+		<name>Henning Schild</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Kozea/Radicale</remote-id>
 	</upstream>
-	<use>
-		<flag name="bcrypt">Enable bcrypt</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-apps/radicale/radicale-2.1.12-r1.ebuild b/www-apps/radicale/radicale-2.1.12-r1.ebuild
deleted file mode 100644
index 2c588c49f493..000000000000
--- a/www-apps/radicale/radicale-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 systemd
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="https://github.com/Kozea/Radicale/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bcrypt"
-
-RDEPEND="
-	acct-user/radicale
-	acct-group/radicale
-	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
-	sys-apps/util-linux
-	bcrypt? (
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-RDIR=/var/lib/${PN}
-
-python_install_all() {
-	rm README* || die
-
-	# init file
-	newinitd "${FILESDIR}"/radicale-r2.init.d radicale
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	# directories
-	keepdir ${RDIR}
-	fowners ${PN}:${PN} ${RDIR}
-	fperms 0750 ${RDIR}
-
-	# config file
-	insinto /etc/${PN}
-	doins config logging
-
-	# fcgi and wsgi files
-	exeinto /usr/share/${PN}
-	doexe radicale.fcgi radicale.wsgi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	local _erdir="${EROOT}${RDIR}"
-
-	einfo "A sample WSGI script has been put into ${EROOT}/usr/share/${PN}."
-	einfo "You will also find there an example FastCGI script."
-	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
-	then
-		ewarn "Unsafe file permissions detected on ${_erdir}. This probably comes"
-		ewarn "from an earlier version of this ebuild."
-		ewarn "To fix run:"
-		ewarn "  \`chown -R ${PN}:${PN} ${_erdir}\`"
-		ewarn "  \`chmod 0750 ${_erdir}\`"
-		ewarn "  \`chmod -R o= ${_erdir}\`"
-	fi
-}
diff --git a/www-apps/radicale/radicale-3.0.6-r4.ebuild b/www-apps/radicale/radicale-3.1.5.ebuild
index 3ddd634a15ff..113b188e44b1 100644
--- a/www-apps/radicale/radicale-3.0.6-r4.ebuild
+++ b/www-apps/radicale/radicale-3.1.5.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 systemd
 
 DESCRIPTION="A simple CalDAV calendar server"
 HOMEPAGE="https://radicale.org/"
-SRC_URI="https://github.com/Kozea/Radicale/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -19,13 +18,14 @@ KEYWORDS="~amd64 ~arm ~x86"
 MY_P="Radicale-${PV}"
 
 RDEPEND="
-	acct-user/radicale
+	>=acct-user/radicale-0-r2
 	acct-group/radicale
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	dev-python/passlib[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/util-linux
 "
 
@@ -36,19 +36,19 @@ BDEPEND="
 	)
 "
 
+distutils_enable_tests --install pytest
+
 S="${WORKDIR}/${MY_P}"
 
 RDIR=/var/lib/"${PN}"
 
-DOCS=( DOCUMENTATION.md NEWS.md )
+DOCS=( DOCUMENTATION.md CHANGELOG.md )
 
 src_prepare() {
 	sed -i '/^addopts =/d' setup.cfg || die
 	distutils-r1_src_prepare
 }
 
-distutils_enable_tests --install pytest
-
 python_test() {
 	epytest radicale/tests/
 }