Bumped radicale

4 files changed, 7 insertions, 72 deletions

diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index a0f98e1..908bcaa 100644
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,5 +1,3 @@
-AUX config 956 RMD160 9d0dce31777f1eed5c2c1fc9f1ae190abe8fbb21 SHA1 3c1e9e9eb078180da89aea8c9f373ec670aacd3c SHA256 8f9b1fd220893f3620c8819eec031001142067029fc74cd9e91063ec490d220b
-AUX radicale-0.3-foreground.patch 500 RMD160 edab3048523dffe36bdc24fa947e6bc045248194 SHA1 dfa851fc79973aac3bd62a648314ad6a9a569c47 SHA256 8ece5d5397a6f04619d7184def8bd4425f2ce5b7981a6a71e91a4053479b8631
 AUX radicale.init.d 550 RMD160 f1f6aa919952b744900c781b8d6cd9283bc44534 SHA1 3c2043b9f2680b14969bd7f3727e3df85c7f9c48 SHA256 1b28de6c1bc2c6119eb654622713fdd2c16d89105940c6b55d2bc081fbb2fd2c
-DIST Radicale-0.3.tar.gz 22195 RMD160 34e8d908548e216d1cc000cd9764a1b8371d1aee SHA1 53fe68e365a3055bd5c7477941e1e071272e19b8 SHA256 81cba97776409506baa86a8d5b1241ff25c8680e37fcb9ab62128953156e5223
-EBUILD radicale-0.3.ebuild 836 RMD160 f92c9330154b02976b57efcbcf36b4294787bdde SHA1 2f2b72c258fd433fa4a62dcedadca086ab73ef53 SHA256 8cca4980d69449871f78f4a44a74de97f3d1310df75f91e73f2b68f8ed3f2e03
+DIST Radicale-0.4.tar.gz 22907 RMD160 ef477e226976f970949fe78184f181cd244442b8 SHA1 70af6c97840c5f890974a7e08bd34f0163157bd1 SHA256 0a20380e5c69b07ee02e439c9a21644da024c9016a9b3fb480c21b9cfb8d2035
+EBUILD radicale-0.4.ebuild 734 RMD160 c928c3f6c2c40d761f16ed404282daa0f356d40f SHA1 6776f363ab0ad356ee2a254777539464e092dc7e SHA256 0c4d2e991f54ff325420c56d0d310948bf70d784b1ce9c5a4aadf549e9680936
diff --git a/app-office/radicale/files/config b/app-office/radicale/files/config
deleted file mode 100644
index 172e488..0000000
--- a/app-office/radicale/files/config
+++ /dev/null
@@ -1,43 +0,0 @@
-# Config file for radicale - a simple calendar server
-#
-# Place it into /etc/radicale/config (global) 
-# or ~/.config/radicale/config (user)
-#
-# The current values are the default ones
-
-[server]
-# CalDAV server hostname, empty for all hostnames
-host =
-# CalDAV server port
-port = 5232
-# Daemon flag
-daemon = False
-# SSL flag, enable HTTPS protocol
-ssl = False
-# SSL certificate path (if needed)
-certificate = /etc/apache2/ssl/server.crt
-# SSL private key (if needed)
-key = /etc/apache2/ssl/server.key
-
-[encoding]
-# Encoding for responding requests
-request = utf-8
-# Encoding for storing local calendars
-stock = utf-8
-
-[acl]
-# Access method
-# Value: fake | htpasswd
-type = fake
-# Htpasswd filename (if needed)
-filename = /etc/radicale/users
-# Htpasswd encryption method (if needed)
-# Value: plain | sha1 | crypt
-encryption = crypt
-
-[storage]
-# Folder for storing local calendars,
-# created if not present
-folder = ~/.config/radicale/calendars
-
-# vim:ft=cfg
diff --git a/app-office/radicale/files/radicale-0.3-foreground.patch b/app-office/radicale/files/radicale-0.3-foreground.patch
deleted file mode 100644
index 4f1c911..0000000
--- a/app-office/radicale/files/radicale-0.3-foreground.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/radicale.py b/radicale.py
-index a0018df..7fc388a 100755
---- a/radicale.py
-+++ b/radicale.py
-@@ -52,6 +52,9 @@ parser.add_option(
-     default=radicale.config.getboolean("server", "daemon"),
-     help="launch as daemon")
- parser.add_option(
-+    "-f", "--foreground", action="store_false", dest="daemon",
-+    help="launch in foreground (opposite of --daemon)")
-+parser.add_option(
-     "-H", "--host",
-     default=radicale.config.get("server", "host"),
-     help="set server hostname")
diff --git a/app-office/radicale/radicale-0.3.ebuild b/app-office/radicale/radicale-0.4.ebuild
index ee8eb24..3afe871 100644
--- a/app-office/radicale/radicale-0.3.ebuild
+++ b/app-office/radicale/radicale-0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=2
 PYTHON_DEPEND="*:2.5"
 SUPPORT_PYTHON_ABIS=1
 
-inherit eutils distutils
+inherit distutils
 
 MY_P="${PN/r/R}-${PV}"
 
@@ -21,24 +21,18 @@ IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	distutils_src_prepare
-
-	epatch ${FILESDIR}/radicale-0.3-foreground.patch
-}
-
 src_install() {
 	distutils_src_install
 
 	# init file
-	newinitd ${FILESDIR}/radicale.init.d radicale
+	newinitd "${FILESDIR}"/radicale.init.d radicale || die
 
 	# config file
 	insinto /etc/${PN}
-	doins ${FILESDIR}/config
+	doins config || die
 }
 
 pkg_postinst() {
-    elog "If you want to use SSL with ${PN}, please check that you have"
-    elog "installed >=dev-lang/python-2.6[ssl]."
+	elog "If you want to use SSL with ${PN}, please check that you have"
+	elog "installed >=dev-lang/python-2.6[ssl]."
 }