Move echo_functions.bash to paludis/util/. Move ebuild / exheres specific code out into conditional_functions.bash.

11 files changed, 18 insertions, 17 deletions

diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index a5c44b07a..d27739de4 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -282,6 +282,7 @@ TESTS_ENVIRONMENT = env \
 	PALUDIS_COMMAND="$(top_builddir)/src/clients/paludis/paludis" \
 	PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
 	PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+	PALUDIS_ECHO_FUNCTIONS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
 	PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
 	PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
 	PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
diff --git a/hooks/demos/elog.bash.in b/hooks/demos/elog.bash.in
index ba4361b51..6e1598a4d 100644
--- a/hooks/demos/elog.bash.in
+++ b/hooks/demos/elog.bash.in
@@ -26,7 +26,7 @@ case "${EBUILD_PHASE}" in
     config|pretend|metadata) return
 esac
 
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 logfile="${PALUDIS_HOOKS_TMPDIR:-${ROOT}/var/tmp/paludis}/elog.${PALUDIS_PID}"
 
diff --git a/hooks/demos/new_packages.bash.in b/hooks/demos/new_packages.bash.in
index 9a3830eee..9783e7a6e 100644
--- a/hooks/demos/new_packages.bash.in
+++ b/hooks/demos/new_packages.bash.in
@@ -10,7 +10,7 @@
 #
 # You should ensure that it has execute permissions.
 
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 syncfile="${PALUDIS_HOOKS_TMPDIR:-${ROOT}/var/tmp/paludis}/sync.${PALUDIS_PID}"
 
diff --git a/hooks/eselect_env_update.bash b/hooks/eselect_env_update.bash
index dd87bedfd..ef55f10b1 100755
--- a/hooks/eselect_env_update.bash
+++ b/hooks/eselect_env_update.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2006, 2007 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
 export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 if [[ -n "${PALUDIS_NO_LIVE_DESTINATION}" ]] ; then
     einfo_unhooked "No need to regenerate environment"
diff --git a/hooks/find_config_updates.hook b/hooks/find_config_updates.hook
index 686448768..da5156bae 100755
--- a/hooks/find_config_updates.hook
+++ b/hooks/find_config_updates.hook
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2006, 2007 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -21,7 +21,7 @@ check_for_config_updates()
     shopt -s extglob
 
     export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
-    source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+    source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
     if [[ -n "${PALUDIS_NO_LIVE_DESTINATION}" ]] ; then
         einfo_unhooked "No need to search for configuration files requiring action"
diff --git a/hooks/gnu_info_index.bash b/hooks/gnu_info_index.bash
index 799f92f6a..f0b132a2e 100755
--- a/hooks/gnu_info_index.bash
+++ b/hooks/gnu_info_index.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2006, 2007 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
 export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 if [[ -n "${PALUDIS_NO_LIVE_DESTINATION}" ]] ; then
     einfo_unhooked "No need to update the GNU info directory"
diff --git a/hooks/installable_cache_regen.bash b/hooks/installable_cache_regen.bash
index 2889196e3..83df6a772 100755
--- a/hooks/installable_cache_regen.bash
+++ b/hooks/installable_cache_regen.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2006 Ciaran McCreesh
+# Copyright (c) 2006, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
 export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 echo
 einfo_unhooked "Regenerating cache for installable repositories..."
diff --git a/hooks/installed_cache_regen.bash b/hooks/installed_cache_regen.bash
index 617277c95..dc1d39be7 100755
--- a/hooks/installed_cache_regen.bash
+++ b/hooks/installed_cache_regen.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2006 Ciaran McCreesh
+# Copyright (c) 2006, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
 export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 echo
 einfo_unhooked "Regenerating cache for installed repositories..."
diff --git a/hooks/news.hook b/hooks/news.hook
index 12d3e088d..7cb396b56 100755
--- a/hooks/news.hook
+++ b/hooks/news.hook
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2006, 2007 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -20,7 +20,7 @@ check_for_news()
 {
     export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
     export ROOT="${ROOT}"
-    source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+    source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
     count="$(eselect news count )"
 
     done_echo=
diff --git a/hooks/update_config_protect_list.bash b/hooks/update_config_protect_list.bash
index 37febc3ab..77f1630c3 100755
--- a/hooks/update_config_protect_list.bash
+++ b/hooks/update_config_protect_list.bash
@@ -17,7 +17,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 if [[ -n "${PALUDIS_NO_LIVE_DESTINATION}" ]] ; then
     einfo_unhooked "No need to update CONFIG_PROTECT lists"
diff --git a/hooks/write_cache_clean.bash b/hooks/write_cache_clean.bash
index 03e6c7425..85f83b442 100755
--- a/hooks/write_cache_clean.bash
+++ b/hooks/write_cache_clean.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set et sw=4 sts=4 :
 
-# Copyright (c) 2007 Ciaran McCreesh
+# Copyright (c) 2007, 2008 Ciaran McCreesh
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
 export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
-source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
+source ${PALUDIS_ECHO_FUNCTIONS_DIR:-${PALUDIS_EBUILD_DIR}}/echo_functions.bash
 
 [[ -n "${PALUDIS_NO_WRITE_CACHE_CLEAN}" ]] && exit 0