www-apps/davical: Removed unused inherits, added missing die statements.

svn path=/sunrise/; revision=8391

diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
index 2f85b4785e2a0d966692c8142224b73ced8975df..c842a9233f55d1301da1252d6173cc304f9fa24c 100644 (file)
--- a/www-apps/davical/ChangeLog
+++ b/www-apps/davical/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Apr 2009; Christian Ruppert <idl0r@gentoo.org> davical-0.9.6.3.ebuild:
+  Removed unused inherits, added missing die statements.
+
   22 Apr 2009; lebarjack <francois.perichon@univ-lille2.fr>
   -davical-0.9.6.2.ebuild, -files/postinstall-en-0.9.6.2.txt,
   +davical-0.9.6.3.ebuild, +files/postinstall-en-0.9.6.3.txt:

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 75fda66643799747370259cc250fab10d7970102..a0ce243b975f4cf0c16986fd1e7100c6bfc1cc02 100644 (file)
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,6 +1,6 @@
 AUX postinstall-en-0.9.6.3.txt 528 RMD160 e53a8999738284de5d4149c1c0ab4aa63d8446cf SHA1 bbf36094893e196913693e590ad5e26309910a8e SHA256 41b4d5a93c64086b95c72d9ddee8d896fc938a3a6dda274557eba8dd6aa3b884
 AUX rscds.conf 11907 RMD160 bdd38b174cf76e2a2ea76da5ed09706d000ccd20 SHA1 12da666505dd8fb814e775f21f9bc7e623dc7597 SHA256 25d27389f72caf07e9c008bd1cfe791eac69a85309ab226946d9d7e4304ec9b7
 DIST davical_0.9.6.3.tar.gz 845377 RMD160 d8a5fb87e2750440e2db43eff267e09e3b84f55d SHA1 eafd03e86cb627a040021dfe35089d7280394989 SHA256 a61606fabb977e5095e884131b083c81ceb0a7ebef27c256a5fa111795a2cccf
-EBUILD davical-0.9.6.3.ebuild 1730 RMD160 9d7e0a3d6dbdfac972e8492c1b522cd13535112e SHA1 c6347f715b45db083576dbd371d98ce0daf4cead SHA256 52d1b570e0e4d220920aab58bc80fcda070460fcfacdef6c1344f8906e10dfbf
-MISC ChangeLog 1378 RMD160 187bb58d3bfb8e6219999a690819e331c75e9b9f SHA1 abf5ff8001d6854c75fae01d0b04cf39a38b5b7c SHA256 cfe13574a3b3602b41bf4ff60dcc9fc0cab1190608fe257cdb1257944e273892
+EBUILD davical-0.9.6.3.ebuild 1753 RMD160 5d9964e139e8da1702412ac12c7451281b3a328d SHA1 69447b827b813f156c78162f8e94f7a3dca89801 SHA256 4f85d84c32691986ccde9e83bc2913d6d15502021982998c6f9b7dde4b594def
+MISC ChangeLog 1512 RMD160 3db7ab188b658fba1b969f5487e4b535f63146b8 SHA1 b21fce8e64b2db0a4af752534cc215cfc35b5c43 SHA256 7759b2cb61a7c2892d30973ae227708738dec99c54d6705a1460b3abd3dd16d2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/www-apps/davical/davical-0.9.6.3.ebuild b/www-apps/davical/davical-0.9.6.3.ebuild
index 76982e6f348687f66afbe9fbea628736c04b44a5..192cc679e09e11be3ee80d90e475ca84f8a6ae6e 100644 (file)
--- a/www-apps/davical/davical-0.9.6.3.ebuild
+++ b/www-apps/davical/davical-0.9.6.3.ebuild
@@ -4,15 +4,16 @@
 
 EAPI="2"
 
-inherit eutils webapp depend.php versionator
+inherit webapp depend.php
 
 DESCRIPTION="A CalDAV and iCal server"
 HOMEPAGE="http://davical.org/"
-SRC_URI="http://debian.mcmillan.net.nz/packages/davical/${PN}_${PV}.tar.gz"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc vhosts"
+
 DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
 RDEPEND="www-servers/apache
        dev-lang/php[pcre,postgres,xml]
@@ -31,7 +32,7 @@ src_compile() {
                phpdoc -c "docs/api/phpdoc.ini"
                eend $? || die "Documentation failed to build"
        fi
-       emake inc/always.php
+       emake inc/always.php || die "emake failed"
        scripts/po/rebuild-translations.sh
 }
 
@@ -58,8 +59,9 @@ src_install() {
                dohtml -r "docs/website/" || die "dohtml failed"
        fi
 
-       insinto /etc/davical/
-       newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php
+       insinto /etc/${PN}
+       newins "${FILESDIR}/rscds.conf" calendar.example.com-conf.php \
+               || die "newins failed"
 
        webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
        webapp_src_install