From 3e89e05b303e46ca960d8b0c1fc6b46b554e199f Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven.armstrong@inf.ethz.ch>
Date: Tue, 8 Feb 2011 11:01:47 +0100
Subject: [PATCH 1/3] add support for gentoo to explorer os

Signed-off-by: Steven Armstrong <steven.armstrong@inf.ethz.ch>
---
 conf/explorers/os | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/explorers/os b/conf/explorers/os
index 3bd3f2ef..41d70545 100755
--- a/conf/explorers/os
+++ b/conf/explorers/os
@@ -32,6 +32,8 @@ fi
 
 [ -f /etc/debian_version ] && echo debian
 
+[ -f /etc/gentoo-release ] && echo gentoo
+
 [ -f /etc/redhat-release ] && echo redhat
 
 # ensure correct exit, otherwise other explorer won't get started

From e1f90293b985f8657a0334b23438daac7dd93173 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven.armstrong@inf.ethz.ch>
Date: Tue, 8 Feb 2011 11:02:46 +0100
Subject: [PATCH 2/3] add support for gentoo to explorer pgk_system

Signed-off-by: Steven Armstrong <steven.armstrong@inf.ethz.ch>
---
 conf/explorers/pkg_system | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/explorers/pkg_system b/conf/explorers/pkg_system
index d9da3f1e..585f107d 100755
--- a/conf/explorers/pkg_system
+++ b/conf/explorers/pkg_system
@@ -22,6 +22,7 @@
 case "$("${__cdist_remote_explorer_dir}/os")" in
       archlinux) echo pacman ;;
       debian|ubuntu) echo apt ;;
+      gentoo) echo emerge ;;
 esac
 
 exit 0

From a7fc72148809cbe8f14bac9be0b0a64de995b982 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven.armstrong@inf.ethz.ch>
Date: Mon, 14 Feb 2011 11:21:49 +0100
Subject: [PATCH 3/3] fix typo: /object/newobject/

Signed-off-by: Steven Armstrong <steven.armstrong@inf.ethz.ch>
---
 bin/cdist-manifest-recursive-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/cdist-manifest-recursive-run b/bin/cdist-manifest-recursive-run
index 5229f439..99d86aec 100755
--- a/bin/cdist-manifest-recursive-run
+++ b/bin/cdist-manifest-recursive-run
@@ -86,7 +86,7 @@ while [ "$__cdist_object_created_new" = 1 ]; do
                   __cdist_exit_err "${newobject} already exists, merge failed."
                else
                   # Fine, merge back! FIXME: touch correct here?
-                  touch "${object}/$__cdist_object_finished"
+                  touch "${newobject}/$__cdist_object_finished"
                   pax -r -w "$newobject" "$__cdist_object_dir"
                fi
             done < "$__cdist_tmp_file"