gentoo resync : 28.04.2018

9 files changed, 7 insertions, 439 deletions

diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
index 235c8d6a749d..cee00f1ee66a 100644
--- a/www-apps/davical/Manifest
+++ b/www-apps/davical/Manifest
@@ -1,16 +1,5 @@
-AUX awl-locations.patch 2303 BLAKE2B 523e817b3b3d124cdd8f22ac3a38d027112b06de9f31cdbad5e76792403973d4ed62b77cd25eeec26df0ad7200cb8257cb55799ac37d7b8cbbe868c1c8c72e74 SHA512 38aca5e25ee3fa7c9d06ec9bb027a28ac175535657be1eb7dc160c95101588a182a1907109b4d4969b3e136a72e142a5b6a0d1734b5a7418a2418ba2f9ce3f5f
-AUX awl_location.patch 1156 BLAKE2B 9a8b92907ade070c75b69cbc2fda6eb777a4b420852733ae35852f3dc11a006c229b5303c8314f84ff13286f4c37284de25e607c4112ddcfd4c5eed14f83a43b SHA512 89a4599d4ef417cba923c2a5f35bbf0b3f6618d8beb344a2ae0ff42c564be2e040ed336f1d8bd8013eda48e77233cb25846d59716b486f441d78fc0d75739f44
-AUX inc_path.patch 1418 BLAKE2B 628cd5c98d333d699ed492bef7e7c7a072b85067eca0928578df10f9bdd5741535f5e4fc0e985d202cc877e6177e75b401d62ab69176e11a3e5bd2f03ef76c51 SHA512 f5f4019322627d32a1fa34251bc5cb5788103ff8048c11c000f034db3118154dd193fd510721cc664e6c492c23331fa2c13dbcddd00c00197dec9d63c4196fd3
 AUX postinstall-en.txt 730 BLAKE2B 43e38a6c099ffd1abf70a066fd0c4a7e88829ddc03bd8804eef1843158210a20a3030b4193ce89d969a88d8be4373e0d22ccb5a9984ec8cacfd9bedccf29d958 SHA512 e77199c7978bf44f96b82dee6d7cf22e4a964f2bd48c17890add7ec0742a5f4c3a296bcb813f6ac79059e8b98b5c155a0846b00c3622ea708f6baf3895270de4
 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9
-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
-EBUILD davical-1.0.2-r2.ebuild 1524 BLAKE2B 388fc6bc7544d8e5693a4d4ed28415d10f913d75ecc376358872c848f46d0e73698e8994ab14416e944c2e78ea221987c4f18565eda3107c465344d234c30c23 SHA512 a153225166179a94097083eeeff752728074a682a0eef566875a3e0ab5887fa5e670b5f35740f0264aab3cb65f97c685edab42c18ba7c3317f226aa32211b681
-EBUILD davical-1.1.0-r1.ebuild 1504 BLAKE2B 30825d086cd43b1c77e1399ee7e97cbd86e8070281853950f26e3f576f3566eae2d0f0de573e57eb57e59c9881585f6248a6c6dc444a26efc546199bdfae618b SHA512 516ba880869db947f76387a4e6d355dbe1392256901dd447840be61ac8fb1dde762f6b9166b2bea754e63f2d26f782dc40d50f56e893d873476de28ed42eabb1
-EBUILD davical-1.1.1-r2.ebuild 1499 BLAKE2B 6bf05d17a8797f8e78ab8e8591eb2e04a2ef9417d8e8b8f1e63dc01d228b01dabf369ebe219119b944fb9e7ec05b18168019070f10edc66786a4d33ba0d7a82f SHA512 68373843aebb1da62840a1891cfa7cb6c6cb593d50e4dc48da25f925bd0657316a5553f14cc152b2a962d5394baf1a924fb4e37a2bc85b1806f35fe1824b10d8
-EBUILD davical-1.1.3.1-r2.ebuild 1567 BLAKE2B 53e2a2241b69454f9800decf4f10602f988c2bc44a44c8fc6051405df31d5633f570e3ff637416b926895381fcc1eff47687cb01e95064d493f7911487a6a39e SHA512 be1cefe42341c70c85480da6298f6cb9b80abf417d9e22de310473212db464284c62c8afb3d83965caea34c813e19da3ef76aba4df279b2fe8ca865178094aba
-EBUILD davical-1.1.7.ebuild 1295 BLAKE2B 4d482667b73ab9824701c1d07f4e642b433fb563cdf36abb0072b8c11e72bedf6db60093d9f15406c09e9fa5223d47bd7762373d3c95ac1bee402274bc116c7e SHA512 34a01e0ab0e4b59556296b507e020b7c0f16fdc0facd1d3640f6a8491133e620e187babdf8aa47bfaa51359cd142513767a644d60de6aebedbe84cba811ddaf6
+DIST davical-1.1.7.tar.xz 1347368 BLAKE2B 74418e99190db94dbb95fe9bdbed8f468cf98070a6ef86cb5af1f6460a97eb8c2faede7858a38b9728c5b3e400c6340f1abf3f00ae757847d8996b22e709f70e SHA512 d66388479259a8369f3a648a9d81f1e2f5488f6a3c4415360c133b21b6c6d4b4d433d5f94a635cffdaa0385a56c24176fa660ee8653d75246604655ccdd1a455
+EBUILD davical-1.1.7.ebuild 1274 BLAKE2B f7719fbe99311187884aeaf65a760d86135e8f9176ec2cdf84d34db5c7f4681f39c6344cb161306ab8ebbaeb711ae72a135c15d43def684e56c8c6f0a2a3fdc2 SHA512 c69d4fe244d216c7a028862b0eaaafa275e27cc0f17370ab3efcce0599b176e9ee5460fc10f76e39fdfe5076545c76e6b05314fcdb0bd122a782a78babf2ba50
 MISC metadata.xml 464 BLAKE2B f84e3f2c3b622eea5925ed066e9885aa1adb55d2f62245da5a63118bd99b30e36c10f21cd001da54a35926489860ee92cbde495552a52faf2f70dfd87807035d SHA512 74382454cf5fad3dc417c8c5be290919a3e86fae9f7508eadc995a0253e18350f1ef8ba9b0085f174e7fb15b14b5cd5630180dcbc2178132409d858182c31b84
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 2705cea82653..000000000000
--- 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 43091254bcf5..000000000000
--- 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 0826a035786f..000000000000
--- 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 03ec48493ae8..000000000000
--- 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 fbd56f271c65..f247e7e3b458 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 e0105bffbd2f..000000000000
--- 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 7eee3d8fcfb8..000000000000
--- 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 2230249df0f9..000000000000
--- 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 */