diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
deleted file mode 100644
index 76e66599b..000000000
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-9999.ebuild,v 1.29 2013/07/31 04:34:00 mattst88 Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
-	EGIT_BRANCH="2.X"
-	inherit git-2
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-inherit eutils multilib python
-
-DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ccache +livecd-stage1-optional kerncache-hack +isoroot_checksum +nokerncache-hack +xz-hack kernel_linux"
-
-DEPEND="app-text/asciidoc"
-RDEPEND="app-arch/lbzip2
-	app-crypt/shash
-	virtual/cdrtools
-	x86? ( >=sys-boot/syslinux-3.72 )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	ia64? ( sys-fs/dosfstools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-	if [[ ${PV} == *9999* ]]; then
-		ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
-		ewarn "work-in-progress code. Be aware that it's likely that it will not"
-		ewarn "be in a working state at any given point. Please do not file bugs"
-		ewarn "until you have posted on the gentoo-catalyst mailing list and we"
-		ewarn "have asked you to do so."
-	fi
-	python_set_active_version 2
-}
-
-src_prepare() {
-	use xz-hack && epatch "${FILESDIR}"/HACK-default-to-xz6.patch
-	use kerncache-hack && epatch "${FILESDIR}"/gross_kerncache_hack_do_not_commit.patch
-	use nokerncache-hack && epatch "${FILESDIR}"/terrifying_kmerge_hack.patch
-	use livecd-stage1-optional && epatch "${FILESDIR}"/livecd-stage1-optional.patch
-	use isoroot_checksum && epatch "${FILESDIR}"/isoroot_checksum.patch
-	python_convert_shebangs 2 catalyst modules/catalyst_lock.py
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-	# Here is where we actually enable ccache
-	use ccache && \
-		dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
-		/etc/catalyst/catalyst.conf
-	dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		/etc/catalyst/catalyst.conf
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-	echo
-}
diff --git a/dev-util/catalyst/files/HACK-default-to-xz6.patch b/dev-util/catalyst/files/HACK-default-to-xz6.patch
deleted file mode 100644
index 788282652..000000000
--- a/dev-util/catalyst/files/HACK-default-to-xz6.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff -Naur catalyst/modules/catalyst_support.py catalyst-xz/modules/catalyst_support.py
---- catalyst/modules/catalyst_support.py	2013-12-13 21:24:46.000000000 -0500
-+++ catalyst-xz/modules/catalyst_support.py	2013-12-13 20:53:14.898398000 -0500
-@@ -72,6 +72,8 @@
- 				_ = 'tar-tvz'
- 			elif file.endswith('.tbz2') or file.endswith('.tar.bz2'):
- 				_ = 'tar-tvj'
-+			elif file.endswith('.xz') or file.endswith('.tar.xz'):
-+				_ = 'tar-tvJ'
- 			elif file.endswith('.tar'):
- 				_ = 'tar-tv'
- 
-@@ -109,6 +111,7 @@
- 	"tar-tv":[calc_contents,"tar tvf %(file)s"],
- 	"tar-tvz":[calc_contents,"tar tvzf %(file)s"],
- 	"tar-tvj":[calc_contents,"tar -I lbzip2 -tvf %(file)s"],
-+	"tar-tvJ":[calc_contents,"tar -I pixz -tvf %(file)s"],
- 	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
- 	# isoinfo-f should be a last resort only
- 	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
-diff -Naur catalyst/modules/generic_stage_target.py catalyst-xz/modules/generic_stage_target.py
---- catalyst/modules/generic_stage_target.py	2013-12-13 21:24:45.000000000 -0500
-+++ catalyst-xz/modules/generic_stage_target.py	2013-12-13 20:53:14.923843000 -0500
-@@ -295,7 +295,7 @@
- 
- 	def set_target_path(self):
- 		self.settings["target_path"]=normpath(self.settings["storedir"]+\
--			"/builds/"+self.settings["target_subpath"]+".tar.bz2")
-+			"/builds/"+self.settings["target_subpath"]+".tar.xz")
- 		if "AUTORESUME" in self.settings\
- 			and os.path.exists(self.settings["autoresume_path"]+\
- 				"setup_target_path"):
-@@ -381,7 +381,10 @@
- 				"/tmp/"+self.settings["source_subpath"]+"/")
- 		else:
- 			self.settings["source_path"]=normpath(self.settings["storedir"]+\
--				"/builds/"+self.settings["source_subpath"]+".tar.bz2")
-+				"/builds/"+self.settings["source_subpath"]+".tar.xz")
-+			if not os.path.isfile(self.settings["source_path"]):
-+				self.settings["source_path"]=normpath(self.settings["storedir"]+\
-+					"/builds/"+self.settings["source_subpath"]+".tar.bz2")
- 			if os.path.isfile(self.settings["source_path"]):
- 				# XXX: Is this even necessary if the previous check passes?
- 				if os.path.exists(self.settings["source_path"]):
-@@ -395,7 +398,7 @@
- 			print "\tseedcache in the options of catalyst.conf the source path"
- 			print "\twill then be "+\
- 				normpath(self.settings["storedir"]+"/builds/"+\
--				self.settings["source_subpath"]+".tar.bz2\n")
-+				self.settings["source_subpath"]+".tar.xz\n")
- 
- 	def set_dest_path(self):
- 		if "root_path" in self.settings:
-@@ -653,9 +656,13 @@
- 					self.settings["source_path"]+"\nto "+\
- 					self.settings["chroot_path"]+\
- 						" (This may take some time) ...\n"
--				if "bz2" == self.settings["chroot_path"][-3:]:
-+				print "fuck this file"+self.settings["source_path"]
-+				if "bz2" == self.settings["source_path"][-3:]:
- 					unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 						self.settings["chroot_path"]
-+				elif "xz" == self.settings["source_path"][-2:]:
-+					unpack_cmd="tar -I pixz -xpf "+self.settings["source_path"]+" -C "+\
-+						self.settings["chroot_path"]
- 				else:
- 					unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 						self.settings["chroot_path"]
-@@ -668,9 +675,12 @@
- 				self.settings["source_path"]+"\nto "+\
- 				self.settings["chroot_path"]+\
- 				" (This may take some time) ...\n"
--			if "bz2" == self.settings["chroot_path"][-3:]:
-+			if "bz2" == self.settings["source_path"][-3:]:
- 				unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 					self.settings["chroot_path"]
-+			elif "xz" == self.settings["source_path"][-2:]:
-+				unpack_cmd="tar -I pixz -xpf "+self.settings["source_path"]+" -C "+\
-+					self.settings["chroot_path"]
- 			else:
- 				unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 					self.settings["chroot_path"]
-@@ -770,8 +780,10 @@
- 				read_from_clst(self.settings["snapshot_cache_path"]+\
- 				"catalyst-hash")
- 			destdir=self.settings["snapshot_cache_path"]
--			if "bz2" == self.settings["chroot_path"][-3:]:
-+			if "bz2" == self.settings["snapshot_path"][-3:]:
- 				unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+			elif "xz" == self.settings["snapshot_path"][-3:]:
-+				unpack_cmd="tar -I pixz -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- 			else:
- 				unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+destdir
- 			unpack_errmsg="Error unpacking snapshot"
-@@ -789,9 +801,12 @@
- 			cleanup_errmsg="Error removing existing snapshot directory."
- 			cleanup_msg=\
- 				"Cleaning up existing portage tree (This can take a long time)..."
--			if "bz2" == self.settings["chroot_path"][-3:]:
-+			if "bz2" == self.settings["snapshot_path"][-3:]:
- 				unpack_cmd="tar -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
- 					self.settings["chroot_path"]+"/usr"
-+			elif "xz" == self.settings["snapshot_path"][-3:]:
-+				unpack_cmd="tar -I pixz -xpf "+self.settings["snapshot_path"]+" -C "+\
-+					self.settings["chroot_path"]+"/usr"
- 			else:
- 				unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+\
- 					self.settings["chroot_path"]+"/usr"
-@@ -1215,7 +1230,7 @@
- 
- 			print "Creating stage tarball..."
- 
--			cmd("tar -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
-+			cmd("tar -I pixz -cpf "+self.settings["target_path"]+" -C "+\
- 				self.settings["stage_path"]+" .",\
- 				"Couldn't create stage tarball",env=self.env)
- 
-diff -Naur catalyst/modules/livecd_stage2_target.py catalyst-xz/modules/livecd_stage2_target.py
---- catalyst/modules/livecd_stage2_target.py	2013-12-13 21:24:45.000000000 -0500
-+++ catalyst-xz/modules/livecd_stage2_target.py	2013-12-13 20:53:14.886987000 -0500
-@@ -33,7 +33,7 @@
- 		file_locate(self.settings, ["cdtar","controller_file"])
- 
- 	def set_source_path(self):
--		self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
-+		self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.xz")
- 		if os.path.isfile(self.settings["source_path"]):
- 			self.settings["source_path_hash"]=generate_hash(self.settings["source_path"])
- 		else:
-diff -Naur catalyst/modules/snapshot_target.py catalyst-xz/modules/snapshot_target.py
---- catalyst/modules/snapshot_target.py	2013-12-13 21:24:44.000000000 -0500
-+++ catalyst-xz/modules/snapshot_target.py	2013-12-13 20:53:14.922792000 -0500
-@@ -19,7 +19,7 @@
- 		self.settings["target_subpath"]="portage"
- 		st=self.settings["storedir"]
- 		self.settings["snapshot_path"]=normpath(st+"/snapshots/portage-"+self.settings["version_stamp"]\
--			+".tar.bz2")
-+			+".tar.xz")
- 		self.settings["tmp_path"]=normpath(st+"/tmp/"+self.settings["target_subpath"])
- 
- 	def setup(self):
-@@ -50,7 +50,7 @@
- 			self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env)
- 
- 		print "Compressing Portage snapshot tarball..."
--		cmd("tar -I lbzip2 -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
-+		cmd("tar -I pixz -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
- 			"Snapshot creation failure",env=self.env)
- 
- 		self.gen_contents_file(self.settings["snapshot_path"])
-diff -Naur catalyst/modules/stage2_target.py catalyst-xz/modules/stage2_target.py
---- catalyst/modules/stage2_target.py	2013-12-13 21:24:44.000000000 -0500
-+++ catalyst-xz/modules/stage2_target.py	2013-12-13 20:53:14.887345000 -0500
-@@ -19,7 +19,7 @@
- 		if "SEEDCACHE" in self.settings and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")):
- 			self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")
- 		else:
--			self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
-+			self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.xz")
- 			if os.path.isfile(self.settings["source_path"]):
- 				if os.path.exists(self.settings["source_path"]):
- 				# XXX: Is this even necessary if the previous check passes?
-@@ -28,7 +28,7 @@
- 		print "Source path set to "+self.settings["source_path"]
- 		if os.path.isdir(self.settings["source_path"]):
- 			print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf"
--			print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n")
-+			print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.xz\n")
- 
- 	# XXX: How do these override_foo() functions differ from the ones in
- 	# generic_stage_target and why aren't they in stage3_target?
diff --git a/dev-util/catalyst/files/gross_kerncache_hack_do_not_commit.patch b/dev-util/catalyst/files/gross_kerncache_hack_do_not_commit.patch
deleted file mode 100644
index 834b4ffa9..000000000
--- a/dev-util/catalyst/files/gross_kerncache_hack_do_not_commit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
-index ef3eb2e..880aa1b 100644
---- a/targets/support/kmerge.sh
-+++ b/targets/support/kmerge.sh
-@@ -202,7 +202,7 @@ fi
- if [ -n "${clst_KERNCACHE}" ]
- then
- 	mkdir -p /tmp/kerncache/${clst_kname}
--	clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
-+	clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse --getbinpkg --usepkg --binpkg-respect-use=n" run_merge "${clst_ksource}" || exit 1
- 	KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
- 	if [ ! -e /etc/portage/profile/package.provided ]
- 	then
diff --git a/dev-util/catalyst/files/isoroot_checksum.patch b/dev-util/catalyst/files/isoroot_checksum.patch
deleted file mode 100644
index 447ef5a02..000000000
--- a/dev-util/catalyst/files/isoroot_checksum.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
-index 08598e5..d807c17 100755
---- a/targets/support/create-iso.sh
-+++ b/targets/support/create-iso.sh
-@@ -78,6 +78,15 @@ else
- 	mkisofs_zisofs_opts=""
- fi
- 
-+#we want to create an md5sum for every file on the iso so we can verify it
-+#from genkernel during boot.  Here we make a function to create the md5sum
-+#and then we call it from arches where it makes sense, starting with amd64/x86
-+isoroot_checksum() {
-+	echo "Creating checksums for all files included in the iso, please wait..."
-+	find "${clst_target_path}" -type f ! -name 'isoroot_checksums' ! -name 'isolinux.bin' -exec sha512sum {} + > "${clst_target_path}"/isoroot_checksums
-+	sed -i "s#${clst_target_path}##" "${clst_target_path}"/isoroot_checksums
-+}
-+
- # Here we actually create the ISO images for each architecture
- case ${clst_hostarch} in
- 	alpha)
-@@ -262,16 +271,19 @@ case ${clst_hostarch} in
- 					mv ${clst_target_path}/boot/* ${clst_target_path}/isolinux
- 					rm -r ${clst_target_path}/boot
- 					echo "Creating ISO using ISOLINUX bootloader"
-+					isoroot_checksum
- 					echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}"
- 					mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image"
- 					isohybrid ${1}
- 				elif [ -e ${clst_target_path}/gentoo.efimg ]
- 				then
-+					isoroot_checksum
- 					echo "Creating ISO using both ISOLINUX and EFI bootloader"
- 					echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z ${clst_target_path}"
- 					mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z ${clst_target_path} || die "Cannot make ISO image"
- 				fi
- 			else
-+				isoroot_checksum
- 				echo "Creating ISO using ISOLINUX bootloader"
- 				echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}"
- 				mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image"
-@@ -279,15 +291,18 @@ case ${clst_hostarch} in
- 			fi
- 		elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ]
- 		then
-+			isoroot_checksum
- 			echo "Creating ISO using GRUB bootloader"
- 			echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}"
- 			mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image"
- 		elif [ -e ${clst_target_path}/gentoo.efimg ]
- 		then
-+			isoroot_checksum
- 			echo 'Creating ISO using EFI bootloader'
- 			echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}"
- 			mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image"
- 		else
-+			isoroot_checksum
- 			echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
- 			mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
- 		fi
diff --git a/dev-util/catalyst/files/livecd-stage1-optional.patch b/dev-util/catalyst/files/livecd-stage1-optional.patch
deleted file mode 100644
index 333790568..000000000
--- a/dev-util/catalyst/files/livecd-stage1-optional.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur catalyst-orig/modules/livecd_stage2_target.py catalyst/modules/livecd_stage2_target.py
---- catalyst-orig/modules/livecd_stage2_target.py	2014-03-09 18:33:28.447525000 -0400
-+++ catalyst/modules/livecd_stage2_target.py	2014-03-09 18:33:48.658313000 -0400
-@@ -75,60 +75,60 @@
- 				myf.write("\nblacklist "+x)
- 			myf.close()
- 
--	def unpack(self):
--		unpack=True
--		display_msg=None
--
--		clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack")
--
--		if os.path.isdir(self.settings["source_path"]):
--			unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"]
--			display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\
--				self.settings["chroot_path"]+" (This may take some time) ...\n"
--			error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
--			invalid_snapshot=False
--
--		if "AUTORESUME" in self.settings:
--			if os.path.isdir(self.settings["source_path"]) and \
--				os.path.exists(self.settings["autoresume_path"]+"unpack"):
--				print "Resume point detected, skipping unpack operation..."
--				unpack=False
--			elif "source_path_hash" in self.settings:
--				if self.settings["source_path_hash"] != clst_unpack_hash:
--					invalid_snapshot=True
--
--		if unpack:
--			self.mount_safety_check()
--			if invalid_snapshot:
--				print "No Valid Resume point detected, cleaning up  ..."
--				#os.remove(self.settings["autoresume_path"]+"dir_setup")
--				self.clear_autoresume()
--				self.clear_chroot()
--				#self.dir_setup()
--
--			if not os.path.exists(self.settings["chroot_path"]):
--				os.makedirs(self.settings["chroot_path"])
--
--			if not os.path.exists(self.settings["chroot_path"]+"/tmp"):
--				os.makedirs(self.settings["chroot_path"]+"/tmp",1777)
--
--			if "PKGCACHE" in self.settings:
--				if not os.path.exists(self.settings["pkgcache_path"]):
--					os.makedirs(self.settings["pkgcache_path"],0755)
--
--			if not display_msg:
--				raise CatalystError,"Could not find appropriate source. Please check the 'source_subpath' setting in the spec file."
--
--			print display_msg
--			cmd(unpack_cmd,error_msg,env=self.env)
--
--			if "source_path_hash" in self.settings:
--				myf=open(self.settings["autoresume_path"]+"unpack","w")
--				myf.write(self.settings["source_path_hash"])
--				myf.close()
--			else:
--				touch(self.settings["autoresume_path"]+"unpack")
--
-+#	def unpack(self):
-+#		unpack=True
-+#		display_msg=None
-+#
-+#		clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack")
-+#
-+#		if os.path.isdir(self.settings["source_path"]):
-+#			unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"]
-+#			display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\
-+#				self.settings["chroot_path"]+" (This may take some time) ...\n"
-+#			error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
-+#			invalid_snapshot=False
-+#
-+#		if "AUTORESUME" in self.settings:
-+#			if os.path.isdir(self.settings["source_path"]) and \
-+#				os.path.exists(self.settings["autoresume_path"]+"unpack"):
-+#				print "Resume point detected, skipping unpack operation..."
-+#				unpack=False
-+#			elif "source_path_hash" in self.settings:
-+#				if self.settings["source_path_hash"] != clst_unpack_hash:
-+#					invalid_snapshot=True
-+#
-+#		if unpack:
-+#			self.mount_safety_check()
-+#			if invalid_snapshot:
-+#				print "No Valid Resume point detected, cleaning up  ..."
-+#				#os.remove(self.settings["autoresume_path"]+"dir_setup")
-+#				self.clear_autoresume()
-+#				self.clear_chroot()
-+#				#self.dir_setup()
-+#
-+#			if not os.path.exists(self.settings["chroot_path"]):
-+#				os.makedirs(self.settings["chroot_path"])
-+#
-+#			if not os.path.exists(self.settings["chroot_path"]+"/tmp"):
-+#				os.makedirs(self.settings["chroot_path"]+"/tmp",1777)
-+#
-+#			if "PKGCACHE" in self.settings:
-+#				if not os.path.exists(self.settings["pkgcache_path"]):
-+#					os.makedirs(self.settings["pkgcache_path"],0755)
-+#
-+#			if not display_msg:
-+#				raise CatalystError,"Could not find appropriate source. Please check the 'source_subpath' setting in the spec file."
-+#
-+#			print display_msg
-+#			cmd(unpack_cmd,error_msg,env=self.env)
-+#
-+#			if "source_path_hash" in self.settings:
-+#				myf=open(self.settings["autoresume_path"]+"unpack","w")
-+#				myf.write(self.settings["source_path_hash"])
-+#				myf.close()
-+#			else:
-+#				touch(self.settings["autoresume_path"]+"unpack")
-+#
- 	def set_action_sequence(self):
- 		self.settings["action_sequence"]=["unpack","unpack_snapshot",\
- 				"config_profile_link","setup_confdir","portage_overlay",\
diff --git a/dev-util/catalyst/files/terrifying_kmerge_hack.patch b/dev-util/catalyst/files/terrifying_kmerge_hack.patch
deleted file mode 100644
index 0107ad0b4..000000000
--- a/dev-util/catalyst/files/terrifying_kmerge_hack.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- targets/support/kmerge.sh	2014-09-10 23:38:49.437456137 -0400
-+++ targets/support/kmerge.sh_hack	2014-09-10 23:34:14.654268000 -0400
-@@ -256,6 +256,9 @@
- else
- 	[ -L /usr/src/linux ] && rm -f /usr/src/linux
- 	run_merge "${clst_ksource}" || exit 1
-+	pushd /usr/src/
-+	ln -s linux-3.15.5-pentoo linux
-+	popd
- 	if [ ! "${clst_kextraversion}" = "" ]
- 	then
- 		echo "Setting extraversion to ${clst_kextraversion}"