10 files changed, 223 insertions, 271 deletions
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index cc9e5c54aa9a..36bece61faa7 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,2 +1,2 @@
-DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
-DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
+DIST Radicale-3.1.8.gh.tar.gz 137123 BLAKE2B ec855138aa18508da5375c5bde854cee4d4110fb75437cc1472afd3b589dfa523031cdd1b8a51a0f6a74dfe819308acd068b979acde32c05941d113d9d289f1e SHA512 5c4b55ee9cfc5060a0e0cf1f284d2c5a354bcabd7a088214e917fabb0083bcd172fd92aeb59b1f869f34e04f8c276efbed15c2a3ff2fdbc81b2220586bbaf31b
+DIST Radicale-3.1.9.gh.tar.gz 141258 BLAKE2B 6d74eabd7e09b1804a6a3c556a9f629fb72c4685fdf5d96d0d53ffaf5db712968b054678be866002ab4ceafaf1d3d8ad3f52aae7a9a4ecabbc129149c96ab9b6 SHA512 f4d0b26149c331b4bc02f01bb637cea1d29e1d563a4133c4293ec13990f1553988181582c2e726ce33b563403a14e9ec863403f86e66b13fd8cfd62cf74439e4
diff --git a/www-apps/radicale/files/radicale-1.1.6-config.patch b/www-apps/radicale/files/radicale-1.1.6-config.patch
deleted file mode 100644
index 4eb286f8d400..000000000000
--- a/www-apps/radicale/files/radicale-1.1.6-config.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/config b/config
-index 453a45e..10c1595 100644
---- a/config
-+++ b/config
-@@ -146,7 +146,7 @@ http_password_parameter =
- #custom_handler =
- 
- # File for rights management from_file
--#file = ~/.config/radicale/rights
-+file = /etc/radicale/rights
- 
- 
- [storage]
-@@ -163,7 +163,7 @@ file = ~/.config/radicale/rights
- #custom_handler =
- 
- # Folder for storing local collections, created if not present
--#filesystem_folder = ~/.config/radicale/collections
-+filesystem_folder = /var/lib/radicale/
- 
- # Database URL for SQLAlchemy
- # dialect+driver://user:password@host/dbname[?key=value..]
-diff --git a/logging b/logging
---- a/logging
-+++ b/logging
-@@ -45,7 +45,7 @@ formatter = simple
- [handler_file]
- # File handler
- class = FileHandler
--args = ('/var/log/radicale',)
-+args = ('/var/log/radicale/radicale.log',)
- formatter = full
- 
- 
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 00f85d29e0e5..000000000000
--- a/www-apps/radicale/files/radicale-r2.init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 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/files/radicale-r3.init.d b/www-apps/radicale/files/radicale-r3.init.d
new file mode 100644
index 000000000000..bb0cc5db08b0
--- /dev/null
+++ b/www-apps/radicale/files/radicale-r3.init.d
@@ -0,0 +1,27 @@
+#!/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
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping radicale"
+		start-stop-daemon --stop --quiet \
+		--pidfile ${PIDFILE}
+	eend $?
+}
diff --git a/www-apps/radicale/files/radicale.init.d b/www-apps/radicale/files/radicale.init.d
deleted file mode 100644
index a59e8d387093..000000000000
--- a/www-apps/radicale/files/radicale.init.d
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE=/var/run/radicale.pid
-
-depend() {
-    use net
-    need localmount
-}
-
-start() {
-    ebegin "Starting radicale"
-        start-stop-daemon --start --quiet --background \
-        --user radicale \
-        --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 fdc133d91b45..1dead5aa423a 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -1,14 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>maksbotan@gentoo.org</email>
-        <name>Maxim Koltsov</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="pypi">Radicale</remote-id>
-    </upstream>
-    <use>
-        <flag name="bcrypt">Depend on passlib to enable bcrypt and md5 authentication methods</flag>
-    </use>
+	<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>
 </pkgmetadata>
diff --git a/www-apps/radicale/radicale-1.1.6.ebuild b/www-apps/radicale/radicale-1.1.6.ebuild
deleted file mode 100644
index 7b955b0ebf31..000000000000
--- a/www-apps/radicale/radicale-1.1.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 user
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/vobject-0.9.5[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-RDIR=/var/lib/radicale
-LDIR=/var/log/radicale
-
-PATCHES=( "${FILESDIR}"/${P}-config.patch )
-
-pkg_setup() {
-	enewgroup radicale
-	enewuser radicale -1 -1 ${RDIR} radicale
-}
-
-python_install_all() {
-	rm README* || die
-
-	# init file
-	newinitd "${FILESDIR}"/radicale.init.d radicale
-
-	# directories
-	diropts -m0750
-	dodir ${RDIR}
-	fowners radicale:radicale ${RDIR}
-	keepdir ${RDIR}
-	diropts -m0755
-	dodir ${LDIR}
-	fowners radicale:radicale ${LDIR}
-	keepdir ${LDIR}
-
-	# config file
-	insinto /etc/${PN}
-	doins config logging
-
-	# fcgi and wsgi files
-	exeinto /usr/share/${PN}
-	doexe radicale.wsgi
-	doexe radicale.fcgi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "A sample WSGI and FastCGI script are in ${EROOT}usr/share/${PN}."
-	einfo "Radicale supports different authentication backends that depend on external libraries."
-	einfo "Please install"
-	optfeature "LDAP auth" dev-python/python-ldap
-	optfeature "PAM auth" dev-python/python-pam
-	optfeature "HTTP auth" dev-python/requests
-	optfeature "FastCGI mode" dev-python/flup
-	optfeature "Database storage backend" dev-python/sqlalchemy
-	einfo "Please note that some of these libraries are Python 2 only."
-}
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
deleted file mode 100644
index 881d37248fc7..000000000000
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils user systemd
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bcrypt"
-
-RDEPEND="sys-apps/util-linux
-	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
-	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-RDIR=/var/lib/${PN}
-
-pkg_pretend() {
-	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
-		eerror "It looks like you have a version 1 database in ${RDIR}."
-		eerror "You must convert this database to version 2 format before upgrading."
-		eerror "You may want to back up the old database before migrating."
-		eerror
-		eerror "If you have kept the Gentoo-default database configuration, this will work:"
-		eerror "1. Stop any running instance of Radicale."
-		eerror "2. Run \`radicale --export-storage ~/radicale-exported\`."
-		eerror "3. Run \`chown -R radicale: ~/radicale-exported\`"
-		eerror "4. Run \`mv \"${RDIR}\" \"${RDIR}.old\"\`."
-		eerror "5. Install Radicale version 2."
-		eerror "6. Run \`mv ~/radicale-exported \"${RDIR}/collections\"\`."
-		eerror
-		eerror "For more details, or if you are have a more complex configuration,"
-		eerror "please see the migration guide: https://radicale.org/1to2/"
-		eerror "If you do a custom migration, please ensure the database is cleaned out of"
-		eerror "${RDIR}, including the hidden .props file."
-		die
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 ${RDIR} ${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.1.8-r1.ebuild b/www-apps/radicale/radicale-3.1.8-r1.ebuild
new file mode 100644
index 000000000000..5dc44dba4e8f
--- /dev/null
+++ b/www-apps/radicale/radicale-3.1.8-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 systemd
+
+MY_P=${P^}
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="https://radicale.org/"
+SRC_URI="
+	https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>=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
+"
+
+BDEPEND="
+	test? (
+		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDIR=/var/lib/"${PN}"
+
+DOCS=( DOCUMENTATION.md CHANGELOG.md )
+
+python_test() {
+	epytest -o addopts= radicale/tests/
+}
+
+python_install_all() {
+	rm README* || die
+	# init file
+	newinitd "${FILESDIR}"/radicale-r3.init.d radicale
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# directories
+	keepdir "${RDIR}"
+	fperms 0750 "${RDIR}"
+	fowners "${PN}:${PN}" "${RDIR}"
+
+	# config file
+	insinto /etc/"${PN}"
+	doins config
+
+	# fcgi and wsgi files
+	exeinto /usr/share/"${PN}"
+	doexe 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 ""
+		ewarn "Unsafe file permissions detected on ${_erdir}."
+		ewarn "This probably comes 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.1.9.ebuild b/www-apps/radicale/radicale-3.1.9.ebuild
new file mode 100644
index 000000000000..7c3557675f25
--- /dev/null
+++ b/www-apps/radicale/radicale-3.1.9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 systemd
+
+MY_P=${P^}
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="https://radicale.org/"
+SRC_URI="
+	https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>=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
+"
+
+BDEPEND="
+	test? (
+		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/waitress[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDIR=/var/lib/"${PN}"
+
+DOCS=( DOCUMENTATION.md CHANGELOG.md )
+
+python_test() {
+	epytest -o addopts= radicale/tests/
+}
+
+python_install_all() {
+	rm README* || die
+	# init file
+	newinitd "${FILESDIR}"/radicale-r3.init.d radicale
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	# directories
+	keepdir "${RDIR}"
+	fperms 0750 "${RDIR}"
+	fowners "${PN}:${PN}" "${RDIR}"
+
+	# config file
+	insinto /etc/"${PN}"
+	doins config
+
+	# fcgi and wsgi files
+	exeinto /usr/share/"${PN}"
+	doexe 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 ""
+		ewarn "Unsafe file permissions detected on ${_erdir}."
+		ewarn "This probably comes 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
+}