github-cli: bump to 2.1.0

Dependency verification

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-python/python-application/python-application-3.0.3.exheres-0

@@ -1,7 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require pypi setup-py [ import=distutils blacklist="3" ]
+require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require github [ user="AGProjects" pn="python3-application" tag="${PV}" ]
 
 SUMMARY="Basic building blocks for python applications"
 HOMEPAGE="http://ag-projects.com/"

packages/dev-python/python-eventlib/python-eventlib-0.3.0.exheres-0

@@ -1,8 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user="AGProjects" tag="release-${PV}" ]
-require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
+require github [ user="AGProjects" pn="python3-eventlib" tag="${PV}" ]
+require setup-py [ import=distutils blacklist="2" multibuild=false ]
 
 SUMMARY="Coroutine-based networking library"
 HOMEPAGE="http://sipsimpleclient.org"

packages/dev-python/python-gnutls/python-gnutls-3.1.8.exheres-0

@@ -1,7 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require pypi setup-py [ import=distutils blacklist="3" ]
+require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require github [ user="AGProjects" pn="python3-gnutls" tag="${PV}" ]
 
 SUMMARY="High level object oriented wrapper around libgnutls"
 HOMEPAGE="http://ag-projects.com/"

packages/dev-python/python-msrplib/python-msrplib-0.21.0.exheres-0

@@ -1,8 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require github [ user="AGProjects" tag="release-${PV}" ]
-require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
+require github [ user="AGProjects" pn="python3-msrplib" tag="${PV}" ]
+require setup-py [ import=distutils blacklist="2" multibuild=false ]
 
 SUMMARY="Client library for MSRP protocol and its relay extension"
 HOMEPAGE="http://sipsimpleclient.org"
@@ -14,9 +14,9 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     run:
-        dev-python/python-application[python_abis:*(-)?]
-        dev-python/python-eventlib[python_abis:*(-)?]
-        dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
+        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
+        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
+        dev-python/python-gnutls[>=3.1.8][python_abis:*(-)?]
         net-twisted/Twisted[python_abis:*(-)?]
 "
 

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

@@ -1,7 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require pypi setup-py [ import=distutils blacklist="3" ]
+require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require github [ user="AGProjects" pn="python3-otr" tag="${PV}" ]
 
 SUMMARY="Off-The-Record Messaging protocol implementation for Python"
 HOMEPAGE="https://github.com/AGProjects/python-otr"
@@ -14,9 +15,8 @@ MYOPTIONS=""
 DEPENDENCIES="
     build+run:
         dev-python/cryptography[>=1.6][python_abis:*(-)?]
-        dev-python/enum34[python_abis:*(-)?]
         dev-python/gmpy2[python_abis:*(-)?]
-        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
+        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-libs/libotr
 "

packages/dev-python/python-sipsimple/files/0001-Fix-build-with-LibreSSL-2.7.patch

@@ -1,26 +0,0 @@
-From 8e0874b1be515abc8845e3ad41c4332f992e5687 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Tue, 24 Dec 2019 22:17:28 +0100
-Subject: [PATCH] Fix build with LibreSSL 2.7
-Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/8
-
----
- deps/pjsip/third_party/zsrtp/include/openssl_compat.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
-index 5b6e183e..aebbf996 100644
---- a/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
-+++ b/deps/pjsip/third_party/zsrtp/include/openssl_compat.h
-@@ -3,7 +3,7 @@
- 
- #include <openssl/hmac.h>
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- static HMAC_CTX *HMAC_CTX_new(void)
- {
-     HMAC_CTX *ctx = (HMAC_CTX*)OPENSSL_malloc(sizeof(HMAC_CTX));
--- 
-2.24.1
-

packages/dev-python/python-sipsimple/files/python-sipsimple-3.4.2-fix-build.patch

@@ -1,45 +0,0 @@
-From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001
-From: Charles Barcza <info@blackpanther.hu>
-Date: Mon, 13 Mar 2017 14:46:34 +0100
-Subject: [PATCH 1/2] Build fix on Linux
-Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1
-
----
- setup_pjsip.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup_pjsip.py b/setup_pjsip.py
-index 4760e64..a43533d 100644
---- a/setup_pjsip.py
-+++ b/setup_pjsip.py
-@@ -157,6 +157,7 @@ def configure_pjsip(self):
-         if sys_platform == "win32":
-             cmd = ["bash", "configure"]
-         else:
-+    	    os.system("chmod +x "+ self.build_dir +"/*configure")
-             cmd = ["./configure"]
-         cmd.extend(["--disable-g7221-codec"])
-         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)
-
-From b80cf7ee9d4c32b4e068eb74492f31ccab1296b2 Mon Sep 17 00:00:00 2001
-From: Charles Barcza <info@blackpanther.hu>
-Date: Mon, 13 Mar 2017 14:55:29 +0100
-Subject: [PATCH 2/2] Build fix on Linux
-
----
- setup_pjsip.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup_pjsip.py b/setup_pjsip.py
-index a43533d..5f1b27b 100644
---- a/setup_pjsip.py
-+++ b/setup_pjsip.py
-@@ -157,7 +157,7 @@ def configure_pjsip(self):
-         if sys_platform == "win32":
-             cmd = ["bash", "configure"]
-         else:
--    	    os.system("chmod +x "+ self.build_dir +"/*configure")
-+	    os.system("chmod +x "+ self.build_dir +"/*configure")
-             cmd = ["./configure"]
-         cmd.extend(["--disable-g7221-codec"])
-         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)

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

