# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1584841221 -3600
# Node ID 43d28a985b5c0206339ae9e05e3f0fd0ecddc123
# Parent  f3ea3b7c6ace8c4248152bfaf05c0bfd10b0ab18# Parent  36906ed82d4a3ce24bdd626ad136e4e02d32e743
Automated merge with https://localhost/hg/portage

diff -r f3ea3b7c6ace -r 43d28a985b5c www-apps/radicale/Manifest
--- a/www-apps/radicale/Manifest	Sat Mar 21 09:44:39 2020 +0100
+++ b/www-apps/radicale/Manifest	Sun Mar 22 02:40:21 2020 +0100
@@ -1,4 +1,3 @@
-AUX radicale-1.1.6-config.patch 841 SHA256 5fde28355b7c4cae3d4ed84402f5d631efd67adeec642e1439bb478d666e177b SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9 WHIRLPOOL dce9ce67138fb19a826ead92674f308ffd58bfd06f7ce6679ab8b4ca9803d37cd9b822c81605ed7e4b3ed9dca176a7ca9d451439af8838197f77a4a95b4a0170
 AUX radicale.init.d 564 SHA256 2475792713d1ff78ccf376bf2ab20243a69b04ef68cc637668db758e677bcbdd SHA512 670de8a2d0d5e29b68c1e177db20d13874722f2ac9d96e746e59cb47181e206b4d249a5f9c4411acf4abe49ec44d93cf452b9100470e5374f3fe8e3c0dc000aa WHIRLPOOL a65ef3ee6a18622f90e70dac5bb0fa37426d9f751d7850b0faf2b61294efd254cebc31ffa0c82657cb047576784893cbd0a362c7412e5855717ea9ec11374f98
-DIST Radicale-1.1.6.tar.gz 48280 SHA256 c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9 WHIRLPOOL 6287e5f25cab30bf68b2bd603e7755f625c52202ff1f577f600b33a5feb5950dc645558effd7bd178bfd657ceabb0c4b645966f798b38e6cec41ec921868720b
-EBUILD radicale-1.1.6.ebuild 1584 SHA256 42607add710a2d5864cffa2da4ce9aa47cec309785d4e0b0fb6eb22fc931e30d SHA512 a45170f14d065515b3dbf538641d1ae436579e072800cf6048fd4370d35034e3dbd78775fe036518471ccb1d1b6ca3bff1b63092dee7de108099a6860b38d13a WHIRLPOOL c5308f6d70d57fa8a62badf3f6d16c03c5644ce15443a77f51dfc685ccd9fdbdc686fcbdfaa070f97998a1fcf48a3649b9ad3ba88f9539afaf287fa878b145f6
+DIST Radicale-2.1.8.tar.gz 76348 SHA256 720d7c63faa9b9ce9f019067cb846cb2ca593a3c13af343a65cd40b4e381cde8 SHA512 038bee4114b090bcf873e8a4ec83cbbc7bdd34b4843fd1a769a023c891b589b3a18637d5f8f8595691a7930804ad7695e333bb9df96d00515b7a3695294eb5f7 WHIRLPOOL 51244f93d5970559c896bb2db7eee710d41babfdf51408c6c0ebbbe4be474f3a7b556052e382e3cbf82006795ac04c0a410c545dc418145c2f5ad9b1ffa5736d
+EBUILD radicale-2.1.8.ebuild 1271 SHA256 825bdcde3938d4acaca39b7b88175331731c02a88e291338c33af41070e5d1da SHA512 979e4e5a32c6e26dbdd683d3e4558089e150f824f36fda8c0a0912dfe9d66aca26a206ab718312bc9773ee6d839961a542f398ddaf68648fdd854ffb742e59e4 WHIRLPOOL 91d03309401706fad722d04e4fb10489327dfc1747fbc92f4f47efbeb5a9827ad15adc77e17a5c0ea3bb1b36139361f603ed065b4e5fa391239069d3ca207cbd
diff -r f3ea3b7c6ace -r 43d28a985b5c www-apps/radicale/radicale-1.1.6.ebuild
--- a/www-apps/radicale/radicale-1.1.6.ebuild	Sat Mar 21 09:44:39 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils distutils-r1 user
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="http://www.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=""
-
-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}
-	diropts -m0755
-	dodir ${LDIR}
-	fowners radicale:radicale ${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 ${ROOT}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 -r f3ea3b7c6ace -r 43d28a985b5c www-apps/radicale/radicale-2.1.8.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/www-apps/radicale/radicale-2.1.8.ebuild	Sun Mar 22 02:40:21 2020 +0100
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit eutils distutils-r1 user
+
+MY_PN="Radicale"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="http://www.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="+bcrypt"
+
+DEPEND="
+	dev-python/vobject
+	bcrypt? ( app-admin/apache-tools dev-python/passlib[bcrypt] )"
+
+S=${WORKDIR}/${MY_P}
+
+RDIR=/var/lib/radicale
+LDIR=/var/log/radicale
+
+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}
+	diropts -m0755
+	dodir ${LDIR}
+	fowners radicale:radicale ${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 script has been put into ${ROOT}usr/share/${PN}."
+	einfo "You will also find there an example FastCGI script."
+}