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

metadata/repository_mask.conf

@@ -3,7 +3,6 @@
     dev-lang/fsharp[~scm]
     dev-lang/fstar[~scm]
     dev-python/pytype[~scm]
-    dev-util/universal-ctags[~scm]
     games-emulation/gambatte[~scm]
     games-engines/OpenJK[~scm]
     games-engines/flare[~scm]

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.5.9-r1.exheres-0

@@ -1,78 +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/ilmbase
-        media-libs/jasper
-        media-libs/libpng:=
-        media-libs/openexr
-        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 )
-"
-
-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_Xine=1
-    -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1
-    -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/mygui/files/mygui-3.2.2-Use-GNUInstallDirs.patch

@@ -1,168 +0,0 @@
-From fbdfac84763ce525e7d243eefbb23c013db93e32 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Tue, 24 May 2016 18:06:54 +0200
-Subject: [PATCH] Use GNUInstallDirs
-
-This will probably not make it upstream since they try to
-be windows compatible.
----
- CMake/ConfigureBuild.cmake                     |  2 +-
- CMake/Utils/MyGUIConfigTargets.cmake           | 40 +++++++++++++-------------
- CMakeLists.txt                                 |  1 +
- MyGUIEngine/CMakeLists.txt                     |  2 +-
- Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt |  2 +-
- 5 files changed, 24 insertions(+), 23 deletions(-)
-
-diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
-index 9c6aad9..b655848 100644
---- a/CMake/ConfigureBuild.cmake
-+++ b/CMake/ConfigureBuild.cmake
-@@ -47,7 +47,7 @@ if (UNIX)
-   else ()
-     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
-   endif ()
--  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
-+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
-   # configure additional packages
-   
-diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
-index d48d2a3..61b80a5 100644
---- a/CMake/Utils/MyGUIConfigTargets.cmake
-+++ b/CMake/Utils/MyGUIConfigTargets.cmake
-@@ -60,27 +60,27 @@ endfunction(mygui_create_vcproj_userfile)
- # install targets according to current build type
- function(mygui_install_target TARGETNAME SUFFIX)
- 	install(TARGETS ${TARGETNAME}
--		RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
--		LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
--		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
-+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
- 	)
- 	install(TARGETS ${TARGETNAME}
--		RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
--		LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
--		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
-+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
- 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo
- 	)
- 	install(TARGETS ${TARGETNAME}
--		RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
--		LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
--		ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
-+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
-+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel
- 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel
- 	)
- 	install(TARGETS ${TARGETNAME}
--		RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
--		LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
--		ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
-+		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug
-+		LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
-+		ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug
- 		FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug
- 	)
- endfunction(mygui_install_target)
-@@ -364,11 +364,11 @@ function(mygui_install_app PROJECTNAME)
- 	if (MYGUI_INSTALL_PDB)
- 		# install debug pdb files
- 		install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_DEBUG_PATH}/${PROJECTNAME}.pdb
--			DESTINATION bin${MYGUI_DEBUG_PATH}
-+			DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}
- 			CONFIGURATIONS Debug
- 		)
- 		install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_RELWDBG_PATH}/${PROJECTNAME}.pdb
--			DESTINATION bin${MYGUI_RELWDBG_PATH}
-+			DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}
- 			CONFIGURATIONS RelWithDebInfo
- 		)
- 	endif ()
-@@ -400,7 +400,7 @@ function(mygui_plugin PROJECTNAME)
- 	set_target_properties(${PROJECTNAME} PROPERTIES PREFIX "")
- 
- 	install(FILES ${HEADER_FILES}
--		DESTINATION include/MYGUI
-+		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/MYGUI
- 	)
- endfunction(mygui_plugin)
- 
-@@ -431,20 +431,20 @@ function(mygui_config_lib PROJECTNAME)
- 		# install debug pdb files
- 		if (MYGUI_STATIC)
- 			install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb
--				DESTINATION lib${MYGUI_LIB_DEBUG_PATH}
-+				DESTINATION ${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_DEBUG_PATH}
- 				CONFIGURATIONS Debug
- 			)
- 			install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb
--				DESTINATION lib${MYGUI_LIB_RELWDBG_PATH}
-+				DESTINATION ${CMAKE_INSTALL_LIBDIR}${MYGUI_LIB_RELWDBG_PATH}
- 				CONFIGURATIONS RelWithDebInfo
- 			)
- 		else ()
- 			install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_DEBUG_PATH}/${PROJECTNAME}_d.pdb
--				DESTINATION bin${MYGUI_DEBUG_PATH}
-+				DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_DEBUG_PATH}
- 				CONFIGURATIONS Debug
- 			)
- 			install(FILES ${MYGUI_BINARY_DIR}/bin${MYGUI_RELWDBG_PATH}/${PROJECTNAME}.pdb
--				DESTINATION bin${MYGUI_RELWDBG_PATH}
-+				DESTINATION ${CMAKE_INSTALL_BINDIR}${MYGUI_RELWDBG_PATH}
- 				CONFIGURATIONS RelWithDebInfo
- 			)
- 		endif ()
-@@ -459,7 +459,7 @@ function(mygui_config_sample PROJECTNAME)
- 	# set install RPATH for Unix systems
- 	if (UNIX AND MYGUI_FULL_RPATH)
- 		set_property(TARGET ${PROJECTNAME} APPEND PROPERTY
--			INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+			INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
- 		set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
- 	endif ()
- endfunction(mygui_config_sample)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fc5694..0cddafa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,6 +17,7 @@ set(CMAKE_MODULE_PATH
- 	"${MYGUI_SOURCE_DIR}/CMake/Utils"
- 	"${MYGUI_SOURCE_DIR}/CMake/Packages"
- )
-+include(GNUInstallDirs)
- include(CMakeDependentOption)
- include(MacroLogFeature)
- include(MyGUIConfigTargets)
-diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt
-index c5eab54..839ff43 100644
---- a/MyGUIEngine/CMakeLists.txt
-+++ b/MyGUIEngine/CMakeLists.txt
-@@ -64,5 +64,5 @@ endif ()
- 
- # install MyGUIEngine headers
- install(FILES ${HEADER_FILES}
--  DESTINATION include/MYGUI
-+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
- )
-diff --git a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
-index 169ad05..4bd7cd1 100644
---- a/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
-+++ b/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt
-@@ -30,7 +30,7 @@ link_directories(${OPENGL_LIB_DIR} ${PNG_LIBRARY})
- 
- # installation rules
- install(FILES ${HEADER_FILES}
--        DESTINATION include/MYGUI
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/MYGUI
- )
- mygui_install_target(${PROJECTNAME} "")
- 
--- 
-2.8.3
-

packages/dev-games/mygui/files/mygui-3.2.2-underlinking.patch

@@ -1,21 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 10:42:42 UTC 2012
-Subject: build system
-Upstream: no
-
-fix underlinking
-
---- MyGUIEngine/CMakeLists.txt
-+++ MyGUIEngine/CMakeLists.txt
-@@ -48,7 +48,10 @@
- if (MYGUI_USE_FREETYPE)
- 	target_link_libraries(${PROJECTNAME}
- 		${FREETYPE_LIBRARIES}
--	)
-+		dl)
-+else()
-+	target_link_libraries(${PROJECTNAME}
-+		dl)
- endif()
- 
- # platform specific dependencies

