Merge pull request 'discord-bin: bump to 0.0.19' (#107) from beholders_eye/hasufell-repository:beholders_eye/discord-bump into master

Reviewed-on: hasufell/hasufell-repository#107

packages/dev-cpp/ctemplate/ctemplate-2.4.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require autotools [ supported_autoconf=[ 2.7 ] supported_automake=[ 1.16 ] ]
 require github [ user="olafvdspek" tag="${PNV}" ]
 
 SUMMARY="A simple but powerful template language for C++"

packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.6.5.exheres-0

@@ -1,80 +0,0 @@
-# Copyright 2013-2014 Thomas Witt
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-MY_PN="OpenSceneGraph"
-MY_PNV=${MY_PN}-${PV}
-
-require github [ user=openscenegraph project=${MY_PN} tag=${MY_PNV} ]
-require cmake [ api=2 ]
-
-SUMMARY="High performance 3D graphics toolkit"
-DESCRIPTION="
-The OpenSceneGraph is an open source high performance 3D graphics toolkit, used by application
-developers in fields such as visual simulation, games, virtual reality, scientific visualization
-and modelling. Written entirely in Standard C++ and OpenGL it runs on all Windows platforms, OSX,
-GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well
-established as the world leading scene graph technology, used widely in the vis-sim, space,
-scientific, oil-gas, games and virtual reality industries.
-"
-HOMEPAGE+=" http://${PN}.org"
-
-LICENCES="wxWinLL-3 LGPL-2.1"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        virtual/unzip
-    build+run:
-        app-text/poppler[cairo]
-        dev-libs/glib:2
-        media/ffmpeg
-        media-libs/freetype:2
-        media-libs/giflib:=
-        media-libs/gstreamer:1.0
-        media-libs/imath
-        media-libs/jasper
-        media-libs/libpng:=
-        media-libs/openexr[>=3]
-        media-libs/SDL:0
-        media-libs/tiff
-        media-plugins/gst-plugins-base:1.0
-        net-misc/curl
-        sys-libs/zlib
-        x11-dri/mesa
-        x11-libs/cairo
-        x11-libs/libX11
-        x11-libs/libXrandr
-        providers:ijg-jpeg? ( media-libs/jpeg:= )
-        providers:jpeg-turbo? ( media-libs/libjpeg-turbo )
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PN}-3.6.5-openexr3.patch
-)
-
-CMAKE_SRC_CONFIGURE_PARAMS=(
-    -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_FBX=
-    -DCMAKE_DISABLE_FIND_PACKAGE_Performer=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_Lua51=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_Lua52=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1
-    -DOSG_USE_LOCAL_LUA_SOURCE=OFF
-    -DOPENGL_PROFILE=GL2
-    -DDYNAMIC_OPENSCENEGRAPH=ON
-    -DLIB_POSTFIX=""
-)
-

packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.6.5-openexr3.patch

