commit: 7ee14b4b13114bd009f46551bf644a104f69cfb3 Author: Till Schäfer <till2.schaefer <AT> uni-dortmund <DOT> de> AuthorDate: Wed Apr 25 15:02:37 2018 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Apr 27 09:40:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee14b4b
www-apps/davical: use official release tarball drop outdated versions Closes: https://bugs.gentoo.org/653988 Package-Manager: Portage-2.3.24, Repoman-2.3.6 www-apps/davical/Manifest | 6 +- www-apps/davical/davical-1.0.2-r2.ebuild | 70 ---------------------- www-apps/davical/davical-1.1.0-r1.ebuild | 71 ----------------------- www-apps/davical/davical-1.1.1-r2.ebuild | 69 ---------------------- www-apps/davical/davical-1.1.3.1-r2.ebuild | 71 ----------------------- www-apps/davical/davical-1.1.7.ebuild | 8 ++- www-apps/davical/files/awl-locations.patch | 93 ------------------------------ www-apps/davical/files/awl_location.patch | 21 ------- www-apps/davical/files/inc_path.patch | 28 --------- 9 files changed, 6 insertions(+), 431 deletions(-) diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest index bc9270c1403..5e6249b3a8e 100644 --- a/www-apps/davical/Manifest +++ b/www-apps/davical/Manifest @@ -1,5 +1 @@ -DIST davical-1.0.2.tar.gz 2739740 BLAKE2B 1f8c117d52d577a4364407e35552ca59aeaaea812e0cff76525a65cbfc70ab2e235f1dc38198c16a5cc7869a3592923a72821cff1dd737b85238fbe10629a5d2 SHA512 8eb1df963b0e3aa87c28e75001c4301698abff74fd4581bdc826bfad8d8e1cd5aa0b641c668dbecc2f85ca8f3bca8ec9a508d268881da004cbb84017c2604dcb -DIST davical-1.1.0.tar.gz 2967572 BLAKE2B e36f5d20323996f48173c3cde32d4b8600dd019fb13f649edc053588679bea5b1753df70db4997277db251a8ef862cece9a32e230c48929cb8728109de3cb3cd SHA512 5c272418b5c324d0ea4cbdd9c1124171ecd1fe1f3df4953569b02a47359469539205ff48e92aa19abaa667bb7c69f1b8b8196d79e549645009ac0b7bbddd7c18 -DIST davical-1.1.1.tar.gz 2979425 BLAKE2B 06dd2bda2459b113c94d19128979da2ed6fc06442591812116afd69aee94ab7ac2ebb31b58afe2d4335f8e49bb1f52d2fcfac7a8a31b6643f11143c4ef61521b SHA512 6f0b2a13ba6698ea1a7d16988c795888820a08d125ac3d622b6c9fc21f831b698e8ce2c9c7ae25e64252f38502e473daabbd0626c5b2450646efb7cdb7f5b31e -DIST davical-1.1.3.1.tar.gz 3031220 BLAKE2B 1a4bd7d2c027647095e76033f6689c31da3626a8862a8ab80287e48879c41348fc8dd18a59a2e8e02bf1ceb1d0c7ae8ae5ffce6cb720051a145048f0fb3903e5 SHA512 1944c4750799e9388adcaf1d5df6a2a5daccc34dd7274673a6b27cf0c32b2357d3cdd6d7c0928ea182408ce5111530f6b0e2eb6d882eb47ee1dcfa6eb8d4fe4b -DIST davical-1.1.7.tar.gz 1818904 BLAKE2B ce6ffca5786963e2363832d994380f066812d2cd49c729270dcd92b98214c9a5be7b20ff678947ae7b300c39bdc31c5adb39cbb3d54c0bad4109809947b65811 SHA512 2bec19a85da5d626dcabc47c0c3a76e435d42a26da3e3a747a072c79a4dd955c012864580ad7ecd17b6c901acbebd77d17be9c74cef8ca19b12cba4b442c1d70 +DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455 diff --git a/www-apps/davical/davical-1.0.2-r2.ebuild b/www-apps/davical/davical-1.0.2-r2.ebuild deleted file mode 100644 index 2705cea8265..00000000000 --- a/www-apps/davical/davical-1.0.2-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit webapp eutils - -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=">=dev-php/awl-0.51 - sys-devel/gettext" -RDEPEND=" - app-admin/pwgen - dev-lang/php:*[calendar,curl,pdo,postgres,xml] - dev-perl/DBI - dev-perl/DBD-Pg - dev-perl/YAML - >=dev-php/awl-0.51 - www-servers/apache" - -need_httpd - -src_prepare() { - epatch "${FILESDIR}/awl_location.patch" - epatch "${FILESDIR}/inc_path.patch" -} - -src_compile() { - emake built-po -} - -src_install() { - webapp_src_preinst - - dodoc INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog - - einfo "Installing web files" - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess - - einfo "Installing main files and i18n" - insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale || die "doins failed" - rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* - - if use doc ; then - einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ - fi - - insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" - - 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.1.0-r1.ebuild b/www-apps/davical/davical-1.1.0-r1.ebuild deleted file mode 100644 index 43091254bcf..00000000000 --- a/www-apps/davical/davical-1.1.0-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit webapp eutils - -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=" - >=dev-php/awl-0.51 - sys-devel/gettext - " -RDEPEND="app-admin/pwgen - dev-lang/php:*[calendar,curl,pdo,postgres,xml] - dev-perl/DBI - dev-perl/DBD-Pg - dev-perl/YAML - >=dev-php/awl-0.51 - www-servers/apache" - -need_httpd - -src_prepare() { - epatch "${FILESDIR}/awl_location.patch" - epatch "${FILESDIR}/inc_path.patch" -} - -src_compile() { - emake built-po -} - -src_install() { - webapp_src_preinst - - dodoc INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog - - einfo "Installing web files" - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess - - einfo "Installing main files and i18n" - insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale - rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* - - if use doc ; then - einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ - fi - - insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" - - 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.1.1-r2.ebuild b/www-apps/davical/davical-1.1.1-r2.ebuild deleted file mode 100644 index 0826a035786..00000000000 --- a/www-apps/davical/davical-1.1.1-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit webapp eutils - -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=">=dev-php/awl-0.51 - sys-devel/gettext" -RDEPEND="app-admin/pwgen - dev-lang/php:*[calendar,curl,pdo,postgres,xml] - dev-perl/DBI - dev-perl/DBD-Pg - dev-perl/YAML - >=dev-php/awl-0.51 - virtual/httpd-php" - -need_httpd - -src_prepare() { - epatch "${FILESDIR}/awl_location.patch" - epatch "${FILESDIR}/inc_path.patch" -} - -src_compile() { - emake built-po -} - -src_install() { - webapp_src_preinst - - dodoc INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog - - einfo "Installing web files" - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess - - einfo "Installing main files and i18n" - insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale - rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* - - if use doc ; then - einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ - fi - - insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" - - 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.1.3.1-r2.ebuild b/www-apps/davical/davical-1.1.3.1-r2.ebuild deleted file mode 100644 index 03ec48493ae..00000000000 --- a/www-apps/davical/davical-1.1.3.1-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit webapp eutils - -DESCRIPTION="A CalDAV and CardDAV Server" -HOMEPAGE="http://davical.org/"; -SRC_URI="https://gitlab.com/${PN}-project/${PN}/repository/archive.tar.gz?ref=r${PV} -> ${PN}-${PV}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND=">=dev-php/awl-0.55 - sys-devel/gettext" -RDEPEND="app-admin/pwgen - dev-lang/php:*[calendar,curl,pdo,postgres,xml] - dev-perl/DBI - dev-perl/DBD-Pg - dev-perl/YAML - >=dev-php/awl-0.55 - virtual/httpd-php" - -S="${WORKDIR}/${PN}.git" - -need_httpd - -src_prepare() { - epatch "${FILESDIR}/awl-locations.patch" - epatch "${FILESDIR}/inc_path.patch" -} - -src_compile() { - emake built-po -} - -src_install() { - webapp_src_preinst - - dodoc INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog - - einfo "Installing web files" - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess - - einfo "Installing main files and i18n" - insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale - rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* - - if use doc ; then - einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ - fi - - insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" - - 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.1.7.ebuild b/www-apps/davical/davical-1.1.7.ebuild index fbd56f271c6..f247e7e3b45 100644 --- a/www-apps/davical/davical-1.1.7.ebuild +++ b/www-apps/davical/davical-1.1.7.ebuild @@ -3,11 +3,11 @@ EAPI=6 -inherit webapp vcs-snapshot +inherit webapp DESCRIPTION="A CalDAV and CardDAV Server" -HOMEPAGE="http://davical.org/"; -SRC_URI="https://gitlab.com/${PN}-project/${PN}/repository/archive.tar.gz?ref=r${PV} -> ${PN}-${PV}.tar.gz" +HOMEPAGE="https://davical.org/"; +SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" @@ -24,6 +24,8 @@ RDEPEND="app-admin/pwgen need_httpd +S="${WORKDIR}" + src_compile() { emake built-locale } diff --git a/www-apps/davical/files/awl-locations.patch b/www-apps/davical/files/awl-locations.patch deleted file mode 100644 index e0105bffbd2..00000000000 --- a/www-apps/davical/files/awl-locations.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/dba/create-database.sh b/dba/create-database.sh -index b1dd1fa..d25f9d9 100755 ---- a/dba/create-database.sh -+++ b/dba/create-database.sh -@@ -10,22 +10,29 @@ DBADIR="`dirname \"$0\"`" - - INSTALL_NOTE_FN="`mktemp -t tmp.XXXXXXXXXX`" - --testawldir() { -- [ -f "${1}/dba/awl-tables.sql" ] --} - --# --# Attempt to locate the AWL directory --AWLDIR="${DBADIR}/../../awl" --if ! testawldir "${AWLDIR}"; then -- AWLDIR="/usr/share/awl" -- if ! testawldir "${AWLDIR}"; then -- AWLDIR="/usr/local/share/awl" -- if ! testawldir "${AWLDIR}"; then -- echo "Unable to find AWL libraries" -- exit 1 -+# Candidate locations of the AWL directory -+awldirs="${DBADIR}/../../awl -+/usr/share/awl -+/usr/share/php/awl -+/usr/local/share/awl" -+ -+# Disable globbing and use newline as seperator -+set -f; IFS=' -+' -+for d in $awldirs ; do -+ if [ -f "${d}/dba/awl-tables.sql" ] ; then -+ AWLDIR="${d}" -+ break - fi -- fi -+done -+ -+# Renable file globbing and reset seperator -+set +f; unset IFS -+ -+if [ -z "${AWLDIR}" ] ; then -+ echo "Unable to find AWL libraries" -+ exit 1 - fi - - export AWL_DBAUSER=davical_dba -diff --git a/scripts/po/rebuild-translations.sh b/scripts/po/rebuild-translations.sh -index 7191615..809fa8c 100755 ---- a/scripts/po/rebuild-translations.sh -+++ b/scripts/po/rebuild-translations.sh -@@ -10,17 +10,30 @@ - PODIR="po" - LOCALEDIR="locale" - APPLICATION="davical" --AWL_LOCATION="../awl" -- --if [ ! -d "${AWL_LOCATION}" ]; then -- AWL_LOCATION="`find .. -type d -name 'awl-*.*'`" -- if [ ! -d "${AWL_LOCATION}" ]; then -- AWL_LOCATION=/usr/share/awl -- if [ ! -d "${AWL_LOCATION}" ]; then -- echo "I can't find a location for the AWL libraries and I need those strings too" -- exit 1 -+ -+awldirs="../awl -+`find .. -type d -name 'awl-*.*'` -+/usr/share/awl -+/usr/share/php/awl -+/usr/local/share/awl" -+ -+# Disable globbing and use newline as seperator -+set -f; IFS=' -+' -+ -+for d in $awldirs ; do -+ if [ -d "${d}" ] ; then -+ AWL_LOCATION="${d}" -+ break - fi -- fi -+done -+ -+# Renable file globbing and reset seperator -+set +f; unset IFS -+ -+if [ -z "${AWL_LOCATION}" ] ; then -+ echo "I can't find a location for the AWL libraries and I need those strings too" -+ exit 1 - fi - - egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1 diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch deleted file mode 100644 index 7eee3d8fcfb..00000000000 --- a/www-apps/davical/files/awl_location.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- scripts/po/rebuild-translations.sh.orig 2011-09-29 21:23:48.122625252 +0200 -+++ scripts/po/rebuild-translations.sh 2011-09-29 21:49:55.642929743 +0200 -@@ -10,7 +10,7 @@ - PODIR="po" - LOCALEDIR="locale" - APPLICATION="davical" --AWL_LOCATION="../awl" -+AWL_LOCATION="/usr/share/php/awl/inc" - - if [ ! -d "${AWL_LOCATION}" ]; then - AWL_LOCATION="`find .. -type d -name 'awl-*.*'`" -@@ -25,7 +25,8 @@ - - egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1 - sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1 --sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp -+sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2 -+sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp - xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp - sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot - rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1 diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch deleted file mode 100644 index 2230249df0f..00000000000 --- a/www-apps/davical/files/inc_path.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 */
