diff --git a/portage/kde/kactivities/kactivities-20111102.py b/portage/kde/kactivities/kactivities-20111102.py
index 639a998d9..614e70ee3 100644
--- a/portage/kde/kactivities/kactivities-20111102.py
+++ b/portage/kde/kactivities/kactivities-20111102.py
@@ -1,23 +1,25 @@
-import os
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kactivities'
-        for version in ['4.4', '4.5', '4.6', '4.7', '4.8', '4.9']:
-            self.svnTargets[version] = '[git]kde:kactivities|KDE/%s|' % version
-        self.defaultTarget = '4.9'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.shortDescription = "KDE Activity Manager"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__(self)
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kde-baseapps/kde-baseapps-20110130.py b/portage/kde/kde-baseapps/kde-baseapps-20110130.py
index da404ae9e..7324c7505 100644
--- a/portage/kde/kde-baseapps/kde-baseapps-20110130.py
+++ b/portage/kde/kde-baseapps/kde-baseapps-20110130.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kde-baseapps'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.shortDescription = "KDE base applications (Konqueror, Dolphin)"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kde-runtime/kde-runtime-20110130.py b/portage/kde/kde-runtime/kde-runtime-20110130.py
index 4a0b03c68..a8a2dc1b0 100644
--- a/portage/kde/kde-runtime/kde-runtime-20110130.py
+++ b/portage/kde/kde-runtime/kde-runtime-20110130.py
@@ -1,27 +1,33 @@
 import info
-import compiler
+import kdedefaults as kd
+
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kde-runtime'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        self.shortDescription = 'Components for KDE applications required at runtime'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.dependencies['kde/kactivities'] = 'default'
         self.dependencies['kdesupport/oxygen-icons'] = 'default'
-        self.dependencies['win32libs/libssh'] = 'default'
+        self.dependencies['win32libs/libssh'] = 'default'
         self.dependencies['kde/kactivities'] = 'default'
         self.dependencies['kde/kdepimlibs'] = 'default'
         self.dependencies['kde/nepomuk-core'] = 'default'
         if compiler.isMinGW_WXX():
