[Uml-devel] kdesupport/emerge/portage
Ralf Habacker
Ralf.Habacker at freenet.de
Mon Apr 12 14:03:30 UTC 2010
SVN commit 1114016 by habacker:
reverted last patch, there were too many unrelated files checked in by accident
_M contributed/dbus4win-src/dbus4win-src-20090527.py
_M dev-util/cmake/cmake-2.8.1.py
_M dev-util/subversion/subversion-1.6.5.20091115.py
_M enterprise4/akonadi-e (directory)
_M enterprise4/akonadi-e/akonadi-e-20090621.py
_M enterprise4/automoc-e (directory)
_M enterprise4/automoc-e/automoc-e-20090619.py
_M enterprise4/dbus4win-src (directory)
_M enterprise4/dbus4win-src/dbus4win-src-20090527.py
_M enterprise4/kdebase-runtime-branch (directory)
_M enterprise4/kdebase-runtime-branch/kdebase-runtime-branch-20090622.py
_M enterprise4/kdelibs-branch (directory)
_M enterprise4/kdelibs-branch/kdelibs-branch-20090618.py
_M enterprise4/kdepim-branch (directory)
_M enterprise4/kdepim-branch/kdepim-branch-20090622.py
_M enterprise4/kdepimlibs-branch (directory)
_M enterprise4/kdepimlibs-branch/kdepimlibs-branch-20090621.py
_M enterprise4/kdewin-e (directory)
_M enterprise4/kdewin-e/kdewin-e-20090621.py
_M enterprise4/l10n-kde4-e (directory)
_M enterprise4/l10n-kde4-e/l10n-kde4-e-20091112.py
_M enterprise4/libxml2-src-e (directory)
_M enterprise4/libxml2-src-e/libxml2-src-e-2.7.3.py
_M enterprise4/pcre-src-e (directory)
_M enterprise4/pcre-src-e/pcre-src-e-20090622.py
_M enterprise4/phonon-e (directory)
_M enterprise4/phonon-e/phonon-e-20090619.py
_M enterprise4/qimageblitz-e (directory)
_M enterprise4/qimageblitz-e/qimageblitz-e-20090619.py
_M enterprise4/qt-e (directory)
_M enterprise4/qt-e/qt-e-4.5.1.20090618.py
_M enterprise4/soprano-e (directory)
_M enterprise4/soprano-e/soprano-e-20090619.py
_M enterprise4/strigi-e (directory)
_M enterprise4/strigi-e/strigi-e-20090619.py
_M enterprise5/soprano-e5/soprano-e5-20100409.py
_M extragear/amarok/amarok-2.1.20090603.py
_M extragear/amarok/post-install-bin.cmd
_M extragear/digikam/post-install-bin.cmd
_M extragear/konversation/konversation-20090215.py
M +0 -1 extragear/krusader/krusader-2.0.0svn.py
_M extragear/ktorrent/ktorrent-20090131.py
_M kde-4.1/kdebase-apps (directory)
_M kde-4.1/kdebase-apps/kdebase-apps-20080202.py
_M kde-4.1/kdebase-runtime (directory)
_M kde-4.1/kdebase-runtime/kdebase-runtime-20080202.py
_M kde-4.1/kdebase-workspace (directory)
_M kde-4.1/kdebase-workspace/kdebase-workspace-20080202.py
_M kde-4.1/kdeedu (directory)
_M kde-4.1/kdeedu/kdeedu-20080202.py
_M kde-4.1/kdegames (directory)
_M kde-4.1/kdegames/kdegames-20080202.py
_M kde-4.1/kdegraphics (directory)
_M kde-4.1/kdegraphics/kdegraphics-20080202.py
_M kde-4.1/kdelibs (directory)
_M kde-4.1/kdelibs/kdelibs-20080202.py
_M kde-4.1/kdenetwork (directory)
_M kde-4.1/kdenetwork/kdenetwork-20080202.py
_M kde-4.1/kdepim (directory)
_M kde-4.1/kdepim/kdepim-20080202.py
_M kde-4.1/kdepimlibs (directory)
_M kde-4.1/kdepimlibs/kdepimlibs-20080202.py
_M kde-4.1/kdesdk (directory)
_M kde-4.1/kdesdk/kdesdk-20080202.py
_M kde-4.1/kdetoys (directory)
_M kde-4.1/kdetoys/kdetoys-20080202.py
_M kde-4.1/kdeutils (directory)
_M kde-4.1/kdeutils/kdeutils-20080202.py
_M kde-4.1/kdewebdev (directory)
_M kde-4.1/kdewebdev/kdewebdev-20080202.py
_M kde-4.1/l10n-kde4 (directory)
_M kde-4.1/l10n-kde4/l10n-kde4-20080320.py
_M kde-4.2 (directory)
_M kde-4.2/kdebase-apps (directory)
_M kde-4.2/kdebase-apps/kdebase-apps-20080202.py
_M kde-4.2/kdebase-runtime (directory)
_M kde-4.2/kdebase-runtime/kdebase-runtime-20080202.py
_M kde-4.2/kdebase-workspace (directory)
_M kde-4.2/kdebase-workspace/kdebase-workspace-20080202.py
_M kde-4.2/kdeedu (directory)
_M kde-4.2/kdeedu/kdeedu-20080202.py
_M kde-4.2/kdegames (directory)
_M kde-4.2/kdegames/kdegames-20080202.py
_M kde-4.2/kdegraphics (directory)
_M kde-4.2/kdegraphics/kdegraphics-20080202.py
_M kde-4.2/kdelibs (directory)
_M kde-4.2/kdelibs/kdelibs-20080202.py
_M kde-4.2/kdenetwork (directory)
_M kde-4.2/kdenetwork/kdenetwork-20080202.py
_M kde-4.2/kdepim (directory)
_M kde-4.2/kdepim/kdepim-20080202.py
_M kde-4.2/kdepimlibs (directory)
_M kde-4.2/kdepimlibs/kdepimlibs-20080202.py
_M kde-4.2/kdesdk (directory)
_M kde-4.2/kdesdk/kdesdk-20080202.py
_M kde-4.2/kdetoys (directory)
_M kde-4.2/kdetoys/kdetoys-20080202.py
_M kde-4.2/kdeutils (directory)
_M kde-4.2/kdeutils/kdeutils-20080202.py
_M kde-4.2/kdewebdev (directory)
_M kde-4.2/kdewebdev/kdewebdev-20080202.py
_M kde-4.2/l10n-kde4 (directory)
_M kde-4.2/l10n-kde4/l10n-kde4-20080320.py
M +6 -7 kde/kde4-l10n/kde4-l10n-20090815.py
_M kde/kdemultimedia (directory)
_M kde/kdeplasma-addons (directory)
_M kdesupport/akonadi/akonadi-1.1.2.20090504.py
_M kdesupport/automoc/automoc-0.9.88.20090122.py
_M kdesupport/eigen2/eigen2-20090504.py
_M kdesupport/kdewin-installer-static/kdewin-installer-static-0.9.6.py
_M kdesupport/kdewin-installer/kdewin-installer-0.9.6.py
_M kdesupport/phonon/phonon-4.3.1.20090227.py
_M kdesupport/qca/qca-2.0.2.20100225.py
_M kdesupport/qimageblitz/qimageblitz-0.0.5.20090108.py
_M kdesupport/soprano/soprano-2.3.71.20100107.py
_M kdesupport/strigi/strigi-0.7.1.20100107.py
_M kdesupport/taglib-extras/taglib-extras-1.0.1-20090921.py
M +28 -25 libs/qt/qt-4.6.2.20100215.py
_M testing/digikam-support/digikam-support-0.2.0.py
_M testing/kdevelop/kdevelop-3.9.91.20090208.py
_M testing/kdevplatform/kdevplatform-3.9.91.20090208.py
_M testing/koffice/koffice-2.1.1.20100122.py
_M testing/libsamplerate (directory)
_M testing/libsamplerate-src (directory)
_M testing/libsamplerate-src/libsamplerate-src-0.1.7.py
_M testing/libsamplerate/libsamplerate-0.1.7.py
_M testing/libspectre-src (directory)
_M testing/libspectre-src/libspectre-src-0.2.1.py
_M testing/marble-qt/marble-qt-0.6.1.py
M +0 -1 testing/mysql-debug/mysql-debug-5.1.36.py
M +0 -1 testing/mysql-embedded/mysql-embedded-5.1.36.py
M +2 -1 testing/mysql-server/mysql-server-5.1.36.py
A testing/mysql-server/mysql-server.xml testing/mysql-server/mysql-server.xml#1114014
_M testing/okular-backends (directory)
_M testing/okular-backends/okular-backends-0.1.0.py
M +0 -1 testing/umbrello/umbrello-20090807.py
_M win32libs-bin/cyrus-sasl (directory)
_M win32libs-bin/sqlite (directory)
MM +0 -1 win32libs-bin/sqlite/sqlite-3.6.2.py
M +1 -1 win32libs-sources/aspell-src/aspell-src-0.60.5.py
_M win32libs-sources/cfitsio-src/cfitsio-src-3.20.py
_M win32libs-sources/chm-src (directory)
_M win32libs-sources/chm-src/chm-src-20081217.py
_M win32libs-sources/cyrus-sasl-src (directory)
_M win32libs-sources/dbus-src/dbus-src-1.2.4.20091122.py
_M win32libs-sources/dbus/dbus-1.2.4.20081023.py
_M win32libs-sources/dbus/dbus-src-1.2.4.20081023.py
_M win32libs-sources/djvu-src (directory)
_M win32libs-sources/exiv2-src (directory)
_M win32libs-sources/exiv2-src/exiv2-0.16-cmake.diff
M +1 -1 win32libs-sources/expat-src/expat-src-2.0.1.py
_M win32libs-sources/gettext-src/gettext-src-0.17-1.py
_M win32libs-sources/libical-src/libical-src-0.44.py
_M win32libs-sources/libmsn-src (directory)
_M win32libs-sources/libpng-src/libpng-src-1.4.1.py
_M win32libs-sources/libzip-src (directory)
_M win32libs-sources/openbabel-src/openbabel-src-2.2.3.py
_M win32libs-sources/pcre-src/pcre-src-8.00.20091115.py
_M win32libs-sources/poppler-src/poppler-src-0.12.4.20100222.py
_M win32libs-sources/shared-mime-info-src/shared-mime-info-src-0.70.20091007.py
--- trunk/kdesupport/emerge/portage/extragear/krusader/krusader-2.0.0svn.py #1114015:1114016
@@ -5,7 +5,6 @@
class subinfo( info.infoclass ):
def setTargets( self ):
self.svnTargets['svnHEAD'] = "trunk/extragear/utils/krusader"
- self.patchToApply['svnHEAD'] = ['krusader-svn.patch',1]
self.targets['2.0.0-beta2'] = 'http://prdownloads.sourceforge.net/krusader/krusader-2.0.0-beta2.tar.gz'
self.targetInstSrc['2.0.0-beta2'] = 'krusader-2.0.0-beta2'
self.patchToApply['2.0.0-beta2'] = ['krusader.patch',1]
--- trunk/kdesupport/emerge/portage/kde/kde4-l10n/kde4-l10n-20090815.py #1114015:1114016
@@ -29,7 +29,7 @@
self.subinfo.options.make.ignoreErrors = True
self.subinfo.options.exitOnErrors = False
# hardcoded for now
- self.subinfo.options.package.version = '4.3.65'
+ #self.subinfo.options.package.version = '4.3.63'
def repositoryPath(self,index=0):
# \todo we cannot use CMakePackageBase here because repositoryPath
@@ -60,8 +60,7 @@
return True
def createPackage(self):
- self.subinfo.options.package.packageName = 'kde4-l10n-%s' % self.language
- self.subinfo.options.package.version = '4.3.68'
+ self.subinfo.options.package.packageName = 'l10n-kde4-%s' % self.language
self.subinfo.options.package.withCompiler = False
return KDEWinPackager.createPackage(self)
@@ -73,18 +72,18 @@
# all targets in svn
self.languages = 'af ar be bg bn bn_IN br ca cs csb cy da de '
self.languages += 'el en_GB eo es et eu fa fi fr fy ga gl gu '
- self.languages += 'ha he hi hne hr hsb hu hy is it ja ka kk km kn ko ku '
- self.languages += 'lb lt lv mai mk ml mr ms mt nb nds ne nl nn nso oc '
+ self.languages += 'ha he hi hr hsb hu hy is it ja ka kk km kn ko ku '
+ self.languages += 'lb lt lv mk ml ms mt nb nds ne nl nn nso oc '
self.languages += 'pa pl pt pt_BR ro ru rw se sk sl sr sv '
self.languages += 'ta te tg th tr uk uz vi wa xh zh_CN zh_HK zh_TW '
#for testing
- #self.languages = 'de'
+ self.languages = 'de'
def setDependencies( self ):
self.hardDependencies['dev-util/cmake'] = 'default'
self.hardDependencies['dev-util/gettext-tools'] = 'default'
- #self.ardDependencies['kde/kdelibs'] = 'default'
+ self.hardDependencies['kde/kdelibs'] = 'default'
class MainPackage(PackageBase):
--- trunk/kdesupport/emerge/portage/libs/qt/qt-4.6.2.20100215.py #1114015:1114016
@@ -29,12 +29,8 @@
self.svnTargets['4.6.0'] = "git://gitorious.org/+kde-developers/qt/kde-qt.git|4.6.0-patched|"
self.svnTargets['4.6.1'] = "git://gitorious.org/+kde-developers/qt/kde-qt.git|4.6.1-patched|"
self.svnTargets['4.6.2'] = "git://gitorious.org/+kde-developers/qt/kde-qt.git|4.6.2-patched|"
- self.svnTargets['4.6.2-mingw-x64'] = "git://gitorious.org/+qt-mingw-w64/qt/qt-mingw-w64-qt.git|4.6_jjc|"
- self.targetSrcSuffix['4.6.2-mingw-x64'] = "x64"
- if (COMPILER == "mingw" or COMPILER == "mingw4") and os.getenv("EMERGE_ARCHITECTURE") == 'x64':
- self.defaultTarget = '4.6.2-mingw-x64'
- else:
- self.defaultTarget = '4.6.2'
+
+ self.defaultTarget = '4.6.2'
## \todo this is prelimary and may be changed
self.options.package.packageName = 'qt'
@@ -44,15 +40,11 @@
self.hardDependencies['virtual/base'] = 'default'
self.hardDependencies['dev-util/perl'] = 'default'
self.hardDependencies['testing/mysql-server'] = 'default'
- if os.getenv("EMERGE_ARCHITECTURE") == 'x64':
+ if COMPILER == "mingw" or COMPILER == "mingw4":
+ self.hardDependencies['win32libs-bin/dbus'] = 'default'
+ else:
self.hardDependencies['win32libs-sources/dbus-src'] = 'default'
- self.hardDependencies['testing/openssl_beta-src'] = 'default'
- elif COMPILER == "msvc2008":
- self.hardDependencies['win32libs-sources/dbus-src'] = 'default'
- self.hardDependencies['win32libs-bin/openssl'] = 'default'
- else:
- self.hardDependencies['win32libs-bin/dbus'] = 'default'
- self.hardDependencies['win32libs-bin/openssl'] = 'default'
+ self.hardDependencies['win32libs-bin/openssl'] = 'default'
class Package(PackageBase,GitSource, QMakeBuildSystem, KDEWinPackager):
def __init__( self, **args ):
@@ -62,22 +54,30 @@
QMakeBuildSystem.__init__(self)
KDEWinPackager.__init__(self)
# get instance of dbus and openssl package
- if os.getenv("EMERGE_ARCHITECTURE") == 'x64':
+ if self.compiler() == "mingw" or self.compiler() == "mingw4":
+ self.dbus = portage.getPackageInstance('win32libs-bin','dbus')
+ else:
self.dbus = portage.getPackageInstance('win32libs-sources','dbus-src')
- self.openssl = portage.getPackageInstance('testing','openssl_beta-src')
- elif COMPILER == "msvc2008":
- self.dbus = portage.getPackageInstance('win32libs-sources','dbus-src')
- self.openssl = portage.getPackageInstance('win32libs-bin','openssl')
- else:
- self.dbus = portage.getPackageInstance('win32libs-bin','dbus')
- self.openssl = portage.getPackageInstance('win32libs-bin','openssl')
-
+ self.openssl = portage.getPackageInstance('win32libs-bin','openssl')
self.mysql_server = portage.getPackageInstance('testing','mysql-server')
def configure( self, unused1=None, unused2=""):
self.enterBuildDir()
- self.setPathes()
+ #
+ os.putenv( "PATH", os.path.join( self.buildDir(), "bin" ) + ";" + os.getenv("PATH") )
+
+ # so that the mkspecs can be found, when -prefix is set
+ os.putenv( "QMAKEPATH", self.sourceDir() )
+
+ platform = ""
+ if self.compiler() == "msvc2005" or self.compiler() == "msvc2008":
+ platform = "win32-%s" % self.compiler()
+ elif self.compiler() == "mingw" or self.compiler() == "mingw4":
+ platform = "win32-g++"
+ else:
+ exit( 1 )
+
os.environ[ "USERIN" ] = "y"
userin = "y"
@@ -95,7 +95,7 @@
"-no-phonon -qdbus -openssl -dbus-linked " \
"-fast -ltcg -no-vcproj -no-dsp " \
"-nomake demos -nomake examples " \
- "%s %s" % ( userin, configure, self.platform, self.installDir(), incdirs, libdirs)
+ "%s %s" % ( userin, configure, platform, self.installDir(), incdirs, libdirs)
if self.buildType() == "Debug":
command += " -debug "
else:
@@ -117,6 +117,9 @@
os.environ[ "INCLUDE" ] = "%s%s" % (inctmp, incdirs)
os.environ[ "LIB" ] = "%s%s" % (libtmp, libdirs)
+ # so that the mkspecs can be found, when -prefix is set
+ os.putenv( "QMAKEPATH", self.sourceDir() )
+
QMakeBuildSystem.make(self)
if not libtmp:
--- trunk/kdesupport/emerge/portage/testing/mysql-debug/mysql-debug-5.1.36.py #1114015:1114016
@@ -19,7 +19,6 @@
def __init__( self ):
self.subinfo = subinfo()
BinaryPackageBase.__init__( self )
- self.subinfo.options.package.withCompiler=False
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/testing/mysql-embedded/mysql-embedded-5.1.36.py #1114015:1114016
@@ -22,7 +22,6 @@
def __init__( self ):
self.subinfo = subinfo()
BinaryPackageBase.__init__( self )
- self.subinfo.options.package.withCompiler=False
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/testing/mysql-server/mysql-server-5.1.36.py #1114015:1114016
@@ -20,7 +20,8 @@
def __init__( self ):
self.subinfo = subinfo()
BinaryPackageBase.__init__( self )
- self.subinfo.options.package.withCompiler=False
+
+
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/testing/umbrello/umbrello-20090807.py #1114015:1114016
@@ -16,7 +16,6 @@
self.subinfo = subinfo()
CMakePackageBase.__init__(self)
self.subinfo.options.configure.onlyBuildTargets = 'umbrello'
- self.subinfo.options.make.slnBaseName = 'kdesdk'
if __name__ == '__main__':
Package().execute()
--- trunk/kdesupport/emerge/portage/win32libs-bin/sqlite/sqlite-3.6.2.py #1114015:1114016
@@ -36,7 +36,6 @@
self.createCombinedPackage = True
def install( self ):
- BinaryPackageBase.unpack(self)
dst = os.path.join( self.imageDir(), "bin" )
utils.cleanDirectory( dst )
dst = os.path.join( self.imageDir(), "include" )
--- trunk/kdesupport/emerge/portage/win32libs-sources/aspell-src/aspell-src-0.60.5.py #1114015:1114016
@@ -19,7 +19,7 @@
self.hardDependencies['dev-util/perl'] = 'default' # buildtime dependency
self.hardDependencies['dev-util/msys'] = 'default' # buildtime dependency
-class Package(base.baseclass):
+class subclass(base.baseclass):
def __init__( self, **args ):
base.baseclass.__init__( self, args=args )
self.createCombinedPackage = True
--- trunk/kdesupport/emerge/portage/win32libs-sources/expat-src/expat-src-2.0.1.py #1114015:1114016
@@ -5,7 +5,7 @@
class subinfo(info.infoclass):
def setDependencies( self ):
- #self.hardDependencies['dev-util/msys'] = 'default'
+ self.hardDependencies['dev-util/msys'] = 'default'
self.hardDependencies['win32libs-sources/zlib-src'] = 'default'
def setTargets( self ):
More information about the umbrello-devel
mailing list