summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/biboumi/metadata.xml2
-rw-r--r--net-im/bitlbee/bitlbee-3.6-r2.ebuild (renamed from net-im/bitlbee/bitlbee-3.6-r1.ebuild)13
-rw-r--r--net-im/bitlbee/bitlbee-3.6-r3.ebuild156
-rw-r--r--net-im/bitlbee/bitlbee-9999.ebuild18
-rw-r--r--net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch31
-rw-r--r--net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch99
-rw-r--r--net-im/bitlbee/metadata.xml10
-rw-r--r--net-im/cawbird/cawbird-1.5-r2.ebuild9
-rw-r--r--net-im/cawbird/metadata.xml5
-rw-r--r--net-im/choqok/choqok-1.7.0-r1.ebuild1
-rw-r--r--net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch43
-rw-r--r--net-im/discord-bin/Manifest2
-rw-r--r--net-im/discord-bin/discord-bin-0.0.20-r1.ebuild (renamed from net-im/discord-bin/discord-bin-0.0.18.ebuild)9
-rw-r--r--net-im/ejabberd/Manifest2
-rw-r--r--net-im/ejabberd/ejabberd-21.12-r1.ebuild235
-rw-r--r--net-im/ejabberd/ejabberd-22.05-r2.ebuild (renamed from net-im/ejabberd/ejabberd-22.05-r1.ebuild)15
-rw-r--r--net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch38
-rw-r--r--net-im/ejabberd/files/ejabberd.initd54
-rw-r--r--net-im/ejabberd/files/ejabberd.logrotate13
-rw-r--r--net-im/element-desktop-bin/Manifest2
-rw-r--r--net-im/element-desktop-bin/element-desktop-bin-1.11.8-r1.ebuild (renamed from net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild)13
-rw-r--r--net-im/empathy/empathy-3.12.14-r2.ebuild (renamed from net-im/empathy/empathy-3.12.14.ebuild)21
-rw-r--r--net-im/gajim/Manifest2
-rw-r--r--net-im/gajim/gajim-1.3.3-r2.ebuild2
-rw-r--r--net-im/gajim/gajim-1.3.3_p2-r1.ebuild2
-rw-r--r--net-im/gajim/gajim-1.4.0-r1.ebuild2
-rw-r--r--net-im/gajim/gajim-1.4.0.ebuild2
-rw-r--r--net-im/gajim/gajim-1.4.1.ebuild2
-rw-r--r--net-im/gajim/gajim-1.4.2.ebuild2
-rw-r--r--net-im/gajim/gajim-1.4.6.ebuild97
-rw-r--r--net-im/gajim/gajim-1.4.7.ebuild97
-rw-r--r--net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild105
-rw-r--r--net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1-r1.ebuild (renamed from net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild)7
-rw-r--r--net-im/mcabber/metadata.xml2
-rw-r--r--net-im/neochat/Manifest2
-rw-r--r--net-im/neochat/neochat-22.06.ebuild (renamed from net-im/neochat/neochat-1.2.0.ebuild)20
-rw-r--r--net-im/prosody/Manifest1
-rw-r--r--net-im/prosody/prosody-0.12.0.ebuild164
-rw-r--r--net-im/prosody/prosody-0.12.1.ebuild2
-rw-r--r--net-im/psi/psi-1.5-r1.ebuild (renamed from net-im/psi/psi-1.5.ebuild)6
-rw-r--r--net-im/psi/psi-9999.ebuild4
-rw-r--r--net-im/qtox/Manifest2
-rw-r--r--net-im/qtox/qtox-1.17.3.ebuild87
-rw-r--r--net-im/qtox/qtox-1.17.4.ebuild91
-rw-r--r--net-im/qtox/qtox-1.17.6-r1.ebuild (renamed from net-im/qtox/qtox-1.17.6.ebuild)4
-rw-r--r--net-im/qtox/qtox-9999.ebuild2
-rw-r--r--net-im/rocketchat-desktop-bin/Manifest2
-rw-r--r--net-im/rocketchat-desktop-bin/metadata.xml5
-rw-r--r--net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.9-r1.ebuild (renamed from net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild)9
-rw-r--r--net-im/signal-desktop-bin/Manifest2
-rw-r--r--net-im/signal-desktop-bin/signal-desktop-bin-5.61.1-r1.ebuild (renamed from net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild)9
-rw-r--r--net-im/skypeforlinux/Manifest5
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.83.0.411-r1.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild)5
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.85.0.409-r1.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild)5
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild100
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.86.0.407-r1.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild)5
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.87.0.403-r1.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild)5
-rw-r--r--net-im/slack/Manifest2
-rw-r--r--net-im/slack/slack-4.23.0-r1.ebuild (renamed from net-im/slack/slack-4.23.0.ebuild)9
-rw-r--r--net-im/slack/slack-4.27.156-r1.ebuild (renamed from net-im/slack/slack-4.22.0.ebuild)31
-rw-r--r--net-im/synapse/Manifest42
-rw-r--r--net-im/synapse/files/synapse.initd10
-rw-r--r--net-im/synapse/files/synapse.service22
-rw-r--r--net-im/synapse/metadata.xml15
-rw-r--r--net-im/synapse/synapse-1.65.0.ebuild104
-rw-r--r--net-im/synapse/synapse-1.66.0.ebuild126
-rw-r--r--net-im/synapse/synapse-1.67.0.ebuild135
-rw-r--r--net-im/synapse/synapse-1.68.0.ebuild185
-rw-r--r--net-im/teams/teams-1.4.00.13653-r3.ebuild (renamed from net-im/teams/teams-1.4.00.13653-r2.ebuild)9
-rw-r--r--net-im/teams/teams-1.4.00.26453-r2.ebuild (renamed from net-im/teams/teams-1.4.00.26453-r1.ebuild)9
-rw-r--r--net-im/teams/teams-1.4.00.7556-r2.ebuild (renamed from net-im/teams/teams-1.4.00.7556-r1.ebuild)8
-rw-r--r--net-im/teams/teams-1.5.00.10453-r1.ebuild (renamed from net-im/teams/teams-1.5.00.10453.ebuild)9
-rw-r--r--net-im/telegram-desktop-bin/Manifest10
-rw-r--r--net-im/telegram-desktop-bin/metadata.xml4
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-4.1.0.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild)0
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.0.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild)3
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild52
-rw-r--r--net-im/telegram-desktop/Manifest2
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch2
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch33
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch71
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch2
-rw-r--r--net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch43
-rw-r--r--net-im/telegram-desktop/metadata.xml8
-rw-r--r--net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild2
-rw-r--r--net-im/telegram-desktop/telegram-desktop-4.2.4.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild)114
-rw-r--r--net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild4
-rw-r--r--net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild7
-rw-r--r--net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2-r1.ebuild (renamed from net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild)6
-rw-r--r--net-im/zoom/Manifest5
-rw-r--r--net-im/zoom/zoom-5.11.1.3595.ebuild185
-rw-r--r--net-im/zoom/zoom-5.11.10.4400-r1.ebuild (renamed from net-im/zoom/zoom-5.10.7.3311.ebuild)18
-rw-r--r--net-im/zoom/zoom-5.11.9.4300-r5.ebuild (renamed from net-im/zoom/zoom-5.11.0.3540.ebuild)18
93 files changed, 1661 insertions, 1294 deletions
diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml
index 294112cad842..c848a5fb996b 100644
--- a/net-im/biboumi/metadata.xml
+++ b/net-im/biboumi/metadata.xml
@@ -16,6 +16,6 @@
</upstream>
<use>
<flag name="udns">Asynchronously resolve domain names using
- net-libs/udns</flag>
+ <pkg>net-libs/udns</pkg></flag>
</use>
</pkgmetadata>
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
index 592437d7f4bb..26f201ce42fd 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit python-any-r1 systemd toolchain-funcs
@@ -18,18 +18,17 @@ fi
DESCRIPTION="irc to IM gateway that support multiple IM protocols"
HOMEPAGE="https://www.bitlbee.org/"
-LICENSE="GPL-2"
+LICENSE="GPL-2 BSD-2"
SLOT="0"
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE_PROTOCOLS="purple twitter +xmpp"
IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
${IUSE_PROTOCOLS}"
RESTRICT="!test? ( test )"
REQUIRED_USE="
- || ( purple xmpp msn oscar )
+ || ( purple xmpp )
purple? ( plugins )
- test? ( plugins )
- xmpp? ( !nss )
+ test? ( xmpp )
"
COMMON_DEPEND="
@@ -65,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.5-libcheck.patch
"${FILESDIR}"/${PN}-3.5-libevent.patch
"${FILESDIR}"/${P}-disabled-plugins-use.patch
+ "${FILESDIR}"/${P}-strict-aliasing.patch
)
src_configure() {
@@ -114,6 +114,7 @@ src_configure() {
--prefix=/usr \
--datadir=/usr/share/bitlbee \
--etcdir=/etc/bitlbee \
+ --libdir=/usr/$(get_libdir) \
--plugindir=/usr/$(get_libdir)/bitlbee \
--pcdir=/usr/$(get_libdir)/pkgconfig \
--systemdsystemunitdir=$(systemd_get_systemunitdir) \
diff --git a/net-im/bitlbee/bitlbee-3.6-r3.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
new file mode 100644
index 000000000000..58a5879455b9
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1 systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
+ inherit git-r3
+else
+ SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
+ KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
+fi
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="https://www.bitlbee.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE_PROTOCOLS="purple twitter +xmpp"
+IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
+ ${IUSE_PROTOCOLS}"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ || ( purple xmpp )
+ purple? ( plugins )
+ test? ( xmpp )
+"
+
+COMMON_DEPEND="
+ acct-group/bitlbee
+ acct-user/bitlbee
+ dev-libs/glib:2
+ dev-libs/json-parser:=
+ purple? ( net-im/pidgin )
+ libevent? ( dev-libs/libevent:= )
+ otr? ( >=net-libs/libotr-4 )
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ nss? ( dev-libs/nss )
+ !nss? (
+ dev-libs/openssl:0=
+ )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-bitlbee )
+ test? ( dev-libs/check )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ xinetd? ( sys-apps/xinetd )
+"
+
+BDEPEND="${PYTHON_DEPS}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.5-systemd-user.patch"
+ "${FILESDIR}/${PN}-3.5-libcheck.patch"
+ "${FILESDIR}/${PN}-3.5-libevent.patch"
+ "${FILESDIR}/${P}-disabled-plugins-use.patch"
+ "${FILESDIR}/${P}-system-json-parser.patch"
+)
+
+src_configure() {
+ local myconf
+
+ # setup plugins, protocol, ipv6 and debug
+ myconf+=( --jabber=$(usex xmpp 1 0) )
+ for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
+ myconf+=( --${flag}=$(usex ${flag} 1 0) )
+ done
+
+ # set otr
+ if use otr && use plugins ; then
+ myconf+=( --otr=plugin )
+ else
+ if use otr ; then
+ ewarn "OTR support has been disabled automatically because it"
+ ewarn "requires the plugins USE flag."
+ fi
+ myconf+=( --otr=0 )
+ fi
+
+ # setup ssl use flags
+ if use gnutls ; then
+ myconf+=( --ssl=gnutls )
+ einfo "Using gnutls for SSL support"
+ else
+ ewarn "Only gnutls is officially supported by upstream."
+ if use nss ; then
+ myconf+=( --ssl=nss )
+ einfo "Using nss for SSL support"
+ else
+ myconf+=( --ssl=openssl )
+ einfo "Using openssl for SSL support"
+ fi
+ fi
+
+ # set event handler
+ if use libevent ; then
+ myconf+=( --events=libevent )
+ else
+ myconf+=( --events=glib )
+ fi
+
+ # not autotools-based
+ ./configure \
+ --prefix=/usr \
+ --datadir=/usr/share/bitlbee \
+ --etcdir=/etc/bitlbee \
+ --libdir=/usr/$(get_libdir) \
+ --pcdir=/usr/$(get_libdir)/pkgconfig \
+ --plugindir=/usr/$(get_libdir)/bitlbee \
+ --externaljsonparser=1 \
+ --systemdsystemunitdir=$(systemd_get_systemunitdir) \
+ --doc=1 \
+ --strip=0 \
+ --verbose=1 \
+ "${myconf[@]}" || die
+
+ sed -i \
+ -e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+ Makefile.settings || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
+
+ keepdir /var/lib/bitlbee
+ fperms 700 /var/lib/bitlbee
+ fowners bitlbee:bitlbee /var/lib/bitlbee
+
+ dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins doc/bitlbee.xinetd bitlbee
+ fi
+
+ newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee
+ newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee
+
+ exeinto /usr/share/bitlbee
+ doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index 075402136f9c..079feaea767b 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit python-any-r1 systemd toolchain-funcs
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="irc to IM gateway that support multiple IM protocols"
@@ -20,22 +20,22 @@ HOMEPAGE="https://www.bitlbee.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE_PROTOCOLS="purple twitter +xmpp"
IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd
${IUSE_PROTOCOLS}"
RESTRICT="!test? ( test )"
REQUIRED_USE="
- || ( purple xmpp msn oscar )
+ || ( purple xmpp )
purple? ( plugins )
- test? ( plugins )
- xmpp? ( !nss )
+ test? ( xmpp )
"
COMMON_DEPEND="
acct-group/bitlbee
acct-user/bitlbee
dev-libs/glib:2
+ dev-libs/json-parser:=
purple? ( net-im/pidgin )
libevent? ( dev-libs/libevent:= )
otr? ( >=net-libs/libotr-4 )
@@ -61,7 +61,7 @@ BDEPEND="${PYTHON_DEPS}
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.5-systemd-user.patch
+ "${FILESDIR}/${PN}-3.5-systemd-user.patch"
)
src_configure() {
@@ -111,8 +111,10 @@ src_configure() {
--prefix=/usr \
--datadir=/usr/share/bitlbee \
--etcdir=/etc/bitlbee \
- --plugindir=/usr/$(get_libdir)/bitlbee \
+ --libdir=/usr/$(get_libdir) \
--pcdir=/usr/$(get_libdir)/pkgconfig \
+ --plugindir=/usr/$(get_libdir)/bitlbee \
+ --external_json_parser=1 \
--systemdsystemunitdir=$(systemd_get_systemunitdir) \
--doc=1 \
--strip=0 \
diff --git a/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch
new file mode 100644
index 000000000000..30ecff9747ee
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-strict-aliasing.patch
@@ -0,0 +1,31 @@
+Based on upstream [1] commits:
+- 161dff8321df ("Fix error type-punned pointer warning")
+- d7b67db02aaa ("Fix error type-punned pointer warning")
+
+[1] https://github.com/json-parser/json-parser
+
+Upstream-PR: https://github.com/bitlbee/bitlbee/pull/162
+
+diff --git a/lib/json.c b/lib/json.c
+index 24288f94..2150cbaf 100644
+--- a/lib/json.c
++++ b/lib/json.c
+@@ -139,7 +139,7 @@ static int new_value
+ return 0;
+ }
+
+- value->_reserved.object_mem = (*(char **) &value->u.object.values) + values_size;
++ value->_reserved.object_mem = (void *) (((char *) value->u.object.values) + values_size);
+
+ value->u.object.length = 0;
+ break;
+@@ -406,7 +406,8 @@ json_value * json_parse_ex(json_settings * settings,
+ case json_object:
+
+ if (state.first_pass) {
+- (*(json_char **) &top->u.object.values) += string_length + 1;
++ json_char **chars = (json_char **) &top->u.object.values;
++ chars[0] += string_length + 1;
+ } else {
+ top->u.object.values [top->u.object.length].name
+ = (json_char *) top->_reserved.object_mem;
diff --git a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
new file mode 100644
index 000000000000..0a9c197d763d
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch
@@ -0,0 +1,99 @@
+This is adapted patch from upstream PR 151. Original PR defines
+--external-json-parser which breaks configuration, see [1]. It was changed to
+--externaljsonparser and $external_json_parser to $externaljsonparser.
+Additionally, LDFLAGS_CHECK variable was introduced in order to make
+tests working, see [2] and #865667.
+
+[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905
+[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239
+
+Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151
+
+diff --git a/configure b/configure
+index fd8d363a..39495515 100755
+--- a/configure
++++ b/configure
+@@ -47,6 +47,7 @@ plugins=1
+ otr=0
+
+ events=glib
++externaljsonparser=auto
+ ssl=auto
+
+ pam=0
+@@ -148,6 +149,7 @@ Option Description Default
+ --events=... Event handler (glib, libevent) $events
+ --ssl=... SSL library to use (gnutls, nss, openssl, auto)
+ $ssl
++--externaljsonparser=0/1/auto Use External JSON parser $externaljsonparser
+
+
+ --target=... Cross compilation target same as host
+@@ -398,6 +400,21 @@ else
+ fi
+ echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
+
++if [ "$externaljsonparser" = "auto" ]; then
++ if pkg-config --exists json-parser; then
++ externaljsonparser=1
++ else
++ externaljsonparser=0
++ fi
++fi
++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings
++if [ "$externaljsonparser" = "1" ]; then
++ echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings
++ echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings
++ echo "LDFLAGS_CHECK+=$(pkg-config --libs json-parser)" >> Makefile.settings
++fi
++
++
+ detect_gnutls()
+ {
+ if $PKG_CONFIG --exists gnutls; then
+@@ -979,6 +996,12 @@ else
+ echo ' systemd disabled.'
+ fi
+
++if [ "$externaljsonparser" = "1" ]; then
++ echo ' Using system JSON parser.'
++else
++ echo ' Using bundled JSON parser.'
++fi
++
+ echo ' Using event handler: '$events
+ echo ' Using SSL library: '$ssl
+ #echo ' Building with these storage backends: '$STORAGES
+diff --git a/lib/Makefile b/lib/Makefile
+index fc46aedc..ad95d9cb 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/
+ endif
+
+ # [SH] Program variables
+-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o
++
++ifneq ($(EXTERNAL_JSON_PARSER),1)
++objects += json.o
++endif
+
+ LFLAGS += -r
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 76122a2f..2235bf1d 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -20,7 +20,7 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.
+
+ check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
+ @echo '*' Linking $@
+- $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)
++ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LDFLAGS_CHECK) $(EFLAGS)
+
+ %.o: $(_SRCDIR_)%.c
+ @echo '*' Compiling $<
+--
+2.35.1
+
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index 4d61638429f9..0541d2f03527 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -11,9 +11,7 @@
</maintainer>
<use>
<flag name="libevent">Use libevent for event handling</flag>
- <flag name="msn">Enable MSN Messenger IM protocol support.</flag>
- <flag name="nss">Use NSS for SSL support in MSN and Jabber</flag>
- <flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
+ <flag name="nss">Prefer <pkg>dev-libs/nss</pkg> as SSL/TLS provider</flag>
<flag name="otr">Enable support for encrypted conversations</flag>
<flag name="plugins">Enable support for plugins</flag>
<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag>
@@ -21,7 +19,9 @@
</use>
<longdescription>
Bitlbee as an IRC to IM gateway. It provides an irc server that allows
- you to log on and then connect to various instant messaging protocols
- (AIM, MSN, Yahoo, Jabber, etc).
+ you to log on and then connect to various instant messaging protocols.
</longdescription>
+ <upstream>
+ <remote-id type="github">bitlbee/bitlbee</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-im/cawbird/cawbird-1.5-r2.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild
index aee227728983..356538a344b1 100644
--- a/net-im/cawbird/cawbird-1.5-r2.ebuild
+++ b/net-im/cawbird/cawbird-1.5-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
LICENSE="CC-BY-3.0 GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="gstreamer spell"
RDEPEND="
@@ -43,6 +43,13 @@ BDEPEND="
src_prepare() {
default
+
+ # Remove tests that require the network.
+ for test in avatardownload filters inlinemediadownloader \
+ texttransform tweetparsing; do
+ sed -i "/${test}/d" tests/meson.build || die
+ done
+
vala_setup
}
diff --git a/net-im/cawbird/metadata.xml b/net-im/cawbird/metadata.xml
index d1905ebb02b4..35907e6cd778 100644
--- a/net-im/cawbird/metadata.xml
+++ b/net-im/cawbird/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>matthew@gentoo.org</email>
- <name>Matthew Smith</name>
-</maintainer>
+<!-- maintainer-needed -->
<upstream>
<remote-id type="github">IBBoard/cawbird</remote-id>
</upstream>
diff --git a/net-im/choqok/choqok-1.7.0-r1.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild
index 347ae3c26c3d..665a4a472330 100644
--- a/net-im/choqok/choqok-1.7.0-r1.ebuild
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${WORKDIR}/${P}-choqokplugin.patch"
"${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938
"${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297
+ "${FILESDIR}/${P}-fix-KCModule-warning.patch" # bug 871546, git master
)
src_configure() {
diff --git a/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch
new file mode 100644
index 000000000000..26721514ca04
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch
@@ -0,0 +1,43 @@
+From 9c488d8f776b5e7462e8e57dc2b15db5fe28815a Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <scarpino@kde.org>
+Date: Sat, 8 Feb 2020 16:06:18 +0100
+Subject: [PATCH] Fix warning about KCModule::changed
+
+---
+ choqok/config/behavior/behaviorconfig.cpp | 4 ++--
+ choqok/config/plugins/choqokpluginconfig.cpp | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/choqok/config/behavior/behaviorconfig.cpp b/choqok/config/behavior/behaviorconfig.cpp
+index a25b0196..fb1d16b3 100644
+--- a/choqok/config/behavior/behaviorconfig.cpp
++++ b/choqok/config/behavior/behaviorconfig.cpp
+@@ -95,9 +95,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList &args)
+ d->mBehaviorTabCtl->addTab(d->proxyModule, proxyInfo.moduleName());
+
+ connect(d->mPrfsShorten, (void (BehaviorConfig_Shorten::*)(bool))&BehaviorConfig_Shorten::changed,
+- this, (void (KCModule::*)())&KCModule::changed);
++ this, &BehaviorConfig::markAsChanged);
+ connect(d->proxyModule, (void (KCModuleProxy::*)(KCModuleProxy*))&KCModuleProxy::changed,
+- this, (void (KCModule::*)())&KCModule::changed);
++ this, &BehaviorConfig::markAsChanged);
+
+ load();
+
+diff --git a/choqok/config/plugins/choqokpluginconfig.cpp b/choqok/config/plugins/choqokpluginconfig.cpp
+index 1a5f4fc2..4f36d608 100644
+--- a/choqok/config/plugins/choqokpluginconfig.cpp
++++ b/choqok/config/plugins/choqokpluginconfig.cpp
+@@ -46,8 +46,7 @@ ChoqokPluginConfig::ChoqokPluginConfig(QWidget *parent, const QVariantList &args
+ mainLayout->setMargin(0);
+ mainLayout->addWidget(m_pluginSelector);
+
+- connect(m_pluginSelector, &KPluginSelector::changed, this,
+- (void (KCModule::*)())&KCModule::changed);
++ connect(m_pluginSelector, &KPluginSelector::changed, this, &ChoqokPluginConfig::markAsChanged);
+ connect(m_pluginSelector, &KPluginSelector::configCommitted,
+ this, &ChoqokPluginConfig::reparseConfiguration);
+
+--
+GitLab
+
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 7db891be33a3..a9024b0bb762 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1 +1 @@
-DIST discord-0.0.18.tar.gz 77398558 BLAKE2B e25ad448dd9f89e460a4380cde850506298a443be2b70fb243b92ab6a139815fea36260b879ece044c5c607561fde6adf36a188c186c48c34052ec105b23d732 SHA512 a9c5de48186542fa4385c5cf4ffb54484dee008cde5230a9f8a0e71a84e1e7ce680e170aca2018ad2217618ed2d4a4882836a408a5d0a5cab054c0954c1b55be
+DIST discord-0.0.20.tar.gz 77399859 BLAKE2B 74f73bcbfdfb1d0ada03510e471bd1e0838ad3fb4a514d2357d1fb38a4ccad0fe09000c44300c9af692ee757284e174bf9c32125a00d36c217caba12d9d045ac SHA512 720bc8a8b61cbbe3566c34065f9831571da121d210e3f2876c34cb964d60bab33f8dc16f7ca758e918cd8f35a69699c0b9063782e6c95087c0baa41a6d0e7cf5
diff --git a/net-im/discord-bin/discord-bin-0.0.18.ebuild b/net-im/discord-bin/discord-bin-0.0.20-r1.ebuild
index e40d2077e427..58ed3ccea6ef 100644
--- a/net-im/discord-bin/discord-bin-0.0.18.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.20-r1.ebuild
@@ -20,13 +20,14 @@ SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
LICENSE="all-rights-reserved"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
# libXScrnSaver is used through dlopen (bug #825370)
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e8815deaf151..df8cc1d38ab8 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,2 @@
-DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
-DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
diff --git a/net-im/ejabberd/ejabberd-21.12-r1.ebuild b/net-im/ejabberd/ejabberd-21.12-r1.ebuild
deleted file mode 100644
index 51abb0f8f050..000000000000
--- a/net-im/ejabberd/ejabberd-21.12-r1.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam rebar systemd verify-sig
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
- -> ${P}.tar.gz
- verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
- roster-gw selinux sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO: >=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.29
- >=dev-erlang/eimp-1.0.21
- >=dev-erlang/fast_tls-1.1.13
- >=dev-erlang/fast_xml-1.1.48
- >=dev-erlang/fast_yaml-1.0.32
- >=dev-erlang/yconf-1.0.12
- >=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.11.2
- >=dev-erlang/lager-3.9.1
- >=dev-erlang/p1_oauth2-0.6.10
- >=dev-erlang/p1_utils-1.0.23
- >=dev-erlang/stringprep-1.0.27
- >=dev-erlang/xmpp-1.5.6
- >=dev-erlang/pkix-1.0.8
- >=dev-erlang/mqtree-1.0.14
- >=dev-erlang/idna-6.0.0-r1
- >=dev-erlang/p1_acme-1.0.16
- >=dev-erlang/base64url-1.0.1
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.12 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.16 )
- redis? ( >=dev-erlang/eredis-1.2.0 )
- sip? ( >=dev-erlang/esip-1.0.45 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
- stun? ( >=dev-erlang/stun-1.0.47 )
- zlib? ( >=dev-erlang/ezlib-1.0.10 )"
-RDEPEND="${DEPEND}
- acct-user/ejabberd
- captcha? ( media-gfx/imagemagick[truetype,png] )
- selinux? ( sec-policy/selinux-jabber )
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=(
- "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
-)
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
- -i "${S}/Makefile.in" \
- || die 'failed to set ejabberd path in Makefile.in'
- sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
- -i "${S}/ejabberdctl.template" \
- || die 'failed to set ejabberd path in ejabberdctl.template'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
- local epam_wrapper_src="${1}"
- local epam_wrapper_dst="${S}/epam-wrapper"
-
- [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
- sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
- "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
- || die 'failed to install epam-wrapper'
-}
-
-# Get path to ejabberd lib directory.
-#
-# This is the path ./configure script Base for this path is path set in
-# ./configure script which is /usr/lib by default. If libdir is explicitely set
-# to something else than this should be adjusted here as well.
-get_ejabberd_path() {
- echo "/usr/$(get_libdir)/${P}"
-}
-
-src_prepare() {
- default
-
- rebar_remove_deps
- correct_ejabberd_paths
- customize_epam_wrapper "${FILESDIR}/epam-wrapper"
-
- rebar_fix_include_path fast_xml
- rebar_fix_include_path p1_utils
- rebar_fix_include_path xmpp
-
- # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
- # rather than its parent which is default. That way ejabberd directory
- # takes precedence is module lookup.
- local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
- sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
- -i "${S}/ejabberdctl.template" \
- || die 'failed to set ERL_LIBS in ejabberdctl.template'
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --localstatedir="${EPREFIX}/var" \
- --enable-user=${PN} \
- $(use_enable debug) \
- $(use_enable full-xml) \
- $(use_enable mssql) \
- $(use_enable mysql) \
- $(use_enable odbc) \
- $(use_enable pam) \
- $(use_enable postgres pgsql) \
- $(use_enable redis) \
- $(use_enable roster-gw roster-gateway-workaround) \
- $(use_enable sqlite) \
- $(use_enable sip) \
- $(use_enable stun) \
- $(use_enable zlib)
-
- # more options to support
- # --enable-elixir requires https://github.com/elixir-lang/elixir
-}
-
-src_compile() {
- emake REBAR='rebar -v' src
-}
-
-src_install() {
- default
-
- if use pam; then
- local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
- pamd_mimic_system xmpp auth account
- into "$(get_ejabberd_path)/priv"
- newbin epam-wrapper epam
- fi
-
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${PN}.service"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
- keepdir /var/{lib,log}/ejabberd
-}
-
-pkg_preinst() {
- if use pam; then
- einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \
- "authentication"
- # See
- # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
- # epam binary is installed by dev-erlang/epam package, therefore SUID
- # is set by that package. Instead of jabber group it uses epam group,
- # therefore we need to add jabber user to epam group.
- usermod -a -G epam ejabberd || die
- fi
-}
-
-pkg_postinst() {
- local migrate_to_ejabberd_user=false
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- echo
- elog "For configuration instructions, please see"
- elog " https://docs.ejabberd.im/"
- echo
- else
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 21.04-r1; then
- migrate_to_ejabberd_user=true
- break
- fi
- done
- fi
-
- # Sarting with >=21.04-r1, the ejabberd configuration is now in
- # /etc/ejabberd and no longer in /etc/jabber. See if we need to
- # migrate the configuration. Furthermore, ejabberd no longer runs
- # under the, shared via net-im/jabber-base, 'jabber' use, but under
- # its own user. This increase isolation and hence robustness and
- # security.
- if $migrate_to_ejabberd_user; then
- ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
- ewarn "(just as upstream) and *not* /etc/jabber."
- ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd."
- ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
- ewarn "Please check your configuration, and finish the migration by stopping ejabberd"
- ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd."
-
- local -A dirs_to_migrate=(
- [/etc/jabber]=/etc/ejabberd
- [/var/spool/jabber]=/var/lib/ejabberd
- )
-
- for src_dir in "${!dirs_to_migrate[@]}"; do
- local eroot_src_dir="${EROOT}${src_dir}"
- local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
-
- cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
-
- if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
- rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
- fi
- if ! use prefix; then
- chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
- fi
- done
- fi
-}
diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild b/net-im/ejabberd/ejabberd-22.05-r2.ebuild
index 39a5d3e79270..ebb3a879d1e2 100644
--- a/net-im/ejabberd/ejabberd-22.05-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-22.05-r2.ebuild
@@ -60,7 +60,7 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- >=acct-user/ejabberd-1
+ >=acct-user/ejabberd-2[pam?]
captcha? ( media-gfx/imagemagick[truetype,png] )
selinux? ( sec-policy/selinux-jabber )
"
@@ -174,19 +174,6 @@ src_install() {
keepdir /var/{lib,log}/ejabberd
}
-pkg_preinst() {
- if use pam; then
- einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \
- "authentication"
- # See
- # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
- # epam binary is installed by dev-erlang/epam package, therefore SUID
- # is set by that package. Instead of jabber group it uses epam group,
- # therefore we need to add jabber user to epam group.
- usermod -a -G epam ejabberd || die
- fi
-}
-
pkg_postinst() {
local migrate_to_ejabberd_user=false
diff --git a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
deleted file mode 100644
index 0fb1f5ce602e..000000000000
--- a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
-
-Set SHELL since the generic jabber user used on Gentoo for jabber
-servers doesn't have a valid shell set by default and fix EXEC_CMD
-otherwise it fails with This account is currently not available again
-due to jabber not having a valid shell.
-
-Also, workaround the assumption that jabber's /root is a directory when
-instead it defaults to /dev/null on Gentoo.
----
-
-diff --git a/ejabberdctl.template b/ejabberdctl.template
-index 571b90b..71336c0 100755
---- a/ejabberdctl.template
-+++ b/ejabberdctl.template
-@@ -82,6 +82,7 @@ fi
- ERL_LIBS={{libdir}}
- ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
- ERL_INETRC="$ETC_DIR"/inetrc
-+HOME=$SPOOL_DIR
-
- # define ejabberd parameters
- EJABBERD_OPTS="$EJABBERD_OPTS\
-@@ -105,12 +106,13 @@ export ERL_MAX_ETS_TABLES
- export CONTRIB_MODULES_PATH
- export CONTRIB_MODULES_CONF_DIR
- export ERL_LIBS
-+export HOME
-
- # run command either directly or via su $INSTALLUSER
- exec_cmd()
- {
- case $EXEC_CMD in
-- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
-+ as_install_user) su -p -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
- as_current_user) "$@" ;;
- esac
- }
diff --git a/net-im/ejabberd/files/ejabberd.initd b/net-im/ejabberd/files/ejabberd.initd
deleted file mode 100644
index 94ac2ae8e465..000000000000
--- a/net-im/ejabberd/files/ejabberd.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
- use dns
- need epmd net
- provide jabber-server
-}
-
-start() {
- if ejabberdctl status >/dev/null 2>&1; then
- ewarn "ejabberd is already started (manually?)."
- return 0
- fi
- ebegin "Starting ejabberd"
- /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
- eend $?
-}
-
-reload() {
- ebegin "Reloading ejabberd configuration"
- /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
- eend $?
-}
-
-stop() {
- ejabberdctl status >/dev/null 2>&1
- if test $? = 3; then
- ewarn "ejabberd is already stopped (manually?)."
- return 0
- fi
- ebegin "Stopping ejabberd"
- if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
- cnt=0
- sleep 1
- while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
- echo -n .
- cnt=`expr $cnt + 1`
- if [ $cnt -ge 60 ] ; then
- eend 1
- break
- fi
- sleep 1
- done
- eend 0
- else
- eend 1
- einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
- fi
- eend 0
-}
diff --git a/net-im/ejabberd/files/ejabberd.logrotate b/net-im/ejabberd/files/ejabberd.logrotate
deleted file mode 100644
index 4f324729dba8..000000000000
--- a/net-im/ejabberd/files/ejabberd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/jabber/*.log {
- su jabber jabber
- weekly
- rotate 4
- missingok
- nocreate
- sharedscripts
- notifempty
- compress
- postrotate
- /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
- endscript
-}
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index c236958eda29..e97b0b85355c 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.10.15_amd64.deb 77384226 BLAKE2B 3681293b6838c5ee20024784d9348d8d213316b260e883bd3de2655a675702d41179498711203dd04f0c0bbabc1e83422d4294cc511f8ae59443f8fbdf1043e6 SHA512 57a81d8d89c850a0103414c1605cec04cbdebab7a7d9ad58363f56f3242a46acce2ce88ab324cba3c76273423e6247e49acb2e4d81e656e32a1b059f66bac6e6
+DIST element-desktop_1.11.8_amd64.deb 81824720 BLAKE2B a359d51bf946bbca2ee76f961533d02bcfbadab90c50d849f50897bb495cfe8199bf55964e9dcae6913d854800ec161638c8255203e4e0e5935a6e319e492b4b SHA512 6a5d7386e84a1c4d35baa3e1cc711f4fbecc9815b2f8afac5bb347054d16fb396dc1d480ca3f4bdabf0754eaf61ff9ed18cc92c548c029b69c01ae325af424b2
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.8-r1.ebuild
index 82b460c20465..60b6ee4a0616 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.11.8-r1.ebuild
@@ -17,13 +17,16 @@ SLOT="0"
KEYWORDS="~amd64"
RESTRICT="splitdebug"
-RDEPEND="app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
+RDEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
dev-db/sqlcipher
- dev-libs/atk
dev-libs/expat
dev-libs/glib:2
+ dev-libs/nettle
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
@@ -51,9 +54,7 @@ QA_PREBUILT="opt/Element/chrome-sandbox
opt/Element/libGLESv2.so
opt/Element/libffmpeg.so
opt/Element/libvk_swiftshader.so
- opt/Element/libvulkan.so.1
- opt/Element/swiftshader/libEGL.so
- opt/Element/swiftshader/libGLESv2.so"
+ opt/Element/libvulkan.so.1"
src_prepare() {
default
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14-r2.ebuild
index c8262cd9b808..8200203b05ba 100644
--- a/net-im/empathy/empathy-3.12.14.ebuild
+++ b/net-im/empathy/empathy-3.12.14-r2.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
inherit gnome2 python-any-r1 virtualx
@@ -44,7 +43,7 @@ COMMON_DEPEND="
>=net-libs/telepathy-glib-0.23.2
>=net-im/telepathy-logger-0.8.0:=
- app-crypt/gcr[gtk]
+ app-crypt/gcr:0=[gtk]
dev-libs/libxml2:2
gnome-base/gsettings-desktop-schemas
media-sound/pulseaudio[glib]
@@ -53,7 +52,7 @@ COMMON_DEPEND="
geolocation? (
>=app-misc/geoclue-2.1:2.0
- >=sci-geosciences/geocode-glib-3.10 )
+ >=sci-geosciences/geocode-glib-3.10:0 )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= )
map? (
>=media-libs/clutter-1.7.14:1.0
@@ -68,24 +67,24 @@ COMMON_DEPEND="
>=media-video/cheese-3.4:= )
"
-# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-base:1.0
net-im/telepathy-connection-managers
- !<net-voip/telepathy-rakia-0.7
x11-themes/adwaita-icon-theme
gnome? ( gnome-extra/gnome-contacts )
"
DEPEND="${COMMON_DEPEND}
+ test? (
+ sys-apps/grep
+ >=dev-libs/check-0.9.4 )
+"
+BDEPEND="
${PYTHON_DEPS}
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-util/intltool-0.50.0
dev-util/itstool
virtual/pkgconfig
- test? (
- sys-apps/grep
- >=dev-libs/check-0.9.4 )
"
PDEPEND=">=net-im/telepathy-mission-control-5.14"
@@ -112,5 +111,5 @@ src_configure() {
}
src_test() {
- dbus-launch virtx emake check #504516
+ virtx dbus-run-session emake check
}
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 90421df2906f..566debda7083 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -3,3 +3,5 @@ DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff
DIST gajim-1.4.0.tar.gz 8932710 BLAKE2B 66924bf2e0f39c74e0ce45bfb24c6bd41c547f170c149611dc08e45db1f665f1159be6586dde1a64f1037de029dc2d83c1146545c36645dd67b63509ce156043 SHA512 9fb2b967325d04d7cfa8cb97d0dcebdd5cfd8b8a0a4f8928e7d8c547d90567b7fb0d84d48cdd151b5e38ce72f65de2679c8cc1543ff3ed25d792e6de070042a0
DIST gajim-1.4.1.tar.gz 7321296 BLAKE2B 2b170800a1ee6304831e1ec7c006e2133c577dd6b34da4e89ab35a6032677c7db61939834a5b3ad73026b7417703321dc43bb63aa2d0c03676cddb728c7294e6 SHA512 614b96d1e64e8601992d608de279abdd38fcfa637094eeffef6adab725446b8955d07725a3d7577d71be4b883943e3341f84540a86e9a61c32ec51ae8999cfcc
DIST gajim-1.4.2.tar.gz 7315938 BLAKE2B 2315be3d8efa98bf45cc7479a38a83f6d297bc4af9550ce70ccbb9f4fce681cdec57658f2c5c12c4b3b1b97d7623b1da32b675be971e186623957a267010d85c SHA512 d3402b39c9253334523538b86c3e2d6f272f576824048b344a235a12982c53280c3638b0b299c536ed38bcb8648388ba5bea8056c722cc8a5dc5d98012f6d57c
+DIST gajim-1.4.6.tar.gz 7170876 BLAKE2B 305fddfa693ecc73e01e5e287066d5a57ac2aa628f08f7e6d2dc8520ce2814eea80f980b28901d44bbd8b3fff31d8e1835f959c17d549956469f0ee0a31552bd SHA512 05ca7698dfac7482ef63ff2ee7b5cc65de61c4fb7e1c0bf1b033be868dc6d65c6cd34f622781b403e23257e3209b9120b10455ecb6e482b1a17490a17bfb4597
+DIST gajim-1.4.7.tar.gz 7184866 BLAKE2B 9be0ae485a372683623eff1f9ed1d209800c3088bf01c134bb5c6f1770e8ded1ebe6c2b301ad648c6cfb1793e2be43aade1410a701f7d0490f2ab1b0a4c3fdd5 SHA512 5988f6b7aa46166208b1693b9e1a5fe982cea2987f3f4170bcb14e4bb9be1154b1c6ceed020a949131a498db43d2dffee30bd3167cd56889c1cbb5641ed960f4
diff --git a/net-im/gajim/gajim-1.3.3-r2.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild
index 726c404f14f1..6e5f155ed93d 100644
--- a/net-im/gajim/gajim-1.3.3-r2.ebuild
+++ b/net-im/gajim/gajim-1.3.3-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
index 9228c4d00e2f..0edac94fa59b 100644
--- a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
+++ b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.0-r1.ebuild b/net-im/gajim/gajim-1.4.0-r1.ebuild
index 60900668dd5d..fb118fea5c42 100644
--- a/net-im/gajim/gajim-1.4.0-r1.ebuild
+++ b/net-im/gajim/gajim-1.4.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.0.ebuild b/net-im/gajim/gajim-1.4.0.ebuild
index dbb2ac846a85..48b15ddd3f96 100644
--- a/net-im/gajim/gajim-1.4.0.ebuild
+++ b/net-im/gajim/gajim-1.4.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.1.ebuild b/net-im/gajim/gajim-1.4.1.ebuild
index 60900668dd5d..fb118fea5c42 100644
--- a/net-im/gajim/gajim-1.4.1.ebuild
+++ b/net-im/gajim/gajim-1.4.1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.2.ebuild b/net-im/gajim/gajim-1.4.2.ebuild
index 60900668dd5d..fb118fea5c42 100644
--- a/net-im/gajim/gajim-1.4.2.ebuild
+++ b/net-im/gajim/gajim-1.4.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_REQ_USE="sqlite,xml(+)"
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
diff --git a/net-im/gajim/gajim-1.4.6.ebuild b/net-im/gajim/gajim-1.4.6.ebuild
new file mode 100644
index 000000000000..b9ec7f21e3dc
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P%_p2}"
+
+COMMON_DEPEND="
+ dev-libs/gobject-introspection[cairo(+)]
+ >=x11-libs/gtk+-3.22:3[introspection]
+ x11-libs/gtksourceview:4"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/precis-i18n[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
+ <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
+ x11-libs/libXScrnSaver
+ app-crypt/libsecret[crypt,introspection]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ net-libs/libsoup[introspection]
+ media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ crypt? (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+ geolocation? ( app-misc/geoclue[introspection] )
+ jingle? (
+ net-libs/farstream:0.2[introspection]
+ media-libs/gstreamer:1.0[introspection]
+ media-libs/gst-plugins-base:1.0[introspection]
+ media-libs/gst-plugins-ugly:1.0
+ media-plugins/gst-plugins-gtk
+ )
+ omemo? (
+ dev-python/python-axolotl[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ )
+ remote? (
+ >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+ sys-apps/dbus[X]
+ )
+ rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+ spell? (
+ app-text/gspell[introspection]
+ app-text/hunspell
+ )
+ upnp? ( net-libs/gupnp-igd[introspection] )
+ ')"
+
+src_install() {
+ distutils-r1_src_install
+
+ # avoid precompressed man pages
+ rm -r "${D}/usr/share/man"
+ doman data/*.1
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+# Tests are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.4.7.ebuild b/net-im/gajim/gajim-1.4.7.ebuild
new file mode 100644
index 000000000000..bd8c2bbd2248
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.7.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P%_p2}"
+
+COMMON_DEPEND="
+ dev-libs/gobject-introspection[cairo(+)]
+ >=x11-libs/gtk+-3.22:3[introspection]
+ x11-libs/gtksourceview:4"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/precis-i18n[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
+ <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
+ x11-libs/libXScrnSaver
+ app-crypt/libsecret[crypt,introspection]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ net-libs/libsoup[introspection]
+ media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ crypt? (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+ geolocation? ( app-misc/geoclue[introspection] )
+ jingle? (
+ net-libs/farstream:0.2[introspection]
+ media-libs/gstreamer:1.0[introspection]
+ media-libs/gst-plugins-base:1.0[introspection]
+ media-libs/gst-plugins-ugly:1.0
+ media-plugins/gst-plugins-gtk
+ )
+ omemo? (
+ dev-python/python-axolotl[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ )
+ remote? (
+ >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+ sys-apps/dbus[X]
+ )
+ rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+ spell? (
+ app-text/gspell[introspection]
+ app-text/hunspell
+ )
+ upnp? ( net-libs/gupnp-igd[introspection] )
+ ')"
+
+src_install() {
+ distutils-r1_src_install
+
+ # avoid precompressed man pages
+ rm -r "${D}/usr/share/man"
+ doman data/*.1
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+# Tests are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild b/net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..e4dd3c659d02
--- /dev/null
+++ b/net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit desktop multilib-build pax-utils unpacker xdg
+
+MY_PN="${PN/-bin/}"
+
+DESCRIPTION="Chat and network platform"
+HOMEPAGE="https://gitter.im"
+SRC_URI="amd64? ( https://update.gitter.im/linux64/${MY_PN}_${PV}_amd64.deb )
+ x86? ( https://update.gitter.im/linux32/${MY_PN}_${PV}_i386.deb )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 +abi_x86_64"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+ dev-libs/atk:0[${MULTILIB_USEDEP}]
+ dev-libs/expat:0[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/nspr:0[${MULTILIB_USEDEP}]
+ dev-libs/nss:0[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+ net-print/cups:0[${MULTILIB_USEDEP}]
+ sys-apps/dbus:0[${MULTILIB_USEDEP}]
+ x11-libs/cairo:0[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ x11-libs/libdrm:0[${MULTILIB_USEDEP}]
+ x11-libs/libX11:0[${MULTILIB_USEDEP}]
+ x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+ x11-libs/libXext:0[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+ x11-libs/libXi:0[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+ x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+ x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+ x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+ x11-libs/pango:0[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}"
+
+QA_EXECSTACK="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a*"
+QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe
+ opt/gitter/pnacl/pnacl_public_x86_64_ld_nexe
+ opt/gitter/pnacl/pnacl_public_x86_64_pnacl_sz_nexe
+ opt/gitter/payload
+ opt/gitter/swiftshader/libEGL.so
+ opt/gitter/swiftshader/libGLESv2.so
+ opt/gitter/chromedriver
+ opt/gitter/lib/libnw.so
+ opt/gitter/lib/libnode.so
+ opt/gitter/lib/libffmpeg.so
+ opt/gitter/nacl_helper
+ opt/gitter/nwjc
+ opt/gitter/nacl_irt_x86_64.nexe
+ opt/gitter/Gitter"
+QA_FLAGS_IGNORED="opt/gitter/minidump_stackwalk
+ opt/gitter/nacl_helper_bootstrap
+ opt/gitter/crashpad_handler
+ opt/gitter/lib/libEGL.so
+ opt/gitter/lib/libGLESv2.so"
+
+src_prepare() {
+ default
+
+ local arch
+ multilib_get_enabled_abis
+ arch="$(usex amd64 "64" "32")"
+
+ # Remove hardcoded paths
+ sed -i \
+ -e '/Exec/s/=.*/=gitter/' \
+ -e '/Icon/s/=.*/=gitter/' \
+ opt/Gitter/linux"${arch}"/gitter.desktop || die "sed failed"
+}
+
+src_install() {
+ local arch
+ arch="$(usex amd64 "64" "32")"
+
+ newicon opt/Gitter/linux"${arch}"/logo.png gitter.png
+ newicon -s 256 opt/Gitter/linux"${arch}"/logo.png gitter.png
+ domenu opt/Gitter/linux"${arch}"/gitter.desktop
+
+ insinto /opt/gitter
+ doins -r opt/Gitter/linux"${arch}"/.
+ fperms -R +x /opt/gitter/lib/ /opt/gitter/swiftshader/ \
+ /opt/gitter/pnacl/pnacl_public_x86_64_{ld_nexe,pnacl_llc_nexe,pnacl_sz_nexe} \
+ /opt/gitter/{Gitter,chromedriver,crashpad_handler,minidump_stackwalk,nwjc,payload} \
+ /opt/gitter/nacl_{helper,helper_bootstrap,irt_x86_64.nexe}
+
+ dosym ../../opt/gitter/Gitter /usr/bin/gitter
+
+ pax-mark -m "${ED}"/opt/gitter/Gitter
+}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1-r1.ebuild
index d3d4259d992a..994e1fe52260 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1-r1.ebuild
@@ -21,9 +21,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2[X]
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2[X]
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index 0abc7b5f4923..14c5661f23ad 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/metadata.xml
@@ -8,7 +8,7 @@
history logging, commands completion, and external actions triggers.
</longdescription>
<use>
- <flag name="aspell">Adds support for app-text/aspell spell
+ <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell
checker.</flag>
<flag name="otr">Enable encrypted conversations using Off-The-Records
messaging
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index c151cad22052..97071e6a58b9 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1 +1 @@
-DIST neochat-1.2.0.tar.xz 244064 BLAKE2B dcf728036269e3aefc524c1fea56f07f76c4132d810e2edb2c199ff8df7fd77ff8d90a5fbd6d13d59dae8894ccc312cf38107a3b5ba5a08fd80b31a0f8a53a0c SHA512 50837f44b899999753208363283c20a6b858bdaf26bba9e9762a04c2e65534014df88a9404ce7659a87d5e896e08a5e5f4ac23e3922ebe4cb6c7715b07058af7
+DIST neochat-22.06.tar.xz 336432 BLAKE2B ad77e83bb64137bb3f4597999ed2db0f47a83a0e253150b7a27903acebfd28f58062b8dcb8c393312d11f830df6e6b208d07daa016e99b4c75c16f3da1aa85ce SHA512 d7f3776620592f509f9db42c5b8118c7c5d6f11ad152502a36bd49c8aa56bf3b6c0056ec1dfc4268002b6c035926aee6e9e835de271e27ebbfc2bacda218d13e
diff --git a/net-im/neochat/neochat-1.2.0.ebuild b/net-im/neochat/neochat-22.06.ebuild
index 357579f37efd..e4fc3548c1b3 100644
--- a/net-im/neochat/neochat-1.2.0.ebuild
+++ b/net-im/neochat/neochat-22.06.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-KFMIN=5.77.0
-QTMIN=5.15.2
-inherit ecm kde.org
+KDE_ORG_CATEGORY=network
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm plasma-mobile.kde.org
DESCRIPTION="Client for Matrix, the decentralized communication protocol"
HOMEPAGE="https://apps.kde.org/neochat/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~ppc64"
fi
@@ -20,6 +20,7 @@ SLOT="0"
DEPEND="
app-text/cmark:=
+ dev-libs/qcoro5
dev-libs/qtkeychain:=
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
@@ -29,11 +30,15 @@ DEPEND="
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5[qml]
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
media-libs/kquickimageeditor:5
>=net-libs/libquotient-0.6
"
@@ -41,6 +46,7 @@ RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=kde-frameworks/purpose-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5[qml]
"
BDEPEND="virtual/pkgconfig"
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index a5cf62919db7..3a2602eb46c9 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,2 +1 @@
-DIST prosody-0.12.0.tar.gz 610330 BLAKE2B 14694ee95dc6eb6d053278a9d7718fd7487fe7ef862b4e2ee0d57f2b60cdeb22d1c74eac4a4df7447ea3e9ff57fb3734a9c9997f2767ed3aa04682f265b82185 SHA512 b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce
DIST prosody-0.12.1.tar.gz 611898 BLAKE2B 0b65ffbd6d4703f9e5fbac80e8887a4a41297afd22a776fb2eaa718b309f46c55a9d78f1d3ea97d4434c6ea2ebfe7a9051532ceda25ad78611769bd031894084 SHA512 705d2bcd38ffb19e90dab19992711aebf3d81f7bca7f9791ae5149510d465ec837ddf26a8c547eff2f2d131e5a694ddc3d0aac0b8921df65808192ae00527a85
diff --git a/net-im/prosody/prosody-0.12.0.ebuild b/net-im/prosody/prosody-0.12.0.ebuild
deleted file mode 100644
index 569a5077e12b..000000000000
--- a/net-im/prosody/prosody-0.12.0.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua-single systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
-REQUIRED_USE="
- ^^ ( icu idn )
- ${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-group/prosody
- acct-user/prosody
- $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
- dev-lua/luarocks[${LUA_SINGLE_USEDEP}]
- $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]')
- icu? ( dev-libs/icu:= )
- idn? ( net-dns/libidn:= )
- ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') )
- libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
- dev-libs/openssl:0=
- lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
- mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
- postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
- sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
- ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
- zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
- ${LUA_DEPS}
-"
-
-RDEPEND="
- ${DEPEND}
- selinux? ( sec-policy/selinux-jabber )
-"
-
-BDEPEND="
- virtual/pkgconfig
- test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" )
-
-src_prepare() {
- default
-
- # Set correct plugin path for optional net-im/prosody-modules package
- sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
- local myeconfargs=(
- --add-cflags="${CFLAGS}"
- --add-ldflags="${LDFLAGS}"
- --c-compiler="$(tc-getCC)"
- --datadir="${EPREFIX}/var/lib/prosody"
- --idn-library="$(usex idn 'idn' 'icu')"
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --linker="$(tc-getCC)"
- --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
- --no-example-certs
- --ostype="linux"
- --prefix="${EPREFIX}/usr"
- --runwith="${ELUA}"
- --sysconfdir="${EPREFIX}/etc/prosody"
- --with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
- --with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
- )
-
- # Since the configure script is handcrafted,
- # and yells at unknown options, do not use 'econf'.
- ./configure "${myeconfargs[@]}" || die
-
- rm makefile || die
- mv GNUmakefile Makefile || die
-}
-
-src_install() {
- default
-
- keepdir /var/lib/prosody
-
- newinitd "${FILESDIR}"/prosody.initd-r6 prosody
- systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service
-
- newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf
-}
-
-pkg_postinst() {
- local migrate_to_prosody_user="false"
- tmpfiles_process prosody.conf
-
- if [[ ${REPLACING_VERSIONS} ]]; then
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 0.12.0; then
- migrate_to_prosody_user="true"
- break
- fi
- done
- fi
-
- # Sarting with >=0.12.0, the prosody configuration is now in
- # /etc/prosody and no longer in /etc/jabber.
- # See if we need to migrate the configuration. Furthermore,
- # prosody no longer runs under the, shared via net-im/jabber-base,
- # 'jabber' use, but under its own user.
- # This increase isolation and hence robustness and security.
- if ${migrate_to_prosody_user}; then
- local -A dirs_to_migrate=(
- [/etc/jabber]=/etc/prosody
- [/var/log/jabber]=/var/log/prosody
- [/var/spool/jabber]=/var/lib/prosody
- )
-
- for src_dir in "${!dirs_to_migrate[@]}"; do
- local eroot_src_dir="${EROOT}/${src_dir}"
- local eroot_dst_dir="${EROOT}/${dirs_to_migrate[${src_dir}]}"
-
- cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
-
- if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
- rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
- fi
-
- if ! use prefix; then
- chown --recursive prosody:prosody "${eroot_dst_dir}" || die
- fi
- done
-
- # Update configuration file to match new pathes and permissions
- local mysedargs=(
- -e "'s#/etc/jabber#/etc/prosody#g'"
- -e "'s#/run/jabber#/run/prosody#g'"
- -e "'s#/var/log/jabber#/var/log/prosody#g'"
- -e "'s/prosody_user.*/prosody_user = \"prosody\";/g'"
- -e "'s/prosody_group.*/prosody_group = \"prosody\";/g'"
- -i /etc/prosody/prosody.cfg.lua
- )
-
- eval sed "${mysedargs[@]}" || die
-
- ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody"
- ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber."
- ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody."
- ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)."
- ewarn "Please check your configuration."
- fi
-}
diff --git a/net-im/prosody/prosody-0.12.1.ebuild b/net-im/prosody/prosody-0.12.1.ebuild
index e9cab9fb7d64..569a5077e12b 100644
--- a/net-im/prosody/prosody-0.12.1.ebuild
+++ b/net-im/prosody/prosody-0.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
REQUIRED_USE="
^^ ( icu idn )
diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5-r1.ebuild
index 51720b881c72..4845d29a519e 100644
--- a/net-im/psi/psi-1.5.ebuild
+++ b/net-im/psi/psi-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding xscreensaver"
REQUIRED_USE="
@@ -25,7 +25,7 @@ REQUIRED_USE="
BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ doc? ( app-doc/doxygen[dot] )
"
DEPEND="
app-crypt/qca:2[ssl]
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 6dc0701912e8..4d4fbb81991e 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,7 +30,7 @@ REQUIRED_USE="
BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
- doc? ( app-doc/doxygen )
+ doc? ( app-doc/doxygen[dot] )
extras? ( >=sys-devel/qconf-2.4 )
"
DEPEND="
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index 89cce77a2b83..26687b415f4c 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,3 +1 @@
-DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56
-DIST qTox-1.17.4.tar.gz 4778657 BLAKE2B 5edcb6b6f997eeb4a332c23477d4c5021085cf8c62be596b0eb4771963f450bc96de6c2dc30ec3cfc98577f20bf618e8fc2478fc34af8a8810fc538a5ccc787b SHA512 00dd2b4492e6dbf90b038bd1e5263ba96c969fb5d879b5680401ad090ffe6aaa70ff487f2e88f93c573f2e1a7e6ca50a75dfe7b51fc56fc4d08cac076bfd75d0
DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208
diff --git a/net-im/qtox/qtox-1.17.3.ebuild b/net-im/qtox/qtox-1.17.3.ebuild
deleted file mode 100644
index 41932b6c4516..000000000000
--- a/net-im/qtox/qtox-1.17.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="qTox-${PV}"
-inherit cmake xdg
-
-DESCRIPTION="qTox is an instant messaging client using the encrypted p2p Tox protocol"
-HOMEPAGE="https://qtox.github.io/"
-SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="notification spellcheck test X"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/qTox"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-RDEPEND="
- || (
- dev-qt/qtgui:5[gif,jpeg,png,X(-)]
- dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
- )
- dev-db/sqlcipher
- dev-libs/libsodium:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/qrencode:=
- media-libs/libexif:=
- media-libs/openal
- media-video/ffmpeg:=[webp,v4l]
- net-libs/tox:0/0.2[av]
- notification? ( x11-libs/snorenotify )
- spellcheck? ( kde-frameworks/sonnet:5 )
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-src_prepare() {
- cmake_src_prepare
-
- # bug 628574
- if ! use test; then
- sed -i CMakeLists.txt -e "/include(Testing)/d" || die
- sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE="Release"
- -DPLATFORM_EXTENSIONS=$(usex X)
- -DUPDATE_CHECK=OFF
- -DUSE_CCACHE=ON
- -DSPELL_CHECK=$(usex spellcheck)
- -DSVGZ_ICON=ON
- -DASAN=OFF
- -DDESKTOP_NOTIFICATIONS=$(usex notification)
- -DSTRICT_OPTIONS=OFF
- -DGIT_DESCRIBE="${PV}"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # The excluded tests require network access.
- cmake_src_test -E "test_(bsu|core)"
-}
diff --git a/net-im/qtox/qtox-1.17.4.ebuild b/net-im/qtox/qtox-1.17.4.ebuild
deleted file mode 100644
index 825ce6aa14d1..000000000000
--- a/net-im/qtox/qtox-1.17.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/qTox/qTox.git"
-else
- MY_P="qTox-${PV}"
- SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/qTox"
-fi
-
-DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol"
-HOMEPAGE="https://qtox.github.io/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="notification +spellcheck test X"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-RDEPEND="
- dev-db/sqlcipher
- dev-libs/libsodium:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5[gif,jpeg,png,X(-)]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/qrencode:=
- media-libs/libexif
- media-libs/openal
- media-video/ffmpeg:=[webp,v4l]
- >=net-libs/tox-0.2.13:=[av]
- notification? ( x11-libs/snorenotify )
- spellcheck? ( kde-frameworks/sonnet:5 )
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
- X? ( x11-base/xorg-proto )
-"
-
-DOCS=( CHANGELOG.md README.md doc/user_manual_en.md )
-
-src_prepare() {
- cmake_src_prepare
-
- # bug 628574
- if ! use test; then
- sed -i CMakeLists.txt -e "/include(Testing)/d" || die
- sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DPLATFORM_EXTENSIONS=$(usex X)
- -DUPDATE_CHECK=OFF
- -DUSE_CCACHE=OFF
- -DSPELL_CHECK=$(usex spellcheck)
- -DSVGZ_ICON=ON
- -DASAN=OFF
- -DDESKTOP_NOTIFICATIONS=$(usex notification)
- -DSTRICT_OPTIONS=OFF
- )
-
- [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} )
-
- cmake_src_configure
-}
-
-src_test() {
- # The excluded tests require network access.
- cmake_src_test -E "test_(bsu|core)"
-}
diff --git a/net-im/qtox/qtox-1.17.6.ebuild b/net-im/qtox/qtox-1.17.6-r1.ebuild
index 825ce6aa14d1..ef4155852191 100644
--- a/net-im/qtox/qtox-1.17.6.ebuild
+++ b/net-im/qtox/qtox-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
else
MY_P="qTox-${PV}"
SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
S="${WORKDIR}/qTox"
fi
@@ -33,7 +33,7 @@ RDEPEND="
dev-libs/libsodium:=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
- dev-qt/qtgui:5[gif,jpeg,png,X(-)]
+ dev-qt/qtgui:5[gif(+),jpeg,png,X(-)]
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtsvg:5
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index f9ff34f329b6..fe8a64494ea3 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
dev-libs/libsodium:=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
- dev-qt/qtgui:5[gif,jpeg,png,X(-)]
+ dev-qt/qtgui:5[gif(+),jpeg,png,X(-)]
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtsvg:5
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 877f346ea074..d998d52a8183 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1 +1 @@
-DIST rocketchat-3.8.7-linux-x86_64.rpm 62302012 BLAKE2B 2e5b36191abcb783e126e92bc608716efc910151484399cbbaf2fe0837fe8a40eb5c84b71e33052c5a950adfa0851d30be2e964754b08f3a9f3754169c5dc169 SHA512 833abf90425b5f9d0feb28acba4559d8d410ef2f5276b03fac8c781b9eab3ae7e0eebd613bc84e28a0dfa6005778a9afd91d528b6fa67ab825564e98241548c6
+DIST rocketchat-3.8.9-linux-x86_64.rpm 62919312 BLAKE2B b9a7d51f5ff969ae395ffae4fb2814e7ec87ec72924892c7e00c4eea8fe5ab7f2c79a9c4f93b9c8f2a1a3d7c7b4b4127e37afabd01a690cfdb058a8aaf33ca4a SHA512 8f3562825a967bcc3d9a7f605c67b26dc329d1f44f26b84d44a3e0585661ba9a71db958f3cfbd4d3923fc3434ced887037b7528b70babbbfcbbb4e20b3d400bb
diff --git a/net-im/rocketchat-desktop-bin/metadata.xml b/net-im/rocketchat-desktop-bin/metadata.xml
index 49b40b0d68a8..42dd05249f7c 100644
--- a/net-im/rocketchat-desktop-bin/metadata.xml
+++ b/net-im/rocketchat-desktop-bin/metadata.xml
@@ -5,8 +5,5 @@
<remote-id type="github">RocketChat/Rocket.Chat.Electron</remote-id>
<bugs-to>https://github.com/RocketChat/Rocket.Chat.Electron/issues</bugs-to>
</upstream>
- <maintainer type="person">
- <email>andrewammerlaan@gentoo.org</email>
- <name>Andrew Ammerlaan</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.9-r1.ebuild
index 355c5e06379d..dcf529fbc6a3 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.9-r1.ebuild
@@ -26,8 +26,10 @@ SLOT="0"
RESTRICT="bindist mirror"
RDEPEND="
- app-accessibility/at-spi2-atk:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/libappindicator
dev-libs/nspr
@@ -88,9 +90,6 @@ src_install() {
exeinto "${DESTDIR}"
doexe chrome-sandbox rocketchat-desktop *.so*
- exeinto "${DESTDIR}/swiftshader"
- doexe swiftshader/*.so*
-
insinto "${DESTDIR}"
doins *.pak *.bin *.json *.dat
insopts -m0755
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index aa4e75dbbcd9..6ffee260afd8 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_5.48.0_amd64.deb 116776998 BLAKE2B cd1e7f9c83234e11a70c9ff1664e9e013e50c31863bc6d8e21c1f76be8d91e802ccf7127221287672245c5c69c33e36ed0c85a1781c8978695aa44869beb7375 SHA512 a2cfe0289cee3f8837f14a428f9d3f11238e0aacdcaff4d665162e01b41b318e2e6fe88ce88bade8167d8db1df54a8c5cb466d5fd13d2e6d570aa2d4e81ed4bd
+DIST signal-desktop_5.61.1_amd64.deb 124785488 BLAKE2B acf6c88c75bc31ef0abf8e045b8608c649ce511aa4e155483e377e4826f78365496dc9466e4b8197655f353f49683ebf4e6bda0499c0c449744e18149992d0a4 SHA512 9d49ae2dcfe3ecd7d8e96eff08113f5c475e1edbe2cb6001bbcf4b2b8dd687bb8914a64e76bc76f90bdf3216a90a669d885f65e69b79a17a188eab29f780557b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.61.1-r1.ebuild
index 75db5c2f8043..03b11d6d08b0 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.61.1-r1.ebuild
@@ -20,18 +20,19 @@ IUSE="+sound"
RESTRICT="splitdebug"
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
+ dev-libs/wayland
media-libs/alsa-lib
media-libs/mesa[X(+)]
net-print/cups
sys-apps/dbus[X]
- x11-libs/gdk-pixbuf:2
x11-libs/cairo
x11-libs/gtk+:3[X]
x11-libs/libdrm
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 9743d4a4c379..adbc221147fb 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,4 @@
-DIST skypeforlinux_8.81.0.268-1.x86_64.rpm 140540850 BLAKE2B 5d6cca460c5ad663ba5ac90d3d22f7c7eab7869b6b34413de7e8a479d7461d8b7aa9112798722a38c6b9ed0bf0321a37300bf410fc123e0bb8c7164cb027b2a7 SHA512 e2b077cca85c9fdbdac7b50cbfe3fa5bb628c7321dc30d5d6eac5d3c8b83d2a365bbe226f33cf35d2e5614a1b48eb9971ada4c87b98dd161c985e99a5008a9c9
-DIST skypeforlinux_8.82.0.403-1.x86_64.rpm 140817695 BLAKE2B 94a1038a534dce77e014e3823e4e5f2a8e6a951d3a644ed1562a5d50dad92f73152910286d797c50b882662f6f85cbf30bc4d80e5fcee7ac956f2c18177c00e1 SHA512 97920148290f9a4e7091f90a9e46f20ba663ad3f07c15a8540947d4b9a4390c217ac4eea5e80a5aad3a83e4110588fb7038b6359f34f4774ca6912f91db76346
-DIST skypeforlinux_8.83.0.408-1.x86_64.rpm 140847167 BLAKE2B 79d00a80bdb9cfa131094de2d702b1c8031307c6614ed962567cfeb3868bd542f5483b4ef87ab7146f9aa94e4548d9339ce7f4f28e65c2bfb5add25a3d3e5d26 SHA512 66865836f6e44ec54f14b26bdb0bcf2b9aec11379d4b16386814a44137e6eb1dd83cfbe2f4248cf6b2b4ba2513ebdcc64fec5f1819ee3a67e2ae04bcf4f7e028
DIST skypeforlinux_8.83.0.411-1.x86_64.rpm 140568859 BLAKE2B 3e429e5c60fe812092a2da1cd6ed4012d81e65a4f69c18772a7e34721c1549e18c401ea2fc6d0263bdbace85265c48467835e97f7fa50eca1ae8dbbbf4cf0b3c SHA512 ebab053e75e81e294e434aa7f573843017a97d749cdf9fdf1768ba35a8172e17b1c98f5cb68e7445ab19bd44c4b1d6b8defdcff6bcd24128b5fa176466f10752
DIST skypeforlinux_8.85.0.409-1.x86_64.rpm 125943432 BLAKE2B 7300c53c85387df71a7b1ccdd56a12a659a0e8ddbf8b274c32ac956e0bd67269815bc56e4d3a91cbc3f8214a3259026147ae3e8467efec934d06424495bf502d SHA512 2ee36ea93259390bb1061aae5ea86ac5617ac411f058b62607324fc36debbd7c914e872b9a2741ff72b37bc5e1b4683d862d3c01b84f9a3fe98de2e20959c911
+DIST skypeforlinux_8.86.0.407-1.x86_64.rpm 126036696 BLAKE2B e9fb9fb5c3612c1818d801c1ce43848ca2e313a7d09009678b6aeb1a649cd29c58a6e798fc22e48a6d23ceedd3a99b087110abc7b3d4cb8ba97cbe31d1f77c2e SHA512 8546a0bfc367e801b0f94d926dedf87dd2212888ea4d9206b1ed650c334ceebc1d72029a81c826dbf1630ec6625a6e08c7ae942e6dd79403027671996385435b
+DIST skypeforlinux_8.87.0.403-1.x86_64.rpm 126049259 BLAKE2B e094fcda81bff2509a0411d12758fd3dfcaaf57ea56ac02c0243a13ea8c1a84c3558ec8c67a33bef4995d8c18f4d3df52d85f5971cb60d6e080f43d4fa124a35 SHA512 80d3ddd384bea9fb1cea3d802da4e65acd441656d794728071879476160b6fbcf22d17152e8d06b0d3250596e8ff77de249d502db89484b20b15e1ef56f1e01c
diff --git a/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild b/net-im/skypeforlinux/skypeforlinux-8.83.0.411-r1.ebuild
index 911974eaca88..75d4118fd051 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.83.0.411-r1.ebuild
@@ -21,7 +21,10 @@ RESTRICT="mirror bindist strip" #299368
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ )
dev-libs/expat[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild b/net-im/skypeforlinux/skypeforlinux-8.85.0.409-r1.ebuild
index 911974eaca88..75d4118fd051 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.85.0.409-r1.ebuild
@@ -21,7 +21,10 @@ RESTRICT="mirror bindist strip" #299368
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ )
dev-libs/expat[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild b/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild
deleted file mode 100644
index 911974eaca88..000000000000
--- a/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit chromium-2 desktop pax-utils rpm multilib-build xdg
-
-DESCRIPTION="Instant messaging client, with support for audio and video"
-HOMEPAGE="https://www.skype.com/"
-SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
-S="${WORKDIR}"
-
-LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-QA_PREBUILT="*"
-RESTRICT="mirror bindist strip" #299368
-
-RDEPEND="
- app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
- dev-libs/expat[${MULTILIB_USEDEP}]
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- dev-libs/nspr[${MULTILIB_USEDEP}]
- dev-libs/nss[${MULTILIB_USEDEP}]
- media-libs/alsa-lib[${MULTILIB_USEDEP}]
- media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
- media-libs/freetype:2[${MULTILIB_USEDEP}]
- media-libs/libv4l[${MULTILIB_USEDEP}]
- net-print/cups[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-devel/gcc[cxx]
- sys-libs/glibc
- virtual/ttf-fonts
- x11-libs/cairo[${MULTILIB_USEDEP}]
- x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXdamage[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
- x11-libs/libxkbfile[${MULTILIB_USEDEP}]
- x11-libs/pango[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
- rpm_src_unpack ${A}
-}
-
-src_prepare() {
- default
- sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
- -i usr/bin/skypeforlinux || die
- sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
- -e "/^OnlyShowIn=/d" \
- -i usr/share/applications/skypeforlinux.desktop || die
-}
-
-src_install() {
- dodir /opt
- cp -a usr/share/skypeforlinux "${ED}"/opt || die
-
- # remove chrome-sandbox binary, users should use kernel namespaces
- # https://bugs.gentoo.org/692692#c18
- rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
-
- dobin usr/bin/skypeforlinux
-
- dodoc usr/share/skypeforlinux/*.html
- dodoc -r usr/share/doc/skypeforlinux/.
- # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
- dosym ${PF} usr/share/doc/skypeforlinux
-
- doicon usr/share/pixmaps/skypeforlinux.png
-
- local res
- for res in 16 32 256 512; do
- newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
- done
-
- domenu usr/share/applications/skypeforlinux.desktop
-
- pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
- pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-}
diff --git a/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild b/net-im/skypeforlinux/skypeforlinux-8.86.0.407-r1.ebuild
index 911974eaca88..75d4118fd051 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.86.0.407-r1.ebuild
@@ -21,7 +21,10 @@ RESTRICT="mirror bindist strip" #299368
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ )
dev-libs/expat[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild b/net-im/skypeforlinux/skypeforlinux-8.87.0.403-r1.ebuild
index 911974eaca88..75d4118fd051 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.87.0.403-r1.ebuild
@@ -21,7 +21,10 @@ RESTRICT="mirror bindist strip" #299368
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
- dev-libs/atk[${MULTILIB_USEDEP}]
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ )
dev-libs/expat[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr[${MULTILIB_USEDEP}]
diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest
index 935a53b48b4b..6d318d8ec972 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,2 +1,2 @@
-DIST slack-desktop-4.22.0-amd64.deb 65772046 BLAKE2B e0178bb0118fa22699c459f7e289ba17fa116ba4f231a5fca6d4a889b737110c8de036651ca753a282500b168bba0fbae83c03a42e1a6df0096d1ca31761adcf SHA512 085122d454c9cf66091c167d16017d051a37dcf3cec07dcc8b4e28f40bc1b77bc98315b63219b1bd56c65305b3b49b9fb4161f8271a03e4bf7d42889b9c282f1
DIST slack-desktop-4.23.0-amd64.deb 65626830 BLAKE2B a4b49e71b956e74a915ea9f2e26272d8ef15191c92479b1ed2615108569cc4c6cb97de53ff8d4099e4348b81c97447c0edfc1b0fbeacda3833953de9463e877f SHA512 f7885d78f712624ec8c3a26787a1876f4c6a35fedeec824ed4b1d7cc57dd23b9402254a7cfa9f585c3869a920d6fcfc868b9875a477fde1eab9d42a01d43d550
+DIST slack-desktop-4.27.156-amd64.deb 66938030 BLAKE2B b7d457fcb6a2518eaea7efc4d7b43f01f8c1da8a1218d3c2c2c14e195004102be344c6f4e2b60dd4f4677e53ea976cb7b0b102e3e0eec385df881eecdee4a7cd SHA512 b7aa66136a330536393a157843e02e4cfec5eca74431304b1b166e80eaadf41e8b12ad69af8616032042237cb9a38414f9bf1b76701def1985edd0a5570781f9
diff --git a/net-im/slack/slack-4.23.0.ebuild b/net-im/slack/slack-4.23.0-r1.ebuild
index 16e9577cda1b..3fc9f4865b12 100644
--- a/net-im/slack/slack-4.23.0.ebuild
+++ b/net-im/slack/slack-4.23.0-r1.ebuild
@@ -17,9 +17,11 @@ KEYWORDS="-* ~amd64"
IUSE="appindicator suid"
RESTRICT="bindist mirror"
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
- app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
- dev-libs/atk:0[${MULTILIB_USEDEP}]
+RDEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat:0[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr:0[${MULTILIB_USEDEP}]
@@ -28,6 +30,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
media-libs/mesa:0[${MULTILIB_USEDEP}]
net-print/cups:0[${MULTILIB_USEDEP}]
sys-apps/dbus:0[${MULTILIB_USEDEP}]
+ sys-libs/glibc
x11-libs/cairo:0[${MULTILIB_USEDEP}]
x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
diff --git a/net-im/slack/slack-4.22.0.ebuild b/net-im/slack/slack-4.27.156-r1.ebuild
index 8650535c9304..bc5a24fd03fb 100644
--- a/net-im/slack/slack-4.22.0.ebuild
+++ b/net-im/slack/slack-4.27.156-r1.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MULTILIB_COMPAT=( abi_x86_64 )
inherit desktop multilib-build optfeature pax-utils unpacker xdg
DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com"
+HOMEPAGE="https://slack.com"
SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64"
-IUSE="appindicator suid"
+IUSE="appindicator +seccomp suid wayland"
RESTRICT="bindist mirror"
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
- app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
- dev-libs/atk:0[${MULTILIB_USEDEP}]
+RDEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat:0[${MULTILIB_USEDEP}]
dev-libs/glib:2[${MULTILIB_USEDEP}]
dev-libs/nspr:0[${MULTILIB_USEDEP}]
@@ -28,6 +30,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
media-libs/mesa:0[${MULTILIB_USEDEP}]
net-print/cups:0[${MULTILIB_USEDEP}]
sys-apps/dbus:0[${MULTILIB_USEDEP}]
+ sys-libs/glibc
x11-libs/cairo:0[${MULTILIB_USEDEP}]
x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
x11-libs/gtk+:3[${MULTILIB_USEDEP}]
@@ -70,7 +73,19 @@ src_prepare() {
if use appindicator ; then
sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
usr/share/applications/slack.desktop \
- || die "sed failed for slack.desktop"
+ || die "sed failed for appindicator"
+ fi
+
+ if ! use seccomp ; then
+ sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \
+ usr/share/applications/slack.desktop \
+ || die "sed failed for seccomp"
+ fi
+
+ if use wayland ; then
+ sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \
+ usr/share/applications/slack.desktop \
+ || die "sed failed for wayland"
fi
rm usr/lib/slack/LICENSE{,S-linux.json} \
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
new file mode 100644
index 000000000000..7b4ae2c6354a
--- /dev/null
+++ b/net-im/synapse/Manifest
@@ -0,0 +1,42 @@
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST blake2-0.10.4.crate 46804 BLAKE2B 694e81198aa92d610a189056558b77765f8231a2dbde4e861396edb57398af30e10c6bfd8bb0b62c2013d4874b5442d3df8857499d0f5fff640649224ac4663a SHA512 ea6fde4969d66de70e0689da8c76efd37c8f70b9f1d1894d5c1e497a980b011cac75ac650170b7f0face9f85f0c35d05e136dcf823e1cbe7df3db58b72c6fa4b
+DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
+DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951
+DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
+DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
+DIST indoc-1.0.7.crate 13716 BLAKE2B fe515fcf534a552feba188aea5d5da0febc123db24485eb887a3431592780fd468f6409167457c68a7ef6368fcad71c14fcd7922bf2de29794a341d7d4cbbf0b SHA512 b60e534953d600bc2de3d6951f9da67ca3ab3c78fdce3e9c5f91e544ca848aef0c22c35a26fe7a39c07bd916a79fdf496269fecfa5491a58e178f37b2965b348
+DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
+DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
+DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910
+DIST pyo3-0.16.6.crate 364587 BLAKE2B 935b3347770e1fba76f6aee6b4ddc41cf9cb13be77e76d2668985012776a119906403a8fe95ccd0e33b4630bd38936693d2fd1b7b3d11d84a4e53fca021a2f36 SHA512 fe297e4d171ecb5a965ce9f3a0527a086766ac5607ba7b59b2a3a8f6cc66da3959d93f1d6aa688d67ceebde41ac4adefce18c0d52c1b77d0cd95cf1178f52325
+DIST pyo3-build-config-0.16.6.crate 28891 BLAKE2B 26667482bf9f5b140daab9728f58965a8417e879bfeaf27d9c61f75502150557f3d5952bf52b1d16360ade2f58ed44f99e10a5781a6d241844e9202735c6625e SHA512 a015bb4c328f0d1e643d64831e029bbd66cbf635ab616533f35aefce59abf1c5d596099feaccb81bff02e863867c14f975ce6fc55bc05d99ea47b5f6fdc2da5d
+DIST pyo3-ffi-0.16.6.crate 60756 BLAKE2B 148e67de195577a1676c80be1a5538d80cf25b0d9eac9facfdcd223dc40484a9c3c7c84377f727e83e50118fa803591acc1d800b93adf29c91e6a15154c2856c SHA512 97c69900e2b355a002d10e48883cc8d4d9245d07f956087fb9c3b0ecfb9039c84c3f3a23f17caf28c637c4522f0fe252fbbb16b543825e4f724ee19232a34d22
+DIST pyo3-macros-0.16.6.crate 8453 BLAKE2B 518809b1236149f14b264d48f642e873aea2b22edb655cf4cf4d6307d2eeb7544228b80ca7559397d3483c837ae2ea9f772a26563d01a95613dad0a1a704c1e9 SHA512 95b6898da9974ef232b04197e47ea4e7d60de9f817da9a9995f07b05ca74965df2b2e8e8267d616b665b04ab810b93ca17255b20df89ac9c71014e5c9fd3a9f1
+DIST pyo3-macros-backend-0.16.6.crate 49252 BLAKE2B 9fc531507d4f9d0e7ed183987fbabd043f7c31afe6488c53c6100d98e75e5296e9ee7cc4eb14798967ac62e7d8c31d602eac5166699058def384e4f029a3cf0b SHA512 49d82cff8762eeb27d8220aa98b2be43f614445f156212d45abef052e347ba2f4a7930e7c5c8a9843ea895ac5c223afc6527d036a9cad00efff9bda18907b019
+DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
+DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
+DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
+DIST synapse-1.65.0.gh.tar.gz 7895758 BLAKE2B 1c816dfb7982fc0462a4a3b84c19dd144e7ac16d6cadf1e73dc71002c234eed5945ad8162d69960eff1bab80a3396a1b78e0be2cc2dfee314f6fb39d0b91b098 SHA512 3ba9751f707d41a9e18d9fe63f9652c36712451d42953e2bd4add8c142418a2a47a2ce75da893832af9225b944dd7b275f6d744f6e70d468b7f143dd5ccb9137
+DIST synapse-1.66.0.gh.tar.gz 7916982 BLAKE2B 116d9f7dfd046ddc245ef1375bb3f01aad126fab8dedeb0e9172ce9b4bfa6c9757e241d9f0b2bad07525657e7a1f378d9385401436132c4ee6046629792a9840 SHA512 ebe8ab787d72592b395226490414f7dce5c250173be654dc6ce63deec3a7d718f8400cdc81dfb73ae331632bed4dfb5c6f09c64538f4bda8546db8fb75d728b7
+DIST synapse-1.67.0.gh.tar.gz 7933047 BLAKE2B 8fd6b48198256c8cbe4a2a1d5215e1eb34084065056dd251a19b01c44e7f193b612f49a8fce74498d406e338dba3c6f4a0db384f323d5e4174d181de8478ef24 SHA512 913335b3815ff218134cda80d7149a95aea69eda170e9da6d7566213f077692a92b0276e2530ae4e69572b13124de28b6546a7322b3d9e65f676df0ca4cb9469
+DIST synapse-1.68.0.gh.tar.gz 7961362 BLAKE2B 9822e5068aefe9807946b25b6a04142c8b506a165349e8bf5d8c45227e0959331d13870f2d2ddb5925ef8892e16c6a35002e4a091814fddd73a0bf03590278d2 SHA512 fc31ba2c92ab698ea54006862021f855cc1011a6d7a9d8d42e2eb07bbd6f9f332d35c68fecc43cb543530da7dba6e83d0e5379c7e8dc91bb48f228d509a9f584
+DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
+DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
+DIST unicode-ident-1.0.3.crate 35031 BLAKE2B d8d20829b97e7f1b9710feb6773cc5c4d25de6509772491e6f508a489285e32ec3a14ae689a1f1cd01ff5e2d4301b98579155535e03e240c8605b5737c9c5de5 SHA512 7ebdcfd7131a0e7a834f7e973b9cf813495259e0a0606539623d3f9bb51f9c6414908e71281d6a77397021e48d41c400a704c65990aaa8ca8d0a6095d9b3ed47
+DIST unindent-0.1.10.crate 7703 BLAKE2B 75458d7f21ded1eca4bb3f7f55b2fa73bf92b2309316eca1b2ffaa0c9f8d7cd8c7851b96688f6597f4af6973f70e9053c2708c1228fa6a9784e41c778488c4b7 SHA512 46ff1a2c042972af2fe5958677b2fa5adf3b9edbb168bd66cc93baf9d1b128f583d9502b83f174b35866343b57a57c8a91a465eab267dddae919af24095bf6bd
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
diff --git a/net-im/synapse/files/synapse.initd b/net-im/synapse/files/synapse.initd
new file mode 100644
index 000000000000..e8e494c722c0
--- /dev/null
+++ b/net-im/synapse/files/synapse.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Matrix synapse daemon"
+description=""
+command=/usr/bin/synapse_homeserver
+command_args="--daemonize --config-path /etc/synapse/homeserver.yaml"
+pidfile=/var/lib/synapse/homeserver.pid
+start_stop_daemon_args="--user synapse --group synapse"
diff --git a/net-im/synapse/files/synapse.service b/net-im/synapse/files/synapse.service
new file mode 100644
index 000000000000..19661e96257e
--- /dev/null
+++ b/net-im/synapse/files/synapse.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Synapse Matrix homeserver
+After=network.target
+After=postgresql-10.service
+After=postgresql-11.service
+After=postgresql-12.service
+After=postgresql-13.service
+After=postgresql-14.service
+After=postgresql-15.service
+
+[Service]
+ExecStart=/usr/bin/synctl --no-daemonize start /etc/synapse/homeserver.yaml
+ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+PrivateTmp=true
+User=synapse
+Group=synapse
+WorkingDirectory=/var/lib/synapse
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/synapse/metadata.xml b/net-im/synapse/metadata.xml
new file mode 100644
index 000000000000..8ce7426a7984
--- /dev/null
+++ b/net-im/synapse/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>arkamar@atlas.cz</email>
+ <name>Petr Vaněk</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">matrix-org/synapse</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-im/synapse/synapse-1.65.0.ebuild b/net-im/synapse/synapse-1.65.0.ebuild
new file mode 100644
index 000000000000..885d190b5f29
--- /dev/null
+++ b/net-im/synapse/synapse-1.65.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1 multiprocessing optfeature systemd
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+ https://matrix.org/
+ https://github.com/matrix-org/synapse/
+"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/matrix-org/${PN}.git"
+else
+ MY_PV="${PV/_rc/rc}"
+ SRC_URI="https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+ KEYWORDS="amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ acct-user/synapse
+ acct-group/synapse
+"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/canonicaljson[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/frozendict[${PYTHON_USEDEP}]
+ dev-python/ijson[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ >=dev-python/matrix-common-1.2.1[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/phonenumbers[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},webp]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pymacaroons[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ dev-python/signedjson[${PYTHON_USEDEP}]
+ dev-python/sortedcontainers[${PYTHON_USEDEP}]
+ dev-python/treq[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+ ')
+"
+BDEPEND="
+ test? ( $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/parameterized[${PYTHON_USEDEP}]
+ ') )
+"
+
+python_test() {
+ "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /var/{lib,log}/synapse /etc/synapse
+ fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+ fperms 0750 /var/{lib,log}/synapse /etc/synapse
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+ optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+ einfo "In order to generate initial configuration run:"
+ einfo "sudo -u synapse synapse_homeserver \\"
+ einfo " --server-name matrix.domain.tld \\"
+ einfo " --config-path /etc/synapse/homeserver.yaml \\"
+ einfo " --generate-config \\"
+ einfo " --data-directory /var/lib/synapse \\"
+ einfo " --report-stats=no"
+ einfo
+ einfo "See also upgrade notes:"
+ einfo "https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+}
diff --git a/net-im/synapse/synapse-1.66.0.ebuild b/net-im/synapse/synapse-1.66.0.ebuild
new file mode 100644
index 000000000000..e63f6f0fdf2c
--- /dev/null
+++ b/net-im/synapse/synapse-1.66.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1 multiprocessing optfeature systemd
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+ https://matrix.org/
+ https://github.com/matrix-org/synapse/
+"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/matrix-org/${PN}.git"
+else
+ MY_PV="${PV/_rc/rc}"
+ SRC_URI="https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+ KEYWORDS="amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ acct-user/synapse
+ acct-group/synapse
+"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/canonicaljson[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/frozendict[${PYTHON_USEDEP}]
+ dev-python/ijson[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ >=dev-python/matrix-common-1.2.1[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/phonenumbers[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},webp]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pydantic[${PYTHON_USEDEP}]
+ dev-python/pymacaroons[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ dev-python/signedjson[${PYTHON_USEDEP}]
+ dev-python/sortedcontainers[${PYTHON_USEDEP}]
+ dev-python/treq[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+ ')
+"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/parameterized[${PYTHON_USEDEP}]
+ ')
+ postgres? ( dev-db/postgresql[server] )
+ )
+"
+
+src_test() {
+ if use postgres; then
+ initdb -D "${T}/pgsql" || die
+ pg_ctl -w -D "${T}/pgsql" start \
+ -o "-h '' -k '${T}'" || die
+ createdb -h "${T}" synapse_test || die
+
+ local -x SYNAPSE_POSTGRES=1
+ local -x SYNAPSE_POSTGRES_HOST="${T}"
+ fi
+
+ distutils-r1_src_test
+
+ if use postgres; then
+ pg_ctl -w -D "${T}/pgsql" stop || die
+ fi
+}
+
+python_test() {
+ "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /var/{lib,log}/synapse /etc/synapse
+ fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+ fperms 0750 /var/{lib,log}/synapse /etc/synapse
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+ optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+ einfo "In order to generate initial configuration run:"
+ einfo "sudo -u synapse synapse_homeserver \\"
+ einfo " --server-name matrix.domain.tld \\"
+ einfo " --config-path /etc/synapse/homeserver.yaml \\"
+ einfo " --generate-config \\"
+ einfo " --data-directory /var/lib/synapse \\"
+ einfo " --report-stats=no"
+ einfo
+ einfo "See also upgrade notes:"
+ einfo "https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+}
diff --git a/net-im/synapse/synapse-1.67.0.ebuild b/net-im/synapse/synapse-1.67.0.ebuild
new file mode 100644
index 000000000000..17b22a83c544
--- /dev/null
+++ b/net-im/synapse/synapse-1.67.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1 multiprocessing optfeature systemd
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+ https://matrix.org/
+ https://github.com/matrix-org/synapse/
+"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/matrix-org/${PN}.git"
+else
+ MY_PV="${PV/_rc/rc}"
+ SRC_URI="https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+ KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ acct-user/synapse
+ acct-group/synapse
+"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/canonicaljson[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/frozendict[${PYTHON_USEDEP}]
+ dev-python/ijson[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ >=dev-python/matrix-common-1.2.1[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/phonenumbers[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},webp]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pydantic[${PYTHON_USEDEP}]
+ dev-python/pymacaroons[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ dev-python/signedjson[${PYTHON_USEDEP}]
+ dev-python/sortedcontainers[${PYTHON_USEDEP}]
+ dev-python/treq[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+ ')
+"
+BDEPEND="
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/parameterized[${PYTHON_USEDEP}]
+ ')
+ postgres? ( dev-db/postgresql[server] )
+ )
+"
+
+src_test() {
+ if use postgres; then
+ initdb --pgdata="${T}/pgsql" || die
+ pg_ctl --wait --pgdata="${T}/pgsql" start \
+ --options="-h '' -k '${T}'" || die
+ createdb --host="${T}" synapse_test || die
+
+ # See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
+ local -x SYNAPSE_POSTGRES=1
+ local -x SYNAPSE_POSTGRES_HOST="${T}"
+ fi
+
+ distutils-r1_src_test
+
+ if use postgres; then
+ pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+ fi
+}
+
+python_test() {
+ "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /var/{lib,log}/synapse /etc/synapse
+ fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+ fperms 0750 /var/{lib,log}/synapse /etc/synapse
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+ optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ einfo
+ elog "In order to generate initial configuration run:"
+ elog "sudo -u synapse synapse_homeserver \\"
+ elog " --server-name matrix.domain.tld \\"
+ elog " --config-path /etc/synapse/homeserver.yaml \\"
+ elog " --generate-config \\"
+ elog " --data-directory /var/lib/synapse \\"
+ elog " --report-stats=no"
+ einfo
+ else
+ einfo
+ einfo "Please refer to upgrade notes if any special steps are required"
+ einfo "to upgrade from the version you currently have installed:"
+ einfo
+ einfo " https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+ einfo
+ fi
+}
diff --git a/net-im/synapse/synapse-1.68.0.ebuild b/net-im/synapse/synapse-1.68.0.ebuild
new file mode 100644
index 000000000000..2916a28b5011
--- /dev/null
+++ b/net-im/synapse/synapse-1.68.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=poetry
+
+CRATES="
+ autocfg-1.1.0
+ bitflags-1.3.2
+ blake2-0.10.4
+ block-buffer-0.10.3
+ cfg-if-1.0.0
+ crypto-common-0.1.6
+ digest-0.10.5
+ generic-array-0.14.6
+ hex-0.4.3
+ indoc-1.0.7
+ libc-0.2.132
+ lock_api-0.4.7
+ once_cell-1.13.1
+ parking_lot-0.12.1
+ parking_lot_core-0.9.3
+ proc-macro2-1.0.43
+ pyo3-0.16.6
+ pyo3-build-config-0.16.6
+ pyo3-ffi-0.16.6
+ pyo3-macros-0.16.6
+ pyo3-macros-backend-0.16.6
+ quote-1.0.21
+ redox_syscall-0.2.16
+ scopeguard-1.1.0
+ smallvec-1.9.0
+ subtle-2.4.1
+ syn-1.0.99
+ target-lexicon-0.12.4
+ typenum-1.15.0
+ unicode-ident-1.0.3
+ unindent-0.1.10
+ version_check-0.9.4
+ windows-sys-0.36.1
+ windows_aarch64_msvc-0.36.1
+ windows_i686_gnu-0.36.1
+ windows_i686_msvc-0.36.1
+ windows_x86_64_gnu-0.36.1
+ windows_x86_64_msvc-0.36.1
+"
+
+inherit cargo distutils-r1 multiprocessing optfeature systemd
+
+MY_PV="${PV/_rc/rc}"
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+ https://matrix.org/
+ https://github.com/matrix-org/synapse/
+"
+SRC_URI="
+ https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ $(cargo_crate_uris)
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="Apache-2.0"
+# Additional licenses needed for Rust crates
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ acct-user/synapse
+ acct-group/synapse
+"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/attrs[${PYTHON_USEDEP}]
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/canonicaljson[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/frozendict[${PYTHON_USEDEP}]
+ dev-python/ijson[${PYTHON_USEDEP}]
+ >=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ >=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}]
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/phonenumbers[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP},webp]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pydantic[${PYTHON_USEDEP}]
+ dev-python/pymacaroons[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ dev-python/signedjson[${PYTHON_USEDEP}]
+ dev-python/sortedcontainers[${PYTHON_USEDEP}]
+ dev-python/treq[${PYTHON_USEDEP}]
+ dev-python/twisted[${PYTHON_USEDEP}]
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+ ')
+"
+BDEPEND="
+ $(python_gen_cond_dep 'dev-python/setuptools-rust[${PYTHON_USEDEP}]')
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/parameterized[${PYTHON_USEDEP}]
+ ')
+ postgres? ( dev-db/postgresql[server] )
+ )
+"
+
+# Rust extension
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
+
+src_test() {
+ if use postgres; then
+ initdb --pgdata="${T}/pgsql" || die
+ pg_ctl --wait --pgdata="${T}/pgsql" start \
+ --options="-h '' -k '${T}'" || die
+ createdb --host="${T}" synapse_test || die
+
+ # See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
+ local -x SYNAPSE_POSTGRES=1
+ local -x SYNAPSE_POSTGRES_HOST="${T}"
+ fi
+
+ # This move is necessary otherwise python is not able to locate
+ # synapse_rust.abi3.so.
+ mv synapse{,.hidden} || die
+
+ distutils-r1_src_test
+
+ if use postgres; then
+ pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+ fi
+}
+
+python_test() {
+ "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /var/{lib,log}/synapse /etc/synapse
+ fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+ fperms 0750 /var/{lib,log}/synapse /etc/synapse
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+ optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ einfo
+ elog "In order to generate initial configuration run:"
+ elog "sudo -u synapse synapse_homeserver \\"
+ elog " --server-name matrix.domain.tld \\"
+ elog " --config-path /etc/synapse/homeserver.yaml \\"
+ elog " --generate-config \\"
+ elog " --data-directory /var/lib/synapse \\"
+ elog " --report-stats=no"
+ einfo
+ else
+ einfo
+ einfo "Please refer to upgrade notes if any special steps are required"
+ einfo "to upgrade from the version you currently have installed:"
+ einfo
+ einfo " https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+ einfo
+ fi
+}
diff --git a/net-im/teams/teams-1.4.00.13653-r2.ebuild b/net-im/teams/teams-1.4.00.13653-r3.ebuild
index 3dd90b904b90..46c746a8d637 100644
--- a/net-im/teams/teams-1.4.00.13653-r2.ebuild
+++ b/net-im/teams/teams-1.4.00.13653-r3.ebuild
@@ -27,10 +27,11 @@ QA_PREBUILT="*"
# libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6,
# apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
RDEPEND="
- app-accessibility/at-spi2-core:2
- app-accessibility/at-spi2-atk:2
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/expat
dev-libs/glib
dev-libs/nspr
@@ -73,7 +74,7 @@ src_prepare() {
}
src_install() {
- rm _gpgorigin || die
+ rm -f _gpgorigin || die
rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die
rm -r "usr/share/${PN}/resources/tmp" || die
rm "usr/share/${PN}/chrome-sandbox" || die
diff --git a/net-im/teams/teams-1.4.00.26453-r1.ebuild b/net-im/teams/teams-1.4.00.26453-r2.ebuild
index 3f93b3cfb662..d8f3285bf66f 100644
--- a/net-im/teams/teams-1.4.00.26453-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.26453-r2.ebuild
@@ -27,10 +27,11 @@ QA_PREBUILT="*"
# libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18),
# libstdc++6 (>= 4.8.1)
RDEPEND="
- app-accessibility/at-spi2-core:2
- app-accessibility/at-spi2-atk:2
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/expat
dev-libs/glib
dev-libs/nspr
@@ -73,7 +74,7 @@ src_prepare() {
}
src_install() {
- rm _gpgorigin || die
+ rm -f _gpgorigin || die
rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die
rm -r "usr/share/${PN}/resources/tmp" || die
rm "usr/share/${PN}/chrome-sandbox" || die
diff --git a/net-im/teams/teams-1.4.00.7556-r1.ebuild b/net-im/teams/teams-1.4.00.7556-r2.ebuild
index 295d2e9e2bd5..16c36bbc7330 100644
--- a/net-im/teams/teams-1.4.00.7556-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.7556-r2.ebuild
@@ -23,9 +23,11 @@ QA_PREBUILT="*"
# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1,
# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1)
RDEPEND="
- app-accessibility/at-spi2-atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/expat
dev-libs/glib
dev-libs/nspr
@@ -70,7 +72,7 @@ src_configure() {
}
src_install() {
- rm _gpgorigin || die
+ rm -f _gpgorigin || die
doins -r .
fperms +x /usr/bin/teams
diff --git a/net-im/teams/teams-1.5.00.10453.ebuild b/net-im/teams/teams-1.5.00.10453-r1.ebuild
index 3fd38c8df204..f792495ae547 100644
--- a/net-im/teams/teams-1.5.00.10453.ebuild
+++ b/net-im/teams/teams-1.5.00.10453-r1.ebuild
@@ -27,10 +27,11 @@ QA_PREBUILT="*"
# libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18),
# libstdc++6 (>= 4.8.1)
RDEPEND="
- app-accessibility/at-spi2-core:2
- app-accessibility/at-spi2-atk:2
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/expat
dev-libs/glib
dev-libs/nspr
@@ -73,7 +74,7 @@ src_prepare() {
}
src_install() {
- rm _gpgorigin || die
+ rm -f _gpgorigin || die
rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die
rm -r "usr/share/${PN}/resources/tmp" || die
rm "usr/share/${PN}/chrome-sandbox" || die
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 419f550db27d..0c8be03ed1a7 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,6 @@
-DIST tdesktop-3.7.3.tar.gz 16335926 BLAKE2B 7e7760a3684b50541144c72c1b0e3e36f1b1e9bc6eef20c3fdc151f0658f7d3c867eb895242efdf916fa6057ee61ea54ce822bab8fc82a6e17e41c26f9dfdd84 SHA512 359325cf6fefc29234b7032235cc033b9844ff597aeb7b3c6b99e8e6923d52994e8767524ff37afd5d098e4005e03d1f9c8308d6a04481831fa53e22935ee049
-DIST tdesktop-4.0.2.tar.gz 16636296 BLAKE2B afd9e8277532b21367b9f75059e9bb4efa69231dae2ad9a78119fee3eddfd804507a647da663a26bcdf7ca0749eb1ab4e2824d81452836f4804dd7a19dedd0e6 SHA512 0a8f587e55e634b500346cd77508fc9b4f76f75eaf080d50c4f2a6867eeabcecb3f814624971b97cc465f6f8d88aa79998899c299b70ada43a43904a830b5ad0
-DIST tsetup.3.7.3.tar.xz 41978536 BLAKE2B 1ab5b63479acedee3b3059382761e887c7a9eca899e6496b223f32758a4f23a17da296940203765593cdac9df8a4d80264adbdf9a51b7f70d9ffc90a41661346 SHA512 05339778ea218c84406cceff7b6dfd357ff55d02f8082d222a9430aebe0a34561e9801fb4ebb44ce01c127cbca17ea53e3d61ab4d9288976d556453b9d06bce8
-DIST tsetup.4.0.2.tar.xz 43401944 BLAKE2B 705da23c4c68498c693e6908374447fd24a24434a866b4a51a11b7dbe250f6268d56f0a16a64b5aefb8ed5d4ca13fd1dacc4b1e0cf57df873403eb07f96e34cc SHA512 790a1bcc0e34ddc8d483978d9c32fe3409b1e42092647e106fef3731066cb5bd5b7c045143ef949d341be7981a8ba5d3906dd2b50eaf22c4e0b2d23ab4805c36
+DIST tdesktop-4.1.0.tar.gz 16990380 BLAKE2B f037dbd8a3a7e30d906a8b4a1244b15fbad7304924033751dd89a0d7aa4db7d17d08821cfed53ff00977793d0974c675c7fea96e614d9a5cbf4d7026beac7ec1 SHA512 50c61a22d0953992cfd6a9eab0ca1ed87e2367e06cf47d51ce7339b93cd49a57ec6a6b5a4a4496f2e8ab71fdf968dc1850844e005eae48fb34ae35040225fbb1
+DIST tdesktop-4.2.0.tar.gz 17060742 BLAKE2B 3f85f903e07bf3a18357c7ec184f9a87863f50306715ad1c1dd03a88b6dff245b2bb7bdf7caf9d31e841f4dbee91be23dcd7d733f53c71b66ede5b9ec252d594 SHA512 48164145da0b6ff54260cfa9c07750da2461ff1c9b6abe0579f35e59dc16f87caa050a464c705b0f6afb186b8d7ee5d30e01be8033c777a4db4c0cd2dcd36382
+DIST tdesktop-4.2.4.tar.gz 17065673 BLAKE2B d2fd5db5d216b369902f697f8b2613fbb62ae7b788e08dc33f410a62547c335a8c20f2099989bb8eaaf92a81320e4fc24a3aaf266c6632b2264271e95c8b01ec SHA512 cc4cc3be490de750cb3a048a861d492bea1d2484160ee70b102979b8b446349333effe29f1b51fa014c7a65a4901779fa58f6b0d86ae12864f85d014e8f36d20
+DIST tsetup.4.1.0.tar.xz 43918764 BLAKE2B 05a34d44583aace5ae261d46a1c7382a63bb8a52f8ca07513011d6221b67f835a3f5a4f38a0c9036614cf8e944c71c9be16e344b24c5cf41b293f3b02bdd8170 SHA512 f226a98ea4ba97a3643adcbe2c883082dff72de25a5aa3a246beef78930eaed4e45fa1b4e46a179444660c7be06c124dbe27802271fa6ff0991ab3ac60f8e470
+DIST tsetup.4.2.0.tar.xz 44483976 BLAKE2B ca48fe1e4e92d4cfcfc7601a46ce72dbc3db3fb434ce5c04a4cfdaa6f6b9facc8d5973132798d456401125968a404a5f8b22f872dcb4f7ae07a925d6b8d68469 SHA512 e07f8db5eaa0c46a795887f0bf9ea96bd10c0d48fb1d4a496eb51beb487e92432512839466126067707f2314a6b9d021e15958271f8eeb2a9ad6db86780b997d
+DIST tsetup.4.2.4.tar.xz 46792948 BLAKE2B 20ebef199dc526de1e786ebd76dfd40d557f4211ae4c37d080f010738a710efe4ed2e5100c81249d49efb4902f7333f4548bff00a50eb284269dbd2aaff1bd21 SHA512 3397e480334605ebe7a8a3f3c6211adea8be0b759749e4beb579a6c4a75cb13accc3be5fa62c1d784fd6f0b92c66be15e986ed83c4fde29a38766b48a013b104
diff --git a/net-im/telegram-desktop-bin/metadata.xml b/net-im/telegram-desktop-bin/metadata.xml
index c54fafcb7a57..398b85731d09 100644
--- a/net-im/telegram-desktop-bin/metadata.xml
+++ b/net-im/telegram-desktop-bin/metadata.xml
@@ -5,10 +5,6 @@
<email>henning@hennsch.de</email>
<name>Henning Schild</name>
</maintainer>
- <maintainer type="person">
- <email>np-hardass@gentoo.org</email>
- <name>Adam Feldman</name>
- </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.1.0.ebuild
index d0558b783945..d0558b783945 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.1.0.ebuild
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.0.ebuild
index 40ecf6ecfb9d..d0558b783945 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.0.ebuild
@@ -17,9 +17,6 @@ SLOT="0"
KEYWORDS="-* ~amd64"
QA_PREBUILT="usr/bin/telegram-desktop"
-# current desktop-file-utils-0.26 does not understand Version=1.5
-# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59
-QA_DESKTOP_FILE="usr/share/applications/telegramdesktop.desktop"
RDEPEND="
sys-libs/glibc
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild
new file mode 100644
index 000000000000..d0558b783945
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.2.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+ https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+ amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+ sys-libs/glibc
+ dev-libs/glib:2
+ >=media-libs/fontconfig-2.13
+ media-libs/freetype:2
+ virtual/opengl
+ x11-libs/libX11
+ >=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+ newbin Telegram telegram-desktop
+
+ insinto /etc/tdesktop
+ newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
+
+ local icon_size
+ for icon_size in 16 32 48 64 128 256 512; do
+ newicon -s "${icon_size}" \
+ "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+ telegram.png
+ done
+
+ domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 5e1ddfb6238b..adc3d1e0d03a 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,2 +1,2 @@
-DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
+DIST tdesktop-4.2.4-full.tar.gz 49210806 BLAKE2B 5900f977156f8ec98098a5e2fe97efcc5c2d7e2768123268e4b232e384c47a02fec11b3d5d875f99134aace9d3d7f937defb83ea1572d41c7df52f4d1bda1e9c SHA512 c0b458e4f21855d1041f7343ffdd501890a7535d040b45a8bd565e545d5bc01a00703af65e14ae407bf53f81a6d28d3f7d6afa664eb5b8e5641b21bb8e669a3a
diff --git a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
index 35781fda0ced..7550828ef59e 100644
--- a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
+++ b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
@@ -1,3 +1,5 @@
+https://bugs.gentoo.org/830180
+
--- tdesktop-3.3.0-full.orig/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
+++ tdesktop-3.3.0-full/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
@@ -34,7 +34,7 @@
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
deleted file mode 100644
index 4f5c7017e6ac..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Only link jemalloc for the Telegram binary
-
-Some combination of factors is making the different codegen tools hang when
-jemalloc is linked for those, and they're ran under portage's sandbox. Since
-this is only used during build-time, and jemalloc is merely necessary to
-improve runtime memory use, it's unnecessary to use it for anything else.
-
---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
-@@ -1357,6 +1357,12 @@
- desktop-app::external_kwayland
- )
- endif()
-+
-+ target_link_libraries(Telegram
-+ PRIVATE
-+ desktop-app::linux_jemalloc_helper
-+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+ )
- endif()
-
- if (build_macstore)
---- tdesktop-3.5.2-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.5.2-full/cmake/options_linux.cmake
-@@ -64,8 +64,6 @@
-
- target_link_libraries(common_options
- INTERFACE
-- desktop-app::linux_jemalloc_helper
-- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
- ${CMAKE_DL_LIBS}
- )
-
diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
deleted file mode 100644
index bd3595858c20..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Optionally disable jemalloc
-
-Telegram upstream heavily insists you use the jemalloc allocator. This is due
-to the high memory usage resulting from the glibc allocator. It is unknown why
-this affects telegram the way it does, but upstream solved the issue by using a
-different allocator. Initially they used mallocng, now jemalloc.
-
-However, other libcs don't necessarily need this, and as such this should be
-optional. As mallocng is a fork of musl's allocator, and this was used before
-the switch to jemalloc, the musl allocator should still be OK.
-
-Please warn glibc users about disabling jemalloc, don't report bugs about
-memory usage upstream unless you're using jemalloc.
-
-Related info:
-https://github.com/telegramdesktop/tdesktop/issues/16084
-https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-
---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
-@@ -1358,11 +1358,13 @@
- )
- endif()
-
-- target_link_libraries(Telegram
-- PRIVATE
-- desktop-app::linux_jemalloc_helper
-- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-- )
-+ if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+ target_link_libraries(Telegram
-+ PRIVATE
-+ desktop-app::linux_jemalloc_helper
-+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+ )
-+ endif()
- endif()
-
- if (build_macstore)
---- tdesktop-3.5.2-full.orig/cmake/CMakeLists.txt
-+++ tdesktop-3.5.2-full/cmake/CMakeLists.txt
-@@ -5,7 +5,7 @@
- # https://github.com/desktop-app/legal/blob/master/LEGAL
-
- add_subdirectory(external)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
- add_subdirectory(linux_jemalloc_helper)
- endif()
- if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
---- tdesktop-3.5.2-full.orig/cmake/external/CMakeLists.txt
-+++ tdesktop-3.5.2-full/cmake/external/CMakeLists.txt
-@@ -37,7 +37,7 @@
- add_checked_subdirectory(hunspell)
- endif()
- add_checked_subdirectory(iconv)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
- add_checked_subdirectory(jemalloc)
- endif()
- add_checked_subdirectory(jpeg)
---- tdesktop-3.5.2-full.orig/cmake/variables.cmake
-+++ tdesktop-3.5.2-full/cmake/variables.cmake
-@@ -26,6 +26,7 @@
- option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF)
- option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF)
- option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF)
-+option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (Linux only)." OFF)
- option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
- option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
- option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
index 6836e6935049..18240ce522e2 100644
--- a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
@@ -5,6 +5,8 @@ jemalloc is linked for those, and they're ran under portage's sandbox. Since
this is only used during build-time, and jemalloc is merely necessary to
improve runtime memory use, it's unnecessary to use it for anything else.
+https://bugs.gentoo.org/802624
+
--- tdesktop-3.6.0-full.orig/Telegram/CMakeLists.txt
+++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt
@@ -1376,6 +1376,14 @@
diff --git a/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..a7710e145443
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram.patch
@@ -0,0 +1,43 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+https://bugs.gentoo.org/802624
+
+--- tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt
+@@ -1478,6 +1478,14 @@
+ desktop-app::external_wayland_client
+ )
+ endif()
++
++ if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
++ target_link_libraries(Telegram
++ INTERFACE
++ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
++ $<LINK_ONLY:desktop-app::external_jemalloc>
++ )
++ endif()
+ endif()
+
+ if (build_macstore)
+--- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake
++++ tdesktop-4.2.4-full/cmake/options_linux.cmake
+@@ -78,14 +78,6 @@
+ )
+ endif()
+
+-if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
+- target_link_libraries(common_options
+- INTERFACE
+- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+- $<LINK_ONLY:desktop-app::external_jemalloc>
+- )
+-endif()
+-
+ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
+ target_link_options(common_options
+ INTERFACE
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index d0e2c0f4aa4f..5359672b12eb 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -10,8 +10,10 @@
<name>Proxy Maintainers</name>
</maintainer>
<use>
- <flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
- <flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
- <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
+ <flag name="enchant">Enable the <pkg>app-text/aspell</pkg> spell-checking backend</flag>
+ <flag name="hunspell">Enable the <pkg>app-text/hunspell</pkg> spell-checking backend</flag>
+ <flag name="fonts">Use builtin patched copy of open-sans fonts (overrides fontconfig)</flag>
+ <flag name="qt6">Build with Qt6 support</flag>
+ <flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag>
</use>
</pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
index ed70c3f67a7b..43b266565f32 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
@@ -158,5 +158,5 @@ pkg_postinst() {
ewarn
fi
optfeature_header
- optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
+ optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4
}
diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.2.4.ebuild
index 757e0eab2ba4..56002aede441 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.2.4.ebuild
@@ -3,9 +3,9 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
+inherit xdg cmake python-any-r1 optfeature
DESCRIPTION="Official desktop client for Telegram"
HOMEPAGE="https://desktop.telegram.org"
@@ -16,45 +16,60 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +fonts +hunspell +jemalloc screencast +spell qt6 qt6-imageformats wayland +X"
REQUIRED_USE="
spell? (
^^ ( enchant hunspell )
)
+ qt6-imageformats? ( qt6 )
"
+KIMAGEFORMATS_RDEPEND="
+ media-libs/libavif:=
+ media-libs/libheif:=
+ media-libs/libjxl
+"
RDEPEND="
!net-im/telegram-desktop-bin
app-arch/lz4:=
dev-cpp/abseil-cpp:=
+ dev-libs/glib:2
dev-libs/libdispatch
+ dev-libs/libsigc++:2
dev-libs/openssl:=
dev-libs/xxhash
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
- >=dev-qt/qtimageformats-5.15:5
- >=dev-qt/qtnetwork-5.15:5[ssl]
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtwidgets-5.15:5[png,X?]
- media-fonts/open-sans
media-libs/fontconfig:=
- ~media-libs/libtgvoip-2.4.4_p20220117
+ media-libs/libjpeg-turbo:=
+ ~media-libs/libtgvoip-2.4.4_p20220503
media-libs/openal
media-libs/opus:=
media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20220209[screencast=,X=]
+ ~media-libs/tg_owt-0_pre20220507:=[screencast=,X=]
media-video/ffmpeg:=[opus]
sys-libs/zlib:=[minizip]
- dbus? (
- dev-cpp/glibmm:2
- dev-qt/qtdbus:5
- dev-libs/libdbusmenu-qt[qt5(+)]
- )
+ x11-libs/xcb-util-keysyms
+ dbus? ( dev-cpp/glibmm:2 )
enchant? ( app-text/enchant:= )
hunspell? ( >=app-text/hunspell-1.7:= )
jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
- wayland? ( kde-frameworks/kwayland:= )
+ !qt6? (
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+ >=dev-qt/qtimageformats-5.15:5
+ >=dev-qt/qtnetwork-5.15:5[ssl]
+ >=dev-qt/qtsvg-5.15:5
+ >=dev-qt/qtwidgets-5.15:5[png,X?]
+ kde-frameworks/kcoreaddons:=
+ )
+ qt6? (
+ dev-qt/qt5compat:6
+ dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
+ dev-qt/qtimageformats:6
+ dev-qt/qtsvg:6
+ wayland? ( dev-qt/qtwayland:6 )
+ qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} )
+ )
X? ( x11-libs/libxcb:= )
"
DEPEND="${RDEPEND}
@@ -69,16 +84,16 @@ BDEPEND="
# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
PATCHES=(
- "${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch"
+ "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
"${FILESDIR}/tdesktop-3.5.2-musl.patch"
- "${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch"
- "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch"
)
+# Current desktop-file-utils-0.26 does not understand Version=1.5
+QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
+
pkg_pretend() {
if has ccache ${FEATURES}; then
- ewarn
ewarn "ccache does not work with ${PN} out of the box"
ewarn "due to usage of precompiled headers"
ewarn "check bug https://bugs.gentoo.org/715114 for more info"
@@ -87,9 +102,20 @@ pkg_pretend() {
}
src_prepare() {
- # no explicit toggle, doesn't build with the system one #752417
- sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
- cmake/external/rlottie/CMakeLists.txt || die
+ # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to
+ # build in gentoo right now.
+ if use qt6-imageformats; then
+ sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \
+ cmake/external/kimageformats/CMakeLists.txt
+ printf "%s\n" \
+ 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \
+ 'Q_IMPORT_PLUGIN(HEIFPlugin)' \
+ 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \
+ >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp
+ fi
+
+ # kde-frameworks/kcoreaddons is bundled when using qt6, see:
+ # cmake/external/kcoreaddons/CMakeLists.txt
cmake_src_prepare
}
@@ -98,17 +124,15 @@ src_configure() {
local mycmakeargs=(
-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
- -DDESKTOP_APP_QT6=OFF
+ -DQT_VERSION_MAJOR=$(usex qt6 6 5)
-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+ -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell) # enables hunspell (recommended)
-DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell
-
- # This option is heavily discouraged by upstream.
- # See files/tdesktop-*-jemalloc-optional.patch
- -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
+ -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) # use system fonts instead of bundled ones
)
if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -140,8 +164,8 @@ src_configure() {
pkg_postinst() {
xdg_pkg_postinst
if ! use X && ! use screencast; then
- elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
- elog
+ ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
+ ewarn
fi
if has_version '<dev-qt/qtcore-5.15.2-r10'; then
ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
@@ -149,10 +173,32 @@ pkg_postinst() {
ewarn
fi
if ! use jemalloc && use elibc_glibc; then
+ # https://github.com/telegramdesktop/tdesktop/issues/16084
+ # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
ewarn "Do NOT report issues about RAM usage without enabling this flag first."
ewarn
fi
+ if use qt6; then
+ ewarn "Qt6 support in gentoo is experimental."
+ ewarn "Please report any issues you may find, but don't expect"
+ ewarn "everything to work correctly as of yet."
+ ewarn
+ fi
+ if use wayland && ! use qt6; then
+ ewarn "Wayland-specific integrations have been deprecated with Qt5."
+ ewarn "The app will continue to function under wayland, but some"
+ ewarn "functionality may be reduced."
+ ewarn "These integrations are only supported when built with Qt6."
+ ewarn
+ fi
+ if use qt6 && ! use qt6-imageformats; then
+ elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support"
+ elog
+ fi
optfeature_header
- optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
+ optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4
+ if ! use qt6; then
+ optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats
+ fi
}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
index 9e53f3cc8b69..a98e75125f0a 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
inherit gnome2 python-any-r1 virtualx
DESCRIPTION="Daemon that centralizes the communication logging within the Telepathy framework"
diff --git a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild b/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
index 878a21a4c1b2..3bc82dffd99c 100644
--- a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
+++ b/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
@@ -26,9 +26,10 @@ SLOT="0"
RESTRICT="bindist mirror"
RDEPEND="
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib
dev-libs/nspr
diff --git a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2-r1.ebuild
index dec45a3a26f8..4210323ad7f2 100644
--- a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild
+++ b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2-r1.ebuild
@@ -29,8 +29,10 @@ SLOT="0"
RESTRICT="bindist mirror"
RDEPEND="
- app-accessibility/at-spi2-atk:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/libappindicator
dev-libs/nspr
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 2e53b525aceb..797ef57774ca 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,3 +1,2 @@
-DIST zoom-5.10.7.3311_x86_64.tar.xz 130117904 BLAKE2B d3ad7501ec6fc495c62bb783c79690f5424c7e07b0cad1a3e71e20633e9df088c918a0b9a4cc5a956b016e6144da4998567ebb3ef393452caf8814d4e300c186 SHA512 acf31bc5e983500f534ccfcfe0b935a735e4a259bcfb37d99109bed41d0f3f561a664c5cbf728f907feb8ec5e79a13a27dc39c01948ee2e9f1bab2288e450231
-DIST zoom-5.11.0.3540_x86_64.tar.xz 131577872 BLAKE2B 11d40635b83469672bd9da1aea3312b735ff924d85faf515f435dba1e11c2b957c76d56a05490b2d55d4f3db3fc84b46a96a3cdd23ab2e137e4f4e9d8c87d109 SHA512 6b58e1978710f1293438164edb02ab0920e479851f7fee137bdbdc13b9d70d168a253ec140f68c6922d523e183808a31bb3527fea893bf480e1a34f7e703b5f6
-DIST zoom-5.11.1.3595_x86_64.tar.xz 131583416 BLAKE2B 9848b198bc8c523287e68d85ec42bbb5c1fc6448210c4104273bf6680f4fa2f460a5f880f07d6d5d65aa83cd58c82b071be83205e505c097c205370cd1304c35 SHA512 9e02dcbd33369334521cc51f8a64db1f677fe887773fa73e4ade10f01a0e0ac48cce3ff6ce962d52208935ecf19f82c22c9d81702e9839c30f0cdaa3fd9fde4e
+DIST zoom-5.11.10.4400_x86_64.tar.xz 132583796 BLAKE2B a81771f5f07943d28f5ad9e2d1d349ca1245841f69589c552cf8db81179486e9e6dad12db13bb9403d184d28f994255ec124077c163025fd21b5f9882eb16c3c SHA512 d662c58877f5976ca8e4fd4b77ec67fe8769e3954df9a13fe1f7ddd4073db2df430287dbe5b124dbfad854deaa73f5a89dbbc5131a058c85c6f6ed3f5f0767ec
+DIST zoom-5.11.9.4300_x86_64.tar.xz 132589368 BLAKE2B 44232cb69d69f2be15639d7c633a311645d645b93e9c367e74ab3df5153b9cbbe2ac8d8554849d56b8512b50357637aa9134893174014571929a6deb6fdba0c9 SHA512 421ad949f9e3a266170864551336f40daeb6e72979174ec8fc796eadb5e5b132f7267c812d92a845fa9d5ca94aacc047336ab655246d8de56b7844432952811b
diff --git a/net-im/zoom/zoom-5.11.1.3595.ebuild b/net-im/zoom/zoom-5.11.1.3595.ebuild
deleted file mode 100644
index de370171be34..000000000000
--- a/net-im/zoom/zoom-5.11.1.3595.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/quazip-1.0:0=
- media-libs/alsa-lib
- media-libs/fdk-aac:0/2
- media-libs/fontconfig
- media-libs/freetype
- media-libs/mesa[gbm(+)]
- media-sound/mpg123
- net-print/cups
- sys-apps/dbus
- sys-apps/util-linux
- sys-libs/glibc
- virtual/opengl
- x11-libs/cairo
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libxkbcommon[X]
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libxshmfence
- x11-libs/libXtst
- x11-libs/pango
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- opencl? ( virtual/opencl )
- pulseaudio? ( media-sound/pulseaudio )
- wayland? ( dev-libs/wayland )
- !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
- !bundled-qt? (
- dev-libs/icu
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5[widgets]
- dev-qt/qtdiag:5
- dev-qt/qtgraphicaleffects:5
- dev-qt/qtgui:5
- dev-qt/qtlocation:5
- dev-qt/qtnetwork:5
- dev-qt/qtquickcontrols:5[widgets]
- dev-qt/qtquickcontrols2:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- wayland? ( dev-qt/qtwayland )
- )"
-
-BDEPEND="dev-util/bbe
- bundled-libjpeg-turbo? ( dev-util/patchelf )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
- default
-
- # The tarball doesn't contain an icon, so extract it from the binary
- bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
- >videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
- || die "Extraction of icon failed"
-
- if ! use pulseaudio; then
- # For some strange reason, zoom cannot use any ALSA sound devices if
- # it finds libpulse. This causes breakage if media-sound/apulse[sdk]
- # is installed. So, force zoom to ignore libpulse.
- bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
- mv zoom.tmp zoom || die
- fi
-
- if use bundled-libjpeg-turbo; then
- # Remove insecure RPATH from bundled lib
- patchelf --remove-rpath libturbojpeg.so || die
- fi
-}
-
-src_install() {
- insinto /opt/zoom
- exeinto /opt/zoom
- doins -r cef json ringtone scheduler sip timezones translations
- doins *.pcm Embedded.properties version.txt
- doexe zoom zopen ZoomLauncher *.sh
- dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
- dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
- dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
- if use opencl; then
- doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
- dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
- fi
-
- if use bundled-libjpeg-turbo; then
- doexe libturbojpeg.so
- else
- dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
- fi
-
- if use bundled-qt; then
- doexe libicu*.so.56 libQt5*.so.5
- doins qt.conf
-
- local dirs="Qt* bearer generic iconengines imageformats \
- platforminputcontexts platforms wayland* xcbglintegrations"
- doins -r ${dirs}
- find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \
- -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-
- ( # Remove libs and plugins with unresolved soname dependencies
- cd "${ED}"/opt/zoom || die
- rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \
- QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \
- platforms/libqeglfs.so platforms/libqlinuxfb.so || die
- use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \
- platforms/libqwayland*.so || die
- )
- else
- local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
- if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
- ewarn "You have disabled the bundled-qt USE flag."
- ewarn "You may experience problems when running Zoom with"
- ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
- ewarn "See https://bugs.gentoo.org/798681 for details."
- fi
- fi
-
- make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
- make_desktop_entry "zoom %U" Zoom videoconference-zoom \
- "Network;VideoConference;" \
- "MimeType=$(printf '%s;' \
- x-scheme-handler/zoommtg \
- x-scheme-handler/zoomus \
- application/x-zoom)"
- doicon videoconference-zoom.svg
- doicon -s scalable videoconference-zoom.svg
-
- local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
- the whiteboard) require display compositing. If you encounter
- a black window when sharing the screen, then one of the following
- actions should help:
- \\n- Enable compositing in your window manager if it is supported
- \\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
- use wayland \
- && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
- edit ~/.config/zoomus.conf and change the value of
- enableWaylandShare to true."
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.10.7.3311.ebuild b/net-im/zoom/zoom-5.11.10.4400-r1.ebuild
index de370171be34..1f9950a803ee 100644
--- a/net-im/zoom/zoom-5.10.7.3311.ebuild
+++ b/net-im/zoom/zoom-5.11.10.4400-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit desktop readme.gentoo-r1 wrapper xdg-utils
+inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
DESCRIPTION="Video conferencing and web conferencing service"
HOMEPAGE="https://zoom.us/"
@@ -17,14 +17,15 @@ IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
RESTRICT="mirror bindist strip"
RDEPEND="!games-engines/zoom
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
- >=dev-libs/quazip-1.0:0=
+ >=dev-libs/quazip-1.0:0=[qt5(+)]
media-libs/alsa-lib
media-libs/fdk-aac:0/2
media-libs/fontconfig
@@ -53,7 +54,7 @@ RDEPEND="!games-engines/zoom
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
opencl? ( virtual/opencl )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
wayland? ( dev-libs/wayland )
!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
!bundled-qt? (
@@ -77,6 +78,7 @@ RDEPEND="!games-engines/zoom
BDEPEND="dev-util/bbe
bundled-libjpeg-turbo? ( dev-util/patchelf )"
+CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
QA_PREBUILT="opt/zoom/*"
src_prepare() {
@@ -166,10 +168,6 @@ src_install() {
actions should help:
\\n- Enable compositing in your window manager if it is supported
\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
- use wayland \
- && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
- edit ~/.config/zoomus.conf and change the value of
- enableWaylandShare to true."
readme.gentoo_create_doc
}
diff --git a/net-im/zoom/zoom-5.11.0.3540.ebuild b/net-im/zoom/zoom-5.11.9.4300-r5.ebuild
index de370171be34..1f9950a803ee 100644
--- a/net-im/zoom/zoom-5.11.0.3540.ebuild
+++ b/net-im/zoom/zoom-5.11.9.4300-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit desktop readme.gentoo-r1 wrapper xdg-utils
+inherit desktop linux-info readme.gentoo-r1 wrapper xdg-utils
DESCRIPTION="Video conferencing and web conferencing service"
HOMEPAGE="https://zoom.us/"
@@ -17,14 +17,15 @@ IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
RESTRICT="mirror bindist strip"
RDEPEND="!games-engines/zoom
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
- >=dev-libs/quazip-1.0:0=
+ >=dev-libs/quazip-1.0:0=[qt5(+)]
media-libs/alsa-lib
media-libs/fdk-aac:0/2
media-libs/fontconfig
@@ -53,7 +54,7 @@ RDEPEND="!games-engines/zoom
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
opencl? ( virtual/opencl )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
wayland? ( dev-libs/wayland )
!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
!bundled-qt? (
@@ -77,6 +78,7 @@ RDEPEND="!games-engines/zoom
BDEPEND="dev-util/bbe
bundled-libjpeg-turbo? ( dev-util/patchelf )"
+CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
QA_PREBUILT="opt/zoom/*"
src_prepare() {
@@ -166,10 +168,6 @@ src_install() {
actions should help:
\\n- Enable compositing in your window manager if it is supported
\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
- use wayland \
- && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland,
- edit ~/.config/zoomus.conf and change the value of
- enableWaylandShare to true."
readme.gentoo_create_doc
}