packages/dev-games/mygui/mygui-3.2.2-r1.exheres-0

@@ -1,61 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-MY_PNV=MyGUI${PV}
-WORK="${WORKBASE}/${PN}-${MY_PNV}"
-
-require cmake [ api=2 ]
-require github [ user=MyGUI tag=${MY_PNV} ]
-
-SUMMARY="A library for creating GUIs for games"
-HOMEPAGE="http://mygui.info/"
-
-LICENCES="MIT"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        media-libs/freetype:2
-        media-libs/glew
-        x11-dri/mesa
-"
-
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    -p0 "${FILES}"/${PNV}-underlinking.patch
-    -p1 "${FILES}"/${PNV}-Use-GNUInstallDirs.patch
-)
-
-CMAKE_SRC_CONFIGURE_PARAMS=(
-    -DCMAKE_INSTALL_BINDIR="/usr$(exhost --target)/bin"
-    -DCMAKE_INSTALL_INCLUDEDIR="/usr/$(exhost --target)/include"
-    -DCMAKE_INSTALL_LIBDIR="/usr/$(exhost --target)/lib"
-    -DCMAKE_INSTALL_PREFIX="/usr"
-    -DMYGUI_BUILD_DEMOS=OFF
-    -DMYGUI_BUILD_DOCS=OFF
-    -DMYGUI_BUILD_PLUGINS=ON
-    -DMYGUI_BUILD_TOOLS=OFF
-    -DCMAKE_BUILD_TYPE=Release
-    -DMYGUI_BUILD_WRAPPER=OFF
-    -DMYGUI_INSTALL_DOCS=OFF
-    -DMYGUI_INSTALL_MEDIA=ON
-    -DMYGUI_INSTALL_SAMPLES=OFF
-    -DMYGUI_INSTALL_TOOLS=OFF
-    -DMYGUI_RENDERSYSTEM=4
-    -DMYGUI_STATIC=OFF
-    -DMYGUI_USE_FREETYPE=ON
-    -DMYGUI_USE_SYSTEM_GLEW=ON
-)
-
-src_install() {
-    cmake_src_install
-
-    # test media not needed at runtime
-    edo rm -r "${IMAGE}"/usr/share/MYGUI/Media/UnitTests
-    # wrapper not available for linux, remove related media
-    edo rm -r "${IMAGE}"/usr/share/MYGUI/Media/Wrapper
-}
-

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/dev-python/python-sipsimple/files/d75b225e566cae2c998504dc5cd76bb30226cb43.patch

