From 19c7f3244f0c9078fbd3034ad74b6af5be021b66 Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sun, 11 Jan 2009 21:35:50 -0600
Subject: [PATCH] Remove catalyst.support module

---
 ChangeLog                                | 17 +++++++++++++++++
 modules/catalyst/arch/alpha.py           |  1 -
 modules/catalyst/arch/arm.py             |  1 -
 modules/catalyst/arch/hppa.py            |  1 -
 modules/catalyst/arch/ia64.py            |  1 -
 modules/catalyst/arch/mips.py            |  1 -
 modules/catalyst/arch/powerpc.py         |  1 -
 modules/catalyst/arch/s390.py            |  1 -
 modules/catalyst/arch/sh.py              |  1 -
 modules/catalyst/arch/sparc.py           |  1 -
 modules/catalyst/arch/x86.py             |  1 -
 modules/catalyst/lock.py                 |  1 -
 modules/catalyst/support.py              | 20 --------------------
 modules/catalyst/target/embedded.py      |  1 -
 modules/catalyst/target/generic_stage.py |  1 -
 modules/catalyst/target/grp.py           |  1 -
 modules/catalyst/target/livecd_stage1.py |  1 -
 modules/catalyst/target/livecd_stage2.py |  1 -
 modules/catalyst/target/netboot.py       |  1 -
 modules/catalyst/target/snapshot.py      |  1 -
 modules/catalyst/target/stage1.py        |  1 -
 modules/catalyst/target/stage2.py        |  1 -
 modules/catalyst/target/stage3.py        |  1 -
 modules/catalyst/target/stage4.py        |  1 -
 modules/catalyst/target/tinderbox.py     |  1 -
 25 files changed, 17 insertions(+), 43 deletions(-)
 delete mode 100644 modules/catalyst/support.py

diff --git a/ChangeLog b/ChangeLog
index 63b576c3..bcb679ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/arch/alpha.py, modules/catalyst/arch/arm.py,
+  modules/catalyst/arch/hppa.py, modules/catalyst/arch/ia64.py,
+  modules/catalyst/arch/mips.py, modules/catalyst/arch/powerpc.py,
+  modules/catalyst/arch/s390.py, modules/catalyst/arch/sh.py,
+  modules/catalyst/arch/sparc.py, modules/catalyst/arch/x86.py,
+  modules/catalyst/lock.py, -modules/catalyst/support.py,
+  modules/catalyst/target/embedded.py,
+  modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,
+  modules/catalyst/target/livecd_stage1.py,
+  modules/catalyst/target/livecd_stage2.py,
+  modules/catalyst/target/netboot.py, modules/catalyst/target/snapshot.py,
+  modules/catalyst/target/stage1.py, modules/catalyst/target/stage2.py,
+  modules/catalyst/target/stage3.py, modules/catalyst/target/stage4.py,
+  modules/catalyst/target/tinderbox.py:
+  Remove catalyst.support module
+
   12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/config.py, modules/catalyst/support.py,
   modules/catalyst/util.py:
diff --git a/modules/catalyst/arch/alpha.py b/modules/catalyst/arch/alpha.py
index ec8c9e04..75f11327 100644
--- a/modules/catalyst/arch/alpha.py
+++ b/modules/catalyst/arch/alpha.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class generic_alpha(catalyst.arch.generic_arch):
 	"abstract base class for all alpha builders"
diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py
index 1599f2dd..7aa9fb2c 100644
--- a/modules/catalyst/arch/arm.py
+++ b/modules/catalyst/arch/arm.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class generic_arm(catalyst.arch.generic_arch):
 	"Abstract base class for all arm (little endian) builders"
diff --git a/modules/catalyst/arch/hppa.py b/modules/catalyst/arch/hppa.py
index 39c38d22..716d4d8d 100644
--- a/modules/catalyst/arch/hppa.py
+++ b/modules/catalyst/arch/hppa.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class generic_hppa(catalyst.arch.generic_arch):
 	"Abstract base class for all hppa builders"
diff --git a/modules/catalyst/arch/ia64.py b/modules/catalyst/arch/ia64.py
index ceffff4a..ec52e274 100644
--- a/modules/catalyst/arch/ia64.py
+++ b/modules/catalyst/arch/ia64.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class arch_ia64(catalyst.arch.generic_arch):
 	"builder class for ia64"
