From 5d62c8b3277d3815af538b8b615273c63e9af7a3 Mon Sep 17 00:00:00 2001 From: lebarjack Date: Mon, 16 Jan 2012 14:22:53 +0000 Subject: www-apps/davical: New version of davical svn path=/sunrise/; revision=12657 --- www-apps/davical/ChangeLog | 7 ++- www-apps/davical/Manifest | 13 +++--- www-apps/davical/davical-0.9.9.7.ebuild | 77 ------------------------------ www-apps/davical/davical-1.0.2.ebuild | 78 +++++++++++++++++++++++++++++++ www-apps/davical/files/awl_location.patch | 2 +- www-apps/davical/files/inc_path.patch | 28 +++++++++++ www-apps/davical/files/postinstall-en.txt | 5 +- www-apps/davical/files/vhost-example | 1 - 8 files changed, 121 insertions(+), 90 deletions(-) delete mode 100644 www-apps/davical/davical-0.9.9.7.ebuild create mode 100644 www-apps/davical/davical-1.0.2.ebuild create mode 100644 www-apps/davical/files/inc_path.patch (limited to 'www-apps') diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog index ea6d6e10b..db0b01970 100644 --- a/www-apps/davical/ChangeLog +++ b/www-apps/davical/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for www-apps/davical -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jan 2012; lebarjack + -davical-0.9.9.7.ebuild, +davical-1.0.2.ebuild, files/awl_location.patch, + +files/inc_path.patch, files/postinstall-en.txt, files/vhost-example: + New version of davical + 05 Nov 2011; Sven Schwyn (svoop) -davical-0.9.9.6.ebuild, +davical-0.9.9.7.ebuild: Version bump for davical diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest index e08834cfb..03f87cfd6 100644 --- a/www-apps/davical/Manifest +++ b/www-apps/davical/Manifest @@ -1,7 +1,8 @@ -AUX awl_location.patch 1153 RMD160 3e4f86a5a3875b33cc4d05af17a83ab1f372345a SHA1 0ff4784259044e32e927a0a16f5502bbb9e72d0c SHA256 ae987efc9d5209aedd61039ee6b3e2724ba65cac5d33480c1060b8875231a654 -AUX postinstall-en.txt 895 RMD160 61e2a9dfb5c571e4b6467b16172e5161a70c47c5 SHA1 87cf264f588f0a715506b73af2cbdb80b6669ea5 SHA256 360c09900188462b35c561bf5595b70a5c967dd50e62298484c2022dc943b62e -AUX vhost-example 433 RMD160 8ce2aee1f3bcad5ab296b3c09704630d533fbd38 SHA1 d0d5d1af9b0ce41866ddf034d048afc547820c88 SHA256 324589afec23b5d7f10b5c95a162cf0cdeb1e05253fd8f8206fffada95209ffa -DIST davical-0.9.9.7.tar.gz 2696161 RMD160 ae2165c7cd2036b2db845369d556c26b97b404c0 SHA1 655487788d4bae062e89310083dc00f686a3ad54 SHA256 954649b61cadacd5647f14790fd31f79d59ce351196afa183ceee2ed51e8e1ef -EBUILD davical-0.9.9.7.ebuild 1812 RMD160 9afdab6ae8b3d4f8936b5ed55f023c3b0596c6fb SHA1 94b02203ccf7a8243fcb11ae0218ae3d445c123c SHA256 cbd0f83451caab3e2910658993f8b023d3ba29b8b026d2bc049c6f59d87903f6 -MISC ChangeLog 5050 RMD160 248fff118851f0aae95804549d9e34031d7ebe8e SHA1 a59fec87a34484ba21c10690b755357aa53798fe SHA256 5266b8a4ba17df407d658fdd66ec7c5dcd1d34134248a198ad753f2d69bcf0e2 +AUX awl_location.patch 1157 RMD160 bfb3ed06aeba14c5dba49c72f207a9499907b233 SHA1 87c6b903c3c6baa54ebb2a651ecb4b44187bb175 SHA256 c1b8c6b16d96b66112c46323ded1a7f76c746819c49e3c4ec3055e0f8f191368 +AUX inc_path.patch 1418 RMD160 6966f134dcff29bc829bd6572aefccc0bcefe0b7 SHA1 fdf27970da1c6bf8fc6ad2b0a15474b5fc099780 SHA256 b0f4544639ce76b3cdcd032854bb94178580e12dd51cb9d8d5d6a1f29747a138 +AUX postinstall-en.txt 730 RMD160 a39674de7cefa276aab4d02945b63216cf62a8d9 SHA1 77edb005c8576d681218e4fa471f7492feaafb31 SHA256 a8796e92aace5307fa6911a3019cd2f1f4baefb5bd4b90efedda5793967ceed1 +AUX vhost-example 366 RMD160 aa9831be71c50e608b09c0f9a92ad30c52fc18ba SHA1 2b79bdcbd5d995f6014b86eaceab24418296e5d6 SHA256 3d1609ff3652814c00aeb33effdfca48a60698b8b5da4db7f97951807235b333 +DIST davical-1.0.2.tar.gz 2739740 RMD160 d24ccc16363f30789ec3c0b384f99999405fee7d SHA1 5d8b87018411d6f3995809d959450dd7522a149c SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6 +EBUILD davical-1.0.2.ebuild 1867 RMD160 c53aceddd2bcbf866ee4f9b430d52f92e31fcb01 SHA1 c302a26495a6471065a853a897e422a54d46e1f2 SHA256 6ecc590d0f749fb055ebdbdd947ce31fb49f07d67d2354b5a10eaf2fdf7f5c07 +MISC ChangeLog 5284 RMD160 3454577badce029482ef9fb1309475a425d2fdbf SHA1 003be215b465ec0f0310a1d9c9093cdeada89d5a SHA256 aa65bc5b00b397ab9aeca3fc502e330f09f7d8840f9e25fdc77f3553c0f57f96 MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 diff --git a/www-apps/davical/davical-0.9.9.7.ebuild b/www-apps/davical/davical-0.9.9.7.ebuild deleted file mode 100644 index 36fb63eb7..000000000 --- a/www-apps/davical/davical-0.9.9.7.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit depend.php webapp - -DESCRIPTION="A CalDAV and iCal server" -HOMEPAGE="http://davical.org/" -SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" -RDEPEND="app-admin/pwgen - || ( =dev-lang/php-5.3[pdo,postgres,xml] ) - dev-perl/DBI - dev-perl/DBD-Pg - dev-perl/yaml - >=dev-php/awl-0.49 - www-servers/apache" - -need_php5 -need_httpd - -src_prepare() { - epatch "${FILESDIR}/awl_location.patch" -} - -src_compile() { - if use doc ; then - einfo "Generating documentation" - phpdoc -c "docs/api/phpdoc.ini"\ - || die "Documentation failed to build" - fi - emake built-po || die "emake failed" -} - -src_install() { - webapp_src_preinst - - dodoc-php INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog \ - || die "dodoc failed" - - einfo "Installing web files" - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess || die "doins failed" - - einfo "Installing main files and i18n" - insinto "${MY_HOSTROOTDIR}" - doins -r inc locale || die "doins failed" - rm -f "${D}/${MY_HOSTROOTDIR}/inc/always.php.in" - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" - - if use doc ; then - einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ || die "dohtml failed" - fi - - insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" \ - || die "newins failed" - - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" - webapp_src_install - - fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" - fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" -} diff --git a/www-apps/davical/davical-1.0.2.ebuild b/www-apps/davical/davical-1.0.2.ebuild new file mode 100644 index 000000000..bdfcd51a8 --- /dev/null +++ b/www-apps/davical/davical-1.0.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit depend.php webapp + +DESCRIPTION="A CalDAV and CardDAV Server" +HOMEPAGE="http://davical.org/" +SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" +RDEPEND="app-admin/pwgen + || ( =dev-lang/php-5.3[pdo,postgres,xml] ) + dev-perl/DBI + dev-perl/DBD-Pg + dev-perl/yaml + >=dev-php/awl-0.51 + www-servers/apache" + +need_php5 +need_httpd + +src_prepare() { + epatch "${FILESDIR}/awl_location.patch" + epatch "${FILESDIR}/inc_path.patch" +} + +src_compile() { + if use doc ; then + einfo "Generating documentation" + phpdoc -q -c "docs/api/phpdoc.ini"\ + || die "Documentation failed to build" + fi + emake built-po || die "emake failed" +} + +src_install() { + webapp_src_preinst + + dodoc-php INSTALL README debian/README.Debian \ + testing/README.regression_tests TODO debian/changelog \ + || die "dodoc failed" + + einfo "Installing web files" + insinto "${MY_HTDOCSDIR}" + doins -r htdocs/* htdocs/.htaccess || die "doins failed" + + einfo "Installing main files and i18n" + insinto "${MY_HOSTROOTDIR}/${PN}" + doins -r inc locale || die "doins failed" + rm -f "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" + + einfo "Installing sql files" + insinto "${MY_SQLSCRIPTSDIR}" + doins -r dba/* || die "doins failed" + + if use doc ; then + einfo "Installing documentation" + dohtml -r docs/api/ docs/website/ || die "dohtml failed" + fi + + insinto /etc/${PN} + doins config/* "${FILESDIR}/vhost-example" \ + || die "newins failed" + + webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" + webapp_src_install + + fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" + fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" +} diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch index 376aae6a3..2f4366855 100644 --- a/www-apps/davical/files/awl_location.patch +++ b/www-apps/davical/files/awl_location.patch @@ -5,7 +5,7 @@ LOCALEDIR="locale" APPLICATION="davical" -AWL_LOCATION="../awl" -+AWL_LOCATION="/usr/share/php5/awl" ++AWL_LOCATION="/usr/share/php5/awl/inc" if [ ! -d "${AWL_LOCATION}" ]; then AWL_LOCATION="`find .. -type d -name 'awl-*.*'`" diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch new file mode 100644 index 000000000..2230249df --- /dev/null +++ b/www-apps/davical/files/inc_path.patch @@ -0,0 +1,28 @@ +--- htdocs/always.php.orig 2012-01-05 21:28:16.382878446 +0100 ++++ htdocs/always.php 2012-01-05 21:30:06.828431957 +0100 +@@ -48,7 +48,7 @@ + // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt'); // An array of locales to try, or just a single locale + // $c->local_tzid = 'Pacific/Auckland'; // Perhaps we should read from /etc/timezone - I wonder how standard that is? + $c->default_locale = 'en'; +-$c->locale_path = '../locale'; ++$c->locale_path = '../../davical/locale'; + $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']); + $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']); + $c->default_privileges = array('read-free-busy', 'schedule-deliver'); +@@ -80,6 +80,7 @@ + '../../awl/inc' + , '/usr/share/awl/inc' // Where it ends up on Debian + , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries ++ , '/usr/share/php5/awl/inc' // Gentoo's standard for PHP5 libraries + , '/usr/local/share/awl/inc' + ); + foreach( $try_paths AS $awl_include_path ) { +@@ -95,7 +96,7 @@ + } + + // Ensure that ../inc is in our included paths as early as possible +-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path()); ++set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path()); + + + /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */ diff --git a/www-apps/davical/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt index 7565fbffd..5a88a2bdf 100644 --- a/www-apps/davical/files/postinstall-en.txt +++ b/www-apps/davical/files/postinstall-en.txt @@ -15,7 +15,4 @@ You can safely ignore any message about missing time_zone table. If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/ have been moved away from the htdocs directory and placed into hostroot for -safety reasons. Update you include_path accordingly. - -You may have to configure the locale path in the davical configuration file. -(add a $c->locale_path = '/path/to/the/locales';) +safety reasons. diff --git a/www-apps/davical/files/vhost-example b/www-apps/davical/files/vhost-example index 5ac5c35f5..d6f0da208 100644 --- a/www-apps/davical/files/vhost-example +++ b/www-apps/davical/files/vhost-example @@ -9,7 +9,6 @@ Allow from all - php_value include_path "/usr/share/php5/awl:/var/www/myvhost/inc" php_value magic_quotes_gpc 0 php_value register_globals 0 php_value error_reporting "E_ALL & ~E_NOTICE" -- cgit v1.2.3-18-g5258