diff --git a/portage/kdesupport/kdewin-installer-static/kdewin-installer-static-0.9.2.py b/portage/kdesupport/kdewin-installer-static/kdewin-installer-static-0.9.2.py index 2543b97f4..45e56f5f1 100644 --- a/portage/kdesupport/kdewin-installer-static/kdewin-installer-static-0.9.2.py +++ b/portage/kdesupport/kdewin-installer-static/kdewin-installer-static-0.9.2.py @@ -1,45 +1,38 @@ import base -import utils -from utils import die import os import sys import info -#DEPEND = """ -#virtual/base -#libs/qt -#""" - class subinfo(info.infoclass): def setDependencies( self ): self.hardDependencies['virtual/base'] = 'default' self.hardDependencies['libs/qt-static'] = 'default' self.hardDependencies['dev-util/upx'] = 'default' def setTargets( self ): self.svnTargets['svnHEAD'] = 'trunk/kdesupport/kdewin-installer' self.defaultTarget = 'svnHEAD' class subclass(base.baseclass): - def __init__(self): - base.baseclass.__init__( self, "" ) + def __init__(self, **args): + base.baseclass.__init__( self, args=args ) self.instsrcdir = "kdewin-installer" self.buildType = "Release" self.subinfo = subinfo() def unpack( self ): return self.kdeSvnUnpack() def compile( self ): + self.kdeCustomDefines = "-DQT_QMAKE_EXECUTABLE:FILEPATH=%s" \ + % os.path.join(self.rootdir, "qt-static", "bin", "qmake.exe").replace('\\', '/') return self.kdeCompile() def install( self ): return self.kdeInstall() def make_package( self ): - if self.traditional: - self.instdestdir = "kde" return self.doPackaging( "kdewin-installer", os.path.basename(sys.argv[0]).replace("kdewin-installer-", "").replace(".py", ""), True ) if __name__ == '__main__': - subclass().execute() \ No newline at end of file + subclass().execute() diff --git a/portage/libs/qt-static/qt-static-4.3.0.py b/portage/libs/qt-static/qt-static-4.3.2.py similarity index 83% rename from portage/libs/qt-static/qt-static-4.3.0.py rename to portage/libs/qt-static/qt-static-4.3.2.py index 4c4aa5bc8..383d6e467 100644 --- a/portage/libs/qt-static/qt-static-4.3.0.py +++ b/portage/libs/qt-static/qt-static-4.3.2.py @@ -1,28 +1,27 @@ import base import os import info SRC_URI= """ http://www.winkde.org/pub/kde/ports/win32/repository/other/qt-static-msvc-4.3.2-bin.zip http://www.winkde.org/pub/kde/ports/win32/repository/other/qt-static-msvc-4.3.2-lib.zip http://www.winkde.org/pub/kde/ports/win32/repository/other/qt-static-msvc-4.3.2-doc.zip """ class subinfo(info.infoclass): def setTargets( self ): self.targets['4.3.2'] = SRC_URI self.defaultTarget = '4.3.2' class subclass(base.baseclass): - def __init__(self): - base.baseclass.__init__( self, SRC_URI ) - if self.traditional: - self.instdestdir = "qt" + def __init__(self, **args): + base.baseclass.__init__( self, args=args ) + self.instdestdir = "qt-static" self.subinfo = subinfo() def unpack(self): res = base.baseclass.unpack( self ) return res if __name__ == '__main__': subclass().execute()