Git commit b5ec6da51bf0ae87daedc487ef53793f1d73a227 by Patrick Spendrin. Committed on 01/07/2011 at 01:19. Pushed by sengels into branch 'kde-4.6'. add the rest of kde-4.6, packages for all git repos still missing (and probably will stay missing) M +4 -15 portage/kde/kde-runtime/kde-runtime-20110130.py M +2 -12 portage/kde/kde-workspace/kde-workspace-20110130.py M +7 -36 portage/kde/kdelibs/kdelibs-20110130.py M +6 -1 portage/kde/kdemultimedia/kdemultimedia-20080202.py M +5 -1 portage/kde/kdenetwork/kdenetwork-20080202.py M +5 -33 portage/kde/kdepim-runtime/kdepim-runtime-20101222.py M +10 -75 portage/kde/kdepim/kdepim-20080202.py D +0 -45 portage/kde/kdepimlibs/kdepimlibs-20080202.py M +7 -14 portage/kde/kdepimlibs/kdepimlibs-20110129.py M +2 -1 portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py M +5 -16 portage/kde/kdesdk/kdesdk-20080202.py M +4 -1 portage/kde/kdetoys/kdetoys-20080202.py M +4 -1 portage/kde/kdeutils/kdeutils-20080202.py D +0 -27 portage/kde/kdewebdev/kdewebdev-20080202.py D +0 -33 portage/kde/kdewebdev/post-install-bin.cmd http://commits.kde.org/emerge/b5ec6da51bf0ae87daedc487ef53793f1d73a227 diff --git a/portage/kde/kde-runtime/kde-runtime-20110130.py b/portage/kde/kde-runtime/kde-runtime-20110130.py index 3e45b10..9606221 100644 --- a/portage/kde/kde-runtime/kde-runtime-20110130.py +++ b/portage/kde/kde-runtime/kde-runtime-20110130.py @@ -2,21 +2,17 @@ import info import compiler class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kde-runtime' - self.svnTargets['komobranch'] = 'branches/work/komo/kdebase/runtime' - if emergePlatform.isCrossCompilingEnabled(): - self.defaultTarget = 'komobranch' - else: - self.defaultTarget = 'gitHEAD' + self.svnTargets['gitHEAD'] = '[git]kde:kde-runtime|KDE/4.6|' + self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kdelibs'] = 'default' self.dependencies['kdesupport/oxygen-icons'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['win32libs-bin/libssh'] = 'default' + self.dependencies['win32libs-bin/libssh'] = 'default' if compiler.isMinGW_WXX(): # self.dependencies['win32libs-bin/libbfd'] = 'default' self.dependencies['win32libs-sources/libbfd-src'] = 'default' + self.shortDescription = "Plugins and applications necessary for the running of KDE applications." def setBuildOptions( self ): self.disableHostBuild = True @@ -29,14 +25,7 @@ class Package(CMakePackageBase): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "" - if emergePlatform.isCrossCompilingEnabled(): - self.subinfo.options.configure.defines += "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE " - self.subinfo.options.configure.defines += "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - - if self.isTargetBuild(): - self.subinfo.options.configure.defines += "-DKDEBASE_DISABLE_MULTIMEDIA=ON " self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " if __name__ == '__main__': diff --git a/portage/kde/kde-workspace/kde-workspace-20110130.py b/portage/kde/kde-workspace/kde-workspace-20110130.py index d25e430..fb4d0ad 100644 --- a/portage/kde/kde-workspace/kde-workspace-20110130.py +++ b/portage/kde/kde-workspace/kde-workspace-20110130.py @@ -2,17 +2,11 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kde-workspace' - self.svnTargets['komobranch'] = 'branches/work/komo/kdebase/workspace' - if emergePlatform.isCrossCompilingEnabled(): - self.defaultTarget = 'komobranch' - else: - self.defaultTarget = 'gitHEAD' + self.svnTargets['gitHEAD'] = '[git]kde:kde-workspace|KDE/4.6|' + self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kde-runtime'] = 'default' -# if not emergePlatform.isCrossCompilingEnabled(): -# self.dependencies['win32libs-bin/fontconfig'] = 'default' self.dependencies['win32libs-bin/freetype'] = 'default' self.dependencies['win32libs-bin/boost'] = 'default' self.dependencies['kdesupport/akonadi'] = 'default' @@ -28,10 +22,6 @@ class Package(CMakePackageBase): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "" - self.subinfo.options.configure.defines += "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - if self.isTargetBuild(): - self.subinfo.options.configure.defines += "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE " self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " if __name__ == '__main__': diff --git a/portage/kde/kdelibs/kdelibs-20110130.py b/portage/kde/kdelibs/kdelibs-20110130.py index e3d9d9a..222d6f2 100644 --- a/portage/kde/kdelibs/kdelibs-20110130.py +++ b/portage/kde/kdelibs/kdelibs-20110130.py @@ -3,12 +3,9 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdelibs' - self.svnTargets['komobranch'] = 'branches/work/komo/kdelibs' - if emergePlatform.isCrossCompilingEnabled(): - self.defaultTarget = 'komobranch' - else: - self.defaultTarget = 'gitHEAD' + self.svnTargets['gitHEAD'] = '[git]kde:kdelibs|KDE/4.6|' + self.shortDescription = "The KDE Library" + self.defaultTarget = 'gitHEAD' def setDependencies( self ): @@ -18,10 +15,9 @@ class subinfo(info.infoclass): self.dependencies['kdesupport/kdewin'] = 'default' self.dependencies['kdesupport/phonon'] = 'default' self.dependencies['kdesupport/attica'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['kdesupport/dbusmenu-qt'] = 'default' - self.dependencies['kdesupport/qca'] = 'default' - self.dependencies['kdesupport/qimageblitz'] = 'default' + self.dependencies['kdesupport/dbusmenu-qt'] = 'default' + self.dependencies['kdesupport/qca'] = 'default' + self.dependencies['kdesupport/qimageblitz'] = 'default' self.dependencies['kdesupport/soprano'] = 'default' self.dependencies['kdesupport/strigi'] = 'default' self.dependencies['virtual/kdelibs-base'] = 'default' @@ -47,32 +43,7 @@ class Package(CMakePackageBase): elif self.compiler() == "msvc2010": self.subinfo.options.configure.defines = " -DKDE_DISTRIBUTION_TEXT=\"MS Visual Studio 2010\" " - qmake = os.path.join(self.mergeDestinationDir(), "bin", "qmake.exe") - if not os.path.exists(qmake): - utils.warning("could not find qmake in <%s>" % qmake) - ## \todo a standardized way to check if a package is installed in the image dir would be good. - self.subinfo.options.configure.defines += " -DQT_QMAKE_EXECUTABLE:FILEPATH=%s " \ - % qmake.replace('\\', '/') - - self.subinfo.options.configure.defines += "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - - if emergePlatform.isCrossCompilingEnabled(): - self.subinfo.options.configure.defines += \ - "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=ON " - else: - self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " - if self.isHostBuild(): - self.subinfo.options.configure.defines += "-DBUILD_kdoctools=ON " - if self.isTargetBuild(): - self.subinfo.options.configure.defines += \ - "-DKDE_PLATFORM_PROFILE=Mobile "\ - "-DBUILD_kutils=ON "\ - "-DBUILD_kross=ON "\ - "-DBUILD_interfaces=ON " \ - "-DBUILD_sonnet=ON " \ - "-DKDECORE_INPROCESS_SSLD=ON " \ - "-DKDELIBS_USE_FAKE_WALLET=ON " + self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " def install( self ): if not CMakePackageBase.install( self ): diff --git a/portage/kde/kdemultimedia/kdemultimedia-20080202.py b/portage/kde/kdemultimedia/kdemultimedia-20080202.py index e7089d4..667bbcb 100644 --- a/portage/kde/kdemultimedia/kdemultimedia-20080202.py +++ b/portage/kde/kdemultimedia/kdemultimedia-20080202.py @@ -2,14 +2,19 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdemultimedia' + self.svnTargets['svnHEAD'] = 'branches/KDE/4.6/kdemultimedia' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdemultimedia-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdemultimedia-4.6.' + ver self.defaultTarget = 'svnHEAD' def setDependencies( self ): + self.runtimeDependencies['kde/kde-runtime'] = 'default' self.dependencies['kde/kdelibs'] = 'default' self.dependencies['win32libs-bin/taglib'] = 'default' self.dependencies['win32libs-bin/libogg'] = 'default' self.dependencies['win32libs-bin/libvorbis'] = 'default' + self.shortDescription = "KDE multimedia applications (jux, kmix, kmixctrl, kscd)" from Package.CMakePackageBase import * diff --git a/portage/kde/kdenetwork/kdenetwork-20080202.py b/portage/kde/kdenetwork/kdenetwork-20080202.py index 2bbb997..f2e1044 100644 --- a/portage/kde/kdenetwork/kdenetwork-20080202.py +++ b/portage/kde/kdenetwork/kdenetwork-20080202.py @@ -3,7 +3,10 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdenetwork' + self.svnTargets['svnHEAD'] = 'branches/KDE/4.6/kdenetwork' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdenetwork-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdenetwork-4.6.' + ver self.defaultTarget = 'svnHEAD' def setDependencies( self ): @@ -15,6 +18,7 @@ class subinfo(info.infoclass): #mingw already contains libgmp if not compiler.isMinGW(): self.dependencies['win32libs-bin/libgmp'] = 'default' + self.shortDescription = "KDE Networking applications (Kopete, KGet)" from Package.CMakePackageBase import * diff --git a/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py b/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py index 6bb36bd..661b0ba 100644 --- a/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py +++ b/portage/kde/kdepim-runtime/kdepim-runtime-20101222.py @@ -2,18 +2,15 @@ import info class subinfo( info.infoclass ): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdepim-runtime' + self.svnTargets['gitHEAD'] = '[git]kde:kdepim-runtime|4.6|' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['kde/kde-runtime'] = 'default' - else: - self.dependencies['kdesupport/oxygen-icons'] = 'default' + self.dependencies['kde/kde-runtime'] = 'default' self.dependencies['kde/kdepimlibs'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['kdesupport/grantlee'] = 'default' + self.dependencies['kdesupport/grantlee'] = 'default' self.dependencies['win32libs-bin/sqlite'] = 'default' + self.shortDescription = "Extends the functionality of kdepim" def setBuildOptions( self ): self.disableHostBuild = True @@ -26,34 +23,9 @@ class Package( CMakePackageBase ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "-DKLEO_SYNCHRONOUS_API_HOTFIX=ON " - - if emergePlatform.isCrossCompilingEnabled(): - self.subinfo.options.configure.defines += "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE " - self.subinfo.options.configure.defines += " -DKDEPIM_MOBILE_UI=TRUE " - self.subinfo.options.configure.defines += " -DBUILD_mobile=ON -DBUILD_messagecomposer=ON -DBUILD_runtime=ON -DBUILD_strigi-analyzer=ON " - self.subinfo.options.configure.defines += " -DMESSAGEVIEWER_NO_WEBKIT=ON " - self.subinfo.options.configure.defines += " -DTEMPLATEPARSER_NO_WEBKIT=ON " - #self.subinfo.options.configure.defines += " -DIMAPRESOURCE_NO_SOLID=ON " - self.subinfo.options.configure.defines += " -DRUNTIME_PLUGINS_STATIC=ON " - self.subinfo.options.configure.defines += " -DKDEQMLPLUGIN_STATIC=ON " - self.subinfo.options.configure.defines += " -DACCOUNTWIZARD_NO_GHNS=ON " - self.subinfo.options.configure.defines += " -DBUILD_kmail=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_NO_NEPOMUK=ON " - self.subinfo.options.configure.defines += " -DKDE4_BUILD_TESTS=OFF " - self.subinfo.options.configure.defines += " -DBUILD_kleopatra=ON " - self.subinfo.options.configure.defines += " -DBUILD_korganizer=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_ENTERPRISE_BUILD=ON " - self.subinfo.options.configure.defines += " -DKORGAC_AKONADI_AGENT=ON " - self.subinfo.options.configure.defines += " -DBUILD_NEW_MAIL_NOTIFIER_AGENT=ON " - self.subinfo.options.configure.defines += " -DAKONADI_USE_STRIGI_SEARCH=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_INPROCESS_LDAP=ON " - else: - self.subinfo.options.configure.defines += " -DKDEPIM_BUILD_MOBILE=FALSE " + self.subinfo.options.configure.defines += " -DKDEPIM_BUILD_MOBILE=FALSE " self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " - self.subinfo.options.configure.defines += "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - def install( self ): if not CMakePackageBase.install( self ): return False diff --git a/portage/kde/kdepim/kdepim-20080202.py b/portage/kde/kdepim/kdepim-20080202.py index d31ed73..87c8154 100644 --- a/portage/kde/kdepim/kdepim-20080202.py +++ b/portage/kde/kdepim/kdepim-20080202.py @@ -2,93 +2,28 @@ import info class subinfo( info.infoclass ): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdepim' + self.svnTargets['gitHEAD'] = '[git]kde:kdepim|4.6|' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdepim-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdepim-4.6.' + ver self.defaultTarget = 'gitHEAD' def setDependencies( self ): - if not emergePlatform.isCrossCompilingEnabled(): - self.runtimeDependencies['kde/kde-runtime'] = 'default' - self.runtimeDependencies['kde/kdepim-runtime'] = 'default' - else: - self.dependencies['kdesupport/oxygen-icons'] = 'default' + self.runtimeDependencies['kde/kdepim-runtime'] = 'default' self.dependencies['kde/kdepimlibs'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['kdesupport/grantlee'] = 'default' + self.dependencies['kdesupport/grantlee'] = 'default' self.dependencies['win32libs-bin/sqlite'] = 'default' - - def setBuildOptions( self ): - self.disableHostBuild = True - self.disableTargetBuild = False + self.shortDescription = "KDE's Personal Information Management suite" + from Package.CMakePackageBase import * - + class Package( CMakePackageBase ): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) - - # save and then overwrite our checkoutDir function - self.baseCheckoutDir = self.source.checkoutDir - self.source.checkoutDir = self.checkoutDir - - self.subDir = False - self.subinfo.options.configure.defines = "-DKLEO_SYNCHRONOUS_API_HOTFIX=ON " - - if emergePlatform.isCrossCompilingEnabled(): - self.subinfo.options.configure.defines += "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE " - self.subinfo.options.configure.defines += " -DKDEPIM_MOBILE_UI=TRUE " - self.subinfo.options.configure.defines += " -DBUILD_mobile=ON -DBUILD_messagecomposer=ON -DBUILD_runtime=ON -DBUILD_strigi-analyzer=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_NO_WEBKIT=ON " - #self.subinfo.options.configure.defines += " -DIMAPRESOURCE_NO_SOLID=ON " - self.subinfo.options.configure.defines += " -DRUNTIME_PLUGINS_STATIC=ON " - self.subinfo.options.configure.defines += " -DKDEQMLPLUGIN_STATIC=ON " - self.subinfo.options.configure.defines += " -DACCOUNTWIZARD_NO_GHNS=ON " - self.subinfo.options.configure.defines += " -DBUILD_kmail=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_NO_NEPOMUK=ON " - self.subinfo.options.configure.defines += " -DKDE4_BUILD_TESTS=OFF " - self.subinfo.options.configure.defines += " -DBUILD_kleopatra=ON " - self.subinfo.options.configure.defines += " -DBUILD_korganizer=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_ENTERPRISE_BUILD=ON " - self.subinfo.options.configure.defines += " -DKORGAC_AKONADI_AGENT=ON " - self.subinfo.options.configure.defines += " -DBUILD_NEW_MAIL_NOTIFIER_AGENT=ON " - self.subinfo.options.configure.defines += " -DKDEPIM_INPROCESS_LDAP=ON " - self.subinfo.options.configure.defines += " -DKLEO_STATIC_KCMODULES=ON " - else: - self.subinfo.options.configure.defines += " -DKDEPIM_BUILD_MOBILE=FALSE " - self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " - - self.subinfo.options.configure.defines += "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - - - def checkoutDir( self, index=0 ): - if self.subDir: - # checkout into subdirectory "runtime" - return os.path.join( self.baseCheckoutDir( index ), "runtime" ) - return self.baseCheckoutDir( index ) - - def fetch( self ): - ret = CMakePackageBase.fetch( self ) - if ret and emergePlatform.isCrossCompilingEnabled(): - self.subDir = True - ret = CMakePackageBase.fetch( self, "[git]kde:kdepim-runtime" ) - return ret - - def qmerge( self ): - ret = CMakePackageBase.qmerge(self) - if self.isTargetBuild(): - mime_update = os.path.join(ROOTDIR, "bin", - "update-mime-database.exe") - if os.path.isfile(mime_update): - target_mimedb = os.path.join(ROOTDIR, self.buildPlatform(), - "share", "mime") - utils.debug("calling update-mime-database: on %s " %\ - target_mimedb, 1) - cmd = "%s %s" % (mime_update, target_mimedb) - return utils.system(cmd) - return ret - + self.subinfo.options.configure.defines += " -DKDEPIM_BUILD_MOBILE=FALSE " if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdepimlibs/kdepimlibs-20080202.py b/portage/kde/kdepimlibs/kdepimlibs-20080202.py deleted file mode 100644 index 2cc59f3..0000000 --- a/portage/kde/kdepimlibs/kdepimlibs-20080202.py +++ /dev/null @@ -1,45 +0,0 @@ -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdepimlibs' - for ver in ['80', '83', '85']: - self.targets['4.0.' + ver] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.' + ver + '/src/kdepimlibs-4.0.' + ver + '.tar.bz2' - self.targetInstSrc['4.0.' + ver] = 'kdepimlibs-4.0.' + ver - self.defaultTarget = 'gitHEAD' - - def setDependencies( self ): - self.dependencies['kde/kdelibs'] = 'default' - self.dependencies['kdesupport/akonadi'] = 'default' - self.dependencies['win32libs-bin/cyrus-sasl'] = 'default' - self.dependencies['win32libs-bin/libical'] = 'default' - self.dependencies['win32libs-bin/boost'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['win32libs-bin/gpgme'] = 'default' - else: - self.dependencies['contributed/gpg4win-dev'] = 'default' - - def setBuildOptions( self ): - self.disableHostBuild = True - self.disableTargetBuild = False - -from Package.CMakePackageBase import * - -class Package(CMakePackageBase): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - self.boost = portage.getPackageInstance('win32libs-bin','boost') - path = self.boost.installDir() - os.putenv( "BOOST_ROOT", path ) - - self.subinfo.options.configure.defines = "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - - if emergePlatform.isCrossCompilingEnabled(): - if self.isTargetBuild(): - self.subinfo.options.configure.defines += "-DKDEPIM_NO_KRESOURCES=ON -DMAILTRANSPORT_INPROCESS_SMTP=ON " - self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " - -if __name__ == '__main__': - Package().execute() diff --git a/portage/kde/kdepimlibs/kdepimlibs-20110129.py b/portage/kde/kdepimlibs/kdepimlibs-20110129.py index 2cc59f3..436fa67 100644 --- a/portage/kde/kdepimlibs/kdepimlibs-20110129.py +++ b/portage/kde/kdepimlibs/kdepimlibs-20110129.py @@ -2,10 +2,10 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdepimlibs' - for ver in ['80', '83', '85']: - self.targets['4.0.' + ver] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.' + ver + '/src/kdepimlibs-4.0.' + ver + '.tar.bz2' - self.targetInstSrc['4.0.' + ver] = 'kdepimlibs-4.0.' + ver + self.svnTargets['gitHEAD'] = '[git]kde:kdepimlibs|4.6|' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdepimlibs-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdepimlibs-4.6.' + ver self.defaultTarget = 'gitHEAD' def setDependencies( self ): @@ -14,10 +14,9 @@ class subinfo(info.infoclass): self.dependencies['win32libs-bin/cyrus-sasl'] = 'default' self.dependencies['win32libs-bin/libical'] = 'default' self.dependencies['win32libs-bin/boost'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['win32libs-bin/gpgme'] = 'default' - else: - self.dependencies['contributed/gpg4win-dev'] = 'default' + self.dependencies['win32libs-bin/gpgme'] = 'default' + self.shortDescription = "the base libraries for PIM related services" + def setBuildOptions( self ): self.disableHostBuild = True @@ -33,12 +32,6 @@ class Package(CMakePackageBase): path = self.boost.installDir() os.putenv( "BOOST_ROOT", path ) - self.subinfo.options.configure.defines = "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - - if emergePlatform.isCrossCompilingEnabled(): - if self.isTargetBuild(): - self.subinfo.options.configure.defines += "-DKDEPIM_NO_KRESOURCES=ON -DMAILTRANSPORT_INPROCESS_SMTP=ON " self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " if __name__ == '__main__': diff --git a/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py b/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py index 8bff2a3..49caa20 100644 --- a/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py +++ b/portage/kde/kdeplasma-addons/kdeplasma-addons-20080717.py @@ -2,12 +2,13 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdeplasma-addons' + self.svnTargets['gitHEAD'] = '[git]kde:kdeplasma-addons|4.6|' 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 * diff --git a/portage/kde/kdesdk/kdesdk-20080202.py b/portage/kde/kdesdk/kdesdk-20080202.py index 670df52..c70832c 100644 --- a/portage/kde/kdesdk/kdesdk-20080202.py +++ b/portage/kde/kdesdk/kdesdk-20080202.py @@ -3,13 +3,17 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdesdk' + self.svnTargets['svnHEAD'] = 'branches/KDE/4.6/kdesdk' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdesdk-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdesdk-4.6.' + ver self.defaultTarget = 'svnHEAD' def setDependencies( self ): self.dependencies['kde/kde-baseapps'] = 'default' self.dependencies['win32libs-bin/boost'] = 'default' self.dependencies['dev-util/zip'] = 'default' + self.shortDescription = "KDE software development package (umbrello, okteta)" from Package.CMakePackageBase import * @@ -18,21 +22,6 @@ class Package(CMakePackageBase): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "-DBUILD_doc=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kate=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kapptemplate=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kbugbuster=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kcachegrind=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kdeaccounts-plugin=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kdepalettes=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_strigi-analyzer=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kioslave=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kmtrace=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kprofilemethod=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_kuiviewer=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_poxml=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_scripts=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_umbrello=OFF " - # self.subinfo.options.configure.defines += "-DBUILD_doc=OFF " if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdetoys/kdetoys-20080202.py b/portage/kde/kdetoys/kdetoys-20080202.py index 43734c2..6a25847 100644 --- a/portage/kde/kdetoys/kdetoys-20080202.py +++ b/portage/kde/kdetoys/kdetoys-20080202.py @@ -2,7 +2,10 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdetoys' + self.svnTargets['svnHEAD'] = 'branches/KDE/4.6/kdetoys' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdetoys-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdesdk-4.6.' + ver self.defaultTarget = 'svnHEAD' def setDependencies( self ): diff --git a/portage/kde/kdeutils/kdeutils-20080202.py b/portage/kde/kdeutils/kdeutils-20080202.py index 6e64421..78663d1 100644 --- a/portage/kde/kdeutils/kdeutils-20080202.py +++ b/portage/kde/kdeutils/kdeutils-20080202.py @@ -3,7 +3,10 @@ import compiler class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdeutils' + self.svnTargets['svnHEAD'] = 'branches/KDE/4.6/kdeutils' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.6.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.6.' + ver + '/src/kdeutils-4.6.' + ver + '.tar.bz2' + self.targetInstSrc['4.6.' + ver] = 'kdeutils-4.6.' + ver self.defaultTarget = 'svnHEAD' def setDependencies( self ): diff --git a/portage/kde/kdewebdev/kdewebdev-20080202.py b/portage/kde/kdewebdev/kdewebdev-20080202.py deleted file mode 100644 index 66bc738..0000000 --- a/portage/kde/kdewebdev/kdewebdev-20080202.py +++ /dev/null @@ -1,27 +0,0 @@ -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdewebdev' - self.defaultTarget = 'svnHEAD' - - def setDependencies( self ): - self.dependencies['kde/kdelibs'] = 'default' - self.dependencies['kde/kdepimlibs'] = 'default' - self.dependencies['kde/kde-runtime'] = 'default' - self.softDependencies['kde/kdevplatform'] = 'default' - -from Package.CMakePackageBase import * - -class Package(CMakePackageBase): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - # if you want to build quanta, you need to build kdevplatform as well - this is not build by default!!! - self.subinfo.options.configure.defines = "" - self.subinfo.options.configure.defines += "-DBUILD_kfilereplace=OFF " - self.subinfo.options.configure.defines += "-DBUILD_kxsldbg=OFF " - self.subinfo.options.configure.defines += "-DBUILD_kommander=OFF " - -if __name__ == '__main__': - Package().execute() diff --git a/portage/kde/kdewebdev/post-install-bin.cmd b/portage/kde/kdewebdev/post-install-bin.cmd deleted file mode 100644 index ceef18b..0000000 --- a/portage/kde/kdewebdev/post-install-bin.cmd +++ /dev/null @@ -1,33 +0,0 @@ -@echo off - -echo ******************************************************************************* -echo package: %0 -echo ******************************************************************************* - -set quitnow=False -::for %%i in ( kioslave.exe kded4.exe ) DO ( -:: tasklist /NH /FI "IMAGENAME eq %%i" | find "%%i" > "Nul" && ( -:: echo error: found %%i running. please kill this process! -:: set quitnow=True -:: ) -::) - -if %quitnow% equ True ( - echo error: one or more programs are running that shouldn't run. - echo please close them before restarting this script - goto :eof -) - -if not `"bin\update-mime-database.exe --help"` equ "" ( - bin\update-mime-database "%CD%\share\mime" -) else ( - echo error: update-mime-database wasn't found. - echo please check for correct installation -) - -if not `"bin\kbuildsycoca4.exe --help"` equ "" ( - bin\kbuildsycoca4 --noincremental -) else ( - echo error: kbuildsycoca4 wasn't found. - echo please check for correct installation -) \ No newline at end of file