From bbd1b079da698701b925503fad1185fddc9212bd Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Sat, 10 Jan 2009 20:44:20 -0600
Subject: [PATCH] Remove builder.py and all references

---
 ChangeLog                         |  9 +++++++++
 modules/builder.py                | 17 -----------------
 modules/catalyst/arch/__init__.py |  5 +++++
 modules/catalyst/arch/alpha.py    |  6 +++---
 modules/catalyst/arch/amd64.py    |  6 +++---
 modules/catalyst/arch/arm.py      | 10 +++++-----
 modules/catalyst/arch/hppa.py     |  6 +++---
 modules/catalyst/arch/ia64.py     |  6 +++---
 modules/catalyst/arch/mips.py     | 10 +++++-----
 modules/catalyst/arch/powerpc.py  | 10 +++++-----
 modules/catalyst/arch/s390.py     | 10 +++++-----
 modules/catalyst/arch/sh.py       | 10 +++++-----
 modules/catalyst/arch/sparc.py    | 10 +++++-----
 modules/catalyst/arch/x86.py      |  6 +++---
 14 files changed, 59 insertions(+), 62 deletions(-)
 delete mode 100644 modules/builder.py

diff --git a/ChangeLog b/ChangeLog
index 0333cffb..39ad31b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> -modules/builder.py,
+  modules/catalyst/arch/__init__.py, modules/catalyst/arch/alpha.py,
+  modules/catalyst/arch/amd64.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:
+  Remove builder.py and all references
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/arch/__init__.py, modules/catalyst/arch/alpha.py,
   modules/catalyst/arch/arm.py, modules/catalyst/arch/hppa.py,
diff --git a/modules/builder.py b/modules/builder.py
deleted file mode 100644
index a1cf73cd..00000000
--- a/modules/builder.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-class generic:
-	def __init__(self,myspec):
-		self.settings=myspec
-	def mount_safety_check(self):
-		"""
-		Make sure that no bind mounts exist in chrootdir (to use before
-		cleaning the directory, to make sure we don't wipe the contents of
-		a bind mount
-		"""
-		pass
-	def mount_all(self):
-		"""do all bind mounts"""
-		pass
-	def umount_all(self):
-		"""unmount all bind mounts"""
-		pass
diff --git a/modules/catalyst/arch/__init__.py b/modules/catalyst/arch/__init__.py
index 173dddb0..f421e60b 100644
--- a/modules/catalyst/arch/__init__.py
+++ b/modules/catalyst/arch/__init__.py
@@ -28,3 +28,8 @@ class arches:
 					"happens due to a syntax error, which should be reported as " \
 					"a bug.")
 		return self._arch_modules
+
+class generic_arch:
+
+	def __init__(self, myspec):
+		self.settings = myspec
diff --git a/modules/catalyst/arch/alpha.py b/modules/catalyst/arch/alpha.py
index 884b9d2e..9bcf229f 100644
--- a/modules/catalyst/arch/alpha.py
+++ b/modules/catalyst/arch/alpha.py
@@ -1,11 +1,11 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_alpha(builder.generic):
+class generic_alpha(catalyst.arch.generic_arch):
 	"abstract base class for all alpha builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CFLAGS"]="-mieee -pipe"
 
diff --git a/modules/catalyst/arch/amd64.py b/modules/catalyst/arch/amd64.py
index 450e56a6..3743ef76 100644
--- a/modules/catalyst/arch/amd64.py
+++ b/modules/catalyst/arch/amd64.py
@@ -1,10 +1,10 @@
 
-import builder
+import catalyst.arch
 
-class generic_amd64(builder.generic):
+class generic_amd64(catalyst.arch.generic_arch):
 	"abstract base class for all amd64 builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
 class arch_amd64(generic_amd64):
diff --git a/modules/catalyst/arch/arm.py b/modules/catalyst/arch/arm.py
index e90625df..470868a8 100644
--- a/modules/catalyst/arch/arm.py
+++ b/modules/catalyst/arch/arm.py
@@ -1,19 +1,19 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_arm(builder.generic):
+class generic_arm(catalyst.arch.generic_arch):
 	"Abstract base class for all arm (little endian) builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CFLAGS"]="-O2 -pipe"
 		self.settings["CXXFLAGS"]="-O1 -pipe"
    
-class generic_armeb(builder.generic):
+class generic_armeb(catalyst.arch.generic_arch):
 	"Abstract base class for all arm (big endian) builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CFLAGS"]="-O2 -pipe"
 		self.settings["CXXFLAGS"]="-O1 -pipe"
diff --git a/modules/catalyst/arch/hppa.py b/modules/catalyst/arch/hppa.py
index 66049994..be382cbc 100644
--- a/modules/catalyst/arch/hppa.py
+++ b/modules/catalyst/arch/hppa.py
@@ -1,11 +1,11 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_hppa(builder.generic):
+class generic_hppa(catalyst.arch.generic_arch):
 	"Abstract base class for all hppa builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CFLAGS"]="-O2 -pipe"
 		self.settings["CXXFLAGS"]="-O2 -pipe"