@@ -1,36 +0,0 @@
-Upstream: Yes
-Source: https://github.com/AGProjects/python3-sipsimple/commit/d75b225e566cae2c998504dc5cd76bb30226cb43
-
-From d75b225e566cae2c998504dc5cd76bb30226cb43 Mon Sep 17 00:00:00 2001
-From: Adrian Georgescu <ag@ag-projects.com>
-Date: Tue, 16 Mar 2021 13:54:03 +0000
-Subject: [PATCH] Decode uri.transport if is bytes in DNS Lookup
-
----
- sipsimple/lookup.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sipsimple/lookup.py b/sipsimple/lookup.py
-index 8ce86a92..27672da7 100644
---- a/sipsimple/lookup.py
-+++ b/sipsimple/lookup.py
-@@ -255,8 +255,9 @@ def lookup_sip_proxy(self, uri, supported_transports, timeout=3.0, lifetime=15.0
- 
-         try:
-             # If the host part of the URI is an IP address, we will not do any lookup
-+            transport = uri.transport.decode() if isinstance(uri.transport, bytes) else uri.transport
-             if re.match("^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$", uri.host.decode()):
--                transport = 'tls' if uri.secure else uri.transport.lower()
-+                transport = 'tls' if uri.secure else transport.lower()
-                 if transport not in supported_transports:
-                     raise DNSLookupError("IP transport %s dictated by URI is not supported" % transport)
-                 port = uri.port or (5061 if transport=='tls' else 5060)
-@@ -270,7 +271,7 @@ def lookup_sip_proxy(self, uri, supported_transports, timeout=3.0, lifetime=15.0
- 
-             # If the port is specified in the URI, we will only do an A lookup
-             if uri.port:
--                transport = 'tls' if uri.secure else uri.transport.lower()
-+                transport = 'tls' if uri.secure else transport.lower()
-                 if transport not in supported_transports:
-                     raise DNSLookupError("Host transport %s dictated by URI is not supported" % transport)
-                 addresses = self._lookup_a_records(resolver, [uri.host.decode()], log_context=log_context)

packages/dev-python/python-sipsimple/files/python-sipsimple-gcc10-fix.patch

@@ -1,25 +0,0 @@
-Upstream: Submitted
-Source: https://github.com/AGProjects/python-sipsimple/pull/10
-
-From 052f7301a0c906c4117dff5453222f12e768bb49 Mon Sep 17 00:00:00 2001
-From: Tom Briden <tom@decompile.me.uk>
-Date: Thu, 23 Jul 2020 19:22:30 +0100
-Subject: [PATCH] Fix multiple definition of `PJ_ATTR_MAY_ALIAS' with GCC-10
-
----
- deps/pjsip/pjlib/include/pj/list.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/pjsip/pjlib/include/pj/list.h b/deps/pjsip/pjlib/include/pj/list.h
-index 880f58d4..50510fe3 100644
---- a/deps/pjsip/pjlib/include/pj/list.h
-+++ b/deps/pjsip/pjlib/include/pj/list.h
-@@ -71,7 +71,7 @@ PJ_BEGIN_DECL
-  * must initialize the 'value' member to an appropriate value (typically the
-  * owner itself).
-  */
--struct pj_list
-+extern struct pj_list
- {
-     PJ_DECL_LIST_MEMBER(void);
- } PJ_ATTR_MAY_ALIAS; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */

packages/dev-python/python-sipsimple/python-sipsimple-5.2.6.exheres-0

@@ -7,6 +7,13 @@ require setup-py [ import=distutils blacklist="2" multibuild=false ]
 SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
 HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
 
+ZRTPCPP_SHA="6b3cd8e6783642292bad0c21e3e5e5ce45ff3e03"
+
+DOWNLOADS+="
+    https://github.com/pjsip/pjproject/archive/2.10.tar.gz
+    https://github.com/wernerd/ZRTPCPP/archive/${ZRTPCPP_SHA}.tar.gz -> ZRTPCPP-${ZRTPCPP_SHA}.tar.gz
+"
+
 LICENCES="GPL-3"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
@@ -31,6 +38,7 @@ DEPENDENCIES="
         providers:openssl? ( dev-libs/openssl )
     run:
         dev-python/dnspython[python_abis:*(-)?]
+        dev-python/gevent[python_abis:*(-)?]
         dev-python/greenlet[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
@@ -46,10 +54,41 @@ DEPENDENCIES="
 
 DEFAULT_SRC_PREPARE_PATCHES=(
     "${FILES}"/${PN}-fix-build.patch
-    "${FILES}"/${PN}-gcc10-fix.patch
-    "${FILES}"/d75b225e566cae2c998504dc5cd76bb30226cb43.patch
 )
 
+src_prepare() {
+    setup-py_src_prepare
+
+    # MOst of this is straight from get_dependencies.sh but that
+    # wants to download the dependencies directly so we can't use it
+    edo mkdir "${WORK}"/deps/pjsip
+    edo mv "${WORKBASE}"/pjproject*/* "${WORK}"/deps/pjsip/
+
+    edo pushd "${WORK}"/deps/
+
+    # Copy wrapper from old version to third_party/zsrtp/
+    edo mkdir ./pjsip/third_party/zsrtp
+    cp -r zsrtp/include ./pjsip/third_party/zsrtp/
+    cp -r zsrtp/srtp    ./pjsip/third_party/zsrtp/
+    cp -r zsrtp/build   ./pjsip/third_party/build/zsrtp
+
+    # Copy new version to third_party/zsrtp/
+    mkdir ./pjsip/third_party/zsrtp/zrtp
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/bnlib ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/common ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/cryptcommon ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/srtp ./pjsip/third_party/zsrtp/zrtp/
+    cp -r "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/zrtp ./pjsip/third_party/zsrtp/zrtp/
+    cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/COPYING ./pjsip/third_party/zsrtp/zrtp/
+    cp "${WORKBASE}"/ZRTPCPP-"${ZRTPCPP_SHA}"/README.md ./pjsip/third_party/zsrtp/zrtp/
+
+    for p in patches/*.patch; do
+        expatch -p0 "${p}"
+    done
+
+    edo popd
+}
+
 src_compile() {
     # breaks horribly with 'ld'
     export LD=${CC}

packages/dev-python/python-xcaplib/files/python-xcaplib-work-with-eventlib.patch

@@ -1,70 +0,0 @@
-Upstream: Yes
-Source: https://github.com/AGProjects/python3-xcaplib/commit/066759cf355b152375767bee4c3858dc0b8087e4
-
-From 066759cf355b152375767bee4c3858dc0b8087e4 Mon Sep 17 00:00:00 2001
-From: Worawut Boonpeang <worawut@ag-projects.com>
-Date: Fri, 4 Dec 2020 13:49:54 +0000
-Subject: [PATCH] xcaplib (Python3) work with eventlib
-
----
- xcaplib/green.py      |  4 +++-
- xcaplib/xcapclient.py | 10 ++++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/xcaplib/green.py b/xcaplib/green.py
-index 237d9d8..d01ee11 100644
---- a/xcaplib/green.py
-+++ b/xcaplib/green.py
-@@ -2,6 +2,8 @@
- from eventlib.green import socket, ssl, httplib, urllib2
- from xcaplib import httpclient
- from xcaplib import client
-+import urllib
-+import http
- 
- 
- class HTTPConnection(httplib.HTTPConnection):
-@@ -22,7 +24,7 @@ def http_open(self, req):
- 
- class HTTPSHandler(urllib.request.HTTPSHandler):
-     def https_open(self, req):
--        return self.do_open(HTTPSConnection, req)
-+        return self.do_open(http.client.HTTPSConnection, req)
- 
- 
- class HTTPClient(httpclient.HTTPClient):
-diff --git a/xcaplib/xcapclient.py b/xcaplib/xcapclient.py
-index cd409df..384c237 100755
---- a/xcaplib/xcapclient.py
-+++ b/xcaplib/xcapclient.py
-@@ -129,6 +129,8 @@ def setup_parser_request(parser):
-     parser.add_option('--etag', help="perform a conditional operation", metavar='ETAG')
-     parser.add_option('--add-header', dest='headers',
-                       action='append', default=[], help=optparse.SUPPRESS_HELP)
-+    parser.add_option("--eventlib", dest='eventlib_enable',
-+                      help="Enables non-blocking mode using eventlib library")
-     parser.add_option("-i", dest='input_filename',
-                       help="source file for the PUT request; default is <stdin>")
-     parser.add_option("-o", dest='output_filename',
-@@ -366,7 +368,11 @@ def update_options_from_config(options):
-                 setattr(options, key, value)
- 
- def parse_args():
--    argv = sys.argv[1:]
-+    argv = None
-+    if "--eventlib" in sys.argv[1:]:
-+        argv = sys.argv[2:]
-+    else:
-+        argv = sys.argv[1:]
- 
-     if not argv:
-         sys.exit('Type %s -h for help.' % sys.argv[0])
-@@ -496,7 +502,7 @@ def get_exit_code(http_error):
-         return 3
- 
- def main():
--    if sys.argv[0].endswith('-eventlib'):
-+    if "--eventlib" in sys.argv[1:]:
-         from xcaplib.green import XCAPClient as client_class
-     else:
-         client_class = XCAPClient

packages/dev-python/python-xcaplib/python-xcaplib-2.0.1.exheres-0

@@ -14,11 +14,8 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     run:
+        dev-python/gevent[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
         dev-python/python-application[>=3.0.3][python_abis:*(-)?]
 "
 
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PN}-work-with-eventlib.patch
-)
-

packages/dev-util/bakefile/bakefile-0.2.11.exheres-0

@@ -5,7 +5,7 @@ require python [ blacklist=3 has_bin=true has_lib=true multibuild=false ]
 require github [ user="vslavik" release="v${PV}" suffix=tar.gz ]
 
 SUMMARY="Bakefile makefiles generator"
-HOMEPAGE="http://bakefile.org/"
+HOMEPAGE="https://bakefile.org/"
 
 LICENCES="MIT"
 SLOT="0"

packages/dev-util/github-cli/github-cli-2.14.7.exheres-0

@@ -23,6 +23,7 @@ BUGS_TO="hasufell@posteo.de"
 src_compile() {
     export GOPATH="${WORK}"/.gopath
     export GOBIN="${WORK}"/.bin
+    export GH_VERSION="v${PV}"
     unset LDFLAGS
 
     esandbox disable_net
@@ -30,7 +31,7 @@ src_compile() {
     emake manpages
 
     edo go run ./cmd/gh completion -s bash > gh.bash-completion
-	edo go run ./cmd/gh completion -s zsh > gh.zsh-completion
+    edo go run ./cmd/gh completion -s zsh > _gh
     esandbox enable_net
 }
 
@@ -39,6 +40,13 @@ src_install() {
     emagicdocs
 
     doman share/man/man?/gh*.?
-    dobashcompletion gh.bash-completion
+    dobashcompletion gh.bash-completion gh
-    dozshcompletion gh.zsh-completion
+    dozshcompletion _gh
 }
+
+src_test() {
+    esandbox disable_net
+    default
+    esandbox enable_net
+}
+

packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0

@@ -1,51 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require alternatives github [ user='universal-ctags' pn='ctags' ]
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
-
-SUMMARY="Universal ctags"
-
-LICENCES="GPL-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    json [[ description = [ Add support for JSON format as output ] ]]
-    seccomp [[ description = [ Add support for libseccomp library ] ]]
-    xml
-    yaml [[ description = [ Add support for YAML format as output ] ]]
-"
-
-DEPENDENCIES="
-    build+run:
-        json? ( dev-libs/jansson )
-        seccomp? ( sys-libs/libseccomp )
-        xml? ( dev-libs/libxml2:2.0[>=2.7.7] )
-        yaml? ( dev-libs/libyaml )
-    build:
-        dev-python/docutils
-        virtual/pkg-config
-"
-
-# input-encoding-option and output-encoding-option fail as of 20-03-2020
-RESTRICT="test"
-
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
-    'json'
-    'seccomp'
-    'xml'
-    'yaml'
-)
-
-src_install() {
-    default
-
-    # alternatives collision
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{ctags,universal-ctags}
-    edo mv "${IMAGE}"/usr/share/man/man1/{ctags,universal-ctags}.1
-
-    alternatives_for ctags universal-ctags 500 \
-        /usr/$(exhost --target)/bin/ctags universal-ctags \
-        /usr/share/man/man1/ctags.1 universal-ctags.1
-}
-

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

@@ -5,7 +5,7 @@ require gtk-icon-cache freedesktop-desktop freedesktop-mime
 
 SUMMARY="Team collaboration tool"
 HOMEPAGE="http://www.slack.com/"
-DOWNLOADS="https://downloads.slack-edge.com/linux_releases/${PN/-bin/}-desktop-${PV}-amd64.deb"
+DOWNLOADS="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/slack-desktop-${PV}-amd64.deb"
 
 LICENCES="all-rights-reserved"
 SLOT="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[>=4.0.1][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

@@ -23,9 +23,9 @@ DEPENDENCIES="
         x11-proto/xorgproto
     build+run:
         dev-libs/libev
-        dev-libs/pcre[>=8.10]
+        dev-libs/pcre[>=8.20]
         x11-libs/libX11
-        x11-libs/libxcb[>=1.9.2]
+        x11-libs/libxcb[>=1.12.0]
         x11-libs/libXext
         x11-libs/pixman:1
         x11-utils/xcb-util-image
@@ -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,8 +49,9 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
 )
 
 MESON_SRC_CONFIGURE_PARAMS=(
+    "-Dcompton=false"
     "-Dunittest=true"
-    "-Dbuild_docs=true"  # with_docs in "next" branch
+    "-Dwith_docs=true"
 )
 MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
     "dbus"
@@ -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 ] ]]