gentoo/livecd.py: Removal of Entropy

1 files changed, 7 insertions, 22 deletions

diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 1fab963..388d889 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -3,6 +3,8 @@
 # livecd.py
 #
 # Copyright (C) 2010 Fabio Erculiani
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -41,13 +43,7 @@ import iutil
 import logging
 from anaconda_log import PROGRAM_LOG_FILE
 import gentoo.utils
-from gentoo import Entropy
-
-# Entropy imports
-from entropy.const import etpConst, const_kill_threads
-from entropy.misc import TimeScheduled, ParallelTask
-from entropy.cache import EntropyCacher
-import entropy.tools
+from gentoo import Portage 
 
 log = logging.getLogger("anaconda")
 
@@ -62,6 +58,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
 
         self.osimg = anaconda.methodstr[8:]
 	# On Gentoo we're using a stage3 as an installation source
+	# FIXME: Replace this with checking for stage3
         #if not os.path.ismount(self.osimg):
         #    anaconda.intf.messageWindow(_("Unable to find image"),
         #       _("The given location [%s] isn't a valid %s "
@@ -71,6 +68,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         #       custom_buttons=[_("Exit installer")])
         #    raise SystemExit(1)
 
+    # _getLiveSize() needs to be adjusted but more measurements are needed
     def _getLiveSize(self):
         st = os.statvfs(PRODUCT_PATH)
         compressed_byte_size = st.f_blocks * st.f_bsize
@@ -93,8 +91,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
     def doPreInstall(self, anaconda):
         self._progress = gentoo.utils.GentooProgress(anaconda)
         self._progress.start()
-        self._entropy = Entropy()
-        self._entropy.connect_progress(self._progress)
         self._gentoo_install = gentoo.utils.GentooInstall(anaconda)
         # We use anaconda.upgrade as bootloader recovery step
         self._bootloader_recovery = anaconda.upgrade
@@ -135,6 +131,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         self._gentoo_install.setup_audio()
         self._gentoo_install.setup_xorg()
         self._gentoo_install.remove_proprietary_drivers()
+	# TODO: This needs to be tried and fixed properly on Gentoo once installing X works
         try:
             self._gentoo_install.setup_nvidia_legacy()
         except Exception as e:
@@ -163,18 +160,13 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
 
     def doPostInstall(self, anaconda):
 
-        self._gentoo_install.setup_entropy_mirrors()
+        self._gentoo_install.setup_portage_mirrors()
         self._gentoo_install.language_packs_install()
         self._gentoo_install.emit_install_done()
 
         storage.writeEscrowPackets(anaconda)
 
         self._gentoo_install.destroy()
-        if hasattr(self._entropy, "shutdown"):
-            self._entropy.shutdown()
-        else:
-            self._entropy.destroy()
-            EntropyCacher().stop()
 
         const_kill_threads()
         anaconda.intf.setInstallProgressClass(None)
@@ -280,12 +272,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
             "gentoomce", "quiet", "scandelay=", "doslowusb", "docrypt",
             "dokeymap", "keymap=", "radeon.modeset=", "modeset=", "nomodeset"]
 
-        # Gentoo MCE install -> MCE support
-        # use reference, yeah
-        cmdline = self._gentoo_install.cmdline
-        if Entropy.is_gentoo_mce() and ("gentoomce" not in cmdline):
-            cmdline.append("gentoomce")
-
         # Setup genkernel (init) keyboard layout
         if gk_kbd is not None:
             if "dokeymap" not in cmdline:
@@ -458,7 +444,6 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
         #cmdline = ' '.join([x for x in cmdline.split() if \
         #    not x.startswith("vga=")])
 
-        # Since Gentoo 5.4, we also write to /etc/default/gentoo-grub
         grub_gentoo_file = self._root + "/etc/default/gentoo-grub"
         grub_gentoo_dir = os.path.dirname(grub_gentoo_file)
         if not os.path.isdir(grub_gentoo_dir):