app-office/radicale: Bump to version 0.6.4 / apply changes from bug #32281. Thanks...

svn path=/sunrise/; revision=12718

diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index dbae7636666609e4acc4f10f2e128141209175de..22f6d6c97d583451c6a0182c556aee7ee15d5571 100644 (file)
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,5 +1,5 @@
-AUX radicale.init.d 550 RMD160 f1f6aa919952b744900c781b8d6cd9283bc44534 SHA1 3c2043b9f2680b14969bd7f3727e3df85c7f9c48 SHA256 1b28de6c1bc2c6119eb654622713fdd2c16d89105940c6b55d2bc081fbb2fd2c
-DIST Radicale-0.6.2.tar.gz 30784 RMD160 8b2559116f6f196a610069d8f9fde7d640c3cbb6 SHA1 c80be198b3ea7c47f73642b1e7e76fdb0ed20e9d SHA256 90067706ef8f03a7debcea5c91e87ff94756dfc59eaad26d13d4cd84cda592c9
-EBUILD radicale-0.6.2.ebuild 1244 RMD160 0e6141bf71f76c5bb0167cb0e09ae3563b96813f SHA1 c6906f98667806ac6b48a1182399136b2c345865 SHA256 c877b26955737f4042bd3b12744736993829f17ffd42eeab30ad802ddccfb5b7
+AUX radicale.init.d 650 RMD160 4c250c0c3967db0cdc8387419fd3f435efe9403e SHA1 a5c604f08d3829d374d6a08bb00529a571cc4b51 SHA256 9cf1ef81ab063759b72a54012aa33052f92ad69598943522e1c03d826dbace07
+DIST Radicale-0.6.4.tar.gz 30994 RMD160 9da7aede8ec48fa9725a85985cd3e6e3bd277689 SHA1 15854dd3a7070ef8438573b4a9fef92a2b46b8ab SHA256 83fd6d1b958cd2eae7fa8d773db508e1a4f87266e48346016d03e2b2c7eb80ea
+EBUILD radicale-0.6.4.ebuild 1494 RMD160 d127bd645f555c308f0bce8385158eb3bad3ccd4 SHA1 fe5f3dd39f865d4509e10b196775bdbeb82e65f0 SHA256 046a3087153fcdda6c952e53b524cf53542cef7cc929f454cfda3f73933cefb8
 MISC ChangeLog 617 RMD160 05b51ebbdacc637d2ca4566b750f7bbccb6882e9 SHA1 a90de5a0bc117017665c861493cf3fcb88fdf6d0 SHA256 1108593b5a9ebe280a62e683851ab789bf6fa16514809deda7d43e6274d700f4
 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82

diff --git a/app-office/radicale/files/radicale.init.d b/app-office/radicale/files/radicale.init.d
index 53beabb159fee55c8b1cd27064d33e13f3ec23ad..ebbe58de799f5199e7f628bc2798badce7ac2623 100644 (file)
--- a/app-office/radicale/files/radicale.init.d
+++ b/app-office/radicale/files/radicale.init.d
@@ -11,8 +11,11 @@ depend() {
 }
 
 start() {
+    touch /var/log/radicale
+    chown radicale:radicale /var/log/radicale
     ebegin "Starting radicale"
         start-stop-daemon --start --quiet --background \
+        --user radicale \
         --pidfile ${PIDFILE} --make-pidfile \
         --exec /usr/bin/radicale -- --foreground
     eend $?

diff --git a/app-office/radicale/radicale-0.6.2.ebuild b/app-office/radicale/radicale-0.6.4.ebuild
similarity index 82%
rename from app-office/radicale/radicale-0.6.2.ebuild
rename to app-office/radicale/radicale-0.6.4.ebuild
index 14ee0cb372f93361b52fb5922596fe5efff6a70a..04326eaf316f79ff8086d8ba20e77f92116f225b 100644 (file)
--- a/app-office/radicale/radicale-0.6.2.ebuild
+++ b/app-office/radicale/radicale-0.6.4.ebuild
@@ -6,7 +6,7 @@ EAPI=2
 PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS=1
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="Radicale"
 MY_P="${MY_PN}-${PV}"
@@ -28,6 +28,18 @@ RDEPEND="ssl? ( >=dev-lang/python-2.6.6[ssl] )
 
 S=${WORKDIR}/${MY_P}
 
+RDIR=/var/lib/radicale
+
+pkg_setup() {
+       enewgroup radicale
+       enewuser radicale -1 -1 ${RDIR} radicale
+}
+
+src_prepare() {
+       sed -i -e "s:^folder = .*$:folder = ${RDIR}:g" \
+                               config || die
+}
+
 src_install() {
        # delete the useless .rst, so that it is not installed
        rm README.rst
@@ -37,6 +49,9 @@ src_install() {
        # init file
        newinitd "${FILESDIR}"/radicale.init.d radicale || die
 
+       keepdir ${RDIR}
+       fowners radicale:radicale ${RDIR}
+
        # config file
        insinto /etc/${PN}
        doins config logging || die