diff --git a/modules/catalyst/arch/mips.py b/modules/catalyst/arch/mips.py
index 9b2f30a7..54dd83fb 100644
--- a/modules/catalyst/arch/mips.py
+++ b/modules/catalyst/arch/mips.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class generic_mips(catalyst.arch.generic_arch):
 	"Abstract base class for all mips builders [Big-endian]"
diff --git a/modules/catalyst/arch/powerpc.py b/modules/catalyst/arch/powerpc.py
index ea28b04c..410437c3 100644
--- a/modules/catalyst/arch/powerpc.py
+++ b/modules/catalyst/arch/powerpc.py
@@ -1,6 +1,5 @@
 
 import os,catalyst.arch
-from catalyst.support import *
 from catalyst.error import *
 
 class generic_ppc(catalyst.arch.generic_arch):
diff --git a/modules/catalyst/arch/s390.py b/modules/catalyst/arch/s390.py
index ba8d8a63..a21609ed 100644
--- a/modules/catalyst/arch/s390.py
+++ b/modules/catalyst/arch/s390.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class generic_s390(catalyst.arch.generic_arch):
 	"abstract base class for all s390 builders"
diff --git a/modules/catalyst/arch/sh.py b/modules/catalyst/arch/sh.py
index 485feb37..4b77b36a 100644
--- a/modules/catalyst/arch/sh.py
+++ b/modules/catalyst/arch/sh.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch
-from catalyst.support import *
 
 class generic_sh(catalyst.arch.generic_arch):
 	"Abstract base class for all sh builders [Little-endian]"
diff --git a/modules/catalyst/arch/sparc.py b/modules/catalyst/arch/sparc.py
index 30c93240..129e9c1d 100644
--- a/modules/catalyst/arch/sparc.py
+++ b/modules/catalyst/arch/sparc.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch,os
-from catalyst.support import *
 from catalyst.error import *
 
 class generic_sparc(catalyst.arch.generic_arch):
diff --git a/modules/catalyst/arch/x86.py b/modules/catalyst/arch/x86.py
index 6c45b343..8fe038a9 100644
--- a/modules/catalyst/arch/x86.py
+++ b/modules/catalyst/arch/x86.py
@@ -1,6 +1,5 @@
 
 import catalyst.arch,os
-from catalyst.support import *
 from catalyst.error import *
 
 class generic_x86(catalyst.arch.generic_arch):
diff --git a/modules/catalyst/lock.py b/modules/catalyst/lock.py
index 5690e316..9a5f699d 100644
--- a/modules/catalyst/lock.py
+++ b/modules/catalyst/lock.py
@@ -5,7 +5,6 @@ import os
 import stat
 import sys
 import time
-from catalyst.support import *
 
 def writemsg(mystr):
 	sys.stderr.write(mystr)
diff --git a/modules/catalyst/support.py b/modules/catalyst/support.py
deleted file mode 100644
index f2415061..00000000
--- a/modules/catalyst/support.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Spec file format:
-
-The spec file format is a very simple and easy-to-use format for storing data. Here's an example
-file:
-
-item1: value1
-item2: foo bar oni
-item3:
-	meep
-	bark
-	gleep moop
-
-This file would be interpreted as defining three items: item1, item2 and item3. item1 would contain
-the string value "value1". Item2 would contain an ordered list [ "foo", "bar", "oni" ]. item3
-would contain an ordered list as well: [ "meep", "bark", "gleep", "moop" ]. It's important to note
-that the order of multiple-value items is preserved, but the order that the items themselves are
-defined are not preserved. In other words, "foo", "bar", "oni" ordering is preserved but "item1"
-"item2" "item3" ordering is not, as the item strings are stored in a dictionary (hash).
-"""
diff --git a/modules/catalyst/target/embedded.py b/modules/catalyst/target/embedded.py
index c116deda..fbc8e8cf 100644
--- a/modules/catalyst/target/embedded.py
+++ b/modules/catalyst/target/embedded.py
@@ -9,7 +9,6 @@ It sounds real complicated but basically it runs
 ROOT=/tmp/submerge emerge --blahblah foo bar
 """
 
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 
diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index 7ff76b7e..7fff5190 100644
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -5,7 +5,6 @@ the driver class for pretty much everything that Catalyst does.
 """
 
 import os, string, types, shutil
-from catalyst.support import *
 from catalyst.target.generic import *
 from stat import *
 import catalyst.lock
diff --git a/modules/catalyst/target/grp.py b/modules/catalyst/target/grp.py
index 6b7770dd..f7024973 100644
--- a/modules/catalyst/target/grp.py
+++ b/modules/catalyst/target/grp.py
@@ -4,7 +4,6 @@ The builder class for GRP (Gentoo Reference Platform) builds.
 """
 
 import os,types,glob
