From b267140fc6a105b292860298799d05017724e536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bo=20=C3=98rsted=20Andresen?= <bo.andresen@zlin.dk>
Date: Fri, 5 Mar 2010 18:23:05 +0000
Subject: [PATCH] Enable the globstar shell option in exheres-0.

---
 paludis/repositories/e/eapi.cc              |    1 +
 paludis/repositories/e/eapi.hh              |    2 ++
 paludis/repositories/e/eapis/exheres-0.conf |    1 +
 paludis/repositories/e/eapis/paludis-1.conf |    2 +-
 paludis/repositories/e/ebuild.cc            |    2 ++
 paludis/repositories/e/ebuild/ebuild.bash   |    3 +++
 6 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index a5ff023..21386ae 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -186,6 +186,7 @@ namespace
                         value_for<n::save_base_variables>(check_get(k, "save_base_variables")),
                         value_for<n::save_unmodifiable_variables>(check_get(k, "save_unmodifiable_variables")),
                         value_for<n::save_variables>(check_get(k, "save_variables")),
+                        value_for<n::shell_options>(check_get(k, "shell_options")),
                         value_for<n::source_merged_variables>(check_get(k, "source_merged_variables")),
                         value_for<n::support_eclasses>(destringify_key<bool>(k, "support_eclasses")),
                         value_for<n::support_exlibs>(destringify_key<bool>(k, "support_exlibs")),
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 971bce3..5829b85 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -164,6 +164,7 @@ namespace paludis
         struct save_base_variables;
         struct save_unmodifiable_variables;
         struct save_variables;
+        struct shell_options;
         struct short_description;
         struct slot;
         struct source_merged_variables;
@@ -391,6 +392,7 @@ namespace paludis
             NamedValue<n::save_base_variables, std::string> save_base_variables;
             NamedValue<n::save_unmodifiable_variables, std::string> save_unmodifiable_variables;
             NamedValue<n::save_variables, std::string> save_variables;
+            NamedValue<n::shell_options, std::string> shell_options;
             NamedValue<n::source_merged_variables, std::string> source_merged_variables;
             NamedValue<n::support_eclasses, bool> support_eclasses;
             NamedValue<n::support_exlibs, bool> support_exlibs;
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index d3e1213..a3dbaea 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -340,6 +340,7 @@ doins_symlink = true
 failure_is_fatal = true
 no_s_workdir_fallback = true
 fix_mtimes = true
+shell_options = globstar
 
 unpack_suffixes = tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar gz,Z,z bz2 rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma lzma 7z,7Z tar.xz xz
 
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 9f45ef7..4a724ef 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -87,7 +87,7 @@ save_unmodifiable_variables = \
     PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR PALUDIS_UTILITY_PATH_SUFFIXES \
     PALUDIS_EBUILD_MODULE_SUFFIXES PALUDIS_NON_EMPTY_VARIABLES \
     PALUDIS_DIRECTORY_VARIABLES PALUDIS_EBUILD_MUST_NOT_SET_VARIABLES \
-    PALUDIS_SAVE_VARIABLES PALUDIS_SAVE_BASE_VARIABLES \
+    PALUDIS_SAVE_VARIABLES PALUDIS_SAVE_BASE_VARIABLES PALUDIS_SHELL_OPTIONS \
     PALUDIS_DIRECTORY_IF_EXISTS_VARIABLES PALUDIS_SOURCE_MERGED_VARIABLES \
     PALUDIS_MUST_NOT_CHANGE_VARIABLES PALUDIS_RDEPEND_DEFAULTS_TO_DEPEND \
     ECLASSDIR ECLASSDIRS EXLIBSDIRS PALUDIS_VARIABLE PALUDIS_PROFILE_DIR \
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 47444a3..9e1d68b 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -260,6 +260,8 @@ EbuildCommand::operator() ()
                     params.package_id()->eapi()->supported()->ebuild_environment_variables()->env_ebuild_phase())
             .with_setenv("PALUDIS_PIPE_COMMANDS_SUPPORTED", "yes")
             .with_setenv("PALUDIS_PIPE_COMMAND_DELIM", "\2")
+            .with_setenv("PALUDIS_SHELL_OPTIONS",
+                    params.package_id()->eapi()->supported()->ebuild_options()->shell_options())
             )
         .with_setenv("SLOT", "")
         .with_setenv("PALUDIS_PROFILE_DIR", "")
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index aa1b7d0..4e2240b 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -82,6 +82,9 @@ fi
 
 shopt -s expand_aliases
 shopt -s extglob
+for p in ${PALUDIS_SHELL_OPTIONS}; do
+    shopt -s globstar
+done
 
 export ROOT="${ROOT%+(/)}/"
 
-- 
1.7.0.1