@@ -1,86 +0,0 @@
-Source: Arch, https://github.com/archlinux/svntogit-community/blob/packages/openscenegraph/trunk/openscenegraph-openexr3.patch
-Upstream: Reported, https://github.com/openscenegraph/OpenSceneGraph/issues/1075
-Reason: Fix build with OpenEXR >= 3
-
-diff --git a/CMakeModules/FindOpenEXR.cmake b/CMakeModules/FindOpenEXR.cmake
-index 233be972b..d1b022881 100644
---- a/CMakeModules/FindOpenEXR.cmake
-+++ b/CMakeModules/FindOpenEXR.cmake
-@@ -51,11 +51,11 @@ MACRO(OPENEXR_FIND libname)
-     OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d)
- ENDMACRO(OPENEXR_FIND)
- 
--OPENEXR_FIND(IlmImf)
-+OPENEXR_FIND(OpenEXR)
- 
- SET(OPENEXR_FOUND "NO")
--IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
--    SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} )
--    SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY )
-+IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)
-+    SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} )
-+    SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY )
-     SET(OPENEXR_FOUND "YES")
--ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
-+ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)
-diff --git a/CMakeModules/Findilmbase.cmake b/CMakeModules/Findilmbase.cmake
-index 4b076c7c9..4610497fa 100644
---- a/CMakeModules/Findilmbase.cmake
-+++ b/CMakeModules/Findilmbase.cmake
-@@ -10,7 +10,7 @@
- # Created by Robert Osfield. 
- 
- 
--FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h
-+FIND_PATH(ILMBASE_INCLUDE_DIR Imath/ImathVec.h
-     $ENV{ILMBASE_DIR}/include
-     $ENV{ILMBASE_DIR}
-     ~/Library/Frameworks
-@@ -28,7 +28,7 @@ FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h
- # example: ILMBASE_FIND_VAR(OPENEXR_IlmThread_LIBRARY IlmThread)
- MACRO(ILMBASE_FIND_VAR varname libname)
-     FIND_LIBRARY( ${varname}
--        NAMES ${libname} ${libname}-2_1 ${libname}-2_2
-+        NAMES ${libname} ${libname}-2_1 ${libname}-2_2 ${libname}-3_0
-         PATHS
-         $ENV{ILMBASE_DIR}/lib
-         $ENV{ILMBASE_DIR}
-@@ -53,11 +53,11 @@ ENDMACRO(ILMBASE_FIND)
- 
- ILMBASE_FIND(IlmThread)
- ILMBASE_FIND(Iex)
--ILMBASE_FIND(Half)
-+ILMBASE_FIND(Imath)
- 
- SET(ILMBASE_FOUND "NO")
--IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
--    SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Half_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
--    SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Half_LIBRARY ILMBASE_Iex_LIBRARY )
-+IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY)
-+    SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Imath_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
-+    SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Imath_LIBRARY ILMBASE_Iex_LIBRARY )
-     SET(ILMBASE_FOUND "YES")
--ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
-+ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY)
-diff --git a/src/osgPlugins/exr/CMakeLists.txt b/src/osgPlugins/exr/CMakeLists.txt
-index 6191ed18f..9a368b2c2 100644
---- a/src/osgPlugins/exr/CMakeLists.txt
-+++ b/src/osgPlugins/exr/CMakeLists.txt
-@@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR )
-+INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/Imath )
- INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR )
- 
- SET(TARGET_SRC ReaderWriterEXR.cpp )
-diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp
-index 7132e97f8..96c5507ef 100644
---- a/src/osgPlugins/exr/ReaderWriterEXR.cpp
-+++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp
-@@ -13,6 +13,7 @@
- #include <osgDB/FileNameUtils>
- #include <osgDB/FileUtils>
- 
-+#include <ImfInt64.h>
- #include <ImfRgbaFile.h>
- #include <ImfIO.h>
- #include <ImfArray.h>

packages/dev-libs/mbedtls/mbedtls-2.16.0-r1.exheres-0