-            self.dependencies['win32libs/libbfd'] = 'default'
+            self.dependencies['win32libs/libbfd'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kde-workspace/kde-workspace-20110130.py b/portage/kde/kde-workspace/kde-workspace-20110130.py
index 9bd3db65a..0d1d9c658 100644
--- a/portage/kde/kde-workspace/kde-workspace-20110130.py
+++ b/portage/kde/kde-workspace/kde-workspace-20110130.py
@@ -1,24 +1,29 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kde-workspace'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'the KDE workspace including the oxygen style'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
-        self.dependencies['win32libs/freetype'] = 'default'
-        self.dependencies['win32libs/boost'] = 'default'
+        self.dependencies['win32libs/freetype'] = 'default'
+        self.dependencies['win32libs/boost'] = 'default'
         self.dependencies['kdesupport/akonadi'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
 
diff --git a/portage/kde/kdeedu/analitza/analitza-20120113.py b/portage/kde/kdeedu/analitza/analitza-20120113.py
index 0e03bc423..a50befb30 100644
--- a/portage/kde/kdeedu/analitza/analitza-20120113.py
+++ b/portage/kde/kdeedu/analitza/analitza-20120113.py
@@ -1,23 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:analitza|KDE/4.9|'
-        for ver in ['0', '1', '2', '3', '4']:
-            self.targets['4.9.' + ver] = "ftp://ftp.kde.org/pub/kde/stable/4.9." + ver + "/src/analitza-4.9." + ver + ".tar.bz2"
-            self.targetInstSrc['4.9.' + ver] = 'analitza-4.9.' + ver
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a library for mathematical features'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/blinken/blinken-20110621.py b/portage/kde/kdeedu/blinken/blinken-20110621.py
index 470a28574..cfe1dd283 100644
--- a/portage/kde/kdeedu/blinken/blinken-20110621.py
+++ b/portage/kde/kdeedu/blinken/blinken-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:blinken'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a memory enhancement game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdeedu/cantor/cantor-20110621.py
index 496907690..8e9392274 100644
--- a/portage/kde/kdeedu/cantor/cantor-20110621.py
+++ b/portage/kde/kdeedu/cantor/cantor-20110621.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:cantor'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a KDE frontend for mathematical software'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/analitza'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py
index dff5c4c88..aaaf853bf 100644
--- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py
+++ b/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kalgebra'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a graph calculator'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/analitza'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kalzium/kalzium-20110621.py b/portage/kde/kdeedu/kalzium/kalzium-20110621.py
index 575d2f768..aa65af1de 100644
--- a/portage/kde/kdeedu/kalzium/kalzium-20110621.py
+++ b/portage/kde/kdeedu/kalzium/kalzium-20110621.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kalzium'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'periodic table of elements'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdeedu'] = 'default'
-        self.dependencies['win32libs/openbabel'] = 'default'
+        self.dependencies['win32libs/openbabel'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kanagram/kanagram-20110621.py b/portage/kde/kdeedu/kanagram/kanagram-20110621.py
index 1acf09ca4..62d53d944 100644
--- a/portage/kde/kdeedu/kanagram/kanagram-20110621.py
+++ b/portage/kde/kdeedu/kanagram/kanagram-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kanagram'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a letter order game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdeedu'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kbruch/kbruch-20110621.py b/portage/kde/kdeedu/kbruch/kbruch-20110621.py
index ab4255945..e733402d4 100644
--- a/portage/kde/kdeedu/kbruch/kbruch-20110621.py
+++ b/portage/kde/kdeedu/kbruch/kbruch-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kbruch'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'Excercise fractions'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kgeography/kgeography-20110621.py b/portage/kde/kdeedu/kgeography/kgeography-20110621.py
index e22011f95..ff5b95351 100644
--- a/portage/kde/kdeedu/kgeography/kgeography-20110621.py
+++ b/portage/kde/kdeedu/kgeography/kgeography-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kgeography'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a geography trainer'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/khangman/khangman-20110621.py b/portage/kde/kdeedu/khangman/khangman-20110621.py
index 4d1d0d225..abd0deb4a 100644
--- a/portage/kde/kdeedu/khangman/khangman-20110621.py
+++ b/portage/kde/kdeedu/khangman/khangman-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:khangman'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'the hangman game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kig/kig-20110621.py b/portage/kde/kdeedu/kig/kig-20110621.py
index 972a4d688..c96334720 100644
--- a/portage/kde/kdeedu/kig/kig-20110621.py
+++ b/portage/kde/kdeedu/kig/kig-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kig'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'interactive geometry'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kiten/kiten-20110621.py b/portage/kde/kdeedu/kiten/kiten-20110621.py
index ca0a88931..44dff3708 100644
--- a/portage/kde/kdeedu/kiten/kiten-20110621.py
+++ b/portage/kde/kdeedu/kiten/kiten-20110621.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kiten'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a Japanese reference/study tool'
         self.defaultTarget = 'gitHEAD'
 
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/klettres/klettres-20110621.py b/portage/kde/kdeedu/klettres/klettres-20110621.py
index 503272b42..b484b5182 100644
--- a/portage/kde/kdeedu/klettres/klettres-20110621.py
+++ b/portage/kde/kdeedu/klettres/klettres-20110621.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:klettres'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'learn the alphabet'
         self.defaultTarget = 'gitHEAD'
 
 
     def setDependencies( self ):
         self.dependencies['kde/libkdeedu'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kmplot/kmplot-20110621.py b/portage/kde/kdeedu/kmplot/kmplot-20110621.py
index ccfbc0b5f..92f799ddb 100644
--- a/portage/kde/kdeedu/kmplot/kmplot-20110621.py
+++ b/portage/kde/kdeedu/kmplot/kmplot-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kmplot'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'mathematical function plotter'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kstars/kstars-20110621.py b/portage/kde/kdeedu/kstars/kstars-20110621.py
index 13d1287a6..fb0b8b892 100644
--- a/portage/kde/kdeedu/kstars/kstars-20110621.py
+++ b/portage/kde/kdeedu/kstars/kstars-20110621.py
@@ -1,23 +1,28 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kstars'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a desktop planetarium'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
-        self.buildDependencies['win32libs/cfitsio'] = 'default'
+        self.buildDependencies['win32libs/cfitsio'] = 'default'
         self.dependencies['kde/kde-runtime'] = 'default'
-        self.dependencies['win32libs/libnova'] = 'default'
+        self.dependencies['win32libs/libnova'] = 'default'
         self.dependencies['kdesupport/eigen2'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/ktouch/ktouch-20110621.py b/portage/kde/kdeedu/ktouch/ktouch-20110621.py
index 460f1b726..c19c5db6a 100644
--- a/portage/kde/kdeedu/ktouch/ktouch-20110621.py
+++ b/portage/kde/kdeedu/ktouch/ktouch-20110621.py
@@ -1,19 +1,24 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ktouch'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'touch typing tutor'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kturtle/kturtle-20110621.py b/portage/kde/kdeedu/kturtle/kturtle-20110621.py
index 622d54fef..86a7b42c4 100644
--- a/portage/kde/kdeedu/kturtle/kturtle-20110621.py
+++ b/portage/kde/kdeedu/kturtle/kturtle-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kturtle'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'educational programming environment'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/kwordquiz/kwordquiz-20110621.py b/portage/kde/kdeedu/kwordquiz/kwordquiz-20110621.py
index 73e85e300..6ed28b330 100644
--- a/portage/kde/kdeedu/kwordquiz/kwordquiz-20110621.py
+++ b/portage/kde/kdeedu/kwordquiz/kwordquiz-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kwordquiz'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a flash card trainer'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdeedu'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/libkdeedu/libkdeedu-20110621.py b/portage/kde/kdeedu/libkdeedu/libkdeedu-20110621.py
index 50e13796f..26141d269 100644
--- a/portage/kde/kdeedu/libkdeedu/libkdeedu-20110621.py
+++ b/portage/kde/kdeedu/libkdeedu/libkdeedu-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libkdeedu'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'the educational support libraries'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/marble/marble-20110621.py b/portage/kde/kdeedu/marble/marble-20110621.py
index 57a20008a..b63b8752c 100644
--- a/portage/kde/kdeedu/marble/marble-20110621.py
+++ b/portage/kde/kdeedu/marble/marble-20110621.py
@@ -1,22 +1,27 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:marble'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.patchToApply[ 'gitHEAD' ] = [("0004-listen-on-any-address-to-support-mapping-over-networ.patch_", 1)]
         self.shortDescription = 'the desktop globe'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.buildDependencies['win32libs/nmealib'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/pairs/pairs-20120519.py b/portage/kde/kdeedu/pairs/pairs-20120519.py
index 21ce720dc..6c02099a2 100644
--- a/portage/kde/kdeedu/pairs/pairs-20120519.py
+++ b/portage/kde/kdeedu/pairs/pairs-20120519.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:pairs'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'A memory and pairs game for KDE'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/parley/parley-20110621.py b/portage/kde/kdeedu/parley/parley-20110621.py
index 4281d3a30..510afe0f4 100644
--- a/portage/kde/kdeedu/parley/parley-20110621.py
+++ b/portage/kde/kdeedu/parley/parley-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:parley'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a vocabulary trainer'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdeedu'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/rocs/rocs-20110621.py b/portage/kde/kdeedu/rocs/rocs-20110621.py
index 682b5a01d..b9b8f55a6 100644
--- a/portage/kde/kdeedu/rocs/rocs-20110621.py
+++ b/portage/kde/kdeedu/rocs/rocs-20110621.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:rocs'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'rocs graph theory'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeedu/step/step-20110621.py b/portage/kde/kdeedu/step/step-20110621.py
index 4adf75813..10a197187 100644
--- a/portage/kde/kdeedu/step/step-20110621.py
+++ b/portage/kde/kdeedu/step/step-20110621.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:step'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'an interactive physical simulator'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kdesupport/eigen2'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/bomber/bomber-20120911.py b/portage/kde/kdegames/bomber/bomber-20120911.py
index dab6a6c60..36d3683b8 100644
--- a/portage/kde/kdegames/bomber/bomber-20120911.py
+++ b/portage/kde/kdegames/bomber/bomber-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:bomber'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'arcade bombing game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/bovo/bovo-20120911.py b/portage/kde/kdegames/bovo/bovo-20120911.py
index 8d5f834c4..8fe81507a 100644
--- a/portage/kde/kdegames/bovo/bovo-20120911.py
+++ b/portage/kde/kdegames/bovo/bovo-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:bovo'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a gomoku like game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/granatier/granatier-20120911.py b/portage/kde/kdegames/granatier/granatier-20120911.py
index a762b3df8..46f9d5e14 100644
--- a/portage/kde/kdegames/granatier/granatier-20120911.py
+++ b/portage/kde/kdegames/granatier/granatier-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:granatier'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'clone of the classic Bomberman game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kapman/kapman-20120911.py b/portage/kde/kdegames/kapman/kapman-20120911.py
index 2a036fa9a..174160109 100644
--- a/portage/kde/kdegames/kapman/kapman-20120911.py
+++ b/portage/kde/kdegames/kapman/kapman-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kapman'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a pacman like game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/katomic/katomic-20120911.py b/portage/kde/kdegames/katomic/katomic-20120911.py
index a7b8cf056..2b446904a 100644
--- a/portage/kde/kdegames/katomic/katomic-20120911.py
+++ b/portage/kde/kdegames/katomic/katomic-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:katomic'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'fun and educational game built around molecular geometry'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kblackbox/kblackbox-20120911.py b/portage/kde/kdegames/kblackbox/kblackbox-20120911.py
index 42110053e..dbc79ccf7 100644
--- a/portage/kde/kdegames/kblackbox/kblackbox-20120911.py
+++ b/portage/kde/kdegames/kblackbox/kblackbox-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kblackbox'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a game of hide and seek'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kblocks/kblocks-20120911.py b/portage/kde/kdegames/kblocks/kblocks-20120911.py
index 24ec3bef7..d3d8dfdf2 100644
--- a/portage/kde/kdegames/kblocks/kblocks-20120911.py
+++ b/portage/kde/kdegames/kblocks/kblocks-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kblocks'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a tetris like game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kbounce/kbounce-20120911.py b/portage/kde/kdegames/kbounce/kbounce-20120911.py
index 2f16494ca..27394f853 100644
--- a/portage/kde/kdegames/kbounce/kbounce-20120911.py
+++ b/portage/kde/kdegames/kbounce/kbounce-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kbounce'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'kde bounce ball game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kbreakout/kbreakout-20120911.py b/portage/kde/kdegames/kbreakout/kbreakout-20120911.py
index 0f9fee65e..6576ec5fe 100644
--- a/portage/kde/kdegames/kbreakout/kbreakout-20120911.py
+++ b/portage/kde/kdegames/kbreakout/kbreakout-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kbreakout'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a breakout like game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kdiamond/kdiamond-20120911.py b/portage/kde/kdegames/kdiamond/kdiamond-20120911.py
index 262e906d3..2d2d59c58 100644
--- a/portage/kde/kdegames/kdiamond/kdiamond-20120911.py
+++ b/portage/kde/kdegames/kdiamond/kdiamond-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdiamond'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a bejeweled like game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kfourinline/kfourinline-20120911.py b/portage/kde/kdegames/kfourinline/kfourinline-20120911.py
index c5a93e399..f84a20e30 100644
--- a/portage/kde/kdegames/kfourinline/kfourinline-20120911.py
+++ b/portage/kde/kdegames/kfourinline/kfourinline-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kfourinline'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a Connect-Four like game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py b/portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py
index 503b4bdc3..87a505331 100644
--- a/portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py
+++ b/portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kgoldrunner'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a maze-threading game with a puzzle flavor'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kigo/kigo-20120911.py b/portage/kde/kdegames/kigo/kigo-20120911.py
index bfdf0c1b4..d98474a77 100644
--- a/portage/kde/kdegames/kigo/kigo-20120911.py
+++ b/portage/kde/kdegames/kigo/kigo-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kigo'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'an open-source implementation of the popular Go game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/killbots/killbots-20120911.py b/portage/kde/kdegames/killbots/killbots-20120911.py
index 0d53b38a3..b2c2c22fa 100644
--- a/portage/kde/kdegames/killbots/killbots-20120911.py
+++ b/portage/kde/kdegames/killbots/killbots-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:killbots'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a game of killer robots and teleportation'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kiriki/kiriki-20120911.py b/portage/kde/kdegames/kiriki/kiriki-20120911.py
index f22478dfb..5ec99e434 100644
--- a/portage/kde/kdegames/kiriki/kiriki-20120911.py
+++ b/portage/kde/kdegames/kiriki/kiriki-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kiriki'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a Yahtzee dice game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py b/portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py
index 6afeeb901..eac277376 100644
--- a/portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py
+++ b/portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kjumpingcube'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a simple dice driven tactical game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/klickety/klickety-20120911.py b/portage/kde/kdegames/klickety/klickety-20120911.py
index d0e35fe59..a068dfd12 100644
--- a/portage/kde/kdegames/klickety/klickety-20120911.py
+++ b/portage/kde/kdegames/klickety/klickety-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:klickety'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a kind of solitary game that takes place on a Tetris-like board'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/klines/klines-20120911.py b/portage/kde/kdegames/klines/klines-20120911.py
index 678fab787..df926201e 100644
--- a/portage/kde/kdegames/klines/klines-20120911.py
+++ b/portage/kde/kdegames/klines/klines-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:klines'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a little game about balls and how to get rid of them'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py b/portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py
index b089b668a..8f4c7db11 100644
--- a/portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py
+++ b/portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kmahjongg'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a Mahjongg game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kmines/kmines-20120911.py b/portage/kde/kdegames/kmines/kmines-20120911.py
index 186b71fd7..ab80443ac 100644
--- a/portage/kde/kdegames/kmines/kmines-20120911.py
+++ b/portage/kde/kdegames/kmines/kmines-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kmines'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a minesweeper game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py b/portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py
index cd897b5ac..b9307cdd8 100644
--- a/portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py
+++ b/portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:knavalbattle'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a ship sinking game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/knetwalk/knetwalk-20120911.py b/portage/kde/kdegames/knetwalk/knetwalk-20120911.py
index a5d96bcae..6f944fa73 100644
--- a/portage/kde/kdegames/knetwalk/knetwalk-20120911.py
+++ b/portage/kde/kdegames/knetwalk/knetwalk-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:knetwalk'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a game for system administrators'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kolf/kolf-20120911.py b/portage/kde/kdegames/kolf/kolf-20120911.py
index 99c5e4257..14b78e15f 100644
--- a/portage/kde/kdegames/kolf/kolf-20120911.py
+++ b/portage/kde/kdegames/kolf/kolf-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kolf'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a miniature golf game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kollision/kollision-20120911.py b/portage/kde/kdegames/kollision/kollision-20120911.py
index 58dd6ddc6..4e6599bdf 100644
--- a/portage/kde/kdegames/kollision/kollision-20120911.py
+++ b/portage/kde/kdegames/kollision/kollision-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kollision'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a simple ball dodging game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/konquest/konquest-20120911.py b/portage/kde/kdegames/konquest/konquest-20120911.py
index 6d20827be..30295087d 100644
--- a/portage/kde/kdegames/konquest/konquest-20120911.py
+++ b/portage/kde/kdegames/konquest/konquest-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:konquest'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a galactic strategy game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kpat/kpat-20120911.py b/portage/kde/kdegames/kpat/kpat-20120911.py
index 8b4e567ee..fd7b21134 100644
--- a/portage/kde/kdegames/kpat/kpat-20120911.py
+++ b/portage/kde/kdegames/kpat/kpat-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kpat'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a selection of solitaire card games'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kreversi/kreversi-20120911.py b/portage/kde/kdegames/kreversi/kreversi-20120911.py
index 99daa8c60..08113fd58 100644
--- a/portage/kde/kdegames/kreversi/kreversi-20120911.py
+++ b/portage/kde/kdegames/kreversi/kreversi-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kreversi'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a reversi game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kshisen/kshisen-20120911.py b/portage/kde/kdegames/kshisen/kshisen-20120911.py
index 2e50f61ab..757e4c1b7 100644
--- a/portage/kde/kdegames/kshisen/kshisen-20120911.py
+++ b/portage/kde/kdegames/kshisen/kshisen-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kshisen'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a shisen sho game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/ksirk/ksirk-20120911.py b/portage/kde/kdegames/ksirk/ksirk-20120911.py
index 8f4e8818a..ac2c05bac 100644
--- a/portage/kde/kdegames/ksirk/ksirk-20120911.py
+++ b/portage/kde/kdegames/ksirk/ksirk-20120911.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksirk'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a Risk strategy game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
         self.dependencies['kdesupport/qca'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py b/portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py
index af13e2a2f..9bff29e86 100644
--- a/portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py
+++ b/portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksnakeduel'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a simple snake duel game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py b/portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py
index 8ee3c64ca..b7ffd711a 100644
--- a/portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py
+++ b/portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kspaceduel'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'SpaceWar! arcade game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/ksquares/ksquares-20120911.py b/portage/kde/kdegames/ksquares/ksquares-20120911.py
index f738940cb..e0f3e1d3a 100644
--- a/portage/kde/kdegames/ksquares/ksquares-20120911.py
+++ b/portage/kde/kdegames/ksquares/ksquares-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksquares'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'dots and boxes game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/ksudoku/ksudoku-20120911.py b/portage/kde/kdegames/ksudoku/ksudoku-20120911.py
index 72cc6e56b..0fee15193 100644
--- a/portage/kde/kdegames/ksudoku/ksudoku-20120911.py
+++ b/portage/kde/kdegames/ksudoku/ksudoku-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksudoku'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a sudoku puzzle game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/ktuberling/ktuberling-20120911.py b/portage/kde/kdegames/ktuberling/ktuberling-20120911.py
index 13f12bc8c..08911fab4 100644
--- a/portage/kde/kdegames/ktuberling/ktuberling-20120911.py
+++ b/portage/kde/kdegames/ktuberling/ktuberling-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ktuberling'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a stamp drawing toy'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/kubrick/kubrick-20120911.py b/portage/kde/kdegames/kubrick/kubrick-20120911.py
index 5ae54d1de..032f8b2b1 100644
--- a/portage/kde/kdegames/kubrick/kubrick-20120911.py
+++ b/portage/kde/kdegames/kubrick/kubrick-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kubrick'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a game based on Rubik Cube'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/libkdegames/libkdegames-20120911.py b/portage/kde/kdegames/libkdegames/libkdegames-20120911.py
index 0121c1266..741b3c1ce 100644
--- a/portage/kde/kdegames/libkdegames/libkdegames-20120911.py
+++ b/portage/kde/kdegames/libkdegames/libkdegames-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libkdegames'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'the kdegames support libraries'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py b/portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py
index 4c8c39107..ac79a5f79 100644
--- a/portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py
+++ b/portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libmahjong'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'Common code, backgrounds and tile sets for games using Mahjongg tiles'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/lskat/lskat-20120911.py b/portage/kde/kdegames/lskat/lskat-20120911.py
index ae18b9d40..a551be511 100644
--- a/portage/kde/kdegames/lskat/lskat-20120911.py
+++ b/portage/kde/kdegames/lskat/lskat-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:lskat'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'Lieutnant Skat card game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/palapeli/palapeli-20120911.py b/portage/kde/kdegames/palapeli/palapeli-20120911.py
index c1e0f7072..aa13bedcb 100644
--- a/portage/kde/kdegames/palapeli/palapeli-20120911.py
+++ b/portage/kde/kdegames/palapeli/palapeli-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:palapeli'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'a single-player jigsaw puzzle game'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegames/picmi/picmi-20120911.py b/portage/kde/kdegames/picmi/picmi-20120911.py
index 09f2132fe..a1e453312 100644
--- a/portage/kde/kdegames/picmi/picmi-20120911.py
+++ b/portage/kde/kdegames/picmi/picmi-20120911.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:picmi'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = 'A nonogram logic game for KDE'
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/libkdegames'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/gwenview/gwenview-20110627.py b/portage/kde/kdegraphics/gwenview/gwenview-20110627.py
index 19ca56b38..8588170a6 100644
--- a/portage/kde/kdegraphics/gwenview/gwenview-20110627.py
+++ b/portage/kde/kdegraphics/gwenview/gwenview-20110627.py
@@ -1,25 +1,30 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:gwenview'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "Image viewer for KDE"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-baseapps'] = 'default'
         self.dependencies['kde/libkipi'] = 'default' 
-        self.dependencies['win32libs/exiv2'] = 'default'
-        self.dependencies['win32libs/jpeg'] = 'default'
+        self.dependencies['win32libs/exiv2'] = 'default'
+        self.dependencies['win32libs/jpeg'] = 'default'
    
 
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/kamera/kamera-20110627.py b/portage/kde/kdegraphics/kamera/kamera-20110627.py
index 0347d10c5..01113a9ea 100644
--- a/portage/kde/kdegraphics/kamera/kamera-20110627.py
+++ b/portage/kde/kdegraphics/kamera/kamera-20110627.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kamera'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "KDE integration for gphoto2 cameras"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/kcolorchooser/kcolorchooser-20110627.py b/portage/kde/kdegraphics/kcolorchooser/kcolorchooser-20110627.py
index 04c013711..a4667d1b6 100644
--- a/portage/kde/kdegraphics/kcolorchooser/kcolorchooser-20110627.py
+++ b/portage/kde/kdegraphics/kcolorchooser/kcolorchooser-20110627.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kcolorchooser'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "A small utility to select a color"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-20110627.py b/portage/kde/kdegraphics/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-20110627.py
index 4b4a34267..49ae5c3ff 100644
--- a/portage/kde/kdegraphics/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-20110627.py
+++ b/portage/kde/kdegraphics/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-20110627.py
@@ -1,22 +1,27 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdegraphics-strigi-analyzer'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "Strigi analyzers for various graphics file formats"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
-        self.dependencies['win32libs/tiff'] = 'default'
+        self.dependencies['win32libs/tiff'] = 'default'
         self.dependencies['kdesupport/strigi'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/kdegraphics-thumbnailers/kdegraphics-thumbnailers-20110627.py b/portage/kde/kdegraphics/kdegraphics-thumbnailers/kdegraphics-thumbnailers-20110627.py
index 918f23185..169728e56 100644
--- a/portage/kde/kdegraphics/kdegraphics-thumbnailers/kdegraphics-thumbnailers-20110627.py
+++ b/portage/kde/kdegraphics/kdegraphics-thumbnailers/kdegraphics-thumbnailers-20110627.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdegraphics-thumbnailers'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "Thumbnailers for various graphics file formats"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/kolourpaint/kolourpaint-20110627.py b/portage/kde/kdegraphics/kolourpaint/kolourpaint-20110627.py
index d0086ecb8..7d9929fb9 100644
--- a/portage/kde/kdegraphics/kolourpaint/kolourpaint-20110627.py
+++ b/portage/kde/kdegraphics/kolourpaint/kolourpaint-20110627.py
@@ -1,22 +1,27 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kolourpaint'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "KolourPaint is an easy-to-use paint program"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.dependencies['kdesupport/qimageblitz'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/kruler/kruler-20110627.py b/portage/kde/kdegraphics/kruler/kruler-20110627.py
index c013c9d9e..8d85db260 100644
--- a/portage/kde/kdegraphics/kruler/kruler-20110627.py
+++ b/portage/kde/kdegraphics/kruler/kruler-20110627.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kruler'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "A pixel measuring tool for KDE"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/ksaneplugin/ksaneplugin-20110627.py b/portage/kde/kdegraphics/ksaneplugin/ksaneplugin-20110627.py
index bc9bea324..3bff9d1ab 100644
--- a/portage/kde/kdegraphics/ksaneplugin/ksaneplugin-20110627.py
+++ b/portage/kde/kdegraphics/ksaneplugin/ksaneplugin-20110627.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksaneplugin'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "This is a KScan plugin that implements the scanning through libksane"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.dependencies['kde/libksane'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py b/portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
index be8c0b727..dc422baa7 100644
--- a/portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
+++ b/portage/kde/kdegraphics/ksnapshot/ksnapshot-20110627.py
@@ -1,22 +1,27 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksnapshot'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "A handy utility primarily designed for taking screenshots"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/libkipi'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/libkdcraw/libkdcraw-4.8.2-20120419.py b/portage/kde/kdegraphics/libkdcraw/libkdcraw-4.8.2-20120419.py
index e576ab364..61ebf5f0a 100644
--- a/portage/kde/kdegraphics/libkdcraw/libkdcraw-4.8.2-20120419.py
+++ b/portage/kde/kdegraphics/libkdcraw/libkdcraw-4.8.2-20120419.py
@@ -1,34 +1,32 @@
-import os
-import sys
-import info
-class subinfo(info.infoclass):
-    def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libkdcraw'
-        self.targets['4.8.0'] = 'ftp://ftp.kde.org/pub/kde/stable/4.8.0/src/libkdcraw-4.8.0.tar.bz2'
-        self.targetInstSrc['4.8.0'] = 'libkdcraw-4.8.0'
-        for ver in ['4.8.1', '4.8.2', '4.8.3']:
-            self.targets[ver] = "ftp://ftp.kde.org/pub/kde/stable/" + ver + "/src/libkdcraw-" + ver + ".tar.xz"
-            self.targetInstSrc[ver] = 'libkdcraw-' + ver
-        
-        for ver in ['4.8.0', '4.8.1', '4.8.2', '4.8.3']:
-            self.patchToApply[ver] = [('libkdcraw-4.8.0-20120125.diff',1)]
-        
-        self.defaultTarget = '4.8.2'
-        
-        self.shortDescription = 'libkdcraw is a C++ interface around LibRaw library used to decode RAW picture files.'
-
-    def setDependencies( self ):
-        self.dependencies['kde/kde-runtime'] = 'default'
-        self.dependencies['kde/kdelibs'] = 'default'
-
-
-from Package.CMakePackageBase import *
-
-class Package( CMakePackageBase ):
-    def __init__( self ):
-        self.subinfo = subinfo()
-        CMakePackageBase.__init__( self )
-
-
-if __name__ == '__main__':
-    Package().execute()
+import info
+import kdedefaults as kd
+
+class subinfo(info.infoclass):
+    def setTargets( self ):
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        for ver in ['4.8.0', '4.8.1', '4.8.2', '4.8.3']:
+            self.patchToApply[ver] = [('libkdcraw-4.8.0-20120125.diff',1)]
+
+        self.defaultTarget = '4.8.2'
+
+        self.shortDescription = 'libkdcraw is a C++ interface around LibRaw library used to decode RAW picture files.'
+
+    def setDependencies( self ):
+        self.dependencies['kde/kde-runtime'] = 'default'
+        self.dependencies['kde/kdelibs'] = 'default'
+
+
+from Package.CMakePackageBase import *
+
+class Package( CMakePackageBase ):
+    def __init__( self ):
+        self.subinfo = subinfo()
+        CMakePackageBase.__init__( self )
+
+
+if __name__ == '__main__':
+    Package().execute()
diff --git a/portage/kde/kdegraphics/libkexiv2/libkexiv2-20110627.py b/portage/kde/kdegraphics/libkexiv2/libkexiv2-20110627.py
index 0157835dc..db85a8e06 100644
--- a/portage/kde/kdegraphics/libkexiv2/libkexiv2-20110627.py
+++ b/portage/kde/kdegraphics/libkexiv2/libkexiv2-20110627.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libkexiv2'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures metadata as EXIF IPTC and XMP."
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
-        self.dependencies['win32libs/exiv2'] = 'default'
+        self.dependencies['win32libs/exiv2'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/libkipi/libkipi-20110627.py b/portage/kde/kdegraphics/libkipi/libkipi-20110627.py
index 6d5f1fbe7..dc0a741a0 100644
--- a/portage/kde/kdegraphics/libkipi/libkipi-20110627.py
+++ b/portage/kde/kdegraphics/libkipi/libkipi-20110627.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libkipi'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "Libkipi is an interface to use kipi-plugins from a KDE image management program like digiKam."
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/libksane/libksane-20110627.py b/portage/kde/kdegraphics/libksane/libksane-20110627.py
index 2e8f820ec..f2232c906 100644
--- a/portage/kde/kdegraphics/libksane/libksane-20110627.py
+++ b/portage/kde/kdegraphics/libksane/libksane-20110627.py
@@ -1,20 +1,25 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:libksane'
-        self.shortDescription = "libksane is an image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner."
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        self.shortDescription = "libksane is an image scanning library that provides a QWidget that contains all the logic needed to interface a scanner."
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/mobipocket/mobipocket-20110627.py b/portage/kde/kdegraphics/mobipocket/mobipocket-20110627.py
index 6c8665bda..3b2a2b8d4 100644
--- a/portage/kde/kdegraphics/mobipocket/mobipocket-20110627.py
+++ b/portage/kde/kdegraphics/mobipocket/mobipocket-20110627.py
@@ -1,22 +1,27 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:mobipocket'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "A collection of plugins to handle mobipocket files"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.dependencies['kde/okular'] = 'default'
         self.dependencies['kdesupport/strigi'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/okular/okular-20110627.py b/portage/kde/kdegraphics/okular/okular-20110627.py
index b5cc76d57..2ce4bd419 100644
--- a/portage/kde/kdegraphics/okular/okular-20110627.py
+++ b/portage/kde/kdegraphics/okular/okular-20110627.py
@@ -1,30 +1,35 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:okular'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "KDE document viewer"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
-        self.buildDependencies['win32libs/chm'] = 'default'
+        self.buildDependencies['win32libs/chm'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
         self.dependencies['kdesupport/qca'] = 'default'
         self.dependencies['kdesupport/poppler'] = 'default'
         self.dependencies['kdesupport/qimageblitz'] = 'default'
-        self.dependencies['win32libs/tiff'] = 'default'
-        self.dependencies['win32libs/djvu'] = 'default'
-        self.dependencies['win32libs/zlib'] = 'default'
-        self.dependencies['win32libs/freetype'] = 'default'
-        self.dependencies['win32libs/libspectre'] = 'default'
+        self.dependencies['win32libs/tiff'] = 'default'
+        self.dependencies['win32libs/djvu'] = 'default'
+        self.dependencies['win32libs/zlib'] = 'default'
+        self.dependencies['win32libs/freetype'] = 'default'
+        self.dependencies['win32libs/libspectre'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdegraphics/svgpart/svgpart-20110627.py b/portage/kde/kdegraphics/svgpart/svgpart-20110627.py
index dbd998679..a1e698472 100644
--- a/portage/kde/kdegraphics/svgpart/svgpart-20110627.py
+++ b/portage/kde/kdegraphics/svgpart/svgpart-20110627.py
@@ -1,17 +1,22 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:svgpart'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "A svg kpart"
         self.defaultTarget = 'gitHEAD'
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdelibs/kdelibs-20110130.py b/portage/kde/kdelibs/kdelibs-20110130.py
index df075177f..5fe6b09a2 100644
--- a/portage/kde/kdelibs/kdelibs-20110130.py
+++ b/portage/kde/kdelibs/kdelibs-20110130.py
@@ -1,55 +1,57 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdelibs'
-        self.svnTargets['frameworks'] = '[git]kde:kdelibs|frameworks|'
-        for version in ['4.4', '4.5', '4.6', '4.7', '4.8', '4.9']:
-            self.svnTargets[version] = '[git]kde:kdelibs|KDE/%s|' % version
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + 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/automoc'] = 'default'
+        self.buildDependencies['win32libs/automoc'] = 'default'
         self.dependencies['kdesupport/hupnp'] = 'default'
         self.dependencies['kdesupport/kdewin'] = 'default'
         self.dependencies['kdesupport/phonon'] = 'default'
         self.dependencies['kdesupport/attica'] = '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.supportsNinja = False
         self.subinfo.options.configure.defines = ""
         if compiler.isMinGW():
           self.subinfo.options.configure.defines += " -DKDE_DISTRIBUTION_TEXT=\"MinGW %s\" " % compiler.getMinGWVersion()
         elif compiler.isMSVC():
           self.subinfo.options.configure.defines = " -DKDE_DISTRIBUTION_TEXT=\"%s\" " % compiler.getVersion()
 
     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()
diff --git a/portage/kde/kdemultimedia/kdemultimedia-20080202.py b/portage/kde/kdemultimedia/kdemultimedia-20080202.py
index 3afd13a3a..44cfd9391 100644
--- a/portage/kde/kdemultimedia/kdemultimedia-20080202.py
+++ b/portage/kde/kdemultimedia/kdemultimedia-20080202.py
@@ -1,24 +1,32 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['svnHEAD'] = 'trunk/KDE/kdemultimedia'
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        if kd.kdebranch == 'master':
+            self.svnTargets['svnHEAD'] = 'trunk/KDE/%s' % self.package
+        else:
+            self.svnTargets['svnHEAD'] = 'branches/KDE/%s/%s' % (kd.kdeversion[:-1], self.package)
         self.shortDescription = "KDE multimedia applications (jux, kmix, kmixctrl, kscd)"
         self.defaultTarget = 'svnHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
-        self.dependencies['win32libs/taglib'] = 'default'
-        self.dependencies['win32libs/libogg'] = 'default'
-        self.dependencies['win32libs/libvorbis'] = 'default'
+        self.dependencies['win32libs/taglib'] = 'default'
+        self.dependencies['win32libs/libogg'] = 'default'
+        self.dependencies['win32libs/libvorbis'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdenetwork/kdenetwork-20080202.py b/portage/kde/kdenetwork/kdenetwork-20080202.py
index 7c80a3a27..c1a715537 100644
--- a/portage/kde/kdenetwork/kdenetwork-20080202.py
+++ b/portage/kde/kdenetwork/kdenetwork-20080202.py
@@ -1,25 +1,34 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['svnHEAD'] = 'trunk/KDE/kdenetwork'
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        if kd.kdebranch == 'master':
+            self.svnTargets['svnHEAD'] = 'trunk/KDE/%s' % self.package
+        else:
+            self.svnTargets['svnHEAD'] = 'branches/KDE/%s/%s' % (kd.kdeversion[:-1], self.package)
+
         self.defaultTarget = 'svnHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdepimlibs'] = 'default'
         self.dependencies['kdesupport/qca'] = 'default'
-        self.dependencies['win32libs/libidn'] = 'default'
-        self.dependencies['win32libs/libmsn'] = 'default'
-        self.dependencies['win32libs/mpir'] = 'default'
+        self.dependencies['win32libs/libidn'] = 'default'
+        self.dependencies['win32libs/libmsn'] = 'default'
+        self.dependencies['win32libs/mpir'] = 'default'
         self.shortDescription = "KDE Networking applications (Kopete, KGet)"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py b/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py
index 04eb0745a..a7c018706 100644
--- a/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py
+++ b/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py
@@ -1,32 +1,37 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdepim-runtime'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdepimlibs'] = 'default'
         self.dependencies['kdesupport/grantlee'] = 'default'
-        self.dependencies['win32libs/sqlite'] = 'default'
+        self.dependencies['win32libs/sqlite'] = 'default'
         self.shortDescription = "Extends the functionality of kdepim"
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
     def install( self ):
         if not CMakePackageBase.install( self ):
             return False
         if compiler.isMinGW():
             manifest = os.path.join( self.packageDir(), "akonadi_maildispatcher_agent.exe.manifest" )
             executable = os.path.join( self.installDir(), "bin", "akonadi_maildispatcher_agent.exe" )
             utils.embedManifest( executable, manifest )
         return True
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdepim/kdepim-20080202.py b/portage/kde/kdepim/kdepim-20080202.py
index 7d901d158..59ddca833 100644
--- a/portage/kde/kdepim/kdepim-20080202.py
+++ b/portage/kde/kdepim/kdepim-20080202.py
@@ -1,27 +1,32 @@
 import info
+import kdedefaults as kd
 
-class subinfo( info.infoclass ):
+class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdepim'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
         # Workaround BUG 302342
         self.patchToApply['gitHEAD'] = ('fix_introduction_screen.diff', 1)
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.runtimeDependencies['kde/kdepim-runtime'] = 'default'
         self.dependencies['kde/kdepimlibs'] = 'default'
         self.dependencies['kdesupport/grantlee'] = 'default'
         self.dependencies['kde/nepomuk-widgets'] = 'default'
         self.shortDescription = "KDE's Personal Information Management suite"
 
 from Package.CMakePackageBase import *
 
 class Package( CMakePackageBase ):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdepimlibs/kdepimlibs-20110129.py b/portage/kde/kdepimlibs/kdepimlibs-20110129.py
index 57be1a509..f2834f3a0 100644
--- a/portage/kde/kdepimlibs/kdepimlibs-20110129.py
+++ b/portage/kde/kdepimlibs/kdepimlibs-20110129.py
@@ -1,29 +1,34 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdepimlibs'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.dependencies['kde/nepomuk-core'] = 'default'
         self.dependencies['kdesupport/akonadi'] = 'default'
-        self.dependencies['win32libs/cyrus-sasl'] = 'default'
-        self.dependencies['win32libs/libical'] = 'default'
-        self.dependencies['win32libs/gpgme'] = 'default'
-        self.dependencies['win32libs/openldap'] = 'default'
+        self.dependencies['win32libs/cyrus-sasl'] = 'default'
+        self.dependencies['win32libs/libical'] = 'default'
+        self.dependencies['win32libs/gpgme'] = 'default'
+        self.dependencies['win32libs/openldap'] = 'default'
         self.shortDescription = "the base libraries for PIM related services"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
-        self.boost = portage.getPackageInstance('win32libs','boost')
+        self.boost = portage.getPackageInstance('win32libs','boost')
         path = self.boost.installDir()
         os.putenv( "BOOST_ROOT", path )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py b/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py
index 18d3eb4d7..ac2e307df 100644
--- a/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py
+++ b/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdeplasma-addons'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kde-workspace'] = 'default'
         self.shortDescription = "All kind of addons to improve your Plasma experience"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdesdk/kdesdk-20080202.py b/portage/kde/kdesdk/kdesdk-20080202.py
index fcab8f5fb..4aef55f65 100644
--- a/portage/kde/kdesdk/kdesdk-20080202.py
+++ b/portage/kde/kdesdk/kdesdk-20080202.py
@@ -1,22 +1,31 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['svnHEAD'] = 'trunk/KDE/kdesdk'
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        if kd.kdebranch == 'master':
+            self.svnTargets['svnHEAD'] = 'trunk/KDE/%s' % self.package
+        else:
+            self.svnTargets['svnHEAD'] = 'branches/KDE/%s/%s' % (kd.kdeversion[:-1], self.package)
+
         self.defaultTarget = 'svnHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-baseapps'] = 'default'
-        self.dependencies['win32libs/boost'] = 'default'
+        self.dependencies['win32libs/boost'] = 'default'
         self.dependencies['dev-util/zip'] = 'default'
         self.shortDescription = "KDE software development package (umbrello, okteta)"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdetoys/kdetoys-20080202.py b/portage/kde/kdetoys/kdetoys-20080202.py
index a41a7664e..6baf9a48d 100644
--- a/portage/kde/kdetoys/kdetoys-20080202.py
+++ b/portage/kde/kdetoys/kdetoys-20080202.py
@@ -1,20 +1,29 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['svnHEAD'] = 'trunk/KDE/kdetoys'
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
+        if kd.kdebranch == 'master':
+            self.svnTargets['svnHEAD'] = 'trunk/KDE/%s' % self.package
+        else:
+            self.svnTargets['svnHEAD'] = 'branches/KDE/%s/%s' % (kd.kdeversion[:-1], self.package)
+
         self.shortDescription = 'some toy apps & games'
         self.defaultTarget = 'svnHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kde-runtime'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/ark/ark-20120112.py b/portage/kde/kdeutils/ark/ark-20120112.py
index 38ef59940..ce18dfcbc 100644
--- a/portage/kde/kdeutils/ark/ark-20120112.py
+++ b/portage/kde/kdeutils/ark/ark-20120112.py
@@ -1,24 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kactivities|KDE/4.9|'
-        for ver in ['1', '2', '3', '4']:
-            self.targets['4.9.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.9.' + ver + '/src/kactivities-4.9.' + ver + '.tar.xz'
-            self.targetInstSrc['4.9.' + ver] = 'kactivities-4.9.' + ver
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/kdelibs'] = 'default'
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.shortDescription = "KDE Activity Manager"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__(self)
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/filelight/filelight-20120112.py b/portage/kde/kdeutils/filelight/filelight-20120112.py
index 020db7c77..78dc13a1f 100644
--- a/portage/kde/kdeutils/filelight/filelight-20120112.py
+++ b/portage/kde/kdeutils/filelight/filelight-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:filelight'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a graphical representation of your file system"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kcalc/kcalc-20120112.py b/portage/kde/kdeutils/kcalc/kcalc-20120112.py
index a66bcf874..ee69278f6 100644
--- a/portage/kde/kdeutils/kcalc/kcalc-20120112.py
+++ b/portage/kde/kdeutils/kcalc/kcalc-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kcalc'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "KDE's calculator"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kcharselect/kcharselect-20120112.py b/portage/kde/kdeutils/kcharselect/kcharselect-20120112.py
index fa080e409..4df0b89e6 100644
--- a/portage/kde/kdeutils/kcharselect/kcharselect-20120112.py
+++ b/portage/kde/kdeutils/kcharselect/kcharselect-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kcharselect'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a tool to select special characters from all installed fonts"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kdiskfree/kdiskfree-20120112.py b/portage/kde/kdeutils/kdiskfree/kdiskfree-20120112.py
index 53b99d136..524991cdb 100644
--- a/portage/kde/kdeutils/kdiskfree/kdiskfree-20120112.py
+++ b/portage/kde/kdeutils/kdiskfree/kdiskfree-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kdiskfree'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "displays the available file devices along with information"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kfloppy/kfloppy-20120112.py b/portage/kde/kdeutils/kfloppy/kfloppy-20120112.py
index c15fd26f8..fd4754fce 100644
--- a/portage/kde/kdeutils/kfloppy/kfloppy-20120112.py
+++ b/portage/kde/kdeutils/kfloppy/kfloppy-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kfloppy'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a utility to format floppy disks"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kgpg/kgpg-20120112.py b/portage/kde/kdeutils/kgpg/kgpg-20120112.py
index 9142a8783..0bf474178 100644
--- a/portage/kde/kdeutils/kgpg/kgpg-20120112.py
+++ b/portage/kde/kdeutils/kgpg/kgpg-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kgpg'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a simple interface for GnuPG"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kremotecontrol/kremotecontrol-20120112.py b/portage/kde/kdeutils/kremotecontrol/kremotecontrol-20120112.py
index a9f833639..077319107 100644
--- a/portage/kde/kdeutils/kremotecontrol/kremotecontrol-20120112.py
+++ b/portage/kde/kdeutils/kremotecontrol/kremotecontrol-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kremotecontrol'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a KDE frontend for your remote controls"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/ksecretsservice/ksecretsservice-20120112.py b/portage/kde/kdeutils/ksecretsservice/ksecretsservice-20120112.py
index 758dc7dd2..f92a46fe4 100644
--- a/portage/kde/kdeutils/ksecretsservice/ksecretsservice-20120112.py
+++ b/portage/kde/kdeutils/ksecretsservice/ksecretsservice-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ksecrets'
+        self.svnTargets['gitHEAD'] = '[git]kde:ksecrets|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + "ksecrets" + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = "ksecrets" + '-' + kd.kdeversion + ver
+
         self.shortDescription = "secrets management infrastructure for KDE"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/ktimer/ktimer-20120112.py b/portage/kde/kdeutils/ktimer/ktimer-20120112.py
index 8cba4b493..dc7253923 100644
--- a/portage/kde/kdeutils/ktimer/ktimer-20120112.py
+++ b/portage/kde/kdeutils/ktimer/ktimer-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:ktimer'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a little tool to execute programs after some time"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/kwallet/kwallet-20120112.py b/portage/kde/kdeutils/kwallet/kwallet-20120112.py
index 877db906b..bffc2e458 100644
--- a/portage/kde/kdeutils/kwallet/kwallet-20120112.py
+++ b/portage/kde/kdeutils/kwallet/kwallet-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:kwallet'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "KDE Wallet Manager"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/printer-applet/printer-applet-20120112.py b/portage/kde/kdeutils/printer-applet/printer-applet-20120112.py
index 4652c702b..5349fed23 100644
--- a/portage/kde/kdeutils/printer-applet/printer-applet-20120112.py
+++ b/portage/kde/kdeutils/printer-applet/printer-applet-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:printer-applet'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "Printer Applet shows current print jobs, warnings & errors"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/superkaramba/superkaramba-20120112.py b/portage/kde/kdeutils/superkaramba/superkaramba-20120112.py
index 5441f3b06..b5a66aba6 100644
--- a/portage/kde/kdeutils/superkaramba/superkaramba-20120112.py
+++ b/portage/kde/kdeutils/superkaramba/superkaramba-20120112.py
@@ -1,21 +1,26 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:superkaramba'
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.shortDescription = "a tool to create interactive widgets on your KDE desktop"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/kdeutils/sweeper/sweeper-20120112.py b/portage/kde/kdeutils/sweeper/sweeper-20120112.py
index 32e023136..66109fa6a 100644
--- a/portage/kde/kdeutils/sweeper/sweeper-20120112.py
+++ b/portage/kde/kdeutils/sweeper/sweeper-20120112.py
@@ -1,31 +1,26 @@
 import info
-from os.path import dirname as dn, join as j
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        kdepath = j(dn(__file__), '..', '..')
-        kdebranch = open(j(kdepath, 'kdebranch')).read()
-        kdeversion = open(j(kdepath, 'kdeversion')).read() + '.'
-        package = 'sweeper'
-
-        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (package, kdebranch)
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
         for ver in ['0', '1', '2', '3', '4', '5']:
-            self.targets[kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kdeversion + ver + "/src/" + package + "-" + kdeversion + ver + ".tar.xz"
-            self.targetInstSrc[kdeversion + ver] = package + '-' + kdeversion + ver
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
 
         self.shortDescription = "a tool to clean unwanted traces"
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.runtimeDependencies['kde/kde-runtime'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__( self )
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/nepomuk-core/nepomuk-core-20120728.py b/portage/kde/nepomuk-core/nepomuk-core-20120728.py
index 2ad02d8e8..23c2bb98f 100644
--- a/portage/kde/nepomuk-core/nepomuk-core-20120728.py
+++ b/portage/kde/nepomuk-core/nepomuk-core-20120728.py
@@ -1,26 +1,28 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:nepomuk-core'
-        for ver in ['0', '1', '2', '3', '4']:
-            self.targets['4.9.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.9.' + ver + '/src/nepomuk-core-4.9.' + ver + '.tar.xz'
-            self.targetInstSrc['4.9.' + ver] = 'nepomuk-core-4.9.' + ver
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kdesupport/soprano'] = 'default'
         self.dependencies['kdesupport/strigi'] = 'default'
         self.dependencies['data/shared-desktop-ontologies'] = 'default'
         self.dependencies['kde/kdelibs'] = 'default'
         self.shortDescription = "Nepomuk core libraries"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__(self)
 
 if __name__ == '__main__':
     Package().execute()
diff --git a/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py b/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py
index de9e7fcba..723f75b5c 100644
--- a/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py
+++ b/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py
@@ -1,23 +1,25 @@
 import info
+import kdedefaults as kd
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        self.svnTargets['gitHEAD'] = '[git]kde:nepomuk-widgets'
-        for ver in ['0', '1', '2', '3', '4']:
-            self.targets['4.9.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.9.' + ver + '/src/nepomuk-widgets-4.9.' + ver + '.tar.xz'
-            self.targetInstSrc['4.9.' + ver] = 'nepomuk-widgets-4.9.' + ver
+        self.svnTargets['gitHEAD'] = '[git]kde:%s|%s|' % (self.package, kd.kdebranch)
+        for ver in ['0', '1', '2', '3', '4', '5']:
+            self.targets[kd.kdeversion + ver] = "ftp://ftp.kde.org/pub/kde/stable/" + kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
+            self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + kd.kdeversion + ver
+
         self.defaultTarget = 'gitHEAD'
 
     def setDependencies( self ):
         self.dependencies['kde/nepomuk-core'] = 'default'
         self.shortDescription = "Nepomuk GUI components"
 
 from Package.CMakePackageBase import *
 
 class Package(CMakePackageBase):
     def __init__( self ):
         self.subinfo = subinfo()
         CMakePackageBase.__init__(self)
 
 if __name__ == '__main__':
     Package().execute()