diff --git a/.gitignore b/.gitignore index 24a9a67e5..977c5bff4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc -*~ \ No newline at end of file +*~ +python/* diff --git a/bin/Packager/PackagerFactory.py b/bin/Packager/PackagerFactory.py index dd8e9170f..e59ba832b 100644 --- a/bin/Packager/PackagerFactory.py +++ b/bin/Packager/PackagerFactory.py @@ -1,49 +1,49 @@ # # copyright (c) 2009 Ralf Habacker # from Packager.KDEWinPackager import * from Packager.CPackPackager import * from Packager.SevenZipPackager import * from Packager.MSInstallerPackager import * from Packager.InnoSetupPackager import * def init(packager, parent): packager.subinfo = parent.subinfo packager.parent = parent packager.category = parent.category packager.package = parent.package packager.version = parent.version packager.buildTarget = parent.subinfo.buildTarget packager.PV = parent.PV return def PackagerFactory(parent, packagerType): """provides multi packager type api return PackagerBase derived instance for recent settings""" utils.debug( "PackagerFactory called", 2 ) packagers = [] if packagerType: for packagerClass in packagerType: - if not isinstance(packagerClass, PackagerBase): + if not issubclass(packagerClass, PackagerBase): utils.die("PackagerFactory: unsupported packager %s" % packagerClass) else: packager = packagerClass() init(packager, parent) packagers.append(packager) else: # automatic detection packager = InnoSetupPackager() init(packager, parent) if packager.configFile() != None: packagers.append(packager) # default packager if len(packagers) == 0: packager = KDEWinPackager() init(packager, parent) packagers.append(packager) return packagers diff --git a/bin/emerge.py b/bin/emerge.py index 35030acdf..77bcfd2a6 100644 --- a/bin/emerge.py +++ b/bin/emerge.py @@ -1,632 +1,648 @@ -# -*- coding: utf-8 -*- -# this will emerge some programs... - -# copyright: -# Holger Schroeder -# Patrick Spendrin - -import sys - -# The minimum python version for emerge please edit here -# if you add code that changes this requirement -MIN_PY_VERSION = (3, 0, 0) - -if sys.version_info[0:3] < MIN_PY_VERSION: - print ("Error: Python too old!") - print ("Emerge needs at least Python Version %s.%s.%s" % MIN_PY_VERSION ) - print ("Please install it and adapt your kdesettings.bat") - exit(1) - -import os -import utils -import portage -import emergePlatform -import portageSearch -import shutil -from InstallDB import * - - -def usage(): - print(""" -Usage: - emerge [[ command and flags ] [ singletarget ] - [ command and flags ] [ singletarget ] - ... ] - - where singletarget can be of the form: - category - package - category/package - -Emerge is a tool for building KDE-related software under Windows. emerge -automates it, looks for the dependencies and fetches them automatically. -Some options should be used with extreme caution since they will -make your kde installation unusable in 999 out of 1000 cases. - -Commands (no packagename needed - will be ignored when given): - ---print-installed This will show a list of all packages that - are installed currently. It queries both - databases (etc\portage\installed) and the - manifest directory - it prints out only those - packages that are contained within - --print-installable ---print-installable This will give you a list of packages that can - be installed. Currently you don't need to - enter the category and package: only the - package will be enough. ---update-all this option tries to update all installed - packages that contain one or multiple svn - targets. This is equivalent to running all - those packages with the flag --update. - -Commands (must have a packagename): - ---print-targets This will print all the different targets one package - can contain: different releases might have different - tags that are build as targets of a package. As an - example: You could build the latest amarok sources with - the target 'svnHEAD' the previous '1.80' release would - be contained as target '1.80'. ---print-revision This will print the revision that the source repository - of this package currently has or nothing if there is no - repository. ---fetch retrieve package sources (also checkout sources from - svn or git). ---unpack unpack package sources and make up the build directory. ---compile compile the sources: this includes - configure'ing/cmake'ing and running [mingw32-|n|]make. ---configure configure the sources (support is package specific) ---make run [mingw32-|n|]make (support is package specific) ---install This will run [mingw32-|n|]make install into the image - directory of each package. ---manifest This step creates the files contained in the manifest - dir. ---qmerge This will merge the image directory into the KDEROOT ---test This will run the unittests if they are present ---package This step will create a package out of the image - directory instead of merge'ing the image directory into - the KDEROOT (Requires the packager to be installed - already.) ---full-package This will create packages instead of installing stuff - to KDEROOT ---install-deps This will fetch and install all required dependencies - for the specified package ---unmerge this uninstalls a package from KDEROOT - it requires a - working manifest directory. unmerge only delete - unmodified files by default. You may use the -f or - --force option to let unmerge delete all files - unconditional. ---cleanallbuilds Clean complete build directory. ---cleanbuild Clean build directory for the specified package. This - cleans also all the image directories of all targets of - the specified package. ---checkdigest Check digest for the specified package. If no digest is - available calculate and print digests. ---cleanimage Clean image directory for the specified package and - target. ---createpatch Create source patch file for the specific package based - on the original archive file or checkout revision of - the used software revision control system. ---disable-buildhost This disables the building for the host. ---disable-buildtarget This disables the building for the target. - -Flags: - ---buildtype=[BUILDTYPE] This will override the build type set by the - environment option EMERGE_BUILDTYPE . - Please set it to one out of Release, Debug, - RelWithDebInfo, MinSizeRel ---target=[TARGET] This will override the build of the default - target. The default Target is marked with a - star in the printout of --print-targets ---options= Set emerge property from string . - An example for is "cmake.openIDE=1"; - see options.py for more informations. ---patchlevel=[PATCHLEVEL] This will add a patch level when used together - with --package ---log-dir=[LOG_DIR] This will log the build output to a logfile in - LOG_DIR for each package. Logging information - is appended to existing logs. - --i ignore install: using this option will install a package over an - existing install. This can be useful if you want to check some - new code and your last build isn't that old. --p ---probe probing: emerge will only look which files it has to build - according to the list of installed files and according to the - dependencies of the package. --q quiet: there should be no output - The verbose level should be 0 --t test: if used on an KDE target it will override the environment - variable and build the target with -DKDE_BUILD_TESTS=ON --v verbose: increases the verbose level of emerge. Default is 1. - verbose level 1 contains some notes from emerge, all output of - cmake, make and other programs that are used. verbose level 2 - adds an option VERBOSE=1 to make and emerge is more verbose - highest level is verbose level 3. --z if packages from version control system sources are installed, - it marks them as out of date and rebuilds them (tags are not - marked as out of date). --sz similar to -z, only that it acts only on the last package, and - works as normal on the rest. ---noclean this option will try to use an existing build directory. Please - handle this option with care - it will possibly break if the - directory isn't existing. ---nocopy this option is deprecated. In older releases emerge would have - copied everything from the SVN source tree to a source directory - under %KDEROOT%\\tmp - currently nocopy is applied by default if - EMERGE_NOCOPY is not set to "False". Be aware that setting - EMERGE_NOCOPY to "False" might slow down the build process, - irritate you and increase the disk space roughly by the size of - SVN source tree. ---offline do not try to connect to the internet: KDE packages will try to - use an existing source tree and other packages would try to use - existing packages in the download directory. If that doesn't - work, the build will fail. ---update this option is the same as '-i --noclean'. It will update a single - package that is already installed. ---cleanup Clean your portage directory, to prevent emerge errors, removes - empty directories and *.pyc files - -Internal options or options that aren't fully implemented yet: -PLEASE DO NOT USE! ---version-dir ---version-package - -More information see the README or http://windows.kde.org/. -Send feedback to . - -""") - -@utils.log -def doExec( category, package, action, opts ): - utils.startTimer("%s for %s" % ( action,package),1) - utils.debug( "emerge doExec called. action: %s opts: %s" % (action, opts), 2 ) - fileName = portage.getFilename( category, package ) - opts_string = ( "%s " * len( opts ) ) % tuple( opts ) - commandstring = "python %s %s %s" % ( fileName, action, opts_string ) - - utils.debug( "file: " + fileName, 1 ) - try: - #Switched to import the packages only, because otherwise degugging is very hard, if it troubles switch back - #makes touble for xcompile -> changed back - if not utils.system( commandstring ): - utils.die( "running %s" % commandstring ) - #mod = portage.__import__( fileName ) - #mod.Package().execute(action) - except OSError: - utils.stopTimer("%s for %s" % ( action,package)) - return False - utils.stopTimer("%s for %s" % ( action,package)) - return True - -def handlePackage( category, package, buildAction, opts ): - utils.debug( "emerge handlePackage called: %s %s %s" % (category, package, buildAction), 2 ) - success = True - - if continueFlag: - actionList = ['fetch', 'unpack', 'configure', 'make', 'cleanimage', 'install', 'manifest', 'qmerge'] - - found = None - for action in actionList: - if not found and action != buildAction: - continue - found = True - success = success and doExec( category, package, action, opts ) - elif ( buildAction == "all" or buildAction == "full-package" ): - os.putenv( "EMERGE_BUILD_STEP", "" ) - success = doExec( category, package, "fetch", opts ) - success = success and doExec( category, package, "unpack", opts ) - if emergePlatform.isCrossCompilingEnabled(): - if not disableHostBuild: - os.putenv( "EMERGE_BUILD_STEP", "host" ) - success = success and doExec( category, package, "compile", opts ) - success = success and doExec( category, package, "cleanimage", opts ) - success = success and doExec( category, package, "install", opts ) - if ( buildAction == "all" ): - success = success and doExec( category, package, "manifest", opts ) - if ( buildAction == "all" ): - success = success and doExec( category, package, "qmerge", opts ) - if( buildAction == "full-package" ): - success = success and doExec( category, package, "package", opts ) - if disableTargetBuild: - return success - os.putenv( "EMERGE_BUILD_STEP", "target" ) - - success = success and doExec( category, package, "compile", opts ) - success = success and doExec( category, package, "cleanimage", opts ) - success = success and doExec( category, package, "install", opts ) - if ( buildAction == "all" ): - success = success and doExec( category, package, "manifest", opts ) - if ( buildAction == "all" ): - success = success and doExec( category, package, "qmerge", opts ) - if( buildAction == "full-package" ): - success = success and doExec( category, package, "package", opts ) - - elif ( buildAction in [ "fetch", "unpack", "preconfigure", "configure", "compile", "make", "qmerge", "checkdigest", "dumpdeps", - "package", "manifest", "unmerge", "test", "cleanimage", "cleanbuild", "createpatch", "geturls", - "printrev"] and category and package ): - os.putenv( "EMERGE_BUILD_STEP", "" ) - success = True - if emergePlatform.isCrossCompilingEnabled(): - if not disableHostBuild: - os.putenv( "EMERGE_BUILD_STEP", "host" ) - success = doExec( category, package, buildAction, opts ) - if disableTargetBuild: - return success - os.putenv( "EMERGE_BUILD_STEP", "target" ) - success = success and doExec( category, package, buildAction, opts ) - elif ( buildAction == "install" ): - os.putenv( "EMERGE_BUILD_STEP", "" ) - success = True - if emergePlatform.isCrossCompilingEnabled(): - if not disableHostBuild: - os.putenv( "EMERGE_BUILD_STEP", "host" ) - success = doExec( category, package, "cleanimage", opts ) - success = success and doExec( category, package, "install", opts ) - if disableTargetBuild: - return success - os.putenv( "EMERGE_BUILD_STEP", "target" ) - success = success and doExec( category, package, "cleanimage", opts ) - success = success and doExec( category, package, "install", opts ) - elif ( buildAction == "version-dir" ): - print("%s" % ( package )) - success = True - elif ( buildAction == "version-package" ): - print("%s-%s" % ( package, os.getenv( "KDECOMPILER" ) )) - success = True - elif ( buildAction == "print-installable" ): - portage.printInstallables() - success = True - elif ( buildAction == "print-installed" ): - if isDBEnabled(): - printInstalled() - else: - portage.printInstalled() - success = True - elif ( buildAction == "print-targets" ): - portage.printTargets( category, package ) - success = True - elif ( buildAction == "install-deps" ): - success = True - else: - success = utils.error( "could not understand this buildAction: %s" % buildAction ) - - return success - -# -# "main" action starts here -# - -# TODO: all the rest should go into main(). But here I am not -# sure - maybe some of those variables are actually MEANT to -# be used in other modules. Put this back for now - -# but as a temporary solution rename variables to mainXXX -# where it is safe so there are less redefinitions in inner scopes - -utils.startTimer("Emerge") -mainBuildAction = "all" -packageName = None -doPretend = False -outDateVCS = False -outDatePackage = False -stayQuiet = False -disableHostBuild = False -disableTargetBuild = False -ignoreInstalled = False -updateAll = False -continueFlag = False - -if len( sys.argv ) < 2: - usage() - utils.die("") - -environ = dict() # TODO: why do we need this at all? -environ["EMERGE_TRACE"] = os.getenv( "EMERGE_TRACE" ) -environ["EMERGE_BUILDTESTS"] = os.getenv( "EMERGE_BUILDTESTS" ) -environ["EMERGE_OFFLINE"] = os.getenv( "EMERGE_OFFLINE" ) -environ["EMERGE_FORCED"] = os.getenv( "EMERGE_FORCED" ) -environ["EMERGE_VERSION"] = os.getenv( "EMERGE_VERSION" ) -environ["EMERGE_BUILDTYPE"] = os.getenv( "EMERGE_BUILDTYPE" ) -environ["EMERGE_TARGET"] = os.getenv( "EMERGE_TARGET" ) -environ["EMERGE_PKGPATCHLVL"] = os.getenv( "EMERGE_PKGPATCHLVL" ) -environ["EMERGE_LOG_DIR"] = os.getenv( "EMERGE_LOG_DIR" ) - -if environ['EMERGE_TRACE'] == None or not environ['EMERGE_TRACE'].isdigit(): - trace = 0 - os.environ["EMERGE_TRACE"] = str( trace ) -else: - trace = int( environ[ "EMERGE_TRACE" ] ) - -mainOpts = list() - -executableName = sys.argv.pop( 0 ) -nextArguments = sys.argv[:] - -for i in sys.argv: - nextArguments.pop(0) - if ( i == "-p" or i == "--probe" ): - doPretend = True - elif ( i.startswith("--options=") ): - # @todo how to add -o option - options = i.replace( "--options=", "" ) - if "EMERGE_OPTIONS" in os.environ: - os.environ["EMERGE_OPTIONS"] += " %s" % options - else: - os.environ["EMERGE_OPTIONS"] = options - elif ( i == "-z" ): - outDateVCS = True - elif ( i == "-sz" ): - outDatePackage = True - elif ( i == "-q" ): - stayQuiet = True - elif ( i == "-t" ): - os.environ["EMERGE_BUILDTESTS"] = "True" - elif i == "-c" or i == "--continue": - continueFlag = True - elif ( i == "--offline" ): - mainOpts.append( "--offline" ) - os.environ["EMERGE_OFFLINE"] = "True" - elif ( i == "-f" or i == "--force" ): - os.environ["EMERGE_FORCED"] = "True" - elif ( i.startswith( "--buildtype=" ) ): - os.environ["EMERGE_BUILDTYPE"] = i.replace( "--buildtype=", "" ) - elif ( i.startswith( "--target=" ) ): - os.environ["EMERGE_TARGET"] = i.replace( "--target=", "" ) - elif ( i.startswith( "--patchlevel=" ) ): - os.environ["EMERGE_PKGPATCHLVL"] = i.replace( "--patchlevel=", "" ) - elif ( i.startswith( "--log-dir=" ) ): - os.environ["EMERGE_LOG_DIR"] = i.replace( "--log-dir=", "" ) - elif ( i == "-v" ): - utils.Verbose.increase() - elif ( i == "--trace" ): - trace = trace + 1 - os.environ["EMERGE_TRACE"] = str( trace ) - elif ( i == "--nocopy" ): - os.environ["EMERGE_NOCOPY"] = str( True ) - elif ( i == "--noclean" ): - os.environ["EMERGE_NOCLEAN"] = str( True ) - elif ( i == "--clean" ): - os.environ["EMERGE_NOCLEAN"] = str( False ) - elif ( i in [ "--version-dir", "--version-package", "--print-installable", - "--print-installed", "--print-targets" ] ): - mainBuildAction = i[2:] - stayQuiet = True - if i in [ "--print-installable", "--print-installed" ]: - break - elif ( i == "-i" ): - ignoreInstalled = True - elif ( i == "--update" ): - ignoreInstalled = True - os.environ["EMERGE_NOCLEAN"] = str( True ) - elif ( i == "--update-all" ): - ignoreInstalled = True - os.environ["EMERGE_NOCLEAN"] = str( True ) - updateAll = True - elif ( i == "--install-deps" ): - ignoreInstalled = True - mainBuildAction = "install-deps" - elif ( i in [ "--fetch", "--unpack", "--preconfigure", "--configure", "--compile", "--make", - "--install", "--qmerge", "--manifest", "--package", "--unmerge", "--test", "--checkdigest", "--dumpdeps", - "--full-package", "--cleanimage", "--cleanbuild", "--createpatch", "--geturls"] ): - mainBuildAction = i[2:] - elif ( i == "--print-revision" ): - mainBuildAction = "printrev" - elif ( i == "--disable-buildhost" ): - disableHostBuild = True - elif ( i == "--disable-buildtarget" ): - disableTargetBuild = True - elif( i == "--cleanup" ): - utils.debug("Starting to clean emerge" ) - utils.system("cd %s && git clean -f -x -e *.py -e *.diff -e *.ba\\t -e *.cmd -e *.reg" % os.path.join(os.getenv("KDEROOT"),"emerge") ) - exit(0) - elif( i == "--cleanup-dry" ): - utils.debug("Starting to clean emerge" ) - utils.system("cd %s && git clean --dry-run -x -e *.py -e *.diff -e *.ba\\t -e *.cmd -e *.reg" % os.path.join(os.getenv("KDEROOT"),"emerge") ) - exit(0) - elif i == "--cleanallbuilds": - # clean complete build directory - utils.cleanDirectory(os.path.join( os.getenv("KDEROOT"), "build")) - exit(0) - elif ( i == "--search" ): - package = nextArguments.pop(0) - category = "" - if not package.find("/") == -1: - (category,package) = package.split("/") - portageSearch.printSearch(category, package) - exit(0) - elif ( i.startswith( "-" ) ): - usage() - exit ( 1 ) - else: - packageName = i - break - -if stayQuiet == True: - utils.setVerbose(0) - -# get KDEROOT from env -KDEROOT = os.getenv( "KDEROOT" ) -utils.debug( "buildAction: %s" % mainBuildAction ) -utils.debug( "doPretend: %s" % doPretend, 1 ) -utils.debug( "packageName: %s" % packageName ) -utils.debug( "buildType: %s" % os.getenv( "EMERGE_BUILDTYPE" ) ) -utils.debug( "buildTests: %s" % utils.envAsBool( "EMERGE_BUILDTESTS" ) ) -utils.debug( "verbose: %d" % utils.verbose(), 1 ) -utils.debug( "trace: %s" % os.getenv( "EMERGE_TRACE" ), 1 ) -utils.debug( "KDEROOT: %s\n" % KDEROOT, 1 ) -utils.debug_line() - -def unset_var( varname ): - if not os.getenv( varname ) == None: - print() - utils.warning( "%s found as environment variable. you cannot override emerge"\ - " with this - unsetting %s locally" % ( varname, varname ) ) - os.environ[ varname ] = "" - -unset_var( "CMAKE_INCLUDE_PATH" ) -unset_var( "CMAKE_LIBRARY_PATH" ) -unset_var( "CMAKE_FIND_PREFIX" ) -unset_var( "CMAKE_INSTALL_PREFIX" ) - -# adding emerge/bin to find base.py and gnuwin32.py etc. -os.environ["PYTHONPATH"] = os.getenv( "PYTHONPATH", "" ) + os.pathsep + \ - os.path.join( os.getcwd(), os.path.dirname( executableName ) ) -sys.path.append( os.path.join( os.getcwd(), os.path.dirname( executableName ) ) ) - -_deplist = [] -deplist = [] -packageList = [] -categoryList = [] - - -buildType = os.getenv("EMERGE_BUILDTYPE") -if "EMERGE_DEFAULTCATEGORY" in os.environ: - defaultCategory = os.environ["EMERGE_DEFAULTCATEGORY"] -else: - defaultCategory = "kde" - -if updateAll: - installedPackages = portage.PortageInstance.getInstallables() - if portage.PortageInstance.isCategory( packageName ): - utils.debug( "Updating installed packages from category " + packageName, 1 ) - else: - utils.debug( "Updating all installed packages", 1 ) - packageList = [] - for mainCategory, mainPackage, _dummy in installedPackages: - if portage.PortageInstance.isCategory( packageName ) and ( mainCategory != packageName ): - continue -# FIXME: -# if portage.isInstalled( mainCategory, mainPackage, mainVersion, buildType ) \ -# and portage.isPackageUpdateable( mainCategory, mainPackage, mainVersion ): -# categoryList.append( mainCategory ) -# packageList.append( mainPackage ) - utils.debug( "Will update packages: " + str (packageList), 1 ) -elif packageName: - packageList, categoryList = portage.getPackagesCategories(packageName) - -for entry in packageList: - utils.debug( "%s" % entry, 1 ) -utils.debug_line( 1 ) - -for mainCategory, entry in zip (categoryList, packageList): - _deplist = portage.solveDependencies( mainCategory, entry, _deplist ) - -deplist = [p.ident() for p in _deplist] - -for item in range( len( deplist ) ): - if deplist[ item ][ 0 ] in categoryList and deplist[ item ][ 1 ] in packageList: - deplist[ item ].append( ignoreInstalled ) - else: - deplist[ item ].append( False ) - - utils.debug( "dependency: %s" % deplist[ item ], 1 ) - -#for item in deplist: -# cat = item[ 0 ] -# pac = item[ 1 ] -# ver = item[ 2 ] - -# if portage.isInstalled( cat, pac, ver, buildType) and updateAll and not portage.isPackageUpdateable( cat, pac, ver ): -# print "remove:", cat, pac, ver -# deplist.remove( item ) - -if mainBuildAction == "install-deps": - # the first dependency is the package itself - ignore it - # TODO: why are we our own dependency? - del deplist[ 0 ] - -deplist.reverse() - -# package[0] -> category -# package[1] -> package -# package[2] -> version - -if ( mainBuildAction != "all" and mainBuildAction != "install-deps" ): - # if a buildAction is given, then do not try to build dependencies - # and do the action although the package might already be installed. - # This is still a bit problematic since packageName might not be a valid - # package - - if packageName and len( deplist ) >= 1: - mainCategory, mainPackage, tag, ignoreInstalled = deplist[ -1 ] - else: - mainCategory, mainPackage = None, None - - if not handlePackage( mainCategory, mainPackage, mainBuildAction, mainOpts ): - utils.notify("Emerge %s failed" % mainBuildAction, "%s of %s/%s failed" % ( mainBuildAction, mainCategory, mainPackage ), mainBuildAction) - exit(1) - utils.notify("Emerge %s finished"% mainBuildAction, "%s of %s/%s finished" % ( mainBuildAction, mainCategory, mainPackage ), mainBuildAction) - -else: - for mainCategory, mainPackage, defaultTarget, ignoreInstalled in deplist: - target = "" - targetList = [] - isLastPackage = [mainCategory, mainPackage, defaultTarget, ignoreInstalled] == deplist[-1] - if outDateVCS or (outDatePackage and isLastPackage): - target = os.getenv( "EMERGE_TARGET" ) - if not target or target not in list(portage.PortageInstance.getAllTargets( mainCategory, mainPackage ).keys()): - # if no target or a wrong one is defined, simply set the default target here - target = defaultTarget - targetList = portage.PortageInstance.getUpdatableVCSTargets( mainCategory, mainPackage ) - if isDBEnabled(): - if emergePlatform.isCrossCompilingEnabled(): - hostEnabled = portage.isHostBuildEnabled( mainCategory, mainPackage ) - targetEnabled = portage.isTargetBuildEnabled( mainCategory, mainPackage ) - hostInstalled = installdb.isInstalled( mainCategory, mainPackage ) - targetInstalled = installdb.isInstalled( mainCategory, mainPackage, os.getenv( "EMERGE_TARGET_PLATFORM" ) ) - isInstalled = ( not hostEnabled or hostInstalled ) and ( not targetEnabled or targetInstalled ) - else: - isInstalled = installdb.isInstalled( mainCategory, mainPackage, prefix=None ) - else: - isInstalled = portage.isInstalled( mainCategory, mainPackage, buildType ) - if ( isInstalled and not ignoreInstalled ) and not ( - isInstalled and (outDateVCS or (outDatePackage and isLastPackage) ) and target in targetList ): - if utils.verbose() > 1 and mainPackage == packageName: - utils.warning( "already installed %s/%s" % ( mainCategory, mainPackage ) ) - elif utils.verbose() > 2 and not mainPackage == packageName: - utils.warning( "already installed %s/%s" % ( mainCategory, mainPackage ) ) - else: - # in case we only want to see which packages are still to be build, simply return the package name - if ( doPretend ): - if utils.verbose() > 0: - msg = " " - if emergePlatform.isCrossCompilingEnabled(): - if isDBEnabled(): - hostEnabled = portage.isHostBuildEnabled( mainCategory, mainPackage ) - targetEnabled = portage.isTargetBuildEnabled( mainCategory, mainPackage ) - hostInstalled = installdb.isInstalled( mainCategory, mainPackage, prefix=None ) - targetInstalled = installdb.isInstalled( mainCategory, mainPackage, os.getenv( "EMERGE_TARGET_PLATFORM" ) ) - msg += portage.getHostAndTarget( hostEnabled and not hostInstalled, targetEnabled and not targetInstalled ) - else: - msg = "" - utils.warning( "pretending %s/%s%s" % ( mainCategory, mainPackage, msg ) ) - else: - mainAction = mainBuildAction - if mainBuildAction == "install-deps": - mainAction = "all" - - if not handlePackage( mainCategory, mainPackage, mainAction, mainOpts ): - utils.error( "fatal error: package %s/%s %s failed" % \ - ( mainCategory, mainPackage, mainBuildAction ) ) - utils.notify("Emerge build failed", "Build of %s/%s failed" % ( mainCategory, mainPackage ), mainAction) - exit( 1 ) - utils.notify("Emerge build finished", "Build of %s/%s finished" % ( mainCategory, mainPackage ), mainAction) - -utils.new_line() -if len( nextArguments ) > 0: - command = "\"" + sys.executable + "\" -u " + executableName + " " + " ".join( nextArguments ) - - #for element in environ.keys(): - # if environ[ element ]: - # os.environ[ element ] = environ[ element ] - # elif element == "EMERGE_VERBOSE": - # os.environ[ element ] = "1" - # else: - # os.environ[ element ] = "" - if not utils.system(command): - utils.die( "cannot execute next commands cmd: %s" % command ) - -utils.stopTimer("Emerge") - +# -*- coding: utf-8 -*- +# this will emerge some programs... + +# copyright: +# Holger Schroeder +# Patrick Spendrin + +import sys + +# The minimum python version for emerge please edit here +# if you add code that changes this requirement +MIN_PY_VERSION = (3, 0, 0) + +if sys.version_info[0:3] < MIN_PY_VERSION: + print ("Error: Python too old!") + print ("Emerge needs at least Python Version %s.%s.%s" % MIN_PY_VERSION ) + print ("Please install it and adapt your kdesettings.bat") + exit(1) + +import os +import utils +import portage +import emergePlatform +import portageSearch +import shutil +from InstallDB import * +import sched +import time +import datetime +import threading + + +def usage(): + print(""" +Usage: + emerge [[ command and flags ] [ singletarget ] + [ command and flags ] [ singletarget ] + ... ] + + where singletarget can be of the form: + category + package + category/package + +Emerge is a tool for building KDE-related software under Windows. emerge +automates it, looks for the dependencies and fetches them automatically. +Some options should be used with extreme caution since they will +make your kde installation unusable in 999 out of 1000 cases. + +Commands (no packagename needed - will be ignored when given): + +--print-installed This will show a list of all packages that + are installed currently. It queries both + databases (etc\portage\installed) and the + manifest directory - it prints out only those + packages that are contained within + --print-installable +--print-installable This will give you a list of packages that can + be installed. Currently you don't need to + enter the category and package: only the + package will be enough. +--update-all this option tries to update all installed + packages that contain one or multiple svn + targets. This is equivalent to running all + those packages with the flag --update. + +Commands (must have a packagename): + +--print-targets This will print all the different targets one package + can contain: different releases might have different + tags that are build as targets of a package. As an + example: You could build the latest amarok sources with + the target 'svnHEAD' the previous '1.80' release would + be contained as target '1.80'. +--print-revision This will print the revision that the source repository + of this package currently has or nothing if there is no + repository. +--fetch retrieve package sources (also checkout sources from + svn or git). +--unpack unpack package sources and make up the build directory. +--compile compile the sources: this includes + configure'ing/cmake'ing and running [mingw32-|n|]make. +--configure configure the sources (support is package specific) +--make run [mingw32-|n|]make (support is package specific) +--install This will run [mingw32-|n|]make install into the image + directory of each package. +--manifest This step creates the files contained in the manifest + dir. +--qmerge This will merge the image directory into the KDEROOT +--test This will run the unittests if they are present +--package This step will create a package out of the image + directory instead of merge'ing the image directory into + the KDEROOT (Requires the packager to be installed + already.) +--full-package This will create packages instead of installing stuff + to KDEROOT +--install-deps This will fetch and install all required dependencies + for the specified package +--unmerge this uninstalls a package from KDEROOT - it requires a + working manifest directory. unmerge only delete + unmodified files by default. You may use the -f or + --force option to let unmerge delete all files + unconditional. +--cleanallbuilds Clean complete build directory. +--cleanbuild Clean build directory for the specified package. This + cleans also all the image directories of all targets of + the specified package. +--checkdigest Check digest for the specified package. If no digest is + available calculate and print digests. +--cleanimage Clean image directory for the specified package and + target. +--createpatch Create source patch file for the specific package based + on the original archive file or checkout revision of + the used software revision control system. +--disable-buildhost This disables the building for the host. +--disable-buildtarget This disables the building for the target. + +Flags: + +--buildtype=[BUILDTYPE] This will override the build type set by the + environment option EMERGE_BUILDTYPE . + Please set it to one out of Release, Debug, + RelWithDebInfo, MinSizeRel +--target=[TARGET] This will override the build of the default + target. The default Target is marked with a + star in the printout of --print-targets +--options= Set emerge property from string . + An example for is "cmake.openIDE=1"; + see options.py for more informations. +--patchlevel=[PATCHLEVEL] This will add a patch level when used together + with --package +--log-dir=[LOG_DIR] This will log the build output to a logfile in + LOG_DIR for each package. Logging information + is appended to existing logs. + +-i ignore install: using this option will install a package over an + existing install. This can be useful if you want to check some + new code and your last build isn't that old. +-p +--probe probing: emerge will only look which files it has to build + according to the list of installed files and according to the + dependencies of the package. +-q quiet: there should be no output - The verbose level should be 0 +-t test: if used on an KDE target it will override the environment + variable and build the target with -DKDE_BUILD_TESTS=ON +-v verbose: increases the verbose level of emerge. Default is 1. + verbose level 1 contains some notes from emerge, all output of + cmake, make and other programs that are used. verbose level 2 + adds an option VERBOSE=1 to make and emerge is more verbose + highest level is verbose level 3. +-z if packages from version control system sources are installed, + it marks them as out of date and rebuilds them (tags are not + marked as out of date). +-sz similar to -z, only that it acts only on the last package, and + works as normal on the rest. +--noclean this option will try to use an existing build directory. Please + handle this option with care - it will possibly break if the + directory isn't existing. +--nocopy this option is deprecated. In older releases emerge would have + copied everything from the SVN source tree to a source directory + under %KDEROOT%\\tmp - currently nocopy is applied by default if + EMERGE_NOCOPY is not set to "False". Be aware that setting + EMERGE_NOCOPY to "False" might slow down the build process, + irritate you and increase the disk space roughly by the size of + SVN source tree. +--offline do not try to connect to the internet: KDE packages will try to + use an existing source tree and other packages would try to use + existing packages in the download directory. If that doesn't + work, the build will fail. +--update this option is the same as '-i --noclean'. It will update a single + package that is already installed. +--cleanup Clean your portage directory, to prevent emerge errors, removes + empty directories and *.pyc files + +Internal options or options that aren't fully implemented yet: +PLEASE DO NOT USE! +--version-dir +--version-package + +More information see the README or http://windows.kde.org/. +Send feedback to . + +""") + +@utils.log +def doExec( category, package, action, opts ): + utils.startTimer("%s for %s" % ( action,package),1) + utils.debug( "emerge doExec called. action: %s opts: %s" % (action, opts), 2 ) + fileName = portage.getFilename( category, package ) + opts_string = ( "%s " * len( opts ) ) % tuple( opts ) + commandstring = "python %s %s %s" % ( fileName, action, opts_string ) + + utils.debug( "file: " + fileName, 1 ) + try: + #Switched to import the packages only, because otherwise degugging is very hard, if it troubles switch back + #makes touble for xcompile -> changed back + if not utils.system( commandstring ): + utils.die( "running %s" % commandstring ) + #mod = portage.__import__( fileName ) + #mod.Package().execute(action) + except OSError: + utils.stopTimer("%s for %s" % ( action,package)) + return False + utils.stopTimer("%s for %s" % ( action,package)) + return True + +def updateTitle(startTime,title): + while(len(utils._TIMERS)>0): + delta = datetime.datetime.now() - startTime + utils.setTitle("Emerge %s %s" %(title , delta)) + time.sleep(1) + +def handlePackage( category, package, buildAction, opts ): + utils.debug( "emerge handlePackage called: %s %s %s" % (category, package, buildAction), 2 ) + +success = True + + if continueFlag: + actionList = ['fetch', 'unpack', 'configure', 'make', 'cleanimage', 'install', 'manifest', 'qmerge'] + + found = None + for action in actionList: + if not found and action != buildAction: + continue + found = True + success = success and doExec( category, package, action, opts ) + elif ( buildAction == "all" or buildAction == "full-package" ): + os.putenv( "EMERGE_BUILD_STEP", "" ) + success = doExec( category, package, "fetch", opts ) + success = success and doExec( category, package, "unpack", opts ) + if emergePlatform.isCrossCompilingEnabled(): + if not disableHostBuild: + os.putenv( "EMERGE_BUILD_STEP", "host" ) + success = success and doExec( category, package, "compile", opts ) + success = success and doExec( category, package, "cleanimage", opts ) + success = success and doExec( category, package, "install", opts ) + if ( buildAction == "all" ): + success = success and doExec( category, package, "manifest", opts ) + if ( buildAction == "all" ): + success = success and doExec( category, package, "qmerge", opts ) + if( buildAction == "full-package" ): + success = success and doExec( category, package, "package", opts ) + if disableTargetBuild: + return success + os.putenv( "EMERGE_BUILD_STEP", "target" ) + + success = success and doExec( category, package, "compile", opts ) + success = success and doExec( category, package, "cleanimage", opts ) + success = success and doExec( category, package, "install", opts ) + if ( buildAction == "all" ): + success = success and doExec( category, package, "manifest", opts ) + if ( buildAction == "all" ): + success = success and doExec( category, package, "qmerge", opts ) + if( buildAction == "full-package" ): + success = success and doExec( category, package, "package", opts ) + + elif ( buildAction in [ "fetch", "unpack", "preconfigure", "configure", "compile", "make", "qmerge", "checkdigest", "dumpdeps", + "package", "manifest", "unmerge", "test", "cleanimage", "cleanbuild", "createpatch", "geturls", + "printrev"] and category and package ): + os.putenv( "EMERGE_BUILD_STEP", "" ) + success = True + if emergePlatform.isCrossCompilingEnabled(): + if not disableHostBuild: + os.putenv( "EMERGE_BUILD_STEP", "host" ) + success = doExec( category, package, buildAction, opts ) + if disableTargetBuild: + return success + os.putenv( "EMERGE_BUILD_STEP", "target" ) + success = success and doExec( category, package, buildAction, opts ) + elif ( buildAction == "install" ): + os.putenv( "EMERGE_BUILD_STEP", "" ) + success = True + if emergePlatform.isCrossCompilingEnabled(): + if not disableHostBuild: + os.putenv( "EMERGE_BUILD_STEP", "host" ) + success = doExec( category, package, "cleanimage", opts ) + success = success and doExec( category, package, "install", opts ) + if disableTargetBuild: + return success + os.putenv( "EMERGE_BUILD_STEP", "target" ) + success = success and doExec( category, package, "cleanimage", opts ) + success = success and doExec( category, package, "install", opts ) + elif ( buildAction == "version-dir" ): + print("%s" % ( package )) + success = True + elif ( buildAction == "version-package" ): + print("%s-%s" % ( package, os.getenv( "KDECOMPILER" ) )) + success = True + elif ( buildAction == "print-installable" ): + portage.printInstallables() + success = True + elif ( buildAction == "print-installed" ): + if isDBEnabled(): + printInstalled() + else: + portage.printInstalled() + success = True + elif ( buildAction == "print-targets" ): + portage.printTargets( category, package ) + success = True + elif ( buildAction == "install-deps" ): + success = True + else: + success = utils.error( "could not understand this buildAction: %s" % buildAction ) + + return success + +# +# "main" action starts here +# + +# TODO: all the rest should go into main(). But here I am not +# sure - maybe some of those variables are actually MEANT to +# be used in other modules. Put this back for now + +# but as a temporary solution rename variables to mainXXX +# where it is safe so there are less redefinitions in inner scopes + +utils.startTimer("Emerge") +tittleThread = threading.Thread(target=updateTitle,args = (datetime.datetime.now()," ".join(sys.argv[:]),)) +tittleThread.setDaemon(True) +tittleThread.start() + + +mainBuildAction = "all" +packageName = None +doPretend = False +outDateVCS = False +outDatePackage = False +stayQuiet = False +disableHostBuild = False +disableTargetBuild = False +ignoreInstalled = False +updateAll = False +continueFlag = False + +if len( sys.argv ) < 2: + usage() + utils.die("") + +environ = dict() # TODO: why do we need this at all? +environ["EMERGE_TRACE"] = os.getenv( "EMERGE_TRACE" ) +environ["EMERGE_BUILDTESTS"] = os.getenv( "EMERGE_BUILDTESTS" ) +environ["EMERGE_OFFLINE"] = os.getenv( "EMERGE_OFFLINE" ) +environ["EMERGE_FORCED"] = os.getenv( "EMERGE_FORCED" ) +environ["EMERGE_VERSION"] = os.getenv( "EMERGE_VERSION" ) +environ["EMERGE_BUILDTYPE"] = os.getenv( "EMERGE_BUILDTYPE" ) +environ["EMERGE_TARGET"] = os.getenv( "EMERGE_TARGET" ) +environ["EMERGE_PKGPATCHLVL"] = os.getenv( "EMERGE_PKGPATCHLVL" ) +environ["EMERGE_LOG_DIR"] = os.getenv( "EMERGE_LOG_DIR" ) + +if environ['EMERGE_TRACE'] == None or not environ['EMERGE_TRACE'].isdigit(): + trace = 0 + os.environ["EMERGE_TRACE"] = str( trace ) +else: + trace = int( environ[ "EMERGE_TRACE" ] ) + +mainOpts = list() + +executableName = sys.argv.pop( 0 ) +nextArguments = sys.argv[:] + +for i in sys.argv: + nextArguments.pop(0) + if ( i == "-p" or i == "--probe" ): + doPretend = True + elif ( i.startswith("--options=") ): + # @todo how to add -o option + options = i.replace( "--options=", "" ) + if "EMERGE_OPTIONS" in os.environ: + os.environ["EMERGE_OPTIONS"] += " %s" % options + else: + os.environ["EMERGE_OPTIONS"] = options + elif ( i == "-z" ): + outDateVCS = True + elif ( i == "-sz" ): + outDatePackage = True + elif ( i == "-q" ): + stayQuiet = True + elif ( i == "-t" ): + os.environ["EMERGE_BUILDTESTS"] = "True" + elif i == "-c" or i == "--continue": + continueFlag = True + elif ( i == "--offline" ): + mainOpts.append( "--offline" ) + os.environ["EMERGE_OFFLINE"] = "True" + elif ( i == "-f" or i == "--force" ): + os.environ["EMERGE_FORCED"] = "True" + elif ( i.startswith( "--buildtype=" ) ): + os.environ["EMERGE_BUILDTYPE"] = i.replace( "--buildtype=", "" ) + elif ( i.startswith( "--target=" ) ): + os.environ["EMERGE_TARGET"] = i.replace( "--target=", "" ) + elif ( i.startswith( "--patchlevel=" ) ): + os.environ["EMERGE_PKGPATCHLVL"] = i.replace( "--patchlevel=", "" ) + elif ( i.startswith( "--log-dir=" ) ): + os.environ["EMERGE_LOG_DIR"] = i.replace( "--log-dir=", "" ) + elif ( i == "-v" ): + utils.Verbose.increase() + elif ( i == "--trace" ): + trace = trace + 1 + os.environ["EMERGE_TRACE"] = str( trace ) + elif ( i == "--nocopy" ): + os.environ["EMERGE_NOCOPY"] = str( True ) + elif ( i == "--noclean" ): + os.environ["EMERGE_NOCLEAN"] = str( True ) + elif ( i == "--clean" ): + os.environ["EMERGE_NOCLEAN"] = str( False ) + elif ( i in [ "--version-dir", "--version-package", "--print-installable", + "--print-installed", "--print-targets" ] ): + mainBuildAction = i[2:] + stayQuiet = True + if i in [ "--print-installable", "--print-installed" ]: + break + elif ( i == "-i" ): + ignoreInstalled = True + elif ( i == "--update" ): + ignoreInstalled = True + os.environ["EMERGE_NOCLEAN"] = str( True ) + elif ( i == "--update-all" ): + ignoreInstalled = True + os.environ["EMERGE_NOCLEAN"] = str( True ) + updateAll = True + elif ( i == "--install-deps" ): + ignoreInstalled = True + mainBuildAction = "install-deps" + elif ( i in [ "--fetch", "--unpack", "--preconfigure", "--configure", "--compile", "--make", + "--install", "--qmerge", "--manifest", "--package", "--unmerge", "--test", "--checkdigest", "--dumpdeps", + "--full-package", "--cleanimage", "--cleanbuild", "--createpatch", "--geturls"] ): + mainBuildAction = i[2:] + elif ( i == "--print-revision" ): + mainBuildAction = "printrev" + elif ( i == "--disable-buildhost" ): + disableHostBuild = True + elif ( i == "--disable-buildtarget" ): + disableTargetBuild = True + elif( i == "--cleanup" ): + utils.debug("Starting to clean emerge" ) + utils.system("cd %s && git clean -f -x -e *.py -e *.diff -e *.ba\\t -e *.cmd -e *.reg" % os.path.join(os.getenv("KDEROOT"),"emerge") ) + exit(0) + elif( i == "--cleanup-dry" ): + utils.debug("Starting to clean emerge" ) + utils.system("cd %s && git clean --dry-run -x -e *.py -e *.diff -e *.ba\\t -e *.cmd -e *.reg" % os.path.join(os.getenv("KDEROOT"),"emerge") ) + exit(0) + elif i == "--cleanallbuilds": + # clean complete build directory + utils.cleanDirectory(os.path.join( os.getenv("KDEROOT"), "build")) + exit(0) + elif ( i == "--search" ): + package = nextArguments.pop(0) + category = "" + if not package.find("/") == -1: + (category,package) = package.split("/") + portageSearch.printSearch(category, package) + exit(0) + elif ( i.startswith( "-" ) ): + usage() + exit ( 1 ) + else: + packageName = i + break + +if stayQuiet == True: + utils.setVerbose(0) + +# get KDEROOT from env +KDEROOT = os.getenv( "KDEROOT" ) +utils.debug( "buildAction: %s" % mainBuildAction ) +utils.debug( "doPretend: %s" % doPretend, 1 ) +utils.debug( "packageName: %s" % packageName ) +utils.debug( "buildType: %s" % os.getenv( "EMERGE_BUILDTYPE" ) ) +utils.debug( "buildTests: %s" % utils.envAsBool( "EMERGE_BUILDTESTS" ) ) +utils.debug( "verbose: %d" % utils.verbose(), 1 ) +utils.debug( "trace: %s" % os.getenv( "EMERGE_TRACE" ), 1 ) +utils.debug( "KDEROOT: %s\n" % KDEROOT, 1 ) +utils.debug_line() + +def unset_var( varname ): + if not os.getenv( varname ) == None: + print() + utils.warning( "%s found as environment variable. you cannot override emerge"\ + " with this - unsetting %s locally" % ( varname, varname ) ) + os.environ[ varname ] = "" + +unset_var( "CMAKE_INCLUDE_PATH" ) +unset_var( "CMAKE_LIBRARY_PATH" ) +unset_var( "CMAKE_FIND_PREFIX" ) +unset_var( "CMAKE_INSTALL_PREFIX" ) + +# adding emerge/bin to find base.py and gnuwin32.py etc. +os.environ["PYTHONPATH"] = os.getenv( "PYTHONPATH", "" ) + os.pathsep + \ + os.path.join( os.getcwd(), os.path.dirname( executableName ) ) +sys.path.append( os.path.join( os.getcwd(), os.path.dirname( executableName ) ) ) + +_deplist = [] +deplist = [] +packageList = [] +categoryList = [] + + +buildType = os.getenv("EMERGE_BUILDTYPE") +if "EMERGE_DEFAULTCATEGORY" in os.environ: + defaultCategory = os.environ["EMERGE_DEFAULTCATEGORY"] +else: + defaultCategory = "kde" + +if updateAll: + installedPackages = portage.PortageInstance.getInstallables() + if portage.PortageInstance.isCategory( packageName ): + utils.debug( "Updating installed packages from category " + packageName, 1 ) + else: + utils.debug( "Updating all installed packages", 1 ) + packageList = [] + for mainCategory, mainPackage, _dummy in installedPackages: + if portage.PortageInstance.isCategory( packageName ) and ( mainCategory != packageName ): + continue +# FIXME: +# if portage.isInstalled( mainCategory, mainPackage, mainVersion, buildType ) \ +# and portage.isPackageUpdateable( mainCategory, mainPackage, mainVersion ): +# categoryList.append( mainCategory ) +# packageList.append( mainPackage ) + utils.debug( "Will update packages: " + str (packageList), 1 ) +elif packageName: + packageList, categoryList = portage.getPackagesCategories(packageName) + +for entry in packageList: + utils.debug( "%s" % entry, 1 ) +utils.debug_line( 1 ) + +for mainCategory, entry in zip (categoryList, packageList): + _deplist = portage.solveDependencies( mainCategory, entry, _deplist ) + +deplist = [p.ident() for p in _deplist] + +for item in range( len( deplist ) ): + if deplist[ item ][ 0 ] in categoryList and deplist[ item ][ 1 ] in packageList: + deplist[ item ].append( ignoreInstalled ) + else: + deplist[ item ].append( False ) + + utils.debug( "dependency: %s" % deplist[ item ], 1 ) + +#for item in deplist: +# cat = item[ 0 ] +# pac = item[ 1 ] +# ver = item[ 2 ] + +# if portage.isInstalled( cat, pac, ver, buildType) and updateAll and not portage.isPackageUpdateable( cat, pac, ver ): +# print "remove:", cat, pac, ver +# deplist.remove( item ) + +if mainBuildAction == "install-deps": + # the first dependency is the package itself - ignore it + # TODO: why are we our own dependency? + del deplist[ 0 ] + +deplist.reverse() + +# package[0] -> category +# package[1] -> package +# package[2] -> version + +if ( mainBuildAction != "all" and mainBuildAction != "install-deps" ): + # if a buildAction is given, then do not try to build dependencies + # and do the action although the package might already be installed. + # This is still a bit problematic since packageName might not be a valid + # package + + if packageName and len( deplist ) >= 1: + mainCategory, mainPackage, tag, ignoreInstalled = deplist[ -1 ] + else: + mainCategory, mainPackage = None, None + + if not handlePackage( mainCategory, mainPackage, mainBuildAction, mainOpts ): + utils.notify("Emerge %s failed" % mainBuildAction, "%s of %s/%s failed" % ( mainBuildAction, mainCategory, mainPackage ), mainBuildAction) + exit(1) + utils.notify("Emerge %s finished"% mainBuildAction, "%s of %s/%s finished" % ( mainBuildAction, mainCategory, mainPackage ), mainBuildAction) + +else: + for mainCategory, mainPackage, defaultTarget, ignoreInstalled in deplist: + target = "" + targetList = [] + isLastPackage = [mainCategory, mainPackage, defaultTarget, ignoreInstalled] == deplist[-1] + if outDateVCS or (outDatePackage and isLastPackage): + target = os.getenv( "EMERGE_TARGET" ) + if not target or target not in list(portage.PortageInstance.getAllTargets( mainCategory, mainPackage ).keys()): + # if no target or a wrong one is defined, simply set the default target here + target = defaultTarget + targetList = portage.PortageInstance.getUpdatableVCSTargets( mainCategory, mainPackage ) + if isDBEnabled(): + if emergePlatform.isCrossCompilingEnabled(): + hostEnabled = portage.isHostBuildEnabled( mainCategory, mainPackage ) + targetEnabled = portage.isTargetBuildEnabled( mainCategory, mainPackage ) + hostInstalled = installdb.isInstalled( mainCategory, mainPackage ) + targetInstalled = installdb.isInstalled( mainCategory, mainPackage, os.getenv( "EMERGE_TARGET_PLATFORM" ) ) + isInstalled = ( not hostEnabled or hostInstalled ) and ( not targetEnabled or targetInstalled ) + else: + isInstalled = installdb.isInstalled( mainCategory, mainPackage, prefix=None ) + else: + isInstalled = portage.isInstalled( mainCategory, mainPackage, buildType ) + if ( isInstalled and not ignoreInstalled ) and not ( + isInstalled and (outDateVCS or (outDatePackage and isLastPackage) ) and target in targetList ): + if utils.verbose() > 1 and mainPackage == packageName: + utils.warning( "already installed %s/%s" % ( mainCategory, mainPackage ) ) + elif utils.verbose() > 2 and not mainPackage == packageName: + utils.warning( "already installed %s/%s" % ( mainCategory, mainPackage ) ) + else: + # in case we only want to see which packages are still to be build, simply return the package name + if ( doPretend ): + if utils.verbose() > 0: + msg = " " + if emergePlatform.isCrossCompilingEnabled(): + if isDBEnabled(): + hostEnabled = portage.isHostBuildEnabled( mainCategory, mainPackage ) + targetEnabled = portage.isTargetBuildEnabled( mainCategory, mainPackage ) + hostInstalled = installdb.isInstalled( mainCategory, mainPackage, prefix=None ) + targetInstalled = installdb.isInstalled( mainCategory, mainPackage, os.getenv( "EMERGE_TARGET_PLATFORM" ) ) + msg += portage.getHostAndTarget( hostEnabled and not hostInstalled, targetEnabled and not targetInstalled ) + else: + msg = "" + utils.warning( "pretending %s/%s%s" % ( mainCategory, mainPackage, msg ) ) + else: + mainAction = mainBuildAction + if mainBuildAction == "install-deps": + mainAction = "all" + + if not handlePackage( mainCategory, mainPackage, mainAction, mainOpts ): + utils.error( "fatal error: package %s/%s %s failed" % \ + ( mainCategory, mainPackage, mainBuildAction ) ) + utils.notify("Emerge build failed", "Build of %s/%s failed" % ( mainCategory, mainPackage ), mainAction) + exit( 1 ) + utils.notify("Emerge build finished", "Build of %s/%s finished" % ( mainCategory, mainPackage ), mainAction) + +utils.new_line() +if len( nextArguments ) > 0: + command = "\"" + sys.executable + "\" -u " + executableName + " " + " ".join( nextArguments ) + + #for element in environ.keys(): + # if environ[ element ]: + # os.environ[ element ] = environ[ element ] + # elif element == "EMERGE_VERBOSE": + # os.environ[ element ] = "1" + # else: + # os.environ[ element ] = "" + if not utils.system(command): + utils.die( "cannot execute next commands cmd: %s" % command ) + +utils.stopTimer("Emerge") + diff --git a/bin/utils.py b/bin/utils.py index 8926b88f5..c0595e633 100644 --- a/bin/utils.py +++ b/bin/utils.py @@ -1,1482 +1,1487 @@ # -*- coding: utf-8 -*- """@brief utilities this file contains some helper functions for emerge """ # copyright: # Holger Schroeder # Patrick Spendrin # Ralf Habacker import http.client import ftplib import os.path import sys import urllib.parse import shutil import zipfile import tarfile import hashlib import traceback import tempfile import getpass import subprocess import re import inspect import types import datetime from operator import itemgetter import Notifier.NotificationLoader +import ctypes + if os.name == 'nt': import msvcrt # pylint: disable=F0401 else: import fcntl # pylint: disable=F0401 import configparser def abstract(): caller = inspect.getouterframes(inspect.currentframe())[1][3] raise NotImplementedError(caller + ' must be implemented in subclass') def varAsBool(var): return var.lower() in ['true', '1'] def envAsBool(key, default=False): """ return value of environment variable as bool value """ value = os.getenv(key) if value: return value.lower() in ['true', '1'] else: return default def isSourceOnly(): return envAsBool("EMERGE_SOURCEONLY") def LockFileName(lock_id): '''Generate a user global lock file. For id lock_id TODO: generate it smarter to prevent security issues and possible collisions. ''' if not envAsBool("EMERGE_%s_LOCK" % lock_id): return None try: return os.environ["EMERGE_%s_LOCK_FILE" % lock_id] except KeyError: pass return os.path.join( tempfile.gettempdir(), "emerge%s-%s.lck" % (lock_id, getpass.getuser())) class LockFile(object): """Context manager for a user global lock file""" def __init__(self, file_name): self.file_name = file_name self.file_handle = None def __enter__(self): if not self.file_name: return self.file_handle = open(self.file_name, 'a') fh = self.file_handle if os.name == 'nt': fh.seek(0) while True: try: msvcrt.locking(fh.fileno(), msvcrt.LK_LOCK, 2147483647) except IOError: # after 15 secs (every 1 sec, 1 attempt -> 15 secs) # a exception is raised but we want to continue trying. continue break else: fcntl.flock(fh, fcntl.LOCK_EX) fh.truncate(0) print("%d" % os.getpid(), file=fh) fh.flush() def __exit__(self, exc_type, exc_value, exc_tb): fh = self.file_handle if fh is None: return self.file_handle = None if os.name == 'nt': fh.seek(0) msvcrt.locking(fh.fileno(), msvcrt.LK_UNLCK, 2147483647) else: fcntl.flock(fh, fcntl.LOCK_UN) try: fh.close() except IOError: traceback.print_exc() ### fetch functions #FIXME: get this from somewhere else: WGetExecutable = os.path.join( os.getenv( "KDEROOT" ), "bin", "wget.exe" ) if not os.path.exists( WGetExecutable ): WGetExecutable = os.path.join( os.getenv( "KDEROOT" ), "dev-utils", "bin", "wget.exe" ) def test4application( appname): """check if the application specified by 'appname' is available""" try: f = open('NUL:') p = subprocess.Popen( appname, stdout=f, stderr=f ) p.wait() return True except OSError: debug( "could not find application %s" % appname, 1 ) return False class Verbose(object): """ This class will work on the overall output verbosity It defines the interface for the option parser but before the default value is taken from the environment variable. There is only one verbosity value for all parts of emerge. Always updates the shell variable EMERGE_VERBOSE. """ __level = os.getenv("EMERGE_VERBOSE") if not __level or not __level.isdigit() or int(__level) < 0: __level = 1 else: __level = int(__level) @staticmethod def increase(): """increase verbosity""" Verbose.setLevel(Verbose.__level + 1) @staticmethod def decrease(): """decrease verbosity""" Verbose.setLevel(Verbose.__level - 1) @staticmethod def level(): return Verbose.__level @staticmethod def setLevel(newLevel): """ set the level by hand for quick and dirty changes """ Verbose.__level = max(0, newLevel) os.putenv("EMERGE_VERBOSE", str(newLevel)) def verbose( self ): """ returns the verbosity level for the application """ return Verbose.__level class TemporaryVerbosity(object): """Context handler for temporarily different verbosity""" def __init__(self, tempLevel): self.prevLevel = verbose() setVerbose(tempLevel) def __enter__(self): return self def __exit__(self, exc_type, exc_value, trback): setVerbose(self.prevLevel) def verbose(): """return the value of the verbose level""" return Verbose.level() def setVerbose( _verbose ): Verbose.setLevel(_verbose) def getFiles( urls, destdir, suffix='' , filenames = ''): """download files from 'url' into 'destdir'""" debug( "getfiles called. urls: %s, filenames: %s, suffix: %s" % ( urls, filenames, suffix ), 1 ) # make sure distfiles dir exists if ( not os.path.exists( destdir ) ): os.makedirs( destdir ) if type(urls) == list: urlList = urls else: urlList = urls.split() if filenames == '': filenames = [ os.path.basename(x) for x in urlList ] if type(filenames) == list: filenameList = filenames else: filenameList = filenames.split() dlist = list(zip( urlList , filenameList )) for url,filename in dlist: if ( not getFile( url + suffix, destdir , filename ) ): return False return True def getFile( url, destdir , filename='' ): """download file from 'url' into 'destdir'""" debug( "getFile called. url: %s" % url, 1 ) if url == "": error( "fetch: no url given" ) return False wgetpath = WGetExecutable if ( os.path.exists( wgetpath ) ): return wgetFile( url, destdir , filename ) scheme, host, path, _, _, _ = urllib.parse.urlparse( url ) filename = os.path.basename( path ) debug( "%s\n%s\n%s\n%s" % ( scheme, host, path, filename ) ) if ( scheme == "http" ): return getHttpFile( host, path, destdir, filename ) elif ( scheme == "ftp" ): return getFtpFile( host, path, destdir, filename ) else: error( "getFile: protocol not understood" ) return False def wgetFile( url, destdir, filename=''): """download file with wget from 'url' into 'destdir', if filename is given to the file specified""" compath = WGetExecutable command = "%s --no-check-certificate -c -t 10" % compath if os.environ.get("EMERGE_NO_PASSIVE_FTP"): command += " --no-passive-ftp " if(filename ==''): command += " -P %s" % destdir else: command += " -O %s" % os.path.join( destdir, filename ) command += " %s" % url debug( "wgetfile called", 1 ) ret = system( command ) debug( "wget ret: %s" % ret, 2) return ret def getFtpFile( host, path, destdir, filename ): """download file from a ftp host specified by 'host' and 'path' into 'destdir' using 'filename' as file name""" # FIXME check return values here (implement useful error handling)... debug( "FIXME getFtpFile called. %s %s" % ( host, path ), 1 ) ftp = ftplib.FTP( host ) ftp.login( "anonymous", "johndoe" ) with open( os.path.join( destdir, filename ), "wb" ) as outfile: ftp.retrbinary( "RETR " + path, outfile.write ) return True def getHttpFile( host, path, destdir, filename ): """download file from a http host specified by 'host' and 'path' into 'destdir' using 'filename' as file name""" # FIXME check return values here (implement useful error handling)... debug( "getHttpFile called. %s %s" % ( host, path ), 1 ) conn = http.client.HTTPConnection( host ) conn.request( "GET", path ) r1 = conn.getresponse() debug( "status: %s; reason: %s" % ( str( r1.status ), str( r1.reason ) ) ) count = 0 while r1.status == 302: if count > 10: debug( "Redirect loop" ) return False count += 1 _, host, path, _, _, _ = urllib.parse.urlparse( r1.getheader( "Location" ) ) debug( "Redirection: %s %s" % ( host, path ), 1 ) conn = http.client.HTTPConnection( host ) conn.request( "GET", path ) r1 = conn.getresponse() debug( "status: %s; reason: %s" % ( str( r1.status ), str( r1.reason ) ) ) data = r1.read() with open( os.path.join( destdir, filename ), "wb" ) as f: f.write( data ) return True def isCrEol(filename): with open(filename, "rb") as f: return str(f.readline(),'UTF-8').endswith("\r\n") def checkFilesDigests( downloaddir, filenames, digests=None ): """check digest of (multiple) files specified by 'filenames' from 'downloaddir'""" if digests != None: if type(digests) == list: digestList = digests elif digests.find("\n") != -1: digestList = digests.splitLines() else: digestList = [digests] i = 0 for filename in filenames: debug( "checking digest of: %s" % filename, 1 ) pathName = os.path.join( downloaddir, filename ) if digests == None: digestFileName = pathName + '.sha1' if not os.path.exists( digestFileName ): digestFileName, _ = os.path.splitext( pathName ) digestFileName += '.sha1' if not os.path.exists( digestFileName ): error( "digest validation request for file %s, but no digest file present" % pathName ) return False currentHash = digestFileSha1( pathName ) with open( digestFileName, "r" ) as f: line = f.readline() digest = re.search('\\b[0-9a-fA-F]{40}\\b', line) if not digest: error( " digestFile %s for file %s does not contain a valid checksum" % (digestFileName, pathName,) ) return False digest = digest.group(0) if len(digest) != len(currentHash) or digest.find(currentHash) == -1: error( "digest value for file %s (%s) do not match (%s)" % (pathName, currentHash, digest) ) return False # digest provided in digests parameter else: currentHash = digestFileSha1( pathName ) digest = digestList[i].strip() if len(digest) != len(currentHash) or digest.find(currentHash) == -1: error( "digest value for file %s (%s) do not match (%s)" % (pathName, currentHash, digest) ) return False i = i + 1 return True def createFilesDigests( downloaddir, filenames ): """create digests of (multiple) files specified by 'filenames' from 'downloaddir'""" digestList = list() for filename in filenames: pathName = os.path.join( downloaddir, filename ) digest = digestFileSha1( pathName ) entry = filename, digest digestList.append(entry) return digestList def createDigestFile(path): """creates a sha1 diget file""" digets = digestFileSha1(path) f = open(path + ".sha1","wb+") f.write(bytes(digets,"UTF-8")) f.write(bytes("\n",'UTF-8')) f.close() def printFilesDigests( digestFiles, buildTarget=None): size = len( digestFiles ) i = 0 for (fileName, digest) in digestFiles: print("%40s %s" % ( fileName, digest ), end=' ') if size == 1: if buildTarget == None: print(" '%s'" % ( digest )) else: print("self.targetDigests['%s'] = '%s'" % ( buildTarget, digest )) else: if buildTarget == None: if i == 0: print(" ['%s'," % ( digest )) elif i == size-1: print(" '%s']" % ( digest )) else: print(" '%s'," % ( digest )) i = i + 1 else: if i == 0: print("self.targetDigests['%s'] = ['%s'," % ( buildTarget, digest )) elif i == size-1: print(" '%s']" % ( digest )) else: print(" '%s'," % ( digest )) i = i + 1 ### unpack functions def unpackFiles( downloaddir, filenames, workdir ): """unpack (multiple) files specified by 'filenames' from 'downloaddir' into 'workdir'""" cleanDirectory( workdir ) for filename in filenames: debug( "unpacking this file: %s" % filename, 1 ) if ( not unpackFile( downloaddir, filename, workdir ) ): return False return True def unpackFile( downloaddir, filename, workdir ): """unpack file specified by 'filename' from 'downloaddir' into 'workdir'""" ( shortname, ext ) = os.path.splitext( filename ) if ( ext == ".zip" ): return unZip( os.path.join( downloaddir, filename ), workdir ) elif ( ext == ".7z" ): return un7zip( os.path.join( downloaddir, filename ), workdir ) elif ( ext == ".tgz" ): return unTar( os.path.join( downloaddir, filename ), workdir ) elif ( ext == ".gz" or ext == ".bz2" or ext == ".lzma" or ext == ".xz" ): _, myext = os.path.splitext( shortname ) if ( myext == ".tar" ): return unTar( os.path.join( downloaddir, filename ), workdir ) else: error( "unpacking %s" % myext ) return False elif ( ext == ".exe" ): warning( "unpack ignoring exe file" ) return True else: error( "dont know how to unpack this file: %s" % filename ) return False def un7zip( fileName, destdir ): command = "7za x -r -y -o%s %s" % ( destdir, fileName ) if verbose() > 1: return system( command ) else: tmp = tempfile.TemporaryFile() return system( command, stdout=tmp ) def unTar( fileName, destdir,uselinks = envAsBool("EMERGE_USE_SYMLINKS") ): """unpack tar file specified by 'file' into 'destdir'""" debug( "unTar called. file: %s, destdir: %s" % ( fileName, destdir ), 1 ) ( shortname, ext ) = os.path.splitext( fileName ) emerge_tmp = os.path.join(destdir,"emerge_tmp") mode = "r" if ( ext == ".gz" ): mode = "r:gz" #elif(ext == ".bz2"): #mode = "r:bz2" elif(ext == ".lzma" or ext == ".xz" or ext == ".bz2"): un7zip( fileName, emerge_tmp ) _, tarname = os.path.split( shortname ) fileName = os.path.join( emerge_tmp , tarname ) if not os.path.exists( fileName ): error( "couldn't find file %s" % fileName ) return False try: with tarfile.open( fileName, mode ) as tar: # FIXME how to handle errors here ? for tarMember in tar: try: if not uselinks and tarMember.issym(): tarDir = os.path.dirname(tarMember.name) target = tarMember.linkname if not target.startswith("/"):#abspath? target = os.path.normpath("%s/%s"%(tarDir, target)).replace("\\","/") if target in tar.getnames(): tar.extract(target, emerge_tmp ) shutil.move(os.path.join( emerge_tmp , tarDir , tarMember.linkname ),os.path.join( destdir , tarMember.name )) else: warning("link target %s for %s not included in tarfile" % ( target , tarMember.name)) else: tar.extract(tarMember, destdir ) except tarfile.TarError: error( "couldn't extract file %s to directory %s" % ( fileName, destdir ) ) return False return True except tarfile.TarError: error( "could not open existing tar archive: %s" % fileName ) return False finally: if os.path.exists(emerge_tmp): shutil.rmtree(emerge_tmp) def unZip( fileName, destdir ): """unzip file specified by 'file' into 'destdir'""" debug( "unZip called: file %s to destination %s" % ( fileName, destdir ), 1 ) if not os.path.exists( destdir ): os.makedirs( destdir ) try: zipObj = zipfile.ZipFile( fileName ) except (zipfile.BadZipfile, IOError): error( "couldn't extract file %s" % fileName ) return False for name in zipObj.namelist(): if not name.endswith( '/' ): dirname = os.path.join( destdir, os.path.dirname( name ) ) if not os.path.exists( dirname ): os.makedirs( dirname ) with open( os.path.join( destdir, name ), 'wb' ) as outfile: outfile.write( zipObj.read( name ) ) return True ### svn fetch/unpack functions def svnFetch( repo, destdir, username = None, password = None ): debug( "utils svnfetch: repo %s to destination %s" % ( repo, destdir ), 1 ) if ( not os.path.exists( destdir ) ): os.makedirs( destdir ) os.chdir( destdir ) ret = 0 #if ( len( os.listdir( destdir ) ) == 0 ): directory = os.path.basename( repo.replace( "/", "\\" ) ) path = os.path.join( destdir, directory ) debug( "path: %s" % path, 1 ) if ( not os.path.exists( path ) ): # not checked out yet command = "svn checkout %s" % repo if ( username != None ): command = command + " --username " + username if ( password != None ): command = command + " --password " + password with LockFile(LockFileName("SVN")): ret = system( command ) else: # already checked out, so only update os.chdir( path ) debug( "svn up cwd: %s" % os.getcwd(), 1 ) with LockFile(LockFileName("SVN")): ret = system( "svn update" ) if ( ret == 0 ): return True else: return False ### package dependencies functions def checkManifestFile( name, category, package, version ): if os.path.isfile( name ): with open( name, "rt" ) as f: header = f.readline() line = f.readline() if not '/' in line: # update the file line = "%s/%s:%s:%s" % ( package, category, package, version ) with open( name, "wt" ) as f: f.write( header ) f.write( line ) if ( line.startswith( "%s/%s:%s:" % ( category, package, version ) ) ): return True return False def info( message ): if verbose() > 0: print("emerge info: %s" % message) return True def debug( message, level=0 ): if verbose() > level and verbose() > 0: print("emerge debug:", message) sys.stdout.flush() return True def warning( message ): if verbose() > 0: print("emerge warning: %s" % message) return True def new_line( level=0 ): if verbose() > level and verbose() > 0: print() def debug_line( level=0 ): if verbose() > level and verbose() > 0: print("_" * 80) def error( message ): if verbose() > 0: print("emerge error: %s" % message, file=sys.stderr) return False def die( message ): print("emerge fatal error: %s" % message, file=sys.stderr) stopAllTimer() exit( 1 ) def traceMode(): """return the value of the trace level""" traceVal = os.getenv( "EMERGE_TRACE" ) if ( not traceVal == None and traceVal.isdigit() and int(traceVal) > 0 and verbose() > 0 ): return int( traceVal ) else: return 0 def trace( message, dummyLevel=0 ): if traceMode(): #> level: print("emerge trace:", message) sys.stdout.flush() return True def system(cmd, **kw ): """execute cmd in a shell. All keywords are passed to Popen. stdout and stderr might be changed depending on the chosen logging options.""" kw['shell'] = True return systemWithoutShell(cmd, **kw) def systemWithoutShell(cmd, **kw): """execute cmd. All keywords are passed to Popen. stdout and stderr might be changed depending on the chosen logging options.""" debug( "executing command: %s" % cmd, 1 ) if kw.get('stdout') is None: kw['stdout'] = sys.stdout if kw.get('stderr') is None: kw['stderr'] = sys.stderr redirected = False prevStreams = sys.stdout, sys.stderr try: if verbose() == 0 and kw['stdout']== sys.stdout and kw['stderr'] == sys.stderr: redirected = True sys.stderr = sys.stdout = open('test.outlog', 'wb') p = subprocess.Popen( cmd, **kw ) ret = p.wait() finally: if redirected: sys.stderr.close() sys.stdout, sys.stderr = prevStreams return ( ret == 0 ) def copySrcDirToDestDir( srcdir, destdir ): """ deprecated """ return copyDir( srcdir, destdir ) def moveSrcDirToDestDir( srcdir, destdir ): """ deprecated """ return moveDir( srcdir, destdir ) def getFileListFromDirectory( imagedir ): """ create a file list containing hashes """ ret = [] myimagedir = imagedir if ( not imagedir.endswith( "\\" ) ): myimagedir = myimagedir + "\\" for root, _, files in os.walk( imagedir ): for fileName in files: ret.append( ( os.path.join( root, fileName ).replace( myimagedir, "" ), digestFile( os.path.join( root, fileName ) ) ) ) return ret def isVersion( part ): ver_regexp = re.compile("^(cvs\\.)?(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?$") if ver_regexp.match( part ): return True else: return False def etcDir(): """the etc directory for portage""" return os.path.join( os.getenv( "KDEROOT" ), "etc", "portage" ) def packageSplit( fullname ): """ instead of using portage_versions.catpkgsplit use this function now """ splitname = fullname.split('-') x = 0 # fixes pylint warning about using possibly undefined loop variable. # maybe this could be simplified by using only one for loop. for x in range( len( splitname ) ): if isVersion( splitname[ x ] ): break package = splitname[ 0 ] version = splitname[ x ] for part in splitname[ 1 : x ]: package += '-' + part for part in splitname[ x + 1: ]: version += '-' + part return [ package, version ] def getManifestFiles(rootdir, package): """return a list of manifest files for package. The file names are relative to rootdir and normalized (lowercase on windows). Only return existing files - it sometimes happens that the manifest file exists in the manifest directory but not in the package directory""" result = [] manifestDir = os.path.join( rootdir, "manifest" ) if not os.path.exists( manifestDir ): debug("could not find manifest directory %s" % manifestDir, 2) else: fileNames = (os.path.normcase(x) for x in os.listdir(manifestDir) if x.endswith(".mft")) for fileName in fileNames: if package == packageSplit( fileName.replace( ".mft", ""))[0]: fullName = os.path.join(rootdir, "manifest", fileName) if os.path.exists(fullName): result.append(fileName) else: warning("did not find manifest file %s" % fullName) if not result: debug( "could not find any manifest files in %s for rootdir=%s, package=%s" % \ (manifestDir, rootdir, package), 2 ) return result def getFileListFromManifest(rootdir, package, withManifests=False): """ return sorted list according to the manifest files for deletion/import. Each item holds a file name and a digest. If a file name appears once with and once without digest (which often is the case for *.mft), it is only returned once with digest. The file names are normalized: on Windows, all lowercase. Do not return the names of manifest files unless explicitly requested. """ fileList = dict() manifestFiles = [os.path.join(rootdir, "manifest", x) for x in getManifestFiles(rootdir, package)] for manifestFile in manifestFiles: with open(manifestFile, 'rt' ) as fptr: for line in fptr: try: line = line.replace( "\n", "" ).replace( "\r", "" ) # check for digest having two spaces between filename and hash if not line.find( " " ) == -1: [ b, a ] = line.rsplit( " ", 2 ) # check for filname have spaces elif line.count( " " ) > 1: ri = line.rindex( " " ) b = line[ ri: ] a = line[ : ri - 1 ] # check for digest having one spaces elif not line.find( " " ) == -1: [ a, b ] = line.rsplit( " ", 2 ) else: a, b = line, "" except Exception: # pylint: disable=W0703 die( "could not parse line %s" % line) a = os.path.normcase(a) if withManifests or os.path.join( rootdir, a) not in manifestFiles: if a not in fileList or not fileList[a]: # if it is not yet in the fileList or without digest: fileList[a] = b return sorted(list(fileList.items()), key = lambda x: x[0]) def unmergeFileList(rootdir, fileList, forced=False): """ delete files in the fileList if has matches or forced is True """ for filename, filehash in fileList: fullPath = os.path.join(rootdir, os.path.normcase( filename)) if os.path.isfile(fullPath): currentHash = digestFile(fullPath) if currentHash == filehash or filehash == "" or os.path.islink(fullPath): debug( "deleting file %s" % fullPath) try: os.remove(fullPath) except OSError: system( "cmd /C \"attrib -R %s\"" % fullPath ) os.remove(fullPath) else: if forced: warning( "file %s has different hash: %s %s, deleting anyway" % \ (fullPath, currentHash, filehash ) ) try: os.remove(fullPath) except OSError: system( "cmd /C \"attrib -R %s\"" % fullPath ) os.remove(fullPath) else: warning( "file %s has different hash: %s %s, run with option --force to delete it anyway" % \ (fullPath, currentHash, filehash ) ) elif not os.path.isdir(fullPath): warning( "file %s does not exist" % fullPath) def unmerge(rootdir, package, forced=False): """ delete files according to the manifest files. returns False if it found no manifest files.""" debug( "unmerge called: %s" % ( package ), 2 ) fileList = getFileListFromManifest(rootdir, package, withManifests=True) unmergeFileList(rootdir, fileList, forced) return bool(fileList) def cleanManifestDir(imageDir): manifestDir = os.path.join( imageDir, "manifest" ) if os.path.exists( manifestDir ): rmtree(manifestDir) def createManifestDir(imagedir, category, package, version ): """if not yet existing, create the manifest files for an imagedir like the kdewin-packager does""" if not hasManifestFile( imagedir, package ): createManifestFiles( imagedir, imagedir, category, package, version ) def hasManifestFile( imagedir, package ): if os.path.exists( os.path.join( imagedir, "manifest" ) ): for fileName in os.listdir( os.path.join( imagedir, "manifest" ) ): if fileName.startswith( package ) and fileName.endswith( "-bin.mft" ): return True return False def createManifestFiles( imagedir, destdir, category, package, version ): """create the manifest files for an imagedir like the kdewin-packager does""" debug( "createManifestFiles called: %s %s %s %s %s" % ( imagedir, destdir, category, package, version ), 1 ) myimagedir = imagedir if ( not imagedir.endswith( "\\" ) ): myimagedir = myimagedir + "\\" binList = list() libList = list() docList = list() dirType = 0 for root, _, files in os.walk( imagedir ): relativeRoot = root.replace( imagedir, "" ) if relativeRoot.startswith("\\manifest"): continue if relativeRoot.startswith( "\\bin" ): dirType = 1 elif relativeRoot.startswith( "\\lib" ): dirType = 2 elif relativeRoot.startswith( "\\share" ): dirType = 3 elif relativeRoot.startswith( "\\data" ): dirType = 4 elif relativeRoot.startswith( "\\etc" ): dirType = 5 elif relativeRoot.startswith( "\\include" ): dirType = 6 elif relativeRoot.startswith( "\\doc" ): dirType = 7 elif relativeRoot.startswith( "\\man" ): dirType = 8 else: dirType = 1 for fileName in files: if dirType == 1 or dirType == 2: binList.append( os.path.join( root, fileName ).replace( myimagedir, "" ) ) if dirType == 2: if fileName.endswith( ".a" ) or fileName.endswith( ".lib" ): libList.append( os.path.join( root, fileName ).replace( myimagedir, "" ) ) else: binList.append( os.path.join( root, fileName ).replace( myimagedir, "" ) ) if dirType == 3 or dirType == 4 or dirType == 5: binList.append( os.path.join( root, fileName ).replace( myimagedir, "" ) ) if dirType == 6: libList.append( os.path.join( root, fileName ).replace( myimagedir, "" ) ) if dirType == 7 or dirType == 8: docList.append( os.path.join( root, fileName ).replace( myimagedir, "" ) ) if not os.path.exists( os.path.join( destdir, "manifest" ) ): os.makedirs( os.path.join( destdir, "manifest" ) ) for mList, ext, description in [ (binList, 'bin', 'Binaries'), (libList, 'lib', 'developer files'), (docList, 'doc', 'Documentation')]: if mList: with open( os.path.join( destdir, "manifest", "%s-%s-%s.mft" % ( package, version, ext )), 'wb' ) as f: for fileName in mList: f.write( bytes( "%s %s\n" % ( fileName, digestFile( os.path.join( myimagedir, fileName ) ) ), "UTF-8" ) ) f.write( bytes( os.path.join( "manifest", "%s-%s-%s.mft\n" % ( package, version, ext ) ), "UTF-8" ) ) f.write( bytes( os.path.join( "manifest", "%s-%s-%s.ver\n" % ( package, version, ext ) ), "UTF-8" ) ) with open( os.path.join( destdir, "manifest", "%s-%s-%s.ver" % ( package, version, ext )), 'wb' ) as f: f.write( bytes( "%s %s %s\n%s/%s:%s:unknown" % ( package, version, description, category, package, version ), "UTF-8" ) ) return True def mergeImageDirToRootDir( imagedir, rootdir , linkOnly = envAsBool("EMERGE_USE_SYMLINKS")): copyDir( imagedir, rootdir , linkOnly) def moveEntries( srcdir, destdir ): for entry in os.listdir( srcdir ): #print "rootdir:", root debug( "entry: %s" % entry, 1 ) src = os.path.join( srcdir, entry ) dest = os.path.join( destdir, entry ) debug( "src: %s dest: %s" %( src, dest ), 1 ) if( os.path.isfile( dest ) ): os.remove( dest ) if( os.path.isdir( dest ) ): continue os.rename( src, dest ) def moveImageDirContents( imagedir, relSrcDir, relDestDir ): srcdir = os.path.join( imagedir, relSrcDir ) destdir = os.path.join( imagedir, relDestDir ) if ( not os.path.isdir( destdir ) ): os.mkdir( destdir ) moveEntries( srcdir, destdir ) os.chdir( imagedir ) os.removedirs( relSrcDir ) def fixCmakeImageDir( imagedir, rootdir ): """ when using DESTDIR=foo under windows, it does not _replace_ CMAKE_INSTALL_PREFIX with it, but prepends destdir to it. so when we want to be able to install imagedir into KDEROOT, we have to move things around... """ debug( "fixImageDir: %s %s" % ( imagedir, rootdir ), 1 ) # imagedir = e:\foo\thirdroot\tmp\dbus-0\image # rootdir = e:\foo\thirdroot # files are installed to # e:\foo\thirdroot\tmp\dbus-0\image\foo\thirdroot _, rootpath = os.path.splitdrive( rootdir ) #print "rp:", rootpath if ( rootpath.startswith( "\\" ) ): rootpath = rootpath[1:] # CMAKE_INSTALL_PREFIX = X:\ # -> files are installed to # x:\build\foo\dbus\image\ # --> all fine in this case #print "rp:", rootpath if len(rootpath) == 0: return tmp = os.path.join( imagedir, rootpath ) debug( "tmp: %s" % tmp, 1 ) tmpdir = os.path.join( imagedir, "tMpDiR" ) if ( not os.path.isdir( tmpdir ) ): os.mkdir( tmpdir ) moveEntries( tmp, tmpdir ) os.chdir( imagedir ) os.removedirs( rootpath ) moveEntries( tmpdir, imagedir ) cleanDirectory( tmpdir ) os.rmdir( tmpdir ) def cleanDirectory( directory ): debug("clean directory %s" % directory, 1) if ( os.path.exists( directory ) ): for root, dirs, files in os.walk( directory, topdown=False): for name in files: try: os.remove( os.path.join(root, name) ) except OSError: system( "cmd /C \"attrib -R %s\"" % os.path.join(root, name) ) try: os.remove( os.path.join(root, name) ) except OSError: die( "couldn't delete file %s\n ( %s )" % ( name, os.path.join( root, name ) ) ) for name in dirs: try: os.rmdir( os.path.join(root, name) ) except OSError: system( "cmd /C \"attrib -R %s\"" % os.path.join(root, name) ) try: os.rmdir( os.path.join(root, name) ) except OSError: die( "couldn't delete directory %s\n( %s )" % ( name, os.path.join( root, name ) ) ) else: os.makedirs( directory ) def sedFile( directory, fileName, sedcommand ): """ runs the given sed command on the given file """ olddir = os.getcwd() try: os.chdir( directory ) backup = "%s.orig" % fileName if( os.path.isfile( backup ) ): os.remove( backup ) command = "sed -i.orig %s %s" % ( sedcommand, fileName ) system( command ) finally: os.chdir( olddir ) def digestFile( filepath ): """ md5-digests a file """ fileHash = hashlib.md5() if os.path.islink(filepath): tmp = resolveLink(filepath) if not os.path.exists(tmp): warning("cant resolve symbolic link target %s, returning \"\" as digests" % tmp) return "" filepath = tmp with open( filepath, "rb" ) as digFile: for line in digFile: fileHash.update( line ) return fileHash.hexdigest() def digestFileSha1( filepath ): """ sha1-digests a file """ fileHash = hashlib.sha1() with open( filepath, "rb" ) as hashFile: for line in hashFile: fileHash.update( line ) return fileHash.hexdigest() def getVCSType( url ): """ return the type of the vcs url """ if not url: return "" if isGitUrl( url ): return "git" elif url.find("://") == -1: return "svn" elif url.startswith("[hg]"): return "hg" elif url.find("svn:") >= 0 or url.find("https:") >= 0 or url.find("http:") >= 0: return "svn" ## \todo complete more cvs access schemes elif url.find("pserver:") >= 0: return "cvs" else: return "" def isGitUrl( Url ): """ this function returns true, if the Url given as parameter is a git url: it either starts with git:// or the first part before the first '|' ends with .git or if the url starts with the token [git] """ if Url.startswith('git://'): return True # split away branch and tags splitUrl = Url.split('|') if splitUrl[0].endswith(".git"): return True if Url.startswith("[git]"): return True return False def splitVCSUrl( Url ): """ this function splits up an url provided by Url into the server name, the path, a branch or tag; it will return a list with 3 strings according to the following scheme: git://servername/path.git|4.5branch|v4.5.1 will result in ['git://servername:path.git', '4.5branch', 'v4.5.1'] This also works for all other dvcs""" splitUrl = Url.split('|') if len(splitUrl) < 3: c = [x for x in splitUrl] for dummy in range(3 - len(splitUrl)): c.append('') else: c = splitUrl[0:3] return c def replaceVCSUrl( Url ): """ this function should be used to replace the url of a server this comes in useful if you e.g. need to switch the server url for a push url on gitorious.org """ configfile = os.path.join(etcDir(), "..", "emergehosts.conf" ) replacedict = dict() # FIXME handle svn/git usernames and settings with a distinct naming if ( os.getenv( "KDESVNUSERNAME" ) and os.getenv( "KDESVNUSERNAME" ) != "username" ) : replacedict[ "git://git.kde.org/" ] = "git@git.kde.org:" if os.path.exists( configfile ): config = configparser.ConfigParser() config.read( configfile ) # add the default KDE stuff if the KDE username is set. for section in config.sections(): host = config.get( section, "host" ) replace = config.get( section, "replace" ) replacedict[ host ] = replace for host in list(replacedict.keys()): if not Url.find( host ) == -1: Url = Url.replace( host, replacedict[ host ] ) break return Url def createImportLibs( dll_name, basepath ): """creating the import libraries for the other compiler(if ANSI-C libs)""" dst = os.path.join( basepath, "lib" ) if( not os.path.exists( dst ) ): os.mkdir( dst ) # check whether the required binary tools exist HAVE_GENDEF = test4application( "gendef" ) USE_GENDEF = HAVE_GENDEF HAVE_LIB = test4application( "lib" ) HAVE_DLLTOOL = test4application( "dlltool" ) if verbose() > 1: print("gendef found:", HAVE_GENDEF) print("gendef used:", USE_GENDEF) print("lib found:", HAVE_LIB) print("dlltool found:", HAVE_DLLTOOL) dllpath = os.path.join( basepath, "bin", "%s.dll" % dll_name ) defpath = os.path.join( basepath, "lib", "%s.def" % dll_name ) exppath = os.path.join( basepath, "lib", "%s.exp" % dll_name ) imppath = os.path.join( basepath, "lib", "%s.lib" % dll_name ) gccpath = os.path.join( basepath, "lib", "%s.dll.a" % dll_name ) if not HAVE_GENDEF and os.path.exists( defpath ): HAVE_GENDEF = True USE_GENDEF = False if not HAVE_GENDEF: warning( "system does not have gendef.exe" ) return False if not HAVE_LIB and not os.path.isfile( imppath ): warning( "system does not have lib.exe (from msvc)" ) if not HAVE_DLLTOOL and not os.path.isfile( gccpath ): warning( "system does not have dlltool.exe" ) # create .def if USE_GENDEF: cmd = "gendef - %s -a > %s " % ( dllpath, defpath ) system( cmd ) if( HAVE_LIB and not os.path.isfile( imppath ) ): # create .lib cmd = "lib /machine:x86 /def:%s /out:%s" % ( defpath, imppath ) system( cmd ) if( HAVE_DLLTOOL and not os.path.isfile( gccpath ) ): # create .dll.a cmd = "dlltool -d %s -l %s -k" % ( defpath, gccpath ) system( cmd ) if os.path.exists( defpath ): os.remove( defpath ) if os.path.exists( exppath ): os.remove( exppath ) return True def toMSysPath( path ): path = path.replace( '\\', '/' ) if ( path[1] == ':' ): path = '/' + path[0].lower() + '/' + path[3:] return path def cleanPackageName( basename, packagename ): return os.path.basename( basename ).replace( packagename + "-", "" ).replace( ".py", "" ) def renameDir(src, dest): """ rename a directory """ debug("rename directory from %s to %s" % ( src, dest ), 2) if os.rename( src, dest ) == 0: return False else: return True def createDir(path): """Recursive directory creation function. Makes all intermediate-level directories needed to contain the leaf directory""" if not os.path.exists( path ): debug("creating directory %s " % ( path ), 2) os.makedirs( path ) return True def resolveLink(link): """tries to resolve a symlink""" if not os.path.islink(link): return link tmp = os.path.join(os.path.abspath(os.path.dirname(link) ),os.readlink(link)) if not os.path.exists(tmp): warning("cant resolve Link: %s" % link) return tmp def copyFile(src, dest,linkOnly = envAsBool("EMERGE_USE_SYMLINKS")): """ copy file from src to dest""" debug("copy file from %s to %s" % ( src, dest ), 2) destDir = os.path.dirname(dest) if not os.path.exists(destDir): os.makedirs(destDir) if os.path.islink(src): src = resolveLink(src) if linkOnly: if (os.path.exists(dest) or os.path.islink(dest)):#if link is invailid os.path.exists will return false warning("overiding existing link or file %s with %s" % (dest,src)) os.remove(dest) if src.endswith(".exe") or src.endswith("qt.conf"): os.link( src , dest ) else: os.symlink(deSubstPath(src), dest ) else: try: shutil.copy(src,dest) except OSError: system("cmd /C \"attrib -R %s\"" % dest) shutil.copy(src,dest) return True def copyDir( srcdir, destdir,linkOnly=False ): """ copy directory from srcdir to destdir """ debug( "copyDir called. srcdir: %s, destdir: %s" % ( srcdir, destdir ), 2) if ( not srcdir.endswith( "\\" ) ): srcdir += "\\" if ( not destdir.endswith( "\\" ) ): destdir += "\\" for root, _, files in os.walk( srcdir ): # do not copy files under .svn directories, because they are write-protected # and the they cannot easily be deleted... if ( root.find( ".svn" ) == -1 ): tmpdir = root.replace( srcdir, destdir ) if not os.path.exists( tmpdir ): os.makedirs( tmpdir ) for fileName in files: copyFile(os.path.join( root, fileName ),os.path.join( tmpdir, fileName )) debug( "copy %s to %s" % ( os.path.join( root, fileName ), os.path.join( tmpdir, fileName ) ), 2) def moveDir( srcdir, destdir ): """ move directory from srcdir to destdir """ debug( "moveDir called. srcdir: %s, destdir: %s" % ( srcdir, destdir ), 1 ) shutil.move( srcdir, destdir ) def rmtree( directory ): """ recursively delete directory """ debug( "rmtree called. directory: %s" % ( directory ), 2 ) shutil.rmtree ( directory, True ) # ignore errors def moveFile(src, dest): """move file from src to dest""" debug("move file from %s to %s" % ( src, dest ), 2) os.rename( src, dest ) return True def deleteFile(fileName): """delete file """ if not os.path.exists( fileName ): return False debug("delete file %s " % ( fileName ), 2) os.remove( fileName ) return True def findFiles( directory, pattern=None, fileNames=None): """find files recursivly""" if fileNames == None: fileNames = [] pattern = pattern.lower() for entry in os.listdir(directory): if entry.find(".svn") > -1 or entry.find(".bak") > -1: continue fileName = os.path.join(directory, entry) if os.path.isdir(fileName): findFiles(fileName, pattern, fileNames) elif os.path.isfile(fileName) and pattern == None or entry.lower().find(pattern) > -1: fileNames.append(fileName) return fileNames def putenv(name, value): """set environment variable""" debug("set environment variable -- set %s=%s" % ( name, value ), 2) os.putenv( name, value ) return True def unixToDos(filename): with open(filename, "rb") as f: return str(f.read(),'UTF-8').replace('\n', '\r\n') def applyPatch(sourceDir, f, patchLevel='0'): """apply single patch""" cmd = "patch -d %s -p%s < %s" % (sourceDir, patchLevel, f) debug("applying %s" % cmd) if not isCrEol(f): p = subprocess.Popen([ "patch", "-d", sourceDir, "-p", str(patchLevel)], stdin = subprocess.PIPE) p.communicate(bytes(unixToDos(f),'UTF-8')) result = p.wait() == 0 else: result = system( cmd ) if not result: warning( "applying %s failed!" % f) return result def log(fn): def inner(*args, **argv): logdir = os.environ.get('EMERGE_LOG_DIR') if not logdir: return fn(*args, **argv) if os.path.isfile(logdir): die("EMERGE_LOG_DIR %s is a file" % logdir) if not os.path.exists(logdir): try: os.mkdir(logdir) except OSError: die("EMERGE_LOG_DIR %s can not be created" % logdir) logfile = "%s-%s-%s.log" % (args[0], args[1], args[2]) logfile = os.path.join(logdir, logfile) f = open(logfile, "a+") try: old_out = sys.stdout old_err = sys.stderr sys.stdout = f sys.stderr = f return fn(*args, **argv) finally: sys.stdout = old_out sys.stderr = old_err f.close() return inner def getWinVer(): ''' Returns the Windows Version of the system returns "0" if the Version can not be determined ''' try: result = str(subprocess.Popen("cmd /C ver", stdout=subprocess.PIPE).communicate()[0],"windows-1252") except OSError: debug("Windows Version can not be determined", 1) return "0" version = re.search(r"\d+\.\d+\.\d+", result) if(version): return version.group(0) debug("Windows Version can not be determined", 1) return "0" def regQuery(key, value): ''' Query the registry key for value and return the result. ''' query = 'reg query "%s" /v "%s"' % (key, value) debug("Executing registry query %s " % query, 2) result = subprocess.Popen(query, stdout = subprocess.PIPE).communicate()[0] # Output of this command is either an error to stderr # or the key with the value in the next line reValue = re.compile(r"(\s*%s\s*REG_\w+\s*)(.*)" % value) match = reValue.search(str(result, 'windows-1252')) if match and match.group(2): return match.group(2).rstrip() return False def embedManifest(executable, manifest): ''' Embed a manifest to an executable using either the free kdewin manifest if it exists in dev-utils/bin or the one provided by the Microsoft Platform SDK if it is installed' ''' if not os.path.isfile(executable) or not os.path.isfile(manifest): # We die here because this is a problem with the portage files die("embedManifest %s or %s do not exist" % (executable, manifest)) debug("embedding ressource manifest %s into %s" % \ (manifest, executable), 2) mtExe = None mtExe = os.path.join(os.getenv("KDEROOT"), "dev-utils", "bin", "mt.exe") if(not os.path.isfile(mtExe)): # If there is no free manifest tool installed on the system # try to fallback on the manifest tool provided by visual studio sdkdir = regQuery("HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows", "CurrentInstallFolder") if not sdkdir: debug("embedManifest could not find the Registry Key" " for the Windows SDK", 2) else: mtExe = r'%s' % os.path.join(sdkdir, "Bin", "mt.exe") if not os.path.isfile(os.path.normpath(mtExe)): debug("embedManifest could not find a mt.exe in\n\t %s" % \ os.path.dirname(mtExe), 2) if os.path.isfile(mtExe): system([mtExe, "-nologo", "-manifest", manifest, "-outputresource:%s;1" % executable]) else: debug("No manifest tool found. \n Ressource manifest for %s not embedded"\ % executable, 1) def getscriptname(): if __name__ == '__main__': return sys.argv[ 0 ] else: return __name__ def prependPath(*parts): """put path in front of the PATH environment variable, if it is not there yet. The last part must be a non empty string, otherwise we do nothing""" if parts[-1]: fullPath = os.path.join(*parts) old = os.getenv("PATH").split(';') if old[0] != fullPath: debug("adding %s to system path" % fullPath, 2) old.insert(0, fullPath) os.putenv( "PATH", ";".join(old)) -_TIMERS = dict() +def setTitle(title): + ctypes.windll.kernel32.SetConsoleTitleW(title) + +_TIMERS = dict() def startTimer(name, level = 0): """starts a timer for meassurement""" if name in _TIMERS: die("%s already in timers" % name) _TIMERS[name] = (datetime.datetime.now() , level) if os.getenv("EMERGE_MEASURE_TIME") or level == 0 or verbose() > level and verbose() > 0: #debug( "Task: %s started" % name ) sys.stdout.flush() def stopTimer(name): """stops a timer for meassurement""" if not name in _TIMERS: debug( "%s not in timers" % name ) return startTime , level = _TIMERS[name] if os.getenv("EMERGE_MEASURE_TIME") or level == 0 or verbose() > level and verbose() > 0: delta = datetime.datetime.now() - startTime debug( "Task: %s stopped after: %s" % (name , delta) ) sys.stdout.flush() del _TIMERS[name] def stopAllTimer(): """stops all timer for meassurement""" keys = sorted(list(_TIMERS.items()) , key=itemgetter(1) , reverse=True) for key , _ in keys: stopTimer(key) _SUBST = None def deSubstPath(path): """desubstitude emerge short path""" if not envAsBool("EMERGE_USE_SHORT_PATH"): return path global _SUBST # pylint: disable=W0603 drive , tail = os.path.splitdrive(path) drive = drive.upper() if _SUBST == None: tmp = str(subprocess.Popen("subst", stdout=subprocess.PIPE).communicate()[0],"windows-1252").split("\r\n") _SUBST = dict() for s in tmp: if s != "": key , val = s.split("\\: => ") _SUBST[key] = val if drive in list(_SUBST.keys()): deSubst = _SUBST[drive] + tail debug("desubstituded %s to %s" % (path , deSubst) , 1) return deSubst return path def notify(title,message,alertClass = None): backends = os.getenv("EMERGE_USE_NOTIFY") if not backends: return backends = Notifier.NotificationLoader.load(backends.split(";")) for backend in backends.values(): backend.notify(title,message,alertClass) def levenshtein(s1, s2): if len(s1) < len(s2): return levenshtein(s2, s1) if not s1: return len(s2) previous_row = range(len(s2) + 1) for i, c1 in enumerate(s1): current_row = [i + 1] for j, c2 in enumerate(s2): insertions = previous_row[j + 1] + 1 # j+1 instead of j since previous_row and current_row are one character longer deletions = current_row[j] + 1 # than s2 substitutions = previous_row[j] + (c1 != c2) current_row.append(min(insertions, deletions, substitutions)) previous_row = current_row return previous_row[-1] diff --git a/epc/kde4-l10n-package.epc b/epc/kde4-l10n-package.epc index fa84477c9..03d5c7c34 100644 --- a/epc/kde4-l10n-package.epc +++ b/epc/kde4-l10n-package.epc @@ -1,175 +1,176 @@ { "epc": { "buildtime-dependencies": [], - "default-target": "4.8.2", + "default-target": "4.9.0", "dependencies": [ "kde/kde4-l10n-${EPC_PACKAGE-NAME}" ], "package-template": "from Package.VirtualPackageBase import *\nfrom Packager.PortablePackager import *\nclass Package( PortablePackager, VirtualPackageBase ):\n def __init__( self, **args ):\n self.subinfo = subinfo()\n PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] )\n VirtualPackageBase.__init__( self )", "packages": [ { "name": "ar" }, { "name": "bg" }, { "name": "bs" }, { "name": "ca" }, { "name": "ca@valencia" }, { "name": "cs" }, { "name": "da" }, { "name": "de" }, { "name": "el" }, { "name": "en_GB" }, { "name": "es" }, { "name": "et" }, { "name": "eu" }, { "name": "fi" }, { "name": "fr" }, { "name": "ga" }, { "name": "gl" }, { "name": "he" }, { "name": "hr" }, { "name": "hu" }, { "name": "ia" }, { "name": "id" }, { "name": "is" }, { "name": "it" }, { "name": "ja" }, { "name": "kk" }, { "name": "km" }, { "name": "ko" }, { "name": "lt" }, { "name": "lv" }, { "name": "nb" }, { "name": "nds" }, { "name": "nl" }, { "name": "nn" }, { "name": "pa" }, { "name": "pl" }, { "name": "pt" }, { "name": "pt_BR" }, { "name": "ro" }, { "name": "ru" }, { "name": "sk" }, { "name": "sl" }, { "name": "sr" }, { "name": "sv" }, { "name": "th" }, { "name": "tr" }, { "name": "ug" }, { "name": "uk" }, { "name": "wa" }, { "name": "zh_CN" }, { "name": "zh_TW" } ], "portage-dir": "package/kde4-l10n-package", "prefix": "kde4-l10n", "subinfo-template": "import os\nimport info\n\nclass subinfo( info.infoclass ):\n def setTargets( self ):\n for ver in ${EPC_VERSIONS}:\n self.svnTargets[ ver ] = ''\n\n self.defaultTarget = '${EPC_DEFAULT-TARGET}'", "suffix": "package", "versions": [ - "4.8.0", - "4.8.1", - "4.8.2" + "4.9.1", + "4.9.2", + "4.9.3", + "4.9.4" ] }, "vars": {} } \ No newline at end of file diff --git a/epc/kde4-l10n.epc b/epc/kde4-l10n.epc index 30b0ff4e7..167081016 100644 --- a/epc/kde4-l10n.epc +++ b/epc/kde4-l10n.epc @@ -1,173 +1,176 @@ { "epc": { "buildtime-dependencies": [ "dev-util/cmake", "kde/kdelibs", "dev-util/gettext-tools" ], - "default-target": "4.8.2", + "default-target": "4.9.0", "packages": [ { "name": "ar" }, { "name": "bg" }, { "name": "bs" }, { "name": "ca" }, { "name": "ca@valencia" }, { "name": "cs" }, { "name": "da" }, { "name": "de" }, { "name": "el" }, { "name": "en_GB" }, { "name": "es" }, { "name": "et" }, { "name": "eu" }, { "name": "fi" }, { "name": "fr" }, { "name": "ga" }, { "name": "gl" }, { "name": "he" }, { "name": "hr" }, { "name": "hu" }, { "name": "ia" }, { "name": "id" }, { "name": "is" }, { "name": "it" }, { "name": "ja" }, { "name": "kk" }, { "name": "km" }, { "name": "ko" }, { "name": "lt" }, { "name": "lv" }, { "name": "nb" }, { "name": "nds" }, { "name": "nl" }, { "name": "nn" }, { "name": "pa" }, { "name": "pl" }, { "name": "pt" }, { "name": "pt_BR" }, { "name": "ro" }, { "name": "ru" }, { "name": "sk" }, { "name": "sl" }, { "name": "sr" }, { "name": "sv" }, { "name": "th" }, { "name": "tr" }, { "name": "ug" }, { "name": "uk" }, { "name": "wa" }, { "name": "zh_CN" }, { "name": "zh_TW" } ], "portage-dir": "kde/kde4-l10n", "prefix": "kde4-l10n", "subinfo-template": "import os\nimport info\n\nclass subinfo( info.infoclass ):\n def setTargets( self ):\n for ver in ${EPC_VERSIONS}:\n self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-${EPC_PACKAGE-NAME}-%s.tar.xz' % (ver , ver )\n self.targetInstSrc[ ver] = 'kde-l10n-${EPC_PACKAGE-NAME}-%s' % ver\n\n self.defaultTarget = '${EPC_DEFAULT-TARGET}'", "versions": [ - "4.8.1", - "4.8.2" + "4.9.0", + "4.9.1", + "4.9.2", + "4.9.3", + "4.9.4" ] }, "vars": {} } \ No newline at end of file diff --git a/kdeenv.ps1 b/kdeenv.ps1 new file mode 100644 index 000000000..632d4089e --- /dev/null +++ b/kdeenv.ps1 @@ -0,0 +1,205 @@ + +# this file sets some environment variables that are needed +# for finding programs and libraries etc. +# by patrick von Reth +# you should copy kdesettings.ini to ..\etc\kdesettings.ini +# and adapt it to your needs (see that file for more info) + +# this file should contain all path settings - and provide thus an environment +# to build and run kde programs +# based on kdeenv.bat + +cls + +$dp0=[System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition) + +&{ + +function subst([string] $varname, [string] $path, [string] $drive) +{ + foreach($key in $settings["Paths"].keys) + { + $path = $path.Replace("`$`{"+$key+"`}",$settings["Paths"][$key]) + } + if(!(test-path -path $path)) + { + mkdir $path + } + + if( $settings["ShortPath"]["EMERGE_USE_SHORT_PATH"] -eq $true ) + { + [Environment]::SetEnvironmentVariable("EMERGE_USE_SHORT_PATH",$settings["ShortPath"]["EMERGE_USE_SHORT_PATH"],"Process") + if(!(test-path -path $drive)) + { + subst.exe $drive $path + } + $path=$drive + } + if(!$path.endswith("\")) + { + $path += "\" + } + [Environment]::SetEnvironmentVariable($varname, $path, "Process") + +} + + +function readINI([string] $fileName) +{ + $ini = @{} + + switch -regex -file $fileName { + "^\[(.+)\]$" { + $section = $matches[1].Trim() + $ini[$section] = @{} + } + "^\s*([^#].+?)\s*=\s*(.*)" { + $name,$value = $matches[1..2] + $ini[$section][$name] = $value.Trim() + } + } + $ini +} + +function prependPATH([string] $path) +{ + $env:PATH="$path;$env:PATH" +} + +function path-mingw() +{ + if(test-path -path "$env:KDEROOT\mingw\bin") + { + prependPATH "$env:KDEROOT\mingw\bin" + } + else + { + if(test-path -path "$env:KDEROOT\mingw64\bin") + { + prependPATH "$env:KDEROOT\mingw64\bin" + } + else + { + #dont know which version + prependPATH "$env:KDEROOT\mingw64\bin" + prependPATH "$env:KDEROOT\mingw\bin" + } + } +} + +function path-msvc() +{ + if($env:VS110COMNTOOLS -eq "") + { + Write-Host("Couldnt find msvc installation") + } + #http://stackoverflow.com/questions/2124753/how-i-can-use-powershell-with-the-visual-studio-command-prompt + pushd "$env:VS110COMNTOOLS\..\..\VC" + cmd /c "vcvarsall.bat&set" | + foreach { + if ($_ -match "=") { + $v = $_.split("=") + set-item -force -path "ENV:\$($v[0])" -value "$($v[1])" + #Write-Host("$v[0]=$v[1]") + } + } + popd +} + +function setupCCACHE() +{ + if( $settings["General"]["EMERGE_USE_CCACHE"] -eq $true) + { + $env:CCACHE_DIR="$env:KDEROOT\build\CCACHE" + $env:CXX="ccache g++" + $env:CC="ccache gcc" + $env:EMERGE_MAKE_PROGRAM="jom /E" + } +} + + +$env:EMERGE_BUILDTYPE="RelWithDebInfo" + +foreach($arg in $args) +{ +if($arg.ToString().ToLower() -is @("debug","release","relwithdebinfo")) +{ + $env:EMERGE_BUILDTYPE=$arg +} +else +{ + $APPLICATION=$arg +} + +} + + +if(test-path -path $dp0\..\etc\kdesettings.ini) +{ + $settings = readINI $dp0\..\etc\kdesettings.ini +} +else +{ + Write-Error("$dp0\..\etc\kdesettings.ini Does not exist") +} + + +#make settings for general availible in env +foreach($key in $settings["General"].keys) +{ + [Environment]::SetEnvironmentVariable($key,$settings["General"][$key], "Process") +} + + +subst "KDEROOT" $settings["Paths"]["KDEROOT"] $settings["ShortPath"]["EMERGE_ROOT_DRIVE"] +subst "DOWNLOADDIR" $settings["Paths"]["DOWNLOADDIR"] $settings["ShortPath"]["EMERGE_DOWNLOAD_DRIVE"] +subst "KDESVNDIR" $settings["Paths"]["KDESVNDIR"] $settings["ShortPath"]["EMERGE_SVN_DRIVE"] +subst "KDEGITDIR" $settings["Paths"]["KDEGITDIR"] $settings["ShortPath"]["EMERGE_GIT_DRIVE"] + + + +if ($settings["General"]["KDECOMPILER"] -eq "mingw4") +{ + path-mingw + setupCCACHE +} +else +{ + if(([string]$settings["General"]["KDECOMPILER"]).StartsWith("msvc")) + { + path-msvc + } +} + + +prependPATH "$env:KDEROOT\bin" +$env:QT_PLUGIN_PATH="$env:KDEROOT\plugins;$env:KDEROOT\lib\kde4\plugins" +$env:XDG_DATA_DIRS="$env:KDEROOT\share" + +# for dev-utils +prependPATH "$env:KDEROOT\dev-utils\bin" + +#todo:get pythonpath from registry +prependPATH $settings["Paths"]["PYTHONPATH"] + +$env:HOME=$env:USERPROFILE +$env:SVN_SSH="plink" +$env:GIT_SSH="plink" + + +Write-Host("KDEROOT : ${env:KDEROOT}") +Write-Host("KDECOMPILER : ${env:KDECOMPILER}") +Write-Host("KDESVNDIR : ${env:KDESVNDIR}") +Write-Host("KDEGITDIR : ${env:KDEGITDIR}") +Write-Host("PYTHONPATH : " + $settings["Paths"]["PYTHONPATH"]) +Write-Host("DOWNLOADDIR : ${env:DOWNLOADDIR}") + +} + + +function emerge() +{ + python "$env:KDEROOT\emerge\bin\emerge.py" $args +} + +cd $env:KDEROOT \ No newline at end of file diff --git a/kdesettings-example.bat b/kdesettings-example.bat index 40527576b..98ea10f5f 100644 --- a/kdesettings-example.bat +++ b/kdesettings-example.bat @@ -1,282 +1,282 @@ @echo off rem Here you set the base directory under which the whole KDE subsystem will live. set KDEROOT=c:\kderoot rem ####### Compiler settings ####### rem Here you set the compiler to be used. rem * mingw4 - use the mingw gcc compiler (recommended) rem * mingw - use the mingw gcc compiler (gcc Version 3.4.5 - rem please only use this option if you are exactly rem sure about the consequences) rem * msvc2008 - use the Microsoft Visual C++ 2008 compiler rem * msvc2010 - use the Microsoft Visual C++ 2010 compiler rem * msvc2011 - use the Microsoft Visual C++ 2011 compiler (not supported) set KDECOMPILER=mingw4 rem Here you can set the architecure for which packages are build. rem Currently x86 (32bit), x64 (64) and arm (wince) are supported rem rem x86 x64 arm-wince rem mingw4 x x x[1] rem mingw x --- --- rem msvc2005 x --- --- rem msvc2008 x --- --- rem msvc2010 x --- --- rem rem [1] by dev-utils/cegcc-arm-wince package rem set EMERGE_ARCHITECTURE=x86 rem set EMERGE_ARCHITECTURE=x64 rem ####### Directory settings ####### rem Here you change the download directory. rem If you want, so you can share the same download directory between rem mingw and msvc. set DOWNLOADDIR=%KDEROOT%\download rem This option defines the location for git checkouts. set KDEGITDIR=%KDEROOT%\git rem This option defines the location for svn checkouts. set KDESVNDIR=%KDEROOT%\svn rem substitute pathes by drives rem This option is needed to avoid path limit problems in case of long base pathes rem and compiling big packages like qt rem If you disable it do _not_ use any paths longer than 6 letters in the rem directory settings -set EMERGE_USE_SHORT_PATH=True +set EMERGE_USE_SHORT_PATH=1 rem each drive could be commented out to skip substution set EMERGE_ROOT_DRIVE=r: set EMERGE_SVN_DRIVE=s: set EMERGE_GIT_DRIVE=q: set EMERGE_DOWNLOAD_DRIVE=t: rem ####### SVN Settings ####### rem Here you can tell the emerge tool in which dir you want to save the rem SVN checkout of KDE source code. If you have SVN account registered rem within the KDE project, you can also set KDESVNUSERNAME and change rem KDESVNSERVER from svn://anonsvn.kde.org to https://svn.kde.org or rem svn+ssh://username@svn.kde.org, so that you can directly commit rem your changes from the emerge's SVN checkout. In case you use svn+ssh, rem also run 'plink username@svn.kde.org' after executing kdeenv.bat once rem to accept the fingerprint of the server or svn will hang forever when rem trying to download from the server. set KDESVNSERVER=svn://anonsvn.kde.org set KDESVNUSERNAME=username rem If you do not mind getting the output of the svn commands, then enable this rem option rem set KDESVNVERBOSE=True rem Non kde svn repository checkouts will be placed below %DOWNLOADDIR%/svn-src/ rem By default the emerge svn module supports only single branch svn checkouts. rem With this option emerge assumes that the svn repository have the svn standard layout rem and will create related subdirectories for trunk, branches and tags below the above rem mentioned root directory. rem set EMERGE_SVN_STDLAYOUT=1 rem If you use svn+ssh, you will need a ssh-agent equaivalent for managing rem the authorization. Pageant is provided by the Putty project, get it at rem http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html rem and make sure that plink is in your PATH and Pageant is configured rem (you need to import your key) set SVN_SSH=plink rem ####### Git Settings ####### rem With this option set emerge checks out each git repository branch into a rem separate subdirectory (see git clone --mirror at git clone --shared --local). rem Without this option changing the branch will overwrite previous checkouts. rem Note: Changing the value invalidates available checkouts of related packages rem and requires a remove of the complete source dir. rem set EMERGE_GIT_MULTIBRANCH=True rem Setting up variables for git, not needed by emerge but preventing trouble rem with corrupted git pushes set GIT_SSH=plink set HOME=%USERPROFILE% rem set GIT_AUTHOR_NAME=authorname rem set GIT_AUTHOR_EMAIL=email rem set GIT_COMMITTER_NAME=username rem set GIT_COMMITTER_EMAIL=email rem ####### Python Settings ####### rem Here you set the path to your Python installation, rem so that Python will be found, when Python scripts are be executed. rem By setting this here, you don't have to change the global environment rem settings of Windows. In case python is distributed with emerge the rem following setting is not used. if "%PYTHONPATH%" == "" ( set PYTHONPATH="%PROGRAM_FILES%\python32" ) rem ####### Proxy Settings ####### rem proxy settings - in case a proxy is required uncomment the following variables rem set EMERGE_PROXY_HOST= rem set EMERGE_PROXY_PORT=8080 rem set EMERGE_PROXY_USERNAME= rem set EMERGE_PROXY_PASSWORD= rem Here you can set if emerge should not try to download files in passive mode rem set EMERGE_NO_PASSIVE_FTP=True rem ####### Visual Studio Settings ####### rem Here you can adjust the path to your Visual Studio installation if needed rem This is used to set up the build environment automatically if %KDECOMPILER% == msvc2008 set VSDIR=%PROGRAM_FILES%\Microsoft Visual Studio 9.0 if %KDECOMPILER% == msvc2010 set VSDIR=%PROGRAM_FILES%\Microsoft Visual Studio 10.0 if %KDECOMPILER% == msvc2011 set VSDIR=%PROGRAM_FILES%\Microsoft Visual Studio 11.0 rem Here you can adjust the path to the Windows Mobile SDK installation rem This is used to set up the cross-compilation environment automatically if "%EMERGE_TARGET_PLATFORM%" == "WM50" set TARGET_SDKDIR=%PROGRAM_FILES%\Windows Mobile 5.0 SDK R2\PocketPC if "%EMERGE_TARGET_PLATFORM%" == "WM60" set TARGET_SDKDIR=%PROGRAM_FILES%\Windows Mobile 6 Professional SDK\PocketPC if "%EMERGE_TARGET_PLATFORM%" == "WM65" set TARGET_SDKDIR=%PROGRAM_FILES%\Windows Mobile 6 Professional SDK\PocketPC rem Here you can set a specific platform SDK to use with the Visual Studio toolchain rem Normally this is not needed as a default platform SDK is set by the build environment script rem set PSDKDIR=%PROGRAM_FILES%\Microsoft SDKs\Windows\v6.0A rem Here you can set the path to your Microsoft DirectX SDK installation rem This is not needed if you use MinGW or won't use the directx backend for Phonon rem set MSDXSDKDIR=%PROGRAM_FILES%\Microsoft DirectX SDK (August 2009) rem ####### Build Type Settings ####### rem Here you can set type of the emerge build. rem There are two standard build types: Debug and Release. rem Both are used if no EMERGE_BUILDTYPE is set. rem There is a third extra buildtype called RelWithDebInfo, which is rem release (optimized) build but containing debugging information. rem You can override the build type at the commandline using rem the '--buildtype=[BuildType]' option. The build type which is set here rem will not override the buildtype in .py package files. if "%1" == "debug" ( set EMERGE_BUILDTYPE=Debug ) if "%1" == "relwithdebinfo" ( set EMERGE_BUILDTYPE=RelWithDebInfo ) if "%1" == "release" ( set EMERGE_BUILDTYPE=Release ) if "%1" == "" ( set EMERGE_BUILDTYPE=RelWithDebInfo ) rem ####### Various Emerge Settings ####### rem This option can be used to build only source packages and don't use binary packages rem it is needed for wince builds, but works everywhere and is the recommended way to rem use emerge. set EMERGE_SOURCEONLY=True rem override specific emerge options rem This option makes it possible to set properties, which are defined in rem bin\options.py. Multiple entries are separated by a space rem Please note that properties may be overriden by dedicated package rem Example: rem * set EMERGE_OPTIONS=cmake.useIDE=1 install.useMakeToolForInstall=1 rem set EMERGE_OPTIONS= rem If you want to have verbose output, uncomment the following option rem and set it to positive integer for verbose output and to 0 rem or disable it for normal output. Currently the highest verbosity level rem is 3 (equal to 'emerge -v -v -v'). level 0 equals 'emerge -q' set EMERGE_VERBOSE=1 rem Enable this option if you want to have shorter build times, and less rem disk usage. It will then avoid copying source code files of the KDE rem svn repository. To disable, set EMERGE_NOCOPY=False. set EMERGE_NOCOPY=True rem By default emerge will merge all package into KDEROOT. By setting the following rem option to true, the package will be installed into a subdir of KDEROOT. rem The directory is named like the lower cased build type rem When using this option you can run emerge/kdeenv.bat with the build mode type rem parameter (release, releasedebug or debug) to have different shells for each rem build type. rem set EMERGE_MERGE_ROOT_WITH_BUILD_TYPE=True rem If you want to build all packages with buildTests option, enable rem this option. Applies only to the cmake based packages. rem set EMERGE_BUILDTESTS=True rem This option only applies if you want to make packages. It sets rem the output directory where your generated packages should be stored. rem set EMERGE_PKGDSTDIR=%KDEROOT%\tmp rem This option can be used to override the default make program rem change the value to the path of the executable you want to use instead. set EMERGE_MAKE_PROGRAM=%KDEROOT%\dev-utils\bin\jom.exe rem This option can be used to set the default category for packages with the same name rem that are contained in multiple categories; This is especially useful if you want rem to build e.g. from the 4.3 branch: simply set the variable to kde-4.3 then rem for all other packages this option doesn't have any effect rem set EMERGE_DEFAULTCATEGORY=kde-4.3 rem This option can be used to set a directory where build logs are saved rem instead of being printed to the console. Logging information is appended to rem existing logs. rem set EMERGE_LOG_DIR=%KDEROOT%\buildlogs rem This option can be used to integrate packages from other portage directories rem or override the default packages. The default directory can be overridden by rem not including it in this list. If you do not set this option emerge will take rem the current portage directory instead. rem set EMERGE_PORTAGE_ROOT=C:\test\portage;%KDEROOT%\emerge\portage rem This option enables separating of package build dependencies from emerge internal rem dependencies. When enabled packages depends on packages from the internal category rem too. The packages from the internal package belongs to the related python class rem with the same name. They provide a standardized way to define runtime dependencies rem for emerge itself. rem note: After finishing the testing phase this feature will be enabled by default rem and this option removed. rem set EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES=1 rem The following option makes the emerge run fail if applying patches fails rem the default is that failing patches do not result in a stop rem set EMERGE_HOLD_ON_PATCH_FAIL=True rem emerge supports two type of package state and manifest databases: a file based and rem an sqlite based. The file based database interacts better with kdewin rem installer/packager eg. you can directly integrate binary packages while the rem sqlite based database seems to be slighty faster but is only accessable rem through the emerge command line. This option let you choose the used on. rem By default the sqlite database is not used, because the implementation rem results into errors on qmerge action. rem set EMERGE_ENABLE_SQLITEDB=FALSE rem ####### Cross Compiling rem The following variables are used for cross-compiling to Windows Mobile / WinCE rem when uncommented, the proper toolchain is set up for the specified target OS and architecture. rem EMERGE_TARGET_PLATFORM currently supports : rem * WM50 - Windows Mobile 5.0 PocketPC (based on WinCE 5.01) rem * WM60 - Windows Mobile 6.0 Professional (based on WinCE 5.02) rem * WM65 - Windows Mobile 6.5 Professional (based on WinCE 5.02) rem EMERGE_TARGET_ARCHITECTURE currently supports : rem * ARMV4I (all platforms) rem set EMERGE_TARGET_PLATFORM=WM60 rem set EMERGE_TARGET_ARCHITECTURE=ARMV4I rem No editing should be necessary below this line (in an ideal world) rem ################################################################## rem internal used settings version only for emerge maintainers rem increment for each definition change in this file and fix version rem issues in kdeenv.bat rem Note: unset EMERGE_SETTINGS_VERSION means version 0 SET EMERGE_SETTINGS_VERSION=1 echo kdesettings.bat executed diff --git a/kdesettings.ini b/kdesettings.ini new file mode 100644 index 000000000..6e862f02c --- /dev/null +++ b/kdesettings.ini @@ -0,0 +1,33 @@ +[General] +#EMERGE_USE_NOTIFY=Snarl +EMERGE_USE_SYMLINKS=True +EMERGE_TARGET=4.9.3 +EMERGE_USE_CCACHE=True +EMERGE_SOURCEONLY=True +KDECOMPILER=mingw4 +EMERGE_ARCHITECTURE=x64 +EMERGE_VERBOSE=1 + + +EMERGE_NOCOPY=True +EMERGE_MAKE_PROGRAM=jom /E + +[Paths] +DOWNLOADDIR=${KDEROOT}\download +KDEROOT=D:\kde +PYTHONPATH=C:\python32 +KDESVNDIR=${DOWNLOADDIR}\svn +KDEGITDIR=${DOWNLOADDIR}\git + + + +[ShortPath] +EMERGE_USE_SHORT_PATH=True +EMERGE_ROOT_DRIVE=r: +EMERGE_SVN_DRIVE=s: +EMERGE_GIT_DRIVE=q: +EMERGE_DOWNLOAD_DRIVE=t: + +[Version] +EMERGE_SETTINGS_VERSION=1 + diff --git a/portage/dev-util/cmake-pkg/cmake-2.8.10.diff b/portage/dev-util/cmake-pkg/cmake-2.8.10.diff new file mode 100644 index 000000000..196b71694 --- /dev/null +++ b/portage/dev-util/cmake-pkg/cmake-2.8.10.diff @@ -0,0 +1,25 @@ +diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx +--- a/Source/kwsys/SystemTools.cxx ++++ b/Source/kwsys/SystemTools.cxx +@@ -2603,7 +2603,7 @@ bool SystemTools::FileIsDirectory(const char* name) + char buffer[KWSYS_SYSTEMTOOLS_MAXPATH]; + size_t last = strlen(name)-1; + if(last > 0 && (name[last] == '/' || name[last] == '\\') +- && strcmp(name, "/") !=0) ++ && strcmp(name, "/") !=0 && name[last-1] != ':') + { + memcpy(buffer, name, last); + buffer[last] = 0; +@@ -2913,6 +2913,12 @@ SystemToolsAppendComponents( + kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path, + const char* in_base) + { ++#if defined(_WIN32) && !defined(__CYGWIN__) ++ if(in_path[0] == '/' && in_path[1] == 0) { ++ in_path = in_base; ++ } ++#endif ++ + // Collect the output path components. + kwsys_stl::vector out_components; + diff --git a/portage/dev-util/cmake-pkg/cmake-pkg-20100421.py b/portage/dev-util/cmake-pkg/cmake-pkg-20100421.py index e54762c71..407a03b14 100644 --- a/portage/dev-util/cmake-pkg/cmake-pkg-20100421.py +++ b/portage/dev-util/cmake-pkg/cmake-pkg-20100421.py @@ -1,30 +1,32 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = "git://cmake.org/cmake.git" self.svnTargets['release'] = "git://cmake.org/cmake.git|release|" self.svnTargets['v2.8.2'] = "git://cmake.org/cmake.git|release|v2.8.2" - for ver in ['2.8.0', '2.8.1', '2.8.2', '2.8.3', '2.8.8']: + for ver in ['2.8.0', '2.8.1', '2.8.2', '2.8.3', '2.8.8','2.8.10.2']: self.targets[ ver ] = "http://www.cmake.org/files/v2.8/cmake-" + ver + ".tar.gz" self.targetInstSrc[ ver ] = "cmake-" + ver self.patchToApply['2.8.0'] = ("cmake-2.8.0-20100512.diff", 1) self.patchToApply['2.8.1'] = ("cmake-2.8.1-20100511.diff", 1) self.patchToApply['2.8.3'] = ("cmake-2.8.3-20101222.diff", 1) self.patchToApply['2.8.8'] = ("cmake-2.8.3-20101222.diff", 1) - self.defaultTarget = 'release' + self.patchToApply['2.8.10.2'] = ("cmake-2.8.10.diff", 1) + self.targetDigests['2.8.10.2'] = '2d868ccc3f9f2aa7c2844bd0a4609d5313edaaec' + self.defaultTarget = '2.8.10.2' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self): self.subinfo = subinfo() CMakePackageBase.__init__(self) self.subinfo.options.merge.destinationPath = "dev-utils" if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/cmake/cmake-2.8.4.2011622.py b/portage/dev-util/cmake/cmake-2.8.4.2011622.py index b50d79fdc..a486cfb20 100644 --- a/portage/dev-util/cmake/cmake-2.8.4.2011622.py +++ b/portage/dev-util/cmake/cmake-2.8.4.2011622.py @@ -1,55 +1,55 @@ import info import emergePlatform 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.targets['2.8.4'] = 'http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.zip' self.targets['2.8.5'] = 'http://www.cmake.org/files/v2.8/cmake-2.8.5-win32-x86.zip' self.targets['2.8.8'] = 'http://www.cmake.org/files/v2.8/cmake-2.8.8-win32-x86.zip' self.targets['v2.8.2'] = 'http://downloads.sourceforge.net/kde-windows/cmake-vc90-v2.8.2-bin.tar.bz2' self.targets['2.8.0-ce'] = 'http://downloads.sourceforge.net/kde-windows/cmake-vc90-2.8.0-6-bin.tar.bz2' self.targets['2.8.1-ce'] = 'http://downloads.sourceforge.net/kde-windows/cmake-vc90-2.8.1-bin.tar.bz2' self.targets['2.8.3-1'] = 'http://downloads.sourceforge.net/kde-windows/cmake-vc90-2.8.3-1-bin.tar.bz2' self.targets['2.8.3-2'] = 'http://downloads.sourceforge.net/kde-windows/cmake-vc90-2.8.3-2-bin.tar.bz2' self.targets['v2.8.8'] = 'http://downloads.sourceforge.net/kde-windows/cmake-vc100-2.8.8-bin.tar.bz2' self.targetMergeSourcePath['2.4.8'] = 'cmake-2.4.8-win32-x86' self.targetMergeSourcePath['2.6.4'] = 'cmake-2.6.4-win32-x86' self.targetMergeSourcePath['2.8.4'] = 'cmake-2.8.4-win32-x86' self.targetMergeSourcePath['2.8.5'] = 'cmake-2.8.5-win32-x86' self.targetMergeSourcePath['2.8.8'] = 'cmake-2.8.8-win32-x86' self.targetDigests['v2.8.2'] = 'de516a570808c7a022139b55e758d5f7b378ec7d' self.targetDigests['2.8.3-2'] = 'cba746303abb825c8549e6621da35757c039fa9e' self.targetDigests['2.8.4'] = '539ce250521d964a8770e0a7362db196dbc97fbc' self.targetDigests['2.8.5'] = 'ffdcd882600fba4dee1c225d89831f2f889c8276' self.targetDigests['2.8.8'] = '3e93868b4be00e4cee1787c8d0479b2bf3807602' - self.targetDigests['v2.8.8'] = '5ff19829e0cd29b097d9be4dc1fec6e944d19d1a' + self.targetDigests['v2.8.8'] = 'd63da3b1790b64729e357c157ad9103e1bcfa267' self.patchToApply['v2.8.2'] = ( 'findtiff.diff', 0 ) if emergePlatform.isCrossCompilingEnabled(): self.defaultTarget = '2.8.0-ce' else: # 2.8.4 is broken when using short paths and # windres fails even in old projects like zlib - self.defaultTarget = '2.8.3-2' + self.defaultTarget = 'v2.8.8' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' self.buildDependencies['gnuwin32/patch'] = 'default' from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True self.subinfo.options.merge.destinationPath = "dev-utils" BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/dbgview/dbgview-4.7.6..py b/portage/dev-util/dbgview/dbgview-4.7.6..py index 252ca3cf5..67468861e 100644 --- a/portage/dev-util/dbgview/dbgview-4.7.6..py +++ b/portage/dev-util/dbgview/dbgview-4.7.6..py @@ -1,21 +1,21 @@ import info class subinfo( info.infoclass ): def setTargets( self ): - self.targets['4.7.6'] = 'http://download.sysinternals.com/Files/DebugView.zip' - self.defaultTarget = '4.7.6' + self.targets['4.81'] = 'http://download.sysinternals.com/files/DebugView.zip' + self.defaultTarget = '4.81' # the zip file does not have a bin dir, so we have to create it # This attribute is in prelimary state - self.targetInstallPath['4.7.6'] = "bin" + self.targetInstallPath['4.81'] = "bin" from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True self.subinfo.options.merge.destinationPath = "dev-utils" BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/doxygen/doxygen-1.7.4.py b/portage/dev-util/doxygen/doxygen-1.7.4.py index 8ef230f5b..f8855ae27 100644 --- a/portage/dev-util/doxygen/doxygen-1.7.4.py +++ b/portage/dev-util/doxygen/doxygen-1.7.4.py @@ -1,30 +1,25 @@ import info 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' - self.targets['1.7.1'] = 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.1.windows.bin.zip' - self.targets['1.7.3'] = 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.3.windows.bin.zip' - self.targets['1.7.4'] = 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.windows.bin.zip' + for ver in ['1.5.9', '1.7.1', '1.7.3', '1.7.4', '1.8.2']: + self.targets[ ver ] = 'http://ftp.stack.nl/pub/users/dimitri/doxygen-%s.windows.bin.zip' % ver + self.targetInstallPath[ ver ] = "bin" + self.targetDigests['1.7.1'] = '29d2a80444300e5de383fb79bf096d2af05c55ce' self.targetDigests['1.7.3'] = '9dfe3c48f674900fba7537a47706feb6a1bed528' self.targetDigests['1.7.4'] = 'd3e869a5c04796115c5121911ac5f371481ba7f6' - self.defaultTarget = '1.7.4' - # the zip file does not have a bin dir, so we have to create it - # This attribute is in prelimary state - self.targetInstallPath['1.5.9'] = "bin" - self.targetInstallPath['1.7.1'] = "bin" - self.targetInstallPath['1.7.3'] = "bin" - self.targetInstallPath['1.7.4'] = "bin" + self.targetDigests['1.8.2'] = '95eb9882ea105435556c92d71acb19150fd6c76b' + self.defaultTarget = '1.8.2' from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True self.subinfo.options.merge.destinationPath = "dev-utils" BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/gendef/gendef-20120725.py b/portage/dev-util/gendef/gendef-20120725.py new file mode 100644 index 000000000..915f172a0 --- /dev/null +++ b/portage/dev-util/gendef/gendef-20120725.py @@ -0,0 +1,23 @@ +import info +from shells import * + +class subinfo( info.infoclass ): + def setTargets( self ): + self.svnTargets['svnHEAD'] = 'https://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64/trunk/mingw-w64-tools/gendef' + + self.defaultTarget = 'svnHEAD' + + def setDependencies( self ): + self.buildDependencies['dev-util/msys'] = 'default' + + +from Package.AutoToolsPackageBase import * + +class Package( AutoToolsPackageBase ): + def __init__( self ): + self.subinfo = subinfo() + AutoToolsPackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/dev-util/git/git-1.7.4.py b/portage/dev-util/git/git-1.7.4.py index 695a86643..4f1bb3338 100644 --- a/portage/dev-util/git/git-1.7.4.py +++ b/portage/dev-util/git/git-1.7.4.py @@ -1,66 +1,67 @@ # -*- coding: utf-8 -*- import info import tempfile import utils class subinfo(info.infoclass): def setTargets( self ): 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.targets['1.6.4'] = "http://msysgit.googlecode.com/files/PortableGit-1.6.4-preview20090729.7z" self.targets['1.7.0.2'] = "http://msysgit.googlecode.com/files/PortableGit-1.7.0.2-preview20100309.7z" self.targetDigests['1.7.0.2'] = '96c3720dec940c4b8da8a09bfdcfa7ed56c2f016' self.targets['1.7.4'] = "http://msysgit.googlecode.com/files/PortableGit-1.7.4-preview20110204.7z" self.targetDigests['1.7.4'] = 'bc470ba225666a60eed3d4fac544ce2a5611546b' - + self.targets['1.8.0'] = "https://msysgit.googlecode.com/files/PortableGit-1.8.0-preview20121022.7z" + self.targetDigests['1.8.0'] = '580804fcfcc77f1d30a9a27ff0ff85d53bea2442' self.defaultTarget = '1.7.4' def setDependencies(self): self.buildDependencies['dev-util/7zip'] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True self.subinfo.options.merge.destinationPath = "dev-utils//git"; BinaryPackageBase.__init__(self) def unpack(self): if not BinaryPackageBase.unpack(self): return False utils.copyFile(os.path.join(self.packageDir(),"git.bat"),os.path.join(self.rootdir,"dev-utils","bin","git.bat")) utils.copyFile(os.path.join(self.packageDir(),"git.sh"),os.path.join(self.rootdir,"dev-utils","bin","git"))#bash script utils.copyFile(os.path.join(self.packageDir(),"gb.bat"),os.path.join(self.rootdir,"dev-utils","bin","gb.bat")) utils.copyFile(os.path.join(self.packageDir(),"gitk.bat"),os.path.join(self.rootdir,"dev-utils","bin","gitk.bat")) utils.copyFile(os.path.join(self.packageDir(),"vi.bat"),os.path.join(self.rootdir,"dev-utils","bin","vi.bat")) utils.copyFile(os.path.join(self.packageDir(),"vim.bat"),os.path.join(self.rootdir,"dev-utils","bin","vim.bat")) return True def qmerge(self): utils.putenv("EMERGE_USE_SYMLINKS","False") if not BinaryPackageBase.qmerge(self): return False tmpFile = tempfile.TemporaryFile() git = os.path.join(self.rootdir,"dev-utils","git","bin","git") utils.system( "%s config --global --get url.git://anongit.kde.org/.insteadof" % git, stdout=tmpFile, stderr=tmpFile ) tmpFile.seek( 0 ) for line in tmpFile: if str(line,'UTF-8').find("kde:")>-1: return True utils.debug( "adding kde related settings to global git config file",1 ) utils.system( "%s config --global url.git://anongit.kde.org/.insteadOf kde:" % git) utils.system( "%s config --global url.ssh://git@git.kde.org/.pushInsteadOf kde:" % git) utils.system( "%s config --global core.autocrlf false" % git) utils.system( "%s config --system core.autocrlf false" % git) return True if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/jom/jom-1011-20120313.py b/portage/dev-util/jom/jom-1011-20120313.py index 415a7f722..f0c55430d 100644 --- a/portage/dev-util/jom/jom-1011-20120313.py +++ b/portage/dev-util/jom/jom-1011-20120313.py @@ -1,46 +1,48 @@ # -*- coding: utf-8 -*- import info import shutil import os class subinfo(info.infoclass): def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' def setTargets( self ): self.targets['HEAD'] = 'ftp://ftp.qt.nokia.com/jom/jom.zip' for ver in ['0_9_04', '1_0_00', '1_0_01', '1_0_02', '1_0_03', '1_0_04', '1_0_05', '1_0_06', '1_0_07', '1_0_08', '1_0_09', '1_0_10', - '1_0_11']: - self.targets[ver] = 'ftp://ftp.qt.nokia.com/jom/jom_' + ver + '.zip' + '1_0_11','1_0_12','1_0_13']: + self.targets[ver] = 'http://releases.qt-project.org/jom/jom_' + ver + '.zip' self.targets['unstable'] = 'ftp://ftp.qt.nokia.com/jom/unstable-jom.zip' self.targetDigests['0_9_04'] = '1f946283866cd6f40a5888088f6c7d840b62af2d' self.targetDigests['1_0_00'] = '545e964c606d28edce582f167574298589970fb4' self.targetDigests['1_0_01'] = '3cbc2750a8a0b8c736a10c7445b0b92ecf247292' self.targetDigests['1_0_02'] = '9cda65f2de954a3236d79f6bc72f5561da32163f' self.targetDigests['1_0_03'] = 'bb4c0a1db803a3ed8c31da29b1ad672bbcc636cb' self.targetDigests['1_0_05'] = '47c0b3fb58a753bb32b707528adc10bebf2b028a' self.targetDigests['1_0_08'] = '5efb1ada73d2886722ce0473b1b79de0bef38e1d' self.targetDigests['1_0_09'] = '6d58c5353dca65ca9ec4843ef394876ab4db179d' self.targetDigests['1_0_11'] = '089a6cc6a0366d480731be2d5cb608f7a54b8104' + self.targetDigests['1_0_12'] = '751acb5f71c022948553e006edd1aff2662c0b03' + self.targetDigests['1_0_13'] = 'e4059a58be58d04e70a1935b6886e28b69be7b82' self.targets['1_0_1-patched'] = 'http://www.winkde.org/pub/kde/ports/win32/repository/other/jom101-patched.7z' self.targetDigests['1_0_1-patched'] = '5f878e50cdd05f390b2737d4050a740edd48337f' self.targetDigests['unstable'] = '04feebc828bd30b3490890f04dc6b8ed7949e070' - self.defaultTarget = '1_0_11' + self.defaultTarget = '1_0_13' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True self.subinfo.options.merge.destinationPath = os.path.join("dev-utils","bin") BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/mingw-w32/mingw-w32-20111031.py b/portage/dev-util/mingw-w32/mingw-w32-20111031.py index 599740f0b..2549b274c 100644 --- a/portage/dev-util/mingw-w32/mingw-w32-20111031.py +++ b/portage/dev-util/mingw-w32/mingw-w32-20111031.py @@ -1,35 +1,35 @@ # -*- coding: utf-8 -*- import utils import shutil import os import info class subinfo(info.infoclass): def setTargets( self ): ver = "20111031" self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/mingw-w64/mingw-w32-bin_i686-mingw_"+ver+"_sezero.zip" self.defaultTarget = ver - for ver in [ "4.7.1" ]: - self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/mingw-w64/i686-w64-mingw32-gcc-4.7.1-release-win32_rubenvb.7z" + for ver in [ "4.7.2" ]: + self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/mingw-w64/i686-w64-mingw32-gcc-4.7.2-release-win32_rubenvb.7z" def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True BinaryPackageBase.__init__(self) def install(self): shutil.move( os.path.join( self.installDir() , "mingw32" ) , os.path.join( self.installDir(), "mingw" ) ) if self.subinfo.buildTarget == "20111031": shutil.copy( os.path.join( self.installDir() , "mingw" , "bin" , "gmake.exe") , os.path.join( self.installDir() , "mingw" , "bin" , "mingw32-make.exe") ) utils.applyPatch( self.imageDir(), os.path.join( self.packageDir(), "gcc_Exit.diff"), 0 ) return True if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/mingw-w64/mingw-w64-20111031.py b/portage/dev-util/mingw-w64/mingw-w64-20111031.py index 0d1d2ff34..dd809bc75 100644 --- a/portage/dev-util/mingw-w64/mingw-w64-20111031.py +++ b/portage/dev-util/mingw-w64/mingw-w64-20111031.py @@ -1,31 +1,28 @@ import utils import shutil import os import info class subinfo(info.infoclass): def setTargets( self ): for ver in [ "20111031", "20111101" ]: self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/mingw-w64/mingw-w64-bin_x86_64-mingw_"+ver+"_sezero.zip" - self.targets["4.7.1"] = "http://winkde.org/~pvonreth/downloads/%20x86_64-w64-mingw32-gcc-4.7.1-release-win64_rubenvb-crt-2.0.4.7z" + + self.targets["4.7.2"] = "http://downloads.sourceforge.net/sourceforge/mingwbuilds/%s-4.7.2-release-posix-sjlj-rev3.7z" % emergePlatform.buildArchitecture() + self.targetDigests['4.7.2'] = 'e4cc0963bbfe632fd4f7170767f5654ee6adb3c9' self.defaultTarget = "20111031" def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True BinaryPackageBase.__init__(self) - def install(self): -# utils.applyPatch( self.imageDir(), os.path.join( self.packageDir(), "gcc_Exit.diff"), 1 ) -# shutil.copy(os.path.join( self.installDir() , "mingw64" , "bin" , "gmake.exe") , os.path.join( self.installDir() , "mingw64" , "bin" , "mingw32-make.exe") ) - return True - if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/perl/perl-5.12.4.1205.py b/portage/dev-util/perl/perl-5.16.1.1601.py similarity index 80% rename from portage/dev-util/perl/perl-5.12.4.1205.py rename to portage/dev-util/perl/perl-5.16.1.1601.py index d5280615d..26753b864 100644 --- a/portage/dev-util/perl/perl-5.12.4.1205.py +++ b/portage/dev-util/perl/perl-5.16.1.1601.py @@ -1,46 +1,52 @@ import info import emergePlatform class subinfo(info.infoclass): def setTargets( self ): self.targets['5.8.8'] = "http://downloads.activestate.com/ActivePerl/Windows/5.8/ActivePerl-5.8.8.822-MSWin32-x86-280952.zip" self.targetMergeSourcePath['5.8.8'] = "ActivePerl-5.8.8.822-MSWin32-x86-280952\\perl" if emergePlatform.buildArchitecture() == 'x64': self.targets['5.10.1'] = "http://downloads.activestate.com/ActivePerl/releases/5.10.1.1007/ActivePerl-5.10.1.1007-MSWin32-x64-291969.zip" self.targetDigests['5.10.1'] = 'b5e9ab83d14e1c3311e280a96d355d491d4d55f5' self.targetMergeSourcePath['5.10.1'] = "ActivePerl-5.10.1.1007-MSWin32-x64-291969\\perl" self.targets['5.12.2'] = "http://downloads.activestate.com/ActivePerl/releases/5.12.2.1203/ActivePerl-5.12.2.1203-MSWin32-x64-294165.zip" #self.targetDigests['5.12.2'] = 'b5e9ab83d14e1c3311e280a96d355d491d4d55f5' self.targetMergeSourcePath['5.12.2'] = "ActivePerl-5.12.2.1203-MSWin32-x64-294165\\perl" self.targets['5.12.4'] = "http://downloads.activestate.com/ActivePerl/releases/5.12.4.1205/ActivePerl-5.12.4.1205-MSWin32-x64-294981.zip" self.targetDigests['5.12.4'] = 'f49d3681908978e1093f270cce0bf02d0a92334e' self.targetMergeSourcePath['5.12.4'] = "ActivePerl-5.12.4.1205-MSWin32-x64-294981\\perl" + self.targets['5.16.1'] = "http://downloads.activestate.com/ActivePerl/releases/5.16.1.1601/ActivePerl-5.16.1.1601-MSWin32-x64-296175.zip" + self.targetDigests['5.16.1'] = '2993227966574afb227640dcd139b088fee43879' + self.targetMergeSourcePath['5.16.1'] = "ActivePerl-5.16.1.1601-MSWin32-x64-296175\\perl" else: self.targets['5.10.1'] = "http://downloads.activestate.com/ActivePerl/releases/5.10.1.1007/ActivePerl-5.10.1.1007-MSWin32-x86-291969.zip" self.targetDigests['5.10.1'] = '9122a828b32d8b8499c73b61972eaec303698961' self.targetMergeSourcePath['5.10.1'] = "ActivePerl-5.10.1.1007-MSWin32-x86-291969\\perl" self.targets['5.12.2'] = "http://downloads.activestate.com/ActivePerl/releases/5.12.2.1203/ActivePerl-5.12.2.1203-MSWin32-x86-294165.zip" self.targetDigests['5.12.2'] = 'f87d1ab5867a38a46a68f82f5a35d2d2526c1420' self.targetMergeSourcePath['5.12.2'] = "ActivePerl-5.12.2.1203-MSWin32-x86-294165\\perl" self.targets['5.12.4'] = "http://downloads.activestate.com/ActivePerl/releases/5.12.4.1205/ActivePerl-5.12.4.1205-MSWin32-x86-294981.zip" self.targetDigests['5.12.4'] = '14dc84b576a1004d8c71ca3309534c7952215182' self.targetMergeSourcePath['5.12.4'] = "ActivePerl-5.12.4.1205-MSWin32-x86-294981\\perl" - self.defaultTarget = '5.12.4' + self.targets['5.16.1'] = "http://downloads.activestate.com/ActivePerl/releases/5.16.1.1601/ActivePerl-5.16.1.1601-MSWin32-x86-296175.zip" + self.targetDigests['5.16.1'] = 'e638f101c46ca8f0ecbfd7a07772d434d7c22c56' + self.targetMergeSourcePath['5.16.1'] = "ActivePerl-5.16.1.1601-MSWin32-x86-296175\\perl" + self.defaultTarget = '5.16.1' def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True self.subinfo.options.merge.destinationPath = "dev-utils" BinaryPackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/subversion/subversion-1.6.5.20091115.py b/portage/dev-util/subversion/subversion-1.6.5.20091115.py index 6d50dd876..d662b55a5 100644 --- a/portage/dev-util/subversion/subversion-1.6.5.20091115.py +++ b/portage/dev-util/subversion/subversion-1.6.5.20091115.py @@ -1,34 +1,38 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.targets['1.6.5'] = "http://subversion.tigris.org/files/documents/15/47906/svn-win32-1.6.5.zip" + self.targets['1.7.6'] = "http://downloads.sourceforge.net/win32svn/apache22/svn-win32-1.7.6.zip" # this location affects class SvnSource self.targetMergePath['1.6.5'] = "dev-utils/svn"; + self.targetMergePath['1.7.6'] = "dev-utils/svn"; self.targetMergeSourcePath['1.6.5'] = "svn-win32-1.6.5"; + self.targetMergeSourcePath['1.7.6'] = "svn-win32-1.7.6"; self.targetDigests['1.6.5'] = '0df7b20e0bf0fa82ca3a9ededb9207ba50df063e' + self.targetDigests['1.7.6'] = '3a18decdf971268abdec34ab459147a8139241db' self.defaultTarget = '1.6.5' def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__( self): self.subinfo = subinfo() self.subinfo.options.merge.ignoreBuildType = True BinaryPackageBase.__init__(self) def unpack(self): if not BinaryPackageBase.unpack(self): return False utils.copyFile(os.path.join(self.packageDir(),"svn.bat"),os.path.join(self.rootdir,"dev-utils","bin","svn.bat")) return True if __name__ == '__main__': Package().execute() diff --git a/portage/dev-util/winflexbison/winflexbison-20101219.py b/portage/dev-util/winflexbison/winflexbison-20101219.py new file mode 100644 index 000000000..f730c2ce8 --- /dev/null +++ b/portage/dev-util/winflexbison/winflexbison-20101219.py @@ -0,0 +1,29 @@ +# uactools : Binary package of the tools to handle UAC from kde-windows. +# mt.exe can be used to embed manifest files to disable heuristic UAC raise +# requests, setuac.exe can be used to enable raise the privileges of a program. +# The according source package is uactools-pkg + + +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + self.targets[ "2.1" ] = "http://downloads.sourceforge.net/winflexbison/win_flex_bison-2.1.zip" + self.targetDigests['2.1'] = '8225e2bae867c07489cd0dc302bc529ce1a276a2' + self.defaultTarget = "2.1" + + def setDependencies( self ): + self.buildDependencies['gnuwin32/wget'] = 'default' + +from Package.BinaryPackageBase import * + +class Package( BinaryPackageBase ): + def __init__( self ): + self.subinfo = subinfo() + self.subinfo.options.merge.ignoreBuildType = True + self.subinfo.options.merge.destinationPath = "dev-utils" + self.subinfo.options.install.installPath = "bin" + BinaryPackageBase.__init__( self ) + +if __name__ == '__main__': + Package().execute() diff --git a/portage/extragear/amarok/amarok-2.5.0-20110110.py b/portage/extragear/amarok/amarok-2.5.0-20110110.py index be38acad5..8d95e3a82 100644 --- a/portage/extragear/amarok/amarok-2.5.0-20110110.py +++ b/portage/extragear/amarok/amarok-2.5.0-20110110.py @@ -1,41 +1,41 @@ # -*- coding: utf-8 -*- import info import os from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - for ver in [ '2.3.1', '2.3.2' , '2.4.3' ,'2.5.0' ]: + for ver in [ '2.3.1', '2.3.2' , '2.4.3' ,'2.5.0','2.6.0' ]: self.targets[ver] = 'http://download.kde.org/download.php?url=stable/amarok/' + ver + '/src/amarok-' + ver + '.tar.bz2' self.targetInstSrc[ver] = 'amarok-' + ver self.patchToApply[ '2.3.2' ] = [ ( 'amarok-2.3.2-20110110.diff', 1 ) ] self.patchToApply[ '2.4.3' ] = [ ( 'amarok-2.4.3-20110818.diff', 1 ), ( 'amarok-2.4.3-x64.diff', 1 ) ] self.targetDigests['2.4.3'] = '8a46fca6a550a4ca403a9be7f595728c819641c4' self.patchToApply[ '2.5.0' ] = [ ( 'amarok-2.4.90-20111208.diff', 1 )] self.targetDigests['2.5.0'] = '9849900d20225e703c43d242650a8fa211cf15f2' self.svnTargets['gitHEAD'] = '[git]kde:amarok.git' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['win32libs-bin/taglib'] = 'default' self.dependencies['win32libs-bin/taglib-extras'] = 'default' self.dependencies['kdesupport/phonon'] = 'default' self.dependencies['kdesupport/qca'] = 'default' self.dependencies['virtual/kde-runtime'] = 'default' self.dependencies['binary/mysql-pkg'] = 'default' self.dependencies['kdesupport/liblastfm'] = 'default' self.dependencies['win32libs-bin/gettext'] = 'default' self.runtimeDependencies['kdesupport/qtscriptgenerator'] = 'default' self.buildDependencies['dev-util/gettext-tools'] = 'default' self.shortDescription = "a powerful music player" class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/extragear/libkgapi/libkgapi-20120903.py similarity index 56% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/extragear/libkgapi/libkgapi-20120903.py index 6b312504a..5b20339c2 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/extragear/libkgapi/libkgapi-20120903.py @@ -1,20 +1,20 @@ import info -class subinfo(info.infoclass): +class subinfo( info.infoclass ): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:libkgapi' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/kdepimlibs'] = 'default' + self.shortDescription = "KDE library for Google API" from Package.CMakePackageBase import * -class Package(CMakePackageBase): +class Package( CMakePackageBase ): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/extragear/libkgeomap/libkgeomap-1.0.0.py b/portage/extragear/libkgeomap/libkgeomap-1.0.0.py index 7bc35afd0..b50b6fc7d 100644 --- a/portage/extragear/libkgeomap/libkgeomap-1.0.0.py +++ b/portage/extragear/libkgeomap/libkgeomap-1.0.0.py @@ -1,23 +1,22 @@ import os import sys import info # deprecated class class subinfo(info.infoclass): def setTargets( self ): - print "setTargets" self.svnTargets['gitHEAD'] = '[git]kde:libkgeomap' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/testing/rekonq/rekonq-20091023.py b/portage/extragear/rekonq/rekonq-20091023.py similarity index 100% rename from portage/testing/rekonq/rekonq-20091023.py rename to portage/extragear/rekonq/rekonq-20091023.py diff --git a/portage/kde/kactivities/kactivities-20111102.py b/portage/kde/kactivities/kactivities-20111102.py index c25785f01..639a998d9 100644 --- a/portage/kde/kactivities/kactivities-20111102.py +++ b/portage/kde/kactivities/kactivities-20111102.py @@ -1,21 +1,23 @@ import os import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = '[git]kde:kactivities' - self.defaultTarget = 'gitHEAD' + for version in ['4.4', '4.5', '4.6', '4.7', '4.8', '4.9']: + self.svnTargets[version] = '[git]kde:kactivities|KDE/%s|' % version + self.defaultTarget = '4.9' def setDependencies( self ): self.dependencies['kde/kdelibs'] = 'default' self.shortDescription = "KDE Activity Manager" from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__(self) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-4.9.0.py similarity index 95% rename from portage/kde/kde4-l10n/kde4-l10n-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-4.9.0.py index 9df7f9515..47f860f51 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-4.9.0.py @@ -1,70 +1,70 @@ -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['4.8.2'] = '' - self.defaultTarget = '4.8.2' - - def setDependencies( self ): - self.dependencies['kde/kde4-l10n-ar'] = 'default' - self.dependencies['kde/kde4-l10n-bg'] = 'default' - self.dependencies['kde/kde4-l10n-bs'] = 'default' - self.dependencies['kde/kde4-l10n-ca'] = 'default' - self.dependencies['kde/kde4-l10n-ca@valencia'] = 'default' - self.dependencies['kde/kde4-l10n-cs'] = 'default' - self.dependencies['kde/kde4-l10n-da'] = 'default' - self.dependencies['kde/kde4-l10n-de'] = 'default' - self.dependencies['kde/kde4-l10n-el'] = 'default' - self.dependencies['kde/kde4-l10n-en_GB'] = 'default' - self.dependencies['kde/kde4-l10n-es'] = 'default' - self.dependencies['kde/kde4-l10n-et'] = 'default' - self.dependencies['kde/kde4-l10n-eu'] = 'default' - self.dependencies['kde/kde4-l10n-fi'] = 'default' - self.dependencies['kde/kde4-l10n-fr'] = 'default' - self.dependencies['kde/kde4-l10n-ga'] = 'default' - self.dependencies['kde/kde4-l10n-gl'] = 'default' - self.dependencies['kde/kde4-l10n-he'] = 'default' - self.dependencies['kde/kde4-l10n-hr'] = 'default' - self.dependencies['kde/kde4-l10n-hu'] = 'default' - self.dependencies['kde/kde4-l10n-ia'] = 'default' - self.dependencies['kde/kde4-l10n-id'] = 'default' - self.dependencies['kde/kde4-l10n-is'] = 'default' - self.dependencies['kde/kde4-l10n-it'] = 'default' - self.dependencies['kde/kde4-l10n-ja'] = 'default' - self.dependencies['kde/kde4-l10n-kk'] = 'default' - self.dependencies['kde/kde4-l10n-km'] = 'default' - self.dependencies['kde/kde4-l10n-ko'] = 'default' - self.dependencies['kde/kde4-l10n-lt'] = 'default' - self.dependencies['kde/kde4-l10n-lv'] = 'default' - self.dependencies['kde/kde4-l10n-nb'] = 'default' - self.dependencies['kde/kde4-l10n-nds'] = 'default' - self.dependencies['kde/kde4-l10n-nl'] = 'default' - self.dependencies['kde/kde4-l10n-nn'] = 'default' - self.dependencies['kde/kde4-l10n-pa'] = 'default' - self.dependencies['kde/kde4-l10n-pl'] = 'default' - self.dependencies['kde/kde4-l10n-pt'] = 'default' - self.dependencies['kde/kde4-l10n-pt_BR'] = 'default' - self.dependencies['kde/kde4-l10n-ro'] = 'default' - self.dependencies['kde/kde4-l10n-ru'] = 'default' - self.dependencies['kde/kde4-l10n-sk'] = 'default' - self.dependencies['kde/kde4-l10n-sl'] = 'default' - self.dependencies['kde/kde4-l10n-sr'] = 'default' - self.dependencies['kde/kde4-l10n-sv'] = 'default' - self.dependencies['kde/kde4-l10n-th'] = 'default' - self.dependencies['kde/kde4-l10n-tr'] = 'default' - self.dependencies['kde/kde4-l10n-ug'] = 'default' - self.dependencies['kde/kde4-l10n-uk'] = 'default' - self.dependencies['kde/kde4-l10n-wa'] = 'default' - self.dependencies['kde/kde4-l10n-zh_CN'] = 'default' - self.dependencies['kde/kde4-l10n-zh_TW'] = 'default' - -from Package.VirtualPackageBase import * - -class Package( VirtualPackageBase ): - def __init__( self ): - self.subinfo = subinfo() - VirtualPackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import info + +class subinfo(info.infoclass): + def setTargets( self ): + self.svnTargets['4.9.0'] = '' + self.defaultTarget = '4.9.0' + + def setDependencies( self ): + self.dependencies['kde/kde4-l10n-ar'] = 'default' + self.dependencies['kde/kde4-l10n-bg'] = 'default' + self.dependencies['kde/kde4-l10n-bs'] = 'default' + self.dependencies['kde/kde4-l10n-ca'] = 'default' + self.dependencies['kde/kde4-l10n-ca@valencia'] = 'default' + self.dependencies['kde/kde4-l10n-cs'] = 'default' + self.dependencies['kde/kde4-l10n-da'] = 'default' + self.dependencies['kde/kde4-l10n-de'] = 'default' + self.dependencies['kde/kde4-l10n-el'] = 'default' + self.dependencies['kde/kde4-l10n-en_GB'] = 'default' + self.dependencies['kde/kde4-l10n-es'] = 'default' + self.dependencies['kde/kde4-l10n-et'] = 'default' + self.dependencies['kde/kde4-l10n-eu'] = 'default' + self.dependencies['kde/kde4-l10n-fi'] = 'default' + self.dependencies['kde/kde4-l10n-fr'] = 'default' + self.dependencies['kde/kde4-l10n-ga'] = 'default' + self.dependencies['kde/kde4-l10n-gl'] = 'default' + self.dependencies['kde/kde4-l10n-he'] = 'default' + self.dependencies['kde/kde4-l10n-hr'] = 'default' + self.dependencies['kde/kde4-l10n-hu'] = 'default' + self.dependencies['kde/kde4-l10n-ia'] = 'default' + self.dependencies['kde/kde4-l10n-id'] = 'default' + self.dependencies['kde/kde4-l10n-is'] = 'default' + self.dependencies['kde/kde4-l10n-it'] = 'default' + self.dependencies['kde/kde4-l10n-ja'] = 'default' + self.dependencies['kde/kde4-l10n-kk'] = 'default' + self.dependencies['kde/kde4-l10n-km'] = 'default' + self.dependencies['kde/kde4-l10n-ko'] = 'default' + self.dependencies['kde/kde4-l10n-lt'] = 'default' + self.dependencies['kde/kde4-l10n-lv'] = 'default' + self.dependencies['kde/kde4-l10n-nb'] = 'default' + self.dependencies['kde/kde4-l10n-nds'] = 'default' + self.dependencies['kde/kde4-l10n-nl'] = 'default' + self.dependencies['kde/kde4-l10n-nn'] = 'default' + self.dependencies['kde/kde4-l10n-pa'] = 'default' + self.dependencies['kde/kde4-l10n-pl'] = 'default' + self.dependencies['kde/kde4-l10n-pt'] = 'default' + self.dependencies['kde/kde4-l10n-pt_BR'] = 'default' + self.dependencies['kde/kde4-l10n-ro'] = 'default' + self.dependencies['kde/kde4-l10n-ru'] = 'default' + self.dependencies['kde/kde4-l10n-sk'] = 'default' + self.dependencies['kde/kde4-l10n-sl'] = 'default' + self.dependencies['kde/kde4-l10n-sr'] = 'default' + self.dependencies['kde/kde4-l10n-sv'] = 'default' + self.dependencies['kde/kde4-l10n-th'] = 'default' + self.dependencies['kde/kde4-l10n-tr'] = 'default' + self.dependencies['kde/kde4-l10n-ug'] = 'default' + self.dependencies['kde/kde4-l10n-uk'] = 'default' + self.dependencies['kde/kde4-l10n-wa'] = 'default' + self.dependencies['kde/kde4-l10n-zh_CN'] = 'default' + self.dependencies['kde/kde4-l10n-zh_TW'] = 'default' + +from Package.VirtualPackageBase import * + +class Package( VirtualPackageBase ): + def __init__( self ): + self.subinfo = subinfo() + VirtualPackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ar/kde4-l10n-ar-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ar/kde4-l10n-ar-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ar/kde4-l10n-ar-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ar/kde4-l10n-ar-4.9.0.py index c61535f6c..7ef655824 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ar/kde4-l10n-ar-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ar/kde4-l10n-ar-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ar-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ar-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ar-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ar-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-bg/kde4-l10n-bg-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-bg/kde4-l10n-bg-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-bg/kde4-l10n-bg-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-bg/kde4-l10n-bg-4.9.0.py index daa91c80d..52c85030c 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-bg/kde4-l10n-bg-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-bg/kde4-l10n-bg-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-bg-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-bg-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-bg-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-bg-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-bs/kde4-l10n-bs-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-bs/kde4-l10n-bs-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-bs/kde4-l10n-bs-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-bs/kde4-l10n-bs-4.9.0.py index 01308b751..ab09c4429 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-bs/kde4-l10n-bs-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-bs/kde4-l10n-bs-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-bs-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-bs-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-bs-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-bs-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ca/kde4-l10n-ca-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ca/kde4-l10n-ca-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ca/kde4-l10n-ca-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ca/kde4-l10n-ca-4.9.0.py index 1ef4e3d49..939c0a7ca 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ca/kde4-l10n-ca-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ca/kde4-l10n-ca-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ca-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ca-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ca-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ca-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ca@valencia/kde4-l10n-ca@valencia-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ca@valencia/kde4-l10n-ca@valencia-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ca@valencia/kde4-l10n-ca@valencia-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ca@valencia/kde4-l10n-ca@valencia-4.9.0.py index 685d29c15..ed4a6fe90 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ca@valencia/kde4-l10n-ca@valencia-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ca@valencia/kde4-l10n-ca@valencia-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ca@valencia-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ca@valencia-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ca@valencia-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ca@valencia-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-cs/kde4-l10n-cs-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-cs/kde4-l10n-cs-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-cs/kde4-l10n-cs-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-cs/kde4-l10n-cs-4.9.0.py index 5d2c6fcfe..431865dcc 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-cs/kde4-l10n-cs-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-cs/kde4-l10n-cs-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-cs-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-cs-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-cs-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-cs-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-da/kde4-l10n-da-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-da/kde4-l10n-da-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-da/kde4-l10n-da-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-da/kde4-l10n-da-4.9.0.py index c14b743b2..6642412eb 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-da/kde4-l10n-da-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-da/kde4-l10n-da-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-da-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-da-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-da-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-da-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-de/kde4-l10n-de-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-de/kde4-l10n-de-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-de/kde4-l10n-de-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-de/kde4-l10n-de-4.9.0.py index f8fb04847..885eda1d4 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-de/kde4-l10n-de-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-de/kde4-l10n-de-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-de-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-de-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-de-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-de-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-el/kde4-l10n-el-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-el/kde4-l10n-el-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-el/kde4-l10n-el-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-el/kde4-l10n-el-4.9.0.py index e03656899..f1903cd22 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-el/kde4-l10n-el-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-el/kde4-l10n-el-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-el-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-el-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-el-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-el-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-en_GB/kde4-l10n-en_GB-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-en_GB/kde4-l10n-en_GB-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-en_GB/kde4-l10n-en_GB-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-en_GB/kde4-l10n-en_GB-4.9.0.py index 3c5f4b971..03a2c642b 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-en_GB/kde4-l10n-en_GB-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-en_GB/kde4-l10n-en_GB-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-en_GB-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-en_GB-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-en_GB-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-en_GB-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-es/kde4-l10n-es-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-es/kde4-l10n-es-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-es/kde4-l10n-es-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-es/kde4-l10n-es-4.9.0.py index 5d4cbf992..fe399a4a7 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-es/kde4-l10n-es-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-es/kde4-l10n-es-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-es-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-es-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-es-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-es-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-et/kde4-l10n-et-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-et/kde4-l10n-et-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-et/kde4-l10n-et-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-et/kde4-l10n-et-4.9.0.py index 354ebb682..d91b67600 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-et/kde4-l10n-et-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-et/kde4-l10n-et-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-et-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-et-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-et-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-et-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-eu/kde4-l10n-eu-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-eu/kde4-l10n-eu-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-eu/kde4-l10n-eu-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-eu/kde4-l10n-eu-4.9.0.py index 130674533..10797cdaa 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-eu/kde4-l10n-eu-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-eu/kde4-l10n-eu-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-eu-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-eu-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-eu-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-eu-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-fi/kde4-l10n-fi-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-fi/kde4-l10n-fi-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-fi/kde4-l10n-fi-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-fi/kde4-l10n-fi-4.9.0.py index c21da6712..5f90dd656 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-fi/kde4-l10n-fi-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-fi/kde4-l10n-fi-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-fi-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-fi-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-fi-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-fi-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-fr/kde4-l10n-fr-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-fr/kde4-l10n-fr-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-fr/kde4-l10n-fr-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-fr/kde4-l10n-fr-4.9.0.py index 593a1cebc..494eeb537 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-fr/kde4-l10n-fr-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-fr/kde4-l10n-fr-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-fr-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-fr-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-fr-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-fr-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ga/kde4-l10n-ga-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ga/kde4-l10n-ga-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ga/kde4-l10n-ga-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ga/kde4-l10n-ga-4.9.0.py index d339bf5f0..a83ac06d8 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ga/kde4-l10n-ga-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ga/kde4-l10n-ga-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ga-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ga-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ga-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ga-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-gl/kde4-l10n-gl-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-gl/kde4-l10n-gl-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-gl/kde4-l10n-gl-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-gl/kde4-l10n-gl-4.9.0.py index 89c6f2d4e..f2c902cc3 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-gl/kde4-l10n-gl-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-gl/kde4-l10n-gl-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-gl-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-gl-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-gl-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-gl-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-he/kde4-l10n-he-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-he/kde4-l10n-he-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-he/kde4-l10n-he-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-he/kde4-l10n-he-4.9.0.py index a51b737df..fae890ad3 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-he/kde4-l10n-he-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-he/kde4-l10n-he-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-he-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-he-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-he-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-he-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-hr/kde4-l10n-hr-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-hr/kde4-l10n-hr-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-hr/kde4-l10n-hr-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-hr/kde4-l10n-hr-4.9.0.py index 60fe4149f..81f743ad2 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-hr/kde4-l10n-hr-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-hr/kde4-l10n-hr-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-hr-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-hr-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-hr-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-hr-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-hu/kde4-l10n-hu-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-hu/kde4-l10n-hu-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-hu/kde4-l10n-hu-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-hu/kde4-l10n-hu-4.9.0.py index 53d3b46a6..040e9e192 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-hu/kde4-l10n-hu-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-hu/kde4-l10n-hu-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-hu-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-hu-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-hu-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-hu-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ia/kde4-l10n-ia-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ia/kde4-l10n-ia-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ia/kde4-l10n-ia-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ia/kde4-l10n-ia-4.9.0.py index fbb3d43a3..30c4a3957 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ia/kde4-l10n-ia-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ia/kde4-l10n-ia-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ia-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ia-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ia-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ia-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-id/kde4-l10n-id-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-id/kde4-l10n-id-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-id/kde4-l10n-id-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-id/kde4-l10n-id-4.9.0.py index 4e10baad2..a06cc2f30 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-id/kde4-l10n-id-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-id/kde4-l10n-id-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-id-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-id-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-id-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-id-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-is/kde4-l10n-is-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-is/kde4-l10n-is-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-is/kde4-l10n-is-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-is/kde4-l10n-is-4.9.0.py index 9ea3f09e8..01c85a2f7 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-is/kde4-l10n-is-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-is/kde4-l10n-is-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-is-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-is-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-is-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-is-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-it/kde4-l10n-it-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-it/kde4-l10n-it-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-it/kde4-l10n-it-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-it/kde4-l10n-it-4.9.0.py index 1cc801287..d383955fa 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-it/kde4-l10n-it-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-it/kde4-l10n-it-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-it-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-it-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-it-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-it-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ja/kde4-l10n-ja-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ja/kde4-l10n-ja-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ja/kde4-l10n-ja-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ja/kde4-l10n-ja-4.9.0.py index e7e7b30fa..e61afa651 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ja/kde4-l10n-ja-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ja/kde4-l10n-ja-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ja-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ja-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ja-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ja-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-kk/kde4-l10n-kk-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-kk/kde4-l10n-kk-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-kk/kde4-l10n-kk-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-kk/kde4-l10n-kk-4.9.0.py index bae869669..80a9f2f1d 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-kk/kde4-l10n-kk-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-kk/kde4-l10n-kk-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-kk-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-kk-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-kk-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-kk-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-km/kde4-l10n-km-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-km/kde4-l10n-km-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-km/kde4-l10n-km-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-km/kde4-l10n-km-4.9.0.py index 2b92391d0..5b729b3f3 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-km/kde4-l10n-km-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-km/kde4-l10n-km-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-km-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-km-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-km-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-km-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ko/kde4-l10n-ko-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ko/kde4-l10n-ko-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ko/kde4-l10n-ko-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ko/kde4-l10n-ko-4.9.0.py index 026d8a9ff..a03a3577f 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ko/kde4-l10n-ko-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ko/kde4-l10n-ko-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ko-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ko-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ko-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ko-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-lt/kde4-l10n-lt-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-lt/kde4-l10n-lt-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-lt/kde4-l10n-lt-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-lt/kde4-l10n-lt-4.9.0.py index abea60eca..18dce4f74 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-lt/kde4-l10n-lt-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-lt/kde4-l10n-lt-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-lt-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-lt-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-lt-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-lt-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-lv/kde4-l10n-lv-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-lv/kde4-l10n-lv-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-lv/kde4-l10n-lv-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-lv/kde4-l10n-lv-4.9.0.py index 76cac2173..7d7ccec76 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-lv/kde4-l10n-lv-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-lv/kde4-l10n-lv-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-lv-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-lv-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-lv-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-lv-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-nb/kde4-l10n-nb-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-nb/kde4-l10n-nb-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-nb/kde4-l10n-nb-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-nb/kde4-l10n-nb-4.9.0.py index a685ab1c0..d18d022c0 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-nb/kde4-l10n-nb-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-nb/kde4-l10n-nb-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nb-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-nb-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nb-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-nb-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-nds/kde4-l10n-nds-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-nds/kde4-l10n-nds-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-nds/kde4-l10n-nds-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-nds/kde4-l10n-nds-4.9.0.py index ccee41a09..ff5b76db7 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-nds/kde4-l10n-nds-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-nds/kde4-l10n-nds-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nds-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-nds-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nds-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-nds-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-nl/kde4-l10n-nl-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-nl/kde4-l10n-nl-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-nl/kde4-l10n-nl-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-nl/kde4-l10n-nl-4.9.0.py index dd2e26c6e..118a6de84 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-nl/kde4-l10n-nl-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-nl/kde4-l10n-nl-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nl-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-nl-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nl-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-nl-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-nn/kde4-l10n-nn-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-nn/kde4-l10n-nn-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-nn/kde4-l10n-nn-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-nn/kde4-l10n-nn-4.9.0.py index c5ed153cc..3f5946f10 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-nn/kde4-l10n-nn-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-nn/kde4-l10n-nn-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nn-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-nn-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-nn-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-nn-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-pa/kde4-l10n-pa-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-pa/kde4-l10n-pa-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-pa/kde4-l10n-pa-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-pa/kde4-l10n-pa-4.9.0.py index 78bb261de..6c78a3497 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-pa/kde4-l10n-pa-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-pa/kde4-l10n-pa-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pa-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-pa-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pa-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-pa-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-pl/kde4-l10n-pl-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-pl/kde4-l10n-pl-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-pl/kde4-l10n-pl-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-pl/kde4-l10n-pl-4.9.0.py index 8de4653a9..126212b49 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-pl/kde4-l10n-pl-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-pl/kde4-l10n-pl-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pl-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-pl-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pl-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-pl-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-pt/kde4-l10n-pt-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-pt/kde4-l10n-pt-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-pt/kde4-l10n-pt-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-pt/kde4-l10n-pt-4.9.0.py index d94a9aff0..b38253034 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-pt/kde4-l10n-pt-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-pt/kde4-l10n-pt-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pt-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-pt-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pt-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-pt-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-pt_BR/kde4-l10n-pt_BR-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-pt_BR/kde4-l10n-pt_BR-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-pt_BR/kde4-l10n-pt_BR-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-pt_BR/kde4-l10n-pt_BR-4.9.0.py index 10ecd9fd9..00c7c972b 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-pt_BR/kde4-l10n-pt_BR-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-pt_BR/kde4-l10n-pt_BR-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pt_BR-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-pt_BR-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-pt_BR-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-pt_BR-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ro/kde4-l10n-ro-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ro/kde4-l10n-ro-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ro/kde4-l10n-ro-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ro/kde4-l10n-ro-4.9.0.py index 4235ed073..14607a198 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ro/kde4-l10n-ro-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ro/kde4-l10n-ro-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ro-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ro-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ro-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ro-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ru/kde4-l10n-ru-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ru/kde4-l10n-ru-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ru/kde4-l10n-ru-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ru/kde4-l10n-ru-4.9.0.py index 47b021dfb..ca3f663e0 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ru/kde4-l10n-ru-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ru/kde4-l10n-ru-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ru-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ru-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ru-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ru-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-sk/kde4-l10n-sk-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-sk/kde4-l10n-sk-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-sk/kde4-l10n-sk-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-sk/kde4-l10n-sk-4.9.0.py index 0eb1d0fbb..839aab282 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-sk/kde4-l10n-sk-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-sk/kde4-l10n-sk-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sk-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-sk-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sk-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-sk-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-sl/kde4-l10n-sl-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-sl/kde4-l10n-sl-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-sl/kde4-l10n-sl-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-sl/kde4-l10n-sl-4.9.0.py index 3931e7851..e33dfac9b 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-sl/kde4-l10n-sl-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-sl/kde4-l10n-sl-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sl-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-sl-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sl-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-sl-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-sr/kde4-l10n-sr-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-sr/kde4-l10n-sr-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-sr/kde4-l10n-sr-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-sr/kde4-l10n-sr-4.9.0.py index b1429fb96..fa2dbdedf 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-sr/kde4-l10n-sr-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-sr/kde4-l10n-sr-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sr-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-sr-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sr-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-sr-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-sv/kde4-l10n-sv-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-sv/kde4-l10n-sv-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-sv/kde4-l10n-sv-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-sv/kde4-l10n-sv-4.9.0.py index 14ba95206..ea66c3372 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-sv/kde4-l10n-sv-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-sv/kde4-l10n-sv-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sv-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-sv-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-sv-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-sv-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-th/kde4-l10n-th-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-th/kde4-l10n-th-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-th/kde4-l10n-th-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-th/kde4-l10n-th-4.9.0.py index 69c85b13e..1b6e32731 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-th/kde4-l10n-th-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-th/kde4-l10n-th-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-th-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-th-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-th-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-th-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-tr/kde4-l10n-tr-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-tr/kde4-l10n-tr-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-tr/kde4-l10n-tr-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-tr/kde4-l10n-tr-4.9.0.py index b1a23cbb8..1d85179c0 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-tr/kde4-l10n-tr-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-tr/kde4-l10n-tr-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-tr-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-tr-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-tr-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-tr-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-ug/kde4-l10n-ug-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-ug/kde4-l10n-ug-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-ug/kde4-l10n-ug-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-ug/kde4-l10n-ug-4.9.0.py index 7cabf278d..599d6d9c2 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-ug/kde4-l10n-ug-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-ug/kde4-l10n-ug-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ug-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-ug-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-ug-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-ug-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-uk/kde4-l10n-uk-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-uk/kde4-l10n-uk-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-uk/kde4-l10n-uk-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-uk/kde4-l10n-uk-4.9.0.py index 7a0764494..8e8b4f157 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-uk/kde4-l10n-uk-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-uk/kde4-l10n-uk-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-uk-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-uk-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-uk-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-uk-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-wa/kde4-l10n-wa-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-wa/kde4-l10n-wa-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-wa/kde4-l10n-wa-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-wa/kde4-l10n-wa-4.9.0.py index c0a343062..f68793bc0 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-wa/kde4-l10n-wa-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-wa/kde4-l10n-wa-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-wa-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-wa-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-wa-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-wa-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-zh_CN/kde4-l10n-zh_CN-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-zh_CN/kde4-l10n-zh_CN-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-zh_CN/kde4-l10n-zh_CN-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-zh_CN/kde4-l10n-zh_CN-4.9.0.py index e91c14668..d64ccc25f 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-zh_CN/kde4-l10n-zh_CN-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-zh_CN/kde4-l10n-zh_CN-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-zh_CN-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-zh_CN-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-zh_CN-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-zh_CN-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kde4-l10n/kde4-l10n-zh_TW/kde4-l10n-zh_TW-4.8.2.py b/portage/kde/kde4-l10n/kde4-l10n-zh_TW/kde4-l10n-zh_TW-4.9.0.py similarity index 84% rename from portage/kde/kde4-l10n/kde4-l10n-zh_TW/kde4-l10n-zh_TW-4.8.2.py rename to portage/kde/kde4-l10n/kde4-l10n-zh_TW/kde4-l10n-zh_TW-4.9.0.py index a42358504..65347f236 100644 --- a/portage/kde/kde4-l10n/kde4-l10n-zh_TW/kde4-l10n-zh_TW-4.8.2.py +++ b/portage/kde/kde4-l10n/kde4-l10n-zh_TW/kde4-l10n-zh_TW-4.9.0.py @@ -1,28 +1,28 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.1', '4.8.2']: - self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-zh_TW-%s.tar.xz' % (ver , ver ) - self.targetInstSrc[ ver] = 'kde-l10n-zh_TW-%s' % ver - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.buildDependencies['dev-util/cmake'] = 'default' - self.buildDependencies['kde/kdelibs'] = 'default' - self.buildDependencies['dev-util/gettext-tools'] = 'default' - - -from Package.CMakePackageBase import * - -class Package( CMakePackageBase ): - def __init__( self ): - self.subinfo = subinfo() - CMakePackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() +import os +import info + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.0', '4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.targets[ ver] = 'ftp://ftp.kde.org/pub/kde/stable/%s/src/kde-l10n/kde-l10n-zh_TW-%s.tar.xz' % (ver , ver ) + self.targetInstSrc[ ver] = 'kde-l10n-zh_TW-%s' % ver + + self.defaultTarget = '4.9.0' + + + def setDependencies( self ): + self.buildDependencies['dev-util/cmake'] = 'default' + self.buildDependencies['kde/kdelibs'] = 'default' + self.buildDependencies['dev-util/gettext-tools'] = 'default' + + +from Package.CMakePackageBase import * + +class Package( CMakePackageBase ): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdeedu/analitza/analitza-20120113.py similarity index 53% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdeedu/analitza/analitza-20120113.py index bb6c05d00..0e03bc423 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdeedu/analitza/analitza-20120113.py @@ -1,20 +1,23 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:analitza|KDE/4.9|' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.9.' + ver] = "ftp://ftp.kde.org/pub/kde/stable/4.9." + ver + "/src/analitza-4.9." + ver + ".tar.bz2" + self.targetInstSrc['4.9.' + ver] = 'analitza-4.9.' + ver + self.shortDescription = 'a library for mathematical features' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kde-runtime'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdeedu/cantor/cantor-20110621.py index bb6c05d00..496907690 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdeedu/cantor/cantor-20110621.py @@ -1,20 +1,21 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = '[git]kde:cantor' self.shortDescription = 'a KDE frontend for mathematical software' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/analitza'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py index 6b312504a..dff5c4c88 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py @@ -1,20 +1,21 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' self.shortDescription = 'a graph calculator' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/analitza'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kdeedu-20080202.py b/portage/kde/kdeedu/kdeedu-20080202.py index 08abe8f58..946ee8ebb 100644 --- a/portage/kde/kdeedu/kdeedu-20080202.py +++ b/portage/kde/kdeedu/kdeedu-20080202.py @@ -1,39 +1,39 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = '' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/libkdeedu'] = 'default' self.dependencies['kde/blinken'] = 'default' self.dependencies['kde/cantor'] = 'default' self.dependencies['kde/kalgebra'] = 'default' self.dependencies['kde/kalzium'] = 'default' self.dependencies['kde/kanagram'] = 'default' self.dependencies['kde/kbruch'] = 'default' self.dependencies['kde/kgeography'] = 'default' self.dependencies['kde/khangman'] = 'default' self.dependencies['kde/kig'] = 'default' self.dependencies['kde/kiten'] = 'default' self.dependencies['kde/klettres'] = 'default' self.dependencies['kde/kmplot'] = 'default' self.dependencies['kde/kstars'] = 'default' self.dependencies['kde/ktouch'] = 'default' self.dependencies['kde/kturtle'] = 'default' self.dependencies['kde/kwordquiz'] = 'default' self.dependencies['kde/marble'] = 'default' self.dependencies['kde/parley'] = 'default' self.dependencies['kde/rocs'] = 'default' - self.dependencies['kde/step'] = 'default' + # self.dependencies['kde/step'] = 'default' from Package.VirtualPackageBase import * class Package( VirtualPackageBase ): def __init__( self ): self.subinfo = subinfo() VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/bomber/bomber-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/bomber/bomber-20120911.py index 6b312504a..dab6a6c60 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/bomber/bomber-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:bomber' + self.shortDescription = 'arcade bombing game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/bovo/bovo-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/bovo/bovo-20120911.py index 6b312504a..8d5f834c4 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/bovo/bovo-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:bovo' + self.shortDescription = 'a gomoku like game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/granatier/granatier-20120911.py similarity index 66% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/granatier/granatier-20120911.py index 6b312504a..a762b3df8 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/granatier/granatier-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:granatier' + self.shortDescription = 'clone of the classic Bomberman game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kapman/kapman-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kapman/kapman-20120911.py index 6b312504a..2a036fa9a 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kapman/kapman-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kapman' + self.shortDescription = 'a pacman like game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/katomic/katomic-20120911.py similarity index 64% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/katomic/katomic-20120911.py index bb6c05d00..a7b8cf056 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/katomic/katomic-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:katomic' + self.shortDescription = 'fun and educational game built around molecular geometry' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kblackbox/kblackbox-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kblackbox/kblackbox-20120911.py index 6b312504a..42110053e 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kblackbox/kblackbox-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kblackbox' + self.shortDescription = 'a game of hide and seek' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kblocks/kblocks-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kblocks/kblocks-20120911.py index 6b312504a..24ec3bef7 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kblocks/kblocks-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kblocks' + self.shortDescription = 'a tetris like game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kbounce/kbounce-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kbounce/kbounce-20120911.py index 6b312504a..2f16494ca 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kbounce/kbounce-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kbounce' + self.shortDescription = 'kde bounce ball game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kbreakout/kbreakout-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kbreakout/kbreakout-20120911.py index 6b312504a..0f9fee65e 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kbreakout/kbreakout-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kbreakout' + self.shortDescription = 'a breakout like game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdegames/kdegames-20080202.py b/portage/kde/kdegames/kdegames-20080202.py index 9075ffbe8..522232357 100644 --- a/portage/kde/kdegames/kdegames-20080202.py +++ b/portage/kde/kdegames/kdegames-20080202.py @@ -1,21 +1,58 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdegames' - self.defaultTarget = 'svnHEAD' + self.svnTargets['gitHEAD'] = '' + self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' - self.dependencies['kdesupport/qca'] = 'default' - self.shortDescription = "KDE games applications" + self.dependencies['kde/bomber'] = 'default' + self.dependencies['kde/bovo'] = 'default' + self.dependencies['kde/granatier'] = 'default' + self.dependencies['kde/kapman'] = 'default' + self.dependencies['kde/katomic'] = 'default' + self.dependencies['kde/knavalbattle'] = 'default' + self.dependencies['kde/kblackbox'] = 'default' + self.dependencies['kde/kblocks'] = 'default' + self.dependencies['kde/kbounce'] = 'default' + self.dependencies['kde/kbreakout'] = 'default' + self.dependencies['kde/kdiamond'] = 'default' + self.dependencies['kde/kfourinline'] = 'default' + self.dependencies['kde/kgoldrunner'] = 'default' + self.dependencies['kde/kigo'] = 'default' + self.dependencies['kde/killbots'] = 'default' + self.dependencies['kde/kiriki'] = 'default' + self.dependencies['kde/kjumpingcube'] = 'default' + self.dependencies['kde/klickety'] = 'default' + self.dependencies['kde/klines'] = 'default' + self.dependencies['kde/kmahjongg'] = 'default' + self.dependencies['kde/kmines'] = 'default' + self.dependencies['kde/knetwalk'] = 'default' + self.dependencies['kde/kolf'] = 'default' + self.dependencies['kde/kollision'] = 'default' + self.dependencies['kde/konquest'] = 'default' + self.dependencies['kde/kpat'] = 'default' + self.dependencies['kde/kreversi'] = 'default' + self.dependencies['kde/kshisen'] = 'default' + self.dependencies['kde/ksirk'] = 'default' + self.dependencies['kde/kspaceduel'] = 'default' + self.dependencies['kde/ksquares'] = 'default' + self.dependencies['kde/ksudoku'] = 'default' + self.dependencies['kde/ksnakeduel'] = 'default' + self.dependencies['kde/ktuberling'] = 'default' + self.dependencies['kde/kubrick'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' + #self.dependencies['kde/libkmahjongg'] = 'default' + self.dependencies['kde/lskat'] = 'default' + self.dependencies['kde/palapeli'] = 'default' + self.dependencies['kde/picmi'] = 'default' -from Package.CMakePackageBase import * +from Package.VirtualPackageBase import * -class Package(CMakePackageBase): +class Package( VirtualPackageBase ): def __init__( self ): self.subinfo = subinfo() - CMakePackageBase.__init__( self ) + VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdegames/kdegames-package.xml b/portage/kde/kdegames/kdegames-package.xml deleted file mode 100644 index 19c06f826..000000000 --- a/portage/kde/kdegames/kdegames-package.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - the kdegames support libraries - - - - - - - - - kdebase-runtime - kdelibs - - - arcade bombing game - - - - - libkdegames - - - a gomoku like game - - - - - libkdegames - - - a pacman like game - - - - - libkdegames - - - Katomic is both fun and educational game built around molecular geometry - - - - - libkdegames - - - a Battle Ship game for KDE - - - - - libkdegames - - - KBlackbox is a game of hide and seek - - - - - libkdegames - - - a tetris like game - - - - - libkdegames - - - kde bounce ball game - - - - - libkdegames - - - a breakout like game - - - - - libkdegames - - - a bejeweled like game - - - - - libkdegames - - - a Connect-Four like game - - - - - libkdegames - - - KGoldrunner is a maze-threading game with a puzzle flavor - - - - - libkdegames - - - an open-source implementation of the popular Go game - - - - - libkdegames - - - a game of killer robots and teleportation - - - - - libkdegames - - - a Yahtzee dice game - - - - - libkdegames - - - a simple dice driven tactical game - - - - - libkdegames - - - a kind of solitary game that takes place on a Tetris-like board - - - - - libkdegames - - - a little game about balls and how to get rid of them - - - - - libkdegames - - - a Mahjongg game - - - - - libkdegames - - - a minesweeper game - - - - - libkdegames - - - a game for system administrators - - - - - libkdegames - - - a miniature golf game - - - - - - libkdegames - - - a simple ball dodging game - - - - - libkdegames - - - a galactic strategy game - - - - - libkdegames - - - a solitaire game - - - - - - libkdegames - - - a reversi game - - - - - libkdegames - - - a color matching game - - - - - libkdegames - - - a shisen sho game - - - - - libkdegames - - - a Risk strategy game - - - - - - libkdegames - qca - - - SpaceWar! arcade game - - - - - libkdegames - - - dots and boxes game - - - - - libkdegames - - - a sudoku puzzle game - - - - - libkdegames - - - a Tron clone game - - - - - libkdegames - - - a stamp drawing toy - - - - - libkdegames - - - game based on Rubik's Cube - - - - - libkdegames - - - Lieutnant Skat card game - - - - - libkdegames - - - a single-player jigsaw puzzle game - - - - - libkdegames - - - Games applications - - - bomber - bovo - kapman - katomic - kbattleship - kblackbox - kblocks - kbounce - kbreakout - kdiamond - kfourinline - kgoldrunner - kigo - killbots - kiriki - kjumpingcube - klickety - klines - kmahjongg - kmines - knetwalk - kolf - kollision - konquest - kpat - kreversi - ksame - kshisen - ksirk - kspaceduel - ksquares - ksudoku - ktron - ktuberling - kubrick - lskat - - - diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kdiamond/kdiamond-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kdiamond/kdiamond-20120911.py index 6b312504a..262e906d3 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kdiamond/kdiamond-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kdiamond' + self.shortDescription = 'a bejeweled like game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kfourinline/kfourinline-20120911.py similarity index 67% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kfourinline/kfourinline-20120911.py index 6b312504a..c5a93e399 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kfourinline/kfourinline-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kfourinline' + self.shortDescription = 'a Connect-Four like game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py similarity index 65% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py index bb6c05d00..503b4bdc3 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/kgoldrunner/kgoldrunner-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:kgoldrunner' + self.shortDescription = 'a maze-threading game with a puzzle flavor' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/kigo/kigo-20120911.py similarity index 65% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/kigo/kigo-20120911.py index bb6c05d00..bfdf0c1b4 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/kigo/kigo-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:kigo' + self.shortDescription = 'an open-source implementation of the popular Go game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/killbots/killbots-20120911.py similarity index 66% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/killbots/killbots-20120911.py index bb6c05d00..0d53b38a3 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/killbots/killbots-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:killbots' + self.shortDescription = 'a game of killer robots and teleportation' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kiriki/kiriki-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kiriki/kiriki-20120911.py index 6b312504a..f22478dfb 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kiriki/kiriki-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kiriki' + self.shortDescription = 'a Yahtzee dice game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py similarity index 66% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py index bb6c05d00..6afeeb901 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/kjumpingcube/kjumpingcube-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:kjumpingcube' + self.shortDescription = 'a simple dice driven tactical game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/klickety/klickety-20120911.py similarity index 63% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/klickety/klickety-20120911.py index bb6c05d00..d0e35fe59 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/klickety/klickety-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:klickety' + self.shortDescription = 'a kind of solitary game that takes place on a Tetris-like board' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/klines/klines-20120911.py similarity index 65% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/klines/klines-20120911.py index bb6c05d00..678fab787 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/klines/klines-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:klines' + self.shortDescription = 'a little game about balls and how to get rid of them' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py index 6b312504a..b089b668a 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kmahjongg/kmahjongg-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kmahjongg' + self.shortDescription = 'a Mahjongg game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kmines/kmines-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kmines/kmines-20120911.py index 6b312504a..186b71fd7 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kmines/kmines-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kmines' + self.shortDescription = 'a minesweeper game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py index 6b312504a..cd897b5ac 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/knavalbattle/knavalbattle-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:knavalbattle' + self.shortDescription = 'a ship sinking game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/knetwalk/knetwalk-20120911.py similarity index 67% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/knetwalk/knetwalk-20120911.py index 6b312504a..a5d96bcae 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/knetwalk/knetwalk-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:knetwalk' + self.shortDescription = 'a game for system administrators' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kolf/kolf-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kolf/kolf-20120911.py index 6b312504a..99c5e4257 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kolf/kolf-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kolf' + self.shortDescription = 'a miniature golf game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kollision/kollision-20120911.py similarity index 67% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kollision/kollision-20120911.py index 6b312504a..58dd6ddc6 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kollision/kollision-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kollision' + self.shortDescription = 'a simple ball dodging game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/konquest/konquest-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/konquest/konquest-20120911.py index 6b312504a..6d20827be 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/konquest/konquest-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:konquest' + self.shortDescription = 'a galactic strategy game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kpat/kpat-20120911.py similarity index 67% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kpat/kpat-20120911.py index 6b312504a..8b4e567ee 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kpat/kpat-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kpat' + self.shortDescription = 'a selection of solitaire card games' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kreversi/kreversi-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kreversi/kreversi-20120911.py index 6b312504a..99daa8c60 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kreversi/kreversi-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kreversi' + self.shortDescription = 'a reversi game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kshisen/kshisen-20120911.py similarity index 69% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kshisen/kshisen-20120911.py index 6b312504a..2e50f61ab 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kshisen/kshisen-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kshisen' + self.shortDescription = 'a shisen sho game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdegames/kdegames-20080202.py b/portage/kde/kdegames/ksirk/ksirk-20120911.py similarity index 64% copy from portage/kde/kdegames/kdegames-20080202.py copy to portage/kde/kdegames/ksirk/ksirk-20120911.py index 9075ffbe8..8f4e8818a 100644 --- a/portage/kde/kdegames/kdegames-20080202.py +++ b/portage/kde/kdegames/ksirk/ksirk-20120911.py @@ -1,21 +1,21 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdegames' - self.defaultTarget = 'svnHEAD' + self.svnTargets['gitHEAD'] = '[git]kde:ksirk' + self.shortDescription = 'a Risk strategy game' + self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' self.dependencies['kdesupport/qca'] = 'default' - self.shortDescription = "KDE games applications" from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py index 6b312504a..af13e2a2f 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/ksnakeduel/ksnakeduel-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:ksnakeduel' + self.shortDescription = 'a simple snake duel game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py index 6b312504a..8ee3c64ca 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kspaceduel/kspaceduel-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kspaceduel' + self.shortDescription = 'SpaceWar! arcade game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/ksquares/ksquares-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/ksquares/ksquares-20120911.py index 6b312504a..f738940cb 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/ksquares/ksquares-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:ksquares' + self.shortDescription = 'dots and boxes game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/ksudoku/ksudoku-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/ksudoku/ksudoku-20120911.py index 6b312504a..72cc6e56b 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/ksudoku/ksudoku-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:ksudoku' + self.shortDescription = 'a sudoku puzzle game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/ktuberling/ktuberling-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/ktuberling/ktuberling-20120911.py index 6b312504a..13f12bc8c 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/ktuberling/ktuberling-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:ktuberling' + self.shortDescription = 'a stamp drawing toy' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/kubrick/kubrick-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/kubrick/kubrick-20120911.py index 6b312504a..5ae54d1de 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/kubrick/kubrick-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:kubrick' + self.shortDescription = 'a game based on Rubik Cube' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/libkdegames/libkdegames-20120911.py similarity index 77% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/libkdegames/libkdegames-20120911.py index 6b312504a..0121c1266 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/libkdegames/libkdegames-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:libkdegames' + self.shortDescription = 'the kdegames support libraries' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kde-runtime'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/cantor/cantor-20110621.py b/portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py similarity index 62% copy from portage/kde/kdeedu/cantor/cantor-20110621.py copy to portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py index bb6c05d00..4c8c39107 100644 --- a/portage/kde/kdeedu/cantor/cantor-20110621.py +++ b/portage/kde/kdegames/libmahjongg/libmahjongg-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:cantor' - self.shortDescription = 'a KDE frontend for mathematical software' + self.svnTargets['gitHEAD'] = '[git]kde:libmahjong' + self.shortDescription = 'Common code, backgrounds and tile sets for games using Mahjongg tiles' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/lskat/lskat-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/lskat/lskat-20120911.py index 6b312504a..ae18b9d40 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/lskat/lskat-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:lskat' + self.shortDescription = 'Lieutnant Skat card game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/palapeli/palapeli-20120911.py similarity index 67% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/palapeli/palapeli-20120911.py index 6b312504a..c1e0f7072 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/palapeli/palapeli-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:palapeli' + self.shortDescription = 'a single-player jigsaw puzzle game' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py b/portage/kde/kdegames/picmi/picmi-20120911.py similarity index 68% copy from portage/kde/kdeedu/kalgebra/kalgebra-20110621.py copy to portage/kde/kdegames/picmi/picmi-20120911.py index 6b312504a..09f2132fe 100644 --- a/portage/kde/kdeedu/kalgebra/kalgebra-20110621.py +++ b/portage/kde/kdegames/picmi/picmi-20120911.py @@ -1,20 +1,20 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kalgebra' - self.shortDescription = 'a graph calculator' + self.svnTargets['gitHEAD'] = '[git]kde:picmi' + self.shortDescription = 'A nonogram logic game for KDE' self.defaultTarget = 'gitHEAD' def setDependencies( self ): - self.dependencies['kde/kde-runtime'] = 'default' + self.dependencies['kde/libkdegames'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdelibs/kdelibs-20110130.py b/portage/kde/kdelibs/kdelibs-20110130.py index 25ae1f26c..40790089e 100644 --- a/portage/kde/kdelibs/kdelibs-20110130.py +++ b/portage/kde/kdelibs/kdelibs-20110130.py @@ -1,52 +1,54 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = '[git]kde:kdelibs' self.svnTargets['frameworks'] = '[git]kde:kdelibs|frameworks|' + for version in ['4.4', '4.5', '4.6', '4.7', '4.8', '4.9']: + self.svnTargets[version] = '[git]kde:kdelibs|KDE/%s|' % version self.shortDescription = "The KDE Library" self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' self.buildDependencies['dev-util/perl'] = 'default' self.buildDependencies['win32libs-bin/automoc'] = 'default' self.dependencies['kdesupport/hupnp'] = 'default' self.dependencies['kdesupport/kdewin'] = 'default' self.dependencies['kdesupport/phonon'] = 'default' self.dependencies['kdesupport/attica'] = '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' self.dependencies['data/docbook-dtd'] = 'default' self.dependencies['data/docbook-xsl'] = 'default' self.dependencies['data/shared-desktop-ontologies'] = 'default' self.runtimeDependencies['kdesupport/phonon-vlc'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "" if compiler.isMinGW(): self.subinfo.options.configure.defines += " -DKDE_DISTRIBUTION_TEXT=\"MinGW %s\" " % compiler.getMinGWVersion() elif compiler.isMSVC(): self.subinfo.options.configure.defines = " -DKDE_DISTRIBUTION_TEXT=\"%s\" " % compiler.getVersion() def install( self ): if not CMakePackageBase.install( self ): return False if compiler.isMinGW(): manifest = os.path.join( self.packageDir(), "kconf_update.exe.manifest" ) executable = os.path.join( self.installDir(), "bin", "kconf_update.exe" ) utils.embedManifest( executable, manifest ) return True if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdepim/kdepim-20080202.py b/portage/kde/kdepim/kdepim-20080202.py index 7a66f33ec..7d901d158 100644 --- a/portage/kde/kdepim/kdepim-20080202.py +++ b/portage/kde/kdepim/kdepim-20080202.py @@ -1,27 +1,27 @@ import info class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets['gitHEAD'] = '[git]kde:kdepim' self.defaultTarget = 'gitHEAD' # Workaround BUG 302342 self.patchToApply['gitHEAD'] = ('fix_introduction_screen.diff', 1) def setDependencies( self ): self.runtimeDependencies['kde/kde-runtime'] = 'default' self.runtimeDependencies['kde/kdepim-runtime'] = 'default' self.dependencies['kde/kdepimlibs'] = 'default' self.dependencies['kdesupport/grantlee'] = 'default' - self.dependencies['win32libs-bin/sqlite'] = 'default' + self.dependencies['kde/nepomuk-widgets'] = 'default' self.shortDescription = "KDE's Personal Information Management suite" from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/kdepimlibs/kdepimlibs-20110129.py b/portage/kde/kdepimlibs/kdepimlibs-20110129.py index 715c28be5..d61a479b2 100644 --- a/portage/kde/kdepimlibs/kdepimlibs-20110129.py +++ b/portage/kde/kdepimlibs/kdepimlibs-20110129.py @@ -1,28 +1,29 @@ import info class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = '[git]kde:kdepimlibs' self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies['kde/kdelibs'] = 'default' + self.dependencies['kde/nepomuk-core'] = 'default' self.dependencies['kdesupport/akonadi'] = 'default' self.dependencies['win32libs-bin/cyrus-sasl'] = 'default' self.dependencies['win32libs-bin/libical'] = 'default' self.dependencies['win32libs-bin/gpgme'] = 'default' self.dependencies['win32libs-bin/openldap'] = 'default' self.shortDescription = "the base libraries for PIM related services" 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 ) if __name__ == '__main__': Package().execute() diff --git a/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py b/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py new file mode 100644 index 000000000..de9e7fcba --- /dev/null +++ b/portage/kde/nepomuk-widgets/nepomuk-widgets-20120903.py @@ -0,0 +1,23 @@ +import info + +class subinfo(info.infoclass): + def setTargets( self ): + self.svnTargets['gitHEAD'] = '[git]kde:nepomuk-widgets' + for ver in ['0', '1', '2', '3', '4']: + self.targets['4.9.' + ver] = 'ftp://ftp.kde.org/pub/kde/stable/4.9.' + ver + '/src/nepomuk-widgets-4.9.' + ver + '.tar.xz' + self.targetInstSrc['4.9.' + ver] = 'nepomuk-widgets-4.9.' + ver + self.defaultTarget = 'gitHEAD' + + def setDependencies( self ): + self.dependencies['kde/nepomuk-core'] = 'default' + self.shortDescription = "Nepomuk GUI components" + +from Package.CMakePackageBase import * + +class Package(CMakePackageBase): + def __init__( self ): + self.subinfo = subinfo() + CMakePackageBase.__init__(self) + +if __name__ == '__main__': + Package().execute() diff --git a/portage/kdeapps/calligra/calligra-20120805.py b/portage/kdeapps/calligra/calligra-20120805.py index 969d9f564..e29d2275e 100644 --- a/portage/kdeapps/calligra/calligra-20120805.py +++ b/portage/kdeapps/calligra/calligra-20120805.py @@ -1,37 +1,38 @@ import info class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets['gitHEAD'] = "[git]kde:calligra" self.defaultTarget = 'gitHEAD' self.shortDescription = "The Calligra Suite of Applications" def setDependencies( self ): self.buildDependencies['kdesupport/eigen2'] = 'default' self.buildDependencies['win32libs-sources/glew-src'] = 'default' + self.buildDependencies['win32libs-bin/boost-headers'] = 'default' self.dependencies['win32libs-bin/lcms2'] = 'default' self.dependencies['virtual/kde-runtime'] = 'default' self.dependencies['virtual/kdepimlibs'] = 'default' self.dependencies['kdesupport/poppler'] = 'default' self.dependencies['kdesupport/qca'] = 'default' self.dependencies['testing/gsl'] = 'default' self.dependencies['win32libs-bin/exiv2'] = 'default' self.dependencies['win32libs-bin/openjpeg'] = 'default' # self.dependencies['win32libs-bin/libfftw'] = 'default' from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) defines = "" defines += "-DBUILD_kexi=OFF " defines += "-DBUILD_plan=OFF " defines += "-DBUILD_doc=OFF " defines += "-DMEMORY_LEAK_TRACKER=OFF" self.subinfo.options.configure.defines = defines if __name__ == '__main__': Package().execute() diff --git a/portage/kdeapps/rkward/rkward-0.5.2.py b/portage/kdeapps/rkward/rkward-20121211.py similarity index 73% rename from portage/kdeapps/rkward/rkward-0.5.2.py rename to portage/kdeapps/rkward/rkward-20121211.py index 83985541a..79b7b2196 100644 --- a/portage/kdeapps/rkward/rkward-0.5.2.py +++ b/portage/kdeapps/rkward/rkward-20121211.py @@ -1,25 +1,27 @@ import info import os class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets[ 'svnHEAD' ] = 'http://rkward.svn.sourceforge.net/svnroot/rkward/trunk/rkward' - # no "release" targets defined, yet. Releases up to RKWard 0.5.2 (current) had an additional dependency on PHP, which we do not provide + for ver in ['0.5.7', '0.6.0']: + self.targets[ver] = 'http://downloads.sourceforge.net/rkward/rkward-' + ver + '.tar.gz' + self.targetInstSrc[ ver] = 'rkward-' + ver self.defaultTarget = 'svnHEAD' def setDependencies( self ): self.dependencies[ 'testing/r-base' ] = 'default' - self.dependencies[ 'virtual/kde-runtime' ] = 'default' + self.dependencies[ 'extragear/kate' ] = 'default' # provides katepart from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) r_executable = os.path.join( self.mergeDestinationDir(), "lib", "R", "bin", "R.exe" ) self.subinfo.options.configure.defines = " -DR_EXECUTABLE=" + r_executable.replace( "\\\\", "/" ) if __name__ == '__main__': Package().execute() diff --git a/portage/kdesupport/hupnp/hupnp-1.0.0-20111102.py b/portage/kdesupport/hupnp/hupnp-1.0.0-20111102.py index 959b85b20..d50b5bb6b 100644 --- a/portage/kdesupport/hupnp/hupnp-1.0.0-20111102.py +++ b/portage/kdesupport/hupnp/hupnp-1.0.0-20111102.py @@ -1,47 +1,48 @@ # -*- coding: utf-8 -*- import compiler import info class subinfo(info.infoclass): def setTargets( self ): self.shortDescription = "Herqq UPnP (HUPnP) is a software library for building UPnP devices and control points conforming to the UPnP Device Architecture version 1.1" self.svnTargets['svnHEAD'] = "https://hupnp.svn.sourceforge.net/svnroot/hupnp/trunk/herqq" self.patchToApply['svnHEAD'] = ("HUpnp1.diff", 0) for ver in ["1.0.0"]: self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/hupnp/herqq-%s.zip" % ver self.targetInstSrc[ver] = "herqq-%s" % ver self.targetDigests['1.0.0'] = '543a67802c37c66c29c8527522b1630c42756545' self.defaultTarget = "1.0.0" def setDependencies( self ): self.dependencies['libs/qt'] = 'default' self.dependencies['kdesupport/libqtsoap'] = 'default' from Package.QMakePackageBase import * class Package( QMakePackageBase ): def __init__( self, **args ): self.subinfo = subinfo() QMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = ' "PREFIX = %s" ' % self.imageDir().replace("\\","/") self.subinfo.options.configure.defines += ' "CONFIG += DISABLE_TESTAPP"' self.subinfo.options.configure.defines += ' "CONFIG += DISABLE_AVTESTAPP"' self.subinfo.options.configure.defines += ' "CONFIG += DISABLE_QTSOAP"' + self.subinfo.options.configure.defines += ' "CONFIG += rtti"' def install( self ): if not QMakePackageBase.install( self ): return False #sic.: the .lib file is placed under bin dir in hupnp) os.mkdir( os.path.join( self.installDir(), "bin" ) ) # copy over dlls as required by KDE convention for file in os.listdir( os.path.join( self.installDir(), "lib" ) ): if file.endswith( ".dll" ): utils.copyFile( os.path.join( self.installDir(), "lib" , file ), os.path.join( self.installDir(), "bin" , file ) ) return True if __name__ == '__main__': Package().execute() diff --git a/portage/kdesupport/liblastfm/liblastfm-20111012.py b/portage/kdesupport/liblastfm/liblastfm-20111012.py index d13ce26cf..27fce33b1 100644 --- a/portage/kdesupport/liblastfm/liblastfm-20111012.py +++ b/portage/kdesupport/liblastfm/liblastfm-20111012.py @@ -1,35 +1,36 @@ import os import info import shutil class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets[ 'gitHEAD' ] = "git://github.com/TheOneRing/liblastfm.git" self.targetSrcSuffix['gitHEAD'] = "theo" - for ver in ['1.0.0','1.0.1']: + for ver in ['1.0.0','1.0.1','1.0.2','1.0.3']: self.targets[ver] = 'http://cdn.last.fm/client/liblastfm-%s.tar.gz' % ver self.targetInstSrc[ver] = 'liblastfm-%s' % ver self.targetDigests['1.0.0'] = '1947b1a6397ea188151572da33edc7699bf10164' self.targetDigests['1.0.1'] = '2d6adb2c265daa4b62bd9bf7fa8e45d2e29b9c37' + self.targetDigests['1.0.3'] = '4c6dc0eb2a32049fed72f8d713489edfad7b4eff' self.shortDescription = "a C++/Qt4 library provided by Last.fm for use with their web services" self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.dependencies[ 'libs/qt' ] = 'default' self.dependencies[ 'win32libs-bin/libfftw' ] = 'default' self.dependencies[ 'win32libs-bin/libsamplerate' ] = 'default' from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "-DBUILD_FINGERPRINT=ON" if __name__ == '__main__': Package().execute() diff --git a/portage/kdesupport/phonon-vlc/fix windows aout selection.diff b/portage/kdesupport/phonon-vlc/fix windows aout selection.diff new file mode 100644 index 000000000..b5d9f51d5 --- /dev/null +++ b/portage/kdesupport/phonon-vlc/fix windows aout selection.diff @@ -0,0 +1,22 @@ +commit 4c9e2ce10dc47e93370a3eab1113eafcc1690b64 +Author: Harald Sitter +Date: Fri Sep 14 20:48:15 2012 +0200 + + fix windows aout selection + + the directx aout is in fact called aout_directx, so make the devicemanager + look for that rather than directx to fix audio on windows + +diff --git a/src/devicemanager.cpp b/src/devicemanager.cpp +index c9bed25..2f5d720 100644 +--- a/src/devicemanager.cpp ++++ b/src/devicemanager.cpp +@@ -232,7 +232,7 @@ void DeviceManager::updateDeviceList() + knownSoundSystems << QByteArray("alsa") + << QByteArray("oss") + << QByteArray("jack") +- << QByteArray("directx") // Windows ++ << QByteArray("aout_directx") // Windows + << QByteArray("auhal"); // Mac + foreach (const QByteArray &soundSystem, knownSoundSystems) { + if (!audioOutBackends.contains(soundSystem)) { diff --git a/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py b/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py index c1fa2ebc2..f8983d82e 100644 --- a/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py +++ b/portage/kdesupport/phonon-vlc/phonon-vlc-0.5.0-1.py @@ -1,40 +1,48 @@ # -*- coding: utf-8 -*- import info import os import compiler from Package.CMakePackageBase import * class subinfo(info.infoclass): def setDependencies( self ): self.dependencies['kdesupport/phonon'] = 'default' self.dependencies['binary/vlc'] = 'default' if compiler.isMSVC(): self.dependencies['kdesupport/kdewin'] = 'default' def setTargets( self ): self.targets['0.3.1'] = "http://download.kde.org/download.php?url=stable/phonon-backend-vlc/0.3.1/src/phonon-backend-vlc-0.3.1.tar.bz2" self.targetInstSrc['0.3.1'] = "phonon-backend-vlc-0.3.1" self.targetDigests['0.3.1'] = 'b94dddc6f37924c101a8bab7b7a184b7d6b42d96' self.patchToApply['0.3.1'] = ("phonon-backend-vlc-0.3.1-20101223.diff", 1) self.targets['0.4.1'] = "http://download.kde.org/download.php?url=stable/phonon/phonon-backend-vlc/0.4.1/phonon-backend-vlc-0.4.1.tar.xz" self.targetInstSrc['0.4.1'] = "phonon-backend-vlc-0.4.1" self.targetDigests['0.4.1'] = 'b2957b70e1722f08a231b9e64acfafb799b52d11' + self.patchToApply['0.4.1'] = [("phonon-backend-vlc-0.4.1-20111213.diff", 1),("phonon-backend-vlc-0.4.1-20111223.diff",1)] - self.targets['0.5.0'] = "http://download.kde.org/download.php?url=stable/phonon/phonon-backend-vlc/0.5.0/src/phonon-backend-vlc-0.5.0.tar.xz" - self.targetInstSrc['0.5.0'] = "phonon-backend-vlc-0.5.0" + for ver in ['0.5.0', '0.6.0', '0.6.1']: + self.targets[ ver ] = "http://download.kde.org/download.php?url=stable/phonon/phonon-backend-vlc/%s/src/phonon-backend-vlc-%s.tar.xz" % ( ver ,ver ) + self.targetInstSrc[ ver ] = "phonon-backend-vlc-%s" % ver + + self.targetDigests['0.6.0'] = 'f66a70cd27ad49dc98eb6526d0566cfe0802774b' + self.targetDigests['0.6.1'] = '2c17bd124a2f6543efc6af0e6a79bf37f8f5cd37' + self.patchToApply['0.5.0'] = [("0001-Revert-stop-leaking-video-audio-abstraction.patch",1)] + self.patchToApply['0.6.0'] = [("fix windows aout selection.diff",1)] + self.svnTargets['gitHEAD'] = '[git]kde:phonon-vlc' self.shortDescription = "the vlc based phonon multimedia backend" - self.defaultTarget = '0.5.0' + self.defaultTarget = '0.6.1' class Package( CMakePackageBase ): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__(self) - self.subinfo.options.configure.defines = '-DPHONON_BUILDSYSTEM_DIR=\"%s;%s\" ' % (os.path.join(os.getenv('KDEROOT'),'share','phonon','buildsystem').replace('\\','/'),os.path.join(os.getenv('KDEROOT'),'share','phonon-buildsystem').replace('\\','/')) + self.subinfo.options.configure.defines = '-DCMAKE_CXX_FLAGS=-DWIN32 -DPHONON_BUILDSYSTEM_DIR=\"%s;%s\" ' % (os.path.join(os.getenv('KDEROOT'),'share','phonon','buildsystem').replace('\\','/'),os.path.join(os.getenv('KDEROOT'),'share','phonon-buildsystem').replace('\\','/')) if __name__ == '__main__': Package().execute() diff --git a/portage/kdesupport/poppler/poppler-0.18.2.20120112.py b/portage/kdesupport/poppler/poppler-0.18.2.20120112.py index 9ac5c59c3..9b5c199f3 100644 --- a/portage/kdesupport/poppler/poppler-0.18.2.20120112.py +++ b/portage/kdesupport/poppler/poppler-0.18.2.20120112.py @@ -1,45 +1,37 @@ # -*- coding: utf-8 -*- import info from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - for i in ( '0.12.1', '0.12.2', '0.12.3', '0.12.4', '0.14.0', '0.14.1', '0.14.3', '0.14.4', '0.14.5', '0.15.1', - '0.16.0', '0.16.5', '0.18.0', '0.18.1', '0.18.2' ): + for i in ( '0.18.0', '0.18.1', '0.18.2', '0.20.3' ): self.targets[ i ] = 'http://poppler.freedesktop.org/poppler-%s.tar.gz' % i self.targetInstSrc[ i ] = 'poppler-%s' % i - self.patchToApply['0.14.3'] = ( 'poppler-src-0.14.3.patch', 1 ) - self.patchToApply['0.14.4'] = ( 'poppler-src-0.14.3.patch', 1 ) - self.patchToApply['0.14.5'] = ( 'poppler-0.14.5-20101118.diff', 1 ) - self.patchToApply['0.15.1'] = ( 'poppler-0.14.5-20101118.diff', 1 ) - self.targetDigests['0.14.3'] = 'b5e0db722625d92a025e62c3e2fe7a4fc6318b32' - self.targetDigests['0.14.5'] = 'e23b115e4ebc06c937318688b06a7c6b3319a00a' self.svnTargets['gitHEAD'] = "git://git.freedesktop.org/git/poppler/poppler|master" - self.svnTargets['0.12-branch'] = "git://git.freedesktop.org/git/poppler/poppler|poppler-0.12" - self.svnTargets['0.14-branch'] = "git://git.freedesktop.org/git/poppler/poppler|poppler-0.14" - self.svnTargets['0.16-branch'] = "git://git.freedesktop.org/git/poppler/poppler|poppler-0.16" + self.svnTargets['0.18-branch'] = "git://git.freedesktop.org/git/poppler/poppler|poppler-0.18" + self.svnTargets['0.20-branch'] = "git://git.freedesktop.org/git/poppler/poppler|poppler-0.20" self.shortDescription = "PDF rendering library based on xpdf-3.0" self.defaultTarget = "0.18.2" def setDependencies( self ): self.dependencies['win32libs-bin/freetype'] = 'default' self.dependencies['win32libs-bin/openjpeg'] = 'default' self.dependencies['win32libs-bin/lcms'] = 'default' self.dependencies['win32libs-bin/zlib'] = 'default' self.dependencies['win32libs-bin/jpeg'] = 'default' self.dependencies['win32libs-bin/libpng'] = 'default' self.dependencies['win32libs-bin/libxml2'] = 'default' self.runtimeDependencies['data/poppler-data'] = 'default' self.dependencies['libs/qt'] = 'default' class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.package.packageName = 'poppler' self.subinfo.options.configure.defines = "-DBUILD_QT4_TESTS=ON -DENABLE_XPDF_HEADERS=ON" if __name__ == '__main__': Package().execute() diff --git a/portage/kdesupport/qjson/qjson-20100331.py b/portage/kdesupport/qjson/qjson-20100331.py index 076516cd4..7ca0a83eb 100644 --- a/portage/kdesupport/qjson/qjson-20100331.py +++ b/portage/kdesupport/qjson/qjson-20100331.py @@ -1,36 +1,38 @@ import info class subinfo(info.infoclass): def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' self.dependencies['libs/qt'] = 'default' def setTargets( self ): self.svnTargets['gitHEAD'] = 'git://gitorious.org/qjson/qjson.git' - for ver in ['0.7.1']: + for ver in ['0.7.1','0.8.0','0.8.1']: self.targets[ ver ] = "http://downloads.sourceforge.net/qjson/qjson-" + ver + ".tar.bz2" - self.targetInstSrc[ ver ] = "qjson" + self.targetInstSrc[ ver ] = "qjson-%s" % ver + self.targetInstSrc[ '0.7.1' ] = "qjson" self.targetDigests['0.7.1'] = '19bbef24132b238e99744bb35194c6dadece98f9' self.patchToApply['0.7.1'] = ("qjson-20100517.diff", 1) + self.targetDigests['0.8.1'] = '197ccfd533f17bcf40428e68a82e6622047ed4ab' self.shortDescription = "a qt-based library that maps JSON data to Qt objects" - self.defaultTarget = '0.7.1' + self.defaultTarget = '0.8.1' self.options.configure.defines = "" from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "" 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('\\', '/') if __name__ == '__main__': Package().execute() diff --git a/portage/kdesupport/qwt6/qwt6-20110806.py b/portage/kdesupport/qwt6/qwt6-20110806.py index ff44182e9..2936b0305 100644 --- a/portage/kdesupport/qwt6/qwt6-20110806.py +++ b/portage/kdesupport/qwt6/qwt6-20110806.py @@ -1,43 +1,45 @@ # -*- coding: utf-8 -*- import compiler import info class subinfo(info.infoclass): def setTargets( self ): self.shortDescription = "The Qwt library contains GUI Components and utility classes which are primarily useful for programs with a technical background" - for ver in ["6.0.1"]: + for ver in ["6.0.1","6.0.2"]: self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/qwt/qwt-%s.tar.bz2" % ver self.targetInstSrc[ver] = "qwt-%s" % ver + self.patchToApply[ver] = [('qwt-6.0.1-20110807.diff',1)] + self.patchToApply["6.0.1"] = [('qwt-6.0.1-x64-fix.diff', 1)] self.targetDigests['6.0.1'] = '301cca0c49c7efc14363b42e082b09056178973e' - self.patchToApply['6.0.1'] = [('qwt-6.0.1-20110807.diff',1), ('qwt-6.0.1-x64-fix.diff', 1)] - self.defaultTarget = "6.0.1" + self.targetDigests['6.0.2'] = 'cbdd00b29521987c9e7bc6aa51092f0474b9428d' + self.defaultTarget = "6.0.2" def setDependencies( self ): self.dependencies['libs/qt'] = 'default' from Package.QMakePackageBase import * class Package( QMakePackageBase ): def __init__( self, **args ): self.subinfo = subinfo() QMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = ' "QWT_INSTALL_PREFIX = %s" ' % self.imageDir().replace("\\","/") if compiler.isMinGW(): self.subinfo.options.make.supportsMultijob = False def install( self ): if not QMakePackageBase.install( self ): return False #sic.: the .lib file is placed under bin dir in hupnp) os.mkdir( os.path.join( self.installDir(), "bin" ) ) # copy over dlls as required by KDE convention for file in os.listdir( os.path.join( self.installDir(), "lib" ) ): if file.endswith( ".dll" ): utils.copyFile( os.path.join( self.installDir(), "lib" , file ), os.path.join( self.installDir(), "bin" , file ) ) return True if __name__ == '__main__': Package().execute() diff --git a/portage/libs/qt/patches/4.8.3/don't set QT_BUILD_DIR as a side effect.patch b/portage/libs/qt/patches/4.8.3/don't set QT_BUILD_DIR as a side effect.patch new file mode 100644 index 000000000..32f49a2af --- /dev/null +++ b/portage/libs/qt/patches/4.8.3/don't set QT_BUILD_DIR as a side effect.patch @@ -0,0 +1,59 @@ +From b997b885f468bb2ef20a70133bc194a27fa27a8e Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen +Date: Mon, 29 Oct 2012 10:30:33 +0100 +Subject: [PATCH] don't set QT_BUILD_DIR as a side effect + +we would be setting QT_BUILD_DIR to $$[QT_INSTALL_DATA] as a fallback, +which would make qtPrepareTool() believe we were doing a qt build +despite actually trying to build something against an installed qt. this +would become apparent only when using a non-default directory layout, as +is the case in our mac packages. + +Change-Id: I4f27e9427222ad3b9bb83fcc625bab19e00db9be +Reviewed-by: Miikka Heikkinen +Reviewed-by: Teemu Katajisto +Reviewed-by: Joerg Bornemann +--- + mkspecs/features/device_config.prf | 9 +++++---- + mkspecs/features/qt_config.prf | 8 +++++--- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf +index aa0aa50..31a9580 100644 +--- a/mkspecs/features/device_config.prf ++++ b/mkspecs/features/device_config.prf +@@ -1,8 +1,9 @@ + # Load generated qdevice.pri +-isEmpty(QT_BUILD_TREE):exists($$_QMAKE_CACHE_): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) +-isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA] +- +-DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri ++qdd = $$QT_BUILD_TREE ++isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) ++isEmpty(qdd): qdd = $$[QT_INSTALL_DATA] ++DEVICE_PRI = $$qdd/mkspecs/qdevice.pri ++unset(qdd) + + exists($$DEVICE_PRI):include($$DEVICE_PRI) + unset(DEVICE_PRI) +diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf +index 4575f4a..fc14cdd 100644 +--- a/mkspecs/features/qt_config.prf ++++ b/mkspecs/features/qt_config.prf +@@ -3,9 +3,11 @@ + + exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) + isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { +- isEmpty(QT_BUILD_TREE):exists($$_QMAKE_CACHE_): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) +- isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA] +- QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri ++ qdd = $$QT_BUILD_TREE ++ isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) ++ isEmpty(qdd): qdd = $$[QT_INSTALL_DATA] ++ QMAKE_QT_CONFIG = $$qdd/mkspecs/qconfig.pri ++ unset(qdd) + } + !include($$QMAKE_QT_CONFIG, "", true) { + debug(1, "Cannot load qconfig.pri!") +-- +1.7.1 diff --git a/portage/libs/qt/patches/4.8.3/fix-MinGW-w64-compilation.patch b/portage/libs/qt/patches/4.8.3/fix-MinGW-w64-compilation.patch new file mode 100644 index 000000000..26ff8c870 --- /dev/null +++ b/portage/libs/qt/patches/4.8.3/fix-MinGW-w64-compilation.patch @@ -0,0 +1,30 @@ +From 0f5f7c22677e8681ff2af393d01cadd590fe250f Mon Sep 17 00:00:00 2001 +From: Jonathan Liu +Date: Fri, 14 Sep 2012 08:54:25 +1000 +Subject: [PATCH] Fix MinGW-w64 compilation + +ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not +available with MinGW-w64. + +Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4 +(cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065) +Reviewed-by: Simon Hausmann +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index d930ed7..e95ac7f 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -1019,7 +1019,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ + /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. + On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ + #if ENABLE(ASSEMBLER) +-#if CPU(X86_64) ++#if CPU(X86_64) && !COMPILER(MINGW64) + #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 + #else + #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 +-- +1.8.0 diff --git a/portage/libs/qt/qt-4.8.2.20120321.py b/portage/libs/qt/qt-4.8.2.20120321.py index 1bd274373..ceddcbc89 100644 --- a/portage/libs/qt/qt-4.8.2.20120321.py +++ b/portage/libs/qt/qt-4.8.2.20120321.py @@ -1,311 +1,322 @@ # -*- coding: utf-8 -*- import utils from utils import die import os import info import portage import emergePlatform import compiler from Package.QMakePackageBase import * # ok we need something more here # dbus-lib # openssl-lib # we can't use kde-root/include because we get conflicting includes then # we have to make sure that the compiler picks up the correct ones! # --> fetch the two libs above, unpack them into a separate folder class subinfo(info.infoclass): def setTargets( self ): # the static version uses one of the stable versions self.svnTargets['static'] = "[git]kde:qt-kde|4.5.2-patched|" # this is the upcoming 4.7 version with the KDE patches. self.svnTargets['master'] = "[git]kde:qt-kde" # this version contains the patches against the 4.5.3 release and is recommended for KDE 4.3.X self.svnTargets['4.5.3'] = "[git]kde:qt-kde|4.5.3-patched|" # this branch contains all the patches and follows the 4.6-stable branch on qt.git - it updates daily self.svnTargets['4.6'] = "[git]kde:qt-kde|4.6-stable-patched|" # those are the stable releases with the KDE patches applied on top self.svnTargets['4.6.0'] = "[git]kde:qt-kde|4.6.0-patched|" self.svnTargets['4.6.1'] = "[git]kde:qt-kde|4.6.1-patched|" self.svnTargets['4.6.2'] = "[git]kde:qt-kde|4.6.2-patched|" self.svnTargets['4.6.3'] = "[git]kde:qt-kde|4.6.3-patched|" self.svnTargets['4.7.0'] = "[git]kde:qt-kde|4.7.0-patched|" self.svnTargets['4.7.1'] = "[git]kde:qt-kde|4.7.1-patched|" self.svnTargets['4.7.4'] = "[git]kde:qt|4.7-stable|v4.7.4" self.svnTargets['4.8.0'] = "[git]kde:qt|4.7-stable|v4.8.0" self.svnTargets['4.8.1'] = "[git]kde:qt|4.7-stable|v4.8.1" self.svnTargets['4.8.2'] = "[git]kde:qt|4.7-stable|v4.8.2" + self.svnTargets['4.8.3'] = "[git]kde:qt|4.7-stable|v4.8.3" self.svnTargets['4.7'] = "git://gitorious.org/qt/qt.git|4.7|" self.svnTargets['wince'] = "git://gitorious.org/qt/qt.git|4.7|235d1d687dcc2d21860cd753c9d67964c5270be2" self.svnTargets['wince-4.7'] = self.svnTargets["4.7"] self.targetSrcSuffix['wince'] = "4.7" self.targetSrcSuffix['wince-4.7'] = "4.7" self.targetSrcSuffix['4.7'] = "4.7" self.targetSrcSuffix['4.7.4'] = "4.7.4" self.targetSrcSuffix['4.8.0'] = "4.8.0" self.targetSrcSuffix['4.8.1'] = "4.8.1" self.targetSrcSuffix['4.8.2'] = "4.8.2" + self.targetSrcSuffix['4.8.3'] = "4.8.2" self.patchToApply['4.6.3'] = ('patches/4.6.3/fixed_export_macro_for_QtDbus.patch', 1) self.patchToApply['4.7'] = [ ('patches/4.7/out-of-source-build.patch', 1), ('patches/4.7/webkit-fixes.patch', 1) ] self.patchToApply['4.7.1'] = [('patches/4.7.1/buildfix-for-mingw64.patch', 1)] self.patchToApply['4.7.4'] = [ ('patches/4.7/out-of-source-build.patch', 1), ('patches/4.7/add-pdbs-on-msvc.diff', 1) , ("patches/4.7/detect-windows-8-as-windows-7.patch", 1 ), ("patches/4.7.4/0001-fixed-error-generating-wrong-introspection-string-in.patch", 1 ), ("patches/4.7.4/Fix-regular-expression-lookup-in-qsslcertificate-from.patch", 1) ] self.patchToApply['4.8.0'] = [ ('patches/4.7/out-of-source-build.patch', 1), ('patches/4.8/add-pdbs-on-msvc.diff', 1), ('patches/4.8/detect-windows-8-as-windows-7.patch', 1), ('patches/4.8/fixed-win32-detection.patch',1), ('patches/4.8/fix-debug-webkit-linkage-QTBUG-20556.patch', 0), ('patches/4.8.0/0001-Remove-implicit-const-char-QString-cast-from-QDBusSe.patch', 1) ] self.patchToApply['4.8.1'] = [ ('patches/4.7/out-of-source-build.patch', 1), ('patches/4.8/add-pdbs-on-msvc.diff', 1), ('patches/4.8/detect-windows-8-as-windows-7.patch', 1), ('patches/4.8/fixed-win32-detection.patch',1), ('patches/4.8/fix-debug-webkit-linkage-QTBUG-20556.patch', 0), ('patches/4.8.1/Use-windows-path-for-pkgconfig-mkdir_p_asstring.patch', 1) ] self.patchToApply['4.8.2'] = [ ('patches/4.7/out-of-source-build.patch', 1), ('patches/4.8/add-pdbs-on-msvc.diff', 1), ('patches/4.8/detect-windows-8-as-windows-7.patch', 1), ('patches/4.8/fix-debug-webkit-linkage-QTBUG-20556.patch', 0), ('patches/4.8.1/Use-windows-path-for-pkgconfig-mkdir_p_asstring.patch', 1), ('patches/4.8/moc-boost-fix-bug-22829.diff', 1) ] + self.patchToApply['4.8.3'] = [ + ('patches/4.7/out-of-source-build.patch', 1), + ('patches/4.8/add-pdbs-on-msvc.diff', 1), + ('patches/4.8/fix-debug-webkit-linkage-QTBUG-20556.patch', 0), + ('patches/4.8.1/Use-windows-path-for-pkgconfig-mkdir_p_asstring.patch', 1), + ('patches/4.8/moc-boost-fix-bug-22829.diff', 1), + ('patches/4.8.3/fix-MinGW-w64-compilation.patch', 1), + ("patches/4.8.3/don't set QT_BUILD_DIR as a side effect.patch",1) + ] self.shortDescription = "a cross-platform application framework" # If you change the default target here please do not forget to rename the portage file - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.8.3' ## \todo this is prelimary and may be changed self.options.package.packageName = 'qt' self.options.package.specialMode = True # WinCE specific part winceVersionIndependentPatches = self.patchToApply['4.7'] + [ ('patches/4.7/custom-flags-for-wince.patch', 1), ('patches/4.7/fix-build-uitools-for-wince.patch', 1), ('patches/4.7/exchange-malloc-against-dlmalloc-for-wince.patch', 1), ('patches/4.7/fix-endless-loop-in-qProcess-for-wince.patch', 1), ('patches/4.7/Replace-malloc-in-qimage.patch', 1), ('patches/4.7/Enable-Softkeyboard-wince.patch', 1), ('patches/4.7/comboboxes-wrong-direction_wince.patch', 1), ('patches/4.7/Add-gpgLogging.patch', 1), ('patches/4.7/allow-more-then-one-instance-of-a-wince-application.patch', 1), ('patches/4.7/Add-qCalloc-to-qmalloc.patch', 1), ('patches/4.7/Use-dlmalloc-in-QScript4.dll.patch', 1), ('patches/4.7/Use-dlmalloc-for-javascript-garbage-collector.patch', 1), ('patches/4.7/Use-dlmalloc-in-qpaintengine.patch', 1), ('patches/4.7/Use-qCalloc-instead-of-qt_wince_calloc-impl.patch', 1), ('patches/4.7/Use-qRealloc-instead-of-realloc-in-qimage.patch', 1), ('patches/4.7/fix-calloc.patch', 1)] self.patchToApply['wince'] = winceVersionIndependentPatches + [ ('patches/4.7/fix-qml-alignment.patch', 1), # Upstream in 4.7 ('patches/4.7/Override-new-in-qt-dlls-to-use-dlmalloc.patch', 1), ('patches/4.7/Replace-qeventdispatcher.patch', 1), ('patches/4.7/fix-build-with-QT_NO_SVG.patch', 1), ('patches/4.7/fix-QSortFilterProxyModel.patch', 1), ('patches/4.7/Repaint-when-text-color-changes.patch', 1), ('patches/4.7/fix-map-to-global-calculations.patch', 1), ('patches/4.7/fix-widget-creation.patch', 1)] self.patchToApply['wince-4.7'] = winceVersionIndependentPatches + [ ('patches/4.7/Override-new-in-qt-dlls-for-4-7-branch.patch', 1), ('patches/4.7/Replace-qeventdispatcher-and-add-wcecompat-dep-for-4-7-branch.patch', 1), ('patches/4.7/fix-build-with-QT_NO_SVG-for-4-7-branch.patch', 1)] if emergePlatform.isCrossCompilingEnabled(): self.defaultTarget = 'wince' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' self.buildDependencies['dev-util/perl'] = 'default' self.dependencies['win32libs-bin/openssl'] = 'default' if EmergeBase().buildType() == "Debug": self.dependencies['win32libs-sources/dbus-src'] = 'default' else: self.dependencies['win32libs-bin/dbus'] = 'default' if not emergePlatform.isCrossCompilingEnabled(): self.dependencies['binary/mysql-pkg'] = 'default' else: self.dependencies['win32libs-sources/wcecompat-src'] = 'default' class Package(PackageBase, GitSource, QMakeBuildSystem, KDEWinPackager): def __init__( self, **args ): self.subinfo = subinfo() PackageBase.__init__(self) if not self.subinfo.options.useShortPathes \ and self.compiler() == "mingw4" and len(self.rootdir) > 10: # mingw4 cannot compile qt if the command line arguments # exceed 8192 chars utils.warning('for mingw4, rootdir %s is too long for full path names.' ' Using short path names.' % self.rootdir) self.subinfo.options.useShortPathes = True GitSource.__init__(self) QMakeBuildSystem.__init__(self) KDEWinPackager.__init__(self) # get instance of dbus and openssl package self.openssl = portage.getPackageInstance('win32libs-bin', 'openssl') if self.buildType() == "Debug": self.dbus = portage.getPackageInstance('win32libs-sources', 'dbus-src') else: self.dbus = portage.getPackageInstance('win32libs-bin', 'dbus') if not emergePlatform.isCrossCompilingEnabled(): self.mysql_server = portage.getPackageInstance('binary', 'mysql-pkg') else: self.wcecompat = portage.getPackageInstance('win32libs-sources', 'wcecompat-src') def configure( self, unused1=None, unused2=""): self.enterBuildDir() self.setPathes() xplatform = "" if self.isTargetBuild(): if self.buildPlatform() == "WM60": xplatform = "wincewm60professional-%s" % self.compiler() elif self.buildPlatform() == "WM65": xplatform = "wincewm65professional-%s" % self.compiler() elif self.buildPlatform() == "WM50": xplatform = "wincewm50pocket-%s" % self.compiler() else: exit( 1 ) os.environ[ "USERIN" ] = "y" userin = "y" incdirs = " -I \"" + os.path.join( self.dbus.installDir(), "include" ) + "\"" libdirs = " -L \"" + os.path.join( self.dbus.installDir(), "lib" ) + "\"" incdirs += " -I \"" + os.path.join( self.openssl.installDir(), "include" ) + "\"" libdirs += " -L \"" + os.path.join( self.openssl.installDir(), "lib" ) + "\"" if self.isTargetBuild(): incdirs += " -I \"" + os.path.join( self.wcecompat.installDir(), "include" ) + "\"" libdirs += " -L \"" + os.path.join( self.wcecompat.installDir(), "lib" ) + "\"" if not emergePlatform.isCrossCompilingEnabled(): incdirs += " -I \"" + os.path.join( self.mysql_server.installDir(), "include" ) + "\"" libdirs += " -L \"" + os.path.join( self.mysql_server.installDir(), "lib" ) + "\"" libdirs += " -l libmysql " else: utils.copyFile( os.path.join( self.packageDir(), "sources", "qconfig-kde-wince.h" ), os.path.join( self.sourceDir(), "src", "corelib" , "global", "qconfig-kde-wince.h" ) ) utils.copyFile( os.path.join( self.packageDir(), "sources", "new.cpp" ), os.path.join( self.sourceDir(), "src", "corelib" , "global", "new.cpp" ) ) utils.copyFile( os.path.join( self.packageDir(), "sources", "gpglogger_wince.cpp" ), os.path.join( self.sourceDir(), "src", "corelib" , "global", "gpglogger_wince.cpp" ) ) utils.copyFile( os.path.join( self.packageDir(), "sources", "gpglogger_wince.h" ), os.path.join( self.sourceDir(), "src", "corelib" , "global", "gpglogger_wince.h" ) ) configure = os.path.join( self.sourceDir(), "configure.exe" ).replace( "/", "\\" ) command = r"echo %s | %s -opensource -prefix %s -platform %s " % ( userin, configure, self.installDir(), self.platform ) if emergePlatform.isCrossCompilingEnabled(): if self.isTargetBuild(): command += "-xplatform %s -qconfig kde-wince " % xplatform command += "-no-exceptions -no-stl -no-rtti " if self.isHostBuild(): command += "-no-xmlpatterns -no-declarative -no-opengl " command += "-no-qt3support -no-multimedia -no-scripttools -no-accessibility -no-libmng -no-libtiff -no-gif -no-webkit " if not emergePlatform.isCrossCompilingEnabled(): # non-cc builds only command += "-plugin-sql-odbc -plugin-sql-mysql " command += "-qt-style-windowsxp -qt-style-windowsvista " command += "-qt-libpng -qt-libjpeg -qt-libtiff " # WebKit won't link properly with LTCG in a 32-bit MSVC environment if emergePlatform.buildArchitecture() == "x86" and compiler.isMSVC2008(): command += "-no-ltcg " else: command += "-ltcg " # all builds command += "-no-phonon " command += "-qdbus -dbus-linked -openssl-linked " command += "-no-fast -no-vcproj -no-dsp " command += "-nomake demos -nomake examples " command += "%s %s" % ( incdirs, libdirs ) if self.buildType() == "Debug": command += " -debug " else: command += " -release " print("command: ", command) utils.system( command ) return True def make(self, unused=''): if self.isTargetBuild(): self.setupTargetToolchain() self.setPathes() QMakeBuildSystem.make(self) return True def install( self ): if self.isTargetBuild(): # Configuring Qt for WinCE ignores the -prefix option, # so we have to do the job manually... # delete this because it is not working for windows utils.deleteFile( os.path.join( self.buildDir(), "plugin", "bearer", "qnmbearerd4.dll" )) utils.deleteFile( os.path.join( self.buildDir(), "plugin", "bearer", "qnmbearer4.dll" )) # syncqt expects qconfig.h to be in the install dir and fails if not utils.createDir( os.path.join( self.installDir(), "src", "corelib", "global") ) utils.copyFile( os.path.join( self.buildDir(), "src", "corelib", "global", "qconfig.h" ), os.path.join( self.installDir(), "src", "corelib" , "global", "qconfig.h" ) ) # headers need to be copied using syncqt because of the relative paths utils.prependPath(self.sourceDir(), "bin") command = os.path.join(self.sourceDir(), "bin", "syncqt.bat") command += " -base-dir \"" + self.sourceDir() + "\"" command += " -outdir \"" + self.installDir() + "\"" command += " -copy" command += " -quiet" utils.system( command ) utils.copySrcDirToDestDir( os.path.join( self.buildDir(), "bin" ) , os.path.join( self.installDir(), "bin" ) ) utils.copySrcDirToDestDir( os.path.join( self.buildDir(), "lib" ) , os.path.join( self.installDir(), "lib" ) ) # the dlls must be copied to the bin dir too for file in os.listdir( os.path.join( self.installDir(), "lib" ) ): if file.endswith( ".dll" ): utils.copyFile( os.path.join( self.installDir(), "lib" , file ), os.path.join( self.installDir(), "bin" , file ) ) utils.copySrcDirToDestDir( os.path.join( self.buildDir(), "mkspecs" ) , os.path.join( self.installDir(), "mkspecs" ) ) utils.copySrcDirToDestDir( os.path.join( self.buildDir(), "plugins" ) , os.path.join( self.installDir(), "plugins" ) ) # create qt.conf utils.copyFile( os.path.join( self.packageDir(), "qt.conf" ), os.path.join( self.installDir(), "bin", "qt.conf" ) ) return True if not QMakeBuildSystem.install(self): return False # Workaround QTBUG-12034 utils.copySrcDirToDestDir( os.path.join( self.buildDir(), "plugins", "imageformats" ) , os.path.join( self.installDir(), "bin", "imageformats" ) ) # create qt.conf utils.copyFile( os.path.join( self.packageDir(), "qt.conf" ), os.path.join( self.installDir(), "bin", "qt.conf" ) ) # install msvc debug files if available if self.compiler() == "msvc2005" or self.compiler() == "msvc2008" or self.compiler() == "msvc2010": srcdir = os.path.join( self.buildDir(), "lib" ) destdir = os.path.join( self.installDir(), "lib" ) filelist = os.listdir( srcdir ) for file in filelist: if file.endswith( ".pdb" ): utils.copyFile( os.path.join( srcdir, file ), os.path.join( destdir, file ) ) return True if __name__ == '__main__': Package().execute() diff --git a/portage/libs/runtime/runtime-multi.py b/portage/libs/runtime/runtime-multi.py index 73f2f0471..34de730bb 100644 --- a/portage/libs/runtime/runtime-multi.py +++ b/portage/libs/runtime/runtime-multi.py @@ -1,86 +1,84 @@ import info class subinfo( info.infoclass ): def setTargets( self ): # not used yet only for reference self.targets['0.0.2'] = "http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe" self.shortDescription = "the compiler runtime package" self.defaultTarget = '0.0.2' def setDependencies( self ): self.buildDependencies[ 'virtual/base' ] = 'default' from Package.BinaryPackageBase import * import compiler class Package( BinaryPackageBase ): def __init__( self ): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if compiler.isMinGW(): self.subinfo.options.package.version = compiler.getMinGWVersion() # elif compiler.isMSVC2008(): # self.subinfo.options.package.version = '9.0.30729.1' def fetch( self ): return True def unpack( self ): destdir = os.path.join( self.installDir(), "bin" ) utils.createDir( self.workDir() ) utils.createDir( destdir ) postfix = "" if self.buildType() == "Debug": postfix = "d" files = [] if compiler.isMinGW(): - if compiler.isMinGW32(): - srcdir = os.path.join( self.rootdir, "mingw", "bin" ) - files = [ 'mingwm10.dll', 'libgcc_s_dw2-1.dll' ] - elif compiler.isMinGW_W32(): - srcdir = os.path.join( self.rootdir, "mingw", "bin" ) + if compiler.getMinGWVersion() == "4.4.7": + if compiler.isMinGW_W32(): + srcdir = os.path.join( self.rootdir, "mingw", "bin" ) + elif compiler.isMinGW_W64(): + srcdir = os.path.join( self.rootdir, "mingw64", "bin" ) files = [ 'libgcc_s_sjlj-1.dll', 'libgomp-1.dll' ] - elif compiler.isMinGW_W64(): - srcdir = os.path.join( self.rootdir, "mingw64", "bin" ) - files = [ 'libgcc_s_sjlj-1.dll', 'libgomp-1.dll' ] -# elif compiler.isMSVC2008(): -# if self.buildType() == "Debug": -# srcdir = os.path.join( self.packageDir(), "redist", "Debug_NonRedist", "x86", "Microsoft.VC90.DebugCRT" ) -# files = [ "Microsoft.VC90.DebugCRT.manifest", "msvcr90d.dll", "msvcp90d.dll", "msvcm90d.dll"] -# else: -# srcdir = os.path.join( self.packageDir(), "redist", "x86", "Microsoft.VC90.CRT" ) -# files = [ "Microsoft.VC90.CRT.manifest", "msvcr90.dll", "msvcp90.dll", "msvcm90.dll" ] + else: + if compiler.isMinGW_W32(): + srcdir = os.path.join( self.rootdir, "mingw", "bin" ) + elif compiler.isMinGW_W64(): + srcdir = os.path.join( self.rootdir, "mingw64", "bin" ) + files = [ 'libgcc_s_sjlj-1.dll', 'libgomp-1.dll', 'libstdc++-6.dll', 'libwinpthread-1.dll' ] + elif compiler.isMSVC2010(): if os.environ["EMERGE_ARCHITECTURE"] == "x86" and os.environ["PROCESSOR_ARCHITECTURE"] == "AMD64": srcdir = os.path.join( os.environ["SystemRoot"], "SysWOW64") else: srcdir = os.path.join( os.environ["SystemRoot"], "System32") files = [ "msvcr100%s.dll" % postfix, "msvcp100%s.dll" % postfix ] for file in files: - utils.copyFile( os.path.join( srcdir, file ), os.path.join( destdir, file ) ) + utils.copyFile( os.path.join( srcdir, file ), os.path.join( destdir, file ) ,False) # extract pthread package. - if compiler.isMinGW_WXX(): + if compiler.isMinGW_WXX() and compiler.getMinGWVersion() == "4.4.7": tmpdir = os.getenv( "TEMP" ) if compiler.isMinGW_W32(): _ext = 32 elif compiler.isMinGW_W64(): _ext = 64 else: utils.die( "unknown flavor of mingw-wXX" ) pthreadPackageName = os.path.join( self.rootdir, "mingw", "pthreads-w%s.zip" ) % _ext pthreadDll = "pthreadGC2-w%s.dll" % _ext utils.unZip( pthreadPackageName, tmpdir ) srcdir = os.path.join( tmpdir, "bin" ) files = [ pthreadDll ] for file in files: utils.copyFile( os.path.join( srcdir, file ), os.path.join( destdir, file ) ) + return True if __name__ == '__main__': Package().execute() diff --git a/portage/package/amarok-package/amarok-package-20110804.py b/portage/package/amarok-package/amarok-package-20110804.py index 88508a43e..adb48e745 100644 --- a/portage/package/amarok-package/amarok-package-20110804.py +++ b/portage/package/amarok-package/amarok-package-20110804.py @@ -1,39 +1,37 @@ # -*- coding: utf-8 -*- import info from Package.VirtualPackageBase import * from Packager.NullsoftInstallerPackager import * # This is an example package for building class subinfo( info.infoclass ): def setTargets( self ): self.amarok = portage.getPackageInstance('extragear','amarok') _,gitVersion = self.amarok.getPackageVersion() self.svnTargets[ 'git-' + gitVersion ] = "" self.svnTargets[ '2.6pre' ] = "" self.defaultTarget = '2.6pre' - - def setDependencies( self ): self.dependencies[ 'extragear/amarok' ] = 'default' self.dependencies[ 'kde/kde-workspace' ] = 'default' self.dependencies[ 'kdesupport/snorenotify' ] = 'default' self.dependencies[ 'libs/runtime' ] = 'default' #self.dependencies[ 'win32libs-bin/liblzma' ] = 'default' self.dependencies[ 'kdesupport/hupnp' ] = 'default'#the packages are optional and not installed by default self.dependencies[ 'kdesupport/phonon-vlc'] = 'default' class Package( NullsoftInstallerPackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() blacklists = [ NSIPackagerLists.runtimeBlacklist, 'blacklist.txt', 'blacklist-virtuoso.txt' ] NullsoftInstallerPackager.__init__( self, blacklists=blacklists ) VirtualPackageBase.__init__( self ) self.scriptname = os.path.join(self.packageDir(),"NullsoftInstaller.nsi") self.defines[ "amarok-root" ] = self.subinfo.amarok.sourceDir() self.defines[ "amarok-icon" ] = os.path.join(self.packageDir(),"amarok.ico") self.defines[ "kde-version" ] = "4.8.2" if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ar-package/kde4-l10n-ar-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ar-package/kde4-l10n-ar-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ar-package/kde4-l10n-ar-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ar-package/kde4-l10n-ar-package-4.9.0.py index eafe52577..69560ab05 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ar-package/kde4-l10n-ar-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ar-package/kde4-l10n-ar-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ar'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-bg-package/kde4-l10n-bg-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-bg-package/kde4-l10n-bg-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-bg-package/kde4-l10n-bg-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-bg-package/kde4-l10n-bg-package-4.9.0.py index cb18ba61b..73ff0f101 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-bg-package/kde4-l10n-bg-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-bg-package/kde4-l10n-bg-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-bg'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-bs-package/kde4-l10n-bs-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-bs-package/kde4-l10n-bs-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-bs-package/kde4-l10n-bs-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-bs-package/kde4-l10n-bs-package-4.9.0.py index f96d51b74..081666d98 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-bs-package/kde4-l10n-bs-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-bs-package/kde4-l10n-bs-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-bs'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ca-package/kde4-l10n-ca-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ca-package/kde4-l10n-ca-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ca-package/kde4-l10n-ca-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ca-package/kde4-l10n-ca-package-4.9.0.py index 17d972354..2d87529a6 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ca-package/kde4-l10n-ca-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ca-package/kde4-l10n-ca-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ca'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ca@valencia-package/kde4-l10n-ca@valencia-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ca@valencia-package/kde4-l10n-ca@valencia-package-4.9.0.py similarity index 85% rename from portage/package/kde4-l10n-package/kde4-l10n-ca@valencia-package/kde4-l10n-ca@valencia-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ca@valencia-package/kde4-l10n-ca@valencia-package-4.9.0.py index 7e0779662..947fd0b9b 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ca@valencia-package/kde4-l10n-ca@valencia-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ca@valencia-package/kde4-l10n-ca@valencia-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ca@valencia'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-cs-package/kde4-l10n-cs-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-cs-package/kde4-l10n-cs-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-cs-package/kde4-l10n-cs-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-cs-package/kde4-l10n-cs-package-4.9.0.py index ec670a91d..ab7afe991 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-cs-package/kde4-l10n-cs-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-cs-package/kde4-l10n-cs-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-cs'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-da-package/kde4-l10n-da-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-da-package/kde4-l10n-da-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-da-package/kde4-l10n-da-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-da-package/kde4-l10n-da-package-4.9.0.py index c5fc717a8..0bd53b9d8 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-da-package/kde4-l10n-da-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-da-package/kde4-l10n-da-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-da'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-de-package/kde4-l10n-de-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-de-package/kde4-l10n-de-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-de-package/kde4-l10n-de-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-de-package/kde4-l10n-de-package-4.9.0.py index 046bfb215..884e4b134 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-de-package/kde4-l10n-de-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-de-package/kde4-l10n-de-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-de'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-el-package/kde4-l10n-el-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-el-package/kde4-l10n-el-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-el-package/kde4-l10n-el-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-el-package/kde4-l10n-el-package-4.9.0.py index 0323baab6..50dfba845 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-el-package/kde4-l10n-el-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-el-package/kde4-l10n-el-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-el'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-en_GB-package/kde4-l10n-en_GB-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-en_GB-package/kde4-l10n-en_GB-package-4.9.0.py similarity index 85% rename from portage/package/kde4-l10n-package/kde4-l10n-en_GB-package/kde4-l10n-en_GB-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-en_GB-package/kde4-l10n-en_GB-package-4.9.0.py index 47a5379e4..4fef0596c 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-en_GB-package/kde4-l10n-en_GB-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-en_GB-package/kde4-l10n-en_GB-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-en_GB'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-es-package/kde4-l10n-es-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-es-package/kde4-l10n-es-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-es-package/kde4-l10n-es-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-es-package/kde4-l10n-es-package-4.9.0.py index 5b5bb39b9..10aae0bba 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-es-package/kde4-l10n-es-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-es-package/kde4-l10n-es-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-es'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-et-package/kde4-l10n-et-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-et-package/kde4-l10n-et-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-et-package/kde4-l10n-et-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-et-package/kde4-l10n-et-package-4.9.0.py index cf4f4744d..16f9a8b66 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-et-package/kde4-l10n-et-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-et-package/kde4-l10n-et-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-et'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-eu-package/kde4-l10n-eu-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-eu-package/kde4-l10n-eu-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-eu-package/kde4-l10n-eu-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-eu-package/kde4-l10n-eu-package-4.9.0.py index 5e4530a79..24c6fc667 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-eu-package/kde4-l10n-eu-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-eu-package/kde4-l10n-eu-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-eu'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-fi-package/kde4-l10n-fi-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-fi-package/kde4-l10n-fi-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-fi-package/kde4-l10n-fi-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-fi-package/kde4-l10n-fi-package-4.9.0.py index 4f397a668..44eb7ad91 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-fi-package/kde4-l10n-fi-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-fi-package/kde4-l10n-fi-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-fi'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-fr-package/kde4-l10n-fr-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-fr-package/kde4-l10n-fr-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-fr-package/kde4-l10n-fr-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-fr-package/kde4-l10n-fr-package-4.9.0.py index 74f875dbb..0811b28dd 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-fr-package/kde4-l10n-fr-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-fr-package/kde4-l10n-fr-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-fr'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ga-package/kde4-l10n-ga-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ga-package/kde4-l10n-ga-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ga-package/kde4-l10n-ga-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ga-package/kde4-l10n-ga-package-4.9.0.py index b729aa500..173e9c189 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ga-package/kde4-l10n-ga-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ga-package/kde4-l10n-ga-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ga'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-gl-package/kde4-l10n-gl-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-gl-package/kde4-l10n-gl-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-gl-package/kde4-l10n-gl-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-gl-package/kde4-l10n-gl-package-4.9.0.py index c82312e00..8700e6c38 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-gl-package/kde4-l10n-gl-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-gl-package/kde4-l10n-gl-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-gl'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-he-package/kde4-l10n-he-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-he-package/kde4-l10n-he-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-he-package/kde4-l10n-he-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-he-package/kde4-l10n-he-package-4.9.0.py index 71a8af29e..e633ffc72 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-he-package/kde4-l10n-he-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-he-package/kde4-l10n-he-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-he'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-hr-package/kde4-l10n-hr-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-hr-package/kde4-l10n-hr-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-hr-package/kde4-l10n-hr-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-hr-package/kde4-l10n-hr-package-4.9.0.py index 2bd5ad42b..aafd0b600 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-hr-package/kde4-l10n-hr-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-hr-package/kde4-l10n-hr-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-hr'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-hu-package/kde4-l10n-hu-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-hu-package/kde4-l10n-hu-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-hu-package/kde4-l10n-hu-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-hu-package/kde4-l10n-hu-package-4.9.0.py index 3a821ac98..7510df484 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-hu-package/kde4-l10n-hu-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-hu-package/kde4-l10n-hu-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-hu'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ia-package/kde4-l10n-ia-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ia-package/kde4-l10n-ia-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ia-package/kde4-l10n-ia-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ia-package/kde4-l10n-ia-package-4.9.0.py index 4ca5eb253..4a31075f6 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ia-package/kde4-l10n-ia-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ia-package/kde4-l10n-ia-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ia'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-id-package/kde4-l10n-id-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-id-package/kde4-l10n-id-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-id-package/kde4-l10n-id-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-id-package/kde4-l10n-id-package-4.9.0.py index f0235c0dd..1684eebe5 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-id-package/kde4-l10n-id-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-id-package/kde4-l10n-id-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-id'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-is-package/kde4-l10n-is-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-is-package/kde4-l10n-is-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-is-package/kde4-l10n-is-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-is-package/kde4-l10n-is-package-4.9.0.py index ffd6ebe9e..7a3d49b03 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-is-package/kde4-l10n-is-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-is-package/kde4-l10n-is-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-is'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-it-package/kde4-l10n-it-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-it-package/kde4-l10n-it-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-it-package/kde4-l10n-it-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-it-package/kde4-l10n-it-package-4.9.0.py index 68a52026f..087cdfd60 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-it-package/kde4-l10n-it-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-it-package/kde4-l10n-it-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-it'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ja-package/kde4-l10n-ja-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ja-package/kde4-l10n-ja-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ja-package/kde4-l10n-ja-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ja-package/kde4-l10n-ja-package-4.9.0.py index d128dddf4..336d27334 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ja-package/kde4-l10n-ja-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ja-package/kde4-l10n-ja-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ja'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-kk-package/kde4-l10n-kk-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-kk-package/kde4-l10n-kk-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-kk-package/kde4-l10n-kk-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-kk-package/kde4-l10n-kk-package-4.9.0.py index 9af7b09af..7112cbcb7 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-kk-package/kde4-l10n-kk-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-kk-package/kde4-l10n-kk-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-kk'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-km-package/kde4-l10n-km-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-km-package/kde4-l10n-km-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-km-package/kde4-l10n-km-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-km-package/kde4-l10n-km-package-4.9.0.py index be57d15a0..23e1eea08 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-km-package/kde4-l10n-km-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-km-package/kde4-l10n-km-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-km'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-kn-package/kde4-l10n-kn-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-kn-package/kde4-l10n-kn-package-4.8.2-20120419.py deleted file mode 100644 index 80470a97f..000000000 --- a/portage/package/kde4-l10n-package/kde4-l10n-kn-package/kde4-l10n-kn-package-4.8.2-20120419.py +++ /dev/null @@ -1,26 +0,0 @@ -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: - self.svnTargets[ ver ] = '' - - self.defaultTarget = '4.8.2' - - - def setDependencies( self ): - self.dependencies['kde/kde4-l10n-kn'] = 'default' - - -from Package.VirtualPackageBase import * -from Packager.PortablePackager import * -class Package( PortablePackager, VirtualPackageBase ): - def __init__( self, **args ): - self.subinfo = subinfo() - PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) - VirtualPackageBase.__init__( self ) - - -if __name__ == '__main__': - Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ko-package/kde4-l10n-ko-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ko-package/kde4-l10n-ko-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ko-package/kde4-l10n-ko-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ko-package/kde4-l10n-ko-package-4.9.0.py index 798f976df..4e9a9257d 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ko-package/kde4-l10n-ko-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ko-package/kde4-l10n-ko-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ko'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-lt-package/kde4-l10n-lt-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-lt-package/kde4-l10n-lt-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-lt-package/kde4-l10n-lt-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-lt-package/kde4-l10n-lt-package-4.9.0.py index 4b58b0bb9..9a6de3b83 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-lt-package/kde4-l10n-lt-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-lt-package/kde4-l10n-lt-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-lt'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-lv-package/kde4-l10n-lv-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-lv-package/kde4-l10n-lv-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-lv-package/kde4-l10n-lv-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-lv-package/kde4-l10n-lv-package-4.9.0.py index f0466d334..bd19131fb 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-lv-package/kde4-l10n-lv-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-lv-package/kde4-l10n-lv-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-lv'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-nb-package/kde4-l10n-nb-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-nb-package/kde4-l10n-nb-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-nb-package/kde4-l10n-nb-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-nb-package/kde4-l10n-nb-package-4.9.0.py index bdd5dc94b..38c024c75 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-nb-package/kde4-l10n-nb-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-nb-package/kde4-l10n-nb-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-nb'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-nds-package/kde4-l10n-nds-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-nds-package/kde4-l10n-nds-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-nds-package/kde4-l10n-nds-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-nds-package/kde4-l10n-nds-package-4.9.0.py index 89ab56ea1..5660ba6d6 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-nds-package/kde4-l10n-nds-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-nds-package/kde4-l10n-nds-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-nds'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-nl-package/kde4-l10n-nl-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-nl-package/kde4-l10n-nl-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-nl-package/kde4-l10n-nl-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-nl-package/kde4-l10n-nl-package-4.9.0.py index 24fcc0b21..56a0a71ba 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-nl-package/kde4-l10n-nl-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-nl-package/kde4-l10n-nl-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-nl'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-nn-package/kde4-l10n-nn-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-nn-package/kde4-l10n-nn-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-nn-package/kde4-l10n-nn-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-nn-package/kde4-l10n-nn-package-4.9.0.py index 1c2707239..976f66b17 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-nn-package/kde4-l10n-nn-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-nn-package/kde4-l10n-nn-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-nn'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-pa-package/kde4-l10n-pa-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-pa-package/kde4-l10n-pa-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-pa-package/kde4-l10n-pa-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-pa-package/kde4-l10n-pa-package-4.9.0.py index 2b320ea33..25f303ef1 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-pa-package/kde4-l10n-pa-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-pa-package/kde4-l10n-pa-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-pa'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-package-4.9.0.py similarity index 96% rename from portage/package/kde4-l10n-package/kde4-l10n-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-package-4.9.0.py index 354cd85c6..0d006283b 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-package-4.9.0.py @@ -1,70 +1,70 @@ import info class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['4.8.2'] = '' - self.defaultTarget = '4.8.2' + self.svnTargets['4.9.0'] = '' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['package/kde4-l10n-ar-package'] = 'default' self.dependencies['package/kde4-l10n-bg-package'] = 'default' self.dependencies['package/kde4-l10n-bs-package'] = 'default' self.dependencies['package/kde4-l10n-ca-package'] = 'default' self.dependencies['package/kde4-l10n-ca@valencia-package'] = 'default' self.dependencies['package/kde4-l10n-cs-package'] = 'default' self.dependencies['package/kde4-l10n-da-package'] = 'default' self.dependencies['package/kde4-l10n-de-package'] = 'default' self.dependencies['package/kde4-l10n-el-package'] = 'default' self.dependencies['package/kde4-l10n-en_GB-package'] = 'default' self.dependencies['package/kde4-l10n-es-package'] = 'default' self.dependencies['package/kde4-l10n-et-package'] = 'default' self.dependencies['package/kde4-l10n-eu-package'] = 'default' self.dependencies['package/kde4-l10n-fi-package'] = 'default' self.dependencies['package/kde4-l10n-fr-package'] = 'default' self.dependencies['package/kde4-l10n-ga-package'] = 'default' self.dependencies['package/kde4-l10n-gl-package'] = 'default' self.dependencies['package/kde4-l10n-he-package'] = 'default' self.dependencies['package/kde4-l10n-hr-package'] = 'default' self.dependencies['package/kde4-l10n-hu-package'] = 'default' self.dependencies['package/kde4-l10n-ia-package'] = 'default' self.dependencies['package/kde4-l10n-id-package'] = 'default' self.dependencies['package/kde4-l10n-is-package'] = 'default' self.dependencies['package/kde4-l10n-it-package'] = 'default' self.dependencies['package/kde4-l10n-ja-package'] = 'default' self.dependencies['package/kde4-l10n-kk-package'] = 'default' self.dependencies['package/kde4-l10n-km-package'] = 'default' self.dependencies['package/kde4-l10n-ko-package'] = 'default' self.dependencies['package/kde4-l10n-lt-package'] = 'default' self.dependencies['package/kde4-l10n-lv-package'] = 'default' self.dependencies['package/kde4-l10n-nb-package'] = 'default' self.dependencies['package/kde4-l10n-nds-package'] = 'default' self.dependencies['package/kde4-l10n-nl-package'] = 'default' self.dependencies['package/kde4-l10n-nn-package'] = 'default' self.dependencies['package/kde4-l10n-pa-package'] = 'default' self.dependencies['package/kde4-l10n-pl-package'] = 'default' self.dependencies['package/kde4-l10n-pt-package'] = 'default' self.dependencies['package/kde4-l10n-pt_BR-package'] = 'default' self.dependencies['package/kde4-l10n-ro-package'] = 'default' self.dependencies['package/kde4-l10n-ru-package'] = 'default' self.dependencies['package/kde4-l10n-sk-package'] = 'default' self.dependencies['package/kde4-l10n-sl-package'] = 'default' self.dependencies['package/kde4-l10n-sr-package'] = 'default' self.dependencies['package/kde4-l10n-sv-package'] = 'default' self.dependencies['package/kde4-l10n-th-package'] = 'default' self.dependencies['package/kde4-l10n-tr-package'] = 'default' self.dependencies['package/kde4-l10n-ug-package'] = 'default' self.dependencies['package/kde4-l10n-uk-package'] = 'default' self.dependencies['package/kde4-l10n-wa-package'] = 'default' self.dependencies['package/kde4-l10n-zh_CN-package'] = 'default' self.dependencies['package/kde4-l10n-zh_TW-package'] = 'default' from Package.VirtualPackageBase import * class Package( VirtualPackageBase ): def __init__( self ): self.subinfo = subinfo() VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-pl-package/kde4-l10n-pl-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-pl-package/kde4-l10n-pl-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-pl-package/kde4-l10n-pl-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-pl-package/kde4-l10n-pl-package-4.9.0.py index 271d8499a..d7e17e94a 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-pl-package/kde4-l10n-pl-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-pl-package/kde4-l10n-pl-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-pl'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-pt-package/kde4-l10n-pt-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-pt-package/kde4-l10n-pt-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-pt-package/kde4-l10n-pt-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-pt-package/kde4-l10n-pt-package-4.9.0.py index c5f416463..646a2bcf8 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-pt-package/kde4-l10n-pt-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-pt-package/kde4-l10n-pt-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-pt'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-pt_BR-package/kde4-l10n-pt_BR-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-pt_BR-package/kde4-l10n-pt_BR-package-4.9.0.py similarity index 85% rename from portage/package/kde4-l10n-package/kde4-l10n-pt_BR-package/kde4-l10n-pt_BR-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-pt_BR-package/kde4-l10n-pt_BR-package-4.9.0.py index b8cc05b40..5c12ce920 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-pt_BR-package/kde4-l10n-pt_BR-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-pt_BR-package/kde4-l10n-pt_BR-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-pt_BR'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ro-package/kde4-l10n-ro-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ro-package/kde4-l10n-ro-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ro-package/kde4-l10n-ro-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ro-package/kde4-l10n-ro-package-4.9.0.py index d9f80c55f..54b89b376 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ro-package/kde4-l10n-ro-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ro-package/kde4-l10n-ro-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ro'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ru-package/kde4-l10n-ru-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ru-package/kde4-l10n-ru-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ru-package/kde4-l10n-ru-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ru-package/kde4-l10n-ru-package-4.9.0.py index f50946899..4edb7fca6 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ru-package/kde4-l10n-ru-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ru-package/kde4-l10n-ru-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ru'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-sk-package/kde4-l10n-sk-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-sk-package/kde4-l10n-sk-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-sk-package/kde4-l10n-sk-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-sk-package/kde4-l10n-sk-package-4.9.0.py index f81b8df73..670ba9b9f 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-sk-package/kde4-l10n-sk-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-sk-package/kde4-l10n-sk-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-sk'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-sl-package/kde4-l10n-sl-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-sl-package/kde4-l10n-sl-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-sl-package/kde4-l10n-sl-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-sl-package/kde4-l10n-sl-package-4.9.0.py index 28cef473f..05014ee2b 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-sl-package/kde4-l10n-sl-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-sl-package/kde4-l10n-sl-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-sl'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-sr-package/kde4-l10n-sr-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-sr-package/kde4-l10n-sr-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-sr-package/kde4-l10n-sr-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-sr-package/kde4-l10n-sr-package-4.9.0.py index 48f578fa4..e2eeea74d 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-sr-package/kde4-l10n-sr-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-sr-package/kde4-l10n-sr-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-sr'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-sv-package/kde4-l10n-sv-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-sv-package/kde4-l10n-sv-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-sv-package/kde4-l10n-sv-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-sv-package/kde4-l10n-sv-package-4.9.0.py index 4f8245425..7afedffd1 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-sv-package/kde4-l10n-sv-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-sv-package/kde4-l10n-sv-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-sv'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-th-package/kde4-l10n-th-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-th-package/kde4-l10n-th-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-th-package/kde4-l10n-th-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-th-package/kde4-l10n-th-package-4.9.0.py index ac59761bb..c678c7833 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-th-package/kde4-l10n-th-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-th-package/kde4-l10n-th-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-th'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-tr-package/kde4-l10n-tr-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-tr-package/kde4-l10n-tr-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-tr-package/kde4-l10n-tr-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-tr-package/kde4-l10n-tr-package-4.9.0.py index 90d6ff522..7012932aa 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-tr-package/kde4-l10n-tr-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-tr-package/kde4-l10n-tr-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-tr'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-ug-package/kde4-l10n-ug-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-ug-package/kde4-l10n-ug-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-ug-package/kde4-l10n-ug-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-ug-package/kde4-l10n-ug-package-4.9.0.py index d2ea2f3ec..c25d96f90 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-ug-package/kde4-l10n-ug-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-ug-package/kde4-l10n-ug-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-ug'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-uk-package/kde4-l10n-uk-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-uk-package/kde4-l10n-uk-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-uk-package/kde4-l10n-uk-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-uk-package/kde4-l10n-uk-package-4.9.0.py index c29d4a977..2950feec5 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-uk-package/kde4-l10n-uk-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-uk-package/kde4-l10n-uk-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-uk'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-wa-package/kde4-l10n-wa-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-wa-package/kde4-l10n-wa-package-4.9.0.py similarity index 84% rename from portage/package/kde4-l10n-package/kde4-l10n-wa-package/kde4-l10n-wa-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-wa-package/kde4-l10n-wa-package-4.9.0.py index 8bf798bdb..0980aa160 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-wa-package/kde4-l10n-wa-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-wa-package/kde4-l10n-wa-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-wa'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-zh_CN-package/kde4-l10n-zh_CN-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-zh_CN-package/kde4-l10n-zh_CN-package-4.9.0.py similarity index 85% rename from portage/package/kde4-l10n-package/kde4-l10n-zh_CN-package/kde4-l10n-zh_CN-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-zh_CN-package/kde4-l10n-zh_CN-package-4.9.0.py index dece7f039..2625168c2 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-zh_CN-package/kde4-l10n-zh_CN-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-zh_CN-package/kde4-l10n-zh_CN-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-zh_CN'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/kde4-l10n-zh_TW-package/kde4-l10n-zh_TW-package-4.8.2-20120419.py b/portage/package/kde4-l10n-package/kde4-l10n-zh_TW-package/kde4-l10n-zh_TW-package-4.9.0.py similarity index 85% rename from portage/package/kde4-l10n-package/kde4-l10n-zh_TW-package/kde4-l10n-zh_TW-package-4.8.2-20120419.py rename to portage/package/kde4-l10n-package/kde4-l10n-zh_TW-package/kde4-l10n-zh_TW-package-4.9.0.py index 3d19a7c37..e78016e99 100644 --- a/portage/package/kde4-l10n-package/kde4-l10n-zh_TW-package/kde4-l10n-zh_TW-package-4.8.2-20120419.py +++ b/portage/package/kde4-l10n-package/kde4-l10n-zh_TW-package/kde4-l10n-zh_TW-package-4.9.0.py @@ -1,26 +1,26 @@ import os import info class subinfo( info.infoclass ): def setTargets( self ): - for ver in ['4.8.0', '4.8.1', '4.8.2']: + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: self.svnTargets[ ver ] = '' - self.defaultTarget = '4.8.2' + self.defaultTarget = '4.9.0' def setDependencies( self ): self.dependencies['kde/kde4-l10n-zh_TW'] = 'default' from Package.VirtualPackageBase import * from Packager.PortablePackager import * class Package( PortablePackager, VirtualPackageBase ): def __init__( self, **args ): self.subinfo = subinfo() PortablePackager.__init__( self , whitelists = [os.path.join(os.getenv('KDEROOT'),'emerge','portage','package','kde4-l10n-package','whitelist.txt')] ) VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/package/kde4-l10n-package/whitelist.txt b/portage/package/kde4-l10n-package/whitelist.txt deleted file mode 100644 index 6bfd8e83f..000000000 --- a/portage/package/kde4-l10n-package/whitelist.txt +++ /dev/null @@ -1,2 +0,0 @@ -# whitelist -share\\locale\\.* diff --git a/portage/package/kdeedu-package/NullsoftInstaller.nsi b/portage/package/kdeedu-package/NullsoftInstaller.nsi new file mode 100644 index 000000000..3d4c2219a --- /dev/null +++ b/portage/package/kdeedu-package/NullsoftInstaller.nsi @@ -0,0 +1,131 @@ +; basic script template for NullsoftInstallerPackager +; +; Copyright 2010 Patrick Spendrin +; adapted from marble.nsi + +; registry stuff +!define regkey "Software\${company}\KDEEdu" +!define uninstkey "Software\Microsoft\Windows\CurrentVersion\Uninstall\KDEEdu" + +!define startmenu "$SMPROGRAMS\KDEEdu" +!define uninstaller "uninstall.exe" + +;-------------------------------- + +XPStyle on +ShowInstDetails hide +ShowUninstDetails hide + +SetCompressor /SOLID lzma + +Name "${productname}" +Caption "${productname}" + +OutFile "${setupname}" + +!include "MUI2.nsh" +!define MUI_ICON "${kdeedu-icon}" + +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_LICENSE "${kdeedu-root}\COPYING" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_INSTFILES + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +!insertmacro MUI_LANGUAGE "English" + + +SetDateSave on +SetDatablockOptimize on +CRCCheck on +SilentInstall normal + +InstallDir "$PROGRAMFILES\KDEEdu" +InstallDirRegKey HKLM "${regkey}" "" + +;-------------------------------- + +AutoCloseWindow false +ShowInstDetails hide + + + +Section "KDEEdu" + ExecWait '"$INSTDIR\bin\kdeinit4.exe" "--shutdown"' + WriteRegStr HKLM "${regkey}" "Install_Dir" "$INSTDIR" + ; write uninstall strings + WriteRegStr HKLM "${uninstkey}" "DisplayName" "KDE Edu (remove only)" + WriteRegStr HKLM "${uninstkey}" "UninstallString" '"$INSTDIR\${uninstaller}"' + + SetOutPath $INSTDIR + + +; package all files, recursively, preserving attributes +; assume files are in the correct places + +File /a /r /x "*.nsi" /x "${setupname}" "${srcdir}\*.*" + +WriteUninstaller "${uninstaller}" + +SectionEnd + + +; create shortcuts +Section "Shortcuts" +SetShellVarContext all +CreateDirectory "${startmenu}" +SetOutPath $INSTDIR ; for working directory +CreateShortCut "${startmenu}\Blinken.lnk" "$INSTDIR\bin\blinken.exe" +CreateShortCut "${startmenu}\Cantor.lnk" "$INSTDIR\bin\cantor.exe" +CreateShortCut "${startmenu}\KAlgebra.lnk" "$INSTDIR\bin\kalgebra.exe" +CreateShortCut "${startmenu}\Kalzium.lnk" "$INSTDIR\bin\kalzium.exe" +CreateShortCut "${startmenu}\Kanagram.lnk" "$INSTDIR\bin\kanagram.exe" +CreateShortCut "${startmenu}\KBruch.lnk" "$INSTDIR\bin\kbruch.exe" +CreateShortCut "${startmenu}\KGeography.lnk" "$INSTDIR\bin\kgeography.exe" +CreateShortCut "${startmenu}\KHangMan.lnk" "$INSTDIR\bin\khangman.exe" +CreateShortCut "${startmenu}\Kig.lnk" "$INSTDIR\bin\kig.exe" +CreateShortCut "${startmenu}\Kiten.lnk" "$INSTDIR\bin\kiten.exe" +CreateShortCut "${startmenu}\KLettres.lnk" "$INSTDIR\bin\klettres.exe" +CreateShortCut "${startmenu}\KMplot.lnk" "$INSTDIR\bin\kmplot.exe" +CreateShortCut "${startmenu}\KStars.lnk" "$INSTDIR\bin\kstars.exe" +CreateShortCut "${startmenu}\KTouch.lnk" "$INSTDIR\bin\ktouch.exe" +CreateShortCut "${startmenu}\KTurtle.lnk" "$INSTDIR\bin\kturtle.exe" +CreateShortCut "${startmenu}\KWordQuiz.lnk" "$INSTDIR\bin\kwordquiz.exe" +CreateShortCut "${startmenu}\Marble.lnk" "$INSTDIR\bin\marble.exe" +CreateShortCut "${startmenu}\Pairs.lnk" "$INSTDIR\bin\pairs.exe" +CreateShortCut "${startmenu}\Parley.lnk" "$INSTDIR\bin\parley.exe" +CreateShortCut "${startmenu}\Rocs.lnk" "$INSTDIR\bin\rocs.exe" +CreateShortCut "${startmenu}\Step.lnk" "$INSTDIR\bin\step.exe" +CreateShortCut "${startmenu}\Appearance Settings.lnk" "$INSTDIR\bin\kcmshell4.exe" "style" "$INSTDIR\bin\systemsettings.exe" +CreateShortCut "${startmenu}\Snorenotify.lnk" "$INSTDIR\bin\snorenotify.exe" +CreateShortCut "${startmenu}\Uninstall.lnk" $INSTDIR\uninstall.exe" +SectionEnd + +;post install +Section +SetOutPath "$INSTDIR" +ExecWait '"$INSTDIR\bin\update-mime-database.exe" "$INSTDIR\share\mime"' +ExecWait '"$INSTDIR\bin\kbuildsycoca4.exe" "--noincremental"' +SectionEnd + +; Uninstaller +; All section names prefixed by "Un" will be in the uninstaller + +UninstallText "This will uninstall KDE Edu." + +Section "Uninstall" +SetShellVarContext all +ExecWait '"$INSTDIR\bin\kdeinit4.exe" "--shutdown"' + +DeleteRegKey HKLM "${uninstkey}" +DeleteRegKey HKLM "${regkey}" + +Delete "${startmenu}\Uninstall.lnk" + +RMDir /r "${startmenu}" +RMDir /r "$INSTDIR" + +SectionEnd + diff --git a/portage/package/kdeedu-package/kdeedu-package-20120923.py b/portage/package/kdeedu-package/kdeedu-package-20120923.py new file mode 100644 index 000000000..a2c26c2d5 --- /dev/null +++ b/portage/package/kdeedu-package/kdeedu-package-20120923.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +import info +from Package.VirtualPackageBase import * +from Packager.NullsoftInstallerPackager import * + +# This is an example package for building + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.svnTargets[ ver ] = '' + + self.defaultTarget = '4.9.0' + + def setDependencies( self ): + self.dependencies[ 'kde/kdeedu' ] = 'default' + +class Package( NullsoftInstallerPackager, VirtualPackageBase ): + def __init__( self, **args ): + self.subinfo = subinfo() + # whitelists = [ 'whitelist.txt' ] + # blacklists = [ NSIPackagerLists.runtimeBlacklist, 'blacklist.txt' ] + VirtualPackageBase.__init__( self ) + self.scriptname = os.path.join(self.packageDir(),"NullsoftInstaller.nsi") + # NullsoftInstallerPackager.__init__( self, whitelists,blacklists ) + NullsoftInstallerPackager.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/package/kdegames-package/kdegames-package-20120924.py b/portage/package/kdegames-package/kdegames-package-20120924.py new file mode 100644 index 000000000..2d462e34c --- /dev/null +++ b/portage/package/kdegames-package/kdegames-package-20120924.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +import info +from Package.VirtualPackageBase import * +from Packager.NullsoftInstallerPackager import * + +# This is an example package for building + +class subinfo( info.infoclass ): + def setTargets( self ): + for ver in ['4.9.1', '4.9.2', '4.9.3', '4.9.4']: + self.svnTargets[ ver ] = '' + + self.defaultTarget = '4.9.0' + + def setDependencies( self ): + self.dependencies[ 'kde/kdegames' ] = 'default' + +class Package( NullsoftInstallerPackager, VirtualPackageBase ): + def __init__( self, **args ): + self.subinfo = subinfo() + # whitelists = [ 'whitelist.txt' ] + # blacklists = [ NSIPackagerLists.runtimeBlacklist, 'blacklist.txt' ] + VirtualPackageBase.__init__( self ) + # NullsoftInstallerPackager.__init__( self, whitelists,blacklists ) + NullsoftInstallerPackager.__init__( self ) + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/package/rekonq-package/rekonq-package-20120923.py b/portage/package/rekonq-package/rekonq-package-20120923.py new file mode 100644 index 000000000..220219f17 --- /dev/null +++ b/portage/package/rekonq-package/rekonq-package-20120923.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +import info +from Package.VirtualPackageBase import * +from Packager.NullsoftInstallerPackager import * + +# This is an example package for building + +class subinfo( info.infoclass ): + def setTargets( self ): + _,gitVersion = portage.getPackageInstance('extragear','rekonq').getPackageVersion() + self.svnTargets[ 'git-' + gitVersion ] = "" + self.svnTargets[ '1.1' ] = "" + self.defaultTarget = '1.1' + + def setDependencies( self ): + self.dependencies[ 'extragear/rekonq' ] = 'default' + +class Package( NullsoftInstallerPackager, VirtualPackageBase ): + def __init__( self, **args ): + self.subinfo = subinfo() + # whitelists = [ 'whitelist.txt' ] + # blacklists = [ NSIPackagerLists.runtimeBlacklist, 'blacklist.txt' ] + VirtualPackageBase.__init__( self ) + # NullsoftInstallerPackager.__init__( self, whitelists,blacklists ) + NullsoftInstallerPackager.__init__( self ) + + self.defines[ "executable" ] = "bin\\rekonq.exe" + # self.defines[ "icon" ] = os.path.join(portage.getPackageInstance('extragear','rekonq').sourceDir(),"icons","rekonq.ico") + + +if __name__ == '__main__': + Package().execute() diff --git a/portage/testing/clamz-src/clamz-0.5-20120913.diff b/portage/testing/clamz-src/clamz-0.5-20120913.diff new file mode 100644 index 000000000..c4e594250 --- /dev/null +++ b/portage/testing/clamz-src/clamz-0.5-20120913.diff @@ -0,0 +1,28 @@ +diff -Nru -x '*~' clamz-0.5.orig/download.c clamz-0.5/download.c +--- clamz-0.5.orig/download.c 2010-04-22 19:20:40.000000000 +0200 ++++ clamz-0.5/download.c 2012-09-13 15:59:12.220908900 +0200 +@@ -32,6 +32,10 @@ + + #include "clamz.h" + ++#ifdef _WIN32 ++#define mkdir(X,Y) mkdir(X) ++#endif ++ + struct _clamz_downloader { + const clamz_config *cfg; + CURL *curl; +diff -Nru -x '*~' clamz-0.5.orig/options.c clamz-0.5/options.c +--- clamz-0.5.orig/options.c 2010-04-19 01:28:51.000000000 +0200 ++++ clamz-0.5/options.c 2012-09-13 15:58:45.976581900 +0200 +@@ -28,6 +28,10 @@ + + #include "clamz.h" + ++#ifdef _WIN32 ++#define mkdir(X,Y) mkdir(X) ++#endif ++ + char *get_config_file_name(const char *subdir, const char *base, + const char *suffix) + { diff --git a/portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py b/portage/testing/clamz-src/clamz-src-0.5.py similarity index 53% copy from portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py copy to portage/testing/clamz-src/clamz-src-0.5.py index d930d7ac4..ae920438c 100644 --- a/portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py +++ b/portage/testing/clamz-src/clamz-src-0.5.py @@ -1,42 +1,48 @@ # -*- coding: utf-8 -*- import info import os import compiler class subinfo(info.infoclass): def setTargets( self ): - self.svnTargets['gitHEAD'] = "git://git.samba.org/ccache.git" - self.patchToApply['gitHEAD'] = ('use_bundled_zlib.diff',1) - self.svnTargets['working'] = "git://git.samba.org/ccache.git||206b0c182b8fbe1e115039507c4356ee1316a7fa" - self.patchToApply['working'] = ('use_bundled_zlib.diff',1) - self.defaultTarget = 'working' + self.targets['0.5'] = "http://clamz.googlecode.com/files/clamz-0.5.tar.gz" + self.targetDigests['0.5'] = '54664614e5098f9e4e9240086745b94fe638b176' + self.targetInstSrc['0.5'] = "clamz-0.5" + self.patchToApply['0.5'] = [("clamz-0.5-20120913.diff",1)] + + self.defaultTarget = '0.5' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' if compiler.isMinGW(): self.buildDependencies['dev-util/autotools'] = 'default' + self.dependencies['testing/gcrypt'] = 'default' + self.dependencies['kdesupport/kdewin'] = 'default' + self.dependencies['win32libs-bin/libcurl'] = 'default' from Package.AutoToolsPackageBase import * from Package.VirtualPackageBase import * class PackageMinGW(AutoToolsPackageBase): def __init__( self, **args ): self.subinfo = subinfo() AutoToolsPackageBase.__init__(self) - os.putenv("CXX","g++") - os.putenv("CC","gcc") + self.subinfo.options.configure.defines = " LIBCURL_CFLAGS='-I.' LIBCURL_LIBS=-lcurl LIBGCRYPT_LIBS='-lgcrypt -lkdewin' LIBGCRYPT_CFLAGS='-I.' " + + def configure(self): + return AutoToolsPackageBase.configure( self,cflags = " -I/r/include/mingw/ ") if compiler.isMinGW(): class Package(PackageMinGW): def __init__( self ): PackageMinGW.__init__( self ) else: class Package(VirtualPackageBase): def __init__( self ): self.subinfo = subinfo() VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/testing/ctags/ctags-5.8-20120828.diff b/portage/testing/ctags/ctags-5.8-20120828.diff new file mode 100644 index 000000000..dcb084e01 --- /dev/null +++ b/portage/testing/ctags/ctags-5.8-20120828.diff @@ -0,0 +1,25 @@ +diff -Nru -x '*~' ctags-5.8.orig/main.c ctags-5.8/main.c +--- ctags-5.8.orig/main.c 2007-06-07 06:35:21.000000000 +0200 ++++ ctags-5.8/main.c 2012-08-15 00:19:20.652057700 +0200 +@@ -525,6 +525,7 @@ + extern int main (int __unused__ argc, char **argv) + { + cookedArgs *args; ++ int i = 0; + #ifdef VMS + extern int getredirection (int *ac, char ***av); + +@@ -550,6 +551,13 @@ + setExecutableName (*argv++); + checkRegex (); + ++ for(i = 0; i < argc - 1; i++) { ++ int arglen = strlen(argv[i]); ++ if(argv[i][arglen - 1] == '\\' || argv[i][arglen - 1] == '/') { ++ argv[i][arglen - 1] = 0; ++ } ++ }; ++ + args = cArgNewFromArgv (argv); + previewFirstOption (args); + testEtagsInvocation (); diff --git a/portage/testing/ctags/ctags-5.8.py b/portage/testing/ctags/ctags-5.8.py new file mode 100644 index 000000000..f369948cd --- /dev/null +++ b/portage/testing/ctags/ctags-5.8.py @@ -0,0 +1,24 @@ +import os +import shutil +import utils +import info + +from Package.CMakePackageBase import * + +class subinfo(info.infoclass): + def setTargets( self ): + self.targets['5.8'] = 'http://downloads.sourceforge.net/ctags/ctags-5.8.tar.gz' + self.patchToApply['5.8'] = [('ctags-5.8-20120828.diff', 1), ('ctags-cmake.diff', 1)] + self.targetDigests['5.8'] = '482da1ecd182ab39bbdc09f2f02c9fba8cd20030' + self.targetInstSrc['5.8'] = 'ctags-5.8' + self.defaultTarget = '5.8' + +class Package(CMakePackageBase): + def __init__( self ): + # we use subinfo for now too + self.subinfo = subinfo() + CMakePackageBase.__init__( self ) + +if __name__ == '__main__': + Package().execute() + diff --git a/portage/testing/ctags/ctags-cmake.diff b/portage/testing/ctags/ctags-cmake.diff new file mode 100644 index 000000000..4e74c94f4 --- /dev/null +++ b/portage/testing/ctags/ctags-cmake.diff @@ -0,0 +1,95 @@ +diff -Nru -x '*~' ctags-5.8.orig/CMakeLists.txt ctags-5.8/CMakeLists.txt +--- ctags-5.8.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ ctags-5.8/CMakeLists.txt 2012-08-28 17:04:45.418045400 +0200 +@@ -0,0 +1,91 @@ ++project(ctags) ++ ++cmake_minimum_required(VERSION 2.8) ++ ++option(BUILD_DEBUG_EXTENSION "build debug extension for ctags" OFF) ++ ++set(ctags_SRCS ++ args.c ++ ant.c ++ asm.c ++ asp.c ++ awk.c ++ basic.c ++ beta.c ++ c.c ++ cobol.c ++ dosbatch.c ++ eiffel.c ++ entry.c ++ erlang.c ++ flex.c ++ fortran.c ++ get.c ++ html.c ++ jscript.c ++ keyword.c ++ lisp.c ++ lregex.c ++ lua.c ++ main.c ++ make.c ++ matlab.c ++ ocaml.c ++ options.c ++ parse.c ++ pascal.c ++ perl.c ++ php.c ++ python.c ++ read.c ++ rexx.c ++ routines.c ++ ruby.c ++ scheme.c ++ sh.c ++ slang.c ++ sml.c ++ sort.c ++ sql.c ++ strlist.c ++ tcl.c ++ tex.c ++ verilog.c ++ vhdl.c ++ vim.c ++ yacc.c ++ vstring.c ++) ++ ++set(environment_SRCS ++ argproc.c ++ mac.c ++ qdos.c ++) ++ ++set(regex_SRCS ++ gnu_regex/regex.c ++) ++ ++if(BUILD_DEBUG_EXTENSION) ++ list(APPEND ctags_SRCS debug.c) ++endif(BUILD_DEBUG_EXTENSION) ++ ++add_definitions(-DHAVE_REGCOMP -D__USE_GNU -Dbool=int -Dfalse=0 -Dtrue=1 -Dstrcasecmp=stricmp) ++ ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996) ++endif(MSVC) ++ ++include_directories(${CMAKE_SOURCE_DIR}/gnu_regex) ++ ++add_executable(ctags ${ctags_SRCS} ${regex_SRCS}) ++ ++add_executable(readtags readtags.c) ++set_target_properties(readtags PROPERTIES COMPILE_FLAGS -DREADTAGS_MAIN) ++ ++install(TARGETS ctags readtags RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++install(FILES ctags.1 DESTINATION share/man/man1) diff --git a/portage/testing/glib-src/glib-2.29.14-20110723.diff b/portage/testing/glib-src/glib-2.29.14-20121010.diff similarity index 69% rename from portage/testing/glib-src/glib-2.29.14-20110723.diff rename to portage/testing/glib-src/glib-2.29.14-20121010.diff index 6dd023e3a..d93683b9a 100644 --- a/portage/testing/glib-src/glib-2.29.14-20110723.diff +++ b/portage/testing/glib-src/glib-2.29.14-20121010.diff @@ -1,110 +1,141 @@ diff -Nru glib-2.29.14.orig/build/win32/vs10/gio.vcxproj glib-2.29.14/build/win32/vs10/gio.vcxproj ---- glib-2.29.14.orig/build/win32/vs10/gio.vcxproj 2011-07-22 09:13:19.000000000 +0200 -+++ glib-2.29.14/build/win32/vs10/gio.vcxproj 2011-07-23 16:39:12.713856200 +0200 +--- glib-2.29.14.orig/build/win32/vs10/gio.vcxproj 2011-07-22 08:13:19.000000000 +0100 ++++ glib-2.29.14/build/win32/vs10/gio.vcxproj 2012-10-10 02:02:23.166508800 +0100 @@ -82,7 +82,7 @@ CompileAsC - zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true +@@ -106,7 +106,7 @@ + CompileAsC + + +- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true +@@ -135,7 +135,7 @@ + CompileAsC + + +- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) ++ zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll + $(IntDir)gio.def + true +@@ -159,7 +159,7 @@ + CompileAsC + + +- zdll.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) + zlib.lib;ws2_32.lib;shlwapi.lib;dnsapi.lib;%(AdditionalDependencies) $(OutDir)$(GlibDllPrefix)$(ProjectName)$(GlibDllSuffix).dll $(IntDir)gio.def true diff -Nru glib-2.29.14.orig/build/win32/vs10/glib.props glib-2.29.14/build/win32/vs10/glib.props --- glib-2.29.14.orig/build/win32/vs10/glib.props 2011-07-13 11:34:24.000000000 +0200 +++ glib-2.29.14/build/win32/vs10/glib.props 2011-07-23 16:39:12.716856300 +0200 @@ -1,7 +1,7 @@  - ..\..\..\..\..\vs10\$(Platform) -+ %INSTALLDIR% ++ $(INSTALLDIR) $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ 2.0 -@@ -467,7 +467,7 @@ - -2-vs10 +@@ -464,10 +464,10 @@ + lib + -2.0-0 + +- -2-vs10 ++ $(GlibSeparateVS10DllPrefix) $(GlibSeparateVS10DllSuffix) - ..\..\..\..\..\vs10\$(Platform) -+ %KDEROOT% ++ $(KDEROOT) <_PropertySheetDisplayName>glibprops @@ -481,7 +481,7 @@ msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - intl.lib;%(AdditionalDependencies) + libintl.lib;%(AdditionalDependencies) $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) diff -Nru glib-2.29.14.orig/gio/gdbusconnection.c glib-2.29.14/gio/gdbusconnection.c --- glib-2.29.14.orig/gio/gdbusconnection.c 2011-07-22 08:29:32.000000000 +0200 +++ glib-2.29.14/gio/gdbusconnection.c 2011-07-23 16:41:00.377014100 +0200 @@ -4970,9 +4970,7 @@ guint32 serial; GVariant *value; -#ifdef G_OS_UNIX GUnixFDList *fd_list; -#endif } CallState; static void @@ -5071,7 +5069,9 @@ g_return_if_fail (method_name != NULL && g_dbus_is_member_name (method_name)); g_return_if_fail (timeout_msec >= 0 || timeout_msec == -1); g_return_if_fail ((parameters == NULL) || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE)); +#ifdef G_OS_UNIX g_return_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list)); +#endif state = g_slice_new0 (CallState); state->simple = g_simple_async_result_new (G_OBJECT (connection), @@ -5182,7 +5182,9 @@ g_return_val_if_fail (method_name != NULL && g_dbus_is_member_name (method_name), NULL); g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL); g_return_val_if_fail ((parameters == NULL) || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL); +#ifdef G_OS_UNIX g_return_val_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list), NULL); +#endif g_return_val_if_fail (error == NULL || *error == NULL, NULL); if (reply_type == NULL) diff -Nru glib-2.29.14.orig/gio/gdbusproxy.c glib-2.29.14/gio/gdbusproxy.c --- glib-2.29.14.orig/gio/gdbusproxy.c 2011-07-22 08:29:32.000000000 +0200 +++ glib-2.29.14/gio/gdbusproxy.c 2011-07-23 16:39:12.734857400 +0200 @@ -2461,7 +2461,9 @@ g_return_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name)); g_return_if_fail (parameters == NULL || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE)); g_return_if_fail (timeout_msec == -1 || timeout_msec >= 0); +#ifdef G_OS_UNIX g_return_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list)); +#endif reply_type = NULL; split_interface_name = NULL; @@ -2590,7 +2592,9 @@ g_return_val_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name), NULL); g_return_val_if_fail (parameters == NULL || g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE), NULL); g_return_val_if_fail (timeout_msec == -1 || timeout_msec >= 0, NULL); +#ifdef G_OS_UNIX g_return_val_if_fail (fd_list == NULL || G_IS_UNIX_FD_LIST (fd_list), NULL); +#endif g_return_val_if_fail (error == NULL || *error == NULL, NULL); reply_type = NULL; diff -Nru glib-2.29.14.orig/gio/glocalfile.c glib-2.29.14/gio/glocalfile.c --- glib-2.29.14.orig/gio/glocalfile.c 2011-07-21 08:37:26.000000000 +0200 +++ glib-2.29.14/gio/glocalfile.c 2011-07-23 16:39:12.737857500 +0200 @@ -1001,8 +1001,6 @@ #elif defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE) fstype = g_strdup(statfs_buffer.f_basetype); -#else - fstype = NULL; #endif #ifndef G_OS_WIN32 diff --git a/portage/testing/glib-src/glib-src-2.29.14.py b/portage/testing/glib-src/glib-src-2.29.14.py index b558beb8f..dde1e7721 100644 --- a/portage/testing/glib-src/glib-src-2.29.14.py +++ b/portage/testing/glib-src/glib-src-2.29.14.py @@ -1,43 +1,55 @@ from Package.CMakePackageBase import * import info class subinfo(info.infoclass): def setTargets( self ): self.targets["2.29.14"] = "http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.29/glib-2.29.14.tar.bz2" self.targetInstSrc["2.29.14"] = "glib-2.29.14" - self.patchToApply["2.29.14"] = ('glib-2.29.14-20110723.diff', '1') + self.patchToApply["2.29.14"] = ('glib-2.29.14-20121010.diff', '1') self.targetDigests['2.29.14'] = 'bd993994e9d6262c19d241f6a6f781f11b840831' self.shortDescription = "The Glib libraries: glib, gio, gthread, gmodule, gobject" self.defaultTarget = "2.29.14" def setDependencies( self ): self.buildDependencies['virtual/bin-base'] = 'default' self.dependencies['testing/libffi-src'] = 'default' self.dependencies['win32libs-bin/gettext'] = 'default' class Package(CMakePackageBase): def __init__(self): self.subinfo = subinfo() CMakePackageBase.__init__( self ) def configure( self ): return True def make( self ): return True def compile( self ): self.enterSourceDir() - cmd = "msbuild build\\win32\\vs10\\glib.sln" + os.putenv( "INSTALLDIR", self.imageDir() ) + configuration = "Release" + if self.buildType() == "Debug": + configuration = "Debug" + platform = "Win32" + if self.buildArchitecture() == "x64": + platform = "x64" + cmd = "msbuild /p:configuration=\""+configuration+"\" /p:platform=\""+platform+"\" build\\win32\\vs10\\glib.sln" return self.system( cmd ) def install( self ): self.enterSourceDir() - os.putenv("INSTALLDIR", self.imageDir() ) - print(self.imageDir()) - cmd = "msbuild /target:install build\\win32\\vs10\\glib.sln" + os.putenv( "INSTALLDIR", self.imageDir() ) + configuration = "Release" + if self.buildType() == "Debug": + configuration = "Debug" + platform = "Win32" + if self.buildArchitecture() == "x64": + platform = "x64" + cmd = "msbuild /p:configuration=\""+configuration+"\" /p:platform=\""+platform+"\" /t:install build\\win32\\vs10\\glib.sln" return self.system( cmd ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/aspell/aspell-0.60.6-3.py b/portage/win32libs-bin/aspell/aspell-0.60.6-3.py deleted file mode 100644 index a64136cda..000000000 --- a/portage/win32libs-bin/aspell/aspell-0.60.6-3.py +++ /dev/null @@ -1,37 +0,0 @@ -# This package-script is automatically updated by the script win32libsupdater.py -# which can be found in your emerge/bin folder. To update this package, run -# win32libsupdater.py (and commit the results) -# based on revision svn1213614 - -from Package.BinaryPackageBase import * -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - repoUrl = 'http://downloads.sourceforge.net/kde-windows' - - for version in [ '0.60.5-1', '0.60.6', '0.60.6-3' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'aspell', version ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'aspell', version , '.tar.bz2.sha1' ) - - self.defaultTarget = '0.60.6-3' - - - def setDependencies( self ): - if not os.getenv( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): - self.buildDependencies[ 'gnuwin32/wget' ] = 'default' - self.runtimeDependencies[ 'win32libs-bin/win_iconv' ] = 'default' - - - def setBuildOptions( self ): - self.disableHostBuild = False - self.disableTargetBuild = True - -class Package(BinaryPackageBase): - def __init__(self): - self.subinfo = subinfo() - BinaryPackageBase.__init__( self ) - -if __name__ == '__main__': - Package().execute() diff --git a/portage/win32libs-bin/boost-bjam/boost-bjam-1.48.0.py b/portage/win32libs-bin/aspell/aspell-0.60.6.1-3.py similarity index 70% copy from portage/win32libs-bin/boost-bjam/boost-bjam-1.48.0.py copy to portage/win32libs-bin/aspell/aspell-0.60.6.1-3.py index 87fb91b0e..5678e3be6 100644 --- a/portage/win32libs-bin/boost-bjam/boost-bjam-1.48.0.py +++ b/portage/win32libs-bin/aspell/aspell-0.60.6.1-3.py @@ -1,38 +1,39 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.48.0' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'boost-bjam', version ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-bjam', version, '.tar.bz2.sha1' ) + for version in [ '0.60.6-3', '0.60.5-1', '0.60.6', '0.60.6.1-3' ]: + self.targets[ version ] = self.getPackage( repoUrl, 'aspell', version ) + self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'aspell', version, '.tar.bz2.sha1' ) - self.shortDescription = '''portable C++ libraries''' + self.shortDescription = '''A powerful spell checker, designed to replace ispell''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '0.60.6.1-3' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/win_iconv' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-bjam/boost-bjam-1.48.0.py b/portage/win32libs-bin/boost-bjam/boost-bjam-1.50.0.py similarity index 82% rename from portage/win32libs-bin/boost-bjam/boost-bjam-1.48.0.py rename to portage/win32libs-bin/boost-bjam/boost-bjam-1.50.0.py index 87fb91b0e..df505986c 100644 --- a/portage/win32libs-bin/boost-bjam/boost-bjam-1.48.0.py +++ b/portage/win32libs-bin/boost-bjam/boost-bjam-1.50.0.py @@ -1,38 +1,39 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.48.0' ]: + for version in [ '1.48.0', '1.47.0', '1.50.0' ]: self.targets[ version ] = self.getPackage( repoUrl, 'boost-bjam', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-bjam', version, '.tar.bz2.sha1' ) self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-graph/boost-graph-1.48.0.py b/portage/win32libs-bin/boost-graph/boost-graph-1.50.0.py similarity index 71% copy from portage/win32libs-bin/boost-graph/boost-graph-1.48.0.py copy to portage/win32libs-bin/boost-graph/boost-graph-1.50.0.py index be8784421..8644abc0b 100644 --- a/portage/win32libs-bin/boost-graph/boost-graph-1.48.0.py +++ b/portage/win32libs-bin/boost-graph/boost-graph-1.50.0.py @@ -1,38 +1,41 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision gita7c2a11bea1203153d7f09b40c407a5c63b464d3 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.48.0' ]: + for version in [ '1.48.0', '1.50.0' ]: self.targets[ version ] = self.getPackage( repoUrl, 'boost-graph', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-graph', version, '.tar.bz2.sha1' ) - self.shortDescription = '''${description}''' + self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-regex' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-bjam' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-system/boost-system-1.48.0.py b/portage/win32libs-bin/boost-headers/boost-headers-1.50.0.py similarity index 81% rename from portage/win32libs-bin/boost-system/boost-system-1.48.0.py rename to portage/win32libs-bin/boost-headers/boost-headers-1.50.0.py index e4d71c53e..d12b44310 100644 --- a/portage/win32libs-bin/boost-system/boost-system-1.48.0.py +++ b/portage/win32libs-bin/boost-headers/boost-headers-1.50.0.py @@ -1,38 +1,38 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.44.0', '1.48.0' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'boost-system', version ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-system', version, '.tar.bz2.sha1' ) + for version in [ '1.48.0', '1.47.0', '1.50.0' ]: + self.targets[ version ] = self.getPackage( repoUrl, 'boost-headers', version ) + self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-headers', version, '.tar.bz2.sha1' ) self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-program-options/boost-program-options-1.48.0.py b/portage/win32libs-bin/boost-program-options/boost-program-options-1.50.0.py similarity index 78% copy from portage/win32libs-bin/boost-program-options/boost-program-options-1.48.0.py copy to portage/win32libs-bin/boost-program-options/boost-program-options-1.50.0.py index 5502c4b8c..5b52a2427 100644 --- a/portage/win32libs-bin/boost-program-options/boost-program-options-1.48.0.py +++ b/portage/win32libs-bin/boost-program-options/boost-program-options-1.50.0.py @@ -1,38 +1,40 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.44.0', '1.48.0' ]: + for version in [ '1.48.0', '1.47.0', '1.44.0', '1.50.0' ]: self.targets[ version ] = self.getPackage( repoUrl, 'boost-program-options', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-program-options', version, '.tar.bz2.sha1' ) self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-bjam' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-python/boost-python-1.48.0-1.py b/portage/win32libs-bin/boost-python/boost-python-1.50.0-1.py similarity index 77% rename from portage/win32libs-bin/boost-python/boost-python-1.48.0-1.py rename to portage/win32libs-bin/boost-python/boost-python-1.50.0-1.py index a67589b97..3485c0087 100644 --- a/portage/win32libs-bin/boost-python/boost-python-1.48.0-1.py +++ b/portage/win32libs-bin/boost-python/boost-python-1.50.0-1.py @@ -1,38 +1,40 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.44.0', '1.48.0-1' ]: + for version in [ '1.48.0-1', '1.47.0', '1.44.0', '1.50.0-1' ]: self.targets[ version ] = self.getPackage( repoUrl, 'boost-python', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-python', version, '.tar.bz2.sha1' ) self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0-1' + self.defaultTarget = '1.50.0-1' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-bjam' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-regex/boost-regex-1.48.0.py b/portage/win32libs-bin/boost-regex/boost-regex-1.50.0.py similarity index 74% rename from portage/win32libs-bin/boost-regex/boost-regex-1.48.0.py rename to portage/win32libs-bin/boost-regex/boost-regex-1.50.0.py index 8e4f7dd22..d5fa93e84 100644 --- a/portage/win32libs-bin/boost-regex/boost-regex-1.48.0.py +++ b/portage/win32libs-bin/boost-regex/boost-regex-1.50.0.py @@ -1,38 +1,40 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision gita7c2a11bea1203153d7f09b40c407a5c63b464d3 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.48.0' ]: + for version in [ '1.48.0', '1.50.0' ]: self.targets[ version ] = self.getPackage( repoUrl, 'boost-regex', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-regex', version, '.tar.bz2.sha1' ) - self.shortDescription = '''${description}''' + self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-bjam' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-headers/boost-headers-1.48.0.py b/portage/win32libs-bin/boost-system/boost-system-1.50.0.py similarity index 72% rename from portage/win32libs-bin/boost-headers/boost-headers-1.48.0.py rename to portage/win32libs-bin/boost-system/boost-system-1.50.0.py index 28d515c49..d60546576 100644 --- a/portage/win32libs-bin/boost-headers/boost-headers-1.48.0.py +++ b/portage/win32libs-bin/boost-system/boost-system-1.50.0.py @@ -1,38 +1,40 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.48.0' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'boost-headers', version, packagetypes=['lib'] ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-headers', version, '.tar.bz2.sha1', packagetypes=['lib'] ) + for version in [ '1.48.0', '1.47.0', '1.44.0', '1.50.0' ]: + self.targets[ version ] = self.getPackage( repoUrl, 'boost-system', version ) + self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-system', version, '.tar.bz2.sha1' ) self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-bjam' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-thread/boost-thread-1.48.0.py b/portage/win32libs-bin/boost-thread/boost-thread-1.50.0.py similarity index 78% rename from portage/win32libs-bin/boost-thread/boost-thread-1.48.0.py rename to portage/win32libs-bin/boost-thread/boost-thread-1.50.0.py index 1a9cd2d94..05b5bbd09 100644 --- a/portage/win32libs-bin/boost-thread/boost-thread-1.48.0.py +++ b/portage/win32libs-bin/boost-thread/boost-thread-1.50.0.py @@ -1,38 +1,40 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.44.0', '1.48.0' ]: + for version in [ '1.48.0', '1.47.0', '1.44.0', '1.50.0' ]: self.targets[ version ] = self.getPackage( repoUrl, 'boost-thread', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-thread', version, '.tar.bz2.sha1' ) self.shortDescription = '''portable C++ libraries''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '1.50.0' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-bjam' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-headers' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/clucene-core/clucene-core-0.9.21b.py b/portage/win32libs-bin/clucene-core/clucene-core-0.9.21b.py deleted file mode 100644 index c6243ecd4..000000000 --- a/portage/win32libs-bin/clucene-core/clucene-core-0.9.21b.py +++ /dev/null @@ -1,36 +0,0 @@ -# This package-script is automatically updated by the script win32libsupdater.py -# which can be found in your emerge/bin folder. To update this package, run -# win32libsupdater.py (and commit the results) -# based on revision 1 - -from Package.BinaryPackageBase import * -import os -import info - -class subinfo( info.infoclass ): - def setTargets( self ): - repoUrl = 'http://downloads.sourceforge.net/kde-windows' - - for version in [ '0.9.21b' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'clucene-core', version, packagetypes=['lib'] ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'clucene-core', version , '.tar.bz2.sha1', packagetypes=['lib'] ) - - self.defaultTarget = '0.9.21b' - - - def setDependencies( self ): - if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): - self.buildDependencies[ 'gnuwin32/wget' ] = 'default' - - - def setBuildOptions( self ): - self.disableHostBuild = False - self.disableTargetBuild = True - -class Package(BinaryPackageBase): - def __init__(self): - self.subinfo = subinfo() - BinaryPackageBase.__init__( self ) - -if __name__ == '__main__': - Package().execute() diff --git a/portage/win32libs-bin/boost-program-options/boost-program-options-1.48.0.py b/portage/win32libs-bin/clucene-core/clucene-core-2.3.3.4.py similarity index 69% rename from portage/win32libs-bin/boost-program-options/boost-program-options-1.48.0.py rename to portage/win32libs-bin/clucene-core/clucene-core-2.3.3.4.py index 5502c4b8c..82fd4cf3a 100644 --- a/portage/win32libs-bin/boost-program-options/boost-program-options-1.48.0.py +++ b/portage/win32libs-bin/clucene-core/clucene-core-2.3.3.4.py @@ -1,38 +1,39 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git300e71be83450407a947422dca7250fbfcbbea49 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.47.0', '1.44.0', '1.48.0' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'boost-program-options', version ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-program-options', version, '.tar.bz2.sha1' ) + for version in [ '0.9.21b', '2.3.3.4' ]: + self.targets[ version ] = self.getPackage( repoUrl, 'clucene-core', version ) + self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'clucene-core', version, '.tar.bz2.sha1' ) - self.shortDescription = '''portable C++ libraries''' + self.shortDescription = '''high-performance, full-featured text search engine (required for compiling strigi)''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '2.3.3.4' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/boost-thread' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/boost-graph/boost-graph-1.48.0.py b/portage/win32libs-bin/mysql/mysql-5.5.25a.py similarity index 71% rename from portage/win32libs-bin/boost-graph/boost-graph-1.48.0.py rename to portage/win32libs-bin/mysql/mysql-5.5.25a.py index be8784421..48da86aae 100644 --- a/portage/win32libs-bin/boost-graph/boost-graph-1.48.0.py +++ b/portage/win32libs-bin/mysql/mysql-5.5.25a.py @@ -1,38 +1,41 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision gita7c2a11bea1203153d7f09b40c407a5c63b464d3 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.48.0' ]: - self.targets[ version ] = self.getPackage( repoUrl, 'boost-graph', version ) - self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'boost-graph', version, '.tar.bz2.sha1' ) + for version in [ '5.5.25a' ]: + self.targets[ version ] = self.getPackage( repoUrl, 'mysql', version ) + self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'mysql', version, '.tar.bz2.sha1' ) self.shortDescription = '''${description}''' - self.defaultTarget = '1.48.0' + self.defaultTarget = '5.5.25a' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): self.buildDependencies[ 'virtual/bin-base' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/zlib' ] = 'default' + self.runtimeDependencies[ 'win32libs-bin/openssl' ] = 'default' + self.runtimeDependencies[ 'virtual/base' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/win_iconv/win_iconv-0.0.3.py b/portage/win32libs-bin/win_iconv/win_iconv-0.0.4.py similarity index 74% rename from portage/win32libs-bin/win_iconv/win_iconv-0.0.3.py rename to portage/win32libs-bin/win_iconv/win_iconv-0.0.4.py index fd3a54b43..9672062c8 100644 --- a/portage/win32libs-bin/win_iconv/win_iconv-0.0.3.py +++ b/portage/win32libs-bin/win_iconv/win_iconv-0.0.4.py @@ -1,36 +1,38 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision gitd35af27bcc6e664356dcf0ecbb677c47a37ba6c7 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '0.0.1', '0.0.2', '0.0.3' ]: + for version in [ '0.0.1', '0.0.3', '0.0.2', '0.0.4' ]: self.targets[ version ] = self.getPackage( repoUrl, 'win_iconv', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'win_iconv', version, '.tar.bz2.sha1' ) - self.defaultTarget = '0.0.3' + self.shortDescription = '''a character set conversion library binary compatible with GNU iconv''' + + self.defaultTarget = '0.0.4' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): - self.buildDependencies[ 'gnuwin32/wget' ] = 'default' + self.buildDependencies[ 'virtual/bin-base' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-bin/zlib/zlib-1.2.5-1.py b/portage/win32libs-bin/zlib/zlib-1.2.6-1.py similarity index 75% rename from portage/win32libs-bin/zlib/zlib-1.2.5-1.py rename to portage/win32libs-bin/zlib/zlib-1.2.6-1.py index e24706564..3ec76caf5 100644 --- a/portage/win32libs-bin/zlib/zlib-1.2.5-1.py +++ b/portage/win32libs-bin/zlib/zlib-1.2.6-1.py @@ -1,36 +1,38 @@ # This package-script is automatically updated by the script win32libsupdater.py # which can be found in your emerge/bin folder. To update this package, run # win32libsupdater.py (and commit the results) -# based on revision git63dbe7b082a3bb52939e8675ceb2a3f33aa5ce56 +# based on revision git517fe8408cfc04c16e44590384bd78d065060149 from Package.BinaryPackageBase import * import os import info class subinfo( info.infoclass ): def setTargets( self ): repoUrl = 'http://downloads.sourceforge.net/kde-windows' - for version in [ '1.2.5', '1.2.3-2', '1.2.5-1' ]: + for version in [ '1.2.5-1', '1.2.3-2', '1.2.5', '1.2.6-1' ]: self.targets[ version ] = self.getPackage( repoUrl, 'zlib', version ) self.targetDigestUrls[ version ] = self.getPackage( repoUrl, 'zlib', version, '.tar.bz2.sha1' ) - self.defaultTarget = '1.2.5-1' + self.shortDescription = '''The zlib compression and decompression library''' + + self.defaultTarget = '1.2.6-1' def setDependencies( self ): if not utils.envAsBool( 'EMERGE_ENABLE_IMPLICID_BUILDTIME_DEPENDENCIES' ): - self.buildDependencies[ 'gnuwin32/wget' ] = 'default' + self.buildDependencies[ 'virtual/bin-base' ] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = True class Package(BinaryPackageBase): def __init__(self): self.subinfo = subinfo() BinaryPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py b/portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py index d930d7ac4..d2b1677f7 100644 --- a/portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py +++ b/portage/win32libs-sources/ccache-src/ccache-src-gitHEAD.py @@ -1,42 +1,42 @@ # -*- coding: utf-8 -*- import info import os import compiler class subinfo(info.infoclass): def setTargets( self ): self.svnTargets['gitHEAD'] = "git://git.samba.org/ccache.git" - self.patchToApply['gitHEAD'] = ('use_bundled_zlib.diff',1) self.svnTargets['working'] = "git://git.samba.org/ccache.git||206b0c182b8fbe1e115039507c4356ee1316a7fa" self.patchToApply['working'] = ('use_bundled_zlib.diff',1) self.defaultTarget = 'working' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' if compiler.isMinGW(): self.buildDependencies['dev-util/autotools'] = 'default' from Package.AutoToolsPackageBase import * from Package.VirtualPackageBase import * class PackageMinGW(AutoToolsPackageBase): def __init__( self, **args ): self.subinfo = subinfo() AutoToolsPackageBase.__init__(self) + self.subinfo.options.configure.defines = "--with-bundled-zlib " os.putenv("CXX","g++") os.putenv("CC","gcc") if compiler.isMinGW(): class Package(PackageMinGW): def __init__( self ): PackageMinGW.__init__( self ) else: class Package(VirtualPackageBase): def __init__( self ): self.subinfo = subinfo() VirtualPackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/clucene-core-src/clucene-core-2.3.3.4-20120704.diff b/portage/win32libs-sources/clucene-core-src/clucene-core-2.3.3.4-20120704.diff index d78a17159..9014c8ca3 100644 --- a/portage/win32libs-sources/clucene-core-src/clucene-core-2.3.3.4-20120704.diff +++ b/portage/win32libs-sources/clucene-core-src/clucene-core-2.3.3.4-20120704.diff @@ -1,85 +1,90 @@ diff -Nru -x '*~' clucene-core-2.3.3.4.orig/src/core/CMakeLists.txt clucene-core-2.3.3.4/src/core/CMakeLists.txt --- clucene-core-2.3.3.4.orig/src/core/CMakeLists.txt 2011-03-17 01:21:07.000000000 +0100 -+++ clucene-core-2.3.3.4/src/core/CMakeLists.txt 2012-07-15 14:23:19.387373100 +0200 ++++ clucene-core-2.3.3.4/src/core/CMakeLists.txt 2013-01-03 13:48:45.416526300 +0100 @@ -282,5 +282,7 @@ #and install library install(TARGETS clucene-core - DESTINATION ${LIB_DESTINATION} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib COMPONENT runtime ) diff -Nru -x '*~' clucene-core-2.3.3.4.orig/src/shared/CLucene/config/_threads.h clucene-core-2.3.3.4/src/shared/CLucene/config/_threads.h --- clucene-core-2.3.3.4.orig/src/shared/CLucene/config/_threads.h 2011-03-17 01:21:07.000000000 +0100 -+++ clucene-core-2.3.3.4/src/shared/CLucene/config/_threads.h 2012-07-15 14:46:32.458028100 +0200 ++++ clucene-core-2.3.3.4/src/shared/CLucene/config/_threads.h 2013-01-03 13:48:45.420528900 +0100 @@ -35,8 +35,8 @@ __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(); #ifdef _M_X64 - __declspec(dllimport) long long __stdcall _InterlockedIncrement64(__inout long long volatile*); - __declspec(dllimport) long long __stdcall _InterlockedDecrement64(__inout long long volatile*); + long long __stdcall _InterlockedIncrement64(long long volatile*); + long long __stdcall _InterlockedDecrement64(long long volatile*); #else __declspec(dllimport) long __stdcall InterlockedIncrement(long volatile*); __declspec(dllimport) long __stdcall InterlockedDecrement(long volatile*); diff -Nru -x '*~' clucene-core-2.3.3.4.orig/src/shared/cmake/MacroCheckGccVisibility.cmake clucene-core-2.3.3.4/src/shared/cmake/MacroCheckGccVisibility.cmake --- clucene-core-2.3.3.4.orig/src/shared/cmake/MacroCheckGccVisibility.cmake 2011-03-17 01:21:07.000000000 +0100 -+++ clucene-core-2.3.3.4/src/shared/cmake/MacroCheckGccVisibility.cmake 2012-07-15 14:23:19.400373100 +0200 ++++ clucene-core-2.3.3.4/src/shared/cmake/MacroCheckGccVisibility.cmake 2013-01-03 13:48:45.424529900 +0100 @@ -13,7 +13,7 @@ check_cxx_compiler_flag(-fvisibility=hidden ${GccVisibility}) # get the gcc version - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info) + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info) string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") if (NOT _gcc_version) @@ -37,7 +37,7 @@ set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) if (GCC_IS_NEWER_THAN_4_1) - exec_program(${CMAKE_C_COMPILER} ARGS -v OUTPUT_VARIABLE _gcc_alloc_info) + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") endif (GCC_IS_NEWER_THAN_4_1) diff -Nru -x '*~' clucene-core-2.3.3.4.orig/src/shared/CMakeLists.txt clucene-core-2.3.3.4/src/shared/CMakeLists.txt --- clucene-core-2.3.3.4.orig/src/shared/CMakeLists.txt 2011-03-17 01:21:07.000000000 +0100 -+++ clucene-core-2.3.3.4/src/shared/CMakeLists.txt 2012-07-15 15:42:02.800162600 +0200 ++++ clucene-core-2.3.3.4/src/shared/CMakeLists.txt 2013-01-03 16:04:53.574225400 +0100 @@ -147,8 +147,8 @@ CHOOSE_FUNCTION(_mkdir "_mkdir((const char*)0)" "#define _mkdir(x) mkdir(x,0777)") CHOOSE_FUNCTION(SLEEPFUNCTION "usleep;Sleep(0);_sleep") -CHOOSE_FUNCTION(_snprintf "snprintf;_snprintf") -CHOOSE_FUNCTION(_snwprintf "snwprintf;_snwprintf") +#CHOOSE_FUNCTION(_snprintf "snprintf;_snprintf") +#CHOOSE_FUNCTION(_snwprintf "snwprintf;_snwprintf") ######################################################################## # test for symbols -@@ -213,10 +213,11 @@ +@@ -211,12 +211,13 @@ + ######################################################################## + #check for pthreads - IF ( CMAKE_USE_WIN32_THREADS_INIT ) - SET ( _CL_HAVE_WIN32_THREADS 1 ) +-IF ( CMAKE_USE_WIN32_THREADS_INIT ) +- SET ( _CL_HAVE_WIN32_THREADS 1 ) -ENDIF ( CMAKE_USE_WIN32_THREADS_INIT ) -+ELSE( CMAKE_USE_WIN32_THREADS_INIT ) IF ( CMAKE_USE_PTHREADS_INIT ) SET ( _CL_HAVE_PTHREAD 1 ) - ENDIF (CMAKE_USE_PTHREADS_INIT) -+ENDIF ( CMAKE_USE_WIN32_THREADS_INIT ) +-ENDIF (CMAKE_USE_PTHREADS_INIT) ++ELSE (CMAKE_USE_PTHREADS_INIT) ++IF ( CMAKE_USE_WIN32_THREADS_INIT ) ++ SET ( _CL_HAVE_WIN32_THREADS 1 ) ++ENDIF( CMAKE_USE_WIN32_THREADS_INIT ) ++ENDIF ( CMAKE_USE_PTHREADS_INIT ) IF ( CMAKE_USE_SPROC_INIT OR CMAKE_HP_PTHREADS_INIT ) MESSAGE(FATAL_ERROR "Threads library not implemented") ENDIF( CMAKE_USE_SPROC_INIT OR CMAKE_HP_PTHREADS_INIT ) @@ -340,7 +341,9 @@ ENDIF ( EXTRA_LIBS ) install(TARGETS clucene-shared - DESTINATION ${LIB_DESTINATION} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib COMPONENT development ) IF ( BUILD_STATIC_LIBRARIES ) diff --git a/portage/win32libs-sources/clucene-core-src/clucene-core-src-2.3.3.4-20120725.py b/portage/win32libs-sources/clucene-core-src/clucene-core-src-2.3.3.4-20120725.py index 039445b37..5660f0de6 100644 --- a/portage/win32libs-sources/clucene-core-src/clucene-core-src-2.3.3.4-20120725.py +++ b/portage/win32libs-sources/clucene-core-src/clucene-core-src-2.3.3.4-20120725.py @@ -1,70 +1,70 @@ import info import emergePlatform class subinfo (info.infoclass): def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' self.hardDependencies['win32libs-bin/boost-thread'] = 'default' if emergePlatform.isCrossCompilingEnabled(): self.dependencies['libs/qt'] = 'default' def setTargets( self ): for ver in ['0.9.16a','0.9.20','0.9.21b']: self.targets[ver] = "http://downloads.sourceforge.net/sourceforge/clucene/clucene-core-%s.tar.bz2" % ver self.targetInstSrc[ver] = os.path.join( "clucene-core-%s" % ver, "src" ) if emergePlatform.isCrossCompilingEnabled(): self.patchToApply['0.9.21b'] = ( "clucene-core-0.9.21b-20101110.diff", 2 ) else: self.patchToApply['0.9.21b'] = ( "0.9.21.diff", 2 ) self.targetDigests['0.9.21b'] = '8bc505b64f82723c2dc901036cb0607500870973' self.targets['2.3.3.4'] = "http://garr.dl.sourceforge.net/project/clucene/clucene-core-unstable/2.3/clucene-core-2.3.3.4.tar.gz" self.targetDigests['2.3.3.4'] = '76d6788e747e78abb5abf8eaad78d3342da5f2a4' self.targetInstSrc['2.3.3.4'] = "clucene-core-2.3.3.4" - self.patchToApply['2.3.3.4'] = ('clucene-core-2.3.3.4-20120704.diff',1) + self.patchToApply['2.3.3.4'] = [('clucene-core-2.3.3.4-20120704.diff',1)] self.shortDescription = "high-performance, full-featured text search engine (required for compiling strigi)" self.defaultTarget = '2.3.3.4' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = False from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) self.subinfo.options.configure.defines = "-DCLUCENE_VERSION:STRING="+self.buildTarget if self.buildTarget.startswith('0.9'): self.subinfo.options.configure.configurePath = "src" def unpack( self ): if not CMakePackageBase.unpack( self ): return True if not self.buildTarget.startswith('0.9'): return True; if not emergePlatform.isCrossCompilingEnabled(): # we have an own cmake script - copy it to the right place cmake_script = "" if self.buildTarget == '0.9.16a': cmake_script = os.path.join( self.packageDir() , "CMakeLists-0.9.16.txt" ) else: cmake_script = os.path.join( self.packageDir() , "CMakeLists-0.9.20.txt" ) cmake_dest = os.path.join( self.sourceDir(), "CMakeLists.txt" ) utils.copyFile( cmake_script, cmake_dest ) cmake_script = os.path.join( self.packageDir() , "clucene-config.h.cmake" ) cmake_dest = os.path.join( self.sourceDir(), "Clucene", "clucene-config.h.cmake" ) utils.copyFile( cmake_script, cmake_dest ) return True if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/cryptopp-src/cryptopp-5.6.1-gcc-4.7.0.patch b/portage/win32libs-sources/cryptopp-src/cryptopp-5.6.1-gcc-4.7.0.patch new file mode 100644 index 000000000..968dda185 --- /dev/null +++ b/portage/win32libs-sources/cryptopp-src/cryptopp-5.6.1-gcc-4.7.0.patch @@ -0,0 +1,97 @@ +--- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300 ++++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +0200 +@@ -58,7 +58,7 @@ + Element g[3]={b, a}; + unsigned int i0=0, i1=1, i2=2; + +- while (!Equal(g[i1], this->Identity())) ++ while (!this->Equal(g[i1], this->Identity())) + { + g[i2] = Mod(g[i0], g[i1]); + unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; +--- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300 ++++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +0200 +@@ -435,7 +435,7 @@ + StringSource ssG(param.g, true, new HexDecoder); + Element G; + bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); +- SetSubgroupGenerator(G); ++ this->SetSubgroupGenerator(G); + assert(result); + + StringSource ssN(param.n, true, new HexDecoder); +@@ -591,7 +591,7 @@ + if (level >= 2 && pass) + { + const Integer &q = GetSubgroupOrder(); +- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); ++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); + pass = pass && IsIdentity(gq); + } + return pass; +@@ -629,7 +629,7 @@ + typename EC::Point P; + if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) + BERDecodeError(); +- SetPublicElement(P); ++ this->SetPublicElement(P); + } + + template +--- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300 ++++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +0200 +@@ -43,7 +43,7 @@ + void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) + { + this->m_groupPrecomputation.SetCurve(ec); +- SetSubgroupGenerator(G); ++ this->SetSubgroupGenerator(G); + m_n = n; + m_k = k; + } +@@ -145,9 +145,9 @@ + typedef typename EC::Point Element; + + void Initialize(const DL_GroupParameters_EC ¶ms, const Element &Q) +- {this->AccessGroupParameters() = params; SetPublicElement(Q);} ++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} + void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) +- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} ++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} + + // X509PublicKey + void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); +@@ -166,9 +166,9 @@ + void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) + {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} + void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC ¶ms) +- {GenerateRandom(rng, params);} ++ {this->GenerateRandom(rng, params);} + void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) +- {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} ++ {this->GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} + + // PKCS8PrivateKey + void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); +--- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300 ++++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200 +@@ -422,7 +422,7 @@ + { + this->ThrowIfInvalidTruncatedSize(size); + +- PadLastBlock(this->BLOCKSIZE, 0x01); ++ this->PadLastBlock(this->BLOCKSIZE, 0x01); + + HashEndianCorrectedBlock(this->m_data); + +--- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200 ++++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200 +@@ -89,7 +89,7 @@ + + pointer allocate(size_type n, const void * = NULL) + { +- CheckSize(n); ++ this->CheckSize(n); + if (n == 0) + return NULL; + diff --git a/portage/win32libs-sources/cryptopp-src/cryptopp-src-5.6.1-1.py b/portage/win32libs-sources/cryptopp-src/cryptopp-src-5.6.1-1.py index 8ad5b96fc..bbf60bfd4 100644 --- a/portage/win32libs-sources/cryptopp-src/cryptopp-src-5.6.1-1.py +++ b/portage/win32libs-sources/cryptopp-src/cryptopp-src-5.6.1-1.py @@ -1,38 +1,38 @@ import os import shutil import utils import info import emergePlatform class subinfo( info.infoclass ): def setTargets( self ): self.targets[ '561' ] = 'http://www.cryptopp.com/cryptopp561.zip' self.patchToApply[ '561' ] = [('cmake.diff', 1), - ('workaround_ice_31690.diff', 1)] + ('workaround_ice_31690.diff', 1),("cryptopp-5.6.1-gcc-4.7.0.patch",1)] self.targetDigests['561'] = '31dbb456c21f50865218c57b7eaf4c955a222ba1' self.shortDescription = "Crypto++ Library is a free C++ class library of cryptographic schemes" self.defaultTarget = '561' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' def setBuildOptions( self ): self.disableHostBuild = False self.disableTargetBuild = False from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__(self) self.subinfo.options.configure.defines = "-DCRYPTOPP_BUILD_STATIC_LIBS=ON -DCRYPTOPP_BUILD_SHARED_LIBS=OFF -DCRYPTOPP_BUILD_TESTS=OFF" if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/gettext-src/gettext-0.18-20100521.diff b/portage/win32libs-sources/gettext-src/gettext-0.18-20121007.diff similarity index 99% rename from portage/win32libs-sources/gettext-src/gettext-0.18-20100521.diff rename to portage/win32libs-sources/gettext-src/gettext-0.18-20121007.diff index 9f0911587..f4e876d8d 100644 --- a/portage/win32libs-sources/gettext-src/gettext-0.18-20100521.diff +++ b/portage/win32libs-sources/gettext-src/gettext-0.18-20121007.diff @@ -1,2124 +1,2125 @@ diff -Nru -x '*~' gettext-0.18.orig/cmake/Modules/Findiconv.cmake gettext-0.18/cmake/Modules/Findiconv.cmake --- gettext-0.18.orig/cmake/Modules/Findiconv.cmake 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/cmake/Modules/Findiconv.cmake 2012-04-21 23:16:04.131271700 +0200 @@ -0,0 +1,60 @@ +# - Try to find Iconv +# Once done this will define +# +# ICONV_FOUND - system has Iconv +# ICONV_INCLUDE_DIR - the Iconv include directory +# ICONV_LIBRARIES - Link these to use Iconv +# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const +# +include(CheckCXXSourceCompiles) + +IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + # Already in cache, be silent + SET(ICONV_FIND_QUIETLY TRUE) +ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + +FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + +FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c) + +IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + SET(ICONV_FOUND TRUE) +ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + +set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) +set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) +IF(ICONV_FOUND) + check_cxx_source_compiles(" + #include + int main(){ + iconv_t conv = 0; + const char* in = 0; + size_t ilen = 0; + char* out = 0; + size_t olen = 0; + iconv(conv, &in, &ilen, &out, &olen); + return 0; + } +" ICONV_SECOND_ARGUMENT_IS_CONST ) + IF(ICONV_SECOND_ARGUMENT_IS_CONST) + SET(ICONV_CONST "const") + ENDIF(ICONV_SECOND_ARGUMENT_IS_CONST) +ENDIF(ICONV_FOUND) +set(CMAKE_REQUIRED_INCLUDES) +set(CMAKE_REQUIRED_LIBRARIES) + +IF(ICONV_FOUND) + IF(NOT ICONV_FIND_QUIETLY) + MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") + ENDIF(NOT ICONV_FIND_QUIETLY) +ELSE(ICONV_FOUND) + IF(Iconv_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Iconv") + ENDIF(Iconv_FIND_REQUIRED) +ENDIF(ICONV_FOUND) + +MARK_AS_ADVANCED( + ICONV_INCLUDE_DIR + ICONV_LIBRARIES + ICONV_SECOND_ARGUMENT_IS_CONST +) diff -Nru -x '*~' gettext-0.18.orig/cmake/Modules/FindWcecompat.cmake gettext-0.18/cmake/Modules/FindWcecompat.cmake --- gettext-0.18.orig/cmake/Modules/FindWcecompat.cmake 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/cmake/Modules/FindWcecompat.cmake 2012-04-21 23:16:04.125271400 +0200 @@ -0,0 +1,33 @@ +# Try to find Wcecompat functionality +# Once done this will define +# +# WCECOMPAT_FOUND - system has Wcecompat +# WCECOMPAT_INCLUDE_DIR - Wcecompat include directory +# WCECOMPAT_LIBRARIES - Libraries needed to use Wcecompat +# +# Copyright (c) 2010, Andreas Holzammer, +# +# Redistribution and use is allowed according to the terms of the BSD license. + +if(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND) + set(Wcecompat_FIND_QUIETLY TRUE) +endif(WCECOMPAT_INCLUDE_DIR AND WCECOMPAT_LIB_FOUND) + +find_path(WCECOMPAT_INCLUDE_DIR errno.h PATH_SUFFIXES wcecompat) + +set(WCECOMPAT_LIB_FOUND FALSE) + +if(WCECOMPAT_INCLUDE_DIR) + find_library(WCECOMPAT_LIBRARIES NAMES wcecompat wcecompatex ) + if(WCECOMPAT_LIBRARIES) + set(WCECOMPAT_LIB_FOUND TRUE) + endif(WCECOMPAT_LIBRARIES) +endif(WCECOMPAT_INCLUDE_DIR) + +# I have no idea what this is about, but it seems to be used quite often, so I add this here +set(WCECOMPAT_CONST const) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Wcecompat DEFAULT_MSG WCECOMPAT_LIBRARIES WCECOMPAT_LIB_FOUND) + +mark_as_advanced(WCECOMPAT_INCLUDE_DIR WCECOMPAT_LIBRARIES WCECOMPAT_CONST WCECOMPAT_LIB_FOUND) diff -Nru -x '*~' gettext-0.18.orig/cmake/Modules/MacroBoolTo01.cmake gettext-0.18/cmake/Modules/MacroBoolTo01.cmake --- gettext-0.18.orig/cmake/Modules/MacroBoolTo01.cmake 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/cmake/Modules/MacroBoolTo01.cmake 2012-04-21 23:16:04.134271900 +0200 @@ -0,0 +1,20 @@ +# MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN ) +# This macro evaluates its first argument +# and sets all the given vaiables either to 0 or 1 +# depending on the value of the first one + +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +MACRO(MACRO_BOOL_TO_01 FOUND_VAR ) + FOREACH (_current_VAR ${ARGN}) + IF(${FOUND_VAR}) + SET(${_current_VAR} 1) + ELSE(${FOUND_VAR}) + SET(${_current_VAR} 0) + ENDIF(${FOUND_VAR}) + ENDFOREACH(_current_VAR) +ENDMACRO(MACRO_BOOL_TO_01) diff -Nru -x '*~' gettext-0.18.orig/CMakeLists.txt gettext-0.18/CMakeLists.txt --- gettext-0.18.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/CMakeLists.txt 2012-04-22 00:00:31.473835000 +0200 @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 2.6) + +project(gettext) + +set(PACKAGE_VERSION_MAJOR 0) +set(PACKAGE_VERSION_MINOR 18) +set(PACKAGE_VERSION_SUBMINOR 0) + +set(PACKAGE_VERSION_STRING "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}") + +add_definitions(-DPACKAGE_VERSION_MAJOR=${PACKAGE_VERSION_MAJOR} -DPACKAGE_VERSION_MINOR=${PACKAGE_VERSION_MINOR} -DPACKAGE_VERSION_SUBMINOR=${PACKAGE_VERSION_SUBMINOR} -DPACKAGE_VERSION_STRING="${PACKAGE_VERSION_STRING}") + +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH}) + +include(MacroBoolTo01) + +if(WINCE) + find_package(Wcecompat REQUIRED) + include_directories(${WCECOMPAT_INCLUDE_DIR}) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${WCECOMPAT_INCLUDE_DIR}) + set(LIBRARY_TYPE STATIC) + add_definitions(-DGETTEXT_STATIC_LIBS) + add_definitions(-DWCECOMPAT_USE_DLMALLOC) +else(WINCE) + set(LIBRARY_TYPE SHARED) +endif(WINCE) + +find_package(iconv) +set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ICONV_INCLUDE_DIR}) +set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ICONV_LIBRARIES}) + +include_directories(${ICONV_INCLUDE_DIR}) + +if(MSVC) + add_definitions(-wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS) +endif(MSVC) + +add_subdirectory(gettext-runtime) +#add_subdirectory(gettext-tools) diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/CMakeLists.txt gettext-0.18/gettext-runtime/CMakeLists.txt --- gettext-0.18.orig/gettext-runtime/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/gettext-runtime/CMakeLists.txt 2012-04-21 23:16:04.138272100 +0200 @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 2.6) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) + +project(gettext-runtime) + +include(ConfigureChecks.cmake) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + +#add_subdirectory(doc) +add_subdirectory(intl) +#add_subdirectory(intl-java) +#add_subdirectory(intl-csharp) +#add_subdirectory(gnulib-lib) +#add_subdirectory(src) +#add_subdirectory(po) +#add_subdirectory(man) +#add_subdirectory(m4) +#add_subdirectory(tests) + + + diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/config.h.cmake gettext-0.18/gettext-runtime/config.h.cmake --- gettext-0.18.orig/gettext-runtime/config.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/gettext-runtime/config.h.cmake 2012-04-21 23:16:04.150272800 +0200 @@ -0,0 +1,1270 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if the compiler is building for multiple architectures of Apple + platforms at once. */ +#cmakedefine AA_APPLE_UNIVERSAL_BUILD + +/* Define to the number of bits in type 'ptrdiff_t'. */ +#cmakedefine BITSIZEOF_PTRDIFF_T @BITSIZEOF_PTRDIFF_T@ + +/* Define to the number of bits in type 'sig_atomic_t'. */ +#cmakedefine BITSIZEOF_SIG_ATOMIC_T @BITSIZEOF_SIG_ATOMIC_T@ + +/* Define to the number of bits in type 'size_t'. */ +#cmakedefine BITSIZEOF_SIZE_T @BITSIZEOF_SIZE_T@ + +/* Define to the number of bits in type 'wchar_t'. */ +#cmakedefine BITSIZEOF_WCHAR_T @BITSIZEOF_WCHAR_T@ + +/* Define to the number of bits in type 'wint_t'. */ +#cmakedefine BITSIZEOF_WINT_T @BITSIZEOF_WINT_T@ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#cmakedefine CRAY_STACKSEG_END + +/* Define if mono is the preferred C# implementation. */ +#cmakedefine CSHARP_CHOICE_MONO + +/* Define if pnet is the preferred C# implementation. */ +#cmakedefine CSHARP_CHOICE_PNET + +/* Define to 1 if using `alloca.c'. */ +#cmakedefine C_ALLOCA + +/* Define to 1 if // is a file system root distinct from /. */ +#cmakedefine DOUBLE_SLASH_IS_DISTINCT_ROOT + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#cmakedefine ENABLE_NLS + +/* Define to 1 if the package shall run at any location in the file system. */ +#cmakedefine ENABLE_RELOCATABLE + +/* Define on systems for which file names may have a so-called `drive letter' + prefix, define this to compute the length of that prefix, including the + colon. */ +#cmakedefine FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX + +/* Define if the backslash character may also serve as a file name component + separator. */ +#cmakedefine FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR @FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR@ + +/* Define if a drive letter prefix denotes a relative path if it is not + followed by a file name component separator. */ +#cmakedefine FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE + +/* Define to 1 if realpath() can malloc memory, always gives an absolute path, + and handles trailing slash correctly. */ +#cmakedefine FUNC_REALPATH_WORKS + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module canonicalize-lgpl shall be considered present. */ +#cmakedefine GNULIB_CANONICALIZE_LGPL + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module fwriteerror shall be considered present. */ +#cmakedefine GNULIB_FWRITEERROR + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module sigpipe shall be considered present. */ +#cmakedefine GNULIB_SIGPIPE + +/* Define to 1 when the gnulib module canonicalize_file_name should be tested. + */ +#cmakedefine GNULIB_TEST_CANONICALIZE_FILE_NAME + +/* Define to 1 when the gnulib module environ should be tested. */ +#cmakedefine GNULIB_TEST_ENVIRON + +/* Define to 1 when the gnulib module getopt-gnu should be tested. */ +#cmakedefine GNULIB_TEST_GETOPT_GNU + +/* Define to 1 when the gnulib module lstat should be tested. */ +#cmakedefine GNULIB_TEST_LSTAT + +/* Define to 1 when the gnulib module malloc-posix should be tested. */ +#cmakedefine GNULIB_TEST_MALLOC_POSIX + +/* Define to 1 when the gnulib module mbrtowc should be tested. */ +#cmakedefine GNULIB_TEST_MBRTOWC + +/* Define to 1 when the gnulib module mbsinit should be tested. */ +#cmakedefine GNULIB_TEST_MBSINIT + +/* Define to 1 when the gnulib module mbslen should be tested. */ +#cmakedefine GNULIB_TEST_MBSLEN + +/* Define to 1 when the gnulib module mbsstr should be tested. */ +#cmakedefine GNULIB_TEST_MBSSTR + +/* Define to 1 when the gnulib module memchr should be tested. */ +#cmakedefine GNULIB_TEST_MEMCHR + +/* Define to 1 when the gnulib module readlink should be tested. */ +#cmakedefine GNULIB_TEST_READLINK + +/* Define to 1 when the gnulib module realpath should be tested. */ +#cmakedefine GNULIB_TEST_REALPATH + +/* Define to 1 when the gnulib module sigprocmask should be tested. */ +#cmakedefine GNULIB_TEST_SIGPROCMASK + +/* Define to 1 when the gnulib module stat should be tested. */ +#cmakedefine GNULIB_TEST_STAT + +/* Define to 1 when the gnulib module strerror should be tested. */ +#cmakedefine GNULIB_TEST_STRERROR + +/* Define to 1 when the gnulib module strnlen should be tested. */ +#cmakedefine GNULIB_TEST_STRNLEN + +/* Define to 1 when the gnulib module wcwidth should be tested. */ +#cmakedefine GNULIB_TEST_WCWIDTH + +/* Define to 1 if you have `alloca', as a function or macro. */ +#cmakedefine HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#cmakedefine HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the `argz_count' function. */ +#cmakedefine HAVE_ARGZ_COUNT 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_ARGZ_H 1 + +/* Define to 1 if you have the `argz_next' function. */ +#cmakedefine HAVE_ARGZ_NEXT 1 + +/* Define to 1 if you have the `argz_stringify' function. */ +#cmakedefine HAVE_ARGZ_STRINGIFY 1 + +/* Define to 1 if you have the `asprintf' function. */ +#cmakedefine HAVE_ASPRINTF 1 + +/* Define to 1 if you have the `atexit' function. */ +#cmakedefine HAVE_ATEXIT 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_BP_SYM_H 1 + +/* Define to 1 if the compiler understands __builtin_expect. */ +#cmakedefine HAVE_BUILTIN_EXPECT 1 + +/* Define to 1 if you have the `canonicalize_file_name' function. */ +#cmakedefine HAVE_CANONICALIZE_FILE_NAME 1 + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#cmakedefine HAVE_CFLOCALECOPYCURRENT 1 + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#cmakedefine HAVE_CFPREFERENCESCOPYAPPVALUE 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#cmakedefine HAVE_DCGETTEXT + +/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_CLEARERR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_FEOF_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FERROR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FFLUSH_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FGETS_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FPUTC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FPUTS_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FREAD_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_FWRITE_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_GETCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#cmakedefine HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_GETOPT_CLIP 1 + +/* Define to 1 if you have the declaration of `optreset', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_OPTRESET 1 + +/* Define to 1 if you have the declaration of `program_invocation_name', and + to 0 if you don't. */ +#cmakedefine HAVE_DECL_PROGRAM_INVOCATION_NAME 1 + +/* Define to 1 if you have the declaration of `program_invocation_short_name', + and to 0 if you don't. */ +#cmakedefine HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 1 + +/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if + you don't. */ +#cmakedefine HAVE_DECL_PUTCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_PUTC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_STRERROR 1 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_STRNLEN 1 + +/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL_WCWIDTH 1 + +/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL__SNPRINTF 1 + +/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you + don't. */ +#cmakedefine HAVE_DECL__SNWPRINTF 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_DLFCN_H 1 + +/* Define if you have the declaration of environ. */ +#cmakedefine HAVE_ENVIRON_DECL 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `fwprintf' function. */ +#cmakedefine HAVE_FWPRINTF 1 + +/* Define to 1 if you have the `getcwd' function. */ +#cmakedefine HAVE_GETCWD 1 + +/* Define to 1 if you have the `_getcwd' function. */ +#cmakedefine HAVE_GETCWD2 1 + +/* Define to 1 if you have the `getegid' function. */ +#cmakedefine HAVE_GETEGID 1 + +/* Define to 1 if you have the `geteuid' function. */ +#cmakedefine HAVE_GETEUID 1 + +/* Define to 1 if you have the `getgid' function. */ +#cmakedefine HAVE_GETGID 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long_only' function. */ +#cmakedefine HAVE_GETOPT_LONG_ONLY 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#cmakedefine HAVE_GETPAGESIZE 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#cmakedefine HAVE_GETTEXT 1 + +/* Define to 1 if you have the `getuid' function. */ +#cmakedefine HAVE_GETUID 1 + +/* Define if you have the iconv() function and it works. */ +#cmakedefine HAVE_ICONV @HAVE_ICONV@ + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_ICONV_H 1 + +/* Define if you have the 'intmax_t' type in or . */ +#cmakedefine HAVE_INTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_INTTYPES_H 1 + +/* Define if exists, doesn't clash with , and + declares uintmax_t. */ +#cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1 + +/* Define to 1 if you have the `iswblank' function. */ +#cmakedefine HAVE_ISWBLANK 1 + +/* Define to 1 if you have the `iswcntrl' function. */ +#cmakedefine HAVE_ISWCNTRL 1 + +/* Define if you have and nl_langinfo(CODESET). */ +#cmakedefine HAVE_LANGINFO_CODESET + +/* Define if your file defines LC_MESSAGES. */ +#cmakedefine HAVE_LC_MESSAGES + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type `long long int'. */ +#cmakedefine HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the `lstat' function. */ +#cmakedefine HAVE_LSTAT 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MACH_O_DYLD_H 1 + +/* Define if the 'malloc' function is POSIX compliant. */ +#cmakedefine HAVE_MALLOC_POSIX + +/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including + config.h and . */ +#cmakedefine HAVE_MAP_ANONYMOUS 1 + +/* Define to 1 if you have the `mbrtowc' function. */ +#cmakedefine HAVE_MBRTOWC 1 + +/* Define to 1 if you have the `mbsinit' function. */ +#cmakedefine HAVE_MBSINIT 1 + +/* Define to 1 if you have the `mbslen' function. */ +#cmakedefine HAVE_MBSLEN 1 + +/* Define to 1 if declares mbstate_t. */ +#cmakedefine HAVE_MBSTATE_T 1 + +/* Define to 1 if you have the `memchr' function. */ +#cmakedefine HAVE_MEMCHR 1 + +/* Define to 1 if you have the `memmove' function. */ +#cmakedefine HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +#cmakedefine HAVE_MEMPCPY 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#cmakedefine HAVE_MMAP 1 + +/* Define to 1 if you have the `mprotect' function. */ +#cmakedefine HAVE_MPROTECT 1 + +/* Define to 1 if you have the `munmap' function. */ +#cmakedefine HAVE_MUNMAP 1 + +/* Define to 1 if you have the `newlocale' function. */ +#cmakedefine HAVE_NEWLOCALE 1 + +/* Define to 1 if you have the `pathconf' function. */ +#cmakedefine HAVE_PATHCONF 1 + +/* Define if your printf() function supports format strings with positions. */ +#cmakedefine HAVE_POSIX_PRINTF + +/* Define if the defines PTHREAD_MUTEX_RECURSIVE. */ +#cmakedefine HAVE_PTHREAD_MUTEX_RECURSIVE + +/* Define if the POSIX multithreading library has read/write locks. */ +#cmakedefine HAVE_PTHREAD_RWLOCK + +/* Define to 1 if you have the `putenv' function. */ +#cmakedefine HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_RANDOM_H 1 + +/* Define to 1 if atoll is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_ATOLL 1 + +/* Define to 1 if btowc is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_BTOWC 1 + +/* Define to 1 if canonicalize_file_name is declared even after undefining + macros. */ +#cmakedefine HAVE_RAW_DECL_CANONICALIZE_FILE_NAME 1 + +/* Define to 1 if chown is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_CHOWN 1 + +/* Define to 1 if dprintf is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_DPRINTF 1 + +/* Define to 1 if dup2 is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_DUP2 1 + +/* Define to 1 if dup3 is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_DUP3 1 + +/* Define to 1 if endusershell is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_ENDUSERSHELL 1 + +/* Define to 1 if environ is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_ENVIRON 1 + +/* Define to 1 if euidaccess is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_EUIDACCESS 1 + +/* Define to 1 if faccessat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FACCESSAT 1 + +/* Define to 1 if fchdir is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FCHDIR 1 + +/* Define to 1 if fchmodat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FCHMODAT 1 + +/* Define to 1 if fchownat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FCHOWNAT 1 + +/* Define to 1 if fpurge is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FPURGE 1 + +/* Define to 1 if fseeko is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FSEEKO 1 + +/* Define to 1 if fstatat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FSTATAT 1 + +/* Define to 1 if fsync is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FSYNC 1 + +/* Define to 1 if ftello is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FTELLO 1 + +/* Define to 1 if ftruncate is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FTRUNCATE 1 + +/* Define to 1 if futimens is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_FUTIMENS 1 + +/* Define to 1 if getcwd is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETCWD 1 + +/* Define to 1 if getdelim is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETDELIM 1 + +/* Define to 1 if getdomainname is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETDOMAINNAME 1 + +/* Define to 1 if getdtablesize is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETDTABLESIZE 1 + +/* Define to 1 if getgroups is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETGROUPS 1 + +/* Define to 1 if gethostname is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETHOSTNAME 1 + +/* Define to 1 if getline is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETLINE 1 + +/* Define to 1 if getloadavg is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETLOADAVG 1 + +/* Define to 1 if getlogin is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETLOGIN 1 + +/* Define to 1 if getlogin_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETLOGIN_R 1 + +/* Define to 1 if getpagesize is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETPAGESIZE 1 + +/* Define to 1 if getsubopt is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETSUBOPT 1 + +/* Define to 1 if getusershell is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GETUSERSHELL 1 + +/* Define to 1 if grantpt is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_GRANTPT 1 + +/* Define to 1 if initstat_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_INITSTAT_R 1 + +/* Define to 1 if lchmod is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_LCHMOD + +/* Define to 1 if lchown is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_LCHOWN + +/* Define to 1 if link is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_LINK + +/* Define to 1 if linkat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_LINKAT + +/* Define to 1 if lseek is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_LSEEK + +/* Define to 1 if lstat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_LSTAT + +/* Define to 1 if mbrlen is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MBRLEN + +/* Define to 1 if mbrtowc is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MBRTOWC + +/* Define to 1 if mbsinit is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MBSINIT + +/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MBSNRTOWCS + +/* Define to 1 if mbsrtowcs is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MBSRTOWCS + +/* Define to 1 if memmem is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MEMMEM + +/* Define to 1 if mempcpy is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MEMPCPY + +/* Define to 1 if memrchr is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MEMRCHR + +/* Define to 1 if mkdirat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKDIRAT + +/* Define to 1 if mkdtemp is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKDTEMP + +/* Define to 1 if mkfifo is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKFIFO + +/* Define to 1 if mkfifoat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKFIFOAT + +/* Define to 1 if mknod is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKNOD + +/* Define to 1 if mknodat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKNODAT + +/* Define to 1 if mkostemp is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKOSTEMP + +/* Define to 1 if mkostemps is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKOSTEMPS + +/* Define to 1 if mkstemp is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKSTEMP + +/* Define to 1 if mkstemps is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_MKSTEMPS + +/* Define to 1 if pipe2 is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_PIPE2 + +/* Define to 1 if popen is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_POPEN + +/* Define to 1 if pread is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_PREAD + +/* Define to 1 if ptsname is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_PTSNAME + +/* Define to 1 if pwrite is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_PWRITE + +/* Define to 1 if random_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_RANDOM_R + +/* Define to 1 if rawmemchr is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_RAWMEMCHR + +/* Define to 1 if readlink is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_READLINK + +/* Define to 1 if readlinkat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_READLINKAT + +/* Define to 1 if realpath is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_REALPATH + +/* Define to 1 if renameat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_RENAMEAT + +/* Define to 1 if rmdir is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_RMDIR + +/* Define to 1 if rpmatch is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_RPMATCH + +/* Define to 1 if setenv is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SETENV + +/* Define to 1 if setstate_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SETSTATE_R + +/* Define to 1 if setusershell is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SETUSERSHELL + +/* Define to 1 if sigaction is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGACTION + +/* Define to 1 if sigaddset is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGADDSET + +/* Define to 1 if sigdelset is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGDELSET + +/* Define to 1 if sigemptyset is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGEMPTYSET + +/* Define to 1 if sigfillset is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGFILLSET + +/* Define to 1 if sigismember is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGISMEMBER + +/* Define to 1 if sigpending is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGPENDING + +/* Define to 1 if sigprocmask is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SIGPROCMASK + +/* Define to 1 if sleep is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SLEEP + +/* Define to 1 if snprintf is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SNPRINTF + +/* Define to 1 if srandom_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SRANDOM_R + +/* Define to 1 if stat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STAT + +/* Define to 1 if stpcpy is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STPCPY + +/* Define to 1 if stpncpy is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STPNCPY + +/* Define to 1 if strcasestr is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRCASESTR + +/* Define to 1 if strchrnul is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRCHRNUL + +/* Define to 1 if strdup is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRDUP + +/* Define to 1 if strncat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRNCAT + +/* Define to 1 if strndup is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRNDUP + +/* Define to 1 if strnlen is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRNLEN + +/* Define to 1 if strpbrk is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRPBRK + +/* Define to 1 if strsep is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRSEP + +/* Define to 1 if strsignal is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRSIGNAL + +/* Define to 1 if strtod is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRTOD + +/* Define to 1 if strtok_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRTOK_R + +/* Define to 1 if strtoll is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRTOLL + +/* Define to 1 if strtoull is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRTOULL + +/* Define to 1 if strverscmp is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_STRVERSCMP + +/* Define to 1 if symlink is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SYMLINK + +/* Define to 1 if symlinkat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_SYMLINKAT + +/* Define to 1 if tmpfile is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_TMPFILE + +/* Define to 1 if ttyname_r is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_TTYNAME_R + +/* Define to 1 if unlink is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_UNLINK + +/* Define to 1 if unlinkat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_UNLINKAT + +/* Define to 1 if unlockpt is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_UNLOCKPT + +/* Define to 1 if unsetenv is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_UNSETENV + +/* Define to 1 if usleep is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_USLEEP + +/* Define to 1 if utimensat is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_UTIMENSAT + +/* Define to 1 if vdprintf is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_VDPRINTF + +/* Define to 1 if vsnprintf is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_VSNPRINTF + +/* Define to 1 if wcrtomb is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_WCRTOMB + +/* Define to 1 if wcsnrtombs is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_WCSNRTOMBS + +/* Define to 1 if wcsrtombs is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_WCSRTOMBS + +/* Define to 1 if wctob is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_WCTOB + +/* Define to 1 if wcwidth is declared even after undefining macros. */ +#cmakedefine HAVE_RAW_DECL_WCWIDTH + +/* Define to 1 if you have the `readlink' function. */ +#cmakedefine HAVE_READLINK 1 + +/* Define to 1 if you have the `realpath' function. */ +#cmakedefine HAVE_REALPATH 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SEARCH_H 1 + +/* Define to 1 if you have the `setenv' function. */ +#cmakedefine HAVE_SETENV 1 + +/* Define to 1 if you have the `setlocale' function. */ +#cmakedefine HAVE_SETLOCALE 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SIGNAL_H 1 + +/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ +#cmakedefine HAVE_SIGNED_SIG_ATOMIC_T 1 + +/* Define to 1 if 'wchar_t' is a signed integer type. */ +#cmakedefine HAVE_SIGNED_WCHAR_T 1 + +/* Define to 1 if 'wint_t' is a signed integer type. */ +#cmakedefine HAVE_SIGNED_WINT_T 1 + +/* Define to 1 if the system has the type `sigset_t'. */ +#cmakedefine HAVE_SIGSET_T 1 + +/* Define to 1 if you have the `snprintf' function. */ +#cmakedefine HAVE_SNPRINTF 1 + +/* Define to 1 if stdbool.h conforms to C99. */ +#cmakedefine HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDINT_H 1 + +/* Define if exists, doesn't clash with , and declares + uintmax_t. */ +#cmakedefine HAVE_STDINT_H_WITH_UINTMAX 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ +#cmakedefine HAVE_STPCPY 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#cmakedefine HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strdup' function. */ +#cmakedefine HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#cmakedefine HAVE_STRERROR_R 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_STRING_H 1 + +/* Define to 1 if you have the `strnlen' function. */ +#cmakedefine HAVE_STRNLEN 1 + +/* Define to 1 if you have the `strtol' function. */ +#cmakedefine HAVE_STRTOL 1 + +/* Define to 1 if you have the `strtoul' function. */ +#cmakedefine HAVE_STRTOUL 1 + +/* Define to 1 if the system has the type `struct random_data'. */ +#cmakedefine HAVE_STRUCT_RANDOM_DATA 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_BITYPES_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_TIME_H 1 + +/* Define to 1 if you have the `tsearch' function. */ +#cmakedefine HAVE_TSEARCH 1 + +/* Define if you have the 'uintmax_t' type in or . */ +#cmakedefine HAVE_UINTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_UNISTD_H 1 + +/* Define to 1 if the system has the type `unsigned long long int'. */ +#cmakedefine HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the `uselocale' function. */ +#cmakedefine HAVE_USELOCALE 1 + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#cmakedefine HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_WCHAR_H 1 + +/* Define if you have the 'wchar_t' type. */ +#cmakedefine HAVE_WCHAR_T + +/* Define to 1 if you have the `wcrtomb' function. */ +#cmakedefine HAVE_WCRTOMB 1 + +/* Define to 1 if you have the `wcslen' function. */ +#cmakedefine HAVE_WCSLEN 1 + +/* Define to 1 if you have the `wcsnlen' function. */ +#cmakedefine HAVE_WCSNLEN 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_WCTYPE_H 1 + +/* Define to 1 if you have the `wcwidth' function. */ +#cmakedefine HAVE_WCWIDTH 1 + +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_WINSOCK2_H 1 + +/* Define if you have the 'wint_t' type. */ +#cmakedefine HAVE_WINT_T + +/* Define to 1 if O_NOATIME works. */ +#cmakedefine HAVE_WORKING_O_NOATIME 1 + +/* Define to 1 if O_NOFOLLOW works. */ +#cmakedefine HAVE_WORKING_O_NOFOLLOW 1 + +/* Define to 1 if the system has the type `_Bool'. */ +#cmakedefine HAVE__BOOL 1 + +/* Define to 1 if you have the `_NSGetExecutablePath' function. */ +#cmakedefine HAVE__NSGETEXECUTABLEPATH 1 + +/* Define to 1 if you have the `__fsetlocking' function. */ +#cmakedefine HAVE___FSETLOCKING 1 + +/* Define as const if the declaration of iconv() needs const. */ +#cmakedefine ICONV_CONST @ICONV_CONST@ + +/* Define to a symbolic name denoting the flavor of iconv_open() + implementation. */ +#cmakedefine ICONV_FLAVOR + +/* Define to the value of ${prefix}, as a string. */ +#cmakedefine INSTALLPREFIX + +/* Define if integer division by zero raises signal SIGFPE. */ +#cmakedefine INTDIV0_RAISES_SIGFPE 1 + +#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#else +# define ISSLASH(C) ((C) == '/') +#endif + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#cmakedefine LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#cmakedefine LT_OBJDIR + +/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ +#cmakedefine MALLOC_0_IS_NONNULL 1 + +/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ +#cmakedefine MAP_ANONYMOUS + +/* Define if the mbrtowc function has the NULL string argument bug. */ +#cmakedefine MBRTOWC_NULL_ARG_BUG + +/* Define if the mbrtowc function does not return 0 for a NUL character. */ +#cmakedefine MBRTOWC_NUL_RETVAL_BUG + +/* Define if the mbrtowc function returns a wrong return value. */ +#cmakedefine MBRTOWC_RETVAL_BUG + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#cmakedefine NO_MINUS_C_MINUS_O + +/* Name of package */ +#cmakedefine PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#cmakedefine PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#cmakedefine PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#cmakedefine PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#cmakedefine PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#cmakedefine PACKAGE_URL + +/* Define to the version of this package. */ +#cmakedefine PACKAGE_VERSION + +/* Define if exists and defines unusable PRI* macros. */ +#cmakedefine PRI_MACROS_BROKEN + +/* Define if the pthread_in_use() detection is hard. */ +#cmakedefine PTHREAD_IN_USE_DETECTION_HARD + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'ptrdiff_t'. */ +#cmakedefine PTRDIFF_T_SUFFIX + +/* Define to 1 if readlink fails to recognize a trailing slash. */ +#cmakedefine READLINK_TRAILING_SLASH_BUG 1 + +/* Define to 1 if stat needs help when passed a directory name with a trailing + slash */ +#cmakedefine REPLACE_FUNC_STAT_DIR 1 + +/* Define to 1 if stat needs help when passed a file name with a trailing + slash */ +#cmakedefine REPLACE_FUNC_STAT_FILE 1 + +/* Define this to 1 if strerror is broken. */ +#cmakedefine REPLACE_STRERROR 1 + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'sig_atomic_t'. */ +#cmakedefine SIG_ATOMIC_T_SUFFIX + +/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +#ifndef SIZE_MAX +# undef SIZE_MAX +#endif + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'size_t'. */ +#cmakedefine SIZE_T_SUFFIX + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#cmakedefine STACK_DIRECTION + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +#cmakedefine STAT_MACROS_BROKEN + +/* Define to 1 if you have the ANSI C header files. */ +#cmakedefine STDC_HEADERS + +/* Define to 1 if strerror_r returns char *. */ +#cmakedefine STRERROR_R_CHAR_P + +/* Define if the POSIX multithreading library can be used. */ +#cmakedefine USE_POSIX_THREADS + +/* Define if references to the POSIX multithreading library should be made + weak. */ +#cmakedefine USE_POSIX_THREADS_WEAK + +/* Define if the GNU Pth multithreading library can be used. */ +#cmakedefine USE_PTH_THREADS + +/* Define if references to the GNU Pth multithreading library should be made + weak. */ +#cmakedefine USE_PTH_THREADS_WEAK + +/* Define if the old Solaris multithreading library can be used. */ +#cmakedefine USE_SOLARIS_THREADS + +/* Define if references to the old Solaris multithreading library should be + made weak. */ +#cmakedefine USE_SOLARIS_THREADS_WEAK + +/* Define to 1 if you want getc etc. to use unlocked I/O if available. + Unlocked I/O can improve performance in unithreaded apps, but it is not + safe for multithreaded apps. */ +#cmakedefine USE_UNLOCKED_IO + +/* Define if the Win32 multithreading API can be used. */ +#cmakedefine USE_WIN32_THREADS + +/* Version number of package */ +#cmakedefine VERSION + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'wchar_t'. */ +#cmakedefine WCHAR_T_SUFFIX + +/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type + 'wint_t'. */ +#cmakedefine WINT_T_SUFFIX + +/* Define to 1 if on MINIX. */ +#cmakedefine _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#cmakedefine _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#cmakedefine _POSIX_SOURCE + +/* Define to 500 only on HP-UX. */ +#cmakedefine _XOPEN_SOURCE + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +#cmakedefine __GETOPT_PREFIX + +/* Define to `int' if doesn't define. */ +#cmakedefine gid_t + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#cmakedefine inline +#endif + +/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports + the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of + earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. + __APPLE__ && __MACH__ test for MacOS X. + __APPLE_CC__ tests for the Apple compiler and its version. + __STDC_VERSION__ tests for the C99 mode. */ +#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +# define __GNUC_STDC_INLINE__ 1 +#endif + +/* Define to a type if does not define. */ +#cmakedefine mbstate_t + +/* Define to the type of st_nlink in struct stat, or a supertype. */ +#cmakedefine nlink_t + +/* Define as the type of the result of subtracting two pointers, if the system + doesn't define it. */ +#cmakedefine ptrdiff_t + +/* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is + supported directly. */ +#cmakedefine restrict +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ +#if defined __SUNPRO_CC && !defined __RESTRICT +# define _Restrict +# define __restrict__ +#endif + +/* Define to `unsigned int' if does not define. */ +#cmakedefine size_t + +/* Define as a signed type of the same size as size_t. */ +#cmakedefine ssize_t + +/* Define to `int' if doesn't define. */ +#cmakedefine uid_t + +/* Define to unsigned long or unsigned long long if and + don't define. */ +#cmakedefine uintmax_t @uintmax_t@ +#cmakedefine intmax_t @intmax_t@ + +/* Define as a marker that can be attached to declarations that might not + be used. This helps to reduce warnings, such as from + GCC -Wunused-parameter. */ +#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_UNUSED +#endif +/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name + is a misnomer outside of parameter lists. */ +#define _UNUSED_PARAMETER_ _GL_UNUSED + + + +#define __libc_lock_t gl_lock_t +#define __libc_lock_define gl_lock_define +#define __libc_lock_define_initialized gl_lock_define_initialized +#define __libc_lock_init gl_lock_init +#define __libc_lock_lock gl_lock_lock +#define __libc_lock_unlock gl_lock_unlock +#define __libc_lock_recursive_t gl_recursive_lock_t +#define __libc_lock_define_recursive gl_recursive_lock_define +#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized +#define __libc_lock_init_recursive gl_recursive_lock_init +#define __libc_lock_lock_recursive gl_recursive_lock_lock +#define __libc_lock_unlock_recursive gl_recursive_lock_unlock +#define glthread_in_use libintl_thread_in_use +#define glthread_lock_init_func libintl_lock_init_func +#define glthread_lock_lock_func libintl_lock_lock_func +#define glthread_lock_unlock_func libintl_lock_unlock_func +#define glthread_lock_destroy_func libintl_lock_destroy_func +#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded +#define glthread_rwlock_init_func libintl_rwlock_init_func +#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded +#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func +#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded +#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func +#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded +#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func +#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded +#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func +#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded +#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func +#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded +#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func +#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded +#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func +#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded +#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func +#define glthread_once_func libintl_once_func +#define glthread_once_singlethreaded libintl_once_singlethreaded +#define glthread_once_multithreaded libintl_once_multithreaded + +/* On Windows, variables that may be in a DLL must be marked specially. */ +#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER +# define DLL_VARIABLE __declspec (dllimport) +#else +# define DLL_VARIABLE +#endif + +/* Extra OS/2 (emx+gcc) defines. */ +#ifdef __EMX__ +# include "intl/os2compat.h" +#endif + +#ifdef _MSC_VER +#define inline __inline +#endif diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/ConfigureChecks.cmake gettext-0.18/gettext-runtime/ConfigureChecks.cmake --- gettext-0.18.orig/gettext-runtime/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/gettext-runtime/ConfigureChecks.cmake 2012-04-21 23:16:04.145272500 +0200 @@ -0,0 +1,161 @@ +include(CheckFunctionExists) +include(CheckIncludeFile) +include(CheckTypeSize) + +check_include_file("argz.h" HAVE_ARGZ_H) +CHECK_INCLUDE_FILE("alloca.h" HAVE_ALLOCA_H) +CHECK_INCLUDE_FILE("bp-sym.h" HAVE_BP_SYM_H) +CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) +CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) +CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) +CHECK_INCLUDE_FILE("getopt.h" HAVE_GETOPT_H) +CHECK_INCLUDE_FILE("iconv.h" HAVE_ICONV_H) +CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) +CHECK_INCLUDE_FILE("limits.h" HAVE_LIMITS_H) +CHECK_INCLUDE_FILE("mach-o/dyld.h" HAVE_MACH_O_DYLD_H) +CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) +CHECK_INCLUDE_FILE("random.h" HAVE_RANDOM_H) +CHECK_INCLUDE_FILE("search.h" HAVE_SEARCH_H) +CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H) +CHECK_INCLUDE_FILE("stddef.h" HAVE_STDDEF_H) +CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) +CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H) +CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H) +CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H) +CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H) +CHECK_INCLUDE_FILE("sys/bitypes.h" HAVE_SYS_BITYPES_H) +CHECK_INCLUDE_FILE("sys/inttypes.h" HAVE_SYS_INTTYPES_H) +CHECK_INCLUDE_FILE("sys/mman.h" HAVE_SYS_MMAN_H) +CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H) +CHECK_INCLUDE_FILE("sys/socket.h" HAVE_SYS_SOCKET_H) +CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H) +CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H) +CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) +CHECK_INCLUDE_FILE("time.h" HAVE_TIME_H) +CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) +CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H) +CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H) +CHECK_INCLUDE_FILE("winsock2.h" HAVE_WINSOCK2_H) + + +CHECK_FUNCTION_EXISTS("argz_count" HAVE_ARGZ_COUNT) +CHECK_FUNCTION_EXISTS("argz_next" HAVE_ARGZ_NEXT) +CHECK_FUNCTION_EXISTS("argz_stringify" HAVE_ARGZ_STRINGIFY) +CHECK_FUNCTION_EXISTS("alloca" HAVE_ALLOCA) +if(MSVC) + set(HAVE_ALLOCA 1) +endif(MSVC) +CHECK_FUNCTION_EXISTS("asprintf" HAVE_ASPRINTF) +CHECK_FUNCTION_EXISTS("atexit" HAVE_ATEXIT) +CHECK_FUNCTION_EXISTS("canonicalize_file_name" HAVE_CANONICALIZE_FILE_NAME) +CHECK_FUNCTION_EXISTS("CFLocaleCopyCurrent" HAVE_CFLOCALECOPYCURRENT) +CHECK_FUNCTION_EXISTS("fwprintf" HAVE_FWPRINTF) +CHECK_FUNCTION_EXISTS("getcwd" HAVE_GETCWD) +CHECK_FUNCTION_EXISTS("_getcwd" HAVE_GETCWD2) +CHECK_FUNCTION_EXISTS("getegid" HAVE_GETEGID) +CHECK_FUNCTION_EXISTS("geteuid" HAVE_GETEUID) +CHECK_FUNCTION_EXISTS("getgid" HAVE_GETGID) +CHECK_FUNCTION_EXISTS("getopt_long_only" HAVE_GETOPT_LONG_ONLY) +CHECK_FUNCTION_EXISTS("getpagesize" HAVE_GETPAGESIZE) +CHECK_FUNCTION_EXISTS("gettext" HAVE_GETTEXT) +CHECK_FUNCTION_EXISTS("getuid" HAVE_GETUID) +CHECK_FUNCTION_EXISTS("iconv" HAVE_ICONV) +CHECK_FUNCTION_EXISTS("iswblank" HAVE_ISWBLANK) +CHECK_FUNCTION_EXISTS("iswcntrl" HAVE_ISWCNTRL) +CHECK_FUNCTION_EXISTS("lstat" HAVE_LSTAT) +CHECK_FUNCTION_EXISTS("mbrtowc" HAVE_MBRTOWC) +CHECK_FUNCTION_EXISTS("mbsinit" HAVE_MBSINIT) +CHECK_FUNCTION_EXISTS("mbslen" HAVE_MBSLEN) +CHECK_FUNCTION_EXISTS("memchr" HAVE_MEMCHR) +CHECK_FUNCTION_EXISTS("memmove" HAVE_MEMMOVE) +CHECK_FUNCTION_EXISTS("mempcpy" HAVE_MEMPCPY) +CHECK_FUNCTION_EXISTS("mmap" HAVE_MMAP) +CHECK_FUNCTION_EXISTS("mprotect" HAVE_MPROTECT) +CHECK_FUNCTION_EXISTS("munmap" HAVE_MUNMAP) +CHECK_FUNCTION_EXISTS("newlocale" HAVE_NEWLOCALE) +CHECK_FUNCTION_EXISTS("pathconf" HAVE_PATHCONF) +CHECK_FUNCTION_EXISTS("putenv" HAVE_PUTENV) +CHECK_FUNCTION_EXISTS("readlink" HAVE_READLINK) +CHECK_FUNCTION_EXISTS("realpath" HAVE_REALPATH) +CHECK_FUNCTION_EXISTS("setenv" HAVE_SETENV) +CHECK_FUNCTION_EXISTS("setlocale" HAVE_SETLOCALE) +CHECK_FUNCTION_EXISTS("snprintf" HAVE_SNPRINTF) +CHECK_FUNCTION_EXISTS("stpcpy" HAVE_STPCPY) +CHECK_FUNCTION_EXISTS("strcasecmp" HAVE_STRCASECMP) +CHECK_FUNCTION_EXISTS("strdup" HAVE_STRDUP) +CHECK_FUNCTION_EXISTS("strerror_r" HAVE_STRERROR_R) +CHECK_FUNCTION_EXISTS("strnlen" HAVE_STRNLEN) +CHECK_FUNCTION_EXISTS("strtol" HAVE_STRTOL) +CHECK_FUNCTION_EXISTS("strtoul" HAVE_STRTOUL) +CHECK_FUNCTION_EXISTS("tsearch" HAVE_TSEARCH) +CHECK_FUNCTION_EXISTS("uselocale" HAVE_USELOCALE) +CHECK_FUNCTION_EXISTS("wcrtomb" HAVE_WCRTOMB) +CHECK_FUNCTION_EXISTS("wcslen" HAVE_WCSLEN) +CHECK_FUNCTION_EXISTS("wcsnlen" HAVE_WCSNLEN) +CHECK_FUNCTION_EXISTS("wcwidth" HAVE_WCWIDTH) +CHECK_FUNCTION_EXISTS("_NSGetExecutablePath" HAVE__NSGETEXECUTABLEPATH) +CHECK_FUNCTION_EXISTS("__fsetlocking" HAVE___FSETLOCKING) + +CHECK_FUNCTION_EXISTS("clearerr_unlocked" HAVE_DECL_CLEARERR_UNLOCKED) +CHECK_FUNCTION_EXISTS("feof_unlocked" HAVE_DECL_FEOF_UNLOCKED) +CHECK_FUNCTION_EXISTS("ferror_unlocked" HAVE_DECL_FERROR_UNLOCKED) +CHECK_FUNCTION_EXISTS("fflush_unlocked" HAVE_DECL_FFLUSH_UNLOCKED) +CHECK_FUNCTION_EXISTS("fgets_unlocked" HAVE_DECL_FGETS_UNLOCKED) +CHECK_FUNCTION_EXISTS("fputc_unlocked" HAVE_DECL_FPUTC_UNLOCKED) +CHECK_FUNCTION_EXISTS("fputs_unlocked" HAVE_DECL_FPUTS_UNLOCKED) +CHECK_FUNCTION_EXISTS("fread_unlocked" HAVE_DECL_FREAD_UNLOCKED) +CHECK_FUNCTION_EXISTS("fwrite_unlocked" HAVE_DECL_FWRITE_UNLOCKED) +CHECK_FUNCTION_EXISTS("getchar_unlocked" HAVE_DECL_GETCHAR_UNLOCKED) +CHECK_FUNCTION_EXISTS("getc_unlocked" HAVE_DECL_GETC_UNLOCKED) +CHECK_FUNCTION_EXISTS("getenv" HAVE_DECL_GETENV) +CHECK_FUNCTION_EXISTS("getopt_clip" HAVE_DECL_GETOPT_CLIP) +CHECK_FUNCTION_EXISTS("optreset" HAVE_DECL_OPTRESET) +CHECK_FUNCTION_EXISTS("program_invocation_name" HAVE_DECL_PROGRAM_INVOCATION_NAME) +CHECK_FUNCTION_EXISTS("program_invocation_short_name" HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME) +CHECK_FUNCTION_EXISTS("putchar_unlocked" HAVE_DECL_PUTCHAR_UNLOCKED) +CHECK_FUNCTION_EXISTS("putc_unlocked" HAVE_DECL_PUTC_UNLOCKED) +CHECK_FUNCTION_EXISTS("strerror_r" HAVE_DECL_STRERROR_R) +CHECK_FUNCTION_EXISTS("strnlen" HAVE_DECL_STRNLEN) +CHECK_FUNCTION_EXISTS("wcwidth" HAVE_DECL_WCWIDTH) +CHECK_FUNCTION_EXISTS("_snprintf" HAVE_DECL__SNPRINTF) +CHECK_FUNCTION_EXISTS("_snwprintf" HAVE_DECL__SNWPRINTF) +CHECK_FUNCTION_EXISTS("strerror" HAVE_DECL_STRERROR) + +CHECK_TYPE_SIZE("ptrdiff_t" BITSIZEOF_PTRDIFF_T) +CHECK_TYPE_SIZE("sig_atomic_t" BITSIZEOF_SIG_ATOMIC_T) +CHECK_TYPE_SIZE("size_t" BITSIZEOF_SIZE_T) +CHECK_TYPE_SIZE("wchar_t" BITSIZEOF_WCHAR_T) +CHECK_TYPE_SIZE("wint_t" BITSIZEOF_WINT_T) + +CHECK_TYPE_SIZE("intmax_t" INTMAX_T) + +CHECK_TYPE_SIZE("uintmax_t" UINTMAX_T) +if(HAVE_UINTMAX_T) +set(HAVE_STDINT_H_WITH_UINTMAX true) +endif(HAVE_UINTMAX_T) + +if(ICONV_SECOND_ARGUMENT_IS_CONST) + set(ICONV_CONST const) +endif(ICONV_SECOND_ARGUMENT_IS_CONST) + +if(NOT HAVE_UINTMAX_T) + set(uintmax_t "unsigned __int64") +endif(NOT HAVE_UINTMAX_T) +if(NOT HAVE_INTMAX_T) + set(intmax_t "__int64") +endif(NOT HAVE_INTMAX_T) + +if(WINCE) + set(INTDIV0_RAISES_SIGFPE 1) +endif(WINCE) + +if(WIN32) + set(FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 1) + set(FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 1) +else(WIN32) + set(FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0) +endif(WIN32) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) + +add_definitions(-DHAVE_CONFIG_H -DLIBDIR) \ No newline at end of file diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/CMakeLists.txt gettext-0.18/gettext-runtime/intl/CMakeLists.txt --- gettext-0.18.orig/gettext-runtime/intl/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/gettext-runtime/intl/CMakeLists.txt 2012-04-21 23:20:32.625628700 +0200 @@ -0,0 +1,70 @@ +cmake_minimum_required(VERSION 2.6) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) + +project(intl) + +set(HAVE_NEWLOCALE 0) +set(HAVE_POSIX_PRINTF 0) +set(HAVE_SNPRINTF 0) +set(HAVE_ASPRINTF 0) +set(HAVE_WPRINTF 0) + +configure_file(libgnuintl.h.in libgnuintl.h) + +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + +set(INTL_SRCS + bindtextdom.c + dcgettext.c + dgettext.c + gettext.c + finddomain.c + hash-string.c + loadmsgcat.c + localealias.c + textdomain.c + l10nflist.c + explodename.c + dcigettext.c + dcngettext.c + dngettext.c + ngettext.c + plural-exp.c + localcharset.c + threadlib.c + lock.c + relocatable.c + langprefs.c + localename.c + log.c + printf.c + setlocale.c + version.c + osdep.c + intl-compat.c + libintl.rc + plural.c + intl.def +) + +add_definitions(-DLOCALE_ALIAS_PATH="") +add_definitions(-DLOCALEDIR="") +add_definitions(-DIN_LIBINTL) +#add_definitions(-DBUILDING_DLL) +#add_definitions(-DHAVE_VISIBILITY) + +add_library(intl ${LIBRARY_TYPE} ${INTL_SRCS}) +target_link_libraries(intl ${ICONV_LIBRARIES}) +if(MSVC) +set_target_properties(intl PROPERTIES OUTPUT_NAME "libintl") +endif(MSVC) + +if(WINCE) + target_link_libraries(intl ${WCECOMPAT_LIBRARIES}) +endif(WINCE) + +install(TARGETS intl RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h DESTINATION include RENAME libintl.h) diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/dcigettext.c gettext-0.18/gettext-runtime/intl/dcigettext.c --- gettext-0.18.orig/gettext-runtime/intl/dcigettext.c 2009-12-26 14:42:37.000000000 +0100 +++ gettext-0.18/gettext-runtime/intl/dcigettext.c 2012-04-21 23:16:04.159273300 +0200 @@ -140,8 +140,12 @@ # define tfind __tfind #else # if !defined HAVE_GETCWD +# ifndef _WIN32_WCE char *getwd (); -# define getcwd(buf, max) getwd (buf) +# define getcwd(buf, max) getwd (buf) +# else +# define getcwd _getcwd +# endif # else # if VMS # define getcwd(buf, max) (getcwd) (buf, max, 0) diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/intl.def gettext-0.18/gettext-runtime/intl/intl.def --- gettext-0.18.orig/gettext-runtime/intl/intl.def 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/gettext-runtime/intl/intl.def 2012-04-21 23:16:04.164273600 +0200 -@@ -0,0 +1,51 @@ +@@ -0,0 +1,52 @@ +LIBRARY libintl.DLL +EXPORTS +;_imp___ctype_ptr +_nl_expand_alias +_nl_explode_name +_nl_find_domain +_nl_find_msg +_nl_language_preferences_default +_nl_load_domain +_nl_locale_name +_nl_locale_name_default +_nl_locale_name_environ +_nl_locale_name_posix +_nl_locale_name_thread_unsafe +_nl_log_untranslated +_nl_make_l10nflist +_nl_msg_cat_cntr +_nl_normalize_codeset +bind_textdomain_codeset +bindtextdomain +dcgettext +dcngettext +dgettext +dngettext +gettext +gl_locale_name_thread +libintl_bind_textdomain_codeset +libintl_bindtextdomain +libintl_dcgettext +libintl_dcigettext +libintl_dcngettext +libintl_dgettext +libintl_dngettext +libintl_gettext +libintl_gettext_extract_plural +libintl_gettext_free_exp +libintl_gettext_germanic_plural +libintl_gettextparse +libintl_fprintf +libintl_hash_string +libintl_ngettext +libintl_nl_current_default_domain +libintl_nl_default_default_domain +libintl_nl_default_dirname +libintl_nl_domain_bindings +;libintl_relocate +;libintl_set_relocation_prefix +libintl_setlocale ++libintl_sprintf +libintl_textdomain +libintl_version +locale_charset diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/langprefs.c gettext-0.18/gettext-runtime/intl/langprefs.c --- gettext-0.18.orig/gettext-runtime/intl/langprefs.c 2009-12-12 16:08:01.000000000 +0100 +++ gettext-0.18/gettext-runtime/intl/langprefs.c 2012-04-21 23:16:04.168273900 +0200 @@ -53,6 +53,8 @@ extern const char *_nl_locale_name_from_win32_LANGID (LANGID langid); extern const char *_nl_locale_name_from_win32_LCID (LCID lcid); +#ifndef _WIN32_WCE + /* Get the preferences list through the MUI APIs. This works on Windows Vista and newer. */ static const char * @@ -205,6 +207,8 @@ return NULL; } + + /* Get the system's preference. This can be used as a fallback. */ static BOOL CALLBACK ret_first_language (HMODULE h, LPCSTR type, LPCSTR name, WORD lang, LONG_PTR param) @@ -222,7 +226,7 @@ ret_first_language, (LONG_PTR)&languages); return languages; } - +#endif #endif /* Determine the user's language preferences, as a colon separated list of @@ -324,6 +328,7 @@ static const char *cached_languages; static int cache_initialized; +#ifndef _WIN32_WCE /* Activate the new code only when the GETTEXT_MUI environment variable is set, for the time being, since the new code is not well tested. */ if (!cache_initialized && getenv ("GETTEXT_MUI") != NULL) @@ -346,10 +351,21 @@ cached_languages = languages; cache_initialized = 1; } +#else + if (!cache_initialized) + { + LCID lcid; + + /* Use native Win32 API locale ID. */ + lcid = GetSystemDefaultLCID (); + + cached_languages = _nl_locale_name_from_win32_LCID(lcid); + cache_initialized = 1; + } +#endif if (cached_languages != NULL) return cached_languages; } #endif - return NULL; } diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/libgnuintl.h.in gettext-0.18/gettext-runtime/intl/libgnuintl.h.in --- gettext-0.18.orig/gettext-runtime/intl/libgnuintl.h.in 2010-05-09 20:54:29.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/libgnuintl.h.in 2012-04-21 23:16:04.172274100 +0200 @@ -19,6 +19,10 @@ #ifndef _LIBINTL_H #define _LIBINTL_H 1 +#ifdef _MSC_VER +#define inline __inline +#endif + #include #if (defined __APPLE__ && defined __MACH__) && @HAVE_NEWLOCALE@ # include diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/libintl.rc gettext-0.18/gettext-runtime/intl/libintl.rc --- gettext-0.18.orig/gettext-runtime/intl/libintl.rc 2010-05-09 20:54:29.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/libintl.rc 2012-04-21 23:58:54.528290000 +0200 @@ -22,13 +22,13 @@ VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0" VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "LGPLed libintl for Windows NT/2000/XP/Vista/7 and Windows 95/98/ME\0" - VALUE "FileVersion", PACKAGE_VERSION_STRING "\0" + VALUE "FileVersion", "0.18\0" VALUE "InternalName", "intl.dll\0" VALUE "LegalCopyright", "Copyright (C) 1995-2010\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "intl.dll\0" VALUE "ProductName", "libintl: accessing NLS message catalogs\0" - VALUE "ProductVersion", PACKAGE_VERSION_STRING "\0" + VALUE "ProductVersion", "0.18\0" END END BLOCK "VarFileInfo" diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/loadmsgcat.c gettext-0.18/gettext-runtime/intl/loadmsgcat.c --- gettext-0.18.orig/gettext-runtime/intl/loadmsgcat.c 2009-06-28 21:44:04.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/loadmsgcat.c 2012-04-21 23:16:04.178274400 +0200 @@ -33,6 +33,11 @@ #include #include +#ifdef _WIN32_WCE +# include +#define open(a,b) _open(a,b,0) +#endif + #ifdef __GNUC__ # undef alloca # define alloca __builtin_alloca @@ -40,7 +45,9 @@ #else # ifdef _MSC_VER # include +# undef alloca # define alloca _alloca +# define HAVE_ALLOCA # else # if defined HAVE_ALLOCA_H || defined _LIBC # include @@ -499,7 +506,6 @@ # define O_BINARY 0 #endif - /* We need a sign, whether a new catalog was loaded, which can be associated with all translations. This is important if the translations are cached by one of GCC's features. */ @@ -782,7 +788,7 @@ { __libc_lock_define_initialized_recursive (static, lock) int fd = -1; - size_t size; + size_t _size; #ifdef _LIBC struct stat64 st; #else @@ -836,15 +842,15 @@ #else __builtin_expect (fstat (fd, &st) != 0, 0) #endif - || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) - || __builtin_expect (size < sizeof (struct mo_file_header), 0)) + || __builtin_expect ((_size = (size_t) st.st_size) != st.st_size, 0) + || __builtin_expect (_size < sizeof (struct mo_file_header), 0)) /* Something went wrong. */ goto out; #ifdef HAVE_MMAP /* Now we are ready to load the file. If mmap() is available we try this first. If not available or it failed we try to load it. */ - data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, + data = (struct mo_file_header *) mmap (NULL, _size, PROT_READ, MAP_PRIVATE, fd, 0); if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) @@ -863,11 +869,11 @@ size_t to_read; char *read_ptr; - data = (struct mo_file_header *) malloc (size); + data = (struct mo_file_header *) malloc (_size); if (data == NULL) goto out; - to_read = size; + to_read = _size; read_ptr = (char *) data; do { @@ -897,7 +903,7 @@ /* The magic number is wrong: not a message catalog file. */ #ifdef HAVE_MMAP if (use_mmap) - munmap ((caddr_t) data, size); + munmap ((caddr_t) data, _size); else #endif free (data); @@ -911,7 +917,7 @@ domain->data = (char *) data; domain->use_mmap = use_mmap; - domain->mmap_size = size; + domain->mmap_size = _size; domain->must_swap = data->magic != _MAGIC; domain->malloced = NULL; diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/localename.c gettext-0.18/gettext-runtime/intl/localename.c --- gettext-0.18.orig/gettext-runtime/intl/localename.c 2010-05-09 04:27:13.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/localename.c 2012-04-21 23:16:04.185274800 +0200 @@ -1128,6 +1128,10 @@ # endif #endif +#ifdef _WIN32_WCE +#define GetThreadLocale GetUserDefaultLCID +#endif + #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */ @@ -1448,6 +1452,7 @@ const char * gl_locale_name_from_win32_LANGID (LANGID langid) { +#ifndef _WIN32_WCE /* Activate the new code only when the GETTEXT_MUI environment variable is set, for the time being, since the new code is not well tested. */ if (getenv ("GETTEXT_MUI") != NULL) @@ -1465,6 +1470,7 @@ return namebuf; } } +#endif /* Internet Explorer has an LCID to RFC3066 name mapping stored in HKEY_CLASSES_ROOT\Mime\Database\Rfc1766. But we better don't use that since IE's i18n subsystem is known to be inconsistent with the Win32 base diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/os2compat.c gettext-0.18/gettext-runtime/intl/os2compat.c --- gettext-0.18.orig/gettext-runtime/intl/os2compat.c 2009-06-28 21:44:04.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/os2compat.c 2012-04-21 23:16:04.189275100 +0200 @@ -23,7 +23,9 @@ #include #include +#ifdef HAVE_SYS_PARAM_H #include +#endif /* A version of getenv() that works from DLLs */ extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue); diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/printf-parse.c gettext-0.18/gettext-runtime/intl/printf-parse.c --- gettext-0.18.orig/gettext-runtime/intl/printf-parse.c 2009-12-12 16:08:01.000000000 +0100 +++ gettext-0.18/gettext-runtime/intl/printf-parse.c 2012-04-21 23:16:04.194275400 +0200 @@ -75,6 +75,11 @@ # include "c-ctype.h" #endif +#if defined(_WIN32_WCE) && !defined(_PTRDIFF_T_DEFINED) + typedef int ptrdiff_t; +# define _PTRDIFF_T_DEFINED +#endif + #ifdef STATIC STATIC #endif diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/setlocale.c gettext-0.18/gettext-runtime/intl/setlocale.c --- gettext-0.18.orig/gettext-runtime/intl/setlocale.c 2009-12-26 04:15:07.000000000 +0100 +++ gettext-0.18/gettext-runtime/intl/setlocale.c 2012-04-21 23:16:04.199275600 +0200 @@ -16,6 +16,7 @@ License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #ifdef HAVE_CONFIG_H # include @@ -46,6 +47,9 @@ #if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ +/* FIXME: In Windwos CE the function setlocale is not defined */ +# ifndef _WIN32_WCE + # undef setlocale # undef newlocale @@ -816,10 +820,14 @@ # define setlocale_single setlocale_unixlike # endif +# endif + DLL_EXPORTED char * libintl_setlocale (int category, const char *locale) { +/* FIXME: In Windwos CE we dont need setlocale */ +#ifndef _WIN32_WCE if (locale != NULL && locale[0] == '\0') { /* A request to the set the current locale to the default locale. */ @@ -899,6 +907,8 @@ } else return setlocale_single (category, locale); +#endif + return NULL; } # if HAVE_NEWLOCALE diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/vasnprintf.c gettext-0.18/gettext-runtime/intl/vasnprintf.c --- gettext-0.18.orig/gettext-runtime/intl/vasnprintf.c 2010-05-09 12:54:20.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/vasnprintf.c 2012-04-21 23:16:04.207276100 +0200 @@ -86,6 +86,10 @@ # endif #endif +#ifdef _WIN32_WCE +#include +#endif + /* Checked size_t computations. */ #include "xsize.h" diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/intl/xsize.h gettext-0.18/gettext-runtime/intl/xsize.h --- gettext-0.18.orig/gettext-runtime/intl/xsize.h 2009-06-28 21:44:04.000000000 +0200 +++ gettext-0.18/gettext-runtime/intl/xsize.h 2012-04-21 23:16:04.212276400 +0200 @@ -25,6 +25,9 @@ /* Get SIZE_MAX. */ #include +#ifdef _WIN32_WCE +#define SIZE_MAX _UI32_MAX +#endif #if HAVE_STDINT_H # include #endif diff -Nru -x '*~' gettext-0.18.orig/gettext-runtime/src/CMakeLists.txt gettext-0.18/gettext-runtime/src/CMakeLists.txt --- gettext-0.18.orig/gettext-runtime/src/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ gettext-0.18/gettext-runtime/src/CMakeLists.txt 2012-04-21 23:16:04.216276600 +0200 @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 2.6) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) + +project(tools) + +set(GETTEXT_SRCS + gettext.c +) + +set(NGETTEXT_SRCS + ngettext.c +) + +set(ENVSUBST_SRCS + envsubst.c +) + +add_executable(gettext ${GETTEXT_SRCS}) + +add_executable(ngettext ${NGETTEXT_SRCS}) + +add_executable(envsubst ${ENVSUBST_SRCS}) diff --git a/portage/win32libs-sources/gettext-src/gettext-src-0.18.py b/portage/win32libs-sources/gettext-src/gettext-src-0.18.py index e67c16a30..b97309e33 100644 --- a/portage/win32libs-sources/gettext-src/gettext-src-0.18.py +++ b/portage/win32libs-sources/gettext-src/gettext-src-0.18.py @@ -1,24 +1,24 @@ # -*- coding: utf-8 -*- import info import utils from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): self.targets[ '0.18' ] = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.tar.gz' self.targetInstSrc[ '0.18' ] = "gettext-0.18" - self.patchToApply['0.18'] = [("gettext-0.18-20100521.diff", 1)] + self.patchToApply['0.18'] = [("gettext-0.18-20121007.diff", 1)] self.shortDescription = "GNU internationalization (i18n)" self.defaultTarget = '0.18' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' self.dependencies['win32libs-bin/win_iconv'] = 'default' class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/ilmbase-src/ilmbase-1.0.2-20120804.diff b/portage/win32libs-sources/ilmbase-src/ilmbase-1.0.2-20120804.diff index a2f36355c..f5d0ac7a6 100644 --- a/portage/win32libs-sources/ilmbase-src/ilmbase-1.0.2-20120804.diff +++ b/portage/win32libs-sources/ilmbase-src/ilmbase-1.0.2-20120804.diff @@ -1,174 +1,291 @@ diff -Nru -x '*~' ilmbase-1.0.2.orig/CMakeLists.txt ilmbase-1.0.2/CMakeLists.txt --- ilmbase-1.0.2.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ ilmbase-1.0.2/CMakeLists.txt 2012-08-04 16:21:02.027012900 +0200 -@@ -0,0 +1,20 @@ ++++ ilmbase-1.0.2/CMakeLists.txt 2012-08-06 10:19:40.428176400 +0200 +@@ -0,0 +1,36 @@ +project(ilmbase) +cmake_minimum_required(VERSION 2.6) + +if(WIN32) + set(CONFIG_LOCATION config.windows) +else(WIN32) + set(CONFIG_LOCATION config) +endif(WIN32) + ++option(BUILD_TESTS "build the test executables" ON) ++ ++if(BUILD_TESTS) ++enable_testing() ++endif(BUILD_TESTS) ++ +include_directories(${CONFIG_LOCATION}) +install(FILES ${CONFIG_LOCATION}/IlmBaseConfig.h DESTINATION include) + +include_directories(Half) +include_directories(Iex) + +add_subdirectory(Half) +add_subdirectory(Iex) +add_subdirectory(Imath) +add_subdirectory(IlmThread) + ++if(BUILD_TESTS) ++ add_subdirectory(HalfTest) ++ add_subdirectory(IexTest) ++ add_subdirectory(ImathTest) ++endif(BUILD_TESTS) ++ ++set(IlmBase_targets Half Iex Imath IlmThread) ++install(EXPORT IlmBase_targets DESTINATION lib/cmake/IlmBase FILE IlmBaseTargets.cmake) ++ ++install(FILES ${CMAKE_SOURCE_DIR}/IlmBaseConfig.cmake DESTINATION lib/cmake/IlmBase) diff -Nru -x '*~' ilmbase-1.0.2.orig/Half/CMakeLists.txt ilmbase-1.0.2/Half/CMakeLists.txt --- ilmbase-1.0.2.orig/Half/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ ilmbase-1.0.2/Half/CMakeLists.txt 2012-08-04 16:04:48.441326900 +0200 -@@ -0,0 +1,40 @@ ++++ ilmbase-1.0.2/Half/CMakeLists.txt 2012-08-05 21:04:19.531275400 +0200 +@@ -0,0 +1,41 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +add_executable(eLut eLut.cpp) +add_executable(toFLoat toFloat.cpp) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h + DEPENDS eLut +) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h + DEPENDS toFloat +) + +set_source_files_properties( + eLut.h toFloat.h + PROPERTIES GENERATED ON + ) + + +set (HALF_SOURCES + half.cpp + eLut.h + toFloat.h + ) + +add_library(Half ${HALF_SOURCES}) + -+install(TARGETS Half RUNTIME DESTINATION bin ++install(TARGETS Half EXPORT IlmBase_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES + half.h + halfFunction.h + halfLimits.h + DESTINATION include) +diff -Nru -x '*~' ilmbase-1.0.2.orig/HalfTest/CMakeLists.txt ilmbase-1.0.2/HalfTest/CMakeLists.txt +--- ilmbase-1.0.2.orig/HalfTest/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ ilmbase-1.0.2/HalfTest/CMakeLists.txt 2012-08-06 02:14:50.714416800 +0200 +@@ -0,0 +1,17 @@ ++include_directories(${CMAKE_SOURCE_DIR}/Half ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++set(HalfTest_SRCS ++ main.cpp ++ testArithmetic.cpp ++ testBitPatterns.cpp ++ testClassification.cpp ++ testError.cpp ++ testFunction.cpp ++ testLimits.cpp ++ testSize.cpp ++) ++ ++add_executable(HalfTest ${HalfTest_SRCS}) ++target_link_libraries(HalfTest Half) ++ ++add_test(HalfTest HalfTest) +\ Kein Zeilenumbruch am Dateiende. diff -Nru -x '*~' ilmbase-1.0.2.orig/Iex/CMakeLists.txt ilmbase-1.0.2/Iex/CMakeLists.txt --- ilmbase-1.0.2.orig/Iex/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ ilmbase-1.0.2/Iex/CMakeLists.txt 2012-08-04 16:04:48.447327300 +0200 -@@ -0,0 +1,19 @@ ++++ ilmbase-1.0.2/Iex/CMakeLists.txt 2012-08-05 21:04:19.541275400 +0200 +@@ -0,0 +1,20 @@ +set (Iex_SOURCES + IexBaseExc.cpp + IexThrowErrnoExc.cpp + ) + +add_library(Iex ${Iex_SOURCES}) + -+install(TARGETS Iex RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) ++install(TARGETS Iex EXPORT IlmBase_targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + +install(FILES + Iex.h + IexBaseExc.h + IexErrnoExc.h + IexMacros.h + IexMathExc.h + IexThrowErrnoExc.h + DESTINATION include) +diff -Nru -x '*~' ilmbase-1.0.2.orig/IexTest/CMakeLists.txt ilmbase-1.0.2/IexTest/CMakeLists.txt +--- ilmbase-1.0.2.orig/IexTest/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ ilmbase-1.0.2/IexTest/CMakeLists.txt 2012-08-06 10:15:56.354360100 +0200 +@@ -0,0 +1,11 @@ ++include_directories(${CMAKE_SOURCE_DIR}/Iex ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++set(IexTest_SRCS ++ main.cpp ++ testBaseExc.cpp ++) ++ ++add_executable(IexTest ${IexTest_SRCS}) ++target_link_libraries(IexTest Iex) ++ ++add_test(IexTest IexTest) +\ Kein Zeilenumbruch am Dateiende. +diff -Nru -x '*~' ilmbase-1.0.2.orig/IlmBaseConfig.cmake ilmbase-1.0.2/IlmBaseConfig.cmake +--- ilmbase-1.0.2.orig/IlmBaseConfig.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ ilmbase-1.0.2/IlmBaseConfig.cmake 2012-08-05 21:23:16.152746900 +0200 +@@ -0,0 +1,23 @@ ++# - Config file for the FooBar package ++# It defines the following variables ++# ILMBASE_INCLUDE_DIRS - include directories for IlmBase ++# HALF_LIBRARY - the half library ++# IEX_LIBRARY - the iex library ++# IMATH_LIBRARY - the imath library ++# ILMTHREAD_LIBRARY - the ilmthread library ++# ILMBASE_LIBRARIES - all the ilmbase libraries to link against ++ ++# Compute paths ++get_filename_component(ILMBASE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) ++set(ILMBASE_INCLUDE_DIRS "${ILMBASE_CMAKE_DIR}/../../../include") ++ ++# Our library dependencies (contains definitions for IMPORTED targets) ++include("${ILMBASE_CMAKE_DIR}/IlmBaseTargets.cmake") ++ ++set(HALF_LIBRARY Half) ++set(IEX_LIBRARY Iex) ++set(ILMTHREAD_LIBRARY IlmThread) ++set(IMATH_LIBRARY Imath) ++ ++set(ILMBASE_LIBRARIES ${HALF_LIBRARY} ${IEX_LIBRARY} ${ILMTHREAD_LIBRARY} ${IMATH_LIBRARY}) ++ diff -Nru -x '*~' ilmbase-1.0.2.orig/IlmThread/CMakeLists.txt ilmbase-1.0.2/IlmThread/CMakeLists.txt --- ilmbase-1.0.2.orig/IlmThread/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ ilmbase-1.0.2/IlmThread/CMakeLists.txt 2012-08-04 16:04:48.452327600 +0200 -@@ -0,0 +1,27 @@ ++++ ilmbase-1.0.2/IlmThread/CMakeLists.txt 2012-08-05 21:04:19.541275400 +0200 +@@ -0,0 +1,28 @@ +set (IlmThread_SOURCES + IlmThread.cpp + IlmThreadMutex.cpp + IlmThreadMutexPosix.cpp + IlmThreadMutexWin32.cpp + IlmThreadPool.cpp + IlmThreadPosix.cpp + IlmThreadSemaphore.cpp + IlmThreadSemaphorePosix.cpp + IlmThreadSemaphorePosixCompat.cpp + IlmThreadSemaphoreWin32.cpp + IlmThreadWin32.cpp +) + +add_library(IlmThread ${IlmThread_SOURCES}) +target_link_libraries(IlmThread Iex) + -+install(TARGETS IlmThread RUNTIME DESTINATION bin ++install(TARGETS IlmThread EXPORT IlmBase_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES + IlmThread.h + IlmThreadMutex.h + IlmThreadPool.h + IlmThreadSemaphore.h + DESTINATION include) diff -Nru -x '*~' ilmbase-1.0.2.orig/Imath/CMakeLists.txt ilmbase-1.0.2/Imath/CMakeLists.txt --- ilmbase-1.0.2.orig/Imath/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ ilmbase-1.0.2/Imath/CMakeLists.txt 2012-08-04 16:04:48.458327900 +0200 -@@ -0,0 +1,48 @@ ++++ ilmbase-1.0.2/Imath/CMakeLists.txt 2012-08-05 21:04:19.551275500 +0200 +@@ -0,0 +1,49 @@ +set (Imath_SOURCES + ImathBox.cpp + ImathColorAlgo.cpp + ImathFun.cpp + ImathMatrixAlgo.cpp + ImathRandom.cpp + ImathShear.cpp + ImathVec.cpp +) + +add_library(Imath ${Imath_SOURCES}) +target_link_libraries(Imath Iex) + -+install(TARGETS Imath RUNTIME DESTINATION bin ++install(TARGETS Imath EXPORT IlmBase_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES + ImathBox.h + ImathBoxAlgo.h + ImathColor.h + ImathColorAlgo.h + ImathEuler.h + ImathExc.h + ImathFrame.h + ImathFrustum.h + ImathFun.h + ImathGL.h + ImathGLU.h + ImathHalfLimits.h + ImathInt64.h + ImathInterval.h + ImathLimits.h + ImathLine.h + ImathLineAlgo.h + ImathMath.h + ImathMatrix.h + ImathMatrixAlgo.h + ImathPlane.h + ImathPlatform.h + ImathQuat.h + ImathRandom.h + ImathRoots.h + ImathShear.h + ImathSphere.h + ImathVec.h + ImathVecAlgo.h + DESTINATION include) +diff -Nru -x '*~' ilmbase-1.0.2.orig/ImathTest/CMakeLists.txt ilmbase-1.0.2/ImathTest/CMakeLists.txt +--- ilmbase-1.0.2.orig/ImathTest/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ ilmbase-1.0.2/ImathTest/CMakeLists.txt 2012-08-06 10:20:02.847458700 +0200 +@@ -0,0 +1,27 @@ ++include_directories(${CMAKE_SOURCE_DIR}/Imath ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++set(ImathTest_SRCS ++ main.cpp ++ testExtractEuler.cpp ++ testExtractSHRT.cpp ++ testFrustum.cpp ++ testFun.cpp ++ testInvert.cpp ++ testMatrix.cpp ++ testRandom.cpp ++ testRoots.cpp ++ testShear.cpp ++ testColor.cpp ++ testQuatSetRotation.cpp ++ testLineAlgo.cpp ++ testQuatSlerp.cpp ++ testQuat.cpp ++ testBoxAlgo.cpp ++ testVec.cpp ++ testBox.cpp ++) ++ ++add_executable(ImathTest ${ImathTest_SRCS}) ++target_link_libraries(ImathTest Imath) ++ ++add_test(ImathTest ImathTest) +\ Kein Zeilenumbruch am Dateiende. diff --git a/portage/win32libs-sources/gettext-src/gettext-src-0.18.py b/portage/win32libs-sources/libgit2-src/libgit2-src-20120811.py similarity index 52% copy from portage/win32libs-sources/gettext-src/gettext-src-0.18.py copy to portage/win32libs-sources/libgit2-src/libgit2-src-20120811.py index e67c16a30..035ee77fd 100644 --- a/portage/win32libs-sources/gettext-src/gettext-src-0.18.py +++ b/portage/win32libs-sources/libgit2-src/libgit2-src-20120811.py @@ -1,24 +1,24 @@ # -*- coding: utf-8 -*- import info -import utils -from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - self.targets[ '0.18' ] = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.tar.gz' - self.targetInstSrc[ '0.18' ] = "gettext-0.18" - self.patchToApply['0.18'] = [("gettext-0.18-20100521.diff", 1)] - self.shortDescription = "GNU internationalization (i18n)" - self.defaultTarget = '0.18' + self.svnTargets['gitHEAD'] = 'https://github.com/libgit2/libgit2.git' + + + self.shortDescription = "a portable C library for accessing git repositories" + self.defaultTarget = 'gitHEAD' def setDependencies( self ): self.buildDependencies['virtual/base'] = 'default' - self.dependencies['win32libs-bin/win_iconv'] = 'default' + +from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) +# self.subinfo.options.configure.defines = "-DDBUS_REPLACE_LOCAL_DIR=ON " if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/librdf-src/librdf-src-1.0.14-20110726.py b/portage/win32libs-sources/librdf-src/librdf-src-1.0.14-20110726.py index d7e456e78..99725ac56 100644 --- a/portage/win32libs-sources/librdf-src/librdf-src-1.0.14-20110726.py +++ b/portage/win32libs-sources/librdf-src/librdf-src-1.0.14-20110726.py @@ -1,29 +1,29 @@ import info import emergePlatform from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): for ver in ['1.0.14']: self.targets[ ver ] = 'http://download.librdf.org/source/redland-' + ver + '.tar.gz' self.targetInstSrc[ ver ] = 'redland-' + ver - self.patchToApply[ '1.0.14' ] = ( 'redland-1.0.14-20110811.diff', 1 ) + self.patchToApply[ '1.0.14' ] = [( 'redland-1.0.14-20110811.diff', 1 )] self.targetDigests['1.0.14'] = '2561bf73f00f88e39f5c7b3a9b78f8d4ce7da955' self.shortDescription = "Resource Description Framework (RDF)" self.defaultTarget = '1.0.14' def setDependencies( self ): self.dependencies['win32libs-bin/raptor2'] = 'default' self.dependencies['win32libs-bin/rasqal'] = 'default' self.dependencies['win32libs-bin/sqlite'] = 'default' self.dependencies['win32libs-bin/pthreads'] = 'default' self.buildDependencies['virtual/base'] = 'default' class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute() diff --git a/portage/win32libs-sources/librdf-src/redland-1.0.14-20110811.diff b/portage/win32libs-sources/librdf-src/redland-1.0.14-20110811.diff index a129ad33d..65049b9ae 100644 --- a/portage/win32libs-sources/librdf-src/redland-1.0.14-20110811.diff +++ b/portage/win32libs-sources/librdf-src/redland-1.0.14-20110811.diff @@ -1,810 +1,815 @@ -Binary files redland-1.0.14.orig/.CMakeLists.txt.swp and redland-1.0.14/.CMakeLists.txt.swp differ -diff -Nru redland-1.0.14.orig/CMakeLists.txt redland-1.0.14/CMakeLists.txt ---- redland-1.0.14.orig/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/CMakeLists.txt 2011-08-11 09:29:02.751661279 +0000 -@@ -0,0 +1,190 @@ -+project(librdf) -+ -+cmake_minimum_required(VERSION 2.8) -+ -+set(REDLAND_VERSION_MAJOR 1) -+set(REDLAND_VERSION_MINOR 0) -+set(REDLAND_VERSION_RELEASE 14) -+set(VERSION ${REDLAND_VERSION_MAJOR}.${REDLAND_VERSION_MINOR}.${REDLAND_VERSION_RELEASE}) -+math(EXPR REDLAND_VERSION_DECIMAL "${REDLAND_VERSION_MAJOR} * 10000 + ${REDLAND_VERSION_MINOR} * 100 + ${REDLAND_VERSION_RELEASE}") -+ -+ -+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) -+find_package(PThreadsWin32 REQUIRED) -+find_package(Raptor 2.0 REQUIRED) -+find_package(Rasqal REQUIRED) -+find_package(Sqlite REQUIRED) -+ -+option(BUILD_STATIC "build a static librdf" OFF) -+option(BUILD_TESTS "build test executables for rdf" ON) -+option(BUILD_TOOLS "build tools for librdf" ON) -+ -+if(BUILD_TESTS) -+ enable_testing() -+endif(BUILD_TESTS) -+ -+if(MSVC) -+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996) -+endif(MSVC) -+include_directories( -+ src -+ utils -+ ${PTHREADS_WIN32_INCLUDE_DIR} -+ ${RAPTOR_INCLUDE_DIR} -+ ${RASQAL_INCLUDE_DIR} -+ ${SQLITE_INCLUDE_DIR} -+) -+ -+set(librdf_SRCS -+ src/rdf_init.c -+ src/rdf_raptor.c -+ src/rdf_uri.c -+ src/rdf_digest.c -+ src/rdf_hash.c -+ src/rdf_hash_cursor.c -+ src/rdf_hash_memory.c -+ src/rdf_model.c -+ src/rdf_model_storage.c -+ src/rdf_iterator.c -+ src/rdf_concepts.c -+ src/rdf_list.c -+ src/rdf_storage.c -+ src/rdf_storage_sql.c -+ src/rdf_stream.c -+ src/rdf_parser.c -+ src/rdf_parser_raptor.c -+ src/rdf_heuristics.c -+ src/rdf_files.c -+ src/rdf_utf8.c -+ src/rdf_query.c -+ src/rdf_query_results.c -+ src/rdf_query_rasqal.c -+ src/rdf_serializer.c -+ src/rdf_serializer_raptor.c -+ src/rdf_log.c -+ src/rdf_node_common.c -+ src/rdf_statement_common.c -+ src/rdf_node.c -+ src/rdf_statement.c -+ src/rdf_digest_md5.c -+ src/rdf_digest_sha1.c -+ src/rdf_parser_raptor.c -+ src/rdf_storage_list.c -+ src/rdf_storage_hashes.c -+ src/rdf_storage_trees.c -+ src/rdf_storage_file.c -+# theoretically it should be possible to build all storages, but we don't care I think -+ src/rdf_storage_sqlite.c -+) -+# src/rdf_hash_bdb.c -+ -+set(rdf_HDRS -+ src/redland.h -+ src/librdf.h -+ src/rdf_init.h -+ src/rdf_raptor.h -+ src/rdf_uri.h -+ src/rdf_node.h -+ src/rdf_statement.h -+ src/rdf_concepts.h -+ src/rdf_model.h -+ src/rdf_iterator.h -+ src/rdf_storage.h -+ src/rdf_storage_module.h -+ src/rdf_stream.h -+ src/rdf_parser.h -+ src/rdf_utf8.h -+ src/rdf_query.h -+ src/rdf_serializer.h -+ src/rdf_log.h -+ src/rdf_digest.h -+ src/rdf_hash.h -+ src/rdf_list.h -+) -+ -+add_definitions(-DPKGDATADIR="\"\"" -DLIBRDF_INTERNAL) -+ -+if(BUILD_STATIC) -+ set(_SHARED STATIC) -+ add_definitions(-DREDLAND_STATIC) -+else(BUILD_STATIC) -+ set(_SHARED SHARED) -+endif(BUILD_STATIC) -+ -+add_library(rdf ${_SHARED} ${librdf_SRCS}) -+set_target_properties(rdf PROPERTIES DEFINE_SYMBOL LIBRDF_EXPORTS) -+target_link_libraries(rdf ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) -+ -+# Dummy redland config is necessary for several find redland scripts -+set(PROGRAMM redland) -+add_definitions(-Dredland_version_string="${VERSION}" -Dredland_version_decimal=${REDLAND_VERSION_DECIMAL}) -+configure_file(${CMAKE_SOURCE_DIR}/cmake/config.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/redland-config.cpp) -+add_executable(redland-config ${CMAKE_CURRENT_BINARY_DIR}/redland-config.cpp) -+target_link_libraries(redland-config rdf) -+ -+set(_TARGETS -+ rdf -+ redland-config) -+ -+############################################################################### -+if(BUILD_TESTS OR BUILD_TOOLS) -+ add_library(rdf_static STATIC ${librdf_SRCS}) -+ set_target_properties(rdf_static PROPERTIES COMPILE_FLAGS -DREDLAND_STATIC) -+endif(BUILD_TESTS OR BUILD_TOOLS) -+ -+if(BUILD_TOOLS) -+ set(rdfproc_SRCS -+ utils/rdfproc.c -+ ) -+ if(MSVC) -+ list(APPEND rdfproc_SRCS utils/getopt.c) -+ endif(MSVC) -+ add_executable(rdfproc ${rdfproc_SRCS}) -+ set_target_properties(rdfproc PROPERTIES COMPILE_FLAGS "-DREDLAND_STATIC") -+ target_link_libraries(rdfproc rdf_static ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) -+ -+ set(redland_db_upgrade_SRCS -+ utils/db_upgrade.c -+ ) -+ if(MSVC) -+ list(APPEND redland_db_upgrade_SRCS utils/getopt.c) -+ endif(MSVC) -+ add_executable(redland-db-upgrade ${redland_db_upgrade_SRCS}) -+ set_target_properties(redland-db-upgrade PROPERTIES COMPILE_FLAGS "-DREDLAND_STATIC") -+ target_link_libraries(redland-db-upgrade rdf_static ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) -+ list(APPEND _TARGETS rdfproc redland-db-upgrade) -+endif(BUILD_TOOLS) -+ -+if(BUILD_TESTS) -+ set(rdf_TESTS -+ rdf_node -+ rdf_digest -+ rdf_hash -+ rdf_uri -+ rdf_statement -+ rdf_model -+ rdf_storage -+ rdf_parser -+ rdf_files -+ rdf_heuristics -+ rdf_utf8 -+ rdf_concepts -+ rdf_query -+ rdf_serializer -+ rdf_stream -+ rdf_iterator -+ rdf_init -+ ) -+ -+ foreach(_test ${rdf_TESTS}) -+ add_executable(${_test} src/${_test}.c) -+ set_target_properties(${_test} PROPERTIES COMPILE_FLAGS "-DSTANDALONE -DREDLAND_STATIC") -+ target_link_libraries(${_test} rdf_static ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) -+ add_test(${_test} ${_test}) -+ endforeach(_test ${rdf_TESTS}) -+endif(BUILD_TESTS) -+############################################################################### -+install(TARGETS ${_TARGETS} RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+install(FILES ${rdf_HDRS} DESTINATION include/redland) -diff -Nru redland-1.0.14.orig/cmake/config.cpp.in redland-1.0.14/cmake/config.cpp.in ---- redland-1.0.14.orig/cmake/config.cpp.in 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/config.cpp.in 2011-08-11 09:07:24.451341506 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/config.cpp.in redland-1.0.14/cmake/config.cpp.in +--- redland-1.0.14.orig/cmake/config.cpp.in 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/config.cpp.in 2013-01-03 16:21:04.043867200 +0100 @@ -0,0 +1,27 @@ +#include +#include +#include <@PROGRAMM@.h> + +int main(int argc, char **argv) +{ + if(argc != 2) + return 1; + if(strcmp(argv[1], "--version") == 0) { + fprintf(stdout, "%s", @PROGRAMM@_version_string); + return 0; + } + if(strcmp(argv[1], "--version-decimal") == 0) { + fprintf(stdout, "%d", @PROGRAMM@_version_decimal); + return 0; + } + if(strcmp(argv[1], "--cflags") == 0) { + fprintf(stdout, "\n"); + return 0; + } + if(strcmp(argv[1], "--libs") == 0) { + fprintf(stdout, "\n"); + return 0; + } + return 1; +} + -diff -Nru redland-1.0.14.orig/cmake/modules/FindLibraryWithDebug.cmake redland-1.0.14/cmake/modules/FindLibraryWithDebug.cmake ---- redland-1.0.14.orig/cmake/modules/FindLibraryWithDebug.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/modules/FindLibraryWithDebug.cmake 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/modules/FindLibraryWithDebug.cmake redland-1.0.14/cmake/modules/FindLibraryWithDebug.cmake +--- redland-1.0.14.orig/cmake/modules/FindLibraryWithDebug.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/modules/FindLibraryWithDebug.cmake 2013-01-03 16:21:04.047872600 +0100 @@ -0,0 +1,112 @@ +# +# FIND_LIBRARY_WITH_DEBUG +# -> enhanced FIND_LIBRARY to allow the search for an +# optional debug library with a WIN32_DEBUG_POSTFIX similar +# to CMAKE_DEBUG_POSTFIX when creating a shared lib +# it has to be the second and third argument +# +# Copyright (c) 2007, Christian Ehrlicher, +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname) + + IF(NOT ${win32_dbg_postfix_name} STREQUAL "WIN32_DEBUG_POSTFIX") + + # no WIN32_DEBUG_POSTFIX -> simply pass all arguments to FIND_LIBRARY + FIND_LIBRARY(${var_name} + ${win32_dbg_postfix_name} + ${dgb_postfix} + ${libname} + ${ARGN} + ) + + ELSE(NOT ${win32_dbg_postfix_name} STREQUAL "WIN32_DEBUG_POSTFIX") + + IF(NOT WIN32) + # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX + + FIND_LIBRARY(${var_name} ${libname} ${ARGN}) + + ELSE(NOT WIN32) + + # 1. get all possible libnames + SET(args ${ARGN}) + SET(libnames_release "") + SET(libnames_debug "") + + LIST(LENGTH args listCount) + + IF("${libname}" STREQUAL "NAMES") + SET(append_rest 0) + LIST(APPEND args " ") + + FOREACH(i RANGE ${listCount}) + LIST(GET args ${i} val) + + IF(append_rest) + LIST(APPEND newargs ${val}) + ELSE(append_rest) + IF("${val}" STREQUAL "PATHS") + LIST(APPEND newargs ${val}) + SET(append_rest 1) + ELSE("${val}" STREQUAL "PATHS") + LIST(APPEND libnames_release "${val}") + LIST(APPEND libnames_debug "${val}${dgb_postfix}") + ENDIF("${val}" STREQUAL "PATHS") + ENDIF(append_rest) + + ENDFOREACH(i) + + ELSE("${libname}" STREQUAL "NAMES") + + # just one name + LIST(APPEND libnames_release "${libname}") + LIST(APPEND libnames_debug "${libname}${dgb_postfix}") + + SET(newargs ${args}) + + ENDIF("${libname}" STREQUAL "NAMES") + + # search the release lib + FIND_LIBRARY(${var_name}_RELEASE + NAMES ${libnames_release} + ${newargs} + ) + + # search the debug lib + FIND_LIBRARY(${var_name}_DEBUG + NAMES ${libnames_debug} + ${newargs} + ) + + IF(${var_name}_RELEASE AND ${var_name}_DEBUG) + + # both libs found + SET(${var_name} optimized ${${var_name}_RELEASE} + debug ${${var_name}_DEBUG}) + + ELSE(${var_name}_RELEASE AND ${var_name}_DEBUG) + + IF(${var_name}_RELEASE) + + # only release found + SET(${var_name} ${${var_name}_RELEASE}) + + ELSE(${var_name}_RELEASE) + + # only debug (or nothing) found + SET(${var_name} ${${var_name}_DEBUG}) + + ENDIF(${var_name}_RELEASE) + + ENDIF(${var_name}_RELEASE AND ${var_name}_DEBUG) + + MARK_AS_ADVANCED(${var_name}_RELEASE) + MARK_AS_ADVANCED(${var_name}_DEBUG) + + ENDIF(NOT WIN32) + + ENDIF(NOT ${win32_dbg_postfix_name} STREQUAL "WIN32_DEBUG_POSTFIX") + +ENDMACRO(FIND_LIBRARY_WITH_DEBUG) -diff -Nru redland-1.0.14.orig/cmake/modules/FindPThreadsWin32.cmake redland-1.0.14/cmake/modules/FindPThreadsWin32.cmake ---- redland-1.0.14.orig/cmake/modules/FindPThreadsWin32.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/modules/FindPThreadsWin32.cmake 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/modules/FindPThreadsWin32.cmake redland-1.0.14/cmake/modules/FindPThreadsWin32.cmake +--- redland-1.0.14.orig/cmake/modules/FindPThreadsWin32.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/modules/FindPThreadsWin32.cmake 2013-01-03 17:06:25.752763700 +0100 @@ -0,0 +1,18 @@ +# - Find the native PThreadsWin32 includes and library +# +# This module defines +# PTHREADS_WIN32_INCLUDE_DIR, where to find pthread.h, etc. +# PTHREADS_WIN32_LIBRARIES, the libraries to link against to use PThreadsWin32. +# PTHREADS_WIN32_FOUND, If false, do not try to use PThreadsWin32. + +#============================================================================= +# +find_path(PTHREADS_WIN32_INCLUDE_DIR pthread.h) +find_library(PTHREADS_WIN32_LIBRARIES NAMES pthreads) + +# handle the QUIETLY and REQUIRED arguments and set PTHREADS_WIN32_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PThreadsWin32 DEFAULT_MSG PTHREADS_WIN32_LIBRARIES PTHREADS_WIN32_INCLUDE_DIR) + +mark_as_advanced(PTHREADS_WIN32_INCLUDE_DIR PTHREADS_WIN32_LIBRARIES) -diff -Nru redland-1.0.14.orig/cmake/modules/FindRaptor.cmake redland-1.0.14/cmake/modules/FindRaptor.cmake ---- redland-1.0.14.orig/cmake/modules/FindRaptor.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/modules/FindRaptor.cmake 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/modules/FindRaptor.cmake redland-1.0.14/cmake/modules/FindRaptor.cmake +--- redland-1.0.14.orig/cmake/modules/FindRaptor.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/modules/FindRaptor.cmake 2013-01-03 16:21:04.056866200 +0100 @@ -0,0 +1,100 @@ +# - Try to find the Raptor RDF parsing library (http://librdf.org/raptor/) +# Once done this will define +# +# RAPTOR_FOUND - system has Raptor +# RAPTOR_LIBRARIES - Link these to use Raptor +# RAPTOR_INCLUDE_DIR - Include directory for using Raptor +# RAPTOR_DEFINITIONS - Compiler switches required for using Raptor +# +# Capabilities +# RAPTOR_HAVE_TRIG - Set if raptor has TRIG + +# (c) 2007-2011 Sebastian Trueg +# (c) 2011 Artem Serebriyskiy +# (c) 2011 Michael Jansen +# +# Based on FindFontconfig Copyright (c) 2006,2007 Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +MACRO ( FIND_RAPTOR libname libhints includehints ) + find_library_with_debug( + RAPTOR_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES ${libname} + HINTS ${libhints}) + find_path( + RAPTOR_INCLUDE_DIR raptor.h + HINTS ${includehints} + PATH_SUFFIXES ${libname}) +ENDMACRO () + + + +# Check if we have cached results in case the last round was successful. +if ( NOT( RAPTOR_INCLUDE_DIR AND RAPTOR_LIBRARIES ) OR NOT RAPTOR_FOUND ) + + include(FindLibraryWithDebug) + include(MacroEnsureVersion) + find_package(PkgConfig) + + # Vy default look for version 2.0 + if (NOT Raptor_FIND_VERSION ) + set( Raptor_FIND_VERSION "2.0") + set( Raptor_FIND_VERSION_MAJOR "2" ) + set( Raptor_FIND_VERSION_MINOR "0" ) + endif () + + if ( Raptor_FIND_VERSION_MAJOR EQUAL "2" ) + + if ( NOT WIN32 ) + pkg_check_modules(PC_RAPTOR2 raptor2) + if ( PC_RAPTOR2_FOUND ) + set(RAPTOR_DEFINITIONS ${PC_RAPTOR2_CFLAGS_OTHER}) + set(RAPTOR_VERSION ${PC_RAPTOR2_VERSION} CACHE STRING "Raptor Version found" ) + endif () + endif () + find_raptor( raptor2 "${PC_RAPTOR2_LIBDIR};${PC_RAPTOR2_LIBRARY_DIRS}" "${PC_RAPTOR2_INCLUDEDIR};${PC_RAPTOR2_INCLUDE_DIRS}") + + elseif ( Raptor_FIND_VERSION_MAJOR EQUAL "1" ) + + if ( NOT WIN32 ) + pkg_check_modules(PC_RAPTOR raptor) + if ( PC_RAPTOR_FOUND ) + set(RAPTOR_DEFINITIONS ${PC_RAPTOR_CFLAGS_OTHER}) + set(RAPTOR_VERSION ${PC_RAPTOR_VERSION} CACHE STRING "Raptor Version found" ) + endif () + endif () + find_raptor( raptor "${PC_RAPTOR_LIBDIR};${PC_RAPTOR_LIBRARY_DIRS}" "${PC_RAPTOR_INCLUDEDIR};${PC_RAPTOR_INCLUDE_DIRS}") + + else () + + message( FATAL_ERROR "No idea how to check for version : ${Raptor_FIND_VERSION}") + + endif() + + if (RAPTOR_VERSION) + MACRO_ENSURE_VERSION("1.4.16" ${RAPTOR_VERSION} RAPTOR_HAVE_TRIG) + endif (RAPTOR_VERSION) + + mark_as_advanced(RAPTOR_INCLUDE_DIR RAPTOR_LIBRARIES) + +endif () # Check for cached values + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args( + Raptor + RAPTOR_LIBRARIES RAPTOR_INCLUDE_DIR) + +mark_as_advanced(RAPTOR_VERSION) + +if (NOT RAPTOR_FOUND AND Raptor_FIND_VERSION_MAJOR EQUAL "2" AND NOT Raptor_FIND_QUIET ) + pkg_check_modules(PC_RAPTOR raptor) + if (PC_RAPTOR_FOUND) + message( STATUS "You have raptor1 version ${PC_RAPTOR_VERSION} installed. Please update." ) + endif () +endif () + -diff -Nru redland-1.0.14.orig/cmake/modules/FindRasqal.cmake redland-1.0.14/cmake/modules/FindRasqal.cmake ---- redland-1.0.14.orig/cmake/modules/FindRasqal.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/modules/FindRasqal.cmake 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/modules/FindRasqal.cmake redland-1.0.14/cmake/modules/FindRasqal.cmake +--- redland-1.0.14.orig/cmake/modules/FindRasqal.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/modules/FindRasqal.cmake 2013-01-03 16:21:04.064869400 +0100 @@ -0,0 +1,18 @@ +# - Find the native Rasqal includes and library +# +# This module defines +# RASQAL_INCLUDE_DIR, where to find rasqal.h, etc. +# RASQAL_LIBRARIES, the libraries to link against to use Rasqal. +# RASQAL_FOUND, If false, do not try to use Rasqal. + +#============================================================================= +# +find_path(RASQAL_INCLUDE_DIR rasqal.h PATH_SUFFIXES rasqal) +find_library(RASQAL_LIBRARIES NAMES rasqal) + +# handle the QUIETLY and REQUIRED arguments and set RASQAL_FOUND to TRUE if +# all listed variables are TRUE +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Rasqal DEFAULT_MSG RASQAL_LIBRARIES RASQAL_INCLUDE_DIR) + +mark_as_advanced(RASQAL_INCLUDE_DIR RASQAL_LIBRARIES) -diff -Nru redland-1.0.14.orig/cmake/modules/FindSqlite.cmake redland-1.0.14/cmake/modules/FindSqlite.cmake ---- redland-1.0.14.orig/cmake/modules/FindSqlite.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/modules/FindSqlite.cmake 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/modules/FindSqlite.cmake redland-1.0.14/cmake/modules/FindSqlite.cmake +--- redland-1.0.14.orig/cmake/modules/FindSqlite.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/modules/FindSqlite.cmake 2013-01-03 16:21:04.068869400 +0100 @@ -0,0 +1,50 @@ +# - Try to find Sqlite +# Once done this will define +# +# SQLITE_FOUND - system has Sqlite +# SQLITE_INCLUDE_DIR - the Sqlite include directory +# SQLITE_LIBRARIES - Link these to use Sqlite +# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +# Copyright (c) 2008, Gilles Caulier, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES ) + # in cache already + SET(Sqlite_FIND_QUIETLY TRUE) +endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES ) + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +if( NOT WIN32 ) + find_package(PkgConfig) + + pkg_check_modules(PC_SQLITE QUIET sqlite3) + + set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) +endif( NOT WIN32 ) + +find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h + PATHS + ${PC_SQLITE_INCLUDEDIR} + ${PC_SQLITE_INCLUDE_DIRS} +) + +find_library(SQLITE_LIBRARIES NAMES sqlite3 + PATHS + ${PC_SQLITE_LIBDIR} + ${PC_SQLITE_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) + +# show the SQLITE_INCLUDE_DIR and SQLITE_LIBRARIES variables only in the advanced view +mark_as_advanced(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) + -diff -Nru redland-1.0.14.orig/cmake/modules/MacroEnsureVersion.cmake redland-1.0.14/cmake/modules/MacroEnsureVersion.cmake ---- redland-1.0.14.orig/cmake/modules/MacroEnsureVersion.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/cmake/modules/MacroEnsureVersion.cmake 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/cmake/modules/MacroEnsureVersion.cmake redland-1.0.14/cmake/modules/MacroEnsureVersion.cmake +--- redland-1.0.14.orig/cmake/modules/MacroEnsureVersion.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/cmake/modules/MacroEnsureVersion.cmake 2013-01-03 16:21:04.072870500 +0100 @@ -0,0 +1,71 @@ +# This macro compares version numbers of the form "x.y.z" +# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) +# will set FOO_VERSIN_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION +# where both have to be in a 3-part-version format, leading and trailing +# text is ok, e.g. +# MACRO_ENSURE_VERSION( "2.5.31" "flex 2.5.4a" VERSION_OK) +# which means 2.5.31 is required and "flex 2.5.4a" is what was found on the system + +# Copyright (c) 2006, David Faure, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +MACRO(MACRO_ENSURE_VERSION requested_version found_version var_too_old) + + # parse the parts of the version string + STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_major_vers "${requested_version}") + STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" req_minor_vers "${requested_version}") + STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_patch_vers "${requested_version}") + + STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" found_major_vers "${found_version}") + STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" found_minor_vers "${found_version}") + STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" found_patch_vers "${found_version}") + + # compute an overall version number which can be compared at once + MATH(EXPR req_vers_num "${req_major_vers}*10000 + ${req_minor_vers}*100 + ${req_patch_vers}") + MATH(EXPR found_vers_num "${found_major_vers}*10000 + ${found_minor_vers}*100 + ${found_patch_vers}") + + if (found_vers_num LESS req_vers_num) + set( ${var_too_old} FALSE ) + else (found_vers_num LESS req_vers_num) + set( ${var_too_old} TRUE ) + endif (found_vers_num LESS req_vers_num) + +ENDMACRO(MACRO_ENSURE_VERSION) + + +# This macro compares version numbers of the form "x.y" +# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) +# will set FOO_VERSIN_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION +# where both have to be in a 2-part-version format, leading and trailing +# text is ok, e.g. +# MACRO_ENSURE_VERSION( "0.5" "foo 0.6" VERSION_OK) +# which means 0.5 is required and "foo 0.6" is what was found on the system + +# Copyright (c) 2006, David Faure, +# Copyright (c) 2007, Pino Toscano, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +MACRO(MACRO_ENSURE_VERSION2 requested_version found_version var_too_old) + + # parse the parts of the version string + STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" req_major_vers "${requested_version}") + STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" req_minor_vers "${requested_version}") + + STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+.*" "\\1" found_major_vers "${found_version}") + STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+).*" "\\1" found_minor_vers "${found_version}") + + # compute an overall version number which can be compared at once + MATH(EXPR req_vers_num "${req_major_vers}*100 + ${req_minor_vers}") + MATH(EXPR found_vers_num "${found_major_vers}*100 + ${found_minor_vers}") + + if (found_vers_num LESS req_vers_num) + set( ${var_too_old} FALSE ) + else (found_vers_num LESS req_vers_num) + set( ${var_too_old} TRUE ) + endif (found_vers_num LESS req_vers_num) + +ENDMACRO(MACRO_ENSURE_VERSION2) -diff -Nru redland-1.0.14.orig/src/CMakeLists.txt redland-1.0.14/src/CMakeLists.txt ---- redland-1.0.14.orig/src/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 -+++ redland-1.0.14/src/CMakeLists.txt 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/CMakeLists.txt redland-1.0.14/CMakeLists.txt +--- redland-1.0.14.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/CMakeLists.txt 2013-01-03 17:10:05.725235500 +0100 +@@ -0,0 +1,196 @@ ++project(librdf) ++ ++cmake_minimum_required(VERSION 2.8) ++ ++set(REDLAND_VERSION_MAJOR 1) ++set(REDLAND_VERSION_MINOR 0) ++set(REDLAND_VERSION_RELEASE 14) ++set(VERSION ${REDLAND_VERSION_MAJOR}.${REDLAND_VERSION_MINOR}.${REDLAND_VERSION_RELEASE}) ++math(EXPR REDLAND_VERSION_DECIMAL "${REDLAND_VERSION_MAJOR} * 10000 + ${REDLAND_VERSION_MINOR} * 100 + ${REDLAND_VERSION_RELEASE}") ++ ++ ++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) ++find_package(Threads REQUIRED) ++if(CMAKE_USE_PTHREADS_INIT) ++ set(PTHREADS_WIN32_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) ++ set(PTHREADS_WIN32_INCLUDE_DIR .) ++else(CMAKE_USE_PTHREADS_INIT) ++ find_package(PThreadsWin32 REQUIRED) ++endif(CMAKE_USE_PTHREADS_INIT) ++find_package(Raptor 2.0 REQUIRED) ++find_package(Rasqal REQUIRED) ++find_package(Sqlite REQUIRED) ++ ++option(BUILD_STATIC "build a static librdf" OFF) ++option(BUILD_TESTS "build test executables for rdf" ON) ++option(BUILD_TOOLS "build tools for librdf" ON) ++ ++if(BUILD_TESTS) ++ enable_testing() ++endif(BUILD_TESTS) ++ ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996) ++endif(MSVC) ++include_directories( ++ src ++ utils ++ ${PTHREADS_WIN32_INCLUDE_DIR} ++ ${RAPTOR_INCLUDE_DIR} ++ ${RASQAL_INCLUDE_DIR} ++ ${SQLITE_INCLUDE_DIR} ++) ++ ++set(librdf_SRCS ++ src/rdf_init.c ++ src/rdf_raptor.c ++ src/rdf_uri.c ++ src/rdf_digest.c ++ src/rdf_hash.c ++ src/rdf_hash_cursor.c ++ src/rdf_hash_memory.c ++ src/rdf_model.c ++ src/rdf_model_storage.c ++ src/rdf_iterator.c ++ src/rdf_concepts.c ++ src/rdf_list.c ++ src/rdf_storage.c ++ src/rdf_storage_sql.c ++ src/rdf_stream.c ++ src/rdf_parser.c ++ src/rdf_parser_raptor.c ++ src/rdf_heuristics.c ++ src/rdf_files.c ++ src/rdf_utf8.c ++ src/rdf_query.c ++ src/rdf_query_results.c ++ src/rdf_query_rasqal.c ++ src/rdf_serializer.c ++ src/rdf_serializer_raptor.c ++ src/rdf_log.c ++ src/rdf_node_common.c ++ src/rdf_statement_common.c ++ src/rdf_node.c ++ src/rdf_statement.c ++ src/rdf_digest_md5.c ++ src/rdf_digest_sha1.c ++ src/rdf_parser_raptor.c ++ src/rdf_storage_list.c ++ src/rdf_storage_hashes.c ++ src/rdf_storage_trees.c ++ src/rdf_storage_file.c ++# theoretically it should be possible to build all storages, but we don't care I think ++ src/rdf_storage_sqlite.c ++) ++# src/rdf_hash_bdb.c ++ ++set(rdf_HDRS ++ src/redland.h ++ src/librdf.h ++ src/rdf_init.h ++ src/rdf_raptor.h ++ src/rdf_uri.h ++ src/rdf_node.h ++ src/rdf_statement.h ++ src/rdf_concepts.h ++ src/rdf_model.h ++ src/rdf_iterator.h ++ src/rdf_storage.h ++ src/rdf_storage_module.h ++ src/rdf_stream.h ++ src/rdf_parser.h ++ src/rdf_utf8.h ++ src/rdf_query.h ++ src/rdf_serializer.h ++ src/rdf_log.h ++ src/rdf_digest.h ++ src/rdf_hash.h ++ src/rdf_list.h ++) ++ ++add_definitions(-DPKGDATADIR="\"\"" -DLIBRDF_INTERNAL) ++ ++if(BUILD_STATIC) ++ set(_SHARED STATIC) ++ add_definitions(-DREDLAND_STATIC) ++else(BUILD_STATIC) ++ set(_SHARED SHARED) ++endif(BUILD_STATIC) ++ ++add_library(rdf ${_SHARED} ${librdf_SRCS}) ++set_target_properties(rdf PROPERTIES DEFINE_SYMBOL LIBRDF_EXPORTS) ++target_link_libraries(rdf ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) ++ ++# Dummy redland config is necessary for several find redland scripts ++set(PROGRAMM redland) ++add_definitions(-Dredland_version_string="${VERSION}" -Dredland_version_decimal=${REDLAND_VERSION_DECIMAL}) ++configure_file(${CMAKE_SOURCE_DIR}/cmake/config.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/redland-config.cpp) ++add_executable(redland-config ${CMAKE_CURRENT_BINARY_DIR}/redland-config.cpp) ++target_link_libraries(redland-config rdf) ++ ++set(_TARGETS ++ rdf ++ redland-config) ++ ++############################################################################### ++if(BUILD_TESTS OR BUILD_TOOLS) ++ add_library(rdf_static STATIC ${librdf_SRCS}) ++ set_target_properties(rdf_static PROPERTIES COMPILE_FLAGS -DREDLAND_STATIC) ++endif(BUILD_TESTS OR BUILD_TOOLS) ++ ++if(BUILD_TOOLS) ++ set(rdfproc_SRCS ++ utils/rdfproc.c ++ ) ++ if(MSVC) ++ list(APPEND rdfproc_SRCS utils/getopt.c) ++ endif(MSVC) ++ add_executable(rdfproc ${rdfproc_SRCS}) ++ set_target_properties(rdfproc PROPERTIES COMPILE_FLAGS "-DREDLAND_STATIC") ++ target_link_libraries(rdfproc rdf_static ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) ++ ++ set(redland_db_upgrade_SRCS ++ utils/db_upgrade.c ++ ) ++ if(MSVC) ++ list(APPEND redland_db_upgrade_SRCS utils/getopt.c) ++ endif(MSVC) ++ add_executable(redland-db-upgrade ${redland_db_upgrade_SRCS}) ++ set_target_properties(redland-db-upgrade PROPERTIES COMPILE_FLAGS "-DREDLAND_STATIC") ++ target_link_libraries(redland-db-upgrade rdf_static ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) ++ list(APPEND _TARGETS rdfproc redland-db-upgrade) ++endif(BUILD_TOOLS) ++ ++if(BUILD_TESTS) ++ set(rdf_TESTS ++ rdf_node ++ rdf_digest ++ rdf_hash ++ rdf_uri ++ rdf_statement ++ rdf_model ++ rdf_storage ++ rdf_parser ++ rdf_files ++ rdf_heuristics ++ rdf_utf8 ++ rdf_concepts ++ rdf_query ++ rdf_serializer ++ rdf_stream ++ rdf_iterator ++ rdf_init ++ ) ++ ++ foreach(_test ${rdf_TESTS}) ++ add_executable(${_test} src/${_test}.c) ++ set_target_properties(${_test} PROPERTIES COMPILE_FLAGS "-DSTANDALONE -DREDLAND_STATIC") ++ target_link_libraries(${_test} rdf_static ${PTHREADS_WIN32_LIBRARIES} ${RAPTOR_LIBRARIES} ${RASQAL_LIBRARIES} ${SQLITE_LIBRARIES}) ++ add_test(${_test} ${_test}) ++ endforeach(_test ${rdf_TESTS}) ++endif(BUILD_TESTS) ++############################################################################### ++install(TARGETS ${_TARGETS} RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++install(FILES ${rdf_HDRS} DESTINATION include/redland) +diff -Nru -x '*~' redland-1.0.14.orig/src/CMakeLists.txt redland-1.0.14/src/CMakeLists.txt +--- redland-1.0.14.orig/src/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ redland-1.0.14/src/CMakeLists.txt 2013-01-03 16:21:04.088872300 +0100 @@ -0,0 +1,6 @@ +set(teststr "teststr") +if(${teststr} STREQUAL "test" OR MSVC) +message(STATUS "ok") +else() +message(STATUS "failed") +endif() \ No newline at end of file -diff -Nru redland-1.0.14.orig/src/librdf.h redland-1.0.14/src/librdf.h ---- redland-1.0.14.orig/src/librdf.h 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/src/librdf.h 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/src/librdf.h redland-1.0.14/src/librdf.h +--- redland-1.0.14.orig/src/librdf.h 2011-07-24 00:15:31.000000000 +0200 ++++ redland-1.0.14/src/librdf.h 2013-01-03 16:21:04.092870500 +0100 @@ -52,7 +52,7 @@ # ifdef REDLAND_STATIC # define REDLAND_API # else -# ifdef LIBRDF_INTERNAL +# ifdef LIBRDF_EXPORTS # define REDLAND_API _declspec(dllexport) # else # define REDLAND_API _declspec(dllimport) -diff -Nru redland-1.0.14.orig/src/rdf_model.c redland-1.0.14/src/rdf_model.c ---- redland-1.0.14.orig/src/rdf_model.c 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/src/rdf_model.c 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/src/rdf_model.c redland-1.0.14/src/rdf_model.c +--- redland-1.0.14.orig/src/rdf_model.c 2011-07-23 09:18:52.000000000 +0200 ++++ redland-1.0.14/src/rdf_model.c 2013-01-03 16:21:04.098873500 +0100 @@ -2028,6 +2028,8 @@ int remove_count=0; int status=0; raptor_iostream* iostr; + librdf_node* literal_node; + char literal[6]; iostr = raptor_new_iostream_to_file_handle(world->raptor_world_ptr, stderr); @@ -2117,8 +2119,6 @@ librdf_statement_set_subject(statement, librdf_new_node_from_uri_string(world, (const unsigned char*)"http://example.org/")); librdf_statement_set_predicate(statement, librdf_new_node_from_uri_string(world, (const unsigned char*)"http://purl.org/dc/elements/1.1/creator")); - librdf_node* literal_node; - char literal[6]; strncpy(literal, "DaveX", 6); literal[4]='0'; -diff -Nru redland-1.0.14.orig/src/rdf_query.c redland-1.0.14/src/rdf_query.c ---- redland-1.0.14.orig/src/rdf_query.c 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/src/rdf_query.c 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/src/rdf_query.c redland-1.0.14/src/rdf_query.c +--- redland-1.0.14.orig/src/rdf_query.c 2011-07-19 04:09:30.000000000 +0200 ++++ redland-1.0.14/src/rdf_query.c 2013-01-03 16:21:04.107873000 +0100 @@ -656,7 +656,7 @@ " #define DATA_LANGUAGE "turtle" #define DATA_BASE_URI "http://example.org/" -#define QUERY_STRING "select ?x where (?x rdf:type ?y)"; +#define QUERY_STRING "select ?x where (?x rdf:type ?y)" #define QUERY_LANGUAGE "rdql" #define VARIABLES_COUNT 1 -diff -Nru redland-1.0.14.orig/src/rdf_serializer.c redland-1.0.14/src/rdf_serializer.c ---- redland-1.0.14.orig/src/rdf_serializer.c 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/src/rdf_serializer.c 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/src/rdf_serializer.c redland-1.0.14/src/rdf_serializer.c +--- redland-1.0.14.orig/src/rdf_serializer.c 2011-01-25 05:26:00.000000000 +0100 ++++ redland-1.0.14/src/rdf_serializer.c 2013-01-03 16:21:04.124875100 +0100 @@ -915,7 +915,7 @@ } LogData; -static int +static int REDLAND_CALLBACK_STDCALL log_handler(void *user_data, librdf_log_message *message) { struct log_data* ld=(struct log_data*)user_data; -diff -Nru redland-1.0.14.orig/src/rdf_storage_sql.c redland-1.0.14/src/rdf_storage_sql.c ---- redland-1.0.14.orig/src/rdf_storage_sql.c 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/src/rdf_storage_sql.c 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/src/rdf_storage_sql.c redland-1.0.14/src/rdf_storage_sql.c +--- redland-1.0.14.orig/src/rdf_storage_sql.c 2011-01-21 16:56:38.000000000 +0100 ++++ redland-1.0.14/src/rdf_storage_sql.c 2013-01-03 16:21:04.129875900 +0100 @@ -200,7 +200,7 @@ { if(!dir) dir=PKGDATADIR; - + return librdf_new_sql_config(storage->world, storage->factory->name, layout, dir, librdf_storage_sql_dbconfig_predicates); -diff -Nru redland-1.0.14.orig/src/win32_rdf_config.h redland-1.0.14/src/win32_rdf_config.h ---- redland-1.0.14.orig/src/win32_rdf_config.h 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/src/win32_rdf_config.h 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/src/win32_rdf_config.h redland-1.0.14/src/win32_rdf_config.h +--- redland-1.0.14.orig/src/win32_rdf_config.h 2011-07-24 00:15:31.000000000 +0200 ++++ redland-1.0.14/src/win32_rdf_config.h 2013-01-03 16:21:04.135878500 +0100 @@ -75,40 +75,44 @@ */ /* BDB has close method with 2 args */ -#define HAVE_BDB_CLOSE_2_ARGS 1 +/* #define HAVE_BDB_CLOSE_2_ARGS 1 */ +#ifdef __MINGW32__ +#define HAVE_STRUCT_TIMESPEC 1 +#endif + /* BDB defines DBC */ -#define HAVE_BDB_CURSOR 1 +/* #define HAVE_BDB_CURSOR 1 */ /* BDB cursor method has 4 arguments */ -#define HAVE_BDB_CURSOR_4_ARGS 1 +/* #define HAVE_BDB_CURSOR_4_ARGS 1 */ /* BDB defines DB_TXN */ -#define HAVE_BDB_DB_TXN 1 +/* #define HAVE_BDB_DB_TXN 1 */ /* BDB has fd method with 2 args */ -#define HAVE_BDB_FD_2_ARGS 1 +/* #define HAVE_BDB_FD_2_ARGS 1 * /* Have BDB hash support */ -#define HAVE_BDB_HASH 1 +/* #define HAVE_BDB_HASH 1 */ /* BDB has open method with 6 args */ /* #undef HAVE_BDB_OPEN_6_ARGS */ /* BDB has open method with 7 args */ -#define HAVE_BDB_OPEN_7_ARGS 1 +/* #define HAVE_BDB_OPEN_7_ARGS 1 */ /* BDB has set_flags method */ -#define HAVE_BDB_SET_FLAGS 1 +/* #define HAVE_BDB_SET_FLAGS 1 */ /* BDB has dbopen method */ /* #undef HAVE_DBOPEN */ /* BDB has db_create method */ -#define HAVE_DB_CREATE 1 +/* #define HAVE_DB_CREATE 1 */ /* Define to 1 if you have the header file. */ -#define HAVE_DB_H 1 +/* #define HAVE_DB_H 1 */ /* Define to 1 if you have the header file. */ /* undef HAVE_DLFCN_H */ @@ -129,10 +133,10 @@ #define HAVE_GETOPT 1 /* Define to 1 if you have the header file. */ -#define HAVE_GETOPT_H 1 +/* #define HAVE_GETOPT_H 1 */ /* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 +/* #define HAVE_GETOPT_LONG 1 */ /* Define to 1 if you have the `gettimeofday' function. */ /* #undef HAVE_GETTIMEOFDAY */ @@ -162,7 +166,7 @@ #define HAVE_MKTEMP 1 /* MySQL libraries are present */ -#define HAVE_MYSQL 1 +/* #define HAVE_MYSQL 1 */ /* Define to 1 if you have the header file. */ /* #undef HAVE_OPENSSL_CRYPTO_H */ -diff -Nru redland-1.0.14.orig/utils/rdfproc.c redland-1.0.14/utils/rdfproc.c ---- redland-1.0.14.orig/utils/rdfproc.c 2011-08-11 09:00:23.881216473 +0000 -+++ redland-1.0.14/utils/rdfproc.c 2011-08-11 09:03:05.551458941 +0000 +diff -Nru -x '*~' redland-1.0.14.orig/utils/rdfproc.c redland-1.0.14/utils/rdfproc.c +--- redland-1.0.14.orig/utils/rdfproc.c 2011-07-19 04:09:30.000000000 +0200 ++++ redland-1.0.14/utils/rdfproc.c 2013-01-03 16:21:04.143877200 +0100 @@ -28,7 +28,7 @@ #endif #ifdef WIN32 -#include +#include #endif #include @@ -43,7 +43,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_UNISTD_H #include +#endif #include #include @@ -164,7 +166,7 @@ static const char *default_storage_options="hash-type='bdb',dir='.'"; -static int +static int REDLAND_CALLBACK_STDCALL log_handler(void *user_data, librdf_log_message *message) { /* int code=message->code; */ /* The error code */ diff --git a/portage/win32libs-sources/libspectre-src/libspectre-src-0.2.6.py b/portage/win32libs-sources/libspectre-src/libspectre-src-0.2.6.py index 4b45463ef..60cf026c1 100644 --- a/portage/win32libs-sources/libspectre-src/libspectre-src-0.2.6.py +++ b/portage/win32libs-sources/libspectre-src/libspectre-src-0.2.6.py @@ -1,26 +1,28 @@ import info class subinfo(info.infoclass): def setTargets( self ): """ """ for ver in ['0.2.1', '0.2.6']: self.targets[ver] = "http://libspectre.freedesktop.org/releases/libspectre-" + ver + ".tar.gz" self.targetInstSrc[ver] = "libspectre-" + ver self.patchToApply["0.2.1"] = ("spectre-0.2.1-cmake.diff", 1) self.patchToApply["0.2.6"] = ("libspectre-0.2.6-20101117.diff", 1) self.targetDigests['0.2.6'] = '819475c7e34a1e9bc2e876110fee530b42aecabd' self.shortDescription = "a wrapper library for libgs" self.defaultTarget = '0.2.6' def setDependencies( self ): self.dependencies['win32libs-bin/ghostscript'] = 'default' + self.dependencies['dev-util/cmake'] = 'default' + self.dependencies['virtual/base'] = 'default' from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__(self) if __name__ == '__main__': - Package().execute() \ No newline at end of file + Package().execute() diff --git a/portage/win32libs-sources/mysql-src/mysql-5.5.25a-20120804.diff b/portage/win32libs-sources/mysql-src/mysql-5.5.25a-20120804.diff index 5b05f4393..fb1723972 100644 --- a/portage/win32libs-sources/mysql-src/mysql-5.5.25a-20120804.diff +++ b/portage/win32libs-sources/mysql-src/mysql-5.5.25a-20120804.diff @@ -1,493 +1,493 @@ diff -Nru -x '*~' mysql-5.5.25a.orig/client/mysqlslap.c mysql-5.5.25a/client/mysqlslap.c --- mysql-5.5.25a.orig/client/mysqlslap.c 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/client/mysqlslap.c 2012-08-05 01:53:10.137433600 +0200 @@ -280,7 +280,7 @@ return s + us; } -#ifdef __WIN__ +#ifdef _MSC_VER static int gettimeofday(struct timeval *tp, void *tzp) { unsigned int ticks; diff -Nru -x '*~' mysql-5.5.25a.orig/cmake/FindLibraryWithDebug.cmake mysql-5.5.25a/cmake/FindLibraryWithDebug.cmake --- mysql-5.5.25a.orig/cmake/FindLibraryWithDebug.cmake 1970-01-01 01:00:00.000000000 +0100 +++ mysql-5.5.25a/cmake/FindLibraryWithDebug.cmake 2012-08-05 01:53:10.146434100 +0200 @@ -0,0 +1,113 @@ +# +# FIND_LIBRARY_WITH_DEBUG +# -> enhanced FIND_LIBRARY to allow the search for an +# optional debug library with a WIN32_DEBUG_POSTFIX similar +# to CMAKE_DEBUG_POSTFIX when creating a shared lib +# it has to be the second and third argument + +# Copyright (c) 2007, Christian Ehrlicher, +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname) + + IF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + + # no WIN32_DEBUG_POSTFIX -> simply pass all arguments to FIND_LIBRARY + FIND_LIBRARY(${var_name} + ${win32_dbg_postfix_name} + ${dgb_postfix} + ${libname} + ${ARGN} + ) + + ELSE(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + + IF(NOT WIN32) + # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX + + FIND_LIBRARY(${var_name} ${libname} ${ARGN}) + + ELSE(NOT WIN32) + + # 1. get all possible libnames + SET(args ${ARGN}) + SET(newargs "") + SET(libnames_release "") + SET(libnames_debug "") + + LIST(LENGTH args listCount) + + IF("${libname}" STREQUAL "NAMES") + SET(append_rest 0) + LIST(APPEND args " ") + + FOREACH(i RANGE ${listCount}) + LIST(GET args ${i} val) + + IF(append_rest) + LIST(APPEND newargs ${val}) + ELSE(append_rest) + IF("${val}" STREQUAL "PATHS") + LIST(APPEND newargs ${val}) + SET(append_rest 1) + ELSE("${val}" STREQUAL "PATHS") + LIST(APPEND libnames_release "${val}") + LIST(APPEND libnames_debug "${val}${dgb_postfix}") + ENDIF("${val}" STREQUAL "PATHS") + ENDIF(append_rest) + + ENDFOREACH(i) + + ELSE("${libname}" STREQUAL "NAMES") + + # just one name + LIST(APPEND libnames_release "${libname}") + LIST(APPEND libnames_debug "${libname}${dgb_postfix}") + + SET(newargs ${args}) + + ENDIF("${libname}" STREQUAL "NAMES") + + # search the release lib + FIND_LIBRARY(${var_name}_RELEASE + NAMES ${libnames_release} + ${newargs} + ) + + # search the debug lib + FIND_LIBRARY(${var_name}_DEBUG + NAMES ${libnames_debug} + ${newargs} + ) + + IF(${var_name}_RELEASE AND ${var_name}_DEBUG) + + # both libs found + SET(${var_name} optimized ${${var_name}_RELEASE} + debug ${${var_name}_DEBUG}) + + ELSE(${var_name}_RELEASE AND ${var_name}_DEBUG) + + IF(${var_name}_RELEASE) + + # only release found + SET(${var_name} ${${var_name}_RELEASE}) + + ELSE(${var_name}_RELEASE) + + # only debug (or nothing) found + SET(${var_name} ${${var_name}_DEBUG}) + + ENDIF(${var_name}_RELEASE) + + ENDIF(${var_name}_RELEASE AND ${var_name}_DEBUG) + + MARK_AS_ADVANCED(${var_name}_RELEASE) + MARK_AS_ADVANCED(${var_name}_DEBUG) + + ENDIF(NOT WIN32) + + ENDIF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX") + +ENDMACRO(FIND_LIBRARY_WITH_DEBUG) diff -Nru -x '*~' mysql-5.5.25a.orig/cmake/FindOpenSSL.cmake mysql-5.5.25a/cmake/FindOpenSSL.cmake --- mysql-5.5.25a.orig/cmake/FindOpenSSL.cmake 1970-01-01 01:00:00.000000000 +0100 +++ mysql-5.5.25a/cmake/FindOpenSSL.cmake 2012-08-05 01:53:10.151434400 +0200 @@ -0,0 +1,63 @@ +# - Try to find the OpenSSL encryption library +# Once done this will define +# +# OPENSSL_FOUND - system has the OpenSSL library +# OPENSSL_INCLUDE_DIR - the OpenSSL include directory +# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL +# OPENSSL_EAY_LIBRARIES - The additional libraries needed to use OpenSSL on windows + +# Copyright (c) 2006, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +INCLUDE(FindLibraryWithDebug) + +# on win32 we additional need to link to libeay32.lib +MACRO(OPENSSL_ADD_LIB_EAY_LIBS) + FIND_LIBRARY_WITH_DEBUG(OPENSSL_EAY_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES eay libeay libeay32 libeay32MD) +ENDMACRO(OPENSSL_ADD_LIB_EAY_LIBS) + +IF(OPENSSL_LIBRARIES) + SET(OpenSSL_FIND_QUIETLY TRUE) +ENDIF(OPENSSL_LIBRARIES) + +IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) + SET(LIB_FOUND 1) +ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE) + +FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h ) + +FIND_LIBRARY_WITH_DEBUG(OPENSSL_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES ssl ssleay ssleay32 libssleay32 ssleay32MD) + +IF(WIN32) + OPENSSL_ADD_LIB_EAY_LIBS() + IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND OPENSSL_EAY_LIBRARIES) + SET(OPENSSL_FOUND TRUE) + ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND OPENSSL_EAY_LIBRARIES) + SET(OPENSSL_FOUND FALSE) + ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND OPENSSL_EAY_LIBRARIES) +ELSE(WIN32) + IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) + SET(OPENSSL_FOUND TRUE) + ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) + SET(OPENSSL_FOUND FALSE) + ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) +ENDIF(WIN32) + +IF (OPENSSL_FOUND) + IF (NOT OpenSSL_FIND_QUIETLY) + MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") + ENDIF (NOT OpenSSL_FIND_QUIETLY) +ELSE (OPENSSL_FOUND) + IF (OpenSSL_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could NOT find OpenSSL") + ENDIF (OpenSSL_FIND_REQUIRED) +ENDIF (OPENSSL_FOUND) + +MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) + diff -Nru -x '*~' mysql-5.5.25a.orig/cmake/libutils.cmake mysql-5.5.25a/cmake/libutils.cmake --- mysql-5.5.25a.orig/cmake/libutils.cmake 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/cmake/libutils.cmake 2012-08-05 01:53:10.155434700 +0200 @@ -65,7 +65,7 @@ # that references all exports and this prevents linker from creating an # empty library(there are unportable alternatives, --whole-archive) MACRO(CREATE_EXPORT_FILE VAR TARGET API_FUNCTIONS) - IF(WIN32) + IF(MSVC) SET(DUMMY ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_dummy.c) SET(EXPORTS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_exports.def) CONFIGURE_FILE_CONTENT("" ${DUMMY}) @@ -197,7 +197,7 @@ @ONLY ) ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD - COMMAND rm ${TARGET_LOCATION} + COMMAND cmake remove -E ${TARGET_LOCATION} COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/merge_archives_${TARGET}.cmake ) diff -Nru -x '*~' mysql-5.5.25a.orig/cmake/os/Windows.cmake mysql-5.5.25a/cmake/os/Windows.cmake --- mysql-5.5.25a.orig/cmake/os/Windows.cmake 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/cmake/os/Windows.cmake 2012-08-05 02:10:40.486510200 +0200 @@ -117,6 +117,12 @@ ENDIF() ENDIF() +IF(MINGW) + ADD_DEFINITIONS(-DMINGW_HAS_SECURE_API) + LINK_LIBRARIES(dbghelp) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--enable-stdcall-fixup") +ENDIF() + # Always link with socket library LINK_LIBRARIES(ws2_32) # ..also for tests diff -Nru -x '*~' mysql-5.5.25a.orig/cmake/ssl.cmake mysql-5.5.25a/cmake/ssl.cmake --- mysql-5.5.25a.orig/cmake/ssl.cmake 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/cmake/ssl.cmake 2012-08-05 01:53:10.169435500 +0200 @@ -66,14 +66,13 @@ # Check for system library SET(OPENSSL_FIND_QUIETLY TRUE) INCLUDE(FindOpenSSL) - FIND_LIBRARY(CRYPTO_LIBRARY crypto) - MARK_AS_ADVANCED(CRYPTO_LIBRARY) INCLUDE(CheckSymbolExists) + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" HAVE_SHA512_DIGEST_LENGTH) - IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) + IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH) SET(SSL_SOURCES "") - SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) + SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${OPENSSL_EAY_LIBRARIES}) SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) SET(SSL_INTERNAL_INCLUDE_DIRS "") SET(SSL_DEFINES "-DHAVE_OPENSSL") diff -Nru -x '*~' mysql-5.5.25a.orig/CMakeLists.txt mysql-5.5.25a/CMakeLists.txt --- mysql-5.5.25a.orig/CMakeLists.txt 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/CMakeLists.txt 2012-08-05 01:53:10.174435700 +0200 @@ -232,13 +232,13 @@ # Set commonly used variables -IF(WIN32) - SET(DEFAULT_MYSQL_HOME "C:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}" ) - SET(SHAREDIR share) -ELSE() +# IF(WIN32) +# SET(DEFAULT_MYSQL_HOME "C:/Program Files/MySQL/MySQL Server ${MYSQL_BASE_VERSION}" ) +# SET(SHAREDIR share) +# ELSE() SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX}) - SET(SHAREDIR ${DEFAULT_MYSQL_HOME}/${INSTALL_MYSQLSHAREDIR}) -ENDIF() + SET(SHAREDIR share) +# ENDIF() SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}") IF(INSTALL_MYSQLDATADIR MATCHES "^/.*") diff -Nru -x '*~' mysql-5.5.25a.orig/config.h.cmake mysql-5.5.25a/config.h.cmake --- mysql-5.5.25a.orig/config.h.cmake 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/config.h.cmake 2012-08-05 01:53:10.184436300 +0200 @@ -621,4 +621,21 @@ #cmakedefine SIZEOF_TIME_T @SIZEOF_TIME_T@ #cmakedefine TIME_T_UNSIGNED @TIME_T_UNSIGNED@ +#ifdef _WIN32 + #if (_MSC_VER< 1500) + typedef struct _RTL_CONDITION_VARIABLE { + void* Ptr; + } RTL_CONDITION_VARIABLE, *PRTL_CONDITION_VARIABLE; + typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE; + #endif +#endif + +#ifdef __MINGW32__ +#define __try +#define __except(x) if(0) + +typedef void* RTL_SRWLOCK; +typedef RTL_SRWLOCK SRWLOCK, *PSRWLOCK; +#endif + #endif diff -Nru -x '*~' mysql-5.5.25a.orig/include/my_pthread.h mysql-5.5.25a/include/my_pthread.h --- mysql-5.5.25a.orig/include/my_pthread.h 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/include/my_pthread.h 2012-08-05 01:53:10.191436700 +0200 @@ -53,6 +53,13 @@ We use native conditions on Vista and later, and fallback to own implementation on earlier OS version. */ +typedef enum +{ + SIGNAL= 0, + BROADCAST= 1, + MAX_EVENTS= 2 +} EVENTS; + typedef union { /* Native condition (used on Vista and later) */ @@ -63,12 +70,6 @@ { uint32 waiting; CRITICAL_SECTION lock_waiting; - enum - { - SIGNAL= 0, - BROADCAST= 1, - MAX_EVENTS= 2 - } EVENTS; HANDLE events[MAX_EVENTS]; HANDLE broadcast_block_event; }; @@ -99,11 +100,14 @@ FILETIME ft; __int64 i64; }; -struct timespec { + +struct my_timespec { union ft64 tv; /* The max timeout value in millisecond for pthread_cond_timedwait */ long max_timeout_msec; }; +#define timespec my_timespec + #define set_timespec(ABSTIME,SEC) { \ GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \ (ABSTIME).tv.i64+= (__int64)(SEC)*10000000; \ diff -Nru -x '*~' mysql-5.5.25a.orig/libmysql/authentication_win/common.h mysql-5.5.25a/libmysql/authentication_win/common.h --- mysql-5.5.25a.orig/libmysql/authentication_win/common.h 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/libmysql/authentication_win/common.h 2012-08-05 11:01:01.224575000 +0200 @@ -70,7 +70,7 @@ const char *fmt, va_list args); template -void error_log_print(const char *fmt, ...) +inline void error_log_print(const char *fmt, ...) { va_list args; va_start(args, fmt); diff -Nru -x '*~' mysql-5.5.25a.orig/libmysql/authentication_win/handshake.h mysql-5.5.25a/libmysql/authentication_win/handshake.h --- mysql-5.5.25a.orig/libmysql/authentication_win/handshake.h 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/libmysql/authentication_win/handshake.h 2012-08-05 01:53:10.199437200 +0200 @@ -100,7 +100,7 @@ Handshake(const char *ssp, side_t side); virtual ~Handshake(); - int Handshake::packet_processing_loop(); + int packet_processing_loop(); bool virtual is_complete() const { diff -Nru -x '*~' mysql-5.5.25a.orig/scripts/CMakeLists.txt mysql-5.5.25a/scripts/CMakeLists.txt --- mysql-5.5.25a.orig/scripts/CMakeLists.txt 2012-07-02 13:35:22.000000000 +0200 +++ mysql-5.5.25a/scripts/CMakeLists.txt 2012-08-05 01:53:10.206437600 +0200 @@ -33,8 +33,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql ) ELSEIF(WIN32) - FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql - native_outfile ) + string(REPLACE "/" "\\" native_outfile "${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql") SET(CAT_COMMAND COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} cmd /c copy /b mysql_system_tables.sql + mysql_system_tables_fix.sql diff -Nru -x '*~' mysql-5.5.25a.orig/sql/item_strfunc.cc mysql-5.5.25a/sql/item_strfunc.cc --- mysql-5.5.25a.orig/sql/item_strfunc.cc 2012-07-02 13:35:21.000000000 +0200 +++ mysql-5.5.25a/sql/item_strfunc.cc 2012-08-05 01:53:10.215438100 +0200 @@ -3799,7 +3799,7 @@ with a clock_seq value (initialized random below), we use a separate randominit() here */ - randominit(&uuid_rand, tmp + (ulong) thd, tmp + (ulong)global_query_id); + randominit(&uuid_rand, tmp + (uintptr_t) thd, tmp + (ulong)global_query_id); for (i=0; i < (int)sizeof(mac); i++) mac[i]=(uchar)(my_rnd(&uuid_rand)*255); /* purecov: end */ diff -Nru -x '*~' mysql-5.5.25a.orig/sql/mysqld.cc mysql-5.5.25a/sql/mysqld.cc --- mysql-5.5.25a.orig/sql/mysqld.cc 2012-07-02 13:35:21.000000000 +0200 +++ mysql-5.5.25a/sql/mysqld.cc 2012-08-05 01:53:10.229438900 +0200 @@ -4792,7 +4792,7 @@ if (my_strcasecmp(system_charset_info, argv[1],"mysql")) load_default_groups[load_default_groups_sz-2]= argv[1]; start_mode= 1; - Service.Init(argv[1], mysql_service); -+ Service.Init(argv[1], (void**) mysql_service); ++ Service.Init(argv[1], (void*) mysql_service); return 0; } } @@ -4813,7 +4813,7 @@ start_mode= 1; if (my_strcasecmp(system_charset_info, argv[2],"mysql")) load_default_groups[load_default_groups_sz-2]= argv[2]; - Service.Init(argv[2], mysql_service); -+ Service.Init(argv[2], (void**) mysql_service); ++ Service.Init(argv[2], (void*) mysql_service); return 0; } } @@ -4846,7 +4846,7 @@ { /* start the default service */ start_mode= 1; - Service.Init(MYSQL_SERVICENAME, mysql_service); -+ Service.Init(MYSQL_SERVICENAME, (void**) mysql_service); ++ Service.Init(MYSQL_SERVICENAME, (void*) mysql_service); return 0; } } diff -Nru -x '*~' mysql-5.5.25a.orig/sql/sql_class.cc mysql-5.5.25a/sql/sql_class.cc --- mysql-5.5.25a.orig/sql/sql_class.cc 2012-07-02 13:35:21.000000000 +0200 +++ mysql-5.5.25a/sql/sql_class.cc 2012-08-05 01:53:10.251440100 +0200 @@ -874,7 +874,7 @@ tablespace_op=FALSE; tmp= sql_rnd_with_mutex(); - randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::global_query_id); + randominit(&rand, tmp + (uintptr_t) &rand, tmp + (ulong) ::global_query_id); substitute_null_with_insert_id = FALSE; thr_lock_info_init(&lock_info); /* safety: will be reset after start */ diff -Nru -x '*~' mysql-5.5.25a.orig/sql/sql_show.cc mysql-5.5.25a/sql/sql_show.cc --- mysql-5.5.25a.orig/sql/sql_show.cc 2012-07-02 13:35:21.000000000 +0200 +++ mysql-5.5.25a/sql/sql_show.cc 2012-08-05 01:53:10.264440900 +0200 @@ -2253,21 +2253,21 @@ */ switch (show_type) { case SHOW_DOUBLE_STATUS: - value= ((char *) status_var + (ulong) value); + value= ((char *) status_var + (uintptr_t) value); /* fall through */ case SHOW_DOUBLE: /* 6 is the default precision for '%f' in sprintf() */ end= buff + my_fcvt(*(double *) value, 6, buff, NULL); break; case SHOW_LONG_STATUS: - value= ((char *) status_var + (ulong) value); + value= ((char *) status_var + (uintptr_t) value); /* fall through */ case SHOW_LONG: case SHOW_LONG_NOFLUSH: // the difference lies in refresh_status() end= int10_to_str(*(long*) value, buff, 10); break; case SHOW_LONGLONG_STATUS: - value= ((char *) status_var + (ulong) value); + value= ((char *) status_var + (uintptr_t) value); /* fall through */ case SHOW_LONGLONG: end= longlong10_to_str(*(longlong*) value, buff, 10); @@ -2315,11 +2315,11 @@ break; } case SHOW_KEY_CACHE_LONG: - value= (char*) dflt_key_cache + (ulong)value; + value= (char*) dflt_key_cache + (uintptr_t)value; end= int10_to_str(*(long*) value, buff, 10); break; case SHOW_KEY_CACHE_LONGLONG: - value= (char*) dflt_key_cache + (ulong)value; + value= (char*) dflt_key_cache + (uintptr_t)value; end= longlong10_to_str(*(longlong*) value, buff, 10); break; case SHOW_UNDEF: diff -Nru -x '*~' mysql-5.5.25a.orig/storage/innobase/include/univ.i mysql-5.5.25a/storage/innobase/include/univ.i --- mysql-5.5.25a.orig/storage/innobase/include/univ.i 2012-07-02 13:35:21.000000000 +0200 +++ mysql-5.5.25a/storage/innobase/include/univ.i 2012-08-05 11:23:30.389742900 +0200 @@ -257,7 +257,7 @@ #ifndef UNIV_MUST_NOT_INLINE /* Definition for inline version */ -#ifdef __WIN__ +#ifdef _MSC_VER # define UNIV_INLINE __inline #elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) # define UNIV_INLINE static inline diff --git a/portage/win32libs-sources/openexr-src/openexr-1.7.0-20120804.diff b/portage/win32libs-sources/openexr-src/openexr-1.7.0-20120804.diff index fb81a09af..3028691ce 100644 --- a/portage/win32libs-sources/openexr-src/openexr-1.7.0-20120804.diff +++ b/portage/win32libs-sources/openexr-src/openexr-1.7.0-20120804.diff @@ -1,302 +1,357 @@ diff -Nru -x '*~' openexr-1.7.0.orig/CMakeLists.txt openexr-1.7.0/CMakeLists.txt --- openexr-1.7.0.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/CMakeLists.txt 2012-08-04 18:08:08.710598100 +0200 -@@ -0,0 +1,46 @@ ++++ openexr-1.7.0/CMakeLists.txt 2012-08-05 23:08:04.086957500 +0200 +@@ -0,0 +1,65 @@ +project(OpenEXR) + +cmake_minimum_required(VERSION 2.8) + +find_package(ZLIB REQUIRED) +find_package(IlmBase REQUIRED) + +include_directories(${ZLIB_INCLUDE_DIRS} ${ILMBASE_INCLUDES}) +if(WIN32) + if(MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -DZLIB_DLL) + endif(MSVC) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/config.windows) +endif(WIN32) + +#### options for building exr +option(BUILD_TOOLS "build the exr tools" ON) +option(BUILD_TESTS "build the tests" OFF) +option(BUILD_EXAMPLES "build the example files" OFF) +option(BUILD_DOCS "build the documentation" OFF) + +add_subdirectory(IlmImf) + +if(BUILD_TOOLS) + include_directories(IlmImf ${CMAKE_CURRENT_BINARY_DIR}/IlmImf) + add_subdirectory(exrheader) + add_subdirectory(exr2aces) + add_subdirectory(exrenvmap) + add_subdirectory(exrmakepreview) + add_subdirectory(exrmaketiled) + add_subdirectory(exrmultiview) + add_subdirectory(exrstdattr) ++ ++ set(_OPENEXR_TOOLS ++" ++set(EXRHEADER_BINARY exrheader) ++set(EXR2ACES_BINARY exr2aces) ++set(EXRENVMAP_BINARY exrenvmap) ++set(EXRMAKEPREVIEW_BINARY exrmakepreview) ++set(EXRMAKETILED_BINARY exrmaketiled) ++set(EXRMULTIVIEW_BINARY exrmultiview) ++set(EXRSTDATTR_BINARY exrstdattr) ++" ++ ) +endif(BUILD_TOOLS) + ++set(OpenEXR_targets ilmimf) ++install(EXPORT OpenEXR_targets FILE OpenEXRTargets.cmake DESTINATION lib/cmake/OpenEXR) ++ ++configure_file(${CMAKE_SOURCE_DIR}/OpenEXRConfig.cmake.in ${CMAKE_BINARY_DIR}/OpenEXRConfig.cmake @ONLY) ++ ++install(FILES ${CMAKE_BINARY_DIR}/OpenEXRConfig.cmake DESTINATION lib/cmake/OpenEXR) ++ +if(BUILD_TESTS) + add_subdirectory(IlmImfTest) + add_subdirectory(IlmImfFuzzTest) +endif(BUILD_TESTS) + +if(BUILD_EXAMPLES) + add_subdirectory(IlmImfExamples) +endif(BUILD_EXAMPLES) + +if(BUILD_DOCS) + add_subdirectory(doc) +endif(BUILD_DOCS) diff -Nru -x '*~' openexr-1.7.0.orig/exr2aces/CMakeLists.txt openexr-1.7.0/exr2aces/CMakeLists.txt --- openexr-1.7.0.orig/exr2aces/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exr2aces/CMakeLists.txt 2012-08-04 17:58:44.769342500 +0200 -@@ -0,0 +1,3 @@ ++++ openexr-1.7.0/exr2aces/CMakeLists.txt 2012-08-05 21:26:55.908408800 +0200 +@@ -0,0 +1,8 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_executable(exr2aces main.cpp) +target_link_libraries(exr2aces ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) ++ ++install(TARGETS exr2aces EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) diff -Nru -x '*~' openexr-1.7.0.orig/exrenvmap/CMakeLists.txt openexr-1.7.0/exrenvmap/CMakeLists.txt --- openexr-1.7.0.orig/exrenvmap/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exrenvmap/CMakeLists.txt 2012-08-04 18:09:54.251634700 +0200 ++++ openexr-1.7.0/exrenvmap/CMakeLists.txt 2012-08-05 21:33:01.246971400 +0200 @@ -0,0 +1,20 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + set(exrenvmap_SRCS + makeCubeMap.cpp + EnvmapImage.cpp + readInputImage.cpp + resizeImage.cpp + blurImage.cpp + makeCubeMap.cpp + makeLatLongMap.cpp + main.cpp + ) + -+ +add_executable(exrenvmap ${exrenvmap_SRCS}) +target_link_libraries(exrenvmap ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) + -+install(TARGETS exrenvmap RUNTIME DESTINATION bin ++install(TARGETS exrenvmap EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + diff -Nru -x '*~' openexr-1.7.0.orig/exrheader/CMakeLists.txt openexr-1.7.0/exrheader/CMakeLists.txt --- openexr-1.7.0.orig/exrheader/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exrheader/CMakeLists.txt 2012-08-04 18:10:07.535394500 +0200 -@@ -0,0 +1,6 @@ ++++ openexr-1.7.0/exrheader/CMakeLists.txt 2012-08-05 21:33:09.642146300 +0200 +@@ -0,0 +1,8 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_executable(exrheader main.cpp) +target_link_libraries(exrheader ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) -+install(TARGETS exrheader RUNTIME DESTINATION bin ++ ++install(TARGETS exrheader EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) diff -Nru -x '*~' openexr-1.7.0.orig/exrmakepreview/CMakeLists.txt openexr-1.7.0/exrmakepreview/CMakeLists.txt --- openexr-1.7.0.orig/exrmakepreview/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exrmakepreview/CMakeLists.txt 2012-08-04 18:10:30.377701000 +0200 -@@ -0,0 +1,6 @@ ++++ openexr-1.7.0/exrmakepreview/CMakeLists.txt 2012-08-05 21:33:19.589337000 +0200 +@@ -0,0 +1,8 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_executable(exrmakepreview makePreview.cpp main.cpp) +target_link_libraries(exrmakepreview ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) -+install(TARGETS exrmakepreview RUNTIME DESTINATION bin ++ ++install(TARGETS exrmakepreview EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) diff -Nru -x '*~' openexr-1.7.0.orig/exrmaketiled/CMakeLists.txt openexr-1.7.0/exrmaketiled/CMakeLists.txt --- openexr-1.7.0.orig/exrmaketiled/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exrmaketiled/CMakeLists.txt 2012-08-04 18:12:01.540915300 +0200 -@@ -0,0 +1,6 @@ ++++ openexr-1.7.0/exrmaketiled/CMakeLists.txt 2012-08-05 21:33:56.677522700 +0200 +@@ -0,0 +1,8 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_executable(exrmaketiled Image.cpp makeTiled.cpp main.cpp) +target_link_libraries(exrmaketiled ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) -+install(TARGETS exrmaketiled RUNTIME DESTINATION bin ++ ++install(TARGETS exrmaketiled EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) diff -Nru -x '*~' openexr-1.7.0.orig/exrmultiview/CMakeLists.txt openexr-1.7.0/exrmultiview/CMakeLists.txt --- openexr-1.7.0.orig/exrmultiview/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exrmultiview/CMakeLists.txt 2012-08-04 18:11:53.399449600 +0200 -@@ -0,0 +1,6 @@ ++++ openexr-1.7.0/exrmultiview/CMakeLists.txt 2012-08-05 21:34:11.685727800 +0200 +@@ -0,0 +1,8 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_executable(exrmultiview Image.cpp makeMultiView.cpp main.cpp) +target_link_libraries(exrmultiview ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) -+install(TARGETS exrmultiview RUNTIME DESTINATION bin ++ ++install(TARGETS exrmultiview EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) diff -Nru -x '*~' openexr-1.7.0.orig/exrstdattr/CMakeLists.txt openexr-1.7.0/exrstdattr/CMakeLists.txt --- openexr-1.7.0.orig/exrstdattr/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/exrstdattr/CMakeLists.txt 2012-08-04 18:09:20.768719600 +0200 -@@ -0,0 +1,6 @@ ++++ openexr-1.7.0/exrstdattr/CMakeLists.txt 2012-08-05 21:32:42.940740600 +0200 +@@ -0,0 +1,8 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_executable(exrstdattr main.cpp) +target_link_libraries(exrstdattr ilmimf ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES}) -+install(TARGETS exrstdattr RUNTIME DESTINATION bin ++ ++install(TARGETS exrstdattr EXPORT OpenEXR_targets ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) \ Kein Zeilenumbruch am Dateiende. diff -Nru -x '*~' openexr-1.7.0.orig/IlmImf/CMakeLists.txt openexr-1.7.0/IlmImf/CMakeLists.txt --- openexr-1.7.0.orig/IlmImf/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ openexr-1.7.0/IlmImf/CMakeLists.txt 2012-08-04 17:00:02.851900400 +0200 -@@ -0,0 +1,143 @@ ++++ openexr-1.7.0/IlmImf/CMakeLists.txt 2012-08-05 22:47:06.169879800 +0200 +@@ -0,0 +1,144 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + +add_executable(b44ExpLogTable b44ExpLogTable.cpp) +target_link_libraries(b44ExpLogTable ${HALF_LIBRARY}) + +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h COMMAND b44ExpLogTable > ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h DEPENDS b44ExpLogTable) + +set(ilmimf_SRCS + ImfAttribute.cpp + ImfBoxAttribute.cpp + ImfCRgbaFile.cpp + ImfChannelList.cpp + ImfChannelListAttribute.cpp + ImfFloatAttribute.cpp + ImfFrameBuffer.cpp + ImfHeader.cpp + ImfIO.cpp + ImfInputFile.cpp + ImfIntAttribute.cpp + ImfLineOrderAttribute.cpp + ImfMatrixAttribute.cpp + ImfOpaqueAttribute.cpp + ImfOutputFile.cpp + ImfRgbaFile.cpp + ImfStringAttribute.cpp + ImfVecAttribute.cpp + ImfHuf.cpp + ImfThreading.cpp + ImfWav.cpp + ImfLut.cpp + ImfCompressor.cpp + ImfRleCompressor.cpp + ImfZipCompressor.cpp + ImfPizCompressor.cpp + ImfB44Compressor.cpp + ImfMisc.cpp + ImfCompressionAttribute.cpp + ImfDoubleAttribute.cpp + ImfConvert.cpp + ImfPreviewImage.cpp + ImfPreviewImageAttribute.cpp + ImfVersion.cpp + ImfChromaticities.cpp + ImfChromaticitiesAttribute.cpp + ImfKeyCode.cpp + ImfKeyCodeAttribute.cpp + ImfTimeCode.cpp + ImfTimeCodeAttribute.cpp + ImfRational.cpp + ImfRationalAttribute.cpp + ImfFramesPerSecond.cpp + ImfStandardAttributes.cpp + ImfStdIO.cpp + ImfEnvmap.cpp + ImfEnvmapAttribute.cpp + ImfScanLineInputFile.cpp + ImfTiledInputFile.cpp + ImfTiledMisc.cpp + ImfTiledOutputFile.cpp + ImfTiledRgbaFile.cpp + ImfTileDescriptionAttribute.cpp + ImfTileOffsets.cpp + ImfRgbaYca.cpp + ImfPxr24Compressor.cpp + ImfTestFile.cpp + ImfStringVectorAttribute.cpp + ImfMultiView.cpp + ImfAcesFile.cpp + + ${CMAKE_CURRENT_BINARY_DIR}/b44ExpLogTable.h +) + +set(ilmimf_HDRS + ImfAttribute.h + ImfBoxAttribute.h + ImfCRgbaFile.h + ImfChannelList.h + ImfChannelListAttribute.h + ImfCompressionAttribute.h + ImfDoubleAttribute.h + ImfFloatAttribute.h + ImfFrameBuffer.h + ImfHeader.h + ImfIO.h + ImfInputFile.h + ImfIntAttribute.h + ImfLineOrderAttribute.h + ImfMatrixAttribute.h + ImfOpaqueAttribute.h + ImfOutputFile.h + ImfRgbaFile.h + ImfStringAttribute.h + ImfVecAttribute.h + ImfHuf.h + ImfWav.h + ImfLut.h + ImfArray.h + ImfCompression.h + ImfLineOrder.h + ImfName.h + ImfPixelType.h + ImfVersion.h + ImfXdr.h + ImfConvert.h + ImfPreviewImage.h + ImfPreviewImageAttribute.h + ImfChromaticities.h + ImfChromaticitiesAttribute.h + ImfKeyCode.h + ImfKeyCodeAttribute.h + ImfTimeCode.h + ImfTimeCodeAttribute.h + ImfRational.h + ImfRationalAttribute.h + ImfFramesPerSecond.h + ImfStandardAttributes.h + ImfEnvmap.h + ImfEnvmapAttribute.h + ImfInt64.h + ImfRgba.h + ImfTileDescription.h + ImfTileDescriptionAttribute.h + ImfTiledInputFile.h + ImfTiledOutputFile.h + ImfTiledRgbaFile.h + ImfRgbaYca.h + ImfTestFile.h + ImfThreading.h + ImfB44Compressor.h + ImfStringVectorAttribute.h + ImfMultiView.h + ImfAcesFile.h +) + +add_library(ilmimf ${ilmimf_SRCS}) +target_link_libraries(ilmimf ${ZLIB_LIBRARIES}) + +install(TARGETS ilmimf ++ EXPORT OpenEXR_targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES ${ilmimf_HDRS} DESTINATION include/openexr) -\ Kein Zeilenumbruch am Dateiende. diff -Nru -x '*~' openexr-1.7.0.orig/IlmImf/ImfPxr24Compressor.cpp openexr-1.7.0/IlmImf/ImfPxr24Compressor.cpp --- openexr-1.7.0.orig/IlmImf/ImfPxr24Compressor.cpp 2010-07-17 01:11:52.000000000 +0200 -+++ openexr-1.7.0/IlmImf/ImfPxr24Compressor.cpp 2012-08-04 17:33:22.113251600 +0200 ++++ openexr-1.7.0/IlmImf/ImfPxr24Compressor.cpp 2012-08-05 21:26:55.938408800 +0200 @@ -62,7 +62,6 @@ // string of bytes is compressed with zlib. // //----------------------------------------------------------------------------- -#define ZLIB_WINAPI #include #include diff -Nru -x '*~' openexr-1.7.0.orig/IlmImf/ImfZipCompressor.cpp openexr-1.7.0/IlmImf/ImfZipCompressor.cpp --- openexr-1.7.0.orig/IlmImf/ImfZipCompressor.cpp 2010-07-17 01:11:52.000000000 +0200 -+++ openexr-1.7.0/IlmImf/ImfZipCompressor.cpp 2012-08-04 17:33:28.026589800 +0200 ++++ openexr-1.7.0/IlmImf/ImfZipCompressor.cpp 2012-08-05 21:26:55.938408800 +0200 @@ -39,7 +39,6 @@ // class ZipCompressor // //----------------------------------------------------------------------------- -#define ZLIB_WINAPI #include #include +diff -Nru -x '*~' openexr-1.7.0.orig/OpenEXRConfig.cmake.in openexr-1.7.0/OpenEXRConfig.cmake.in +--- openexr-1.7.0.orig/OpenEXRConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 ++++ openexr-1.7.0/OpenEXRConfig.cmake.in 2012-08-05 23:11:55.878202600 +0200 +@@ -0,0 +1,17 @@ ++# - Config file for the OpenEXR package ++# It defines the following variables ++# OPENEXR_INCLUDE_DIRS - include directories for OpenEXR ++# ILMIMF_LIBRARY - the ilmimf library ++# OPENEXR_LIBRARIES - all the libraries to link against ++ ++# Compute paths ++get_filename_component(OPENEXR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) ++set(OPENEXR_INCLUDE_DIRS "${OPENEXR_CMAKE_DIR}/../../../include") ++ ++# Our library dependencies (contains definitions for IMPORTED targets) ++include("${OPENEXR_CMAKE_DIR}/OpenEXRTargets.cmake") ++ ++set(ILMIMF_LIBRARY ilmimf) ++@_OPENEXR_TOOLS@ ++set(OPENEXR_LIBRARIES ${ILMIMF_LIBRARY}) ++ diff --git a/portage/testing/openldap-src/openldap-2.4.28-20120212.diff b/portage/win32libs-sources/openldap-src/openldap-2.4.28-20120212.diff similarity index 100% rename from portage/testing/openldap-src/openldap-2.4.28-20120212.diff rename to portage/win32libs-sources/openldap-src/openldap-2.4.28-20120212.diff diff --git a/portage/testing/openldap-src/openldap-src-2.4.28.py b/portage/win32libs-sources/openldap-src/openldap-src-2.4.28.py similarity index 100% rename from portage/testing/openldap-src/openldap-src-2.4.28.py rename to portage/win32libs-sources/openldap-src/openldap-src-2.4.28.py diff --git a/portage/win32libs-sources/raptor2-src/raptor2-2.0.8-20121210.diff b/portage/win32libs-sources/raptor2-src/raptor2-2.0.8-20121210.diff new file mode 100644 index 000000000..ce0a76876 --- /dev/null +++ b/portage/win32libs-sources/raptor2-src/raptor2-2.0.8-20121210.diff @@ -0,0 +1,746 @@ +diff -Nru -x '*~' raptor2-2.0.8.orig/cmake/modules/FindYajl.cmake raptor2-2.0.8/cmake/modules/FindYajl.cmake +--- raptor2-2.0.8.orig/cmake/modules/FindYajl.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ raptor2-2.0.8/cmake/modules/FindYajl.cmake 2012-12-30 11:29:55.335385500 +0100 +@@ -0,0 +1,26 @@ ++# Try to find Yajl functionality ++# Once done this will define ++# ++# YAJL_FOUND - system has Yajl ++# YAJL_INCLUDE_DIR - Yajl include directory ++# YAJL_LIBRARIES - Libraries needed to use Yajl ++# ++# Copyright (c) 2011, Patrick Spendrin, ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++if(YAJL_INCLUDE_DIR AND YAJL_FOUND) ++ set(YAJL_FIND_QUIETLY TRUE) ++endif(YAJL_INCLUDE_DIR AND YAJL_FOUND) ++ ++set(YAJL_FOUND FALSE) ++ ++find_path(YAJL_INCLUDE_DIR yajl/yajl_version.h) ++ ++find_library(YAJL_LIBRARIES NAMES yajl yajl_s) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(Yajl DEFAULT_MSG YAJL_LIBRARIES YAJL_FOUND) ++ ++mark_as_advanced(YAJL_INCLUDE_DIR YAJL_LIBRARIES YAJL_FOUND) +diff -Nru -x '*~' raptor2-2.0.8.orig/CMakeLists.txt raptor2-2.0.8/CMakeLists.txt +--- raptor2-2.0.8.orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 ++++ raptor2-2.0.8/CMakeLists.txt 2012-12-30 11:29:57.398351900 +0100 +@@ -0,0 +1,216 @@ ++project(raptor2) ++ ++cmake_minimum_required(VERSION 2.8) ++ ++ ++set(RAPTOR_VERSION_MAJOR 2) ++set(RAPTOR_VERSION_MINOR 0) ++set(RAPTOR_VERSION_RELEASE 8) ++set(VERSION "\"${RAPTOR_VERSION_MAJOR}.${RAPTOR_VERSION_MINOR}.${RAPTOR_VERSION_RELEASE}\"") ++math(EXPR RAPTOR_VERSION_DECIMAL "${RAPTOR_VERSION_MAJOR} * 10000 + ${RAPTOR_VERSION_MINOR} * 100 + ${RAPTOR_VERSION_RELEASE}") ++ ++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) ++find_package(CURL REQUIRED) ++find_package(LibXml2 REQUIRED) ++find_package(LibXslt REQUIRED) ++find_package(Expat REQUIRED) ++find_package(Yajl REQUIRED) ++ ++option(BUILD_STATIC "build static library" OFF) ++option(BUILD_TOOLS "build the tools" ON) ++option(BUILD_TESTS "build the tests" ON) ++ ++if(BUILD_TESTS) ++ enable_testing() ++endif(BUILD_TESTS) ++ ++include(ConfigureChecks.cmake) ++configure_file(src/raptor2.h.in ${CMAKE_BINARY_DIR}/raptor2.h @ONLY) ++ ++if(MSVC) ++ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996 -Dstrcasecmp=stricmp -Dstrncasecmp=strnicmp) ++endif(MSVC) ++ ++set(raptor2_SRCS ++ src/raptor_parse.c ++ src/raptor_serialize.c ++ src/raptor_rfc2396.c ++ src/raptor_uri.c ++ src/raptor_log.c ++ src/raptor_locator.c ++ src/raptor_namespace.c ++ src/raptor_qname.c ++ src/raptor_option.c ++ src/raptor_general.c ++ src/raptor_unicode.c ++ src/raptor_www.c ++ src/raptor_statement.c ++ src/raptor_term.c ++ src/raptor_sequence.c ++ src/raptor_stringbuffer.c ++ src/raptor_iostream.c ++ src/raptor_xml.c ++ src/raptor_xml_writer.c ++ src/raptor_set.c ++ src/turtle_common.c ++ src/raptor_turtle_writer.c ++ src/raptor_avltree.c ++ src/snprintf.c ++ src/raptor_json_writer.c ++ src/raptor_memstr.c ++ src/raptor_concepts.c ++ src/raptor_syntax_description.c ++) ++ ++ if(LIBXML2_FOUND) ++ list(APPEND raptor2_SRCS ++ src/raptor_libxml.c ++ ) ++ endif(LIBXML2_FOUND) ++ ++ list(APPEND raptor2_SRCS ++ src/raptor_rdfxml.c ++ src/raptor_sax2.c ++ src/turtle_lexer.c ++ src/turtle_parser.c ++ src/ntriples_parse.c ++ src/raptor_rss_common.c ++ src/raptor_rss.c ++ src/raptor_grddl.c ++ src/raptor_guess.c ++ src/raptor_librdfa.c ++ src/raptor_json.c ++ src/raptor_serialize_rdfxml.c ++ src/raptor_serialize_ntriples.c ++ src/raptor_abbrev.c ++ src/raptor_serialize_rdfxmla.c ++ src/raptor_serialize_turtle.c ++ src/raptor_serialize_rss.c ++ src/raptor_serialize_dot.c ++ src/raptor_serialize_html.c ++ src/raptor_serialize_json.c ++ src/raptor_www_libxml.c ++ src/raptor_www_curl.c ++ src/raptor_www.c ++ src/strcasecmp.c ++ src/parsedate.c ++ librdfa/context.c ++ librdfa/curie.c ++ librdfa/iri.c ++ librdfa/language.c ++ librdfa/lists.c ++ librdfa/namespace.c ++ librdfa/rdfa.c ++ librdfa/rdfa_utils.c ++ librdfa/subject.c ++ librdfa/triple.c ++) ++ ++if(NOT HAVE_STRTOK_R) ++ list(APPEND raptor2_SRCS ++ librdfa/strtok_r.c ++ ) ++endif(NOT HAVE_STRTOK_R) ++ ++set(raptor2_HDRS ++ src/raptor.h ++ ${CMAKE_BINARY_DIR}/raptor2.h ++) ++ ++add_definitions(-DLIBRDFA_IN_RAPTOR -DRAPTOR_INTERNAL) ++ ++include_directories( ++ ${CMAKE_BINARY_DIR} ++ librdfa ++ src ++ utils ++ ${CURL_INCLUDE_DIR} ++ ${LIBXML2_INCLUDE_DIR} ++ ${YAJL_INCLUDE_DIR} ++ ${EXPAT_INCLUDE_DIR} ++) ++ ++if(BUILD_STATIC) ++ add_definitions(-DRAPTOR_STATIC) ++ set(_SHARED STATIC) ++else(BUILD_STATIC) ++ set(_SHARED SHARED) ++endif(BUILD_STATIC) ++ ++add_library(raptor2 ${_SHARED} ${raptor2_SRCS}) ++set_target_properties(raptor2 PROPERTIES DEFINE_SYMBOL RAPTOR_EXPORTS) ++set(raptor2_LIBS ${CURL_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${EXPAT_LIBRARIES} ${YAJL_LIBRARIES}) ++target_link_libraries(raptor2 ${raptor2_LIBS}) ++ ++set(_targets ++ raptor2 ++) ++ ++############################################################################### ++if(BUILD_TESTS OR BUILD_TOOLS) ++ add_library(raptor2_static STATIC ${raptor2_SRCS}) ++ set_target_properties(raptor2_static PROPERTIES COMPILE_FLAGS "-DRAPTOR_STATIC") ++endif(BUILD_TESTS OR BUILD_TOOLS) ++############################################################################### ++if(BUILD_TESTS) ++ set(raptor_TESTS ++ raptor_parse ++ raptor_rfc2396 ++ raptor_uri ++ raptor_namespace ++ strcasecmp ++ raptor_www ++ raptor_sequence ++ raptor_stringbuffer ++ raptor_uri_win32 ++ raptor_iostream ++ raptor_xml_writer ++ raptor_turtle_writer ++ raptor_avltree ++ raptor_term ++ raptor_set ++ raptor_xml ++ ) ++ ++ set(raptor_parse_SRCS src/raptor_general.c src/raptor_parse.c) ++ set(raptor_uri_win32_SRCS src/raptor_uri.c) ++ set(raptor_www_SRCS src/raptor_www_test.c) ++ set(raptor_nfc_SRCS src/raptor_nfc_test.c) ++ foreach(_test ${raptor_TESTS}) ++ if(NOT DEFINED ${_test}_SRCS) ++ set(${_test}_SRCS src/${_test}.c) ++ endif(NOT DEFINED ${_test}_SRCS) ++ add_executable(${_test} ${${_test}_SRCS}) ++ set_target_properties(${_test} PROPERTIES COMPILE_FLAGS "-DSTANDALONE -DRAPTOR_STATIC") ++ target_link_libraries(${_test} raptor2_static ${raptor2_LIBS}) ++ add_test(${_test} ${_test}) ++ endforeach(_test ${raptor_TESTS}) ++ set_target_properties(raptor_uri_win32 PROPERTIES COMPILE_FLAGS "-DSTANDALONE -DRAPTOR_STATIC -DWIN32_URI_TEST") ++endif(BUILD_TESTS) ++############################################################################### ++if(BUILD_TOOLS) ++ set(rapper_SRCS ++ utils/rapper.c ++ ) ++ set(rdfdiff_SRCS ++ utils/rdfdiff.c ++ ) ++ if(MSVC) ++ set(rapper_SRCS utils/getopt.c ${rapper_SRCS}) ++ set(rdfdiff_SRCS utils/getopt.c ${rdfdiff_SRCS}) ++ endif(MSVC) ++ add_executable(rapper ${rapper_SRCS}) ++ set_target_properties(rapper PROPERTIES COMPILE_FLAGS "-DRAPTOR_STATIC") ++ target_link_libraries(rapper raptor2_static ${raptor2_LIBS}) ++ add_executable(rdfdiff ${rdfdiff_SRCS}) ++ set_target_properties(rdfdiff PROPERTIES COMPILE_FLAGS "-DRAPTOR_STATIC") ++ target_link_libraries(rdfdiff raptor2_static ${raptor2_LIBS}) ++ list(APPEND _targets rapper rdfdiff) ++endif(BUILD_TOOLS) ++ ++############################################################################### ++install(TARGETS ${_targets} RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++install(FILES ${raptor2_HDRS} DESTINATION include/raptor2) +diff -Nru -x '*~' raptor2-2.0.8.orig/ConfigureChecks.cmake raptor2-2.0.8/ConfigureChecks.cmake +--- raptor2-2.0.8.orig/ConfigureChecks.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ raptor2-2.0.8/ConfigureChecks.cmake 2012-12-30 11:29:57.398351900 +0100 +@@ -0,0 +1,102 @@ ++#/* Have curl/curl.h * HAVE_CURL_CURL_H ++#/* INN parsedate function present * HAVE_INN_PARSEDATE ++ ++include(CheckIncludeFile) ++include(CheckFunctionExists) ++check_include_file("dlfcn.h" HAVE_DLFCN_H) ++check_include_file("errno.h" HAVE_ERRNO_H) ++check_include_file("expat.h" HAVE_EXPAT_H) ++check_include_file("fcntl.h" HAVE_FCNTL_H) ++check_include_file("fetch.h" HAVE_FETCH_H) ++check_include_file("getopt.h" HAVE_GETOPT_H) ++check_include_file("inttypes.h" HAVE_INTTYPES_H) ++check_include_file("libxml/hash.h" HAVE_LIBXML_HASH_H) ++check_include_file("libxml/HTMLparser.h" HAVE_LIBXML_HTMLPARSER_H) ++check_include_file("libxml/nanohttp.h" HAVE_LIBXML_NANOHTTP_H) ++check_include_file("libxml/parser.h" HAVE_LIBXML_PARSER_H) ++check_include_file("libxml/SAX2.h" HAVE_LIBXML_SAX2_H) ++check_include_file("libxslt/xslt.h" HAVE_LIBXSLT_XSLT_H) ++check_include_file("limits.h" HAVE_LIMITS_H) ++check_include_file("math.h" HAVE_MATH_H) ++check_include_file("memory.h" HAVE_MEMORY_H) ++check_include_file("setjmp.h" HAVE_SETJMP_H) ++check_include_file("stdint.h" HAVE_STDINT_H) ++check_include_file("stdlib.h" HAVE_STDLIB_H) ++check_include_file("strings.h" HAVE_STRINGS_H) ++check_include_file("string.h" HAVE_STRING_H) ++check_include_file("sys/param.h" HAVE_SYS_PARAM_H) ++check_include_file("sys/stat.h" HAVE_SYS_STAT_H) ++check_include_file("sys/time.h" HAVE_SYS_TIME_H) ++check_include_file("sys/types.h" HAVE_SYS_TYPES_H) ++check_include_file("unistd.h" HAVE_UNISTD_H) ++check_include_file("xmlparse.h" HAVE_XMLPARSE_H) ++ ++check_function_exists("getopt" HAVE_GETOPT) ++check_function_exists("getopt_long" HAVE_GETOPT_LONG) ++check_function_exists("gettimeofday" HAVE_GETTIMEOFDAY) ++check_function_exists("isascii" HAVE_ISASCII) ++check_function_exists("setjmp" HAVE_SETJMP) ++check_function_exists("strcasecmp" HAVE_STRCASECMP) ++check_function_exists("strtok_r" HAVE_STRTOK_R) ++check_function_exists("stricmp" HAVE_STRICMP) ++check_function_exists("vsnprintf" HAVE_VSNPRINTF) ++check_function_exists("xmlCtxtUseOptions" HAVE_XMLCTXTUSEOPTIONS) ++check_function_exists("xmlSAX2InternalSubset" HAVE_XMLSAX2INTERNALSUBSET) ++ ++# need 'extern int optind' declaration? * NEED_OPTIND_DECLARATION ++ ++set(PACKAGE "raptor2") ++set(PACKAGE_BUGREPORT "kde-windows@kde.org") ++set(PACKAGE_NAME "raptor2") ++set(PACKAGE_STRING "\"${PACKAGE} ${VERSION}\"") ++set(PACKAGE_TARNAME "$PACKAGE_STRING{}") ++set(PACKAGE_URL "http://windows.kde.org") ++set(PACKAGE_VERSION ${VERSION}) ++ ++# does libxml struct xmlEntity have a field etype * RAPTOR_LIBXML_ENTITY_ETYPE ++# does libxml struct xmlEntity have a field name_length * RAPTOR_LIBXML_ENTITY_NAME_LENGTH ++# does libxml have HTML_PARSE_NONET * RAPTOR_LIBXML_HTML_PARSE_NONET ++# does libxml xmlSAXHandler have externalSubset field * RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET ++# does libxml xmlSAXHandler have initialized field * RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED ++# does libxml have XML_PARSE_NONET * RAPTOR_LIBXML_XML_PARSE_NONET ++ ++set(RAPTOR_MIN_VERSION_DECIMAL ${RAPTOR_VERSION_DECIMAL}) ++set(RAPTOR_NFC_CHECK 1) ++set(RAPTOR_PARSER_GRDDL 1) ++set(RAPTOR_PARSER_GUESS 1) ++set(RAPTOR_PARSER_JSON 1) ++set(RAPTOR_PARSER_NQUADS 1) ++set(RAPTOR_PARSER_NTRIPLES 1) ++set(RAPTOR_PARSER_RDFA 1) ++set(RAPTOR_PARSER_RDFXML 1) ++set(RAPTOR_PARSER_RSS 1) ++set(RAPTOR_PARSER_TRIG 1) ++set(RAPTOR_PARSER_TURTLE 1) ++set(RAPTOR_SERIALIZER_ATOM 1) ++set(RAPTOR_SERIALIZER_DOT 1) ++set(RAPTOR_SERIALIZER_HTML 1) ++set(RAPTOR_SERIALIZER_JSON 1) ++set(RAPTOR_SERIALIZER_NQUADS 1) ++set(RAPTOR_SERIALIZER_NTRIPLES 1) ++set(RAPTOR_SERIALIZER_RDFXML 1) ++set(RAPTOR_SERIALIZER_RDFXML_ABBREV 1) ++set(RAPTOR_SERIALIZER_RSS_1_0 1) ++set(RAPTOR_SERIALIZER_TURTLE 1) ++ ++set(RAPTOR_WWW_LIBCURL 1) ++# Have libfetch WWW library * RAPTOR_WWW_LIBFETCH ++set(RAPTOR_WWW_LIBXML 1) ++# No WWW library * RAPTOR_WWW_NONE ++set(RAPTOR_XML_1_1 1) ++set(RAPTOR_XML_EXPAT 0) ++# defined in win32_raptor_config.h ++#set(RAPTOR_XML_LIBXML 1) ++# The size of `unsigned char', as computed by sizeof. * SIZEOF_UNSIGNED_CHAR ++# The size of `unsigned int', as computed by sizeof. * SIZEOF_UNSIGNED_INT ++# The size of `unsigned long', as computed by sizeof. * SIZEOF_UNSIGNED_LONG ++# The size of `unsigned short', as computed by sizeof. * SIZEOF_UNSIGNED_SHORT ++set(STDC_HEADERS 1) ++ ++configure_file(src/raptor_config.h.cmake ${CMAKE_BINARY_DIR}/raptor_config.h) ++add_definitions(-DHAVE_CONFIG_H) ++add_definitions(-DRAPTOR_PARSER_RDFA=1) +diff -Nru -x '*~' raptor2-2.0.8.orig/librdfa/strtok_r.h raptor2-2.0.8/librdfa/strtok_r.h +--- raptor2-2.0.8.orig/librdfa/strtok_r.h 2012-05-24 12:36:40.000000000 +0100 ++++ raptor2-2.0.8/librdfa/strtok_r.h 2012-12-30 11:29:57.408366300 +0100 +@@ -11,5 +11,5 @@ + + #ifdef NEED_RDFA_STRTOK_R + char *rdfa_strtok_r(char *str, const char *delim, char **saveptr); +-# define strtok_r(s,d,p) rdfa_strtok_s(s,d,p) ++# define strtok_r(s,d,p) rdfa_strtok_r(s,d,p) + #endif +diff -Nru -x '*~' raptor2-2.0.8.orig/src/raptor_config.h.cmake raptor2-2.0.8/src/raptor_config.h.cmake +--- raptor2-2.0.8.orig/src/raptor_config.h.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ raptor2-2.0.8/src/raptor_config.h.cmake 2012-12-30 11:29:57.418380700 +0100 +@@ -0,0 +1,342 @@ ++/* src/raptor_config.h.in. Generated from configure.ac by autoheader. */ ++ ++/* Define if building universal (internal helper macro) */ ++#cmakedefine AC_APPLE_UNIVERSAL_BUILD @AC_APPLE_UNIVERSAL_BUILD@ ++ ++/* have to check C99 vsnprintf at runtime because cross compiling */ ++#cmakedefine CHECK_VSNPRINTF_RUNTIME @CHECK_VSNPRINTF_RUNTIME@ ++ ++/* does expat crash when it sees an initial UTF8 BOM? */ ++#cmakedefine EXPAT_UTF8_BOM_CRASH @EXPAT_UTF8_BOM_CRASH@ ++ ++/* vsnprint has C99 compatible return value */ ++#cmakedefine HAVE_C99_VSNPRINTF @HAVE_C99_VSNPRINTF@ ++ ++/* Have curl/curl.h */ ++#cmakedefine HAVE_CURL_CURL_H @HAVE_CURL_CURL_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_ERRNO_H @HAVE_ERRNO_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_EXPAT_H @HAVE_EXPAT_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_FETCH_H @HAVE_FETCH_H@ ++ ++/* Define to 1 if you have the `getopt' function. */ ++#cmakedefine HAVE_GETOPT @HAVE_GETOPT@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ ++ ++/* Define to 1 if you have the `getopt_long' function. */ ++#cmakedefine HAVE_GETOPT_LONG @HAVE_GETOPT_LONG@ ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#cmakedefine HAVE_GETTIMEOFDAY @HAVE_GETTIMEOFDAY@ ++ ++/* INN parsedate function present */ ++#cmakedefine HAVE_INN_PARSEDATE @HAVE_INN_PARSEDATE@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ ++ ++/* Define to 1 if you have the `isascii' function. */ ++#cmakedefine HAVE_ISASCII @HAVE_ISASCII@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIBXML_HASH_H @HAVE_LIBXML_HASH_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIBXML_HTMLPARSER_H @HAVE_LIBXML_HTMLPARSER_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIBXML_NANOHTTP_H @HAVE_LIBXML_NANOHTTP_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIBXML_PARSER_H @HAVE_LIBXML_PARSER_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIBXML_SAX2_H @HAVE_LIBXML_SAX2_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIBXSLT_XSLT_H @HAVE_LIBXSLT_XSLT_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_MATH_H @HAVE_MATH_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ ++ ++/* Raptor raptor_parse_date available */ ++#cmakedefine HAVE_RAPTOR_PARSE_DATE @HAVE_RAPTOR_PARSE_DATE@ ++ ++/* have round() in libm */ ++#cmakedefine HAVE_ROUND @HAVE_ROUND@ ++ ++/* Define to 1 if you have the `setjmp' function. */ ++#cmakedefine HAVE_SETJMP @HAVE_SETJMP@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_SETJMP_H @HAVE_SETJMP_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@ ++ ++/* Define to 1 if you have the `strcasecmp' function. */ ++#cmakedefine HAVE_STRCASECMP @HAVE_STRCASECMP@ ++ ++/* Define to 1 if you have the `stricmp' function. */ ++#cmakedefine HAVE_STRICMP @HAVE_STRICMP@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_STRING_H @HAVE_STRING_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_SYS_PARAM_H @HAVE_SYS_PARAM_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ ++ ++/* have trunc() in libm */ ++#cmakedefine HAVE_TRUNC @HAVE_TRUNC@ ++ ++/* Define to 1 if the system has the type `u16'. */ ++#cmakedefine HAVE_U16 @HAVE_U16@ ++ ++/* Define to 1 if the system has the type `u8'. */ ++#cmakedefine HAVE_U8 @HAVE_U8@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ ++ ++/* Define to 1 if you have the `vsnprintf' function. */ ++#cmakedefine HAVE_VSNPRINTF @HAVE_VSNPRINTF@ ++ ++/* Define to 1 if you have the `xmlCtxtUseOptions' function. */ ++#cmakedefine HAVE_XMLCTXTUSEOPTIONS @HAVE_XMLCTXTUSEOPTIONS@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_XMLPARSE_H @HAVE_XMLPARSE_H@ ++ ++/* Define to 1 if you have the `xmlSAX2InternalSubset' function. */ ++#cmakedefine HAVE_XMLSAX2INTERNALSUBSET @HAVE_XMLSAX2INTERNALSUBSET@ ++ ++/* Define to 1 if you have the header file. */ ++#cmakedefine HAVE_YAJL_YAJL_PARSE_H @HAVE_YAJL_YAJL_PARSE_H@ ++ ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#cmakedefine LT_OBJDIR @LT_OBJDIR@ ++ ++/* need 'extern int optind' declaration? */ ++#cmakedefine NEED_OPTIND_DECLARATION @NEED_OPTIND_DECLARATION@ ++ ++/* Define to 1 if your C compiler doesn't accept -c and -o together. */ ++#cmakedefine NO_MINUS_C_MINUS_O @NO_MINUS_C_MINUS_O@ ++ ++/* Name of package */ ++#cmakedefine PACKAGE @PACKAGE@ ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#cmakedefine PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@ ++ ++/* Define to the full name of this package. */ ++#cmakedefine PACKAGE_NAME @PACKAGE_NAME@ ++ ++/* Define to the full name and version of this package. */ ++#cmakedefine PACKAGE_STRING @PACKAGE_STRING@ ++ ++/* Define to the one symbol short name of this package. */ ++#cmakedefine PACKAGE_TARNAME @PACKAGE_TARNAME@ ++ ++/* Define to the home page for this package. */ ++#cmakedefine PACKAGE_URL @PACKAGE_URL@ ++ ++/* Define to the version of this package. */ ++#cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@ ++ ++/* does libxml struct xmlEntity have a field etype */ ++#cmakedefine RAPTOR_LIBXML_ENTITY_ETYPE @RAPTOR_LIBXML_ENTITY_ETYPE@ ++ ++/* does libxml struct xmlEntity have a field name_length */ ++#cmakedefine RAPTOR_LIBXML_ENTITY_NAME_LENGTH @RAPTOR_LIBXML_ENTITY_NAME_LENGTH@ ++ ++/* does libxml have HTML_PARSE_NONET */ ++#cmakedefine RAPTOR_LIBXML_HTML_PARSE_NONET @RAPTOR_LIBXML_HTML_PARSE_NONET@ ++ ++/* does libxml xmlSAXHandler have externalSubset field */ ++#cmakedefine RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET @RAPTOR_LIBXML_XMLSAXHANDLER_EXTERNALSUBSET@ ++ ++/* does libxml xmlSAXHandler have initialized field */ ++#cmakedefine RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED @RAPTOR_LIBXML_XMLSAXHANDLER_INITIALIZED@ ++ ++/* does libxml have XML_PARSE_NONET */ ++#cmakedefine RAPTOR_LIBXML_XML_PARSE_NONET @RAPTOR_LIBXML_XML_PARSE_NONET@ ++ ++/* Minimum supported package version */ ++#cmakedefine RAPTOR_MIN_VERSION_DECIMAL @RAPTOR_MIN_VERSION_DECIMAL@ ++ ++/* Provide a Unicode NFC check */ ++#cmakedefine RAPTOR_NFC_CHECK @RAPTOR_NFC_CHECK@ ++ ++/* Building GRDDL parser */ ++#cmakedefine RAPTOR_PARSER_GRDDL @RAPTOR_PARSER_GRDDL@ ++ ++/* Building guess parser */ ++#cmakedefine RAPTOR_PARSER_GUESS @RAPTOR_PARSER_GUESS@ ++ ++/* Building JSON parser */ ++#cmakedefine RAPTOR_PARSER_JSON @RAPTOR_PARSER_JSON@ ++ ++/* Building N-Quads parser */ ++#cmakedefine RAPTOR_PARSER_NQUADS @RAPTOR_PARSER_NQUADS@ ++ ++/* Building N-Triples parser */ ++#cmakedefine RAPTOR_PARSER_NTRIPLES @RAPTOR_PARSER_NTRIPLES@ ++ ++/* Building RDFA parser */ ++#cmakedefine RAPTOR_PARSER_RDFA @RAPTOR_PARSER_RDFA@ ++ ++/* Building RDF/XML parser */ ++#cmakedefine RAPTOR_PARSER_RDFXML @RAPTOR_PARSER_RDFXML@ ++ ++/* Building RSS Tag Soup parser */ ++#cmakedefine RAPTOR_PARSER_RSS @RAPTOR_PARSER_RSS@ ++ ++/* Building TRiG parser */ ++#cmakedefine RAPTOR_PARSER_TRIG @RAPTOR_PARSER_TRIG@ ++ ++/* Building Turtle parser */ ++#cmakedefine RAPTOR_PARSER_TURTLE @RAPTOR_PARSER_TURTLE@ ++ ++/* Building Atom 1.0 serializer */ ++#cmakedefine RAPTOR_SERIALIZER_ATOM @RAPTOR_SERIALIZER_ATOM@ ++ ++/* Building GraphViz DOT serializer */ ++#cmakedefine RAPTOR_SERIALIZER_DOT @RAPTOR_SERIALIZER_DOT@ ++ ++/* Building HTML Table serializer */ ++#cmakedefine RAPTOR_SERIALIZER_HTML @RAPTOR_SERIALIZER_HTML@ ++ ++/* Building JSON serializer */ ++#cmakedefine RAPTOR_SERIALIZER_JSON @RAPTOR_SERIALIZER_JSON@ ++ ++/* Building N-Quads serializer */ ++#cmakedefine RAPTOR_SERIALIZER_NQUADS @RAPTOR_SERIALIZER_NQUADS@ ++ ++/* Building N-Triples serializer */ ++#cmakedefine RAPTOR_SERIALIZER_NTRIPLES @RAPTOR_SERIALIZER_NTRIPLES@ ++ ++/* Building RDF/XML serializer */ ++#cmakedefine RAPTOR_SERIALIZER_RDFXML @RAPTOR_SERIALIZER_RDFXML@ ++ ++/* Building RDF/XML-abbreviated serializer */ ++#cmakedefine RAPTOR_SERIALIZER_RDFXML_ABBREV @RAPTOR_SERIALIZER_RDFXML_ABBREV@ ++ ++/* Building RSS 1.0 serializer */ ++#cmakedefine RAPTOR_SERIALIZER_RSS_1_0 @RAPTOR_SERIALIZER_RSS_1_0@ ++ ++/* Building Turtle serializer */ ++#cmakedefine RAPTOR_SERIALIZER_TURTLE @RAPTOR_SERIALIZER_TURTLE@ ++ ++/* Release version as a decimal */ ++#cmakedefine RAPTOR_VERSION_DECIMAL @RAPTOR_VERSION_DECIMAL@ ++ ++/* Major version number */ ++#cmakedefine RAPTOR_VERSION_MAJOR @RAPTOR_VERSION_MAJOR@ ++ ++/* Minor version number */ ++#cmakedefine RAPTOR_VERSION_MINOR @RAPTOR_VERSION_MINOR@ ++ ++/* Release version number */ ++#cmakedefine RAPTOR_VERSION_RELEASE @RAPTOR_VERSION_RELEASE@ ++ ++/* Have libcurl WWW library */ ++#cmakedefine RAPTOR_WWW_LIBCURL @RAPTOR_WWW_LIBCURL@ ++ ++/* Have libfetch WWW library */ ++#cmakedefine RAPTOR_WWW_LIBFETCH @RAPTOR_WWW_LIBFETCH@ ++ ++/* Have libxml available as a WWW library */ ++#cmakedefine RAPTOR_WWW_LIBXML @RAPTOR_WWW_LIBXML@ ++ ++/* No WWW library */ ++#cmakedefine RAPTOR_WWW_NONE @RAPTOR_WWW_NONE@ ++ ++/* Check XML 1.1 Names */ ++#cmakedefine RAPTOR_XML_1_1 @RAPTOR_XML_1_1@ ++ ++/* Use expat XML parser */ ++#cmakedefine RAPTOR_XML_EXPAT @RAPTOR_XML_EXPAT@ ++ ++/* Use libxml XML parser */ ++#cmakedefine RAPTOR_XML_LIBXML @RAPTOR_XML_LIBXML@ ++ ++/* The size of `unsigned char', as computed by sizeof. */ ++#cmakedefine SIZEOF_UNSIGNED_CHAR @SIZEOF_UNSIGNED_CHAR@ ++ ++/* The size of `unsigned int', as computed by sizeof. */ ++#cmakedefine SIZEOF_UNSIGNED_INT @SIZEOF_UNSIGNED_INT@ ++ ++/* The size of `unsigned long', as computed by sizeof. */ ++#cmakedefine SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@ ++ ++/* The size of `unsigned short', as computed by sizeof. */ ++#cmakedefine SIZEOF_UNSIGNED_SHORT @SIZEOF_UNSIGNED_SHORT@ ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#cmakedefine STDC_HEADERS @STDC_HEADERS@ ++ ++/* Define to 1 if you can safely include both and . */ ++#cmakedefine TIME_WITH_SYS_TIME @TIME_WITH_SYS_TIME@ ++ ++/* Version number of package */ ++#cmakedefine VERSION @VERSION@ ++ ++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most ++ significant byte first (like Motorola and SPARC, unlike Intel). */ ++#if defined AC_APPLE_UNIVERSAL_BUILD ++# if defined __BIG_ENDIAN__ ++# define WORDS_BIGENDIAN 1 ++# endif ++#else ++# ifndef WORDS_BIGENDIAN ++# undef WORDS_BIGENDIAN ++# endif ++#endif ++ ++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a ++ `char[]'. */ ++#cmakedefine YYTEXT_POINTER @YYTEXT_POINTER@ ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ ++ ++/* Define for large files, on AIX-style hosts. */ ++#cmakedefine _LARGE_FILES @_LARGE_FILES@ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#cmakedefine const @const@ +diff -Nru -x '*~' raptor2-2.0.8.orig/src/raptor2.h.in raptor2-2.0.8/src/raptor2.h.in +--- raptor2-2.0.8.orig/src/raptor2.h.in 2012-05-16 19:16:32.000000000 +0100 ++++ raptor2-2.0.8/src/raptor2.h.in 2012-12-30 11:29:57.418380700 +0100 +@@ -60,7 +60,9 @@ + * + * Raptor library version string + */ ++#ifndef RAPTOR_VERSION_STRING + #define RAPTOR_VERSION_STRING "@VERSION@" ++#endif + + /** + * RAPTOR_VERSION_MAJOR: +@@ -98,7 +100,7 @@ + # ifdef RAPTOR_STATIC + # define RAPTOR_API + # else +-# ifdef RAPTOR_INTERNAL ++# ifdef RAPTOR_EXPORTS + # define RAPTOR_API _declspec(dllexport) + # else + # define RAPTOR_API _declspec(dllimport) +diff -Nru -x '*~' raptor2-2.0.8.orig/src/win32_raptor_config.h raptor2-2.0.8/src/win32_raptor_config.h +--- raptor2-2.0.8.orig/src/win32_raptor_config.h 2012-06-25 03:12:39.000000000 +0100 ++++ raptor2-2.0.8/src/win32_raptor_config.h 2012-12-30 11:29:57.428395100 +0100 +@@ -115,7 +115,7 @@ + + #define RAPTOR_PARSER_GUESS 1 + #define RAPTOR_PARSER_GRDDL 1 +-#define RAPTOR_PARSER_N3 1 ++//#define RAPTOR_PARSER_N3 1 + #define RAPTOR_PARSER_TURTLE 1 + #define RAPTOR_PARSER_NTRIPLES 1 + #define RAPTOR_PARSER_RDFXML 1 diff --git a/portage/win32libs-sources/raptor2-src/raptor2-src-2.0.4-20110811.py b/portage/win32libs-sources/raptor2-src/raptor2-src-2.0.4-20110811.py index dc58551e3..acfc62e93 100644 --- a/portage/win32libs-sources/raptor2-src/raptor2-src-2.0.4-20110811.py +++ b/portage/win32libs-sources/raptor2-src/raptor2-src-2.0.4-20110811.py @@ -1,32 +1,36 @@ import info import emergePlatform from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets( self ): - for ver in ['2.0.4']: + for ver in ['2.0.4', '2.0.8']: self.targets[ ver ] = 'http://download.librdf.org/source/raptor2-' + ver + '.tar.gz' self.targetInstSrc[ ver ] = 'raptor2-' + ver self.patchToApply[ '2.0.4' ] = [( 'raptor2-2.0.4-20110811.diff', 1 ), ( 'raptor2_lround_and_isnan_patch.diff', 1) ] + self.patchToApply[ '2.0.8' ] = [( 'raptor2-2.0.8-20121210.diff', 1 ) + ] self.targetDigests['2.0.4'] = '79e1289f480cb0fe75f49ec29d9f49189a8a58c2' + self.targetDigests['2.0.8'] = '6caec62d28dbf5bc26e8de5a46101b52aabf94fd' self.shortDescription = "Resource Description Framework (RDF)" - self.defaultTarget = '2.0.4' + self.svnTargets['gitHEAD'] = 'git://github.com/dajobe/raptor.git' + self.defaultTarget = '2.0.8' def setDependencies( self ): self.dependencies['win32libs-bin/yajl'] = 'default' self.dependencies['win32libs-bin/expat'] = 'default' self.dependencies['win32libs-bin/libcurl'] = 'default' self.dependencies['win32libs-bin/libxml2'] = 'default' self.dependencies['win32libs-bin/libxslt'] = 'default' self.buildDependencies['virtual/base'] = 'default' class Package(CMakePackageBase): def __init__( self, **args ): self.subinfo = subinfo() CMakePackageBase.__init__( self ) if __name__ == '__main__': Package().execute()