app-office/radicale: Bump to version 0.8.0

5 files changed, 110 insertions, 31 deletions

diff --git a/app-office/radicale/ChangeLog b/app-office/radicale/ChangeLog
index 718c4f1c6..94b0c6e80 100644
--- a/app-office/radicale/ChangeLog
+++ b/app-office/radicale/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*radicale-0.8 (15 Sep 2013)
+
+  15 Sep 2013; René Neumann (Necoro) <gentoo@necoro.eu>
+  -radicale-0.7.1-r1.ebuild, +radicale-0.8.ebuild,
+  +files/radicale-0.8-config.patch, metadata.xml:
+  Bump to version 0.8.0
+
 *radicale-0.7.1-r1 (08 Mar 2013)
 
   08 Mar 2013; Patrick Lauer <patrick@gentoo.org> -radicale-0.7.1.ebuild,
diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index 1a6db9f1d..f6e16acfe 100644
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,5 +1,6 @@
+AUX radicale-0.8-config.patch 2174 SHA256 4bc6c584597219629e1df3b7854695c0660fc2c0ca68f09fba18969df1122d14 SHA512 51b2e90d43f89b3ebef59d3df334041638544457870bf00410ed172399eced19eae4d63eea05f2d3078177c4ea4fceab1e73f28357b58485ffbec78e52f9c042 WHIRLPOOL ee44ea505c09928e5b813e38a35d2f4199464834efc21f74850b26cba33130cb567d415414d5017be469d9cd979a07d91d307ef1b594ab737cd2a973fc5ca4d0
 AUX radicale.init.d 576 SHA256 8090c06d040f3f3cde4d031920136b8f9db85010566fcfe9036a764223fb09bd SHA512 906b0a525c44df5872f51493567b51f4ab83fd4879407275ecfc43c19efa41c40b6a5fd41612972349b1eb00357337be07ee2013a18e6673e2600b1f04fb40bf WHIRLPOOL 0791d62f25975205c1d48b04749468d3dd224980fac7625ebdf4f0def51fa00a12e02b42b3409e6b280d434a04412dbc9b7e5849430cc22f7192d386a2f41795
-DIST Radicale-0.7.1.tar.gz 35355 SHA256 36e076b8c54be9df61a8434e9670d852429dcae557fadb77de23e762258bb8e4 SHA512 00ad9788b39a33f94e656e9104e1a81a9052b182021ea486d865a826c8e8711d58476beb35b89fd46371166886d9a312f417db49d81293d0434af0261c1636e1 WHIRLPOOL a353dad90c3391e104b113479b975e4a29049e7c4301122c6ed064233cc757661ea56ee92fbfe21c97e2702787bd8f639ae93418d68ac3abacb744848d909fa1
-EBUILD radicale-0.7.1-r1.ebuild 1984 SHA256 3b3fdaa468770781a895bf32475bd03bfc12218435dc20bfcf7fa32d4dab34aa SHA512 72097f5b9eaaf2805dcc9a621d87c9e6a415dc0677a9928adcc042f4e06b9d0346a623dfab0fd9f9b5e9f31d388e4072747b0602604a3ba753b01f13ac65d40b WHIRLPOOL 1befec5ac2ffd95695a773eb170ab30319729bc266c365316933486727f25a0ddf0a108f3121a812d12c09a38b70b1dd46f42958dc5435da5d571e4bda0a23b3
-MISC ChangeLog 1345 SHA256 ab304650eb69edbea356e180156986cfd1b469c7475ce051e39daf9c10b16b74 SHA512 5f7e5b03930b31d47fc03fc6d504a3554eb4bd66e655ae231e646e3745cda020b58e4e043e76fa20b9c4975f2d8631b45e5c452c04e5617fb93c4150c201c56d WHIRLPOOL e6fa9eda075d6cf387837eb59c0a271efc15807e725dd822e039adb869425913f12a56965d773f8f202989004cc45199857b455175197cbed8c2a5244ad68660
-MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
+DIST Radicale-0.8.tar.gz 39813 SHA256 e8c0df5239c22f2687a09eca7d53c318706648aff72b620849ed3f7540bc1941 SHA512 8b4db28b1fedc78e6d638a8e00dbbe0f37ada39686aae4afdf427461bbd7189d8222adf417fa5e546d9f6a6c7ff0c08eb3aa8609e9fb57c17a9e30161eabba85 WHIRLPOOL c705914db79503215f86e40545950e0fb07d439bc89372849865fece597eb863c28bd13255206a6e298308ba0a819b2e065ca05b592fc7bbb0c2c44896322138
+EBUILD radicale-0.8.ebuild 1828 SHA256 565f984d347a71474f4d1ad621e520541297017136412f5b1160ee025f213e7b SHA512 25cff306457b144d24c5a3d301220d1a516d53b2bbc3166c7fba48080f4523c8a3179c9d5a48352783e877a28262bceb55d456db393bfd9d1b8b307ed3b698c7 WHIRLPOOL 524d51cdc6e60f2a643e7203517af20043cb940afb5bbd9ebe01d06c1d12d4c54ac3915557da8b981e0802c57c19c847e965a04b50b7983db7ae958a33d88180
+MISC ChangeLog 1557 SHA256 0372c8ef031ea9a9002b5501931597273fbe0893a4113af938f06715442bc155 SHA512 b5dc420f0a8c9067b82092700d90d5467c1571977103e9b740b67f52135d79292fd990f11a0ff5d40247bd8851ac7d9875b4b7dafcfcd799f607859a47685dfd WHIRLPOOL c5912c35a94501ee8e4a14a1171763360a12dc463093d8ecc2c642a52acfa5bdc8e98bde4ce5648695a65ccf97a8f0dcd63d0159fb3e862740af2f50fb0f2bde
+MISC metadata.xml 309 SHA256 0521b440b52d6b9685174e975244b6520c2f9e9ef2afb73480f0910e98dbe5b7 SHA512 1b0591a413e6eae6187d399e3728ccfa36966dca49e7de7f7067fa8849183a14cacfca970af9c74d52a4d21c4031ac9aada5ff068a5e89dbdefbf24bb8c60ade WHIRLPOOL 1d544fd50c0835ac59042d5da02b097e7ad8f656d9fbd08a2d97dcb0db76bb2c3f1f35c0f9235df091bb60c32ae8d0563356723378cc1874b057015410c6874a
diff --git a/app-office/radicale/files/radicale-0.8-config.patch b/app-office/radicale/files/radicale-0.8-config.patch
new file mode 100644
index 000000000..aa867bca2
--- /dev/null
+++ b/app-office/radicale/files/radicale-0.8-config.patch
@@ -0,0 +1,77 @@
+From 6887e996ad771d22659c0eb8cbca94c936fdb10a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <gentoo@necoro.eu>
+Date: Sun, 15 Sep 2013 14:02:32 +0200
+Subject: Fix the config for Gentoo's default needs.
+
+    * Set pathes
+    * Set rights.type to 'owner_only' to model pre-0.8 behavior
+      (None means 'everyone is allowed everything')
+    * Remove 'public_users' and 'private_users' as they are obsolete.
+---
+ config  | 13 ++++---------
+ logging |  2 +-
+ 2 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/config b/config
+index 453a45e..10c1595 100644
+--- a/config
++++ b/config
+@@ -30,7 +30,7 @@ dns_lookup = True
+ # Root URL of Radicale (starting and ending with a slash)
+ base_prefix = /
+ # Message displayed in the client when a password is needed
+-realm = Radicale - Password Required lol
++realm = Radicale - Password Required
+ 
+ 
+ [encoding]
+@@ -45,11 +45,6 @@ stock = utf-8
+ # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http
+ type = None
+ 
+-# Usernames used for public collections, separated by a comma
+-public_users = public
+-# Usernames used for private collections, separated by a comma
+-private_users = private
+-
+ # Htpasswd filename
+ htpasswd_filename = /etc/radicale/users
+ # Htpasswd encryption method
+@@ -97,10 +92,10 @@ http_password_parameter =
+ [rights]
+ # Rights management method
+ # Value: None | owner_only | owner_write | from_file
+-type = None
++type = owner_only
+ 
+ # File for rights management from_file
+-file = ~/.config/radicale/rights
++file = /etc/radicale/rights
+ 
+ 
+ [storage]
+@@ -109,7 +104,7 @@ file = ~/.config/radicale/rights
+ type = filesystem
+ 
+ # 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
+index f4efb88..b10f88c 100644
+--- 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
+ 
+ 
+-- 
+1.8.1.5
+
diff --git a/app-office/radicale/metadata.xml b/app-office/radicale/metadata.xml
index 31dc017fa..7c28c34c3 100644
--- a/app-office/radicale/metadata.xml
+++ b/app-office/radicale/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+	<use>
+		<flag name='sql'>Enable support for using SQL-Databases as storage backend.</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-office/radicale/radicale-0.7.1-r1.ebuild b/app-office/radicale/radicale-0.8.ebuild
index 8974b04ef..98810052c 100644
--- a/app-office/radicale/radicale-0.7.1-r1.ebuild
+++ b/app-office/radicale/radicale-0.8.ebuild
@@ -2,11 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS=1
+EAPI=5
 
