gentoo resync : 28.04.2021

6 files changed, 138 insertions, 29 deletions

diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index bea4601e1275..248e7cefd06a 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,5 +1,8 @@
-AUX radicale-r2.init.d 603 BLAKE2B 3eedaf633d51e18b82a50c304f64a7268afec75e89515eb10b45b891691ff39b5d84753c4b3ed71c5a5b017c65d2c8bd38a6a043e0570f2916d12856202c3b45 SHA512 053fb6d5e7cec094a55fc8e56df9787949fd4b6c09caa1855de91d0a78eba5cfaac1a77a81afc178f93a75a0e70732c2c43b7f378596877ab36240ca46df9b03
+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 109781 BLAKE2B 743eaeffab43f2efcfc798f84d00fee40a09609beeb555e3afe3c9f4c54d8e0ce3a7eba4c1e14d6702775ab7d156b085408ee968b0d53437982cf2ea7cb4653c SHA512 a708fb1269f7ba8c9e351e101f613a8adb18c12b1239b832ed9e0287476f30aa7ded30f9bc259da9c4b5f3aefe90bbf9980d0d08d98dd07b79cd19930b0e204c
-EBUILD radicale-2.1.12.ebuild 1699 BLAKE2B deb1498ddefb8721b76f6c29197a88cb481c65d1bdefcb820c134f5ed878daa7cdaf43914834159c6b7f09b699babaa219cab8fb6b98e5d3bd81c08d3450c1d1 SHA512 c330ec690019e617867a1a35cfda3cabfe8f51ed0f679858bb6615dd7e995bcb3c47e45e0fff2d8cc57d5f04ba1f74c45d4c69d8f0ce81db50bbfa210428a519
-MISC metadata.xml 402 BLAKE2B 34ccd25541195ef792928fb402fa30b78f46eb63248034f65f94b408c3b5b33fcc44ce51502fcfc83e6500f276d2e4120e67a51a4b885cdf6b3ca970d898fd25 SHA512 b4860c05199b13a09ecfdfa9fd941431f7b4d3e76ea8f63840bd1f5ea21774588b794af1c71ad139826248ee238bd6cd0382a3659e926142f5ee005a248243ee
+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.ebuild 1722 BLAKE2B 3aa793d57898fd60726422114c247265f2566134587f1bf04a0cd94d0525baa4935ffb53bdf77996b3f12f5faa6c3f9845a78a8d9ae0bfb9de725a7033e0e866 SHA512 32b0893d0778ac3f6b8ae40387a8e7817e77a165d572b311f21565fb37c5e97ddf527e2adafde4784de10e3fa3a6466ac5922b5d778562d6894d1e2f1408d8cb
+EBUILD radicale-3.0.6-r1.ebuild 1678 BLAKE2B 74750c50d9628decb9d98f4d9d1706df9bed787b3c6c3771868c6002be46c26de725b1b2076c7341264e6f5916de8904bdee255d136635a5fa60bc9c8c495e9c SHA512 1a26bc9d92733e89e8f1820d9b1e40a742f10547ce44d36fed22e02a9e452c3f1ba8f1af7645e55bfe879bd52d97dfcdb693617b8db9d083c3d693993cc08fc2
+MISC metadata.xml 556 BLAKE2B b07d7f83f54dd115fc7fc0e775b97bc30653389d301fa39e0cf8a8ee9a94bc3b3cf6b8bfcbd8c53c2b0502b73011707d7ffa267b9882be935b3f3a489e127957 SHA512 9b5981e5efb581f950a766bda19a405edb78773fbeec2a19fe9bca75d6c208c3f9628954d3ce346d5a90701e0f2e8eb182fbfcf4ca458abafb10d683156ea6fd
diff --git a/www-apps/radicale/files/radicale-r2.init.d b/www-apps/radicale/files/radicale-r2.init.d
index 00f85d29e0e5..23da22d7fc9e 100644
--- a/www-apps/radicale/files/radicale-r2.init.d
+++ b/www-apps/radicale/files/radicale-r2.init.d
@@ -1,27 +1,27 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PIDFILE=/run/radicale.pid
 
 depend() {
-    need localmount
+	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 $?
+	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 $?
+	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/metadata.xml b/www-apps/radicale/metadata.xml
index 6d1efe9490ca..4912a745a440 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
-    <stabilize-allarches/>
-    <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>marco@scardovi.com</email>
+		<name>Marco Scardovi</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.ebuild b/www-apps/radicale/radicale-2.1.12.ebuild
index aef65e3ee5dd..29c9db7bf875 100644
--- a/www-apps/radicale/radicale-2.1.12.ebuild
+++ b/www-apps/radicale/radicale-2.1.12.ebuild
@@ -4,16 +4,16 @@
 EAPI="7"
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
-inherit distutils-r1 eutils systemd
+inherit distutils-r1 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"
+SRC_URI="https://github.com/Kozea/Radicale/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/www-apps/radicale/radicale-3.0.6-r1.ebuild b/www-apps/radicale/radicale-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..3c2169639c60
--- /dev/null
+++ b/www-apps/radicale/radicale-3.0.6-r1.ebuild
@@ -0,0 +1,72 @@
+# 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
+
+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"
+
+MY_P="Radicale-${PV}"
+
+RDEPEND="
+	acct-user/radicale
+	acct-group/radicale
+	dev-python/defusedxml
+	dev-python/passlib[bcrypt,${PYTHON_USEDEP}]
+	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	sys-apps/util-linux
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RDIR=/var/lib/${PN}
+
+python_install_all() {
+	rm README* || die
+
+	# init file
+	newinitd "${FILESDIR}"/radicale-r3.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
+
+	# 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 "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
+}