gentoo resync : 10.04.2018

3 files changed, 89 insertions, 1 deletions

diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index bd3d377df630..890fe627a7b5 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,5 +1,7 @@
 AUX radicale-1.1.6-config.patch 841 BLAKE2B a21d34a08108de5f90470def9239ed667063691c17d0bb000a0b07dfdef58888a6623c29e661b84bc7cca9d3b373dfa7ce8fd0e7e658de36a9bce5ef88555d8d SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9
 AUX radicale.init.d 564 BLAKE2B 370d68329a2507c4b96766597851f1c5de13df492422212df3739eb4a5444ce537cdd23ea5d630ae51795979d69f521054c41a968585ffa671d8624aac176e53 SHA512 670de8a2d0d5e29b68c1e177db20d13874722f2ac9d96e746e59cb47181e206b4d249a5f9c4411acf4abe49ec44d93cf452b9100470e5374f3fe8e3c0dc000aa
 DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
+DIST Radicale-2.1.8.tar.gz 76348 BLAKE2B 87a4ec20990dc7e5dbba88a3fb3d1475210d40c12584d5bb7ba7c6d1ca2cd8efb97b7054d322f0a7fbe58fd8325be63df52f1d370cc13ccc90863b0900925656 SHA512 038bee4114b090bcf873e8a4ec83cbbc7bdd34b4843fd1a769a023c891b589b3a18637d5f8f8595691a7930804ad7695e333bb9df96d00515b7a3695294eb5f7
 EBUILD radicale-1.1.6.ebuild 1683 BLAKE2B 386c82908412da38c77769ce2c5de0741b57459d0cc9ee549e63cab527994950466a65cee20cf110098aec85bd6a2c386cdda02721b450be7dac983e53d6d786 SHA512 887a4d28b3e0d895240e12d8a8a38c21d727fdcd0f0e44cb748c927e3794aa53e34df1acf952f1f2b78e79c520cec2a1446c2f943efc5838e0f2fd23bc270783
-MISC metadata.xml 350 BLAKE2B e2f087a4520fba1ea802662a7baa7299049c4af2170d5096fb320fe910ac5ddbff12817257fed9d18281a942e87b203675df173504a127c4f6c57aee3238b3e9 SHA512 3f8e0eecc8780b629878668cb1cbbb58ccc974f3467e2d919453233caae3b4d903ca191d7cc9b9d2f43d3f91583d734f7da04ac6f4f730b923d7e69bc271da4d
+EBUILD radicale-2.1.8.ebuild 2313 BLAKE2B 0d2500dc90007363eca534da0bb77fe680bc22c72f05f440eedbf33b81cdb768d2deeb669f889426dcacc9f88c343942a3951d3aaae97cf10e24279c1f914ceb SHA512 ee3a3c524b0853e7a8ab82d1cfa4c5c4b8efdf50835818b29cdc90bcb8577e8d6f4a2103c49459e63c4db555ba46f0a0379ef6fc0e8b19fe91b03f9a16344782
+MISC metadata.xml 472 BLAKE2B dad26ff5abb5fb50a0016f23a03f33bf2e6dc536ed92fe30a587824f8b85789ae16a44d362df683c2b62c9db73175f0cbb06b26a6a6d4b3d544fdefb30613690 SHA512 309c2abddb4150357ffbfd35d8dd153592b4e7426b61728a25f7a2a8eb6a97ab8c3e4042eb5e333d4524977ec7f30e6793b33a6a2a70eff1f1c555d7f9f706e2
diff --git a/www-apps/radicale/metadata.xml b/www-apps/radicale/metadata.xml
index c7327c300ab9..fdc133d91b45 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -8,4 +8,7 @@
     <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>
 </pkgmetadata>
diff --git a/www-apps/radicale/radicale-2.1.8.ebuild b/www-apps/radicale/radicale-2.1.8.ebuild
new file mode 100644
index 000000000000..becd552567e9
--- /dev/null
+++ b/www-apps/radicale/radicale-2.1.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 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 distutils-r1 eutils user
+
+MY_PN="Radicale"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A simple CalDAV calendar server"
+HOMEPAGE="http://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"
+
+RDEPEND=">=dev-python/vobject-0.9.5[${PYTHON_USEDEP}]
+	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+RDIR=/var/lib/radicale
+LDIR=/var/log/radicale
+
+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: http://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 radicale
+	enewuser radicale -1 -1 ${RDIR} radicale
+}
+
+python_install_all() {
+	rm README* || die
+
+	# init file
+	newinitd "${FILESDIR}"/radicale.init.d radicale
+
+	# directories
+	diropts -m0750 -oradicale -gradicale
+	keepdir ${RDIR}
+	diropts -m0755 -oradicale -gradicale
+	keepdir ${LDIR}
+
+	# 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() {
+	einfo "A sample WSGI script has been put into ${ROOT%/}/usr/share/${PN}."
+	einfo "You will also find there an example FastCGI script."
+}