@@ -1,94 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-
-require github [ user=ARMmbed tag=mbedtls-${PV} ]
-WORK="${WORKBASE}/${PNV}" # because github.exlib is broken
-require cmake [ api=2 ]
-
-
-SUMMARY="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-DOWNLOADS="https://tls.mbed.org/download/${PNV}-gpl.tgz"
-
-LICENCES="|| ( Apache-2.0 GPL-2 )"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-MYOPTIONS="
-    doc
-    havege [[ description = [ Enable the HAVEGE random generator,
-                              not suitable for virtualized environments! ] ]]
-    threads [[ description = [ Enables the threading abstraction layer
-                               via pthread. This is used if you do intend
-                               to use contexts between threads. ] ]]
-    x86_cpu_features:
-        sse2
-"
-
-DEPENDENCIES="
-    build:
-        doc? (
-            app-doc/doxygen[>=1.8.4]
-            media-gfx/graphviz
-        )
-    build+run:
-        sys-libs/zlib
-    test:
-        dev-lang/perl:*
-        dev-lang/python:*[>=3]
-"
-
-CMAKE_SRC_CONFIGURE_PARAMS=(
-    -DENABLE_PROGRAMS=OFF
-    -DUSE_SHARED_MBEDTLS_LIBRARY=ON
-    -DINSTALL_MBEDTLS_HEADERS=ON
-    -DLIB_INSTALL_DIR="/usr/$(exhost --target)/lib"
-    -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
-    -DENABLE_ZLIB_SUPPORT=ON
-)
-
-CMAKE_SRC_CONFIGURE_TESTS=(
-    '-DENABLE_TESTING=ON'
-)
-
-enable_mbedtls_option() {
-    local myopt="$@"
-    # check that config.h syntax is the same at version bump
-    edo sed -i \
-        -e "s://#define ${myopt}:#define ${myopt}:" \
-        "${CMAKE_SOURCE}"/include/mbedtls/config.h
-}
-
-src_prepare() {
-    option x86_cpu_features:sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-    enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-    option havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-    option threads && enable_mbedtls_option MBEDTLS_THREADING_C
-    option threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-    enable_mbedtls_option MBEDTLS_MD4_C
-    cmake_src_prepare
-}
-
-src_compile() {
-    default
-
-    if option doc ; then
-        emake apidoc
-    fi
-}
-
-src_test() {
-    LD_LIBRARY_PATH="${ECMAKE_BUILD_DIR}/library" \
-        emake test
-}
-
-src_install() {
-    cmake_src_install
-
-    if option doc ; then
-        docinto html
-        dodoc -r "${CMAKE_SOURCE}"/apidoc/*
-    fi
-}
-

packages/dev-python/python-application/files/08c503bdd1e128118e45fa50be256e27415bbd41.patch

@@ -0,0 +1,25 @@
+Upstream: Yes
+
+From 08c503bdd1e128118e45fa50be256e27415bbd41 Mon Sep 17 00:00:00 2001
+From: Adrian Georgescu <ag@ag-projects.com>
+Date: Sat, 1 Jan 2022 15:19:37 +0000
+Subject: [PATCH] collections.MutableMapping was deprecated since Python 3.3
+
+---
+ application/python/weakref.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/application/python/weakref.py b/application/python/weakref.py
+index a785a7e..38fd664 100644
+--- a/application/python/weakref.py
++++ b/application/python/weakref.py
+@@ -1,7 +1,8 @@
+ 
+ import weakref
+ 
+-from collections import MutableMapping, deque
++from collections.abc import MutableMapping
++from collections import deque
+ from copy import deepcopy
+ from threading import local
+ 

packages/dev-python/python-application/python-application-3.0.3.exheres-0

@@ -15,4 +15,7 @@ MYOPTIONS=""
 DEPENDENCIES="
     dev-python/zopeinterface[python_abis:*(-)?]
 "
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/08c503bdd1e128118e45fa50be256e27415bbd41.patch
+)
 

packages/games-engines/openmw/openmw-0.44.0.exheres-0

@@ -1,63 +0,0 @@
-# Copyright 2014-2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gtk-icon-cache
-require github [ user=OpenMW tag=${PNV} ]
-require cmake [ api=2 ]
-
-SUMMARY="An open source reimplementation of TES III: Morrowind"
-HOMEPAGE="http://openmw.org/"
-
-LICENCES="GPL-3 MIT bitstream-font OFL-1.1"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        app-arch/unshield
-        dev-games/OpenSceneGraph[>=3.3.4]
-        dev-games/mygui[>=3.2.1]
-        dev-libs/boost
-        dev-libs/tinyxml
-        media-libs/SDL:2[X]
-        media-libs/freetype:2
-        media-libs/openal
-        sci-physics/bullet[>=2.86]
-        x11-libs/qtbase:5
-        providers:ffmpeg? ( media/ffmpeg )
-        providers:libav? ( media/libav )
-"
-
-CMAKE_SRC_CONFIGURE_PARAMS=(
-    -DBINDIR="/usr/$(exhost --target)/bin"
-    -DBUILD_BSATOOL=ON
-    -DBUILD_DOCS=OFF
-    -DBUILD_ESMTOOL=ON
-    -DBUILD_LAUNCHER=ON
-    -DBUILD_NIFTEST=OFF
-    -DBUILD_OPENCS=ON
-    -DBUILD_OPENMW=ON
-    -DBUILD_UNITTESTS=OFF
-    -DBUILD_WITH_CODE_COVERAGE=OFF
-    -DBUILD_WIZARD=ON
-    -DCMAKE_INSTALL_PREFIX=/usr
-    -DDATADIR="/usr/share/${PN}"
-    -DDESIRED_QT_VERSION=5
-    -DGLOBAL_CONFIG_PATH="/etc"
-    -DICONDIR="/usr/share/icons/hicolor/256x256/apps"
-    -DLIBDIR="/usr/$(exhost --target)/lib"
-    -DMORROWIND_DATA_FILES="/usr/share/${PN}/data"
-    -DOPENMW_RESOURCE_FILES="/usr/share/${PN}/resources"
-    -DUSE_SYSTEM_TINYXML=ON
-)
-
-src_install() {
-    default
-    keepdir /usr/share/openmw/data
-}
-

packages/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.exheres-0

@@ -1,46 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require scons
-
-SUMMARY="A simple converter to create Ogg Theora files"
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
-DOWNLOADS="http://www.v2v.cc/~j/${PN}/downloads/${PNV}.tar.bz2"
-
-LICENCES="GPL-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        media-libs/libvorbis
-        media-libs/libogg
-        media-libs/libtheora
-        providers:ffmpeg? ( media/ffmpeg )
-        providers:libav? ( media/libav )
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    -p0 "${FILES}"/${PN}-0.30-underlinking.patch
-    -p1 "${FILES}"/${PN}-0.30-build.patch
-)
-
-SCONS_SRC_CONFIGURE_PARAMS=(
-    libkate=0
-    bindir="${IMAGE}/usr/$(exhost --target)/bin"
-    destdir=${IMAGE}
-    prefix=/usr
-)
-SCONS_SRC_COMPILE_PARAMS=( "${SCONS_SRC_CONFIGURE_PARAMS[@]}" )
-SCONS_SRC_INSTALL_PARAMS=( "${SCONS_SRC_CONFIGURE_PARAMS[@]}" )
-
-src_install() {
-    scons_src_install
-	dodoc AUTHORS ChangeLog README subtitles.txt TODO
-}
-

packages/media-video/ffmpeg2theora/files/ffmpeg2theora-0.30-build.patch

@@ -1,76 +0,0 @@
-Source: Julian Ospald <hasufell@posteo.de>
-Upstream: no
-Reason: fix build by respecting pkg-config, CC etc
-
-diff --git a/SConstruct b/SConstruct
-index 2458096..eda1c41 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -4,6 +4,7 @@ from glob import glob
- import os
- 
- import SCons
-+import SCons.Util
- 
- def version():
-     #return "0.29"
-@@ -41,6 +42,27 @@ opts.AddVariables(
- env = Environment(options = opts)
- Help(opts.GenerateHelpText(env))
- 
-+if os.environ.has_key('AR'):
-+    env['AR'] = os.environ['AR']
-+if os.environ.has_key('RANLIB'):
-+    env['RANLIB'] = os.environ['RANLIB']
-+if os.environ.has_key('CC'):
-+    env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+    env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+    env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('CPPFLAGS'):
-+    env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+if os.environ.has_key('PKG_CONFIG'):
-+    env['PKG_CONFIG'] = os.environ['PKG_CONFIG']
-+else:
-+    env['PKG_CONFIG'] = 'pkg-config'
-+
- pkg_flags="--cflags --libs"
- if env['static']:
-   pkg_flags+=" --static"
-@@ -75,9 +97,9 @@ if GetOption("help"):
- 
- def ParsePKGConfig(env, name): 
-   if os.environ.get('PKG_CONFIG_PATH', ''):
--    action = 'PKG_CONFIG_PATH=%s pkg-config %s "%s"' % (os.environ['PKG_CONFIG_PATH'], pkg_flags, name)
-+    action = 'PKG_CONFIG_PATH=%s %s %s "%s"' % (os.environ['PKG_CONFIG_PATH'], env['PKG_CONFIG'], pkg_flags, name)
-   else:
--    action = 'pkg-config %s "%s"' % (pkg_flags, name)
-+    action = '%s %s "%s"' % (env['PKG_CONFIG'], pkg_flags, name)
-   return env.ParseConfig(action)
- 
- def TryAction(action):
-@@ -89,16 +111,16 @@ def TryAction(action):
- 
- def CheckPKGConfig(context, version): 
-   context.Message( 'Checking for pkg-config... ' ) 
--  ret = TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0] 
-+  ret = TryAction('%s --atleast-pkgconfig-version=%s' % (env['PKG_CONFIG'], version))[0] 
-   context.Result( ret ) 
-   return ret 
- 
- def CheckPKG(context, name): 
-   context.Message( 'Checking for %s... ' % name )
-   if os.environ.get('PKG_CONFIG_PATH', ''):
--    action = 'PKG_CONFIG_PATH=%s pkg-config --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], name)
-+    action = 'PKG_CONFIG_PATH=%s %s --exists "%s"' % (os.environ['PKG_CONFIG_PATH'], env['PKG_CONFIG'], name)
-   else:
--    action = 'pkg-config --exists "%s"' % name
-+    action = '%s --exists "%s"' % (env['PKG_CONFIG'], name)
-   ret = TryAction(action)[0]
-   context.Result( ret ) 
-   return ret

packages/media-video/ffmpeg2theora/files/ffmpeg2theora-0.30-underlinking.patch

@@ -1,17 +0,0 @@
-Source: Gentoo
-Upstream: unknown
-Reason: fix underlinking
-
---- SConstruct
-+++ SConstruct
-@@ -206,9 +206,8 @@
-   if env['crossmingw']:
-       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
-       env.Append(LIBS=['m'])
--  elif env['static']:
--      env.Append(LIBS=['m', 'dl'])
- 
-+  env.Append(LIBS=['m', 'dl'])
- 
- env = conf.Finish()
- 

packages/net-im/slack/slack-4.27.156.exheres-0

@@ -70,6 +70,7 @@ src_install() {
     insinto /opt/slack
     doins -r usr/lib/slack/.
     edo chmod +x "${IMAGE}"/opt/slack/slack
+    edo chmod +x "${IMAGE}"/opt/slack/chrome_crashpad_handler
     dodir /usr/$(exhost --target)/bin
     dosym ../../../opt/slack/slack /usr/$(exhost --target)/bin/slack
 }

packages/voip/blink/blink-5.1.8-r1.exheres-0

@@ -3,10 +3,10 @@
 
 require desktop-utils gtk-icon-cache
 require setup-py [ import=distutils blacklist="2" multibuild=false ]
-require github [ user="AGProjects" pn="blink-qt" tag="${PV}" ]
 
 SUMMARY="A state of the art, easy to use SIP client"
 HOMEPAGE="http://iCanBlink.com"
+DOWNLOADS="http://download.ag-projects.com/Blink/Linux/${PNV}.tar.gz"
 
 LICENCES="GPL-3"
 SLOT="0"
@@ -25,13 +25,14 @@ DEPENDENCIES="
         dev-python/python-application[>=3.0.3][python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
         dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
-        dev-python/python-sipsimple[>=5.2.2][python_abis:*(-)?]
+        dev-python/python-sipsimple[>=5.2.5][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}/${PN}-data-path.patch"
+    "${FILES}/33c7f377d173d27b4611d061ca36077805250e78.patch"
 )
 
 src_install() {

packages/voip/blink/files/33c7f377d173d27b4611d061ca36077805250e78.patch

@@ -0,0 +1,122 @@
+Upstream: Yes
+
+From 33c7f377d173d27b4611d061ca36077805250e78 Mon Sep 17 00:00:00 2001
+From: Jose Lopes <josemslopes@gmail.com>
+Date: Tue, 8 Feb 2022 08:11:57 +0000
+Subject: [PATCH] Solve issues with python 3.10
+
+GH-3
+---
+ blink/chatwindow.py       |  3 ++-
+ blink/sessions.py         |  6 +++---
+ blink/widgets/buttons.py  |  4 ++--
+ blink/widgets/lineedit.py | 14 +++++++-------
+ blink/widgets/video.py    |  2 +-
+ 5 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/blink/chatwindow.py b/blink/chatwindow.py
+index e55f590..40da6de 100644
+--- a/blink/chatwindow.py
++++ b/blink/chatwindow.py
+@@ -18,7 +18,8 @@
+ from application.python.descriptor import WriteOnceAttribute
+ from application.python.types import MarkerType
+ from application.system import makedirs
+-from collections import MutableSet, deque
++from collections.abc import MutableSet
++from collections import deque
+ from datetime import datetime, timedelta
+ from itertools import count
+ from lxml import etree, html
+diff --git a/blink/sessions.py b/blink/sessions.py
+index 9805515..9928831 100644
+--- a/blink/sessions.py
++++ b/blink/sessions.py
+@@ -5094,13 +5094,13 @@ def showEvent(self, event):
+             total_width = width + window_frame_size.width()
+             total_height = height + window_frame_size.height()
+ 
+-            x = limit(screen_geometry.center().x() - total_width/2, min=available_geometry.left(), max=available_geometry.right()-total_width)
++            x = int(limit(screen_geometry.center().x() - total_width/2, min=available_geometry.left(), max=available_geometry.right()-total_width))
+             if slot is None:
+                 y = -1
+             elif slot % 2 == 0:
+-                y = screen_geometry.center().y() + (slot-1)*total_height/2
++                y = int(screen_geometry.center().y() + (slot-1)*total_height/2)
+             else:
+-                y = screen_geometry.center().y() - slot*total_height/2
++                y = int(screen_geometry.center().y() - slot*total_height/2)
+ 
+             if available_geometry.top() <= y <= available_geometry.bottom() - total_height:
+                 self.setGeometry(x, y, width, height)
+diff --git a/blink/widgets/buttons.py b/blink/widgets/buttons.py
+index c3b18bf..72aefd5 100644
+--- a/blink/widgets/buttons.py
++++ b/blink/widgets/buttons.py
+@@ -620,8 +620,8 @@ def pixmap(self, mode=QIcon.Normal, state=QIcon.Off):
+             return pixmap
+ 
+         size = max(pixmap.width(), pixmap.height())
+-        offset_x = (size - pixmap.width())/2
+-        offset_y = (size - pixmap.height())/2
++        offset_x = int((size - pixmap.width())/2)
++        offset_y = int((size - pixmap.height())/2)
+ 
+         new_pixmap = QPixmap(size, size)
+         new_pixmap.fill(Qt.transparent)
+diff --git a/blink/widgets/lineedit.py b/blink/widgets/lineedit.py
+index ee63e81..f03ac54 100644
+--- a/blink/widgets/lineedit.py
++++ b/blink/widgets/lineedit.py
+@@ -68,13 +68,13 @@ def _update_side_widget_locations(self):
+         text_rect.adjust(spacing, 0, -spacing, 0)
+         mid_height = text_rect.center().y() + 1 - (text_rect.height() % 2)  # need -1 correction for odd heights -Dan
+         if self.left_layout.count() > 0:
+-            left_height = mid_height - self.left_widget.height()/2
++            left_height = int(mid_height - self.left_widget.height()/2)
+             left_width = self.left_widget.width()
+             if left_width == 0:
+-                left_height = mid_height - self.left_widget.sizeHint().height()/2
++                left_height = int(mid_height - self.left_widget.sizeHint().height()/2)
+             self.left_widget.move(text_rect.x(), left_height)
+         text_rect.setX(self.left_margin)
+-        text_rect.setY(mid_height - self.right_widget.sizeHint().height()/2.0)
++        text_rect.setY(int(mid_height - self.right_widget.sizeHint().height()/2.0))
+         text_rect.setHeight(self.right_widget.sizeHint().height())
+         self.right_widget.setGeometry(text_rect)
+ 
+@@ -201,8 +201,8 @@ def __init__(self, parent=None, size=16):
+     def paintEvent(self, event):
+         painter = QPainter(self)
+         if self.icon is not None:
+-            x = (self.width() - self.icon.width()) / 2
+-            y = (self.height() - self.icon.height()) / 2
++            x = int((self.width() - self.icon.width()) / 2)
++            y = int((self.height() - self.icon.height()) / 2)
+             painter.drawPixmap(x, y, self.icon)
+ 
+ 
+@@ -232,8 +232,8 @@ def paintEvent(self, event):
+         painter = QPainter(self)
+         icon = self.icon_pressed if self.isDown() else self.icon
+         if icon is not None:
+-            x = (self.width() - icon.width()) / 2
+-            y = (self.height() - icon.height()) / 2
++            x = int((self.width() - icon.width()) / 2)
++            y = int((self.height() - icon.height()) / 2)
+             painter.drawPixmap(x, y, icon)
+         else:
+             width = self.width()
+diff --git a/blink/widgets/video.py b/blink/widgets/video.py
+index eff4f7c..5ecab6a 100644
+--- a/blink/widgets/video.py
++++ b/blink/widgets/video.py
+@@ -56,7 +56,7 @@ def __init__(self, parent=None, framerate=None):
+         self.cursors.resize_bottom = QCursor(QIcon(Resources.get('icons/resize-bottom.svg')).pixmap(16), hotX=8,  hotY=16)
+         if framerate is not None:
+             self._clock = QTimer()
+-            self._clock.setInterval(1000/framerate)
++            self._clock.setInterval(int(1000/framerate))
+             self._clock.timeout.connect(self.update)
+         else:
+             self._clock = None

packages/x11-apps/picom/picom-9.1.exheres-0

@@ -40,7 +40,6 @@ DEPENDENCIES="
             x11-dri/mesa
         )
     run:
-        dev-lang/python:*[>3.5] [[ note = [ bin/compton-convgen.py ] ]]
         x11-apps/xprop
         x11-apps/xwininfo
 "
@@ -50,6 +49,7 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
 )
 
 MESON_SRC_CONFIGURE_PARAMS=(
+    "-Dcompton=false"
     "-Dunittest=true"
     "-Dwith_docs=true"
 )
@@ -59,13 +59,6 @@ MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
     "opengl"
 )
 
-src_prepare() {
-    meson_src_prepare
-    # don't install compat symlink
-    # this script is also broken
-    echo "#!/bin/sh" > meson/install.sh
-}
-
 src_install() {
     meson_src_install
     option dbus && dodoc -r dbus-examples

packages/x11-misc/zim/zim-0.73.5-r1.exheres-0

@@ -27,7 +27,6 @@ DEPENDENCIES="
     suggestion:
         app-text/dvipng [[ note = [ equation plugin ] ]]
         app-text/texlive-core [[ note = [ equation plugin ] ]]
-        dev-libs/zeitgeist:2.0
         dev-scm/bzr [[ note = [ version control plugin ] ]]
         media-gfx/graphviz [[ note = [ diagram editor plugin ] ]]
         media-gfx/ImageMagick [[ note = [ screenshot plugin ] ]]