SVN commit 1005398 by habacker: migrated to refactored emerge M +9 -14 astyle/astyle-1.22.py M +11 -9 cmake/cmake-2.6.4.py M +5 -11 doxygen/doxygen-1.5.9.py M +8 -6 gettext-tools/gettext-tools-0.17-1.py M +5 -16 git/git-1.6.2.2.py M +8 -5 md5sums/md5sums-20080511.py M +16 -25 mingw/mingw-3.4.5.py M +3 -14 msys/msys-1.11.py M +3 -9 perl/perl-5.10.0.1004.py M +17 -13 ruby/ruby-1.8.6.py --- trunk/kdesupport/emerge/portage/dev-util/astyle/astyle-1.22.py #1005397:1005398 @@ -1,22 +1,17 @@ -import base -import os import info -SRC_URI= "http://www.winkde.org/pub/kde/ports/win32/repository/other/astyle-1.22-bin.zip" - class subinfo(info.infoclass): def setTargets( self ): - self.targets['1.22'] = SRC_URI + self.targets['1.22'] = "http://www.winkde.org/pub/kde/ports/win32/repository/other/astyle-1.22-bin.zip" + self.targetMergePath['1.22'] = "dev-utils"; self.defaultTarget = '1.22' - -class subclass(base.baseclass): - def __init__(self): - base.baseclass.__init__( self, SRC_URI ) - self.subinfo = subinfo() - def unpack(self): - res = base.baseclass.unpack( self ) - return res +from Package.BinaryPackageBase import * +class Package(BinaryPackageBase): + def __init__( self): + self.subinfo = subinfo() + BinaryPackageBase.__init__(self) + if __name__ == '__main__': - subclass().execute() + Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/cmake/cmake-2.6.4.py #1005397:1005398 @@ -1,19 +1,21 @@ -import base import info class subinfo( info.infoclass ): def setTargets( self ): self.targets['2.4.8'] = 'http://www.cmake.org/files/v2.4/cmake-2.4.8-win32-x86.zip' self.targets['2.6.4'] = 'http://www.cmake.org/files/v2.6/cmake-2.6.4-win32-x86.zip' - self.targetInstSrc['2.4.8'] = 'cmake-2.4.8-win32-x86' - self.targetInstSrc['2.6.4'] = 'cmake-2.6.4-win32-x86' + self.targetMergeSourcePath['2.4.8'] = 'cmake-2.4.8-win32-x86' + self.targetMergePath['2.4.8'] = 'dev-utils' self.defaultTarget = '2.6.4' + self.targetMergeSourcePath['2.6.4'] = 'cmake-2.6.4-win32-x86' + self.targetMergePath['2.6.4'] = 'dev-utils' -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.instdestdir = "dev-utils" - self.subinfo = subinfo() +from Package.BinaryPackageBase import * +class Package(BinaryPackageBase): + def __init__( self): + self.subinfo = subinfo() + BinaryPackageBase.__init__(self) + if __name__ == '__main__': - subclass().execute() + Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/doxygen/doxygen-1.5.9.py #1005397:1005398 @@ -1,10 +1,5 @@ -import base import info -from Source.MultiSource import * -from BuildSystem.BinaryBuildSystem import * -from Package.PackageBase import * - class subinfo( info.infoclass ): def setTargets( self ): self.targets['1.5.9'] = 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.5.9.windows.bin.zip' @@ -15,14 +10,13 @@ # merge the package into the dev-utils tree # This attribute is in prelimary state self.targetMergePath['1.5.9'] = "dev-utils"; - -class Package(PackageBase, MultiSource, BinaryBuildSystem): + +from Package.BinaryPackageBase import * + +class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() - PackageBase.__init__(self) - MultiSource.__init__(self) - BinaryBuildSystem.__init__(self) - # no packager required + BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/gettext-tools/gettext-tools-0.17-1.py #1005397:1005398 @@ -1,18 +1,20 @@ -import base import info class subinfo(info.infoclass): def setTargets( self ): self.targets['0.17'] = 'http://winkde.org/pub/kde/ports/win32/repository/win32libs/gettext-tools-0.17-bin.tar.bz2' self.defaultTarget = '0.17' + self.targetMergePath['0.17'] = "dev-utils"; + def setDependencies( self ): self.hardDependencies['win32libs-bin/gettext'] = 'default' -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, "" ) - self.instdestdir = "dev-utils" +from Package.BinaryPackageBase import * + +class Package(BinaryPackageBase): + def __init__( self): self.subinfo = subinfo() + BinaryPackageBase.__init__(self) if __name__ == '__main__': - subclass().execute() + Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/git/git-1.6.2.2.py #1005397:1005398 @@ -1,33 +1,22 @@ # -*- coding: utf-8 -*- -import base import info -SRC_URI= """ -http://winkde.org/pub/kde/ports/win32/repository/other/Git-1.6.3-preview20090507-2.tar.bz2 -""" - class subinfo(info.infoclass): def setTargets( self ): - self.targets['1.6.3'] = SRC_URI + self.targets['1.6.3'] = "http://winkde.org/pub/kde/ports/win32/repository/other/Git-1.6.3-preview20090507-2.tar.bz2" self.targetInstSrc['1.6.3'] = "" - self.targetMergePath['1.6.3'] = "git"; + self.targetMergePath['1.6.3'] = "dev-utils/git"; self.defaultTarget = '1.6.3' def setDependencies( self ): self.hardDependencies['dev-util/msys'] = 'default' +from Package.BinaryPackageBase import * -from Source.ArchiveSource import * -from BuildSystem.BinaryBuildSystem import * -from Package.PackageBase import * - -class Package(PackageBase, ArchiveSource, BinaryBuildSystem): +class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() - PackageBase.__init__(self) - ArchiveSource.__init__(self) - BinaryBuildSystem.__init__(self) - # no packager required + BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/md5sums/md5sums-20080511.py #1005397:1005398 @@ -5,11 +5,14 @@ def setTargets( self ): self.targets['20080511'] = "http://www.winkde.org/pub/kde/ports/win32/repository/other/md5sums-20080511-bin.zip" self.defaultTarget = '20080511' + self.targetMergePath['20080511'] = "dev-utils"; -class subclass(base.baseclass): - def __init__(self, **args ): - base.baseclass.__init__( self, args=args ) - self.subinfo = subinfo() +from Package.BinaryPackageBase import * +class Package(BinaryPackageBase): + def __init__( self): + self.subinfo = subinfo() + BinaryPackageBase.__init__(self) + if __name__ == '__main__': - subclass().execute() + Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/mingw/mingw-3.4.5.py #1005397:1005398 @@ -1,4 +1,3 @@ -import base import utils import shutil import os @@ -29,39 +28,31 @@ class subinfo(info.infoclass): def setTargets( self ): self.targets['3.4.5'] = SRC_URI + self.targetMergePath['3.4.5'] = "mingw"; self.defaultTarget = '3.4.5' def setDependencies( self ): self.hardDependencies['gnuwin32/wget'] = 'default' self.hardDependencies['gnuwin32/patch'] = 'default' -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, SRC_URI, args=args ) - self.instdestdir = "mingw" +from Package.BinaryPackageBase import * + +class Package(BinaryPackageBase): + def __init__( self): self.subinfo = subinfo() - - def unpack( self ): - base.baseclass.unpack( self ) - srcdir = self.workdir - #this patch breaks qt build! - #cmd = "cd %s && patch -p1 < %s" % \ - # ( srcdir, os.path.join( self.packagedir, "windef.diff" ) ) - #self.system( cmd ) - #this patch fails - #cmd = "cd %s && patch -p1 < %s" % \ - # ( srcdir, os.path.join( self.packagedir, "vmr9.diff" ) ) - #self.system( cmd ) - return True + BinaryPackageBase.__init__(self) + +if __name__ == '__main__': + Package().execute() def install( self ): - base.baseclass.install( self ) - srcdir = os.path.join( self.imagedir, self.instdestdir, "bin", "mingwm10.dll" ) - destdir = os.path.join( self.imagedir, "bin" ) - if not os.path.exists( destdir ): - os.mkdir( destdir ) - shutil.copy( srcdir, os.path.join( destdir, "mingwm10.dll" ) ) + BinaryPackageBase.install( self ) + #srcdir = os.path.join( self.imagedir, self.instdestdir, "bin", "mingwm10.dll" ) + #destdir = os.path.join( self.imagedir, "bin" ) + #if not os.path.exists( destdir ): + # os.mkdir( destdir ) + #shutil.copy( srcdir, os.path.join( destdir, "mingwm10.dll" ) ) return True if __name__ == '__main__': - subclass().execute() + Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/msys/msys-1.11.py #1005397:1005398 @@ -1,8 +1,3 @@ -# -*- coding: utf-8 -*- -import base -import utils -from utils import die -import os import info SRC_URI = """ @@ -22,18 +17,12 @@ def setDependencies( self ): self.hardDependencies['gnuwin32/wget'] = 'default' -from Source.ArchiveSource import * -from BuildSystem.BinaryBuildSystem import * -from Package.PackageBase import * +from Package.BinaryPackageBase import * -class Package(PackageBase, ArchiveSource, BinaryBuildSystem): +class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() - PackageBase.__init__(self) - ArchiveSource.__init__(self) - BinaryBuildSystem.__init__(self) - # no packager required + BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() - --- trunk/kdesupport/emerge/portage/dev-util/perl/perl-5.10.0.1004.py #1005397:1005398 @@ -1,4 +1,3 @@ -import base import info class subinfo(info.infoclass): @@ -11,17 +10,12 @@ self.targetMergePath['5.10.0'] = "dev-utils"; self.defaultTarget = '5.10.0' -from Package.PackageBase import * -from Source.ArchiveSource import * -from BuildSystem.BinaryBuildSystem import * +from Package.BinaryPackageBase import * -class Package(PackageBase, ArchiveSource, BinaryBuildSystem): +class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() - PackageBase.__init__(self) - ArchiveSource.__init__(self) - BinaryBuildSystem.__init__(self) - # no packager required + BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() --- trunk/kdesupport/emerge/portage/dev-util/ruby/ruby-1.8.6.py #1005397:1005398 @@ -6,19 +6,23 @@ def setTargets( self ): self.targets['1.8.6'] = "ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.6-i386-mswin32.zip" self.defaultTarget = '1.8.6' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.subinfo = subinfo() + self.targetMergePath['1.8.6'] = 'dev-utils' - def unpack(self): - res = base.baseclass.unpack( self ) - # ruby package contains a file called MANIFEST that we need to get - # out of the way so we can make the manifest dir - if res: - os.remove( os.path.join( self.workdir, self.instsrcdir, "MANIFEST" ) ) - return res +from Package.BinaryPackageBase import * +class Package(BinaryPackageBase): + def __init__( self): + self.subinfo = subinfo() + BinaryPackageBase.__init__(self) + + def unpack(self): + res = BinaryPackageBase.unpack( self ) + # ruby package contains a file called MANIFEST that we need to get + # out of the way so we can make the manifest dir + if res: + os.remove( os.path.join( self.installDir(), "MANIFEST" ) ) + return res + if __name__ == '__main__': - subclass().execute() + Package().execute() +