radicale-2.1.2 - bump

3 files changed, 29 insertions, 12 deletions

diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index ab96bab..82a2381 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1 +1 @@
-DIST Radicale-1.1.1.tar.gz 47174 SHA256 e2c9812913c464ab88ae1f66b29e81f87a4cc6ee1c94d167b33508c530dab4b0 SHA512 dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2 WHIRLPOOL 315977a0bed6c1d5bfac24617b23e791d6c306658a14a478364dde61b5df5ac4136be18139d3edb7ab554f40a1d3cfce367770dab4c023868bb476f34e28a3b6
+DIST Radicale-2.1.2.tar.gz 72255 SHA256 3f8cc20ec2d5427dfffebcb1110e7c0efe088f6d9dbcb5b949931ef2c7f38e9c SHA512 28a15f7a59712388272b64d5a6cb7e5e76e51cf5ebffaa37eb3278e6fe51b9e3a553efba74a1acab51a4368d770c01b5c6390a36deca6292b014580dafdd762a WHIRLPOOL 1aaad92d11779af9d9b582bdb5c5f667fedadcbd8505ca11a725ccfcb9ffa96a8592773a84dbb1e59b03a47499b76213fd7b238d3eedfc2ccce225774f7c1dca
diff --git a/www-apps/radicale/metadata.xml b/www-apps/radicale/metadata.xml
index d3bddde..bde5fba 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
     <upstream>
         <remote-id type="pypi">Radicale</remote-id>
+		<remote-id type="github">Kozea/Radicale</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/www-apps/radicale/radicale-1.1.1.ebuild b/www-apps/radicale/radicale-2.1.2.ebuild
index 8876986..abb7d8b 100644
--- a/www-apps/radicale/radicale-1.1.1.ebuild
+++ b/www-apps/radicale/radicale-2.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit eutils distutils-r1 user
 
@@ -17,20 +17,40 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
+
+RDEPEND=">=dev-python/vobject-0.9.5[$PYTHON_USEDEP]"
+DEPEND="$RDEPEND
+	dev-python/setuptools[$PYTHON_USEDEP]
+	test? (
+		dev-python/pytest-runner[$PYTHON_USEDEP]
+		dev-python/pytest-flake8[$PYTHON_USEDEP]
+		dev-python/pytest-cov[$PYTHON_USEDEP]
+		dev-python/pytest-isort[$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_prepare() {
+#	# no python2 compatibility
+#	if ! python_is_python3; then
+#		sed -e '2i# coding=utf-8' \
+#			-i setup.py || die
+#	fi
+#}
+
+python_test() {
+	esetup.py test || die
+}
+
 python_install_all() {
 	rm README* || die
 
@@ -61,12 +81,8 @@ 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."
 
-	einfo "Radicale supports different authentication backends that depend on external libraries."
+	einfo "Radicale has features 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."
+	optfeature "htpasswd auth" "dev-python/passlib dev-python/bcrypt"
+	optfeature "FastCGI mode" "dev-python/flipflop"
 }