-from catalyst.support import *
 from generic_stage import *
 import catalyst
 from catalyst.error import *
diff --git a/modules/catalyst/target/livecd_stage1.py b/modules/catalyst/target/livecd_stage1.py
index 5cbc73fc..596460e7 100644
--- a/modules/catalyst/target/livecd_stage1.py
+++ b/modules/catalyst/target/livecd_stage1.py
@@ -3,7 +3,6 @@
 Builder class for LiveCD stage1.
 """
 
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.spawn import *
diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py
index 6d215293..a909afc1 100644
--- a/modules/catalyst/target/livecd_stage2.py
+++ b/modules/catalyst/target/livecd_stage2.py
@@ -4,7 +4,6 @@ Builder class for a LiveCD stage2 build.
 """
 
 import os
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 import catalyst.hash
diff --git a/modules/catalyst/target/netboot.py b/modules/catalyst/target/netboot.py
index 534861d2..d6e2ef15 100644
--- a/modules/catalyst/target/netboot.py
+++ b/modules/catalyst/target/netboot.py
@@ -4,7 +4,6 @@ Builder class for a netboot build, version 2
 """
 
 import os,string,types
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
diff --git a/modules/catalyst/target/snapshot.py b/modules/catalyst/target/snapshot.py
index bd9b8f07..adfbb08c 100644
--- a/modules/catalyst/target/snapshot.py
+++ b/modules/catalyst/target/snapshot.py
@@ -4,7 +4,6 @@ Builder class for snapshots.
 """
 
 import os
-from catalyst.support import *
 from generic_stage import *
 import catalyst
 from catalyst.spawn import *
diff --git a/modules/catalyst/target/stage1.py b/modules/catalyst/target/stage1.py
index ac2b192c..1b8eddca 100644
--- a/modules/catalyst/target/stage1.py
+++ b/modules/catalyst/target/stage1.py
@@ -3,7 +3,6 @@
 Builder class for a stage1 installation tarball build.
 """
 
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 
diff --git a/modules/catalyst/target/stage2.py b/modules/catalyst/target/stage2.py
index 5e8cb4ef..60024277 100644
--- a/modules/catalyst/target/stage2.py
+++ b/modules/catalyst/target/stage2.py
@@ -3,7 +3,6 @@
 Builder class for a stage2 installation tarball build.
 """
 
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 import catalyst.hash
diff --git a/modules/catalyst/target/stage3.py b/modules/catalyst/target/stage3.py
index d7d6538e..54342406 100644
--- a/modules/catalyst/target/stage3.py
+++ b/modules/catalyst/target/stage3.py
@@ -3,7 +3,6 @@
 Builder class for a stage3 installation tarball build.
 """
 
-from catalyst.support import *
 from generic_stage import *
 
 class stage3_target(generic_stage_target):
diff --git a/modules/catalyst/target/stage4.py b/modules/catalyst/target/stage4.py
index f64b4b8f..33f989b6 100644
--- a/modules/catalyst/target/stage4.py
+++ b/modules/catalyst/target/stage4.py
@@ -3,7 +3,6 @@
 Builder class for stage4.
 """
 
-from catalyst.support import *
 from generic_stage import *
 
 class stage4_target(generic_stage_target):
diff --git a/modules/catalyst/target/tinderbox.py b/modules/catalyst/target/tinderbox.py
index 0eb29737..8e1eaa76 100644
--- a/modules/catalyst/target/tinderbox.py
+++ b/modules/catalyst/target/tinderbox.py
@@ -3,7 +3,6 @@
 builder class for the tinderbox target
 """
 
-from catalyst.support import *
 from generic_stage import *
 import catalyst.util
 from catalyst.error import *
-- 
2.26.2