@@ -0,0 +1,22 @@
+From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001
+From: Charles Barcza <info@blackpanther.hu>
+Date: Mon, 13 Mar 2017 14:46:34 +0100
+Subject: [PATCH 1/2] Build fix on Linux
+Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1
+
+---
+ setup_pjsip.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup_pjsip.py b/setup_pjsip.py
+index 7dd6c13ff..82e7bd1ca 100644
+--- a/setup_pjsip.py
++++ b/setup_pjsip.py
+@@ -160,6 +160,7 @@ class PJSIP_build_ext(build_ext):
+         if sys_platform == "win32":
+             cmd = ["bash", "configure"]
+         else:
++            os.system("chmod +x "+ self.build_dir +"/*configure")
+             cmd = ["./configure"]
+         cmd.extend(["--disable-g7221-codec"])
+         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)

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

@@ -1,60 +0,0 @@
-# Copyright 2016 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="AGProjects" tag="release-${PV}" ]
-require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
-
-SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
-
-LICENCES="GPL-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
-"
-
-DEPENDENCIES="
-    build:
-        dev-python/Cython[python_abis:*(-)?]
-        virtual/pkg-config
-    build+run:
-        dev-db/sqlite:3
-        dev-libs/icu:=
-        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
-        media/ffmpeg[h264]
-        media-libs/libvpx
-        media-libs/v4l-utils
-        sys-apps/util-linux
-        sys-sound/alsa-lib
-        providers:libressl? ( dev-libs/libressl:= )
-        providers:openssl? ( dev-libs/openssl )
-    run:
-        dev-python/dnspython[python_abis:*(-)?]
-        dev-python/greenlet[python_abis:*(-)?]
-        dev-python/lxml[python_abis:*(-)?]
-        dev-python/python-cjson[python_abis:*(-)?]
-        dev-python/python-dateutil[python_abis:*(-)?]
-        dev-python/python-eventlib[python_abis:*(-)?]
-        dev-python/python-gnutls[python_abis:*(-)?]
-        dev-python/python-msrplib[>=0.19.0][python_abis:*(-)?]
-        dev-python/python-otr[>=1.2.0][python_abis:*(-)?]
-        dev-python/python-xcaplib[python_abis:*(-)?]
-        dev-python/zopeinterface[python_abis:*(-)?]
-        media-libs/x264[-10bit]
-        net-twisted/Twisted[python_abis:*(-)?]
-"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PNV}-fix-build.patch
-    "${FILES}"/0001-Fix-build-with-LibreSSL-2.7.patch
-    "${FILES}"/${PN}-gcc10-fix.patch
-)
-
-src_compile() {
-    # breaks horribly with 'ld'
-    export LD=${CC}
-
-    setup-py_src_compile
-}
-

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

