diff --git a/portage/kde/kdelibs/kdelibs-20110130.py b/portage/kde/kdelibs/kdelibs-20110130.py
index a3535fd52..5936b6e4e 100644
--- a/portage/kde/kdelibs/kdelibs-20110130.py
+++ b/portage/kde/kdelibs/kdelibs-20110130.py
@@ -1,91 +1,61 @@
 # -*- coding: utf-8 -*-
 import info
 
 class subinfo(info.infoclass):
     def setTargets( self ):
         self.svnTargets['gitHEAD'] = '[git]kde:kdelibs|KDE/4.8|'
-        self.svnTargets['komobranch'] = 'branches/work/komo/kdelibs'
-        if emergePlatform.isCrossCompilingEnabled():
-            self.defaultTarget = 'komobranch'
-        else:
-            self.defaultTarget = 'gitHEAD'
+        for ver in ['0', '1', '2', '3', '4']:
+            self.targets['4.8.' + ver] = "ftp://ftp.kde.org/pub/kde/stable/4.8." + ver + "/src/kdelibs-4.8." + ver + ".tar.bz2"
+            self.targetInstSrc['4.8.' + ver] = 'kdelibs-4.8.' + ver
+        self.shortDescription = "The KDE Library"
+        self.defaultTarget = 'gitHEAD'
 
 
     def setDependencies( self ):
         self.buildDependencies['virtual/base'] = 'default'
         self.buildDependencies['dev-util/perl'] = 'default'
         self.buildDependencies['win32libs-bin/automoc'] = 'default'
         self.dependencies['kdesupport/hupnp'] = 'default'
         self.dependencies['kdesupport/kdewin'] = 'default'
         self.dependencies['kdesupport/phonon'] = 'default'
         self.dependencies['kdesupport/attica'] = 'default'
-        if not emergePlatform.isCrossCompilingEnabled():
-            self.dependencies['kdesupport/dbusmenu-qt'] = 'default'
-            self.dependencies['kdesupport/qca'] = 'default'
-            self.dependencies['kdesupport/qimageblitz'] = 'default'
+        self.dependencies['kdesupport/dbusmenu-qt'] = 'default'
+        self.dependencies['kdesupport/qca'] = 'default'
+        self.dependencies['kdesupport/qimageblitz'] = 'default'
         self.dependencies['kdesupport/soprano'] = 'default'
         self.dependencies['kdesupport/strigi'] = 'default'
         self.dependencies['virtual/kdelibs-base'] = 'default'
         self.dependencies['data/docbook-dtd'] = 'default'
         self.dependencies['data/docbook-xsl'] = 'default'
         self.dependencies['data/shared-desktop-ontologies'] = 'default'
         self.runtimeDependencies['kdesupport/phonon-vlc'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
         self.subinfo.options.configure.defines = ""
         if self.compiler() == "mingw":
           self.subinfo.options.configure.defines += " -DKDE_DISTRIBUTION_TEXT=\"MinGW 3.4.5\" "
         elif self.compiler() == "mingw4":
           self.subinfo.options.configure.defines += " -DKDE_DISTRIBUTION_TEXT=\"MinGW 4.4.0\" "
         elif self.compiler() == "msvc2005":
           self.subinfo.options.configure.defines += " -DKDE_DISTRIBUTION_TEXT=\"MS Visual Studio 2005 SP1\" "
         elif self.compiler() == "msvc2008":
           self.subinfo.options.configure.defines += " -DKDE_DISTRIBUTION_TEXT=\"MS Visual Studio 2008 SP1\" "
         elif self.compiler() == "msvc2010":
           self.subinfo.options.configure.defines = " -DKDE_DISTRIBUTION_TEXT=\"MS Visual Studio 2010\" "
 
-        qmake = os.path.join(self.mergeDestinationDir(), "bin", "qmake.exe")
-        if not os.path.exists(qmake):
-            utils.warning("could not find qmake in <%s>" % qmake)
-        ## \todo a standardized way to check if a package is installed in the image dir would be good.
-        self.subinfo.options.configure.defines += " -DQT_QMAKE_EXECUTABLE:FILEPATH=%s " \
-            % qmake.replace('\\', '/')
-
-        self.subinfo.options.configure.defines += "-DHOST_BINDIR=%s " \
-            % os.path.join(ROOTDIR, "bin")
-
-        if emergePlatform.isCrossCompilingEnabled():
-            self.subinfo.options.configure.defines += \
-                    "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=ON "
-        else:
-            self.subinfo.options.configure.defines += "-DBUILD_doc=OFF "
-        if self.isHostBuild():
-            self.subinfo.options.configure.defines += "-DBUILD_kdoctools=ON "
-        if self.isTargetBuild():
-            self.subinfo.options.configure.defines += \
-                    "-DKDE_PLATFORM_PROFILE=Mobile "\
-                    "-DBUILD_kutils=ON "\
-                    "-DBUILD_kross=ON "\
-                    "-DBUILD_interfaces=ON " \
-                    "-DBUILD_sonnet=ON " \
-                    "-DKDECORE_INPROCESS_SSLD=ON " \
-                    "-DKDELIBS_USE_FAKE_WALLET=ON "
-
     def install( self ):
         if not CMakePackageBase.install( self ):
             return False
         if compiler.isMinGW():
             manifest = os.path.join( self.packageDir(), "kconf_update.exe.manifest" )
             executable = os.path.join( self.installDir(), "bin", "kconf_update.exe" )
             utils.embedManifest( executable, manifest )
         return True
 
-
-
 if __name__ == '__main__':
     Package().execute()