-inherit distutils user
+# radicale also supports python3_{2,3}
+# but python-ldap and flup are blocking here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit distutils-r1 user
 
 MY_PN="Radicale"
 MY_P="${MY_PN}-${PV}"
@@ -17,14 +20,12 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fastcgi ldap ssl"
+KEYWORDS="~x86 ~amd64"
+IUSE="fastcgi ldap sql ssl"
 
-# the '>=' goes ok, as radicale supports _all_ other python version
-# this includes all 3.* versions
-RDEPEND="ssl? ( >=dev-lang/python-2.6.6[ssl] )
-		ldap? ( dev-python/python-ldap )
-		fastcgi? ( dev-python/flup )"
+RDEPEND="ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+		fastcgi? ( dev-python/flup[${PYTHON_USEDEP}] )
+		sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )"
 
 # radicale's authentication against PAM is not possible here:
 # Gentoo has not included the package
@@ -36,27 +37,17 @@ S=${WORKDIR}/${MY_P}
 RDIR=/var/lib/radicale
 LDIR=/var/log/radicale
 
+PATCHES=( "${FILESDIR}"/${P}-config.patch )
+
 pkg_setup() {
-	python_pkg_setup
 	enewgroup radicale
 	enewuser radicale -1 -1 ${RDIR} radicale
 }
 
-src_prepare() {
-	# fix pathes
-	sed -i -e "s:^\(filesystem_folder = \).*$:\1${RDIR}:g" \
-				config || die
-	sed -i -e "s;^\(args = ('/var/log/radicale\);\1/radicale.log;" \
-				logging || die
-	distutils_src_prepare
-}
-
-src_install() {
+python_install_all() {
 	# delete the useless .rst, so that it is not installed
 	rm README.rst
 
-	distutils_src_install
-
 	# init file
 	newinitd "${FILESDIR}"/radicale.init.d radicale || die
 
@@ -73,12 +64,12 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins radicale.wsgi
 	use fastcgi && doins radicale.fcgi
+
+	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
 	einfo "Radicale now supports WSGI."
 	einfo "A sample wsgi-script has been put into ${ROOT}usr/share/${PN}."
 	use fastcgi && einfo "You will also find there an example fcgi-script."
-
-	distutils_pkg_postinst
 }