diff --git a/portage/contributed/dbus4win-src/dbus4win-src-20090527.py b/portage/contributed/dbus4win-src/dbus4win-src-20090527.py deleted file mode 100644 index 7f38c227e..000000000 --- a/portage/contributed/dbus4win-src/dbus4win-src-20090527.py +++ /dev/null @@ -1,28 +0,0 @@ -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.targets['dbus4win-frank'] = 'ftp://ftp.kdab.net/pub/dbus4win/dbus4win-20090527-3.zip' - self.targets['dbus4win-noncetcp'] = 'ftp://ftp.kdab.net/pub/dbus4win/dbus4win-noncetcp-20090612.zip' - self.targetInstSrc['dbus4win-frank'] = os.path.join( "dbus4win-20090527-3", "cmake" ) - self.targetInstSrc['dbus4win-noncetcp'] = os.path.join( "dbus4win-noncetcp-20090612", "cmake" ) - self.svnTargets['svnhead'] = 'git://repo.or.cz/dbus4win.git' - self.targetConfigurePath['svnHEAD'] = 'cmake' - - self.defaultTarget = 'svnHEAD' - #self.defaultTarget = 'dbus4win-frank' - - def setDependencies( self ): - self.hardDependencies['win32libs-bin/expat'] = 'default' - self.hardDependencies['virtual/base'] = 'default' - -from Package.CMakePackageBase import * - -class Package(CMakePackageBase): - def __init__( self, **args ): - self.subinfo = subinfo() - CMakePackageBase.__init__(self) - self.subinfo.options.configure.defines = "-DDBUS_USE_EXPAT=ON -DDBUS_DISABLE_EXECUTABLE_DEBUG_POSTFIX=ON" - -if __name__ == '__main__': - Package().execute() diff --git a/portage/contributed/gpg4win-dev/gpg4win-dev-20100611.py b/portage/contributed/gpg4win-dev/gpg4win-dev-20100611.py deleted file mode 100644 index 794509863..000000000 --- a/portage/contributed/gpg4win-dev/gpg4win-dev-20100611.py +++ /dev/null @@ -1,63 +0,0 @@ -# GnuPG - Windows development package -# -# This Package contains the headers and libraries for the gnupg software: -# -# libgpg-error-1.8 -# libgcrypt-1.4.5 -# libassuan-2.0.0 -# libksba-1.0.7 -# gpgme-1.3.0 -# -# The intention is that they should keep up with the recent versions of gpg4win -# (www.gpg4win.de) which packages gnupg seperatly so KDE software can interact -# with gpg4win. - -from Package.CMakePackageBase import * -import info -import glob -import compiler - -class subinfo(info.infoclass): - - def setTargets( self ): - version="20110404-1" - self.targets[version] = \ - "http://files.kolab.org/local/gpg4win/gpg4win-dev-"+version+".zip" - self.defaultTarget = version - self.targetDigests[version] = '1ab7ba150b456ebc7c8a83b1ca3d8d570b2347b5' - - def setDependencies( self ): - self.hardDependencies['virtual/base'] = 'default' - if emergePlatform.isCrossCompilingEnabled(): - self.hardDependencies['contributed/gpg-wce-dev'] = 'default' - - def setBuildOptions( self ): - self.disableHostBuild = False - self.disableTargetBuild = True - -class Package(CMakePackageBase): - def __init__(self): - self.subinfo = subinfo() - self.subinfo.options.merge.ignoreBuildType = True - self.subinfo.options.package.packSources = False - self.subinfo.options.package.withCompiler = None - CMakePackageBase.__init__( self ) - - def compile( self ): - return True - - def install( self ): - if( not self.cleanImage()): - return False - # This package is built with MinGW gcc, since the msvc expects a different - # Name it shall get it. - if compiler.isMSVC(): - gcc_names = glob.glob( self.sourceDir() + '/lib/*.dll.a' ) - for gcc_name in gcc_names: - msvc_name = gcc_name.replace( ".dll.a", ".lib" ) - shutil.move(gcc_name, msvc_name) - shutil.copytree( self.sourceDir() , self.installDir() ) - return True - -if __name__ == '__main__': - Package().execute() diff --git a/portage/contributed/gpgme-qt/gpgme-qt-20080115.py b/portage/contributed/gpgme-qt/gpgme-qt-20080115.py deleted file mode 100644 index e8fda8fad..000000000 --- a/portage/contributed/gpgme-qt/gpgme-qt-20080115.py +++ /dev/null @@ -1,40 +0,0 @@ -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['gitHEAD'] = '[git]kde:kdepimlibs' - - self.targets['r1322'] = "http://saroengels.net/kde-windows/gnuwin32/gpgme-qt.tar.bz2" - self.targetInstSrc['r1322'] = "gpgme-qt" - #self.defaultTarget = 'r1322' - self.defaultTarget = 'gitHEAD' - - def setDependencies( self ): - self.dependencies['win32libs-bin/gpgme'] = 'default' - self.dependencies['kde/kdelibs'] = 'default' - self.dependencies['win32libs-bin/boost'] = 'default' - if not emergePlatform.isCrossCompilingEnabled(): - self.dependencies['win32libs-bin/gpgme'] = 'default' - else: - self.dependencies['contributed/gpg4win-dev'] = 'default' - -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 ) - - self.subinfo.options.configure.defines = "-DHOST_BINDIR=%s " \ - % os.path.join(ROOTDIR, "bin") - - if emergePlatform.isCrossCompilingEnabled(): - if self.isTargetBuild(): - self.subinfo.options.configure.defines += "-DKDEPIM_NO_KRESOURCES=ON -DMAILTRANSPORT_INPROCESS_SMTP=ON " - self.subinfo.options.configure.defines += "-DBUILD_doc=OFF -DKDEPIM_ONLY_KLEO=ON" - -if __name__ == '__main__': - Package().execute() diff --git a/portage/contributed/gpgme-qt/gpgme-qt.patch b/portage/contributed/gpgme-qt/gpgme-qt.patch deleted file mode 100644 index 0c51edd4d..000000000 --- a/portage/contributed/gpgme-qt/gpgme-qt.patch +++ /dev/null @@ -1,936 +0,0 @@ -diff -N -r -u gpgme-qt-orig/cmake/modules/FindGpgme.cmake gpgme-qt/cmake/modules/FindGpgme.cmake ---- gpgme-qt-orig/cmake/modules/FindGpgme.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ gpgme-qt/cmake/modules/FindGpgme.cmake 2008-01-21 22:49:20.094826500 +0100 -@@ -0,0 +1,384 @@ -+# - Try to find the gpgme library -+# -+# Algorithm: -+# - Windows: -+# On Windows, there's three gpgme variants: gpgme{,-glib,-qt}. -+# - The variant used determines the event loop integration possible: -+# - gpgme: no event loop integration possible, only synchronous operations supported -+# - gpgme-glib: glib event loop integration possible, only asynchronous operations supported -+# - gpgme-qt: qt event loop integration possible, only asynchronous operations supported -+# - GPGME_{VANILLA,GLIB,QT}_{FOUND,LIBRARIES} will be set for each of the above -+# - GPGME_INCLUDES is the same for all of the above -+# - GPGME_FOUND is set if any of the above was found -+# - *nix: -+# There's also three variants: gpgme{,-pthread,-pth}. -+# - The variant used determines the multithreaded use possible: -+# - gpgme: no multithreading support available -+# - gpgme-pthread: multithreading available using POSIX threads -+# - gpgme-pth: multithreading available using GNU PTH (cooperative multithreading) -+# - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of the above -+# - GPGME_INCLUDES is the same for all of the above -+# - GPGME_FOUND is set if any of the above was found -+# -+ -+# -+# THIS IS ALMOST A 1:1 COPY OF FindAssuan.cmake in kdepim. -+# Any changes here likely apply there, too. -+# -+ -+# do away with crappy condition repetition on else/endfoo -+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_gpgme_saved ${CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS} ) -+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true ) -+ -+#if this is built-in, please replace, if it isn't, export into a MacroToBool.cmake of it's own -+macro( macro_bool_to_bool FOUND_VAR ) -+ foreach( _current_VAR ${ARGN} ) -+ if ( ${FOUND_VAR} ) -+ set( ${_current_VAR} TRUE ) -+ else() -+ set( ${_current_VAR} FALSE ) -+ endif() -+ endforeach() -+endmacro() -+ -+include (MacroEnsureVersion) -+include (MacroBoolTo01) -+include (MacroLogFeature) -+ -+ -+if ( WIN32 ) -+ -+ # On Windows, we don't have a gpgme-config script, so we need to -+ # look for the stuff ourselves: -+ -+ # in cmake, AND and OR have the same precedence, there's no -+ # subexpressions, and expressions are evaluated short-circuit'ed -+ # IOW: CMake if() suxx. -+ set( _seem_to_have_cached_gpgme false ) -+ if ( GPGME_INCLUDES ) -+ if ( GPGME_VANILLA_LIBRARIES OR GPGME_QT_LIBRARIES OR GPGME_GLIB_LIBRARIES ) -+ set( _seem_to_have_cached_gpgme true ) -+ endif() -+ endif() -+ -+ if ( _seem_to_have_cached_gpgme ) -+ -+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND ) -+ macro_bool_to_bool( GPGME_GLIB_LIBRARIES GPGME_GLIB_FOUND ) -+ macro_bool_to_bool( GPGME_QT_LIBRARIES GPGME_QT_FOUND ) -+ # this would have been preferred: -+ #set( GPGME_*_FOUND macro_bool_to_bool(GPGME_*_LIBRARIES) ) -+ -+ if ( GPGME_VANILLA_FOUND OR GPGME_GLIB_FOUND OR GPGME_QT_FOUND ) -+ set( GPGME_FOUND true ) -+ else() -+ set( GPGME_FOUND false ) -+ endif() -+ -+ else() -+ -+ # is this needed, of just unreflected cut'n'paste? -+ # this isn't a KDE library, after all! -+# if( NOT KDEWIN_FOUND ) -+# find_package( KDEWIN REQUIRED ) -+# endif() -+ -+ set( GPGME_FOUND false ) -+ set( GPGME_VANILLA_FOUND false ) -+ set( GPGME_GLIB_FOUND false ) -+ set( GPGME_QT_FOUND false ) -+ -+ find_path( GPGME_INCLUDES gpgme.h -+ ${CMAKE_INCLUDE_PATH} -+ ${CMAKE_INSTALL_PREFIX}/include -+ ) -+ -+ find_library( _gpgme_vanilla_library NAMES gpgme libgpgme gpgme-11 libgpgme-11 -+ PATHS -+ ${CMAKE_LIBRARY_PATH} -+ ${CMAKE_INSTALL_PREFIX}/lib -+ ) -+ -+ find_library( _gpgme_glib_library NAMES gpgme-glib libgpgme-glib gpgme-glib-11 libgpgme-glib-11 -+ PATHS -+ ${CMAKE_LIBRARY_PATH} -+ ${CMAKE_INSTALL_PREFIX}/lib -+ ) -+ -+ find_library( _gpgme_qt_library NAMES gpgme-qt libgpgme-qt gpgme-qt-11 libgpgme-qt-11 -+ PATHS -+ ${CMAKE_LIBRARY_PATH} -+ ${CMAKE_INSTALL_PREFIX}/lib -+ ) -+ -+ find_library( _gpg_error_library NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0 -+ PATHS -+ ${CMAKE_LIBRARY_PATH} -+ ${CMAKE_INSTALL_PREFIX}/lib -+ ) -+ -+ set( GPGME_INCLUDES ${GPGME_INCLUDES} CACHE INTERNAL "The gpgme include paths" ) -+ -+ if ( _gpgme_vanilla_library AND _gpg_error_library ) -+ set( GPGME_VANILLA_LIBRARIES ${_gpgme_vanilla_library} ${_gpg_error_library} CACHE INTERNAL "The gpgme (vanilla) libraries" ) -+ set( GPGME_VANILLA_FOUND true ) -+ set( GPGME_FOUND true ) -+ endif() -+ -+ if ( _gpgme_glib_library AND _gpg_error_library ) -+ set( GPGME_GLIB_LIBRARIES ${_gpgme_glib_library} ${_gpg_error_library} CACHE INTERNAL "The gpgme-glib libraries" ) -+ set( GPGME_GLIB_FOUND true ) -+ set( GPGME_FOUND true ) -+ endif() -+ -+ if ( _gpgme_qt_library AND _gpg_error_library ) -+ set( GPGME_QT_LIBRARIES ${_gpgme_qt_library} ${_gpg_error_library} CACHE INTERNAL "The gpgme-qt libraries" ) -+ set( GPGME_QT_FOUND true ) -+ set( GPGME_FOUND true ) -+ endif() -+ -+ endif() -+ -+ # these are Unix-only: -+ set( GPGME_PTHREAD_FOUND false ) -+ set( GPGME_PTH_FOUND false ) -+ set( HAVE_GPGME_PTHREAD 0 ) -+ set( HAVE_GPGME_PTH 0 ) -+ -+ macro_bool_to_01( GPGME_FOUND HAVE_GPGME ) -+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA ) -+ macro_bool_to_01( GPGME_GLIB_FOUND HAVE_GPGME_GLIB ) -+ macro_bool_to_01( GPGME_QT_FOUND HAVE_GPGME_QT ) -+ -+else() # not WIN32 -+ -+ # On *nix, we have the gpgme-config script which can tell us all we -+ # need to know: -+ -+ # see WIN32 case for an explanation of what this does: -+ set( _seem_to_have_cached_gpgme false ) -+ if ( GPGME_INCLUDES ) -+ if ( GPGME_VANILLA_LIBRARIES OR GPGME_PTHREAD_LIBRARIES OR GPGME_PTH_LIBRARIES ) -+ set( _seem_to_have_cached_gpgme true ) -+ endif() -+ endif() -+ -+ if ( _seem_to_have_cached_gpgme ) -+ -+ macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND ) -+ macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND ) -+ macro_bool_to_bool( GPGME_PTH_LIBRARIES GPGME_PTH_FOUND ) -+ -+ if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND ) -+ set( GPGME_FOUND true ) -+ else() -+ set( GPGME_FOUND false ) -+ endif() -+ -+ else() -+ -+ set( GPGME_FOUND false ) -+ set( GPGME_VANILLA_FOUND false ) -+ set( GPGME_PTHREAD_FOUND false ) -+ set( GPGME_PTH_FOUND false ) -+ -+ find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config ) -+ -+ # if gpgme-config has been found -+ if ( _GPGMECONFIG_EXECUTABLE ) -+ -+ message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" ) -+ -+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION ) -+ -+ set( _GPGME_MIN_VERSION "1.0.0" ) -+ macro_ensure_version( ${_GPGME_MIN_VERSION} ${GPGME_VERSION} _GPGME_INSTALLED_VERSION_OK ) -+ -+ if ( NOT _GPGME_INSTALLED_VERSION_OK ) -+ -+ message( STATUS "The installed version of gpgme is too old: ${GPGME_VERSION} (required: >= ${_GPGME_MIN_VERSION})" ) -+ -+ else() -+ -+ message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavours..." ) -+ -+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret ) -+ if ( _ret ) -+ set( _gpgme_config_vanilla_libs ) -+ endif() -+ -+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret ) -+ if ( _ret ) -+ set( _gpgme_config_pthread_libs ) -+ endif() -+ -+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret ) -+ if ( _ret ) -+ set( _gpgme_config_pth_libs ) -+ endif() -+ -+ # append -lgpg-error to the list of libraries, if necessary -+ foreach ( _flavour vanilla pthread pth ) -+ if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error" ) -+ set( _gpgme_config_${_flavour}_libs "${_gpgme_config_${_flavour}_libs} -lgpg-error" ) -+ endif() -+ endforeach() -+ -+ if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs ) -+ -+ exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS ) -+ -+ if ( _GPGME_CFLAGS ) -+ string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS "${_GPGME_CFLAGS}" ) -+ string( REGEX REPLACE " *-I" ";" GPGME_INCLUDES "${_GPGME_CFLAGS}" ) -+ endif() -+ -+ foreach ( _flavour vanilla pthread pth ) -+ if ( _gpgme_config_${_flavour}_libs ) -+ -+ set( _gpgme_library_dirs ) -+ set( _gpgme_library_names ) -+ string( TOUPPER "${_flavour}" _FLAVOUR ) -+ -+ string( REGEX REPLACE " +" ";" _gpgme_config_${_flavour}_libs "${_gpgme_config_${_flavour}_libs}" ) -+ -+ foreach( _flag ${_gpgme_config_${_flavour}_libs} ) -+ if ( "${_flag}" MATCHES "^-L" ) -+ string( REGEX REPLACE "^-L" "" _dir "${_flag}" ) -+ file( TO_CMAKE_PATH "${_dir}" _dir ) -+ set( _gpgme_library_dirs ${_gpgme_library_dirs} "${_dir}" ) -+ elseif( "${_flag}" MATCHES "^-l" ) -+ string( REGEX REPLACE "^-l" "" _name "${_flag}" ) -+ set( _gpgme_library_names ${_gpgme_library_names} "${_name}" ) -+ endif() -+ endforeach() -+ -+ set( GPGME_${_FLAVOUR}_FOUND true ) -+ -+ foreach( _name ${_gpgme_library_names} ) -+ set( _gpgme_${_name}_lib ) -+ -+ # if -L options were given, look only there -+ if ( _gpgme_library_dirs ) -+ find_library( _gpgme_${_name}_lib NAMES ${_name} PATHS ${_gpgme_library_dirs} NO_DEFAULT_PATH ) -+ endif() -+ -+ # if not found there, look in system directories -+ if ( NOT _gpgme_${_name}_lib ) -+ find_library( _gpgme_${_name}_lib NAMES ${_name} ) -+ endif() -+ -+ # if still not found, then the whole flavour isn't found -+ if ( NOT _gpgme_${_name}_lib ) -+ if ( GPGME_${_FLAVOUR}_FOUND ) -+ set( GPGME_${_FLAVOUR}_FOUND false ) -+ set( _not_found_reason "dependant library ${_name} wasn't found" ) -+ endif() -+ endif() -+ -+ set( GPGME_${_FLAVOUR}_LIBRARIES ${GPGME_${_FLAVOUR}_LIBRARIES} "${_gpgme_${_name}_lib}" ) -+ endforeach() -+ -+ #check_c_library_exists_explicit( gpgme gpgme_check_version "${_GPGME_CFLAGS}" "${GPGME_LIBRARIES}" GPGME_FOUND ) -+ if ( GPGME_${_FLAVOUR}_FOUND ) -+ message( STATUS " Found flavour '${_flavour}', checking whether it's usable...yes" ) -+ else() -+ message( STATUS " Found flavour '${_flavour}', checking whether it's usable...no" ) -+ message( STATUS " (${_not_found_reason})" ) -+ endif() -+ endif() -+ -+ endforeach( _flavour ) -+ -+ # ensure that they are cached -+ set( GPGME_INCLUDES ${GPGME_INCLUDES} CACHE INTERNAL "The gpgme include paths" ) -+ set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} CACHE INTERNAL "The gpgme (vanilla) libraries" ) -+ set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} CACHE INTERNAL "The gpgme-pthread libraries" ) -+ set( GPGME_PTH_LIBRARIES ${GPGME_PTH_LIBRARIES} CACHE INTERNAL "The gpgme-pth libraries" ) -+ -+ if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND ) -+ set( GPGME_FOUND true ) -+ else() -+ set( GPGME_FOUND false ) -+ endif() -+ -+ endif() -+ -+ endif() -+ -+ endif() -+ -+ endif() -+ -+ # these are Windows-only: -+ set( GPGME_GLIB_FOUND false ) -+ set( GPGME_QT_FOUND false ) -+ set( HAVE_GPGME_GLIB 0 ) -+ set( HAVE_GPGME_QT 0 ) -+ -+ macro_bool_to_01( GPGME_FOUND HAVE_GPGME ) -+ macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA ) -+ macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD ) -+ macro_bool_to_01( GPGME_PTH_FOUND HAVE_GPGME_PTH ) -+ -+endif() # WIN32 | Unix -+ -+ -+set( _gpgme_flavours "" ) -+ -+if ( GPGME_VANILLA_FOUND ) -+ set( _gpgme_flavours "${_gpgme_flavours} vanilla" ) -+endif() -+ -+if ( GPGME_GLIB_FOUND ) -+ set( _gpgme_flavours "${_gpgme_flavours} Glib" ) -+endif() -+ -+if ( GPGME_QT_FOUND ) -+ set( _gpgme_flavours "${_gpgme_flavours} Qt" ) -+endif() -+ -+if ( GPGME_PTHREAD_FOUND ) -+ set( _gpgme_flavours "${_gpgme_flavours} pthread" ) -+endif() -+ -+if ( GPGME_PTH_FOUND ) -+ set( _gpgme_flavours "${_gpgme_flavours} pth" ) -+endif() -+ -+ -+if ( NOT Gpgme_FIND_QUIETLY ) -+ -+ if ( GPGME_FOUND ) -+ message( STATUS "Usable gpgme flavours found: ${_gpgme_flavours}" ) -+ else() -+ message( STATUS "No usable gpgme flavours found." ) -+ endif() -+ -+ macro_bool_to_bool( Gpgme_FIND_REQUIRED _req ) -+ -+ if ( WIN32 ) -+ set( _gpgme_homepage "http://www.gpg4win.org" ) -+ else() -+ set( _gpgme_homepage "http://www.gnupg.org/related_software/gpgme" ) -+ endif() -+ -+ macro_log_feature( -+ GPGME_FOUND -+ "gpgme" -+ "GnuPG Made Easy Development Libraries" -+ ${_gpgme_homepage} -+ ${_req} -+ "${_GPGME_MIN_VERSION} or greater" -+ "Needed to provide GNU Privacy Guard support in KDE PIM applications. Necessary to compile many PIM application, including KMail." -+ ) -+ -+else() -+ -+ if ( Gpgme_FIND_REQUIRED AND NOT GPGME_FOUND ) -+ message( FATAL_ERROR "" ) -+ endif() -+ -+endif() -+ -+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_gpgme_saved ) -diff -N -r -u gpgme-qt-orig/cmake/modules/MacroBoolTo01.cmake gpgme-qt/cmake/modules/MacroBoolTo01.cmake ---- gpgme-qt-orig/cmake/modules/MacroBoolTo01.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ gpgme-qt/cmake/modules/MacroBoolTo01.cmake 2008-01-21 22:49:20.110451500 +0100 -@@ -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 -N -r -u gpgme-qt-orig/cmake/modules/MacroEnsureVersion.cmake gpgme-qt/cmake/modules/MacroEnsureVersion.cmake ---- gpgme-qt-orig/cmake/modules/MacroEnsureVersion.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ gpgme-qt/cmake/modules/MacroEnsureVersion.cmake 2008-01-21 22:49:20.110451500 +0100 -@@ -0,0 +1,117 @@ -+# This file defines the following macros for developers to use in ensuring -+# that installed software is of the right version: -+# -+# MACRO_ENSURE_VERSION - test that a version number is greater than -+# or equal to some minimum -+# MACRO_ENSURE_VERSION_RANGE - test that a version number is greater than -+# or equal to some minimum and less than some -+# maximum -+# MACRO_ENSURE_VERSION2 - deprecated, do not use in new code -+# -+ -+# MACRO_ENSURE_VERSION -+# This macro compares version numbers of the form "x.y.z" or "x.y" -+# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) -+# will set FOO_VERSION_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION -+# 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, -+# Copyright (c) 2007, Will Stephenson -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+# MACRO_ENSURE_VERSION_RANGE -+# This macro ensures that a version number of the form -+# "x.y.z" or "x.y" falls within a range defined by -+# min_version <= found_version < max_version. -+# If this expression holds, FOO_VERSION_OK will be set TRUE -+# -+# Example: MACRO_ENSURE_VERSION_RANGE3( "0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK ) -+# -+# This macro will break silently if any of x,y,z are greater than 100. -+# -+# Copyright (c) 2007, Will Stephenson -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+# NORMALIZE_VERSION -+# Helper macro to convert version numbers of the form "x.y.z" -+# to an integer equal to 10^4 * x + 10^2 * y + z -+# -+# This macro will break silently if any of x,y,z are greater than 100. -+# -+# Copyright (c) 2006, David Faure, -+# Copyright (c) 2007, Will Stephenson -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+# CHECK_RANGE_INCLUSIVE_LOWER -+# Helper macro to check whether x <= y < z -+# -+# Copyright (c) 2007, Will Stephenson -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+ -+MACRO(NORMALIZE_VERSION _requested_version _normalized_version) -+ STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}") -+ if (_threePartMatch) -+ # parse the parts of the version string -+ STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major_vers "${_requested_version}") -+ STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor_vers "${_requested_version}") -+ STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch_vers "${_requested_version}") -+ else (_threePartMatch) -+ STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" _major_vers "${_requested_version}") -+ STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" _minor_vers "${_requested_version}") -+ set(_patch_vers "0") -+ endif (_threePartMatch) -+ -+ # compute an overall version number which can be compared at once -+ MATH(EXPR ${_normalized_version} "${_major_vers}*10000 + ${_minor_vers}*100 + ${_patch_vers}") -+ENDMACRO(NORMALIZE_VERSION) -+ -+MACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER _lower_limit _value _upper_limit _ok) -+ if (${_value} LESS ${_lower_limit}) -+ set( ${_ok} FALSE ) -+ elseif (${_value} EQUAL ${_lower_limit}) -+ set( ${_ok} TRUE ) -+ elseif (${_value} EQUAL ${_upper_limit}) -+ set( ${_ok} FALSE ) -+ elseif (${_value} GREATER ${_upper_limit}) -+ set( ${_ok} FALSE ) -+ else (${_value} LESS ${_lower_limit}) -+ set( ${_ok} TRUE ) -+ endif (${_value} LESS ${_lower_limit}) -+ENDMACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER) -+ -+MACRO(MACRO_ENSURE_VERSION requested_version found_version var_too_old) -+ NORMALIZE_VERSION( ${requested_version} req_vers_num ) -+ NORMALIZE_VERSION( ${found_version} found_vers_num ) -+ -+ 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) -+ -+MACRO(MACRO_ENSURE_VERSION2 requested_version2 found_version2 var_too_old2) -+ MACRO_ENSURE_VERSION( ${requested_version2} ${found_version2} ${var_too_old2}) -+ENDMACRO(MACRO_ENSURE_VERSION2) -+ -+MACRO(MACRO_ENSURE_VERSION_RANGE min_version found_version max_version var_ok) -+ NORMALIZE_VERSION( ${min_version} req_vers_num ) -+ NORMALIZE_VERSION( ${found_version} found_vers_num ) -+ NORMALIZE_VERSION( ${max_version} max_vers_num ) -+ -+ MACRO_CHECK_RANGE_INCLUSIVE_LOWER( ${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok}) -+ENDMACRO(MACRO_ENSURE_VERSION_RANGE) -+ -+ -diff -N -r -u gpgme-qt-orig/cmake/modules/MacroLogFeature.cmake gpgme-qt/cmake/modules/MacroLogFeature.cmake ---- gpgme-qt-orig/cmake/modules/MacroLogFeature.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ gpgme-qt/cmake/modules/MacroLogFeature.cmake 2008-01-21 22:49:20.110451500 +0100 -@@ -0,0 +1,125 @@ -+# This file defines the Feature Logging macros. -+# -+# MACRO_LOG_FEATURE(VAR FEATURE DESCRIPTION URL [REQUIRED [MIN_VERSION [COMMENTS]]]) -+# Logs the information so that it can be displayed at the end -+# of the configure run -+# VAR : TRUE or FALSE, indicating whether the feature is supported -+# FEATURE: name of the feature, e.g. "libjpeg" -+# DESCRIPTION: description what this feature provides -+# URL: home page -+# REQUIRED: TRUE or FALSE, indicating whether the featue is required -+# MIN_VERSION: minimum version number. empty string if unneeded -+# COMMENTS: More info you may want to provide. empty string if unnecessary -+# -+# MACRO_DISPLAY_FEATURE_LOG() -+# Call this to display the collected results. -+# Exits CMake with a FATAL error message if a required feature is missing -+# -+# Example: -+# -+# INCLUDE(MacroLogFeature) -+# -+# FIND_PACKAGE(JPEG) -+# MACRO_LOG_FEATURE(JPEG_FOUND "libjpeg" "Support JPEG images" "http://www.ijg.org" TRUE "3.2a" "") -+# ... -+# MACRO_DISPLAY_FEATURE_LOG() -+ -+# Copyright (c) 2006, Alexander Neundorf, -+# Copyright (c) 2006, Allen Winter, -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+IF (NOT _macroLogFeatureAlreadyIncluded) -+ SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) -+ IF (EXISTS ${_file}) -+ FILE(REMOVE ${_file}) -+ ENDIF (EXISTS ${_file}) -+ -+ SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) -+ IF (EXISTS ${_file}) -+ FILE(REMOVE ${_file}) -+ ENDIF (EXISTS ${_file}) -+ -+ SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) -+ IF (EXISTS ${_file}) -+ FILE(REMOVE ${_file}) -+ ENDIF (EXISTS ${_file}) -+ -+ SET(_macroLogFeatureAlreadyIncluded TRUE) -+ENDIF (NOT _macroLogFeatureAlreadyIncluded) -+ -+ -+MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _comments) -+ -+ SET(_required "${ARGV4}") -+ SET(_minvers "${ARGV5}") -+ SET(_comments "${ARGV6}") -+ -+ IF (${_var}) -+ SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) -+ ELSE (${_var}) -+ IF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") -+ SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/MissingRequirements.txt) -+ ELSE (${_required} MATCHES "[Tt][Rr][Uu][Ee]") -+ SET(_LOGFILENAME ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) -+ ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]") -+ ENDIF (${_var}) -+ -+ SET(_logtext "+ ${_package}") -+ -+ IF (NOT ${_var}) -+ IF (${_minvers} MATCHES ".*") -+ SET(_logtext "${_logtext}, ${_minvers}") -+ ENDIF (${_minvers} MATCHES ".*") -+ SET(_logtext "${_logtext}: ${_description} <${_url}>") -+ IF (${_comments} MATCHES ".*") -+ SET(_logtext "${_logtext}\n${_comments}") -+ ENDIF (${_comments} MATCHES ".*") -+# SET(_logtext "${_logtext}\n") #double-space missing features? -+ ENDIF (NOT ${_var}) -+ FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n") -+ -+ENDMACRO(MACRO_LOG_FEATURE) -+ -+ -+MACRO(MACRO_DISPLAY_FEATURE_LOG) -+ -+ SET(_file ${CMAKE_BINARY_DIR}/MissingRequirements.txt) -+ IF (EXISTS ${_file}) -+ FILE(READ ${_file} _requirements) -+ MESSAGE(STATUS "\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Please install them before continuing this software installation.\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------") -+ FILE(REMOVE ${_file}) -+ MESSAGE(FATAL_ERROR "Exiting: Missing Requirements") -+ ENDIF (EXISTS ${_file}) -+ -+ SET(_summary "\n") -+ -+ SET(_elist 0) -+ SET(_file ${CMAKE_BINARY_DIR}/EnabledFeatures.txt) -+ IF (EXISTS ${_file}) -+ SET(_elist 1) -+ FILE(READ ${_file} _enabled) -+ FILE(REMOVE ${_file}) -+ SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}") -+ ENDIF (EXISTS ${_file}) -+ -+ SET(_dlist 0) -+ SET(_file ${CMAKE_BINARY_DIR}/DisabledFeatures.txt) -+ IF (EXISTS ${_file}) -+ SET(_dlist 1) -+ FILE(READ ${_file} _disabled) -+ FILE(REMOVE ${_file}) -+ SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following OPTIONAL packages could NOT be located on your system.\n-- Consider installing them to enable more features from this software.\n${_disabled}") -+ ELSE (EXISTS ${_file}) -+ IF (${_elist}) -+ SET(_summary "${_summary}Congratulations! All external packages have been found.\n") -+ ENDIF (${_elist}) -+ ENDIF (EXISTS ${_file}) -+ -+ IF (${_elist} OR ${_dlist}) -+ SET(_summary "${_summary}-----------------------------------------------------------------------------\n") -+ ENDIF (${_elist} OR ${_dlist}) -+ MESSAGE(STATUS "${_summary}") -+ -+ENDMACRO(MACRO_DISPLAY_FEATURE_LOG) -diff -N -r -u gpgme-qt-orig/CMakeLists.txt gpgme-qt/CMakeLists.txt ---- gpgme-qt-orig/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ gpgme-qt/CMakeLists.txt 2008-01-21 22:49:20.141701500 +0100 -@@ -0,0 +1,67 @@ -+project( gpgme_qt ) -+ -+set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) -+ -+# search packages used by KDE -+find_package(QT4 REQUIRED) -+#include (KDE4Defaults) -+#include (MacroLibrary) -+ -+find_package(Gpgme REQUIRED) -+include(MacroEnsureVersion) -+add_definitions (${QT_DEFINITIONS}) -+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) -+include_directories ("${CMAKE_INSTALL_PREFIX}/include" ${CMAKE_BINARY_DIR} ${QT_INCLUDES}) -+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) -+add_definitions(-DHAVE_CONFIG_H) -+ -+if (WIN32) -+# overriding LIB_INSTALL_DIR specific for win32 to archieve -+# propper installation of shared library targets will also be -+# used in install(FILES ...) which fails with error -+# 'INSTALL FILES given unknown argument "RUNTIME".' -+# There must be a way to only patch install(TARGETS) -+# set (LIB_INSTALL_DIR lib) -+ add_definitions(-DHAVE_W32_SYSTEM) -+endif (WIN32) -+ -+## gpgme comes in three flavours on each of the platforms: -+## Windows: gpgme, gpgme-glib, gpgme-qt -+## Unix: gpgme, gpgme-pthread, gpgme-pth -+## We're building corresponding gpgme++ flavours -+ -+set(gpgme_qt_LIB_SRCS -+ gpgme/get-env.c -+ gpgme/w32-sema.c -+ gpgme/vasprintf.c -+ gpgme/debug.c -+ gpgme/w32-util.c -+#(js) todo - readd later, as I do not have gpgme supporting getauditlog -+#gpgme/getauditlog.c -+ gpgme/w32-qt-io.cpp -+ gpgme/kdpipeiodevice.cpp -+ gpgme/kdpipeiodevice.h -+) -+ -+qt4_automoc(${gpgme_qt_LIB_SRCS}) -+ -+set( _gpgme_qt_version 1.0.0 ) -+ -+#set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ) -+ -+if(MSVC) -+ include_directories( ${CMAKE_INCLUDE_PATH}/msvc ) -+endif(MSVC) -+if ( GPGME_VANILLA_FOUND ) -+ add_library( gpgme-qt SHARED ${gpgme_qt_LIB_SRCS} gpgme/gpgme.def ) -+ target_link_libraries( gpgme-qt ${GPGME_VANILLA_LIBRARIES} ${QT_QTCORE_LIBRARY} ) -+ if(MSVC) -+ target_link_libraries( gpgme-qt kdewin32 ) -+ endif(MSVC) -+ set_target_properties( gpgme-qt PROPERTIES -+ VERSION ${_gpgme_qt_version} -+ SOVERSION ${_gpgme_qt_version} -+ OUTPUT_NAME gpgme-qt -+ ) -+ install(TARGETS gpgme-qt RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) -+endif ( GPGME_VANILLA_FOUND ) -diff -N -r -u gpgme-qt-orig/config.h.cmake gpgme-qt/config.h.cmake ---- gpgme-qt-orig/config.h.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ gpgme-qt/config.h.cmake 2008-01-21 22:49:20.141701500 +0100 -@@ -0,0 +1,42 @@ -+/* This file is part of the KDE libraries -+ Copyright (c) 2007 The KDE Project -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License version 2 as published by the Free Software Foundation. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. -+*/ -+ -+#ifndef GPGME_QT_CONFIG_H -+#define GPGME_QT_CONFIG_H -+ -+/* Definition of GCC specific attributes. */ -+#if defined __GNUC__ && __GNUC__ > 2 -+# define GPGME_GCC_A_PURE __attribute__ ((__pure__)) -+#else -+# define GPGME_GCC_A_PURE -+#endif -+ -+#ifdef _MSC_VER -+# define snprintf _snprintf -+ -+#endif -+ -+/* Separators as used in $PATH. */ -+#if defined _WIN32 || defined _WIN64 -+# define HAVE_DOSISH_SYSTEM -+# define PATHSEP_C ';' -+#else -+# define PATHSEP_C ':' -+#endif -+ -+#endif -diff -N -r -u gpgme-qt-orig/gpgme/debug.h gpgme-qt/gpgme/debug.h ---- gpgme-qt-orig/gpgme/debug.h 2008-01-21 22:48:20.360451500 +0100 -+++ gpgme-qt/gpgme/debug.h 2008-01-21 22:49:20.157326500 +0100 -@@ -22,6 +22,7 @@ - #define DEBUG_H - - #include -+#include "config.h" - - /* Indirect stringification, requires __STDC__ to work. */ - #define STRINGIFY(v) #v -@@ -40,10 +41,10 @@ - - /* Remove path components from filenames (i.e. __FILE__) for cleaner - logs. */ --static inline const char *_gpgme_debug_srcname (const char *file) -+static const char *_gpgme_debug_srcname (const char *file) - GPGME_GCC_A_PURE; - --static inline const char * -+static const char * - _gpgme_debug_srcname (const char *file) - { - const char *s = strrchr (file, '/'); -diff -N -r -u gpgme-qt-orig/gpgme/gpgme.def gpgme-qt/gpgme/gpgme.def ---- gpgme-qt-orig/gpgme/gpgme.def 2008-01-21 22:48:20.360451500 +0100 -+++ gpgme-qt/gpgme/gpgme.def 2008-01-21 22:49:20.157326500 +0100 -@@ -156,15 +156,15 @@ - gpgme_get_giochannel @121 - gpgme_get_fdptr @122 - -- gpgme_op_getauditlog_start @123 -- gpgme_op_getauditlog @124 -+; gpgme_op_getauditlog_start @123 -+; gpgme_op_getauditlog @124 - -- gpgme_conf_release @125 -- gpgme_conf_arg_new @126 -- gpgme_conf_arg_release @127 -- gpgme_conf_opt_change @128 -- gpgme_op_conf_load @129 -- gpgme_op_conf_save @130 -+; gpgme_conf_release @125 -+; gpgme_conf_arg_new @126 -+; gpgme_conf_arg_release @127 -+; gpgme_conf_opt_change @128 -+; gpgme_op_conf_load @129 -+; gpgme_op_conf_save @130 - - ; END - -diff -N -r -u gpgme-qt-orig/gpgme/gpgme.h gpgme-qt/gpgme/gpgme.h ---- gpgme-qt-orig/gpgme/gpgme.h 2008-01-21 22:48:20.376076500 +0100 -+++ gpgme-qt/gpgme/gpgme.h 2008-01-21 22:49:20.157326500 +0100 -@@ -34,7 +34,11 @@ - - #ifdef _MSC_VER - typedef long off_t; -- typedef long ssize_t; -+ typedef int pid_t; -+ #ifndef _SSIZE_T_DEFINED -+ #define _SSIZE_T_DEFINED -+ typedef long ssize_t; -+ #endif - #else - # include - #endif -diff -N -r -u gpgme-qt-orig/gpgme/w32-qt-io.cpp gpgme-qt/gpgme/w32-qt-io.cpp ---- gpgme-qt-orig/gpgme/w32-qt-io.cpp 2008-01-21 22:48:20.376076500 +0100 -+++ gpgme-qt/gpgme/w32-qt-io.cpp 2008-01-21 22:49:20.172951500 +0100 -@@ -29,8 +29,6 @@ - #include - #include - #include --#include --#include - #include - #include - #include -@@ -408,7 +406,7 @@ - 0, /* returns pid */ - 0 /* returns tid */ - }; -- STARTUPINFO si; -+ STARTUPINFOA si; - int cr_flags = CREATE_DEFAULT_ERROR_MODE - | GetPriorityClass (GetCurrentProcess ()); - int i; -diff -N -r -u gpgme-qt-orig/gpgme/w32-sema.c gpgme-qt/gpgme/w32-sema.c ---- gpgme-qt-orig/gpgme/w32-sema.c 2008-01-21 22:48:20.376076500 +0100 -+++ gpgme-qt/gpgme/w32-sema.c 2008-01-21 22:49:20.172951500 +0100 -@@ -29,7 +29,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff -N -r -u gpgme-qt-orig/gpgme/debug.c gpgme-qt/gpgme/debug.c ---- gpgme-qt-orig/gpgme/debug.c 2008-01-21 22:48:20.376076500 +0100 -+++ gpgme-qt/gpgme/debug.c 2008-01-21 22:49:20.172951500 +0100 -@@ -26,7 +26,6 @@ - #include - #include - #include --#include - #include - #include - #ifndef HAVE_DOSISH_SYSTEM -diff -N -r -u gpgme-qt-orig/gpgme/w32-util.c gpgme-qt/gpgme/w32-util.c ---- gpgme-qt-orig/gpgme/w32-util.c 2008-01-21 22:48:20.376076500 +0100 -+++ gpgme-qt/gpgme/w32-util.c 2008-01-21 22:49:20.172951500 +0100 -@@ -48,14 +48,14 @@ - - #define RTLD_LAZY 0 - --static __inline__ void * -+static __inline void * - dlopen (const char * name, int flag) - { - void * hd = LoadLibrary (name); - return hd; - } - --static __inline__ void * -+static __inline void * - dlsym (void * hd, const char * sym) - { - if (hd && sym) -@@ -68,7 +68,7 @@ - return NULL; - } - --static __inline__ int -+static __inline int - dlclose (void * hd) - { - if (hd) -@@ -432,7 +432,7 @@ - does not exist at the time of the call to mkstemp. TMPL is - overwritten with the result. */ - static int --mkstemp (char *tmpl) -+gpgme_mkstemp (char *tmpl) - { - int len; - char *XXXXXX; -@@ -540,7 +540,7 @@ - if (!tmpname) - return -1; - strcpy (stpcpy (tmpname, tmp), "\\gpgme-XXXXXX"); -- *fd = mkstemp (tmpname); -+ *fd = gpgme_mkstemp (tmpname); - if (fd < 0) - return -1; - diff --git a/portage/contributed/kdebase-apps-branch/kdebase-apps-branch-20080619.py b/portage/contributed/kdebase-apps-branch/kdebase-apps-branch-20080619.py deleted file mode 100644 index c6e8d2221..000000000 --- a/portage/contributed/kdebase-apps-branch/kdebase-apps-branch-20080619.py +++ /dev/null @@ -1,41 +0,0 @@ -import base -import os -import sys -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = 'branches/kdepim/enterprise4/kdebase-4.1-branch/apps' - for ver in ['74', '80', '83']: - self.targets['4.0.' + ver] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.' + ver + '/src/kdebase-enterprise4-4.0.' + ver + '.tar.bz2' - self.targetInstSrc['4.0.' + ver] = 'kdebase-enterprise4-4.0.' + ver - self.defaultTarget = 'svnHEAD' - - def setDependencies( self ): - self.hardDependencies['contributed/kdelibs-branch'] = 'default' - self.hardDependencies['contributed/kdepimlibs-branch'] = 'default' - self.hardDependencies['contributed/kdebase-runtime-branch'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.subinfo = subinfo() - - def unpack( self ): - return self.kdeSvnUnpack() - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - if not self.buildTarget == 'svnHEAD': - return self.doPackaging( "kdebase-apps-enterprise4", self.buildTarget, True ) - else: - return self.doPackaging( "kdebase-apps-enterprise4", os.path.basename(sys.argv[0]).replace("kdebase-apps-", "").replace(".py", ""), True ) - - -if __name__ == '__main__': - subclass().execute() diff --git a/portage/contributed/kdebase-apps-branch/post-install-bin.cmd b/portage/contributed/kdebase-apps-branch/post-install-bin.cmd deleted file mode 100644 index f606bfa21..000000000 --- a/portage/contributed/kdebase-apps-branch/post-install-bin.cmd +++ /dev/null @@ -1,33 +0,0 @@ -@echo off - -echo ******************************************************************************* -echo package: %0 -echo ******************************************************************************* - -set quitnow=False -::for %%i in ( kioslave.exe kded4.exe ) DO ( -:: tasklist /NH /FI "IMAGENAME eq %%i" | find "%%i" > "Nul" && ( -:: echo error: found %%i running. please kill this process! -:: set quitnow=True -:: ) -::) - -if %quitnow% equ True ( - echo error: one or more programs are running that shouldn't run. - echo please close them before restarting this script - goto :eof -) - -if not `"update-mime-database --help"` equ "" ( - update-mime-database %CD%\share\mime -) else ( - echo error: update-mime-database wasn't found. - echo please check for correct installation -) - -if not `"kbuildsycoca4 --help"` equ "" ( - kbuildsycoca4 --noincremental -) else ( - echo error: kbuildsycoca4 wasn't found. - echo please check for correct installation -) \ No newline at end of file diff --git a/portage/contributed/kdepim-nommap/kdepim-nommap-20080506.py b/portage/contributed/kdepim-nommap/kdepim-nommap-20080506.py deleted file mode 100644 index 5eed5f8b4..000000000 --- a/portage/contributed/kdepim-nommap/kdepim-nommap-20080506.py +++ /dev/null @@ -1,42 +0,0 @@ -import base -import os -import sys -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['nommap'] = 'branches/work/kdepim-nommap' -# for ver in ['66', '67', '70']: -# self.targets['4.0.' + ver] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.' + ver + '/src/kdepim-4.0.' + ver + '.tar.bz2' -# self.targetInstSrc['4.0.' + ver] = 'kdepim-4.0.' + ver - self.defaultTarget = 'nommap' - - def setDependencies( self ): - self.hardDependencies['kde/kde-runtime'] = 'default' - self.hardDependencies['contributed/gpgme-qt'] = 'default' - self.hardDependencies['win32libs-bin/sqlite'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.subinfo = subinfo() - self.kdeCustomDefines = "-DKLEO_SYNCHRONOUS_API_HOTFIX=ON" -# self.kdeCustomDefines += " -DBUILD_doc=OFF" - - def unpack( self ): - return self.kdeSvnUnpack() - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - if not self.buildTarget == 'svnHEAD': - return self.doPackaging( "kdepim", self.buildTarget, True ) - else: - return self.doPackaging( "kdepim", os.path.basename(sys.argv[0]).replace("kdepim-", "").replace(".py", ""), True ) - -if __name__ == '__main__': - subclass().execute() diff --git a/portage/contributed/kdeutils-branch/kdeutils-branch-20080620.py b/portage/contributed/kdeutils-branch/kdeutils-branch-20080620.py deleted file mode 100644 index 8ad1c3d6f..000000000 --- a/portage/contributed/kdeutils-branch/kdeutils-branch-20080620.py +++ /dev/null @@ -1,42 +0,0 @@ -import base -import os -import sys -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = 'trunk/KDE/kdeutils' - for ver in ['74', '80', '83']: - self.targets['4.0.' + ver] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.' + ver + '/src/kdeutils-4.0.' + ver + '.tar.bz2' - self.targetInstSrc['4.0.' + ver] = 'kdeutils-enterprise4-4.0.' + ver - self.defaultTarget = 'svnHEAD' - - def setDependencies( self ): - self.hardDependencies['contributed/kdebase-runtime-branch'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - self.buildType="Debug" - base.baseclass.__init__( self, args=args ) - self.subinfo = subinfo() - self.kdeCustomDefines = "" -# self.kdeCustomDefines += "-DBUILD_kwallet=OFF " -# self.kdeCustomDefines += "-DBUILD_doc=OFF" - - def unpack( self ): - return self.kdeSvnUnpack() - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - if not self.buildTarget == 'svnHEAD': - return self.doPackaging( "kdeutils-enterprise4", self.buildTarget, True ) - else: - return self.doPackaging( "kdeutils-enterprise4", os.path.basename(sys.argv[0]).replace("kdeutils-", "").replace(".py", ""), True ) - -if __name__ == '__main__': - subclass().execute() diff --git a/portage/contributed/koffice-trunk/koffice-trunk-20090820.py b/portage/contributed/koffice-trunk/koffice-trunk-20090820.py deleted file mode 100644 index b493d8129..000000000 --- a/portage/contributed/koffice-trunk/koffice-trunk-20090820.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -# KOffice trunk with kdelibs and kdelibs trunk -import base -import os -import utils -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = "trunk/koffice" - self.defaultTarget = 'svnHEAD' - - def setDependencies( self ): - self.hardDependencies['win32libs-bin/lcms'] = 'default' - self.hardDependencies['kde/kdepimlibs'] = 'default' - self.hardDependencies['kde/kde-runtime'] = 'default' - self.hardDependencies['kdesupport/eigen2'] = 'default' - self.softDependencies['kdesupport/qca'] = 'default' - self.softDependencies['testing/gsl'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.instsrcdir = "koffice" - self.subinfo = subinfo() - self.kdeCustomDefines = "" -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_karbon=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kformula=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kpresenter=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kchart=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kdgantt=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kexi=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kivio=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kounavail=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kplato=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_krita=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kword=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_kspread=OFF " -# self.kdeCustomDefines = self.kdeCustomDefines + "-DBUILD_doc=OFF " - - def unpack( self ): - return self.kdeSvnUnpack() - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - return self.doPackaging( "koffice" ) - -if __name__ == '__main__': - subclass().execute() diff --git a/portage/contributed/koffice-trunk/post-install-bin.cmd b/portage/contributed/koffice-trunk/post-install-bin.cmd deleted file mode 100644 index f606bfa21..000000000 --- a/portage/contributed/koffice-trunk/post-install-bin.cmd +++ /dev/null @@ -1,33 +0,0 @@ -@echo off - -echo ******************************************************************************* -echo package: %0 -echo ******************************************************************************* - -set quitnow=False -::for %%i in ( kioslave.exe kded4.exe ) DO ( -:: tasklist /NH /FI "IMAGENAME eq %%i" | find "%%i" > "Nul" && ( -:: echo error: found %%i running. please kill this process! -:: set quitnow=True -:: ) -::) - -if %quitnow% equ True ( - echo error: one or more programs are running that shouldn't run. - echo please close them before restarting this script - goto :eof -) - -if not `"update-mime-database --help"` equ "" ( - update-mime-database %CD%\share\mime -) else ( - echo error: update-mime-database wasn't found. - echo please check for correct installation -) - -if not `"kbuildsycoca4 --help"` equ "" ( - kbuildsycoca4 --noincremental -) else ( - echo error: kbuildsycoca4 wasn't found. - echo please check for correct installation -) \ No newline at end of file diff --git a/portage/contributed/l10n-kde4-branch/autogen.py b/portage/contributed/l10n-kde4-branch/autogen.py deleted file mode 100644 index d3a294f31..000000000 --- a/portage/contributed/l10n-kde4-branch/autogen.py +++ /dev/null @@ -1,217 +0,0 @@ -#!/usr/bin/env python -# -*- coding: UTF-8 -*- - -# create cmake build system files by iterating all available languages [1] -# - -import os -import re -import sys -import getopt - -cmake_filename = "CMakeLists.txt" - -def createTopLevelCMakeListFile(subdir, language): - topLevelCmakeList = os.path.join(subdir, cmake_filename) - - content = " \n\ -project(kde-i18n-%s) \n\ - \n\ -# Search KDE installation \n\ -find_package(KDE4 REQUIRED) \n\ -find_package(Gettext REQUIRED) \n\ -include (KDE4Defaults) \n\ -include(MacroOptionalAddSubdirectory) \n\ - \n\ -if (NOT GETTEXT_MSGMERGE_EXECUTABLE) \n\ - MESSAGE(FATAL_ERROR \"Please install the msgmerge binary\") \n\ -endif (NOT GETTEXT_MSGMERGE_EXECUTABLE) \n\ - \n\ -IF(NOT GETTEXT_MSGFMT_EXECUTABLE) \n\ - MESSAGE(FATAL_ERROR \"Please install the msgfmt binary\") \n\ -endif (NOT GETTEXT_MSGFMT_EXECUTABLE) \n\ -" % (language) - f = open(topLevelCmakeList,"w") - f.write(content) - f.write('\nset(CURRENT_LANG %s)\n\n' % (language)) - return f - -# -# subdir 'messages' -# -def add_cmake_files_messages_po(path): - filename = os.path.join(path, cmake_filename) - fc = open(filename, "w") - fc.write("file(GLOB _po_files *.po)\n\ -GETTEXT_PROCESS_PO_FILES(${CURRENT_LANG} ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )\n") - fc.close() - -def walk_subdir_messages(path): - fc = open(os.path.join(path, cmake_filename), "w") - for subdir in os.listdir(path): - if (subdir != "others" and subdir != "www.kde.org" and subdir != ".svn"): - p = os.path.join(path, subdir) - if (os.path.isdir(p)): - fc.write("add_subdirectory( %s )\n" % subdir) - add_cmake_files_messages_po(p) - fc.write("install(FILES entry.desktop DESTINATION ${LOCALE_INSTALL_DIR}/${CURRENT_LANG}/ )\n") - fc.close() - -def add_cmake_files_messages(langdir, f): - msgdir = os.path.join(langdir, 'messages') - if not os.path.exists(msgdir): - return - f.write("macro_optional_add_subdirectory( messages )\n") - walk_subdir_messages(msgdir) - - -# -# subdir 'docs' -# -def add_cmake_files_docs_subdir(path, subdir): - if subdir == "common": - f = open(os.path.join(path, subdir, cmake_filename), "w") - f.write("FILE(GLOB _html *.html)\n") - f.write("FILE(GLOB _css *.css)\n") - f.write("FILE(GLOB _pngs *.png)\n") - f.write("install( FILES ${_html} ${_css} ${_png} DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/common)\n") - f.close() - return - if os.path.isfile(os.path.join(path, subdir, "index.docbook")): - add_subdir = "" - openmode = "w" - (head, tail) = os.path.split(path) - # check for khelpcenter module - if subdir == "faq" or subdir == "glossary" or subdir == "quickstart" or \ - subdir == "userguide" or subdir == "visualdict": - add_subdir = "SUBDIR khelpcenter/%s" % subdir - # kcontrol or kinfocenter main dir - elif subdir == "kcontrol" or subdir == "kinfocenter": - walk_subdir_docs(os.path.join(path, subdir)) - openmode = "a" - # kcontrol subdir - elif tail == "kcontrol": - add_subdir = "SUBDIR kcontrol/%s" % subdir - # kinfocenter subdir - elif tail == "kinfocenter": - add_subdir = "SUBDIR kinfocenter/%s" % subdir - - f = open(os.path.join(path, subdir, cmake_filename), openmode) - f.write("kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ %s )\n" \ - % add_subdir) - f.close() - return - walk_subdir_docs(os.path.join(path, subdir)) - -def walk_subdir_docs(path): - fc = open(os.path.join(path, cmake_filename), "w") - for subdir in os.listdir(path): - if (subdir != ".svn"): - p = os.path.join(path, subdir) - if (os.path.isdir(p)): - fc.write("add_subdirectory( %s )\n" % subdir) - add_cmake_files_docs_subdir(path, subdir) - fc.close() - -def add_cmake_files_docs(path, f): - docdir = os.path.join(path, 'docs') - if not os.path.exists(docdir): - return - f.write("macro_optional_add_subdirectory( docs )\n") - walk_subdir_docs(docdir) - - -# -# subdir 'data' -# -def walk_subdir_data(path): - fc = open(os.path.join(path, cmake_filename), "w") - for subdir in os.listdir(path): - if (subdir != ".svn"): - p = os.path.join(path, subdir) - if (os.path.isdir(p)): - fc.write("add_subdirectory( %s )\n" % subdir) - fc.close() - - -def add_cmake_files_data(path, f): - datadir = os.path.join(path, 'data') - if not os.path.exists(datadir): - return - f.write("macro_optional_add_subdirectory( data )\n") - walk_subdir_data(datadir) - - -# -# subdir 'scripts' -# -def add_cmake_files_scripts_subdir(path): - fc = open(os.path.join(path, cmake_filename), "w") - for subdir in os.listdir(path): - if (subdir != "internal" and subdir != ".svn"): - p = os.path.join(path, subdir) - if (os.path.isdir(p)): - fc.write("kde4_install_ts_files(\${CURRENT_LANG} %s)\n" % subdir) - fc.close() - -def walk_subdir_scripts(path): - fc = open(os.path.join(path, cmake_filename), "w") - for subdir in os.listdir(path): - if (subdir != "internal" and subdir != ".svn"): - p = os.path.join(path, subdir) - if (os.path.isdir(p)): - fc.write("add_subdirectory( %s )\n" % subdir) - add_cmake_files_scripts_subdir(os.path.join(path, subdir)) - fc.close() - -def add_cmake_files_scripts(path, f): - scriptsdir = os.path.join(path, 'scripts') - if not os.path.exists(scriptsdir): - return - f.write("macro_optional_add_subdirectory( scripts )\n") - walk_subdir_scripts(scriptsdir) - -def handle_subdir(langdir, language): - print("processing %s" % (langdir)) - - # toplevel cmake script - f = createTopLevelCMakeListFile(langdir, language) - - # UI message catalogs - add_cmake_files_messages(langdir, f) - - # Documentation - add_cmake_files_docs(langdir, f) - - # Custom localized application data. - add_cmake_files_data(langdir, f) - - # Transcript files. - add_cmake_files_scripts(langdir, f) - - search = re.compile(langdir + '@.*') - for subdir in os.listdir(langdir): - if search.match(subdir): - handle_subdir(os.path.join(langdir, subdir), subdir) - f.write("macro_optional_add_subdirectory( %s )\n" % subdir) - - f.close() - - -subdirs = sys.argv[1:] -if not subdirs: - fileName = 'inst-apps' - if not os.path.exists(fileName): - fileName = 'subdirs' - f = open(fileName, "r") - for line in f.read().splitlines(): - subdirs.append(line) - f.close() - -if not subdirs: - print("no subdirs given.") - exit(1) - -# Go through all subdirs -for langdir in subdirs: - handle_subdir(langdir, langdir) diff --git a/portage/contributed/l10n-kde4-branch/l10n-kde4-branch-20080626.py b/portage/contributed/l10n-kde4-branch/l10n-kde4-branch-20080626.py deleted file mode 100644 index 8d62cbb5a..000000000 --- a/portage/contributed/l10n-kde4-branch/l10n-kde4-branch-20080626.py +++ /dev/null @@ -1,140 +0,0 @@ -import base -import utils -import os -import sys -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = 'branches/kdepim/enterprise4/l10n-kde4/' - self.targets['4.0.80'] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.80/src/kde-l10n/' - self.targets['4.0.83'] = 'ftp://ftp.kde.org/pub/kde/unstable/4.0.83/src/kde-l10n/' - self.defaultTarget = 'svnHEAD' - - # all targets in svn - self.languages = 'af ar be bg bn bn_IN br ca cs csb cy da de ' - self.languages += 'el en_GB eo es et eu fa fi fr fy ga gl gu ' - self.languages += 'ha he hi hr hsb hu hy is it ja ka kk km kn ko ku ' - self.languages += 'lb lt lv mk ml ms mt nb nds ne nl nn nso oc ' - self.languages += 'pa pl pt pt_BR ro ru rw se sk sl sr sv ' - self.languages += 'ta te tg th tr uk uz vi wa xh zh_CN zh_HK zh_TW ' - - # released target in 4.0.83 - self.languages = 'ar be bg ca cs csb da de ' - self.languages += 'el en_GB eo es et eu fa fi fr fy ga gl ' - self.languages += 'hi hu is it ja kk km ko ' - self.languages += 'lv mk nb nds ne nl nn ' - self.languages += 'pa pl pt pt_BR ro ru se sl sv ' - self.languages += 'ta th tr uk wa zh_CN zh_TW ' - - #for testing - self.languages = 'de' - - def setDependencies( self ): - self.hardDependencies['dev-util/cmake'] = 'default' - self.hardDependencies['dev-util/gettext-tools'] = 'default' - self.hardDependencies['contributed/kdelibs-branch'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.subinfo = subinfo() - - def fetch( self ): - if self.noFetch: - return True - svnpath = self.kdeSvnPath() - if svnpath: - return base.baseclass.fetch( self ) - - if len( self.subinfo.targets ) and self.subinfo.buildTarget in list(self.subinfo.targets.keys()): - for pkg in self.subinfo.languages.split(): - tgt = self.subinfo.buildTarget - filename = self.subinfo.targets[ tgt ] + 'kde-l10n-' + pkg + '-' + tgt + '.tar.bz2' - return utils.getFiles( filename, self.downloaddir ) - else: - return False - - return True - - def unpack( self ): - svnpath = self.kdeSvnPath() - utils.cleanDirectory( self.workdir ) - - if svnpath: - if not self.kdeSvnUnpack( svnpath, "scripts" ): - return False - - for pkg in self.subinfo.languages.split(): - if not self.kdeSvnUnpack( svnpath, pkg ): - return False - autogen = os.path.join( self.packagedir , "autogen.py" ) - svnpath = os.path.join( self.kdesvndir, svnpath ) - - - # execute autogen.py and generate the CMakeLists.txt files - cmd = "cd %s && python %s %s" % \ - (svnpath , autogen, self.subinfo.languages ) - utils.system( cmd ) - - else: - filenames = [] - for pkg in self.subinfo.languages.split(): - if not self.subinfo.buildTarget in list(self.subinfo.targets.keys()): - return False - tgt = self.subinfo.buildTarget - filenames.append( 'kde-l10n-' + pkg + '-' + tgt + '.tar.bz2' ) - if not utils.unpackFiles( self.downloaddir, filenames, self.workdir ): - return False - # no need for autogen.py - CMake scripts are already created - return True - - def compile( self ): - self.kde.nocopy = False - sourcePath = self.kde.sourcePath - svnpath = self.kdeSvnPath() - for pkg in self.subinfo.languages.split(): - self.kde.buildNameExt = pkg - if svnpath: - self.kde.sourcePath = os.path.join( sourcePath, pkg ) - else: - pkg_dir = 'kde-l10n-' + pkg + '-' + self.subinfo.buildTarget - self.kde.sourcePath = os.path.join( sourcePath, pkg_dir ) - if not self.kdeCompile(): - return False - return True - - def install( self ): - self.kde.nocopy = False - imgdir = self.kde.imagedir - for pkg in self.subinfo.languages.split(): - self.kde.buildNameExt = pkg - self.kde.imagedir = os.path.join( imgdir, pkg ) - if not self.kdeInstall(): - return False - return True - - def qmerge( self ): - imgdir = self.kde.imagedir - for pkg in self.subinfo.languages.split(): - self.kde.buildNameExt = pkg - self.kde.imagedir = os.path.join( imgdir, pkg ) - utils.mergeImageDirToRootDir( self.kde.imagedir, self.rootdir ) - return True - - def make_package( self ): - self.svnpath = os.path.join( self.kdesvndir, self.subinfo.svnTargets['svnHEAD'] ) - dstpath = self.packageDestinationDir(withBuildType=False) - - if not utils.test4application( "kdewin-packager" ): - utils.die( "kdewin-packager not found - please make sure it is in your path" ) - - for pkg in self.subinfo.languages.split(): - workdir = os.path.join( self.workdir, pkg ) - cmd = "kdewin-packager -name kde-l10n-%s -version %s -hashfirst -compression 2 -root %s/%s -destdir %s" % \ - ( pkg, self.buildTarget, self.imagedir, pkg, dstpath ) - utils.system( cmd ) - return True - -if __name__ == '__main__': - subclass().execute() diff --git a/portage/contributed/libassuan-src/libassuan-cmake.diff b/portage/contributed/libassuan-src/libassuan-cmake.diff deleted file mode 100644 index 2fd34f1c7..000000000 --- a/portage/contributed/libassuan-src/libassuan-cmake.diff +++ /dev/null @@ -1,388 +0,0 @@ -diff -N -u -r libassuan/assuan-errors.c libassuan/assuan-errors.c ---- libassuan/assuan-errors.c 1970-01-01 01:00:00.000000000 +0100 -+++ libassuan/assuan-errors.c 2007-12-14 21:34:29.790811100 +0100 -@@ -0,0 +1,278 @@ -+/* Generated automatically by mkerrors */ -+/* Do not edit! See mkerrors for copyright notice. */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+#include -+ -+#undef _ASSUAN_IN_LIBASSUAN /* undef to get all error codes. */ -+#include "assuan.h" -+ -+/* If true the modern gpg-error style error codes are used in the -+ API. */ -+static unsigned int err_source; -+ -+/* Enable gpg-error style error codes. ERRSOURCE is one of gpg-error -+ sources. Note, that this function is not thread-safe and should be -+ used right at startup. Switching back to the old style mode is not -+ supported. */ -+void -+assuan_set_assuan_err_source (int errsource) -+{ -+ errsource &= 0xff; -+ err_source = errsource? errsource : 31 /*GPG_ERR_SOURCE_ANY*/; -+} -+ -+ -+/* Helper to map old style Assuan error codes to gpg-error codes. -+ This is used internally to keep an compatible ABI. */ -+assuan_error_t -+_assuan_error (int oldcode) -+{ -+ unsigned int n; -+ -+ if (!err_source) -+ { -+ if (oldcode == -1) -+ return -1; -+ else -+ return (oldcode & 0x00ffffff); /* Make sure that the gpg-error -+ source part is cleared. */ -+ } -+ -+ switch (oldcode) -+ { -+ case ASSUAN_General_Error: n = 257; break; -+ case ASSUAN_Accept_Failed: n = 258; break; -+ case ASSUAN_Connect_Failed: n = 259; break; -+ case ASSUAN_Invalid_Response: n = 260; break; -+ case ASSUAN_Invalid_Value: n = 261; break; -+ case ASSUAN_Line_Not_Terminated: n = 262; break; -+ case ASSUAN_Line_Too_Long: n = 263; break; -+ case ASSUAN_Nested_Commands: n = 264; break; -+ case ASSUAN_No_Data_Callback: n = 265; break; -+ case ASSUAN_No_Inquire_Callback: n = 266; break; -+ case ASSUAN_Not_A_Server: n = 267; break; -+ case ASSUAN_Not_Implemented: n = 69; break; -+ case ASSUAN_Parameter_Conflict: n = 280; break; -+ case ASSUAN_Problem_Starting_Server: n = 269; break; -+ case ASSUAN_Server_Fault: n = 80; break; -+ case ASSUAN_Syntax_Error: n = 276; break; -+ case ASSUAN_Too_Much_Data: n = 273; break; -+ case ASSUAN_Unexpected_Command: n = 274; break; -+ case ASSUAN_Unknown_Command: n = 275; break; -+ case ASSUAN_Canceled: n = 277; break; -+ case ASSUAN_No_Secret_Key: n = 17; break; -+ case ASSUAN_Not_Confirmed: n = 114; break; -+ -+ case ASSUAN_Read_Error: -+ switch (errno) -+ { -+ case 0: n = 16381; /*GPG_ERR_MISSING_ERRNO*/ break; -+ case EAGAIN: -+ n = (6 | (1 << 15)); -+ break; -+ default: n = 270; /*GPG_ERR_ASS_READ_ERROR*/ break; -+ } -+ break; -+ -+ case ASSUAN_Write_Error: -+ switch (errno) -+ { -+ case 0: n = 16381; /*GPG_ERR_MISSING_ERRNO*/ break; -+ case EAGAIN: -+ n = (6 | (1 << 15)); -+ break; -+ default: n = 271; /*GPG_ERR_ASS_WRITE_ERROR*/ break; -+ } -+ break; -+ -+ case ASSUAN_Out_Of_Core: -+ switch (errno) -+ { -+ case 0: /* Should not happen but a user might have provided -+ an incomplete implemented malloc function. Give -+ him a chance to correct this fault but make sure -+ an error is indeed returned. */ -+ n = 16381; /*GPG_ERR_MISSING_ERRNO*/ -+ break; -+ case ENOMEM: -+ n = (86 | (1 << 15)); -+ break; -+ default: -+ n = 16382; /*GPG_ERR_UNKNOWN_ERRNO*/ -+ break; -+ } -+ break; -+ -+ case -1: n = 16383 /*GPG_ERR_EOF*/; break; -+ -+ default: -+ n = 257; -+ break; -+ } -+ -+ return ((err_source << 24) | (n & 0x00ffffff)); -+ -+} -+ -+ -+/* A small helper function to treat EAGAIN transparently to the -+ caller. */ -+int -+_assuan_error_is_eagain (assuan_error_t err) -+{ -+ if ((!err_source && err == ASSUAN_Read_Error && errno == EAGAIN) -+ || (err_source && (err & ((1 << 24) - 1)) == (6 | (1 << 15)))) -+ return 1; -+ else -+ return 0; -+} -+ -+ -+/** -+ * assuan_strerror: -+ * @err: Error code -+ * -+ * This function returns a textual representaion of the given -+ * errorcode. If this is an unknown value, a string with the value -+ * is returned (Beware: it is hold in a static buffer). -+ * -+ * Return value: String with the error description. -+ **/ -+const char * -+assuan_strerror (assuan_error_t err) -+{ -+ const char *s; -+ static char buf[50]; -+ -+ switch (err) -+ { -+ case ASSUAN_No_Error: s="no error"; break; -+ case ASSUAN_General_Error: s="general error"; break; -+ case ASSUAN_Out_Of_Core: s="out of core"; break; -+ case ASSUAN_Invalid_Value: s="invalid value"; break; -+ case ASSUAN_Timeout: s="timeout"; break; -+ case ASSUAN_Read_Error: s="read error"; break; -+ case ASSUAN_Write_Error: s="write error"; break; -+ case ASSUAN_Problem_Starting_Server: s="problem starting server"; break; -+ case ASSUAN_Not_A_Server: s="not a server"; break; -+ case ASSUAN_Not_A_Client: s="not a client"; break; -+ case ASSUAN_Nested_Commands: s="nested commands"; break; -+ case ASSUAN_Invalid_Response: s="invalid response"; break; -+ case ASSUAN_No_Data_Callback: s="no data callback"; break; -+ case ASSUAN_No_Inquire_Callback: s="no inquire callback"; break; -+ case ASSUAN_Connect_Failed: s="connect failed"; break; -+ case ASSUAN_Accept_Failed: s="accept failed"; break; -+ case ASSUAN_Not_Implemented: s="not implemented"; break; -+ case ASSUAN_Server_Fault: s="server fault"; break; -+ case ASSUAN_Invalid_Command: s="invalid command"; break; -+ case ASSUAN_Unknown_Command: s="unknown command"; break; -+ case ASSUAN_Syntax_Error: s="syntax error"; break; -+ case ASSUAN_Parameter_Error: s="parameter error"; break; -+ case ASSUAN_Parameter_Conflict: s="parameter conflict"; break; -+ case ASSUAN_Line_Too_Long: s="line too long"; break; -+ case ASSUAN_Line_Not_Terminated: s="line not terminated"; break; -+ case ASSUAN_No_Input: s="no input"; break; -+ case ASSUAN_No_Output: s="no output"; break; -+ case ASSUAN_Canceled: s="canceled"; break; -+ case ASSUAN_Unsupported_Algorithm: s="unsupported algorithm"; break; -+ case ASSUAN_Server_Resource_Problem: s="server resource problem"; break; -+ case ASSUAN_Server_IO_Error: s="server io error"; break; -+ case ASSUAN_Server_Bug: s="server bug"; break; -+ case ASSUAN_No_Data_Available: s="no data available"; break; -+ case ASSUAN_Invalid_Data: s="invalid data"; break; -+ case ASSUAN_Unexpected_Command: s="unexpected command"; break; -+ case ASSUAN_Too_Much_Data: s="too much data"; break; -+ case ASSUAN_Inquire_Unknown: s="inquire unknown"; break; -+ case ASSUAN_Inquire_Error: s="inquire error"; break; -+ case ASSUAN_Invalid_Option: s="invalid option"; break; -+ case ASSUAN_Invalid_Index: s="invalid index"; break; -+ case ASSUAN_Unexpected_Status: s="unexpected status"; break; -+ case ASSUAN_Unexpected_Data: s="unexpected data"; break; -+ case ASSUAN_Invalid_Status: s="invalid status"; break; -+ case ASSUAN_Locale_Problem: s="locale problem"; break; -+ case ASSUAN_Not_Confirmed: s="not confirmed"; break; -+ case ASSUAN_Bad_Certificate: s="bad certificate"; break; -+ case ASSUAN_Bad_Certificate_Chain: s="bad certificate chain"; break; -+ case ASSUAN_Missing_Certificate: s="missing certificate"; break; -+ case ASSUAN_Bad_Signature: s="bad signature"; break; -+ case ASSUAN_No_Agent: s="no agent"; break; -+ case ASSUAN_Agent_Error: s="agent error"; break; -+ case ASSUAN_No_Public_Key: s="no public key"; break; -+ case ASSUAN_No_Secret_Key: s="no secret key"; break; -+ case ASSUAN_Invalid_Name: s="invalid name"; break; -+ case ASSUAN_Cert_Revoked: s="cert revoked"; break; -+ case ASSUAN_No_CRL_For_Cert: s="no crl for cert"; break; -+ case ASSUAN_CRL_Too_Old: s="crl too old"; break; -+ case ASSUAN_Not_Trusted: s="not trusted"; break; -+ case ASSUAN_Card_Error: s="card error"; break; -+ case ASSUAN_Invalid_Card: s="invalid card"; break; -+ case ASSUAN_No_PKCS15_App: s="no pkcs15 app"; break; -+ case ASSUAN_Card_Not_Present: s="card not present"; break; -+ case ASSUAN_Invalid_Id: s="invalid id"; break; -+ case ASSUAN_USER_ERROR_FIRST: s="user error first"; break; -+ case ASSUAN_USER_ERROR_LAST: s="user error last"; break; -+ case -1: s = "EOF (-1)"; break; -+ default: -+ { -+ unsigned int source, code, n; -+ -+ source = ((err >> 24) & 0xff); -+ code = (err & 0x00ffffff); -+ if (source) -+ { -+ /* Assume this is an libgpg-error and try to map the codes -+ back. */ -+ switch (code) -+ { -+ case 257: n = ASSUAN_General_Error ; break; -+ case 258: n = ASSUAN_Accept_Failed ; break; -+ case 259: n = ASSUAN_Connect_Failed ; break; -+ case 260: n = ASSUAN_Invalid_Response ; break; -+ case 261: n = ASSUAN_Invalid_Value ; break; -+ case 262: n = ASSUAN_Line_Not_Terminated ; break; -+ case 263: n = ASSUAN_Line_Too_Long ; break; -+ case 264: n = ASSUAN_Nested_Commands ; break; -+ case 265: n = ASSUAN_No_Data_Callback ; break; -+ case 266: n = ASSUAN_No_Inquire_Callback ; break; -+ case 267: n = ASSUAN_Not_A_Server ; break; -+ case 69: n = ASSUAN_Not_Implemented ; break; -+ case 280: n = ASSUAN_Parameter_Conflict ; break; -+ case 269: n = ASSUAN_Problem_Starting_Server; break; -+ case 270: n = ASSUAN_Read_Error ; break; -+ case 271: n = ASSUAN_Write_Error ; break; -+ case 80: n = ASSUAN_Server_Fault ; break; -+ case 276: n = ASSUAN_Syntax_Error ; break; -+ case 273: n = ASSUAN_Too_Much_Data ; break; -+ case 274: n = ASSUAN_Unexpected_Command ; break; -+ case 275: n = ASSUAN_Unknown_Command ; break; -+ case 277: n = ASSUAN_Canceled ; break; -+ case 114: n = ASSUAN_Not_Confirmed ; break; -+ case ((1<<15)|86): n = ASSUAN_Out_Of_Core ; break; -+ default: n = 0; break; -+ } -+ if (n) -+ s = assuan_strerror (n); -+ else -+ { -+ sprintf (buf, "ec=%u.%u", source, code ); -+ s=buf; -+ } -+ } -+ else -+ { -+ sprintf (buf, "ec=%d", err ); -+ s=buf; -+ } -+ } -+ break; -+ } -+ -+ return s; -+} -+ -diff -N -u -r libassuan/CMakeLists.txt libassuan/CMakeLists.txt ---- libassuan/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 -+++ libassuan/CMakeLists.txt 2007-12-14 21:39:32.741997200 +0100 -@@ -0,0 +1,70 @@ -+project( libassuan ) -+cmake_minimum_required(VERSION 2.4) -+if (WIN32) -+# overriding LIB_INSTALL_DIR specific for win32 to archieve -+# propper installation of shared library targets will also be -+# used in install(FILES ...) which fails with error -+# 'INSTALL FILES given unknown argument "RUNTIME".' -+# There must be a way to only patch install(TARGETS) -+# set (LIB_INSTALL_DIR lib) -+ add_definitions(-DHAVE_W32_SYSTEM) -+ -+ add_definitions(-DWIN32_LEAN_AND_MEAN) -+ -+endif (WIN32) -+include(CheckIncludeFile) -+check_include_file(HAVE_UNISTD_H "unistd.h") -+if(HAVE_UNISTD_H) -+add_definitions(-DHAVE_UNISTD_H) -+endif(HAVE_UNISTD_H) -+ -+INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/libassuan" -+ "${CMAKE_SOURCE_DIR}/libassuan/src" "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_CURRENT_BINARY_DIR}") -+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) -+add_definitions(-DHAVE_CONFIG_H) -+ -+#ADD_CUSTOM_COMMAND( -+# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/assuan-errors.c -+# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/assuan.h -+# COMMAND sh ARGS ${CMAKE_CURRENT_SOURCE_DIR}/src/mkerrors < ${CMAKE_CURRENT_SOURCE_DIR}/src/assuan.h > ${CMAKE_CURRENT_BINARY_DIR}/assuan-errors.c -+#) -+ -+set(assuan_LIB_SRCS -+ src/assuan.h -+ src/assuan-defs.h -+ src/assuan-util.c -+ src/assuan-buffer.c -+ src/assuan-handler.c -+ src/assuan-inquire.c -+ src/assuan-listen.c -+ src/assuan-connect.c -+ src/assuan-client.c -+ src/assuan-pipe-server.c -+ src/assuan-socket-server.c -+ src/assuan-pipe-connect.c -+ src/assuan-socket-connect.c -+ src/assuan-uds.c -+ src/assuan-io.c -+# src/assuan-io-pth.c -+ src/assuan-logging.c -+ src/assuan-socket.c -+# ${CMAKE_CURRENT_BINARY_DIR}/assuan-errors.c -+ assuan-errors.c -+) -+ -+if (WIN32) -+ set(assuan_LIB_SRCS ${assuan_LIB_SRCS} src/stpcpy.c src/memrchr.c src/isascii.c src/putc_unlocked.c) -+endif (WIN32) -+if(MSVC) -+ add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+endif(MSVC) -+ -+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) -+ -+#####add_definitions(-D_ASSUAN_IN_GPGME_BUILD_ASSUAN) -+ -+ADD_LIBRARY( assuan ${assuan_LIB_SRCS} ) -+TARGET_LINK_LIBRARIES( assuan ) -+install(TARGETS assuan DESTINATION lib ) -+install( FILES src/assuan.h DESTINATION include ) -+install( FILES src/libassuan.m4 DESTINATION share/aclocal ) -diff -N -u -r libassuan/config.h.cmake libassuan/config.h.cmake ---- libassuan/config.h.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ libassuan/config.h.cmake 2007-12-14 21:34:29.790811100 +0100 -@@ -0,0 +1,28 @@ -+/* This file is part of the KDE libraries -+ Copyright (c) 2007 The KDE Project -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public -+ License version 2 as published by the Free Software Foundation. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public License -+ along with this library; see the file COPYING.LIB. If not, write to -+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. -+*/ -+ -+#ifndef LIBASSUAN_CONFIG_H -+#define LIBASSUAN_CONFIG_H -+ -+/* Separators as used in $PATH. */ -+#if defined _WIN32 || defined _WIN64 -+# define HAVE_DOSISH_SYSTEM -+#else -+#endif -+ -+#endif diff --git a/portage/contributed/libassuan-src/libassuan-src-20080525.py b/portage/contributed/libassuan-src/libassuan-src-20080525.py deleted file mode 100644 index c2a191da7..000000000 --- a/portage/contributed/libassuan-src/libassuan-src-20080525.py +++ /dev/null @@ -1,67 +0,0 @@ -import base -import utils -import os -import shutil -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = False - self.targets['1.0.5'] = 'ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-1.0.5.tar.bz2' - self.defaultTarget = '1.0.5' - - def setDependencies( self ): - self.hardDependencies['virtual/base'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.instsrcdir = "libassuan" - self.subinfo = subinfo() - - def unpack( self ): - if self.buildTarget == "svnHEAD": - if utils.verbose() >= 1: - print("libassuan unpack called") - # do the svn fetch/update - repo = "svn://cvs.gnupg.org/libassuan/trunk" - self.svnFetch( repo ) - - utils.cleanDirectory( self.workdir ) - - # now copy the tree below destdir/trunk to workdir - srcdir = os.path.join( self.svndir, "trunk" ) - destdir = os.path.join( self.workdir, "libassuan" ) - utils.copySrcDirToDestDir( srcdir, destdir ) - - os.chdir( self.workdir ) - self.system( "cd %s && patch -p0 < %s" % ( self.workdir, os.path.join( self.packagedir, "libassuan.diff" ) ) ) - self.system( "cd %s && patch -p0 < %s" % ( self.workdir, os.path.join( self.packagedir, "libassuan-cmake.diff" ) ) ) - - return True - else: - base.baseclass.unpack( self ) or utils.die( "unpack failed" ) - os.chdir( self.workdir ) - shutil.move("libassuan-1.0.5", "libassuan") - self.system( "cd %s && patch -p0 < %s" % ( self.workdir, os.path.join( self.packagedir, "libassuan.diff" ) ) ) - self.system( "cd %s && patch -p0 < %s" % ( self.workdir, os.path.join( self.packagedir, "libassuan-cmake.diff" ) ) ) - self.system( "cd %s && patch -p0 < %s" % ( self.workdir, os.path.join( self.packagedir, "libassuan-unistd.diff" ) ) ) - return True - - - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - - # now do packaging with kdewin-packager - self.doPackaging( PACKAGE_NAME, PACKAGE_FULL_VER, True ) - - return True - -if __name__ == '__main__': - subclass().execute() diff --git a/portage/contributed/libassuan-src/libassuan-unistd.diff b/portage/contributed/libassuan-src/libassuan-unistd.diff deleted file mode 100644 index e18a63729..000000000 --- a/portage/contributed/libassuan-src/libassuan-unistd.diff +++ /dev/null @@ -1,214 +0,0 @@ -diff -Nru libassuan.orig/CMakeLists.txt libassuan/CMakeLists.txt ---- libassuan.orig/CMakeLists.txt 2009-10-06 00:25:19.517000000 +0200 -+++ libassuan/CMakeLists.txt 2009-10-06 00:16:23.263000000 +0200 -@@ -61,7 +61,7 @@ - set(assuan_LIB_SRCS ${assuan_LIB_SRCS} src/stpcpy.c src/memrchr.c src/isascii.c src/putc_unlocked.c) - endif (WIN32) - if(MSVC) -- add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ add_definitions(-D_CRT_NO_SECURE_WARNINGS) - endif(MSVC) - - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) -diff -Nru libassuan.orig/src/assuan-buffer.c libassuan/src/assuan-buffer.c ---- libassuan.orig/src/assuan-buffer.c 2007-10-08 19:55:12.000000000 +0200 -+++ libassuan/src/assuan-buffer.c 2009-10-06 00:16:23.290000000 +0200 -@@ -22,7 +22,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #ifdef HAVE_W32_SYSTEM - #include -diff -Nru libassuan.orig/src/assuan-client.c libassuan/src/assuan-client.c ---- libassuan.orig/src/assuan-client.c 2007-10-08 19:55:12.000000000 +0200 -+++ libassuan/src/assuan-client.c 2009-10-06 00:16:23.293000000 +0200 -@@ -21,7 +21,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - - #include "assuan-defs.h" -diff -Nru libassuan.orig/src/assuan-connect.c libassuan/src/assuan-connect.c ---- libassuan.orig/src/assuan-connect.c 2007-08-24 07:29:48.000000000 +0200 -+++ libassuan/src/assuan-connect.c 2009-10-06 00:16:23.296000000 +0200 -@@ -25,7 +25,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #include - #ifndef HAVE_W32_SYSTEM -diff -Nru libassuan.orig/src/assuan-defs.h libassuan/src/assuan-defs.h ---- libassuan.orig/src/assuan-defs.h 2008-05-25 09:42:04.000000000 +0200 -+++ libassuan/src/assuan-defs.h 2009-10-06 00:16:23.299000000 +0200 -@@ -29,7 +29,10 @@ - #else - #include - #endif -+#ifdef HAVE_UNISTD_H - #include -+#endif -+ - - #include "assuan.h" - -diff -Nru libassuan.orig/src/assuan-io-pth.c libassuan/src/assuan-io-pth.c ---- libassuan.orig/src/assuan-io-pth.c 2008-05-25 09:42:04.000000000 +0200 -+++ libassuan/src/assuan-io-pth.c 2009-10-06 00:16:23.302000000 +0200 -@@ -29,7 +29,9 @@ - #if HAVE_SYS_UIO_H - # include - #endif -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #ifdef HAVE_W32_SYSTEM - # include -diff -Nru libassuan.orig/src/assuan-io.c libassuan/src/assuan-io.c ---- libassuan.orig/src/assuan-io.c 2008-05-25 09:42:04.000000000 +0200 -+++ libassuan/src/assuan-io.c 2009-10-06 00:16:23.305000000 +0200 -@@ -21,12 +21,16 @@ - #include - #endif - -+#ifdef HAVE_SYS_TIME_H - #include -+#endif - #include - #ifdef HAVE_SYS_SOCKET_H - # include - #endif -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #ifdef HAVE_W32_SYSTEM - # include -diff -Nru libassuan.orig/src/assuan-listen.c libassuan/src/assuan-listen.c ---- libassuan.orig/src/assuan-listen.c 2007-08-24 07:29:48.000000000 +0200 -+++ libassuan/src/assuan-listen.c 2009-10-06 00:16:23.307000000 +0200 -@@ -21,7 +21,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - - #include "assuan-defs.h" -diff -Nru libassuan.orig/src/assuan-pipe-connect.c libassuan/src/assuan-pipe-connect.c ---- libassuan.orig/src/assuan-pipe-connect.c 2007-11-14 16:01:53.000000000 +0100 -+++ libassuan/src/assuan-pipe-connect.c 2009-10-06 00:16:23.311000000 +0200 -@@ -26,7 +26,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #include - #include -diff -Nru libassuan.orig/src/assuan-pipe-server.c libassuan/src/assuan-pipe-server.c ---- libassuan.orig/src/assuan-pipe-server.c 2007-08-24 07:29:48.000000000 +0200 -+++ libassuan/src/assuan-pipe-server.c 2009-10-06 00:16:23.314000000 +0200 -@@ -22,7 +22,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #ifdef HAVE_W32_SYSTEM - #include - #include -diff -Nru libassuan.orig/src/assuan-socket-connect.c libassuan/src/assuan-socket-connect.c ---- libassuan.orig/src/assuan-socket-connect.c 2007-10-04 09:29:19.000000000 +0200 -+++ libassuan/src/assuan-socket-connect.c 2009-10-06 00:16:23.317000000 +0200 -@@ -23,7 +23,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #ifndef HAVE_W32_SYSTEM - #include -diff -Nru libassuan.orig/src/assuan-socket-server.c libassuan/src/assuan-socket-server.c ---- libassuan.orig/src/assuan-socket-server.c 2007-10-02 09:07:19.000000000 +0200 -+++ libassuan/src/assuan-socket-server.c 2009-10-06 00:16:23.320000000 +0200 -@@ -21,7 +21,9 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #ifdef HAVE_W32_SYSTEM - # include -diff -Nru libassuan.orig/src/assuan-socket.c libassuan/src/assuan-socket.c ---- libassuan.orig/src/assuan-socket.c 2009-10-06 00:25:19.492000000 +0200 -+++ libassuan/src/assuan-socket.c 2009-10-06 00:21:15.675000000 +0200 -@@ -55,6 +55,16 @@ - # define S_IRGRP 0 - # define S_IWGRP 0 - #endif -+ -+#ifndef ENOFILE -+#define ENOFILE ENOENT -+#endif -+ -+#ifdef _MSC_VER -+#define S_IRUSR 0000400 /* read permission, owner */ -+#define S_IWUSR 0000200 /* write permission, owner */ -+#define S_IXUSR 0000100/* execute/search permission, owner */ -+#endif - #endif - - -diff -Nru libassuan.orig/src/assuan-uds.c libassuan/src/assuan-uds.c ---- libassuan.orig/src/assuan-uds.c 2007-10-05 18:06:40.000000000 +0200 -+++ libassuan/src/assuan-uds.c 2009-10-06 00:16:23.323000000 +0200 -@@ -35,7 +35,9 @@ - #if HAVE_SYS_UIO_H - #include - #endif -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #include - #include -diff -Nru libassuan.orig/src/assuan.h libassuan/src/assuan.h ---- libassuan.orig/src/assuan.h 2008-05-25 09:45:30.000000000 +0200 -+++ libassuan/src/assuan.h 2009-10-06 00:16:23.287000000 +0200 -@@ -23,7 +23,14 @@ - - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#else -+#ifdef _MSC_VER -+typedef int ssize_t; -+typedef int pid_t; -+#endif -+#endif - #ifndef _ASSUAN_NO_SOCKET_WRAPPER - #ifdef _WIN32 - #include diff --git a/portage/contributed/libassuan-src/libassuan.diff b/portage/contributed/libassuan-src/libassuan.diff deleted file mode 100644 index e4d814de5..000000000 --- a/portage/contributed/libassuan-src/libassuan.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- libassuan\src\assuan-socket.c 2007-12-14 16:51:55.808441900 +0100 -+++ libassuan2\src\assuan-socket.c 2007-12-14 16:52:11.429941900 +0100 -@@ -21,7 +21,9 @@ - #include - #include - #ifdef HAVE_W32_SYSTEM -+#ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN -+#endif - #include - #include - #include diff --git a/portage/contributed/predicate-work/predicate-work-20091121.py b/portage/contributed/predicate-work/predicate-work-20091121.py deleted file mode 100644 index 702656722..000000000 --- a/portage/contributed/predicate-work/predicate-work-20091121.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Predicate work branch with kdelibs and kdelibs trunk -import base -import os -import utils -import info - -class subinfo(info.infoclass): - def setTargets( self ): - self.svnTargets['svnHEAD'] = "branches/work/predicate" - self.defaultTarget = 'svnHEAD' - - def setDependencies( self ): - self.hardDependencies['kde/kdepimlibs'] = 'default' - self.hardDependencies['kde/kde-runtime'] = 'default' - -class subclass(base.baseclass): - def __init__( self, **args ): - base.baseclass.__init__( self, args=args ) - self.instsrcdir = "predicate" - self.subinfo = subinfo() - self.kdeCustomDefines = "" - - def unpack( self ): - return self.kdeSvnUnpack() - - def compile( self ): - return self.kdeCompile() - - def install( self ): - return self.kdeInstall() - - def make_package( self ): - return self.doPackaging( "predicate" ) - -if __name__ == '__main__': - subclass().execute()