gentoo resync : 28.04.2018

3 files changed, 0 insertions, 142 deletions

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 */