[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] portage: simplify complex packages code
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-09-23 22:11:06
Message-ID: E1ZesFm-0008Cy-3V () scm ! kde ! org
[Download RAW message or body]

Git commit 8791f011a3286f28ce0a5b49f55de09538403313 by Patrick Spendrin.
Committed on 23/09/2015 at 22:10.
Pushed by sengels into branch 'master'.

simplify complex packages code

M  +4    -9    portage/testing/pgsql-src/pgsql-src.py
M  +3    -8    portage/win32libs/icu/icu.py
M  +3    -7    portage/win32libs/openssl/openssl.py
M  +2    -6    portage/win32libs/xerces-c/xerces-c.py

http://commits.kde.org/emerge/8791f011a3286f28ce0a5b49f55de09538403313

diff --git a/portage/testing/pgsql-src/pgsql-src.py b/portage/testing/pgsql-src/pgsql-src.py
index 96757aa..daa84e5 100644
--- a/portage/testing/pgsql-src/pgsql-src.py
+++ b/portage/testing/pgsql-src/pgsql-src.py
@@ -35,7 +35,7 @@ class PackageMSVC( CMakePackageBase ):
     def compile( self ):
         self.enterSourceDir()
         os.chdir( r"src\tools\msvc" )
-        
+
         # write the local config file which includes all the paths to the libraries
         f = open( "config.pl", "wb+" )
         f.write( """# configuration written by emerge\n"""
@@ -65,13 +65,8 @@ class PackageMSys( AutoToolsPackageBase ):
 
 #        self.buildInSource=True
 
-      
+
 if compiler.isMinGW():
-    class Package( PackageMSys ):
-        def __init__( self ):
-            PackageMSys.__init__( self )
+    class Package( PackageMSys ): pass
 else:
-    class Package( PackageMSVC ):
-        def __init__( self ):
-            PackageMSVC.__init__( self )
-            
+    class Package( PackageMSVC ): pass
diff --git a/portage/win32libs/icu/icu.py b/portage/win32libs/icu/icu.py
index 7fb7ed0..f498dda 100644
--- a/portage/win32libs/icu/icu.py
+++ b/portage/win32libs/icu/icu.py
@@ -19,7 +19,6 @@ class subinfo(info.infoclass):
         if compiler.isMSVC2015() or compiler.isMinGW():
             self.patchToApply['55.1'] = ("icu-20150414.diff", 1)
             self.defaultTarget = '55.1'
-            
 
     def setDependencies( self ):
         self.buildDependencies['virtual/base'] = 'default'
@@ -47,7 +46,7 @@ class PackageCMake(CMakePackageBase):
             toolsetSwitches = "/property:PlatformToolset=v110"
         elif compiler.isMSVC2013():
             toolsetSwitches = "/tv:12.0 /property:PlatformToolset=v120"
-          
+
         return utils.system("msbuild /t:Rebuild \"%s\" /p:Configuration=%s %s" %
                 (os.path.join(self.sourceDir(), "allinone", "allinone.sln"), bt, toolsetSwitches)
         )
@@ -84,11 +83,7 @@ class PackageMSys(AutoToolsPackageBase):
         return True
 
 if compiler.isMinGW():
-    class Package(PackageMSys):
-        def __init__( self ):
-            PackageMSys.__init__( self )
+    class Package(PackageMSys): pass
 else:
-    class Package(PackageCMake):
-        def __init__( self ):
-            PackageCMake.__init__( self )
+    class Package(PackageCMake): pass
 
diff --git a/portage/win32libs/openssl/openssl.py b/portage/win32libs/openssl/openssl.py
index 35a0a58..3a8f10c 100644
--- a/portage/win32libs/openssl/openssl.py
+++ b/portage/win32libs/openssl/openssl.py
@@ -138,7 +138,7 @@ class PackageMSys(AutoToolsPackageBase):
     def make(self, dummyBuildType=None):
         return self.shell.execute(self.sourceDir(), self.makeProgram, "depend") and \
                AutoToolsPackageBase.make(self, dummyBuildType)
-        
+
     def install(self):
         self.enterSourceDir()
         self.shell.execute(self.sourceDir(), self.makeProgram,
@@ -154,10 +154,6 @@ class PackageMSys(AutoToolsPackageBase):
 
 
 if compiler.isMinGW():
-    class Package(PackageMSys):
-        def __init__(self):
-            PackageMSys.__init__(self)
+    class Package(PackageMSys): pass
 else:
-    class Package(PackageCMake):
-        def __init__(self):
-            PackageCMake.__init__(self)
+    class Package(PackageCMake): pass
diff --git a/portage/win32libs/xerces-c/xerces-c.py b/portage/win32libs/xerces-c/xerces-c.py
index 6da1826..7770548 100644
--- a/portage/win32libs/xerces-c/xerces-c.py
+++ b/portage/win32libs/xerces-c/xerces-c.py
@@ -25,12 +25,8 @@ class PackageMSys(AutoToolsPackageBase):
 
 
 if compiler.isMinGW():
-    class Package(PackageMSys):
-        def __init__( self ):
-            PackageMSys.__init__( self )
+    class Package(PackageMSys): pass
 else:
-    class Package(VirtualPackageBase):
-        def __init__( self ):
-            VirtualPackageBase.__init__( self )
+    class Package(VirtualPackageBase): pass
             
 

[prev in list] [next in list] [prev in thread] [next in thread]