@@ -0,0 +1,98 @@
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require github [ user="AGProjects" pn="python3-sipsimple" tag="${PV}" ]
+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"
+MYOPTIONS="
+    ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
+"
+
+DEPENDENCIES="
+    build:
+        dev-python/Cython[python_abis:*(-)?]
+        virtual/pkg-config
+    build+run:
+        dev-db/sqlite:3
+        dev-libs/icu:=
+        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
+        media/ffmpeg[h264]
+        media-libs/libvpx
+        media-libs/v4l-utils
+        sys-apps/util-linux
+        sys-sound/alsa-lib
+        providers:libressl? ( dev-libs/libressl:= )
+        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:*(-)?]
+        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
+        dev-python/python-gnutls[>=3.1.8][python_abis:*(-)?]
+        dev-python/python-msrplib[>=0.21.0][python_abis:*(-)?]
+        dev-python/python-otr[>=2.0.1][python_abis:*(-)?]
+        dev-python/python-xcaplib[>=2.0.0][python_abis:*(-)?]
+        dev-python/zopeinterface[python_abis:*(-)?]
+        media-libs/x264[-10bit]
+        net-twisted/Twisted[python_abis:*(-)?]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PN}-fix-build.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}
+
+    setup-py_src_compile
+}
+

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

@@ -1,11 +1,11 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils blacklist="3" ]
+require setup-py [ import=distutils blacklist="2" multibuild=false ]
+require github [ user="AGProjects" pn="python3-xcaplib" tag="${PV}" ]
 
 SUMMARY="Python library for managing XML documents on XCAP server"
 HOMEPAGE="http://sipsimpleclient.org"
-DOWNLOADS="http://download.ag-projects.com/XCAP/${PNV}.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
@@ -14,7 +14,8 @@ MYOPTIONS=""
 
 DEPENDENCIES="
     run:
+        dev-python/gevent[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
-        dev-python/python-application[python_abis:*(-)?]
+        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
 "
 

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.1.0.exheres-0

@@ -23,14 +23,15 @@ 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
     emake
     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 bash > gh.bash-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
-    dozshcompletion gh.zsh-completion
+    dobashcompletion gh.bash-completion gh
+    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/voip/blink/blink-5.1.1.exheres-0

@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require desktop-utils gtk-icon-cache
-require setup-py [ import=distutils blacklist="3" multibuild=false ]
-require github [ user="AGProjects" pn="blink-qt" tag="release-${PV}" ]
+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"
@@ -22,17 +22,16 @@ DEPENDENCIES="
         dev-python/PyQt5[>=5.0][webkit][python_abis:*(-)?]
         dev-python/google-api-python-client[python_abis:*(-)?]
         dev-python/lxml[python_abis:*(-)?]
-        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
-        dev-python/python-cjson[python_abis:*(-)?]
+        dev-python/python-application[>=3.0.3][python_abis:*(-)?]
         dev-python/python-dateutil[python_abis:*(-)?]
-        dev-python/python-eventlib[python_abis:*(-)?]
-        dev-python/python-sipsimple[>=3.0.0][python_abis:*(-)?]
+        dev-python/python-eventlib[>=0.3.0][python_abis:*(-)?]
+        dev-python/python-sipsimple[>=5.2.2][python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         net-twisted/Twisted[python_abis:*(-)?]
 "
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}/${PNV}-data-path.patch"
+    "${FILES}/${PN}-data-path.patch"
 )
 
 src_install() {

packages/voip/blink/files/blink-data-path.patch

@@ -3,14 +3,17 @@ Date: Tue Sep  8 10:10:18 UTC 2015
 Subject: Fix data path fallback
 Upstream: no, correct fix pending since 'sys.prefix' is broken in exherbo
 
---- blink-1.4.1/blink/resources.py
-+++ blink-1.4.1/blink/resources.py
-@@ -71,7 +71,7 @@
-             if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
-                 cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding())
+
+diff --git a/blink/resources.py b/blink/resources.py
+index e981ed8..f1f4f5c 100644
+--- a/blink/resources.py
++++ b/blink/resources.py
+@@ -81,7 +81,7 @@ class Resources(object):
+             elif os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
+                 cls._cached_directory = os.path.join(application_directory, 'resources')
              else:
--                cls._cached_directory = os.path.join(application_directory, 'share', 'blink').decode(sys.getfilesystemencoding())
-+                cls._cached_directory = os.path.join('/usr', 'share', 'blink').decode(sys.getfilesystemencoding())
+-                cls._cached_directory = os.path.join(application_directory, 'share', 'blink')
++                cls._cached_directory = os.path.join('/usr', 'share', 'blink')
          return DirectoryContextManager(cls._cached_directory)
  
      @classmethod

packages/x11-apps/picom/picom-8.2.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
@@ -51,7 +51,7 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
 
 MESON_SRC_CONFIGURE_PARAMS=(
     "-Dunittest=true"
-    "-Dbuild_docs=true"  # with_docs in "next" branch
+    "-Dwith_docs=true"
 )
 MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
     "dbus"