diff --git a/modules/catalyst/arch/ia64.py b/modules/catalyst/arch/ia64.py
index 791c646c..cf74a8a6 100644
--- a/modules/catalyst/arch/ia64.py
+++ b/modules/catalyst/arch/ia64.py
@@ -1,11 +1,11 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class arch_ia64(builder.generic):
+class arch_ia64(catalyst.arch.generic_arch):
 	"builder class for ia64"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CFLAGS"]="-O2 -pipe"
 		self.settings["CFLAGS"]="-O2 -pipe"
diff --git a/modules/catalyst/arch/mips.py b/modules/catalyst/arch/mips.py
index 649cf74b..ff770d53 100644
--- a/modules/catalyst/arch/mips.py
+++ b/modules/catalyst/arch/mips.py
@@ -1,18 +1,18 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_mips(builder.generic):
+class generic_mips(catalyst.arch.generic_arch):
 	"Abstract base class for all mips builders [Big-endian]"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CHOST"]="mips-unknown-linux-gnu"
 
-class generic_mipsel(builder.generic):
+class generic_mipsel(catalyst.arch.generic_arch):
 	"Abstract base class for all mipsel builders [Little-endian]"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 		self.settings["CHOST"]="mipsel-unknown-linux-gnu"
 
diff --git a/modules/catalyst/arch/powerpc.py b/modules/catalyst/arch/powerpc.py
index bbbcb81c..50c848dc 100644
--- a/modules/catalyst/arch/powerpc.py
+++ b/modules/catalyst/arch/powerpc.py
@@ -1,11 +1,11 @@
 
-import os,builder
+import os,catalyst.arch
 from catalyst.support import *
 
-class generic_ppc(builder.generic):
+class generic_ppc(catalyst.arch.generic_arch):
 	"abstract base class for all 32-bit powerpc builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHOST"]="powerpc-unknown-linux-gnu"
 		if self.settings["buildarch"]=="ppc64":
 			if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
@@ -15,10 +15,10 @@ class generic_ppc(builder.generic):
 		else:
 			self.settings["CHROOT"]="chroot"
 
-class generic_ppc64(builder.generic):
+class generic_ppc64(catalyst.arch.generic_arch):
 	"abstract base class for all 64-bit powerpc builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
 class arch_ppc(generic_ppc):
diff --git a/modules/catalyst/arch/s390.py b/modules/catalyst/arch/s390.py
index 4ccff224..6c652c4c 100644
--- a/modules/catalyst/arch/s390.py
+++ b/modules/catalyst/arch/s390.py
@@ -1,17 +1,17 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_s390(builder.generic):
+class generic_s390(catalyst.arch.generic_arch):
 	"abstract base class for all s390 builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
-class generic_s390x(builder.generic):
+class generic_s390x(catalyst.arch.generic_arch):
 	"abstract base class for all s390x builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
 class arch_s390(generic_s390):
diff --git a/modules/catalyst/arch/sh.py b/modules/catalyst/arch/sh.py
index 05b2b1fe..0c7690ba 100644
--- a/modules/catalyst/arch/sh.py
+++ b/modules/catalyst/arch/sh.py
@@ -1,17 +1,17 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_sh(builder.generic):
+class generic_sh(catalyst.arch.generic_arch):
 	"Abstract base class for all sh builders [Little-endian]"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
-class generic_sheb(builder.generic):
+class generic_sheb(catalyst.arch.generic_arch):
 	"Abstract base class for all sheb builders [Big-endian]"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
 class arch_sh(generic_sh):
diff --git a/modules/catalyst/arch/sparc.py b/modules/catalyst/arch/sparc.py
index 9cb93a03..9404caf3 100644
--- a/modules/catalyst/arch/sparc.py
+++ b/modules/catalyst/arch/sparc.py
@@ -1,11 +1,11 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_sparc(builder.generic):
+class generic_sparc(catalyst.arch.generic_arch):
 	"abstract base class for all sparc builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		if self.settings["buildarch"]=="sparc64":
 			if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
 				raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
@@ -14,10 +14,10 @@ class generic_sparc(builder.generic):
 		else:
 			self.settings["CHROOT"]="chroot"
 
-class generic_sparc64(builder.generic):
+class generic_sparc64(catalyst.arch.generic_arch):
 	"abstract base class for all sparc64 builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		self.settings["CHROOT"]="chroot"
 
 class arch_sparc(generic_sparc):
diff --git a/modules/catalyst/arch/x86.py b/modules/catalyst/arch/x86.py
index a260074a..dac91f8e 100644
--- a/modules/catalyst/arch/x86.py
+++ b/modules/catalyst/arch/x86.py
@@ -1,11 +1,11 @@
 
-import builder,os
+import catalyst.arch,os
 from catalyst.support import *
 
-class generic_x86(builder.generic):
+class generic_x86(catalyst.arch.generic_arch):
 	"abstract base class for all x86 builders"
 	def __init__(self,myspec):
-		builder.generic.__init__(self,myspec)
+		catalyst.arch.generic_arch.__init__(self,myspec)
 		if self.settings["buildarch"]=="amd64":
 			if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
 					raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
-- 
2.26.2