summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/biboumi/Manifest1
-rw-r--r--net-im/biboumi/biboumi-9.0-r4.ebuild124
-rw-r--r--net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch301
-rw-r--r--net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch229
-rw-r--r--net-im/biboumi/files/biboumi.initd21
-rw-r--r--net-im/biboumi/files/biboumi.logrotate10
-rw-r--r--net-im/biboumi/metadata.xml21
-rw-r--r--net-im/bitlbee/bitlbee-3.6-r1.ebuild6
-rw-r--r--net-im/bitlbee/bitlbee-9999.ebuild6
-rw-r--r--net-im/cawbird/Manifest1
-rw-r--r--net-im/cawbird/cawbird-1.5-r2.ebuild70
-rw-r--r--net-im/cawbird/metadata.xml11
-rw-r--r--net-im/choqok/Manifest1
-rw-r--r--net-im/choqok/choqok-1.7.0-r1.ebuild (renamed from net-im/choqok/choqok-1.7.0.ebuild)27
-rw-r--r--net-im/corebird/Manifest1
-rw-r--r--net-im/corebird/corebird-1.7.4-r2.ebuild59
-rw-r--r--net-im/corebird/metadata.xml11
-rw-r--r--net-im/coturn/coturn-4.5.2-r1.ebuild (renamed from net-im/coturn/coturn-4.5.2.ebuild)25
-rw-r--r--net-im/coturn/coturn-9999.ebuild33
-rw-r--r--net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch24
-rw-r--r--net-im/dino/Manifest2
-rw-r--r--net-im/dino/dino-0.2.1-r1.ebuild (renamed from net-im/dino/dino-0.2.1.ebuild)4
-rw-r--r--net-im/dino/dino-0.3.0.ebuild (renamed from net-im/dino/dino-0.2.2.ebuild)20
-rw-r--r--net-im/dino/dino-9999.ebuild4
-rw-r--r--net-im/dino/metadata.xml5
-rw-r--r--net-im/discord-bin/Manifest2
-rw-r--r--net-im/discord-bin/discord-bin-0.0.16-r4.ebuild94
-rw-r--r--net-im/discord-bin/discord-bin-0.0.18.ebuild131
-rw-r--r--net-im/discord-bin/metadata.xml9
-rw-r--r--net-im/ejabberd/Manifest5
-rw-r--r--net-im/ejabberd/ejabberd-20.04.ebuild294
-rw-r--r--net-im/ejabberd/ejabberd-21.04.ebuild275
-rw-r--r--net-im/ejabberd/ejabberd-21.12-r1.ebuild (renamed from net-im/ejabberd/ejabberd-21.12.ebuild)26
-rw-r--r--net-im/ejabberd/ejabberd-22.05-r1.ebuild (renamed from net-im/ejabberd/ejabberd-21.04-r2.ebuild)170
-rw-r--r--net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch15
-rw-r--r--net-im/ejabberd/files/ejabberd-22.05.initd54
-rw-r--r--net-im/ejabberd/files/ejabberd-22.05.logrotate13
-rw-r--r--net-im/ejabberd/files/ejabberd.tmpfiles.conf2
-rw-r--r--net-im/ejabberd/metadata.xml2
-rw-r--r--net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild4
-rw-r--r--net-im/ekg2/ekg2-9999.ebuild4
-rw-r--r--net-im/element-desktop-bin/Manifest2
-rw-r--r--net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild (renamed from net-im/element-desktop-bin/element-desktop-bin-1.9.8.ebuild)30
-rw-r--r--net-im/element-desktop-bin/metadata.xml3
-rw-r--r--net-im/empathy/empathy-3.12.14.ebuild4
-rw-r--r--net-im/err/Manifest2
-rw-r--r--net-im/err/err-6.1.8-r1.ebuild93
-rw-r--r--net-im/err/err-6.1.9.ebuild91
-rw-r--r--net-im/err/files/err-6.1.8-fix-irc-backend.patch18
-rw-r--r--net-im/err/metadata.xml9
-rw-r--r--net-im/gajim/Manifest6
-rw-r--r--net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff44
-rw-r--r--net-im/gajim/gajim-1.3.3-r2.ebuild (renamed from net-im/gajim/gajim-1.3.3-r1.ebuild)6
-rw-r--r--net-im/gajim/gajim-1.3.3_p2-r1.ebuild (renamed from net-im/gajim/gajim-1.3.2.ebuild)22
-rw-r--r--net-im/gajim/gajim-1.4.0-r1.ebuild97
-rw-r--r--net-im/gajim/gajim-1.4.0.ebuild (renamed from net-im/gajim/gajim-1.3.1_p2.ebuild)26
-rw-r--r--net-im/gajim/gajim-1.4.1.ebuild97
-rw-r--r--net-im/gajim/gajim-1.4.2.ebuild97
-rw-r--r--net-im/gg-transport/Manifest1
-rw-r--r--net-im/gg-transport/files/jggtrans-2.2.419
-rw-r--r--net-im/gg-transport/gg-transport-2.2.6.ebuild50
-rw-r--r--net-im/gg-transport/metadata.xml12
-rw-r--r--net-im/jabber-base/jabber-base-0.01-r2.ebuild42
-rw-r--r--net-im/jabber-base/metadata.xml14
-rw-r--r--net-im/libcommuni/Manifest2
-rw-r--r--net-im/libcommuni/libcommuni-3.7.0.ebuild (renamed from net-im/libcommuni/libcommuni-3.6.0.ebuild)6
-rw-r--r--net-im/mattermost-desktop-bin/Manifest4
-rw-r--r--net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild (renamed from net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.2.ebuild)5
-rw-r--r--net-im/mcabber/mcabber-1.1.2-r1.ebuild (renamed from net-im/mcabber/mcabber-1.1.2.ebuild)4
-rw-r--r--net-im/mcabber/mcabber-9999.ebuild4
-rw-r--r--net-im/mcabber/metadata.xml5
-rw-r--r--net-im/neochat/neochat-1.2.0.ebuild4
-rw-r--r--net-im/pidgin/Manifest4
-rw-r--r--net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch24
-rw-r--r--net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch52
-rw-r--r--net-im/pidgin/metadata.xml5
-rw-r--r--net-im/pidgin/pidgin-2.14.10.ebuild (renamed from net-im/pidgin/pidgin-2.14.6-r1.ebuild)125
-rw-r--r--net-im/pidgin/pidgin-2.14.8.ebuild19
-rw-r--r--net-im/pidgin/pidgin-2.14.9.ebuild (renamed from net-im/pidgin/pidgin-2.14.7.ebuild)120
-rw-r--r--net-im/poezio/Manifest2
-rw-r--r--net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch9
-rw-r--r--net-im/poezio/metadata.xml4
-rw-r--r--net-im/poezio/poezio-0.14.ebuild (renamed from net-im/poezio/poezio-0.13.1-r2.ebuild)20
-rw-r--r--net-im/poezio/poezio-9999.ebuild18
-rw-r--r--net-im/profanity/Manifest1
-rw-r--r--net-im/profanity/metadata.xml5
-rw-r--r--net-im/profanity/profanity-0.12.1-r1.ebuild67
-rw-r--r--net-im/prosody-modules/Manifest2
-rw-r--r--net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild (renamed from net-im/prosody-modules/prosody-modules-0_pre20211027.ebuild)2
-rw-r--r--net-im/prosody/Manifest3
-rw-r--r--net-im/prosody/files/prosody-0.12.0-gentoo.patch (renamed from net-im/prosody/files/prosody-0.11.7-gentoo.patch)20
-rw-r--r--net-im/prosody/files/prosody.initd-r6 (renamed from net-im/prosody/files/prosody.initd-r5)24
-rw-r--r--net-im/prosody/files/prosody.service-r213
-rw-r--r--net-im/prosody/files/prosody.service-r317
-rw-r--r--net-im/prosody/files/prosody.tmpfilesd-r11
-rw-r--r--net-im/prosody/files/prosody.tmpfilesd-r21
-rw-r--r--net-im/prosody/prosody-0.11.12.ebuild102
-rw-r--r--net-im/prosody/prosody-0.12.0.ebuild164
-rw-r--r--net-im/prosody/prosody-0.12.1.ebuild164
-rw-r--r--net-im/psi/psi-9999.ebuild2
-rw-r--r--net-im/purple-events/purple-events-0.99.1.ebuild4
-rw-r--r--net-im/qtox/Manifest3
-rw-r--r--net-im/qtox/files/qtox-1.16.3-qt-5.13.patch18
-rw-r--r--net-im/qtox/qtox-1.16.3-r1.ebuild76
-rw-r--r--net-im/qtox/qtox-1.17.4.ebuild91
-rw-r--r--net-im/qtox/qtox-1.17.6.ebuild91
-rw-r--r--net-im/qtox/qtox-9999.ebuild10
-rw-r--r--net-im/rocketchat-desktop-bin/Manifest2
-rw-r--r--net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild54
-rw-r--r--net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild105
-rw-r--r--net-im/sendxmpp-amm/metadata.xml2
-rw-r--r--net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild3
-rw-r--r--net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild5
-rw-r--r--net-im/signal-cli-bin/Manifest3
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch33
-rw-r--r--net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild54
-rw-r--r--net-im/signal-desktop-bin/Manifest3
-rw-r--r--net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild99
-rw-r--r--net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild (renamed from net-im/signal-desktop-bin/signal-desktop-bin-5.27.1.ebuild)2
-rw-r--r--net-im/skypeforlinux/Manifest9
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild)3
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild)3
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild)7
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild)10
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild100
-rw-r--r--net-im/slack/Manifest1
-rw-r--r--net-im/slack/slack-4.23.0.ebuild98
-rw-r--r--net-im/spectrum2/Manifest2
-rw-r--r--net-im/spectrum2/metadata.xml4
-rw-r--r--net-im/spectrum2/spectrum2-2.1.3.ebuild (renamed from net-im/spectrum2/spectrum2-2.1.0.ebuild)4
-rw-r--r--net-im/swift/metadata.xml4
-rw-r--r--net-im/teams/Manifest1
-rw-r--r--net-im/teams/teams-1.4.00.13653-r2.ebuild3
-rw-r--r--net-im/teams/teams-1.4.00.26453-r1.ebuild3
-rw-r--r--net-im/teams/teams-1.4.00.7556-r1.ebuild3
-rw-r--r--net-im/teams/teams-1.5.00.10453.ebuild106
-rw-r--r--net-im/telegram-desktop-bin/Manifest8
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild)6
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild)1
-rw-r--r--net-im/telegram-desktop/Manifest5
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch19
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch35
-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.5.2-musl.patch33
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch41
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch75
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch55
-rw-r--r--net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch44
-rw-r--r--net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild146
-rw-r--r--net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild)46
-rw-r--r--net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild)53
-rw-r--r--net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild3
-rw-r--r--net-im/toxic/Manifest1
-rw-r--r--net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch49
-rw-r--r--net-im/toxic/toxic-0.10.1-r1.ebuild112
-rw-r--r--net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild (renamed from net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild)4
-rw-r--r--net-im/wazzapp-bin/Manifest1
-rw-r--r--net-im/wazzapp-bin/metadata.xml12
-rw-r--r--net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild104
-rw-r--r--net-im/whatsapp-desktop-bin/Manifest4
-rw-r--r--net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild54
-rw-r--r--net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild107
-rw-r--r--net-im/yowsup/Manifest2
-rw-r--r--net-im/yowsup/yowsup-3.3.0.ebuild (renamed from net-im/yowsup/yowsup-3.2.3_p20190905.ebuild)19
-rw-r--r--net-im/zoom/Manifest7
-rw-r--r--net-im/zoom/files/README.gentoo8
-rw-r--r--net-im/zoom/zoom-5.10.7.3311.ebuild (renamed from net-im/zoom/zoom-5.9.1.1380.ebuild)50
-rw-r--r--net-im/zoom/zoom-5.11.0.3540.ebuild (renamed from net-im/zoom/zoom-5.8.6.739.ebuild)59
-rw-r--r--net-im/zoom/zoom-5.11.1.3595.ebuild185
-rw-r--r--net-im/zoom/zoom-5.4.53391.1108-r3.ebuild120
171 files changed, 4092 insertions, 2425 deletions
diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest
new file mode 100644
index 00000000000..34c6c222de5
--- /dev/null
+++ b/net-im/biboumi/Manifest
@@ -0,0 +1 @@
+DIST biboumi-9.0.tar.xz 161192 BLAKE2B 27c19f5c44e23caae07bd579b01d663e73cd8b432203ac95ae77e651936eea7cc443f389e589acebe5b36c32e96f215fdf0a86c97193726d601b53b709a2d66e SHA512 cfaacd831b56031906922472275c55fd6f1a5307ebe54959d21e3799ad4612499e8beeb34e8736df9eabc9fec1a861d17567250d64f316ace47395fd6c8f3c18
diff --git a/net-im/biboumi/biboumi-9.0-r4.ebuild b/net-im/biboumi/biboumi-9.0-r4.ebuild
new file mode 100644
index 00000000000..2c45760b389
--- /dev/null
+++ b/net-im/biboumi/biboumi-9.0-r4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="XMPP gateway to IRC"
+HOMEPAGE="https://biboumi.louiz.org/"
+SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+idn postgres +sqlite +ssl systemd test udns"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ virtual/libiconv
+ sys-apps/util-linux
+ sqlite? ( dev-db/sqlite:3 )
+ postgres? ( dev-db/postgresql:* )
+ idn? ( net-dns/libidn:= )
+ udns? ( net-libs/udns )
+ ssl? ( dev-libs/botan:2= )
+ !ssl? ( dev-libs/libgcrypt )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( dev-cpp/catch:0 )
+"
+BDEPEND="dev-python/sphinx"
+RDEPEND="
+ ${COMMON_DEPEND}
+ acct-user/biboumi
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=( README.rst CHANGELOG.rst doc/user.rst )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0-do-not-use-as-a-namespace-separator-with-expat.patch"
+ "${FILESDIR}/${PN}-9.0-use-system-catch2.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DSERVICE_USER="${PN}"
+ -DSERVICE_GROUP="${PN}"
+ )
+
+ # Account for biboumi's atypical configuration system.
+ if use systemd; then
+ mycmakeargs+=(-DWITH_SYSTEMD=yes)
+ else
+ mycmakeargs+=(-DWITHOUT_SYSTEMD=yes)
+ fi
+
+ if use idn; then
+ mycmakeargs+=(-DWITH_LIBIDN=yes)
+ else
+ mycmakeargs+=(-DWITHOUT_LIBIDN=yes)
+ fi
+
+ if use ssl; then
+ mycmakeargs+=(-DWITH_BOTAN=yes)
+ else
+ mycmakeargs+=(-DWITHOUT_BOTAN=yes)
+ fi
+
+ if use udns; then
+ mycmakeargs+=(-DWITH_UDNS=yes)
+ else
+ mycmakeargs+=(-DWITHOUT_UDNS=yes)
+ fi
+
+ if use sqlite; then
+ mycmakeargs+=(-DWITH_SQLITE3=yes)
+ else
+ mycmakeargs+=(-DWITHOUT_SQLITE3=yes)
+ fi
+
+ if use postgres; then
+ mycmakeargs+=(-DWITH_POSTGRESQL=yes)
+ else
+ mycmakeargs+=(-DWITHOUT_POSTGRESQL=yes)
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ cmake_build man
+}
+
+src_test() {
+ cmake_build check
+}
+
+src_install() {
+ cmake_src_install
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+ diropts --owner=biboumi --group=biboumi --mode=750
+ if use sqlite; then
+ keepdir /var/lib/biboumi
+ fi
+ keepdir /var/log/biboumi
+
+ insinto /etc/biboumi
+ insopts --group=biboumi --mode=640
+ newins conf/biboumi.cfg biboumi.cfg.example
+}
diff --git a/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch b/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch
new file mode 100644
index 00000000000..f82cbae8192
--- /dev/null
+++ b/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch
@@ -0,0 +1,301 @@
+From 0061298dd0945f7f67e7fa340c6649b179c804d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
+Date: Thu, 10 Mar 2022 23:23:47 +0100
+Subject: [PATCH] Do not use ':' as a namespace separator with expat
+
+Instead use \1, and build our own nodes by explicitely separating the
+namespace and the node name.
+---
+ src/xmpp/adhoc_command.cpp | 6 +++---
+ src/xmpp/adhoc_commands_handler.cpp | 12 ++++++------
+ src/xmpp/biboumi_adhoc_commands.cpp | 28 ++++++++++++++--------------
+ src/xmpp/xmpp_component.cpp | 2 +-
+ src/xmpp/xmpp_parser.cpp | 2 +-
+ src/xmpp/xmpp_parser.hpp | 4 ++--
+ src/xmpp/xmpp_stanza.cpp | 14 +++++++++++++-
+ src/xmpp/xmpp_stanza.hpp | 6 ++++++
+ tests/xmpp.cpp | 2 ++
+ 9 files changed, 48 insertions(+), 28 deletions(-)
+
+diff --git a/src/xmpp/adhoc_command.cpp b/src/xmpp/adhoc_command.cpp
+index fbf4ce200b82..f8c8e4f146d6 100644
+--- a/src/xmpp/adhoc_command.cpp
++++ b/src/xmpp/adhoc_command.cpp
+@@ -26,7 +26,7 @@ void PingStep1(XmppComponent&, AdhocSession&, XmlNode& command_node)
+
+ void HelloStep1(XmppComponent&, AdhocSession&, XmlNode& command_node)
+ {
+- XmlSubNode x(command_node, "jabber:x:data:x");
++ XmlSubNode x(command_node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Configure your name.");
+@@ -65,9 +65,9 @@ void HelloStep2(XmppComponent&, AdhocSession& session, XmlNode& command_node)
+ }
+ }
+ command_node.delete_all_children();
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "modify";
+- XmlSubNode condition(error, STANZA_NS":bad-request");
++ XmlSubNode condition(error, STANZA_NS, "bad-request");
+ session.terminate();
+ }
+
+diff --git a/src/xmpp/adhoc_commands_handler.cpp b/src/xmpp/adhoc_commands_handler.cpp
+index ff4c1e5506fb..7a84b2e11a45 100644
+--- a/src/xmpp/adhoc_commands_handler.cpp
++++ b/src/xmpp/adhoc_commands_handler.cpp
+@@ -36,16 +36,16 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
+ auto command_it = this->commands.find(node);
+ if (command_it == this->commands.end())
+ {
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "cancel";
+- XmlSubNode condition(error, STANZA_NS":item-not-found");
++ XmlSubNode condition(error, STANZA_NS, "item-not-found");
+ }
+ else if (command_it->second.is_admin_only() &&
+ !Config::is_in_list("admin", jid.bare()))
+ {
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "cancel";
+- XmlSubNode condition(error, STANZA_NS":forbidden");
++ XmlSubNode condition(error, STANZA_NS, "forbidden");
+ }
+ else
+ {
+@@ -94,9 +94,9 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
+ }
+ else // unsupported action
+ {
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "modify";
+- XmlSubNode condition(error, STANZA_NS":bad-request");
++ XmlSubNode condition(error, STANZA_NS, "bad-request");
+ }
+ }
+ return command_node;
+diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
+index 792955c37ec7..aea316d64042 100644
+--- a/src/xmpp/biboumi_adhoc_commands.cpp
++++ b/src/xmpp/biboumi_adhoc_commands.cpp
+@@ -34,7 +34,7 @@ void DisconnectUserStep1(XmppComponent& xmpp_component, AdhocSession&, XmlNode&
+ {
+ auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component);
+
+- XmlSubNode x(command_node, "jabber:x:data:x");
++ XmlSubNode x(command_node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Disconnect a user from the gateway");
+@@ -108,9 +108,9 @@ void DisconnectUserStep2(XmppComponent& xmpp_component, AdhocSession& session, X
+ return;
+ }
+ }
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "modify";
+- XmlSubNode condition(error, STANZA_NS":bad-request");
++ XmlSubNode condition(error, STANZA_NS, "bad-request");
+ session.terminate();
+ }
+
+@@ -124,7 +124,7 @@ void ConfigureGlobalStep1(XmppComponent&, AdhocSession& session, XmlNode& comman
+ auto options = Database::get_global_options(owner.bare());
+
+ command_node.delete_all_children();
+- XmlSubNode x(command_node, "jabber:x:data:x");
++ XmlSubNode x(command_node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Configure some global default settings.");
+@@ -220,9 +220,9 @@ void ConfigureGlobalStep2(XmppComponent& xmpp_component, AdhocSession& session,
+ note.set_inner("Configuration successfully applied.");
+ return;
+ }
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "modify";
+- XmlSubNode condition(error, STANZA_NS":bad-request");
++ XmlSubNode condition(error, STANZA_NS, "bad-request");
+ session.terminate();
+ }
+
+@@ -238,7 +238,7 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
+ auto commands = Database::get_after_connection_commands(options);
+
+ command_node.delete_all_children();
+- XmlSubNode x(command_node, "jabber:x:data:x");
++ XmlSubNode x(command_node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Configure the IRC server " + server_domain);
+@@ -565,9 +565,9 @@ void ConfigureIrcServerStep2(XmppComponent& xmpp_component, AdhocSession& sessio
+ note.set_inner("Configuration successfully applied.");
+ return;
+ }
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "modify";
+- XmlSubNode condition(error, STANZA_NS":bad-request");
++ XmlSubNode condition(error, STANZA_NS, "bad-request");
+ session.terminate();
+ }
+
+@@ -586,7 +586,7 @@ void insert_irc_channel_configuration_form(XmlNode& node, const Jid& requester,
+ auto options = Database::get_irc_channel_options_with_server_default(requester.local + "@" + requester.domain,
+ iid.get_server(), iid.get_local());
+ node.delete_all_children();
+- XmlSubNode x(node, "jabber:x:data:x");
++ XmlSubNode x(node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Configure the IRC channel " + iid.get_local() + " on server " + iid.get_server());
+@@ -671,9 +671,9 @@ void ConfigureIrcChannelStep2(XmppComponent& xmpp_component, AdhocSession& sessi
+ }
+ else
+ {
+- XmlSubNode error(command_node, ADHOC_NS":error");
++ XmlSubNode error(command_node, ADHOC_NS, "error");
+ error["type"] = "modify";
+- XmlSubNode condition(error, STANZA_NS":bad-request");
++ XmlSubNode condition(error, STANZA_NS, "bad-request");
+ session.terminate();
+ }
+ }
+@@ -749,7 +749,7 @@ void DisconnectUserFromServerStep1(XmppComponent& xmpp_component, AdhocSession&
+ { // Send a form to select the user to disconnect
+ auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component);
+
+- XmlSubNode x(command_node, "jabber:x:data:x");
++ XmlSubNode x(command_node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Disconnect a user from selected IRC servers");
+@@ -794,7 +794,7 @@ void DisconnectUserFromServerStep2(XmppComponent& xmpp_component, AdhocSession&
+ command_node.delete_all_children();
+ auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component);
+
+- XmlSubNode x(command_node, "jabber:x:data:x");
++ XmlSubNode x(command_node, "jabber:x:data", "x");
+ x["type"] = "form";
+ XmlSubNode title(x, "title");
+ title.set_inner("Disconnect a user from selected IRC servers");
+diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp
+index de9a7a631be6..62a98ce3bb2c 100644
+--- a/src/xmpp/xmpp_component.cpp
++++ b/src/xmpp/xmpp_component.cpp
+@@ -175,7 +175,7 @@ void XmppComponent::on_stanza(const Stanza& stanza)
+
+ void XmppComponent::send_stream_error(const std::string& name, const std::string& explanation)
+ {
+- Stanza node("stream:error");
++ Stanza node("stream", "error");
+ {
+ XmlSubNode error(node, name);
+ error["xmlns"] = STREAM_NS;
+diff --git a/src/xmpp/xmpp_parser.cpp b/src/xmpp/xmpp_parser.cpp
+index 781fe4cd94b0..1f25fa6f982b 100644
+--- a/src/xmpp/xmpp_parser.cpp
++++ b/src/xmpp/xmpp_parser.cpp
+@@ -38,7 +38,7 @@ XmppParser::XmppParser():
+ void XmppParser::init_xml_parser()
+ {
+ // Create the expat parser
+- this->parser = XML_ParserCreateNS("UTF-8", ':');
++ this->parser = XML_ParserCreateNS("UTF-8", '\1');
+ XML_SetUserData(this->parser, static_cast<void*>(this));
+
+ // Install Expat handlers
+diff --git a/src/xmpp/xmpp_parser.hpp b/src/xmpp/xmpp_parser.hpp
+index ec42f9a326e1..1e5e4e55a875 100644
+--- a/src/xmpp/xmpp_parser.hpp
++++ b/src/xmpp/xmpp_parser.hpp
+@@ -18,9 +18,9 @@
+ * stanza is reasonnably short.
+ *
+ * The element names generated by expat contain the namespace of the
+- * element, a colon (':') and then the actual name of the element. To get
++ * element, a \1 separator and then the actual name of the element. To get
+ * an element "x" with a namespace of "http://jabber.org/protocol/muc", you
+- * just look for an XmlNode named "http://jabber.org/protocol/muc:x"
++ * just look for an XmlNode named "http://jabber.org/protocol/muc\1x"
+ *
+ * TODO: enforce the size-limit for the stanza (limit the number of childs
+ * it can contain). For example forbid the parser going further than level
+diff --git a/src/xmpp/xmpp_stanza.cpp b/src/xmpp/xmpp_stanza.cpp
+index 435f33313b09..0103dd71a357 100644
+--- a/src/xmpp/xmpp_stanza.cpp
++++ b/src/xmpp/xmpp_stanza.cpp
+@@ -52,7 +52,7 @@ XmlNode::XmlNode(const std::string& name, XmlNode* parent):
+ parent(parent)
+ {
+ // split the namespace and the name
+- auto n = name.rfind(':');
++ auto n = name.rfind('\1');
+ if (n == std::string::npos)
+ this->name = name;
+ else
+@@ -67,6 +67,18 @@ XmlNode::XmlNode(const std::string& name):
+ {
+ }
+
++XmlNode::XmlNode(const std::string& xmlns, const std::string& name, XmlNode* parent):
++ name(name),
++ parent(parent)
++{
++ this->attributes["xmlns"] = xmlns;
++}
++
++XmlNode::XmlNode(const std::string& xmlns, const std::string& name):
++ XmlNode(xmlns, name, nullptr)
++{
++}
++
+ void XmlNode::delete_all_children()
+ {
+ this->children.clear();
+diff --git a/src/xmpp/xmpp_stanza.hpp b/src/xmpp/xmpp_stanza.hpp
+index f4b394814e5b..a706337baca0 100644
+--- a/src/xmpp/xmpp_stanza.hpp
++++ b/src/xmpp/xmpp_stanza.hpp
+@@ -25,6 +25,8 @@ class XmlNode
+ public:
+ explicit XmlNode(const std::string& name, XmlNode* parent);
+ explicit XmlNode(const std::string& name);
++ explicit XmlNode(const std::string& xmlns, const std::string& name, XmlNode* parent);
++ explicit XmlNode(const std::string& xmlns, const std::string& name);
+ /**
+ * The copy constructor does not copy the parent attribute. The children
+ * nodes are all copied recursively.
+@@ -150,6 +152,10 @@ public:
+ XmlNode(name),
+ parent_to_add(parent_ref)
+ {}
++ XmlSubNode(XmlNode& parent_ref, const std::string& xmlns, const std::string& name):
++ XmlNode(xmlns, name),
++ parent_to_add(parent_ref)
++ {}
+
+ ~XmlSubNode()
+ {
+diff --git a/tests/xmpp.cpp b/tests/xmpp.cpp
+index 14c51daa460f..c49c2fda94ea 100644
+--- a/tests/xmpp.cpp
++++ b/tests/xmpp.cpp
+@@ -67,6 +67,8 @@ TEST_CASE("substanzas")
+ CHECK(!d.has_children());
+ }
+ CHECK(b.has_children());
++ XmlSubNode e(a, "namespace", "name");
++ CHECK(e.get_tag("xmlns") == "namespace");
+ }
+ CHECK(a.has_children());
+ }
+--
+2.34.1
+
diff --git a/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch b/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch
new file mode 100644
index 00000000000..edda7a37c50
--- /dev/null
+++ b/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch
@@ -0,0 +1,229 @@
+From 414ab9e13fc9e9fa79f7f0a8e1b4a46cd3bd92fd Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 27 Feb 2022 11:06:42 +0100
+Subject: [PATCH] Use the system installation of catch2 if possible
+
+---
+ CMakeLists.txt | 41 ++++++++++++++++++++++++-----------------
+ tests/colors.cpp | 2 +-
+ tests/config.cpp | 2 +-
+ tests/database.cpp | 2 +-
+ tests/encoding.cpp | 2 +-
+ tests/iid.cpp | 2 +-
+ tests/io_tester.cpp | 2 +-
+ tests/irc.cpp | 2 +-
+ tests/jid.cpp | 2 +-
+ tests/logger.cpp | 2 +-
+ tests/network.cpp | 2 +-
+ tests/test.cpp | 2 +-
+ tests/timed_events.cpp | 2 +-
+ tests/utils.cpp | 2 +-
+ tests/uuid.cpp | 2 +-
+ tests/xmpp.cpp | 2 +-
+ 16 files changed, 39 insertions(+), 32 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f07b97feb57b..8175012fe070 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -288,24 +288,31 @@ foreach(file ${source_all})
+ endforeach()
+
+ #
+-## Add a rule to download the catch unit test framework
++## Catch unit test framework
+ #
+-include(ExternalProject)
+-ExternalProject_Add(catch
+- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
+- PREFIX "external"
+- UPDATE_COMMAND ""
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
+- )
+-set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
+-ExternalProject_Get_Property(catch SOURCE_DIR)
+-if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
+- target_include_directories(test_suite
+- PUBLIC "${SOURCE_DIR}/single_include/"
+- )
+- add_dependencies(test_suite catch)
++find_package(Catch2 2.2.1)
++if(Catch2_FOUND)
++ target_link_libraries(test_suite Catch2::Catch2)
++else()
++ # No system-wide installation of the catch unit test framework was
++ # found, download it.
++ include(ExternalProject)
++ ExternalProject_Add(catch
++ GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"
++ PREFIX "external"
++ UPDATE_COMMAND ""
++ CONFIGURE_COMMAND ""
++ BUILD_COMMAND ""
++ INSTALL_COMMAND ""
++ )
++ set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE)
++ ExternalProject_Get_Property(catch SOURCE_DIR)
++ if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp)
++ target_include_directories(test_suite
++ PUBLIC "${SOURCE_DIR}/single_include/"
++ )
++ add_dependencies(test_suite catch)
++ endif()
+ endif()
+
+ #
+diff --git a/tests/colors.cpp b/tests/colors.cpp
+index bf529896dce7..a9761dfff648 100644
+--- a/tests/colors.cpp
++++ b/tests/colors.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <bridge/colors.hpp>
+ #include <xmpp/xmpp_stanza.hpp>
+diff --git a/tests/config.cpp b/tests/config.cpp
+index ec9844fbd5f6..76cfe92e3e51 100644
+--- a/tests/config.cpp
++++ b/tests/config.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ #include "io_tester.hpp"
+
+ #include <iostream>
+diff --git a/tests/database.cpp b/tests/database.cpp
+index 070a46013997..bf6bc20324cb 100644
+--- a/tests/database.cpp
++++ b/tests/database.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <biboumi.h>
+
+diff --git a/tests/encoding.cpp b/tests/encoding.cpp
+index b5192ffbdb8d..8129abc9230e 100644
+--- a/tests/encoding.cpp
++++ b/tests/encoding.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <utils/encoding.hpp>
+
+diff --git a/tests/iid.cpp b/tests/iid.cpp
+index 63b2ba38ca55..7e61f35e348b 100644
+--- a/tests/iid.cpp
++++ b/tests/iid.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <irc/iid.hpp>
+ #include <irc/irc_user.hpp>
+diff --git a/tests/io_tester.cpp b/tests/io_tester.cpp
+index 19c97c91aff8..34f89fdac603 100644
+--- a/tests/io_tester.cpp
++++ b/tests/io_tester.cpp
+@@ -1,5 +1,5 @@
+ #include "io_tester.hpp"
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ #include <iostream>
+
+ /**
+diff --git a/tests/irc.cpp b/tests/irc.cpp
+index 0f30f15e2fdf..cb53e3f226ff 100644
+--- a/tests/irc.cpp
++++ b/tests/irc.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <irc/irc_message.hpp>
+
+diff --git a/tests/jid.cpp b/tests/jid.cpp
+index 592d6f3d0b78..516f961fabbb 100644
+--- a/tests/jid.cpp
++++ b/tests/jid.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <xmpp/jid.hpp>
+ #include <biboumi.h>
+diff --git a/tests/logger.cpp b/tests/logger.cpp
+index 1e3392a4bd43..b4736da3648d 100644
+--- a/tests/logger.cpp
++++ b/tests/logger.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <logger/logger.hpp>
+ #include <config/config.hpp>
+diff --git a/tests/network.cpp b/tests/network.cpp
+index a52eb6acfef8..790190f8d0bf 100644
+--- a/tests/network.cpp
++++ b/tests/network.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+ #include <network/tls_policy.hpp>
+ #include <sstream>
+
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 0c7c351f437f..62bf7476a189 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -1,2 +1,2 @@
+ #define CATCH_CONFIG_MAIN
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+diff --git a/tests/timed_events.cpp b/tests/timed_events.cpp
+index fece422e99d5..6eaf99b3e1b9 100644
+--- a/tests/timed_events.cpp
++++ b/tests/timed_events.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <utils/timed_events.hpp>
+
+diff --git a/tests/utils.cpp b/tests/utils.cpp
+index 6151733e7cf4..22b45cf3113b 100644
+--- a/tests/utils.cpp
++++ b/tests/utils.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <utils/tolower.hpp>
+ #include <utils/revstr.hpp>
+diff --git a/tests/uuid.cpp b/tests/uuid.cpp
+index 12c6c32adbeb..7720e3aaee30 100644
+--- a/tests/uuid.cpp
++++ b/tests/uuid.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <xmpp/xmpp_component.hpp>
+
+diff --git a/tests/xmpp.cpp b/tests/xmpp.cpp
+index 14c51daa460f..01508a63481d 100644
+--- a/tests/xmpp.cpp
++++ b/tests/xmpp.cpp
+@@ -1,4 +1,4 @@
+-#include "catch.hpp"
++#include "catch2/catch.hpp"
+
+ #include <xmpp/xmpp_parser.hpp>
+ #include <xmpp/auth.hpp>
+--
+2.34.1
+
diff --git a/net-im/biboumi/files/biboumi.initd b/net-im/biboumi/files/biboumi.initd
new file mode 100644
index 00000000000..665db9120c9
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="XMPP gateway to IRC"
+pidfile="/var/run/biboumi.pid"
+command="/usr/bin/biboumi"
+command_args="${BIBOUMI_CONFIG:-/etc/biboumi/biboumi.cfg}"
+command_user="${BIBOUMI_USER:-biboumi}"
+command_background="true"
+extra_commands="reload"
+
+depend() {
+ use jabber-server
+}
+
+reload() {
+ ebegin "Reloading configuration of Biboumi"
+ start-stop-daemon --pidfile ${pidfile} --signal USR1
+ eend $?
+}
diff --git a/net-im/biboumi/files/biboumi.logrotate b/net-im/biboumi/files/biboumi.logrotate
new file mode 100644
index 00000000000..19964cf60f3
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.logrotate
@@ -0,0 +1,10 @@
+/var/log/biboumi/*.log {
+ missingok
+ notifempty
+ sharedscripts
+ postrotate
+ for service in /etc/init.d/biboumi*; do
+ rc-service $(basename ${service}) reload > /dev/null
+ done
+ endscript
+}
diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml
new file mode 100644
index 00000000000..294112cad84
--- /dev/null
+++ b/net-im/biboumi/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <name>Florian Schmaus</name>
+ <email>flow@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ Biboumi is an XMPP gateway that connects to IRC servers and translates
+ between the two protocols. It can be used to access IRC channels using
+ any XMPP client as if these channels were XMPP MUCs.
+ </longdescription>
+ <upstream>
+ <doc>https://doc.biboumi.louiz.org/</doc>
+ <bugs-to> https://lab.louiz.org/louiz/biboumi/-/issues</bugs-to>
+ </upstream>
+ <use>
+ <flag name="udns">Asynchronously resolve domain names using
+ net-libs/udns</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
index 4a6f1db2384..592437d7f4b 100644
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild
@@ -1,9 +1,9 @@
-# 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_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
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"
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index e1f92087579..075402136f9 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -1,9 +1,9 @@
-# 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
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1 systemd toolchain-funcs
diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest
new file mode 100644
index 00000000000..8c822e3f91a
--- /dev/null
+++ b/net-im/cawbird/Manifest
@@ -0,0 +1 @@
+DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1
diff --git a/net-im/cawbird/cawbird-1.5-r2.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild
new file mode 100644
index 00000000000..aee22772898
--- /dev/null
+++ b/net-im/cawbird/cawbird-1.5-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Twitter client"
+HOMEPAGE="https://ibboard.co.uk/cawbird/ https://github.com/IBBoard/cawbird"
+SRC_URI="https://github.com/IBBoard/cawbird/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}
+
+LICENSE="CC-BY-3.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gstreamer spell"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/json-glib
+ net-libs/liboauth
+ net-libs/libsoup:2.4
+ net-libs/rest:0.7
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ gstreamer? (
+ media-plugins/gst-plugins-gtk
+ media-plugins/gst-plugins-hls
+ media-plugins/gst-plugins-meta[ffmpeg,http,X]
+ )
+ spell? ( app-text/gspell:=[vala] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(vala_depend)
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ vala_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ # these keys are taken from the readme of cawbird
+ -Dconsumer_key_base64='VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA=='
+ -Dconsumer_secret_base64='MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI='
+ -Dexamples=false
+ $(meson_use spell spellcheck)
+ $(meson_use gstreamer video)
+ -Dx11=true
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_pkg_postrm
+}
diff --git a/net-im/cawbird/metadata.xml b/net-im/cawbird/metadata.xml
new file mode 100644
index 00000000000..d1905ebb02b
--- /dev/null
+++ b/net-im/cawbird/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+<upstream>
+ <remote-id type="github">IBBoard/cawbird</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 968126781e4..0b4997cb039 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1 +1,2 @@
+DIST choqok-1.7.0-patchset-1.tar.xz 3260 BLAKE2B 48612da4e92c9ed4a877858940f73075df4142d68da3854c42892bcfb13a59ab5dd45b06597c404badfb55ebaeddf7485bc0970e65ae29898a742742353d6caa SHA512 78e31f4d8de9d5294c8439959d8966b5b966bf6bc8f26d1b9cb1ffd12bf182d167269b26deb2dfa7d7dd8cf09bcaa0c77a560418075105f40a74fa50c96d48d0
DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild
index 1adc9952516..347ae3c26c3 100644
--- a/net-im/choqok/choqok-1.7.0.ebuild
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild
@@ -1,18 +1,19 @@
-# 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
ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.2
inherit ecm kde.org
DESCRIPTION="Free/Open Source micro-blogging client by KDE"
HOMEPAGE="https://choqok.kde.org/ https://apps.kde.org/choqok/"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
+ SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
KEYWORDS="amd64 x86"
fi
@@ -21,7 +22,7 @@ SLOT="5"
IUSE="attica share telepathy"
DEPEND="
- app-crypt/qca[qt5(+)]
+ >=app-crypt/qca-2.3.0:2
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetworkauth-${QTMIN}:5
@@ -47,17 +48,19 @@ DEPEND="
>=kde-frameworks/sonnet-${KFMIN}:5
attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
- telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+ telepathy? ( >=net-libs/telepathy-qt-0.9.8 )
"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS README changelog )
-src_prepare() {
- ecm_src_prepare
- # TODO: quick fix for bug #708464
- sed -e "/find_package.*Purpose)/s/ COMPONENTS //" -i CMakeLists.txt || die
-}
+PATCHES=(
+ "${WORKDIR}/${P}-optional-purpose.patch" # bug 708464, upstream MR #11
+ "${WORKDIR}/${P}-fix-retrieve-twitter.patch" # KDE-bug 417193
+ "${WORKDIR}/${P}-choqokplugin.patch"
+ "${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938
+ "${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297
+)
src_configure() {
local mycmakeargs=(
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
deleted file mode 100644
index 946446bfbe0..00000000000
--- a/net-im/corebird/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST corebird-1.7.4.tar.gz 555650 BLAKE2B 1c9ef4d81084a291726876a76b700fe556c0c8c803921c2df215db7e0c268029fcefa95ea6aabd8f4934ecbf70e70ee57988b6c7aefebfd0851d3cb73d16b3fc SHA512 7e88f73ef1fc36379172d30251065e7ee3df54eabfaf954015ed4e739c5ad2b1821b43a07e66bb9363b7daa59b5e981d459a4aef87be8a3dd80a7ed41e37e582
diff --git a/net-im/corebird/corebird-1.7.4-r2.ebuild b/net-im/corebird/corebird-1.7.4-r2.ebuild
deleted file mode 100644
index 08f06c7b733..00000000000
--- a/net-im/corebird/corebird-1.7.4-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.34
-
-inherit autotools gnome2 vala virtualx xdg-utils
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer spellcheck"
-
-RDEPEND="dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/json-glib
- gstreamer? ( media-plugins/gst-plugins-gtk:1.0
- media-libs/gst-plugins-base:1.0[X]
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-hls:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-meta:1.0[X]
- media-plugins/gst-plugins-soup:1.0 )
- spellcheck? ( app-text/gspell:=[vala] )
- net-libs/libsoup:2.4
- x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/intltool
- sys-apps/sed
- virtual/pkgconfig"
-
-src_prepare() {
- # Disable that specific test because it would perform a download
- sed -i -e "/inlinemediadownloader/d" tests/Makefile.am || die
- eautoreconf
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable gstreamer video)
- --disable-gst-check
- $(use_enable spellcheck)
- )
- gnome2_src_configure "${myeconfargs[@]}"
-}
-
-src_test() {
- # Need to have $HOME/.config and friends for the tests to work
- xdg_environment_reset
- virtx emake check
-}
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
deleted file mode 100644
index 9e83bd6d956..00000000000
--- a/net-im/corebird/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <use>
- <flag name="spellcheck">Support spell checking</flag>
- </use>
- <upstream>
- <remote-id type="github">baedert/corebird</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-im/coturn/coturn-4.5.2.ebuild b/net-im/coturn/coturn-4.5.2-r1.ebuild
index a183b67dbea..d3a3c881360 100644
--- a/net-im/coturn/coturn-4.5.2.ebuild
+++ b/net-im/coturn/coturn-4.5.2-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit systemd tmpfiles
+
+inherit toolchain-funcs systemd tmpfiles
DESCRIPTION="coturn TURN server project"
HOMEPAGE="https://github.com/coturn/coturn"
if [ ${PV} = 9999 ]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
inherit git-r3
- DEPEND="dev-vcs/git"
# S="${WORKDIR}/${PN}-master"
else
KEYWORDS="~amd64 ~x86"
@@ -21,14 +21,19 @@ SLOT="0"
IUSE="mongodb mysql postgres redis sqlite"
RDEPEND="acct-group/turnserver
acct-user/turnserver
- >dev-libs/libevent-2.1.8
+ >dev-libs/libevent-2.1.8:=
+ dev-libs/openssl:=
mongodb? ( dev-libs/mongo-c-driver )
- mysql? ( dev-db/mysql-connector-c )
+ mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:* )
- redis? ( dev-libs/hiredis )
+ redis? ( dev-libs/hiredis:= )
sqlite? ( dev-db/sqlite )"
-
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.5.2-respect-TMPDIR.patch
+)
src_configure() {
if [ -n "${AR}" ]; then
@@ -56,7 +61,13 @@ src_configure() {
if ! use sqlite; then
export TURN_NO_SQLITE=yes
fi
+
+ tc-export CC
+
+ export ARCHIVERCMD="$(tc-getAR) -r"
+ export PKGCONFIG="$(tc-getPKG_CONFIG)"
export DOCSDIR="/usr/share/doc/${PN}-${PV}"
+
econf $(use_with sqlite)
}
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild
index 4830d0550d0..d3a3c881360 100644
--- a/net-im/coturn/coturn-9999.ebuild
+++ b/net-im/coturn/coturn-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit systemd tmpfiles
+
+inherit toolchain-funcs systemd tmpfiles
DESCRIPTION="coturn TURN server project"
HOMEPAGE="https://github.com/coturn/coturn"
if [ ${PV} = 9999 ]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
inherit git-r3
- DEPEND="dev-vcs/git"
# S="${WORKDIR}/${PN}-master"
else
KEYWORDS="~amd64 ~x86"
@@ -20,15 +20,20 @@ LICENSE="BSD"
SLOT="0"
IUSE="mongodb mysql postgres redis sqlite"
RDEPEND="acct-group/turnserver
- acct-user/turnserver
- >dev-libs/libevent-2.1.8
- mongodb? ( dev-libs/mongo-c-driver )
- mysql? ( dev-db/mysql-connector-c )
- postgres? ( dev-db/postgresql:* )
- redis? ( dev-libs/hiredis )
- sqlite? ( dev-db/sqlite )"
-
+ acct-user/turnserver
+ >dev-libs/libevent-2.1.8:=
+ dev-libs/openssl:=
+ mongodb? ( dev-libs/mongo-c-driver )
+ mysql? ( dev-db/mysql-connector-c:= )
+ postgres? ( dev-db/postgresql:* )
+ redis? ( dev-libs/hiredis:= )
+ sqlite? ( dev-db/sqlite )"
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.5.2-respect-TMPDIR.patch
+)
src_configure() {
if [ -n "${AR}" ]; then
@@ -56,7 +61,13 @@ src_configure() {
if ! use sqlite; then
export TURN_NO_SQLITE=yes
fi
+
+ tc-export CC
+
+ export ARCHIVERCMD="$(tc-getAR) -r"
+ export PKGCONFIG="$(tc-getPKG_CONFIG)"
export DOCSDIR="/usr/share/doc/${PN}-${PV}"
+
econf $(use_with sqlite)
}
diff --git a/net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch b/net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch
new file mode 100644
index 00000000000..036705afc1f
--- /dev/null
+++ b/net-im/coturn/files/coturn-4.5.2-respect-TMPDIR.patch
@@ -0,0 +1,24 @@
+diff --git a/configure b/configure
+index caf11f5..003da8d 100755
+--- a/configure
++++ b/configure
+@@ -513,12 +513,13 @@ fi
+ # Temporary DIR location:
+ #########################
+
+-TMPDIR="."
+-
+-if [ -d /var/tmp ] ; then
+- TMPDIR="/var/tmp"
+-elif [ -d /tmp ] ; then
+- TMPDIR=/tmp
++TMPDIR=${TMPDIR:-.}
++if test x"${TMPDIR}" = "." ; then
++ if [ -d /var/tmp ] ; then
++ TMPDIR="/var/tmp"
++ elif [ -d /tmp ] ; then
++ TMPDIR=/tmp
++ fi
+ fi
+
+ ${ECHO_CMD} Use TMP dir ${TMPDIR}
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 800169e77e5..0c5caf3183b 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,2 +1,2 @@
DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49
-DIST dino-0.2.2.tar.gz 514648 BLAKE2B 54110f3767b5d1d3d4bffc82b767d3c92114c55449ad10705ed10b8815ecc9c337016348886acc3df21d5f27be5d93bbe3c203173167146ff9859bd03f0be7a6 SHA512 6c973b0b88e2c8aecbab694b456762973c5f60217bbf6bc81f4d81226fe8124596bddfe7c190f35307ec3ad6376858ce8f686c74aaebec133124377d8a9e4898
+DIST dino-0.3.0.tar.gz 804810 BLAKE2B cb6365f6fad051d0308909c6d5d2c59d7f57cb94f9f691516e27b7bb3aba214fdffa95066d8203d8ac5bd770bec1580e81baad313beef7fe5c058e1e94a37556 SHA512 e3d885208451b00b0416a1401780a94a169fb1179b2f609f7965e3445873d6b72ded84cb471d534616892ec89b5edcd6701fc97c36f19d690f4b894399000515
diff --git a/net-im/dino/dino-0.2.1.ebuild b/net-im/dino/dino-0.2.1-r1.ebuild
index b9cbc662d43..4a660b77b34 100644
--- a/net-im/dino/dino-0.2.1.ebuild
+++ b/net-im/dino/dino-0.2.1-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
@@ -36,7 +36,7 @@ RDEPEND="
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/pango
- gpg? ( app-crypt/gpgme:1 )
+ gpg? ( app-crypt/gpgme:= )
http? ( net-libs/libsoup:2.4 )
omemo? (
dev-libs/libgcrypt:0
diff --git a/net-im/dino/dino-0.2.2.ebuild b/net-im/dino/dino-0.3.0.ebuild
index 169e9707eef..dcefefcd1c8 100644
--- a/net-im/dino/dino-0.2.2.ebuild
+++ b/net-im/dino/dino-0.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_MAKEFILE_GENERATOR="ninja"
VALA_MIN_API_VERSION="0.34"
-inherit cmake vala xdg
+inherit cmake vala xdg readme.gentoo-r1
DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
HOMEPAGE="https://dino.im"
@@ -31,12 +31,14 @@ RDEPEND="
dev-libs/icu
dev-libs/libgee:0.8
net-libs/glib-networking
+ >=net-libs/libnice-0.1.15
net-libs/libsignal-protocol-c
+ net-libs/libsrtp:2
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/pango
- gpg? ( app-crypt/gpgme:1 )
+ gpg? ( app-crypt/gpgme:= )
http? ( net-libs/libsoup:2.4 )
omemo? (
dev-libs/libgcrypt:0
@@ -47,6 +49,8 @@ RDEPEND="
DEPEND="
$(vala_depend)
${RDEPEND}
+ media-libs/gst-plugins-base
+ media-libs/gstreamer
sys-devel/gettext
"
@@ -77,3 +81,13 @@ src_configure() {
src_test() {
"${BUILD_DIR}"/xmpp-vala-test || die
}
+
+src_install() {
+ cmake_src_install
+ readme.gentoo_create_doc
+}
+
+src_postinst() {
+ xdg_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 29103bf879e..dcefefcd1c8 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-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
@@ -38,7 +38,7 @@ RDEPEND="
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/pango
- gpg? ( app-crypt/gpgme:1 )
+ gpg? ( app-crypt/gpgme:= )
http? ( net-libs/libsoup:2.4 )
omemo? (
dev-libs/libgcrypt:0
diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml
index b2e7c53af48..9f5aee117e5 100644
--- a/net-im/dino/metadata.xml
+++ b/net-im/dino/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>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/dino/dino/issues</bugs-to>
<remote-id type="github">dino/dino</remote-id>
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 9865c481750..7db891be33a 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1 +1 @@
-DIST discord-0.0.16.deb 77079990 BLAKE2B 17cb04baa4eab3494593c54bc556a8e1d01352aa1ba7d1d27da722e53f5445386054b038b57281c5955f46416eccef9fc3521c1b91b3b593c495c29e2537d0c0 SHA512 4ea06420b27cc6dff813798c23d44478bbe4fea2919011796d271f94fcc2e25bae65e7c5c952a6723daa928d3ac99b913198a8500c76a0eef56138dda610c5de
+DIST discord-0.0.18.tar.gz 77398558 BLAKE2B e25ad448dd9f89e460a4380cde850506298a443be2b70fb243b92ab6a139815fea36260b879ece044c5c607561fde6adf36a188c186c48c34052ec105b23d732 SHA512 a9c5de48186542fa4385c5cf4ffb54484dee008cde5230a9f8a0e71a84e1e7ce680e170aca2018ad2217618ed2d4a4882836a408a5d0a5cab054c0954c1b55be
diff --git a/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild b/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
deleted file mode 100644
index e8d74ae05be..00000000000
--- a/net-im/discord-bin/discord-bin-0.0.16-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-bin}"
-MY_BIN="${MY_PN^}"
-
-inherit desktop linux-info optfeature pax-utils unpacker
-
-DESCRIPTION="All-in-one voice and text chat for gamers"
-HOMEPAGE="https://discordapp.com"
-SRC_URI="https://dl.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64"
-RESTRICT="mirror bindist"
-
-# libXScrnSaver is used through dlopen (bug #825370)
-# Need to drop -clone3(+) from glibc once Electron is updated
-# bug #819045, bug #827386
-RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- media-libs/alsa-lib
- media-libs/mesa[gbm(+)]
- net-print/cups
- sys-apps/dbus
- || ( <sys-libs/glibc-2.34 >=sys-libs/glibc-2.34[-clone3(+)] )
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libdrm
- x11-libs/libxcb
- x11-libs/libxkbcommon
- x11-libs/libxshmfence
- x11-libs/pango
-"
-
-QA_PREBUILT="
- opt/discord/${MY_BIN}
- opt/discord/chrome-sandbox
- opt/discord/libffmpeg.so
- opt/discord/libvk_swiftshader.so
- opt/discord/libvulkan.so
- opt/discord/libEGL.so
- opt/discord/libGLESv2.so
- opt/discord/libVkICD_mock_icd.so
- opt/discord/swiftshader/libEGL.so
- opt/discord/swiftshader/libGLESv2.so
- opt/discord/swiftshader/libvk_swiftshader.so
-"
-
-CONFIG_CHECK="~USER_NS"
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:/usr/share/discord/Discord:discord:" \
- usr/share/${MY_PN}/${MY_PN}.desktop || die
-}
-
-src_install() {
- doicon usr/share/${MY_PN}/${MY_PN}.png
- domenu usr/share/${MY_PN}/${MY_PN}.desktop
-
- insinto /opt/${MY_PN}
- doins -r usr/share/${MY_PN}/.
- fperms +x /opt/${MY_PN}/${MY_BIN}
- dosym -r /opt/${MY_PN}/${MY_BIN} /usr/bin/${MY_PN}
-
- pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
-}
-
-pkg_postinst() {
- optfeature "sound support" \
- media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
- optfeature "system tray support" dev-libs/libappindicator
-}
diff --git a/net-im/discord-bin/discord-bin-0.0.18.ebuild b/net-im/discord-bin/discord-bin-0.0.18.ebuild
new file mode 100644
index 00000000000..e40d2077e42
--- /dev/null
+++ b/net-im/discord-bin/discord-bin-0.0.18.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-r*}"
+
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop linux-info optfeature unpacker xdg
+
+DESCRIPTION="All-in-one voice and text chat for gamers"
+HOMEPAGE="https://discordapp.com"
+SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+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
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa[gbm(+)]
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libdrm
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+RESTRICT="bindist mirror strip test"
+
+DESTDIR="/opt/${MY_PN}"
+
+QA_PREBUILT="
+ ${DESTDIR#/}/${MY_PN^}
+ ${DESTDIR#/}/chrome-sandbox
+ ${DESTDIR#/}/libffmpeg.so
+ ${DESTDIR#/}/libvk_swiftshader.so
+ ${DESTDIR#/}/libvulkan.so
+ ${DESTDIR#/}/libEGL.so
+ ${DESTDIR#/}/libGLESv2.so
+ ${DESTDIR#/}/libVkICD_mock_icd.so
+ ${DESTDIR#/}/swiftshader/libEGL.so
+ ${DESTDIR#/}/swiftshader/libGLESv2.so
+ ${DESTDIR#/}/swiftshader/libvk_swiftshader.so
+"
+
+CONFIG_CHECK="~USER_NS"
+
+S="${WORKDIR}/${MY_PN^}"
+
+pkg_pretend() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+ unpack ${MY_PN}-${MY_PV}.tar.gz
+}
+
+src_configure() {
+ chromium_suid_sandbox_check_kernel_config
+
+ default
+}
+
+src_prepare() {
+ default
+ # remove post-install script
+ rm postinst.sh || die "the removal of the unneeded post-install script failed"
+ # cleanup languages
+ pushd "locales/" || die "location change for language cleanup failed"
+ chromium_remove_language_paks
+ popd || die "location reset for language cleanup failed"
+ # fix .desktop exec location
+ sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" ${MY_PN}.desktop || die "fixing of exec location on .desktop failed"
+}
+
+src_install() {
+ doicon -s 256 ${MY_PN}.png
+
+ # install .desktop file
+ domenu ${MY_PN}.desktop
+
+ exeinto "${DESTDIR}"
+ doexe ${MY_PN^} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so
+
+ insinto "${DESTDIR}"
+ doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin
+ insopts -m0755
+ doins -r locales resources swiftshader
+
+ # Chrome-sandbox requires the setuid bit to be specifically set.
+ # see https://github.com/electron/electron/issues/17972
+ fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+ dosym "${DESTDIR}"/${MY_PN^} /usr/bin/${MY_PN}
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "sound support" \
+ media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire
+ optfeature "system tray support" dev-libs/libappindicator
+}
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index 115e9d64a66..f485c452f77 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>ran.dall@icloud.com</email>
+ <name>Randall T. Vasquez</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e50617f2048..e8815deaf15 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,4 @@
-DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
-DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
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-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild
deleted file mode 100644
index 90c657f64b0..00000000000
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd tmpfiles
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
- roster-gw 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[hipe(-)?,odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.22
- >=dev-erlang/eimp-1.0.14
- >=dev-erlang/fast_tls-1.1.5
- >=dev-erlang/fast_xml-1.1.40
- >=dev-erlang/fast_yaml-1.0.24
- >=dev-erlang/yconf-1.0.4
- >=dev-erlang/jiffy-1.0.1
- >=dev-erlang/jose-1.9.0
- >=dev-erlang/lager-3.6.10
- >=dev-erlang/p1_oauth2-0.6.6
- >=dev-erlang/p1_utils-1.0.18
- >=dev-erlang/stringprep-1.0.19
- >=dev-erlang/xmpp-1.4.6
- >=dev-erlang/pkix-1.0.5
- >=dev-erlang/mqtree-1.0.7
- >=dev-erlang/idna-6.0.0
- >=dev-erlang/p1_acme-1.0.5
- >=dev-erlang/base64url-1.0
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.7 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- sip? ( >=dev-erlang/esip-1.0.32 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
- stun? ( >=dev-erlang/stun-1.0.32 )
- zlib? ( >=dev-erlang/ezlib-1.0.7 )"
-RDEPEND="${DEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificate.
-adjust_config() {
- sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
- sed -re 's/^#\s+(certfiles)/\1/' \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
-}
-
-# 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'
-}
-
-# Check if we are missing a default certificate.
-ejabberd_cert_missing() {
- if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
- if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
- # default certificate is present in config and exists - not installing
- return 1
- else
- # default certificate is present in config
- # but doesn't exist - need to install one
- return 0
- fi
- fi
- # no default certificate in config - not installing
- return 1
-}
-
-# Generate and install sample ejabberd certificate. It's installed into
-# EJABBERD_CERT path.
-ejabberd_cert_install() {
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
- install_cert "${EJABBERD_CERT%.*}"
- chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
- chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
-}
-
-# 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}"
-}
-
-# Make ejabberd.service for systemd from upstream provided template.
-make_ejabberd_service() {
- sed -r \
- -e 's!@ctlscriptpath@!/usr/sbin!g' \
- -e 's!^(User|Group)=(.*)!\1=jabber!' \
- -e 's!^(After)=(.*)!\1=epmd.service network.target!' \
- -e '/^After=/ a Requires=epmd.service' \
- "${PN}.service.template" >"${PN}.service" \
- || die 'failed to make ejabberd.service'
-}
-
-# Set paths to defined by net-im/jabber-base.
-set_jabberbase_paths() {
- sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
- -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
- -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
- -i "${S}/Makefile.in" \
- || die 'failed to set paths in Makefile.in'
- sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
- -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
- -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
- -i "${S}/ejabberdctl.template" \
- || die 'failed to set paths ejabberdctl.template'
-}
-
-# Skip installing docs because it's only COPYING that's installed by Makefile.
-skip_docs() {
- gawk -i inplace '
-/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
- if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
- print $0;
- } else {
- next;
- }
-}
-1
-' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
-}
-
-src_prepare() {
- default
-
- rebar_remove_deps
- correct_ejabberd_paths
- set_jabberbase_paths
- make_ejabberd_service
- skip_docs
- adjust_config
- 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'
-
- sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
- -i configure.ac || die "Failed to write correct version to configure"
- # eautoreconf # required in case of download from github
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --enable-user=jabber \
- --disable-system-deps \
- $(use_enable debug) \
- $(use_enable full-xml) \
- $(use_enable hipe) \
- $(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
-
- keepdir /var/lib/lock/ejabberdctl
- rm -rf "${ED%/}/var/log" || die
- rm -rf "${ED%/}/var/spool" || die
-
- if use pam; then
- local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
- pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
- into "$(get_ejabberd_path)/priv"
- newbin epam-wrapper epam
- fi
-
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${PN}.service"
- dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_preinst() {
- if use pam; then
- einfo "Adding jabber 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 jabber || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.tmpfiles.conf
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- echo
- elog "For configuration instructions, please see"
- elog " https://docs.ejabberd.im/"
- echo
- fi
- if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
- ewarn If you are updating from an older version like 17.x
- ewarn you may need to add an access_rules section to your
- ewarn ejabberd.yml config file.
- ewarn Otherwise authentication will be broken and users
- ewarn will not be able to log in.
- echo
- fi
-
- if ejabberd_cert_missing; then
- ejabberd_cert_install
- fi
-}
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild
deleted file mode 100644
index 245c006f114..00000000000
--- a/net-im/ejabberd/ejabberd-21.04.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit pam rebar ssl-cert systemd tmpfiles
-
-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"
-
-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.28
- >=dev-erlang/eimp-1.0.20
- >=dev-erlang/fast_tls-1.1.12
- >=dev-erlang/fast_xml-1.1.46
- >=dev-erlang/fast_yaml-1.0.31
- >=dev-erlang/yconf-1.0.11
- >=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.9.0
- >=dev-erlang/lager-3.6.10
- >=dev-erlang/p1_oauth2-0.6.9
- >=dev-erlang/p1_utils-1.0.22
- >=dev-erlang/stringprep-1.0.25
- >=dev-erlang/xmpp-1.5.3
- >=dev-erlang/pkix-1.0.7
- >=dev-erlang/mqtree-1.0.13
- >=dev-erlang/idna-6.0.0-r1
- >=dev-erlang/p1_acme-1.0.12
- >=dev-erlang/base64url-1.0.1
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.10 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- sip? ( >=dev-erlang/esip-1.0.42 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.12 )
- stun? ( >=dev-erlang/stun-1.0.43 )
- zlib? ( >=dev-erlang/ezlib-1.0.9 )"
-RDEPEND="${DEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )
- selinux? ( sec-policy/selinux-jabber )
-"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificate.
-adjust_config() {
- sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
- sed -re 's/^#\s+(certfiles)/\1/' \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
-}
-
-# 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'
-}
-
-# Check if we are missing a default certificate.
-ejabberd_cert_missing() {
- if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
- if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
- # default certificate is present in config and exists - not installing
- return 1
- else
- # default certificate is present in config
- # but doesn't exist - need to install one
- return 0
- fi
- fi
- # no default certificate in config - not installing
- return 1
-}
-
-# Generate and install sample ejabberd certificate. It's installed into
-# EJABBERD_CERT path.
-ejabberd_cert_install() {
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
- install_cert "${EJABBERD_CERT%.*}"
- chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
- chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
-}
-
-# 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}"
-}
-
-# Make ejabberd.service for systemd from upstream provided template.
-make_ejabberd_service() {
- sed -r \
- -e 's!@ctlscriptpath@!/usr/sbin!g' \
- -e 's!^(User|Group)=(.*)!\1=jabber!' \
- -e 's!^(After)=(.*)!\1=epmd.service network.target!' \
- -e '/^After=/ a Requires=epmd.service' \
- "${PN}.service.template" >"${PN}.service" \
- || die 'failed to make ejabberd.service'
-}
-
-# Set paths to defined by net-im/jabber-base.
-set_jabberbase_paths() {
- sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
- -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
- -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
- -i "${S}/Makefile.in" \
- || die 'failed to set paths in Makefile.in'
- sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
- -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
- -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
- -i "${S}/ejabberdctl.template" \
- || die 'failed to set paths ejabberdctl.template'
-}
-
-src_prepare() {
- default
-
- rebar_remove_deps
- correct_ejabberd_paths
- set_jabberbase_paths
- make_ejabberd_service
- adjust_config
- 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" \
- --enable-user=jabber \
- $(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
-
- keepdir /var/lib/lock/ejabberdctl
- rm -rf "${ED%/}/var/log" || die
- rm -rf "${ED%/}/var/spool" || die
-
- 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"
- dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-}
-
-pkg_preinst() {
- if use pam; then
- einfo "Adding jabber 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 jabber || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.tmpfiles.conf
-
- if [[ ! ${REPLACING_VERSIONS} ]]; then
- echo
- elog "For configuration instructions, please see"
- elog " https://docs.ejabberd.im/"
- echo
- fi
- if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
- ewarn If you are updating from an older version like 17.x
- ewarn you may need to add an access_rules section to your
- ewarn ejabberd.yml config file.
- ewarn Otherwise authentication will be broken and users
- ewarn will not be able to log in.
- echo
- fi
-
- if ejabberd_cert_missing; then
- ejabberd_cert_install
- fi
-}
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild b/net-im/ejabberd/ejabberd-21.12-r1.ebuild
index 3f4d03ad5e8..51abb0f8f05 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12-r1.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit pam rebar systemd
+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"
+ -> ${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"
+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
@@ -32,7 +34,7 @@ DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
>=dev-erlang/fast_yaml-1.0.32
>=dev-erlang/yconf-1.0.12
>=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.11.1
+ >=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
@@ -58,6 +60,7 @@ RDEPEND="${DEPEND}
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=(
@@ -203,6 +206,13 @@ pkg_postinst() {
# 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
@@ -221,11 +231,5 @@ pkg_postinst() {
chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
fi
done
-
- ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
- ewarn "(just as upstream) and *not* /etc/ejabber."
- ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
- ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
- ewarn "Please check your configuration."
fi
}
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
index 63128525a5c..eae32ae4c02 100644
--- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit pam rebar systemd
+inherit autotools 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"
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ verify-sig? ( https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
LICENSE="GPL-2"
SLOT="0"
@@ -24,68 +27,49 @@ RESTRICT="test"
# TODO: tools? (
# TODO: >=dev-erlang/luerl-0.3
# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.28
- >=dev-erlang/eimp-1.0.20
- >=dev-erlang/fast_tls-1.1.12
- >=dev-erlang/fast_xml-1.1.46
- >=dev-erlang/fast_yaml-1.0.31
- >=dev-erlang/yconf-1.0.11
+DEPEND="
+ >=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.15
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/fast_yaml-1.0.33
+ >=dev-erlang/yconf-1.0.13
>=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.9.0
- >=dev-erlang/lager-3.6.10
- >=dev-erlang/p1_oauth2-0.6.9
- >=dev-erlang/p1_utils-1.0.22
- >=dev-erlang/stringprep-1.0.25
- >=dev-erlang/xmpp-1.5.3
- >=dev-erlang/pkix-1.0.7
- >=dev-erlang/mqtree-1.0.13
+ >=dev-erlang/jose-1.11.2
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.11
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.28
+ >=dev-erlang/xmpp-1.5.6
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.15
>=dev-erlang/idna-6.0.0-r1
- >=dev-erlang/p1_acme-1.0.12
+ >=dev-erlang/p1_acme-1.0.19
>=dev-erlang/base64url-1.0.1
ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.10 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- sip? ( >=dev-erlang/esip-1.0.42 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.12 )
- stun? ( >=dev-erlang/stun-1.0.43 )
- zlib? ( >=dev-erlang/ezlib-1.0.9 )"
-RDEPEND="${DEPEND}
- acct-user/ejabberd
+ pam? ( >=dev-erlang/epam-1.0.12 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.18 )
+ 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.2.2 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-1
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}/${PN}-17.04-0002-Dont-overwrite-service-file.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'
-}
+PATCHES=(
+ "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
+)
# Get path to ejabberd lib directory.
#
@@ -96,23 +80,31 @@ get_ejabberd_path() {
echo "/usr/$(get_libdir)/${P}"
}
-# Make ejabberd.service for systemd from upstream provided template.
-make_ejabberd_service() {
- sed -r \
- -e 's!@ctlscriptpath@!/usr/sbin!g' \
- -e 's!^(After)=(.*)!\1=epmd.service network.target!' \
- -e '/^After=/ a Requires=epmd.service' \
- "${PN}.service.template" >"${PN}.service" \
- || die 'failed to make ejabberd.service'
-}
-
src_prepare() {
default
+ eautoreconf
+
rebar_remove_deps
- correct_ejabberd_paths
- make_ejabberd_service
- customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+ # Set paths to ejabberd lib directory consistently to point always to directory
+ # suffixed with version.
+ 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.
+ local epam_wrapper_src="${FILESDIR}/epam-wrapper"
+ 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'
rebar_fix_include_path fast_xml
rebar_fix_include_path p1_utils
@@ -122,7 +114,7 @@ src_prepare() {
# 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}|" \
+ sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \
-i "${S}/ejabberdctl.template" \
|| die 'failed to set ERL_LIBS in ejabberdctl.template'
}
@@ -151,7 +143,14 @@ src_configure() {
}
src_compile() {
- emake REBAR='rebar -v' src
+ # Note that we also add ejabberdctl.example, which will be used by
+ # ejabberd's build system to create /usr/sbin/ejabberdctl, as
+ # target. Otherwise, ejabberdctl.example is due to be created by the
+ # 'install' target (as per upstream's Makefile.in). However when
+ # invoke the 'install' target (in src_install below), DESTDIR is
+ # set, which causes DESTDIR to scope into the ejabberdctl.example
+ # generation.
+ emake REBAR='rebar -v' src ejabberdctl.example
}
src_install() {
@@ -166,16 +165,11 @@ src_install() {
fi
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
systemd_dounit "${PN}.service"
insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
- # /var/lock/ejabberdctl is unused, see
- # https://github.com/processone/ejabberd/pull/3724
- rmdir "${ED}/var/lock/ejabberdctl" || die
- rmdir "${ED}/var/lock" || die
+ newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}"
keepdir /var/{lib,log}/ejabberd
}
@@ -196,12 +190,7 @@ pkg_preinst() {
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
+ if [[ ${REPLACING_VERSIONS} ]]; then
for v in ${REPLACING_VERSIONS}; do
if ver_test "${v}" -lt 21.04-r1; then
migrate_to_ejabberd_user=true
@@ -217,6 +206,13 @@ pkg_postinst() {
# 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
@@ -235,11 +231,5 @@ pkg_postinst() {
chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
fi
done
-
- ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
- ewarn "(just as upstream) and *not* /etc/ejabber."
- ewarn "The files from /etc/jabber where copied to /etc/ejabberd."
- ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
- ewarn "Please check your configuration."
fi
}
diff --git a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch
deleted file mode 100644
index 2bea750ef04..00000000000
--- a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index a0b4553d..4675b88a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -204,8 +204,8 @@ install: all copy-files
- chmod 755 ejabberd.init
- #
- # Service script
-- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
-- > ejabberd.service
-+ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
-+ ejabberd.service.template > ejabberd.service
- chmod 644 ejabberd.service
- #
- # Spool directory
diff --git a/net-im/ejabberd/files/ejabberd-22.05.initd b/net-im/ejabberd/files/ejabberd-22.05.initd
new file mode 100644
index 00000000000..57f9cd5aa33
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.initd
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# 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 .
+ 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-22.05.logrotate b/net-im/ejabberd/files/ejabberd-22.05.logrotate
new file mode 100644
index 00000000000..fd51673fc42
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.logrotate
@@ -0,0 +1,13 @@
+/var/log/ejabberd/*.log {
+ su ejabberd ejabberd
+ 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/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf
deleted file mode 100644
index 6a9cc9e61b7..00000000000
--- a/net-im/ejabberd/files/ejabberd.tmpfiles.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/lock/ejabberdctl 0750 jabber jabber
-d /run/ejabberd 0750 jabber jabber
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 787de61bb99..f894e535971 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -12,7 +12,6 @@
<flag name="captcha">Support for CAPTCHA Forms (XEP-158) on registration</flag>
<flag name="full-xml">Use XML features in XMPP stream (ex: CDATA),
requires XML compliant clients</flag>
- <flag name="hipe">Compile natively with HiPE, not recommended</flag>
<flag name="mssql">Enable Microsoft SQL Server support (via ODBC) for
data storage</flag>
<flag name="mysql">Enable MySQL support for data storage</flag>
@@ -27,6 +26,7 @@
<!-- TODO Add later: flag name="tools">Build development tools</flag -->
</use>
<upstream>
+ <doc>https://docs.ejabberd.im</doc>
<remote-id type="github">processone/ejabberd</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
index f1e09d360c6..3dfe36b6ea6 100644
--- a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild
+++ b/net-im/ekg2/ekg2-0.4_pre20190315-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
@@ -19,7 +19,7 @@ IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
RDEPEND="dev-libs/glib:2
gadu? ( <net-libs/libgadu-1.12:0= )
- gpg? ( app-crypt/gpgme:1= )
+ gpg? ( app-crypt/gpgme:= )
gtk? ( x11-libs/gtk+:2 )
nls? ( virtual/libintl:0= )
openssl? ( dev-libs/openssl:0= )
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 95e8a266ea8..3243fa4af2f 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-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
@@ -18,7 +18,7 @@ IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
RDEPEND="dev-libs/glib:2
gadu? ( <net-libs/libgadu-1.12:0= )
- gpg? ( app-crypt/gpgme:1= )
+ gpg? ( app-crypt/gpgme:= )
gtk? ( x11-libs/gtk+:2 )
nls? ( virtual/libintl:0= )
openssl? ( dev-libs/openssl:0= )
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index 8905b8d6bde..c236958eda2 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.9.8_amd64.deb 82015034 BLAKE2B 0dba465f76181ec92154f700959163fde615d1f08d84452810fd9bc4227252b56cf93eada0ab63fa83cf2a263f684df64f0209f125bb2cc492190c0ba02adb71 SHA512 6c696964a7ac6ab312b5c20de0f80d8f55104fcba258df7a9b2cc38d5ff4d9b2ffc32cf900c541ec3eb8a3be9261fe8e4f7a5ee3bc70a0cc9d5878e5a9e1e2e9
+DIST element-desktop_1.10.15_amd64.deb 77384226 BLAKE2B 3681293b6838c5ee20024784d9348d8d213316b260e883bd3de2655a675702d41179498711203dd04f0c0bbabc1e83422d4294cc511f8ae59443f8fbdf1043e6 SHA512 57a81d8d89c850a0103414c1605cec04cbdebab7a7d9ad58363f56f3242a46acce2ce88ab324cba3c76273423e6247e49acb2e4d81e656e32a1b059f66bac6e6
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.9.8.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild
index 52197085f09..82b460c2046 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.9.8.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit unpacker xdg
+inherit optfeature unpacker xdg
-MY_PN="element-desktop"
+MY_PN="${PN/-bin}"
DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
HOMEPAGE="https://element.io"
@@ -15,40 +15,37 @@ S="${WORKDIR}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+emoji"
RESTRICT="splitdebug"
RDEPEND="app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
app-crypt/libsecret
dev-db/sqlcipher
dev-libs/atk
dev-libs/expat
+ dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
media-libs/mesa
net-print/cups
+ sys-apps/dbus
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
- x11-libs/libdrm
- x11-libs/libxcb
x11-libs/libX11
x11-libs/libXcomposite
- x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
- x11-libs/libXi
x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- x11-libs/pango
- emoji? ( media-fonts/noto-emoji )"
-DEPEND="${RDEPEND}"
+ x11-libs/libdrm
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
+ x11-libs/pango"
QA_PREBUILT="opt/Element/chrome-sandbox
+ opt/Element/chrome_crashpad_handler
opt/Element/element-desktop
opt/Element/libEGL.so
opt/Element/libGLESv2.so
@@ -79,3 +76,8 @@ src_install() {
dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
dosym ${MY_PN} /usr/bin/riot-desktop
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "emojis" media-fonts/noto-emoji
+}
diff --git a/net-im/element-desktop-bin/metadata.xml b/net-im/element-desktop-bin/metadata.xml
index 1af1ffc2b2e..6da2e8686fd 100644
--- a/net-im/element-desktop-bin/metadata.xml
+++ b/net-im/element-desktop-bin/metadata.xml
@@ -5,7 +5,4 @@
<email>steils@gentoo.org</email>
<name>Stefan Strogin</name>
</maintainer>
- <use>
- <flag name="emoji">Use <pkg>media-fonts/noto-emoji</pkg> for displaying emoji</flag>
- </use>
</pkgmetadata>
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild
index 5d3a4bc0e9b..c8262cd9b80 100644
--- a/net-im/empathy/empathy-3.12.14.ebuild
+++ b/net-im/empathy/empathy-3.12.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit gnome2 python-any-r1 virtualx
diff --git a/net-im/err/Manifest b/net-im/err/Manifest
index 96da875a11a..8acdb8c9e6b 100644
--- a/net-im/err/Manifest
+++ b/net-im/err/Manifest
@@ -1 +1,3 @@
DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b
+DIST err-6.1.8.tar.gz 1609310 BLAKE2B e3682bfccd548c92160322287a17e26448322abd3956d464b393f333c0cc521d6d5183dab799d280603995a4508a2eb300fefb9c6159da6ed1c550247fa375d9 SHA512 5413f667ee4e121134b791f0dc8fd709ecbd9093a237b9637d282f41458c40076615ffc9167cfa95f297ae416c38b16ded8ae97aece55a81d88dc46b324ec851
+DIST err-6.1.9.tar.gz 1554146 BLAKE2B 62a715d57c213b8d68c40afad92c14d26ff23fdce1df6b489be23817d33d8bc01c7c400ca7360546abc880b4a7e6205f92a3787cabfce3e14500ef8918a4b010 SHA512 cc8f7a00bc9bd7680d978b4c2e6c9ac78f32e0a99796cc9933802206b2c2998caf060d474aca374d8102923bf8eb64f69a01846c5761b13a8624641796893c9b
diff --git a/net-im/err/err-6.1.8-r1.ebuild b/net-im/err/err-6.1.8-r1.ebuild
new file mode 100644
index 00000000000..d81238c7980
--- /dev/null
+++ b/net-im/err/err-6.1.8-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES="${FILESDIR}/err-6.1.8-fix-irc-backend.patch"
+
+KEYWORDS="~amd64 ~riscv"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="
+ acct-group/err
+ acct-user/err"
+RDEPEND="${DEPEND}
+ dev-python/ansi[${PYTHON_USEDEP}]
+ dev-python/bottle[${PYTHON_USEDEP}]
+ dev-python/colorlog[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/daemonize[${PYTHON_USEDEP}]
+ dev-python/deepmerge[${PYTHON_USEDEP}]
+ dev-python/dulwich[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/webtest[${PYTHON_USEDEP}]
+ irc? (
+ dev-python/irc[${PYTHON_USEDEP}]
+ )
+ xmpp? (
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/slixmpp[${PYTHON_USEDEP}]
+ )"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e '/pygments-markdown-lexer/d' setup.py || die
+
+ # NameError: name 'slack' is not defined
+ rm tests/backend_tests/slack_test.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local deselect=(
+ tests/commands_test.py::test_plugin_cycle
+ tests/commands_test.py::test_broken_plugin
+ tests/commands_test.py::test_backup
+ tests/plugin_management_test.py::test_check_dependencies_requi
+ )
+
+ epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}"/errd.initd.2 errd
+ newconfd "${FILESDIR}"/errd.confd errd
+
+ dodir /etc/${PN}
+ keepdir /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners -R err:err /var/lib/${PN}
+ fowners -R err:err /var/log/${PN}
+
+ insinto /etc/${PN}
+ newins errbot/config-template.py config.py
+}
+
+pkg_postinst() {
+ elog "For more backends (Hipchat, Slact, Telegram) support, use pip"
+}
diff --git a/net-im/err/err-6.1.9.ebuild b/net-im/err/err-6.1.9.ebuild
new file mode 100644
index 00000000000..850051e1923
--- /dev/null
+++ b/net-im/err/err-6.1.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="errbot"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable"
+HOMEPAGE="https://errbot.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~riscv"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="irc +xmpp"
+
+DEPEND="
+ acct-group/err
+ acct-user/err"
+RDEPEND="${DEPEND}
+ dev-python/ansi[${PYTHON_USEDEP}]
+ dev-python/bottle[${PYTHON_USEDEP}]
+ dev-python/colorlog[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/daemonize[${PYTHON_USEDEP}]
+ dev-python/deepmerge[${PYTHON_USEDEP}]
+ dev-python/dulwich[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/webtest[${PYTHON_USEDEP}]
+ irc? (
+ dev-python/irc[${PYTHON_USEDEP}]
+ )
+ xmpp? (
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/slixmpp[${PYTHON_USEDEP}]
+ )"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e '/pygments-markdown-lexer/d' setup.py || die
+
+ # NameError: name 'slack' is not defined
+ rm tests/backend_tests/slack_test.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local deselect=(
+ tests/commands_test.py::test_plugin_cycle
+ tests/commands_test.py::test_broken_plugin
+ tests/commands_test.py::test_backup
+ tests/plugin_management_test.py::test_check_dependencies_requi
+ )
+
+ epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}"/errd.initd.2 errd
+ newconfd "${FILESDIR}"/errd.confd errd
+
+ dodir /etc/${PN}
+ keepdir /var/lib/${PN}
+ keepdir /var/log/${PN}
+ fowners -R err:err /var/lib/${PN}
+ fowners -R err:err /var/log/${PN}
+
+ insinto /etc/${PN}
+ newins errbot/config-template.py config.py
+}
+
+pkg_postinst() {
+ elog "For more backends (Slack, Telegram) support, use pip install \"errbot[slack]\""
+}
diff --git a/net-im/err/files/err-6.1.8-fix-irc-backend.patch b/net-im/err/files/err-6.1.8-fix-irc-backend.patch
new file mode 100644
index 00000000000..0874e7352bc
--- /dev/null
+++ b/net-im/err/files/err-6.1.8-fix-irc-backend.patch
@@ -0,0 +1,18 @@
+From 34df1dd98a7ce3a17c22081fadb427827b431d7f Mon Sep 17 00:00:00 2001
+From: Carlos <nzlosh@yahoo.com>
+Date: Fri, 22 Apr 2022 23:45:44 +0200
+Subject: [PATCH] Fixes #1566 remove unsupport argument reconnection_interval
+ from irc backend.
+
+diff --git a/errbot/backends/irc.py b/errbot/backends/irc.py
+index 95a8757d4..9f7e75b29 100644
+--- a/errbot/backends/irc.py
++++ b/errbot/backends/irc.py
+@@ -377,7 +377,6 @@ def __init__(
+ [(server, port, password)],
+ nickname,
+ username,
+- reconnection_interval=reconnect_on_disconnect,
+ )
+
+ def connect(self, *args, **kwargs) -> None:
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index ad3280d3115..3a8a8e82fe0 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>guyu2876@gmail.com</email>
+ <name>Yu Gu</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<stabilize-allarches/>
<use>
<flag name="irc">Pull optional dependencies, needed for IRC backend</flag>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 81fc64dc5ef..90421df2906 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,3 +1,5 @@
-DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
-DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
+DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba68348fad51fe2f114199972a0fc998ae2c6efba1ea48ecb17b819509c1b45745e98e41f99f2e4afd4a4c1daff4865 SHA512 e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442
DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
+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
diff --git a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
deleted file mode 100644
index 04428d3acbe..00000000000
--- a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/gajim/history_manager.py b/gajim/history_manager.py
-index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644
---- a/gajim/history_manager.py
-+++ b/gajim/history_manager.py
-@@ -55,7 +55,6 @@
- from gajim.common.const import JIDConstant
- from gajim.common.const import KindConstant
- from gajim.common.const import ShowConstant
--from gajim.common.settings import Settings
-
-
- def is_standalone():
-@@ -76,6 +75,8 @@ def init_gtk():
- if is_standalone():
- init_gtk()
-
-+ from gajim.common.settings import Settings
-+
- try:
- shortargs = 'hvsc:l:p:'
- longargs = 'help verbose separate config-path= loglevel= profile='
-@@ -100,6 +101,8 @@ def init_gtk():
- app.settings = Settings()
- app.settings.init()
- app.load_css_config()
-+else:
-+ from gajim.common.settings import Settings
-
- from gajim.common import helpers
- from gajim.gui.dialogs import ErrorDialog
-diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
-index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644
---- a/test/unit/test_gui_interface.py
-+++ b/test/unit/test_gui_interface.py
-@@ -3,6 +3,9 @@
- '''
- import unittest
-
-+import gajim.gui
-+gajim.gui.init('gtk')
-+
- from test import lib
- lib.setup_env()
-
diff --git a/net-im/gajim/gajim-1.3.3-r1.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild
index 5d090a79413..726c404f14f 100644
--- a/net-im/gajim/gajim-1.3.3-r1.ebuild
+++ b/net-im/gajim/gajim-1.3.3-r2.ebuild
@@ -1,9 +1,9 @@
-# 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_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="sqlite,xml"
DISTUTILS_SINGLE_IMPL=1
@@ -24,7 +24,6 @@ COMMON_DEPEND="
>=x11-libs/gtk+-3.22:3[introspection]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
- >=dev-util/intltool-0.40.1
virtual/pkgconfig
>=sys-devel/gettext-0.17-r1"
RDEPEND="${COMMON_DEPEND}
@@ -36,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
+ <dev-python/python-nbxmpp-3[${PYTHON_USEDEP}]
>=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
x11-libs/libXScrnSaver
app-crypt/libsecret[crypt,introspection]
diff --git a/net-im/gajim/gajim-1.3.2.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
index 3786de89985..9228c4d00e2 100644
--- a/net-im/gajim/gajim-1.3.2.ebuild
+++ b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
@@ -1,34 +1,29 @@
-# 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_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite,xml"
DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
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}.tar.gz"
-
-# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761
-PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" )
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/${P%_p2}"
COMMON_DEPEND="
dev-libs/gobject-introspection[cairo(+)]
>=x11-libs/gtk+-3.22:3[introspection]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
- >=dev-util/intltool-0.40.1
virtual/pkgconfig
>=sys-devel/gettext-0.17-r1"
RDEPEND="${COMMON_DEPEND}
@@ -40,7 +35,8 @@ RDEPEND="${COMMON_DEPEND}
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-2.0.2[${PYTHON_USEDEP}]
+ <dev-python/python-nbxmpp-3[${PYTHON_USEDEP}]
+ >=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
x11-libs/libXScrnSaver
app-crypt/libsecret[crypt,introspection]
dev-python/keyring[${PYTHON_USEDEP}]
@@ -95,3 +91,7 @@ pkg_postrm() {
xdg_icon_cache_update
xdg_desktop_database_update
}
+
+# tests in this release don't work, see also:
+# https://dev.gajim.org/gajim/gajim/-/issues/10755
+RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.4.0-r1.ebuild b/net-im/gajim/gajim-1.4.0-r1.ebuild
new file mode 100644
index 00000000000..60900668dd5
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.0-r1.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]
+ 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] )
+ webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ ')"
+
+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.3.1_p2.ebuild b/net-im/gajim/gajim-1.4.0.ebuild
index 01fcfbf62a2..dbb2ac846a8 100644
--- a/net-im/gajim/gajim-1.3.1_p2.ebuild
+++ b/net-im/gajim/gajim-1.4.0.ebuild
@@ -1,31 +1,29 @@
-# 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_{7,8,9} )
+PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="sqlite,xml"
DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
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)/${PN}-${PV/_p/-}.tar.gz"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${PV/_p2/}"
+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]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
- >=dev-util/intltool-0.40.1
virtual/pkgconfig
>=sys-devel/gettext-0.17-r1"
RDEPEND="${COMMON_DEPEND}
@@ -37,7 +35,8 @@ RDEPEND="${COMMON_DEPEND}
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-2.0.2[${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}]
@@ -55,6 +54,12 @@ RDEPEND="${COMMON_DEPEND}
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}]
@@ -86,3 +91,6 @@ 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.1.ebuild b/net-im/gajim/gajim-1.4.1.ebuild
new file mode 100644
index 00000000000..60900668dd5
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.1.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]
+ 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] )
+ webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ ')"
+
+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.2.ebuild b/net-im/gajim/gajim-1.4.2.ebuild
new file mode 100644
index 00000000000..60900668dd5
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.2.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]
+ 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] )
+ webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ ')"
+
+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/gg-transport/Manifest b/net-im/gg-transport/Manifest
deleted file mode 100644
index a504b7ae138..00000000000
--- a/net-im/gg-transport/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jggtrans-2.2.6.tar.gz 883775 BLAKE2B bc27dce3fb70e7a5a1d71e8b46f1acf2c21899b956e5fab4c1d85756356973492d1617bd66517052f2fcdd81ab27e8e330837ee01787180d5193e62255cbcba6 SHA512 9fa6beb03427dc29db6b1aa5707486b857d3f850ed4efc9f2a627cbec4a9e40c91a9092b42a4a338976659f6ebfa0ca6f69e194e51bc51744a7665494fc210e7
diff --git a/net-im/gg-transport/files/jggtrans-2.2.4 b/net-im/gg-transport/files/jggtrans-2.2.4
deleted file mode 100644
index 35713d52cfe..00000000000
--- a/net-im/gg-transport/files/jggtrans-2.2.4
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- after net jabber-server
-}
-
-start() {
- ebegin "Starting Jabber GG Transport"
- start-stop-daemon --start --user jabber --group jabber --exec /usr/sbin/jggtrans -- -u jabber -g jabber /etc/jabber/jggtrans.xml
- eend $?
-}
-
-stop() {
- ebegin "Stopping Jabber GG Transport"
- start-stop-daemon --stop --pidfile /var/run/jabber/jggtrans.pid
- eend $?
-}
diff --git a/net-im/gg-transport/gg-transport-2.2.6.ebuild b/net-im/gg-transport/gg-transport-2.2.6.ebuild
deleted file mode 100644
index 99cf02c8ee1..00000000000
--- a/net-im/gg-transport/gg-transport-2.2.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Gadu-Gadu transport for Jabber"
-HOMEPAGE="https://github.com/Jajcus/jggtrans"
-SRC_URI="https://github.com/Jajcus/jggtrans/releases/download/v${PV}/jggtrans-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=net-im/jabber-base-0.01
- >=dev-libs/glib-2.6.4:2
- net-dns/libidn
- >=net-libs/libgadu-1.9.0_rc3
- dev-libs/expat"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/jggtrans-${PV}"
-
-src_install() {
- emake DESTDIR="${D}" install
-
- keepdir /var/spool/jabber/gg
- keepdir /var/run/jabber
- keepdir /var/log/jabber
- fowners jabber:jabber /var/spool/jabber/gg
- fowners jabber:jabber /var/run/jabber
- fowners jabber:jabber /var/log/jabber
-
- newinitd "${FILESDIR}/jggtrans-2.2.4" jggtrans
-
- insinto /etc/jabber
- doins jggtrans.xml
-
- sed -i \
- -e 's,/var/lib/jabber/spool/gg.localhost/,/var/spool/jabber/gg/,' \
- -e 's,/var/lib/jabber/ggtrans.pid,/var/run/jabber/jggtrans.pid,' \
- -e 's,/tmp/ggtrans.log,/var/log/jabber/jggtrans.log,' \
- "${D}/etc/jabber/jggtrans.xml" || die "sed failed"
-
- einstalldocs
-}
diff --git a/net-im/gg-transport/metadata.xml b/net-im/gg-transport/metadata.xml
deleted file mode 100644
index 65f7546ff4b..00000000000
--- a/net-im/gg-transport/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>
- Gadu-Gadu is a IM network vary famous in Poland, this package will
- enable your jabber server to talk to that network.
- </longdescription>
- <upstream>
- <remote-id type="github">Jajcus/jggtrans</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-im/jabber-base/jabber-base-0.01-r2.ebuild b/net-im/jabber-base/jabber-base-0.01-r2.ebuild
deleted file mode 100644
index e054f2b5b47..00000000000
--- a/net-im/jabber-base/jabber-base-0.01-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Base layout package for various jabber services"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
- acct-group/jabber
- acct-user/jabber
-"
-
-# This package provides the base layout for all jabber related services.
-# Each service should use the user 'jabber' and the group 'jabber.
-#
-# The base layout contains of the following directories:
-# '/etc/jabber/' : All main configuration, by jabber services used, is stored here.
-# '(/var)/run/jabber' : All pid files, used by jabber services, are stored here.
-# : Please note, that this directory should be
-# : created dynamically by each jabber service during startup.
-# '/var/log/jabber/' : All log files, used by jabber services, are stored here.
-# '/var/spool/jabber' : All (flat) database files, used by jabber services, are stored here.
-
-src_install() {
- local paths=(
- "/etc/jabber"
- "/var/log/jabber"
- "/var/spool/jabber"
- )
-
- for path in ${paths[@]}; do
- keepdir "${path}"
- fowners "jabber:jabber" "${path}"
- fperms 770 "${path}"
- done
-}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
deleted file mode 100644
index 3ee268c59de..00000000000
--- a/net-im/jabber-base/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>conikost@gentoo.org</email>
- <name>Conrad Kostecki</name>
- </maintainer>
- <stabilize-allarches/>
- <longdescription>
- This package creates the base layout,
- which is used by several jabber services.
- See ebuild for more information.
- </longdescription>
-</pkgmetadata>
diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest
index 86cab5b573b..815fc58bfd9 100644
--- a/net-im/libcommuni/Manifest
+++ b/net-im/libcommuni/Manifest
@@ -1 +1 @@
-DIST libcommuni-3.6.0.tar.gz 472634 BLAKE2B 0d3d68e27f75cd59ebd61532261e2d3d2c0c2d61d6e08e5b4ed2b21bbf75572f4ce1763fbc4f66c8d5f7c8f9859240ddff5daceeb548d82e2efe936a265031b7 SHA512 cf872d0cdc281a452129a05f5a903eeec3661a4d0d56bdc61bdf95ea969c7b1bcb68534d3d8999fb85ef2b81f17c067b5cd3437351d4635efae3c714567518c0
+DIST libcommuni-3.7.0.tar.gz 475364 BLAKE2B d5bc6deac50b403c7423ab3f9953f94fa3db522f67740a62095700f45c8ee9c35a84aba35f48ff3104a8ffdadaf904f96b625dd1882fa89f49e31731f97e96c0 SHA512 ed1182256899f6be4b492e20958de2edf557b744362701f031ede279c7464b031a57a50e3d7174ae61e313e43564dbf0b04eb382af6bcda71eb96d3405f168c1
diff --git a/net-im/libcommuni/libcommuni-3.6.0.ebuild b/net-im/libcommuni/libcommuni-3.7.0.ebuild
index ed17ccf543a..6c0ce18b28d 100644
--- a/net-im/libcommuni/libcommuni-3.6.0.ebuild
+++ b/net-im/libcommuni/libcommuni-3.7.0.ebuild
@@ -1,13 +1,13 @@
-# 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
inherit qmake-utils
DESCRIPTION="A cross-platform IRC framework written with Qt"
HOMEPAGE="https://communi.github.io/"
-SRC_URI="https://github.com/communi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/communi/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 660dfb795d9..efa21d49d2b 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,2 +1,2 @@
-DIST mattermost-desktop-5.0.2-linux-ia32.tar.gz 86954293 BLAKE2B bcefc68f92358e072da236d51dbc970366674aac68640c77b24375661e027b357baa799bbe52834e7e616206eed2edea9fa8ae2e136a32dd8db027b1691f80e2 SHA512 15a9e71695f7c520c225b94a34e2887ecf9b39e72ecdf95f0c18d58d2c3ba13eeb771c49fcdf5f9fd7a36d11d1cec625965eda71762b19e1e9fff9514c083649
-DIST mattermost-desktop-5.0.2-linux-x64.tar.gz 87312644 BLAKE2B 44a77b62d7aeb978baad20ebad14f75fbad73bd160533287bfadba0148c8c3319f77ccf68ea7625f9fa2dd9d3a6baed6b2e48b9afea21b20ae407389a2161c3b SHA512 e9ad2b24b995ce04c53c4c18661822d40d6ad1ff0d990f9e0dbf00294d80e7884fb5b08302d5b1e8cece4bb95705814ff0ffd0243e4aef290d0a8b79ce622e40
+DIST mattermost-desktop-5.1.0-linux-ia32.tar.gz 102235544 BLAKE2B f7427aa195ec3be706243ce1f1aeb2cbad594905f86b6493796de2ebb7fa161e06b910af9a285583018bad9709e6ce16ee5bc168f2d98f26534af3de3b753b41 SHA512 a94be8235c5c1927c89615297c7e82ff2d1bc61e3600133a5af262bc25b6b6a7c50b516d58c7a387f672510736572aacc0bd9a657e5d25351eea4df2dc8958fc
+DIST mattermost-desktop-5.1.0-linux-x64.tar.gz 102764810 BLAKE2B 7e555d70aa15b308cea637b7ad12a11a16a93cb80693157afbfcf782efff03458e880eabbbd52292e476159669a6ebd809197ba4b2f6154093515cb7f51b7e6e SHA512 5fb3abaf93cdb4e76ba29e56f1da800d665171ade8aa475ccc927f667d513db34db37ee2e1326e59584a38260d32e6c0420ac36822e6b22564d76391a44c7e18
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.2.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild
index e767c09c1e0..ca1c0b05280 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.2.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.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=8
@@ -8,7 +8,7 @@ MY_PN="${PN%-*}"
inherit desktop
DESCRIPTION="Mattermost Desktop application"
-HOMEPAGE="https://about.mattermost.com/"
+HOMEPAGE="https://mattermost.com/"
SRC_URI="
amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
@@ -31,6 +31,7 @@ RDEPEND="
media-libs/mesa
net-print/cups
sys-apps/dbus
+ sys-libs/glibc
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3[X]
diff --git a/net-im/mcabber/mcabber-1.1.2.ebuild b/net-im/mcabber/mcabber-1.1.2-r1.ebuild
index 616c5e554f8..bd5a83f961e 100644
--- a/net-im/mcabber/mcabber-1.1.2.ebuild
+++ b/net-im/mcabber/mcabber-1.1.2-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
@@ -30,7 +30,7 @@ for i in ${LANGS}; do
IUSE="${IUSE} l10n_${i}"
done;
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+RDEPEND="crypt? ( app-crypt/gpgme:= )
otr? ( >=net-libs/libotr-3.1.0 )
aspell? ( app-text/aspell )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index 9e0a12b1fef..eb94b6002a7 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-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 @@ for i in ${LANGS}; do
IUSE="${IUSE} l10n_${i}"
done;
-RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
+RDEPEND="crypt? ( app-crypt/gpgme:= )
otr? ( >=net-libs/libotr-3.1.0 )
aspell? ( app-text/aspell )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index 654e184b3cc..0abc7b5f492 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/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>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
MCabber is a small Jabber console client that features
such as GPG encryption, SSL support, MUC (Multi-User Chat) support,
diff --git a/net-im/neochat/neochat-1.2.0.ebuild b/net-im/neochat/neochat-1.2.0.ebuild
index 79151e390d1..357579f37ef 100644
--- a/net-im/neochat/neochat-1.2.0.ebuild
+++ b/net-im/neochat/neochat-1.2.0.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/neochat/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~ppc64"
+ KEYWORDS="~amd64 ~arm64 ~ppc64"
fi
LICENSE="GPL-3"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index e3f6cfe153b..52bc481c3d8 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,4 +1,4 @@
DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.6.tar.bz2 8672222 BLAKE2B d2e6428728f18096c957b10d7cc5e79704c0fbb403967e3968f59393db125307fc6fc84c90d66788b4a27bd9707b126c1f0df532c2a1e7d1b62356127e87371c SHA512 19ea12b6c9e99b6215a7d955f02d52ad19de8c4beb00806276c8c184d5cc338db119197e0cc9f4685705bd8b83f35c8f63565095b49a319f9696aab37735951b
-DIST pidgin-2.14.7.tar.bz2 8713379 BLAKE2B d48670c8b7419df67c6dddedf8eb15c0c4d61877386f65793b1423b659c6131d92eb58ae6cf63a31432426c8a09da0bdab0be8770517436bae51610a60886b59 SHA512 189b02b5500ca3560972cad9c84e94007e1c8cedd56d39214293412b31ee38bc2dbb33ab2f9320338bb226131f51cc8a1f6a4c66ba889a0f55d91edc15ac7465
+DIST pidgin-2.14.10.tar.bz2 8229328 BLAKE2B 9f004abda0f00b315e763e8b17e4e938b44b8a971d5411d775b9428363ab2ae071462d6d16654fcc09270123c434ef2d1f639d7f6d85c08a83b05c0ba4342c21 SHA512 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d
DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
+DIST pidgin-2.14.9.tar.bz2 8254729 BLAKE2B 3151e1ba21894f3c16ce615223e56e8ebff8f4098fe448b15752ed93e26d7895094fe584dfe0ebc6d8e4e0dba8a51ac57e90e2b7e286f4a840edcac2630df7c2 SHA512 fa610b49f77711df9ec76d886c836a80c5ea1563da4e861cbfcc7f7aba3130eeb5db7bb217e2aac571f9aea5d03da8b15c1aeec300468ab2ede6c409cce60d4f
diff --git a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch b/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
deleted file mode 100644
index cf3a6de7bfb..00000000000
--- a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/593338
-
-Workaround one failing test. test fails on all platforms.
-Needs to be fixed upstream.
-
---- a/libpurple/tests/test_jabber_jutil.c
-+++ b/libpurple/tests/test_jabber_jutil.c
-@@ -144,7 +144,16 @@ START_TEST(test_jabber_id_new)
- * string MUST NOT contain any LCat character."
- * The character is U+066D (ARABIC FIVE POINTED STAR).
- */
-+#if 0
-+ /*
-+ Fails in gentoo: https://bugs.gentoo.org/593338
-+
-+ 98%: Checks: 87, Failures: 1, Errors: 0
-+ test_jabber_jutil.c:147:F:JID validate:test_jabber_id_new:0: JID 'foo@example.com/٭simplexe٭' is invalid but jabber_id_new() allowed it
-+ FAIL check_libpurple (exit status: 1)
-+ */
- assert_invalid_jid("foo@example.com/٭simplexe٭");
-+#endif
-
- /* Ensure that jabber_id_new is properly lowercasing node and domains */
- assert_jid_parts("paul", "darkrain42.org", "PaUL@darkrain42.org");
diff --git a/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch
new file mode 100644
index 00000000000..30caaa92e9c
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch
@@ -0,0 +1,52 @@
+# HG changeset patch
+# Node ID e8f8e1558e11
+# Parent 930e4fb71321
+diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c
+--- a/libpurple/tests/test_util.c
++++ b/libpurple/tests/test_util.c
+@@ -172,7 +172,7 @@
+ fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL));
+ fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21.3234", TRUE, NULL, NULL, NULL));
+ fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21Z", TRUE, NULL, NULL, NULL));
+- fail_unless(1631512800 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL));
++ fail_unless(1631491200 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL));
+
+ /* For testing local time we use Asia/Kathmandu because it's +05:45 and
+ * doesn't have DST which means the test should always pass regardless of
+@@ -195,9 +195,14 @@
+ * localtime.
+ */
+ timestamp = purple_str_to_time("09/13/202115:34:34", TRUE, NULL, NULL, &rest);
+- fail_unless(1631470500 == timestamp);
++ fail_unless(1631491200 == timestamp);
+ assert_string_equal("15:34:34", rest);
+
++ timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest);
++ fail_unless(1282941722 == timestamp);
++ fail_unless((-7 * 60 * 60) == tz_off);
++ assert_string_equal("PDT", rest);
++
+ /* finally revert the TZ environment variable */
+ if(oldtz != NULL) {
+ g_setenv("TZ", oldtz, TRUE);
+diff --git a/libpurple/util.c b/libpurple/util.c
+--- a/libpurple/util.c
++++ b/libpurple/util.c
+@@ -887,6 +887,17 @@
+ t.tm_isdst = -1; /* -1 means dst info is not available */
+ }
+ }
++ } else {
++ /* If we have a time, figure out if we need to adjust our tz offset. */
++ if(!mktime_with_utc) {
++ if(utc) {
++ mktime_with_utc = TRUE;
++ tzoff = 0;
++ } else {
++ /* Local Time */
++ t.tm_isdst = -1; /* -1 means dst info is not available */
++ }
++ }
+ }
+
+ g_free(hours);
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 4ae4682ad00..9d0e3f3f658 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/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>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE, and Zephyr.
</longdescription>
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.10.ebuild
index a912c204bcb..78e466aed03 100644
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.10.ebuild
@@ -1,12 +1,12 @@
-# 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
GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+inherit autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
DESCRIPTION="GTK Instant Messenger client"
HOMEPAGE="https://pidgin.im/"
@@ -16,10 +16,11 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
+test tk v4l +xscreensaver zephyr zeroconf"
+RESTRICT="!test? ( test )"
# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
@@ -30,27 +31,6 @@ tk +xscreensaver zephyr zeroconf"
RDEPEND="
>=dev-libs/glib-2.16
>=dev-libs/libxml2-2.6.18
- ncurses? (
- >=dev-libs/libgnt-$(ver_cut 1-2)
- sys-libs/ncurses:=[unicode(+)]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} )
- )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- >=x11-libs/pango-1.4.0
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6:= )
- prediction? ( >=dev-db/sqlite-3.3:3 )
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=net-libs/farstream-0.2.7:0.2
- )
- zeroconf? ( net-dns/avahi[dbus] )
dbus? (
>=dev-libs/dbus-glib-0.71
>=sys-apps/dbus-0.90
@@ -58,19 +38,41 @@ RDEPEND="
dev-python/dbus-python[${PYTHON_USEDEP}]
')
)
- perl? ( >=dev-lang/perl-5.16:= )
gadu? ( >=net-libs/libgadu-1.11.0 )
gnutls? ( net-libs/gnutls:= )
!gnutls? (
dev-libs/nspr
dev-libs/nss
)
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=net-libs/farstream-0.2.7:0.2
+ )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2[aqua=]
+ x11-libs/libSM
+ >=x11-libs/pango-1.4.0
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+ prediction? ( >=dev-db/sqlite-3.3:3 )
+ )
+ idn? ( net-dns/libidn:= )
meanwhile? ( net-libs/meanwhile )
+ ncurses? (
+ >=dev-libs/libgnt-$(ver_cut 1-2)
+ sys-libs/ncurses:=[unicode(+)]
+ dbus? ( ${PYTHON_DEPS} )
+ python? ( ${PYTHON_DEPS} )
+ )
+ networkmanager? ( net-misc/networkmanager )
+ perl? ( >=dev-lang/perl-5.16:= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
tcl? ( dev-lang/tcl:0= )
tk? ( dev-lang/tk:0= )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn:= )
+ v4l? ( media-plugins/gst-plugins-v4l2 )
+ zeroconf? ( net-dns/avahi[dbus] )
"
# We want nls in case gtk is enabled, bug #
@@ -89,6 +91,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
!gtk? ( nls? ( ${NLS_DEPEND} ) )
+ test? ( >=dev-libs/check-0.9.4 )
"
DOCS=( AUTHORS HACKING NEWS README ChangeLog )
@@ -97,10 +100,11 @@ REQUIRED_USE="
dbus? ( ${PYTHON_REQUIRED_USE} )
networkmanager? ( dbus )
python? ( ${PYTHON_REQUIRED_USE} )
+ v4l? ( gstreamer )
"
# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
+DEFAULT_PRPLS="irc,jabber,simple"
# List of plugins
# app-accessibility/pidgin-festival
@@ -134,7 +138,6 @@ DYNAMIC_PRPLS="irc,jabber,simple"
PATCHES=(
"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
- "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
)
pkg_pretend() {
@@ -160,7 +163,8 @@ pkg_setup() {
}
src_prepare() {
- xdg_src_prepare
+ xdg_environment_reset
+ default
eautoreconf
}
@@ -170,48 +174,49 @@ src_configure() {
replace-flags -O? -O2
use pie && append-cflags -fPIE -pie
- use gadu && DYNAMIC_PRPLS+=",gg"
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+ use gadu && DEFAULT_PRPLS+=",gg"
+ use groupwise && DEFAULT_PRPLS+=",novell"
+ use meanwhile && DEFAULT_PRPLS+=",sametime"
+ use zephyr && DEFAULT_PRPLS+=",zephyr"
+ use zeroconf && DEFAULT_PRPLS+=",bonjour"
local myconf=(
--disable-mono
--disable-static
- --with-dynamic-prpls="${DYNAMIC_PRPLS}"
+ --with-dynamic-prpls="${DEFAULT_PRPLS}"
--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
--x-includes="${EPREFIX}"/usr/include/X11
- $(use_enable ncurses consoleui)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable doc doxygen)
+ $(use_enable gstreamer)
$(use_enable gtk gtkui)
$(use_enable gtk sm)
- $(usex gtk '--enable-nls' "$(use_enable nls)")
- $(use gtk && use_enable xscreensaver screensaver)
- $(use gtk && use_enable prediction cap)
- $(use gtk && use_enable eds gevolution)
- $(use gtk && use_enable spell gtkspell)
+ $(use_enable idn)
+ $(use_enable meanwhile)
+ $(use_enable networkmanager nm)
+ $(use_enable ncurses consoleui)
$(use_enable perl)
+ $(use_enable sasl cyrus-sasl )
$(use_enable tk)
$(use_enable tcl)
- $(use_enable debug)
- $(use_enable dbus)
- $(use_enable meanwhile)
- $(use_enable gstreamer)
- $(use_with gstreamer gstreamer 1.0)
- $(use_enable gstreamer farstream)
- $(use_enable gstreamer vv)
- $(use_enable sasl cyrus-sasl )
- $(use_enable doc doxygen)
- $(use_enable networkmanager nm)
+ $(use_enable v4l farstream)
+ $(use_enable v4l gstreamer-video)
+ $(use_enable v4l vv)
$(use_enable zeroconf avahi)
- $(use_enable idn)
+ $(use_with gstreamer gstreamer 1.0)
+ $(usex gtk '--enable-nls' "$(use_enable nls)")
+ $(use gtk && use_enable eds gevolution)
+ $(use gtk && use_enable prediction cap)
+ $(use gtk && use_enable spell gtkspell)
+ $(use gtk && use_enable xscreensaver screensaver)
)
- if use gnutls; then
+ if use gnutls ; then
einfo "Disabling NSS, using GnuTLS"
myconf+=(
- --enable-nss=no
--enable-gnutls=yes
+ --enable-nss=no
--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
)
@@ -233,7 +238,7 @@ src_configure() {
}
src_install() {
- # setting this here because gnome2.eclass is not EAPI-7 ready
+ # setting this here because we no longer use gnome2.eclass
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
default
diff --git a/net-im/pidgin/pidgin-2.14.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
index 9fa6d8518ea..dfdb2ffb021 100644
--- a/net-im/pidgin/pidgin-2.14.8.ebuild
+++ b/net-im/pidgin/pidgin-2.14.8.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
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
tk +xscreensaver zephyr zeroconf"
@@ -100,7 +100,7 @@ REQUIRED_USE="
"
# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
+DEFAULT_PRPLS="irc,jabber,simple"
# List of plugins
# app-accessibility/pidgin-festival
@@ -134,6 +134,7 @@ DYNAMIC_PRPLS="irc,jabber,simple"
PATCHES=(
"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+ "${FILESDIR}/${P}-libpurple_test_fix.patch" #819774
)
pkg_pretend() {
@@ -169,16 +170,16 @@ src_configure() {
replace-flags -O? -O2
use pie && append-cflags -fPIE -pie
- use gadu && DYNAMIC_PRPLS+=",gg"
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+ use gadu && DEFAULT_PRPLS+=",gg"
+ use groupwise && DEFAULT_PRPLS+=",novell"
+ use meanwhile && DEFAULT_PRPLS+=",sametime"
+ use zephyr && DEFAULT_PRPLS+=",zephyr"
+ use zeroconf && DEFAULT_PRPLS+=",bonjour"
local myconf=(
--disable-mono
--disable-static
- --with-dynamic-prpls="${DYNAMIC_PRPLS}"
+ --with-dynamic-prpls="${DEFAULT_PRPLS}"
--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
--x-includes="${EPREFIX}"/usr/include/X11
$(use_enable ncurses consoleui)
diff --git a/net-im/pidgin/pidgin-2.14.7.ebuild b/net-im/pidgin/pidgin-2.14.9.ebuild
index 5b28584d138..5fa3ae3e271 100644
--- a/net-im/pidgin/pidgin-2.14.7.ebuild
+++ b/net-im/pidgin/pidgin-2.14.9.ebuild
@@ -1,12 +1,12 @@
-# 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
GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+inherit autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg
DESCRIPTION="GTK Instant Messenger client"
HOMEPAGE="https://pidgin.im/"
@@ -19,7 +19,7 @@ SLOT="0/2" # libpurple version
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf"
+tk v4l +xscreensaver zephyr zeroconf"
# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
@@ -30,27 +30,6 @@ tk +xscreensaver zephyr zeroconf"
RDEPEND="
>=dev-libs/glib-2.16
>=dev-libs/libxml2-2.6.18
- ncurses? (
- >=dev-libs/libgnt-$(ver_cut 1-2)
- sys-libs/ncurses:=[unicode(+)]
- dbus? ( ${PYTHON_DEPS} )
- python? ( ${PYTHON_DEPS} )
- )
- gtk? (
- >=x11-libs/gtk+-2.10:2[aqua=]
- x11-libs/libSM
- >=x11-libs/pango-1.4.0
- xscreensaver? ( x11-libs/libXScrnSaver )
- spell? ( >=app-text/gtkspell-2.0.2:2 )
- eds? ( >=gnome-extra/evolution-data-server-3.6:= )
- prediction? ( >=dev-db/sqlite-3.3:3 )
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=net-libs/farstream-0.2.7:0.2
- )
- zeroconf? ( net-dns/avahi[dbus] )
dbus? (
>=dev-libs/dbus-glib-0.71
>=sys-apps/dbus-0.90
@@ -58,19 +37,41 @@ RDEPEND="
dev-python/dbus-python[${PYTHON_USEDEP}]
')
)
- perl? ( >=dev-lang/perl-5.16:= )
gadu? ( >=net-libs/libgadu-1.11.0 )
gnutls? ( net-libs/gnutls:= )
!gnutls? (
dev-libs/nspr
dev-libs/nss
)
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=net-libs/farstream-0.2.7:0.2
+ )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2[aqua=]
+ x11-libs/libSM
+ >=x11-libs/pango-1.4.0
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+ prediction? ( >=dev-db/sqlite-3.3:3 )
+ )
+ idn? ( net-dns/libidn:= )
meanwhile? ( net-libs/meanwhile )
+ ncurses? (
+ >=dev-libs/libgnt-$(ver_cut 1-2)
+ sys-libs/ncurses:=[unicode(+)]
+ dbus? ( ${PYTHON_DEPS} )
+ python? ( ${PYTHON_DEPS} )
+ )
+ networkmanager? ( net-misc/networkmanager )
+ perl? ( >=dev-lang/perl-5.16:= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
tcl? ( dev-lang/tcl:0= )
tk? ( dev-lang/tk:0= )
- sasl? ( dev-libs/cyrus-sasl:2 )
- networkmanager? ( net-misc/networkmanager )
- idn? ( net-dns/libidn:= )
+ v4l? ( media-plugins/gst-plugins-v4l2 )
+ zeroconf? ( net-dns/avahi[dbus] )
"
# We want nls in case gtk is enabled, bug #
@@ -97,10 +98,11 @@ REQUIRED_USE="
dbus? ( ${PYTHON_REQUIRED_USE} )
networkmanager? ( dbus )
python? ( ${PYTHON_REQUIRED_USE} )
+ v4l? ( gstreamer )
"
# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,simple"
+DEFAULT_PRPLS="irc,jabber,simple"
# List of plugins
# app-accessibility/pidgin-festival
@@ -159,7 +161,8 @@ pkg_setup() {
}
src_prepare() {
- xdg_src_prepare
+ xdg_environment_reset
+ default
eautoreconf
}
@@ -169,48 +172,49 @@ src_configure() {
replace-flags -O? -O2
use pie && append-cflags -fPIE -pie
- use gadu && DYNAMIC_PRPLS+=",gg"
- use groupwise && DYNAMIC_PRPLS+=",novell"
- use meanwhile && DYNAMIC_PRPLS+=",sametime"
- use zephyr && DYNAMIC_PRPLS+=",zephyr"
- use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+ use gadu && DEFAULT_PRPLS+=",gg"
+ use groupwise && DEFAULT_PRPLS+=",novell"
+ use meanwhile && DEFAULT_PRPLS+=",sametime"
+ use zephyr && DEFAULT_PRPLS+=",zephyr"
+ use zeroconf && DEFAULT_PRPLS+=",bonjour"
local myconf=(
--disable-mono
--disable-static
- --with-dynamic-prpls="${DYNAMIC_PRPLS}"
+ --with-dynamic-prpls="${DEFAULT_PRPLS}"
--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
--x-includes="${EPREFIX}"/usr/include/X11
- $(use_enable ncurses consoleui)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable doc doxygen)
+ $(use_enable gstreamer)
$(use_enable gtk gtkui)
$(use_enable gtk sm)
- $(usex gtk '--enable-nls' "$(use_enable nls)")
- $(use gtk && use_enable xscreensaver screensaver)
- $(use gtk && use_enable prediction cap)
- $(use gtk && use_enable eds gevolution)
- $(use gtk && use_enable spell gtkspell)
+ $(use_enable idn)
+ $(use_enable meanwhile)
+ $(use_enable networkmanager nm)
+ $(use_enable ncurses consoleui)
$(use_enable perl)
+ $(use_enable sasl cyrus-sasl )
$(use_enable tk)
$(use_enable tcl)
- $(use_enable debug)
- $(use_enable dbus)
- $(use_enable meanwhile)
- $(use_enable gstreamer)
- $(use_with gstreamer gstreamer 1.0)
- $(use_enable gstreamer farstream)
- $(use_enable gstreamer vv)
- $(use_enable sasl cyrus-sasl )
- $(use_enable doc doxygen)
- $(use_enable networkmanager nm)
+ $(use_enable v4l farstream)
+ $(use_enable v4l gstreamer-video)
+ $(use_enable v4l vv)
$(use_enable zeroconf avahi)
- $(use_enable idn)
+ $(use_with gstreamer gstreamer 1.0)
+ $(usex gtk '--enable-nls' "$(use_enable nls)")
+ $(use gtk && use_enable eds gevolution)
+ $(use gtk && use_enable prediction cap)
+ $(use gtk && use_enable spell gtkspell)
+ $(use gtk && use_enable xscreensaver screensaver)
)
- if use gnutls; then
+ if use gnutls ; then
einfo "Disabling NSS, using GnuTLS"
myconf+=(
- --enable-nss=no
--enable-gnutls=yes
+ --enable-nss=no
--with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
--with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
)
@@ -232,7 +236,7 @@ src_configure() {
}
src_install() {
- # setting this here because gnome2.eclass is not EAPI-7 ready
+ # setting this here because we no longer use gnome2.eclass
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
default
diff --git a/net-im/poezio/Manifest b/net-im/poezio/Manifest
index 8c63c9fa1b8..89fdd00059f 100644
--- a/net-im/poezio/Manifest
+++ b/net-im/poezio/Manifest
@@ -1 +1 @@
-DIST poezio-0.13.1.tar.gz 632572 BLAKE2B e8d3d34c5ca8d236a5a434b4b339cab5ea7286c60db3ef5a6012d406848537b587e834b86f7b6049ee8e637a82e883b2d874134bc1f7d64106e0b0f81aab218f SHA512 6c211ef0fa2fc4bd4cce6ab896166eec6bcdc16ad9e774f4d6bf261b404c9ef68b18d934097da0e165b0cce9bd7779da520ac9c3eac30ccf8280f98ef6aa19c6
+DIST poezio-0.14.tar.gz 662379 BLAKE2B 467741d82945c084c79811d41ff85358ad236d0dcefca7e6f1f8ed5d78aa127f800d2370d624ebaf9e2eb20e1038f280c2e874694ea2b86965fe329b82c4b7d8 SHA512 6e68954a918c645592e2d2f8a265e2f2445a39e256c0525a5517e758a90cc404e066cc08d67ad0f8a3c7d6f3efd61f13a776737d110dd23df7a5f7fab54fc6b5
diff --git a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
index 9506cdb1490..7b85ba892c4 100644
--- a/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
+++ b/net-im/poezio/files/Do-not-install-man-pages-and-files-in-usr-share-poez.patch
@@ -4,12 +4,6 @@ Date: Mon, 12 Jul 2021 15:08:30 +0200
Subject: [PATCH] Do not install man pages and files in /usr/share/poezio
Signed-off-by: Florian Schmaus <flo@geekplace.eu>
----
- setup.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index d1dde4d2f02f..bee8e4834b81 100755
--- a/setup.py
+++ b/setup.py
@@ -156,13 +156,9 @@ setup(
@@ -26,6 +20,3 @@ index d1dde4d2f02f..bee8e4834b81 100755
+ sphinx_files_found
),
install_requires=['slixmpp>=1.6.0', 'aiodns', 'pyasn1_modules', 'pyasn1', 'typing_extensions', 'setuptools'],
---
-2.31.1
-
diff --git a/net-im/poezio/metadata.xml b/net-im/poezio/metadata.xml
index eb783ed6ad9..47243d5ddc2 100644
--- a/net-im/poezio/metadata.xml
+++ b/net-im/poezio/metadata.xml
@@ -5,10 +5,6 @@
<email>flow@gentoo.org</email>
<name>Florian Schmaus</name>
</maintainer>
- <maintainer type="person">
- <email>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
<upstream>
<remote-id type="pypi">poezio</remote-id>
</upstream>
diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.14.ebuild
index a43f1e0504f..b89e69da45f 100644
--- a/net-im/poezio/poezio-0.13.1-r2.ebuild
+++ b/net-im/poezio/poezio-0.14.ebuild
@@ -1,16 +1,16 @@
-# 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
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1 optfeature xdg
DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
+LICENSE="GPL-3+"
SLOT="0"
if [[ "${PV}" == "9999" ]]; then
@@ -28,7 +28,7 @@ RDEPEND="
dev-python/aiodns[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
- >=dev-python/slixmpp-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/slixmpp-1.8.2[${PYTHON_USEDEP}]
"
PATCHES=(
@@ -51,6 +51,14 @@ src_compile() {
fi
}
+# Poezio provides its own Python C extension 'poopt', which needs to be
+# correctly discovered to run the tests. See
+# https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions
+python_test() {
+ cd "${T}" || die
+ epytest "${S}"/test
+}
+
src_install() {
distutils-r1_src_install
diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild
index 608644fde1b..162044b8bbf 100644
--- a/net-im/poezio/poezio-9999.ebuild
+++ b/net-im/poezio/poezio-9999.ebuild
@@ -1,16 +1,16 @@
-# 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
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1 optfeature xdg
DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
+LICENSE="GPL-3+"
SLOT="0"
if [[ "${PV}" == "9999" ]]; then
@@ -28,7 +28,7 @@ RDEPEND="
dev-python/aiodns[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
- >=dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/slixmpp-1.8.2[${PYTHON_USEDEP}]
"
PATCHES=(
@@ -51,6 +51,14 @@ src_compile() {
fi
}
+# Poezio provides its own Python C extension 'poopt', which needs to be
+# correctly discovered to run the tests. See
+# https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions
+python_test() {
+ cd "${T}" || die
+ epytest "${S}"/test
+}
+
src_install() {
distutils-r1_src_install
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 10964d81786..f343d5aa16e 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,2 +1,3 @@
DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
DIST profanity-0.11.0.tar.gz 887566 BLAKE2B 373b49670d00aa741e1957a8d3ca0282f6e7215c53c6c89088268d92fa6bd8f396e6c8e69f17aeb65f9183f620376613672c7f71c879ece31b97382df5d7a781 SHA512 14164921e151a9201728afc3835e08649036702d1fcdef6e37f83de6da4b9bd9c5e9ba54db69e3a9e16fb7e360369b4e92b6b771bc5e005e343a9a526738a268
+DIST profanity-0.12.1.tar.gz 895566 BLAKE2B 8e9a0e21ad598c5fdde293e38b9b6fb363ae06f424e7fd11d12a01ec6d5ce39a83849e56e284c15a842f01d66f3a4011f9518aef3a521459f690a7d052fe591f SHA512 ca3ea92fd439336cd0bf0be42afdda464e25be85b910aef837738b8d1787ac174ac93ccee4fb2fb385228ed7be8e9bac5e96a1f89a68df162785b17d7671463f
diff --git a/net-im/profanity/metadata.xml b/net-im/profanity/metadata.xml
index 2be4233605a..3089b326461 100644
--- a/net-im/profanity/metadata.xml
+++ b/net-im/profanity/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>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
Profanity is a console based XMPP client written in C using
ncurses and libstrophe, inspired by Irssi.
diff --git a/net-im/profanity/profanity-0.12.1-r1.ebuild b/net-im/profanity/profanity-0.12.1-r1.ebuild
new file mode 100644
index 00000000000..4dbaba2f82a
--- /dev/null
+++ b/net-im/profanity/profanity-0.12.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A console based XMPP client inspired by Irssi"
+HOMEPAGE="https://profanity-im.github.io"
+SRC_URI="https://profanity-im.github.io/tarballs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="libnotify omemo otr gpg test xscreensaver"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/libstrophe-0.11.0
+ net-misc/curl
+ sys-libs/ncurses:=[unicode(+)]
+ virtual/libcrypt:=
+ media-libs/harfbuzz:=
+ gpg? ( app-crypt/gpgme:= )
+ libnotify? ( x11-libs/libnotify )
+ omemo? (
+ net-libs/libsignal-protocol-c
+ dev-libs/libgcrypt:=
+ )
+ otr? ( net-libs/libotr )
+ sys-libs/readline:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ xscreensaver? (
+ x11-libs/libXScrnSaver
+ x11-libs/libX11
+ )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( dev-util/cmocka )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable libnotify notifications) \
+ $(use_enable omemo) \
+ $(use_enable otr) \
+ $(use_enable gpg pgp) \
+ $(use_with xscreensaver)
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/net-im/prosody-modules/Manifest b/net-im/prosody-modules/Manifest
index a85626a0d7c..10ff3c2864a 100644
--- a/net-im/prosody-modules/Manifest
+++ b/net-im/prosody-modules/Manifest
@@ -1 +1 @@
-DIST prosody-modules-0_pre20211027.tar.xz 1214428 BLAKE2B a514d5d66475c68d6e7eb3040b648530b1f525fc555e85773f53fa982e2634e10fca3721e463ca6a714a2b058213d5a923e8181f332d509b91bba5b6cc15b3b0 SHA512 0d9fc8f167f7a93ee3d46ea517a7943d1a448a7513776e9e6d0003362cc24be938ed185e8c8ce33570aa91e0b1fd66dc4e0f7cc863d97e108f3213e86085b863
+DIST prosody-modules-0_pre20220319.tar.xz 1221828 BLAKE2B bb9482a60b15fd456125b512017ee93223bd139ed5b664236db4313b65985729ad4f5b8adb5d76bb9099ff4de816457fffd1277b7d36c556d00ce789d8ecf15f SHA512 a288d082e3bc2f9450c0b09e4f02816322d0db073134b315b2fa19be4d176037b399d763854c6c9a006eef85153c7bbbabddf5da85225d599082bfc7c0101450
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20211027.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
index 31462790da3..a120ace9658 100644
--- a/net-im/prosody-modules/prosody-modules-0_pre20211027.ebuild
+++ b/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 33a94924974..a5cf62919db 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1 +1,2 @@
-DIST prosody-0.11.12.tar.gz 439656 BLAKE2B 593bb24d7e84ed337e8d8a11b387ac50abd27ea62be0fd18e8c8441472c09565a6603ccb070250b620b3f50f4d1e33fad579f988e68250c083b8a9aa25a8e03b SHA512 cd03ee8b02ffaa478b5329d9942d833cfed2d8bf720bf580a2082d681e7d333bc34f45041cea7234bee75f1a0e7c07983a685fe2ac9b31d51a0dbb36e87ba5d2
+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/files/prosody-0.11.7-gentoo.patch b/net-im/prosody/files/prosody-0.12.0-gentoo.patch
index e571066874b..3b2ba75b15c 100644
--- a/net-im/prosody/files/prosody-0.11.7-gentoo.patch
+++ b/net-im/prosody/files/prosody-0.12.0-gentoo.patch
@@ -5,25 +5,25 @@
-- for any virtual hosts
+-- Prosody will use this user and group for launching the service.
-+-- Gentoo uses by default jabber:jabber (uid:gid) for all Jabber related services.
-+prosody_user = "jabber"
-+prosody_group = "jabber"
++-- Gentoo uses by default prosody:prosody (uid:gid) for all Jabber related services.
++prosody_user = "prosody"
++prosody_group = "prosody"
+
+-- Prosody will create this pid file after it has been successfully started.
+-- Please don't change that path, as it's being used by the Gentoo init scripts.
-+pidfile = "/run/jabber/prosody.pid"
++pidfile = "/run/prosody/prosody.pid"
+
-- This is a (by default, empty) list of accounts that are admins
-- for the server. Note that you must create the accounts separately
-- (see https://prosody.im/doc/creating_accounts for info)
-@@ -30,7 +39,9 @@
- -- Prosody will always look in its source directory for modules, but
- -- this option allows you to specify additional locations where Prosody
- -- will look for modules first. For community modules, see https://modules.prosody.im/
+@@ -26,7 +35,9 @@
+ -- This option allows you to specify additional locations where Prosody
+ -- will search first for modules. For additional modules you can install, see
+ -- the community module repository at https://modules.prosody.im/
---plugin_paths = {}
+-- The default included path is for the optional net-im/prosody-modules package,
+-- which provides additional community maintained modules.
-+plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/community-modules" };
++plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/modules", "/usr/GENTOO_LIBDIR/prosody/community-modules" };
-- This is the list of modules Prosody will load on startup.
- -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+ -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
diff --git a/net-im/prosody/files/prosody.initd-r5 b/net-im/prosody/files/prosody.initd-r6
index 54e37be5bd8..e4138c597b2 100644
--- a/net-im/prosody/files/prosody.initd-r5
+++ b/net-im/prosody/files/prosody.initd-r6
@@ -1,18 +1,20 @@
#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-name="Prosody XMPP server"
extra_started_commands="reload"
-jabber_pid="/run/jabber"
-jabber_logs="/var/log/jabber"
-pidfile="${jabber_pid}/prosody.pid"
-prosody_config="/etc/jabber/prosody.cfg.lua"
+name="Prosody XMPP server"
+prosody_config="/etc/prosody/prosody.cfg.lua"
+prosody_data="/var/lib/prosody"
+prosody_logs="/var/log/prosody"
+prosody_pid="/run/prosody"
+pidfile="${prosody_pid}/prosody.pid"
command="/usr/bin/prosody"
+command_args="--daemonize"
commandctl="/usr/bin/prosodyctl"
-command_group="jabber"
-command_user="jabber"
+command_group="prosody"
+command_user="prosody"
checkconfig() {
if [ ! -f "${prosody_config}" ]; then
@@ -26,7 +28,6 @@ checkconfig() {
depend() {
need net
- provide jabber-server
use dns postgresql
}
@@ -39,6 +40,7 @@ reload() {
start_pre() {
checkconfig || return 1
- checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_logs}"
- checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_pid}"
+ checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${prosody_data}"
+ checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${prosody_logs}"
+ checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${prosody_pid}"
}
diff --git a/net-im/prosody/files/prosody.service-r2 b/net-im/prosody/files/prosody.service-r2
deleted file mode 100644
index 81408beefe5..00000000000
--- a/net-im/prosody/files/prosody.service-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prosody XMPP server
-After=network.target
-
-[Service]
-Group=jabber
-PIDFile=/run/jabber/prosody.pid
-ExecStart=/usr/bin/prosody
-ExecReload=/bin/kill -HUP $MAINPID
-User=jabber
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.service-r3 b/net-im/prosody/files/prosody.service-r3
new file mode 100644
index 00000000000..dec39e4b0b2
--- /dev/null
+++ b/net-im/prosody/files/prosody.service-r3
@@ -0,0 +1,17 @@
+[Unit]
+Description=Prosody XMPP server
+After=network.target
+
+[Service]
+Group=prosody
+PIDFile=/run/prosody/prosody.pid
+ExecStart=/usr/bin/prosody --daemonize
+ExecReload=/bin/kill -HUP $MAINPID
+User=prosody
+ExecStartPre=!/bin/mkdir -p /var/log/prosody
+ExecStartPre=!/bin/mkdir -p /var/lib/prosody
+ExecStartPre=!/bin/chown -R prosody /var/log/prosody
+ExecStartPre=!/bin/chown -R prosody /var/lib/prosody
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd-r1 b/net-im/prosody/files/prosody.tmpfilesd-r1
deleted file mode 100644
index 7fcdd539dec..00000000000
--- a/net-im/prosody/files/prosody.tmpfilesd-r1
+++ /dev/null
@@ -1 +0,0 @@
-d /run/jabber 750 jabber jabber - -
diff --git a/net-im/prosody/files/prosody.tmpfilesd-r2 b/net-im/prosody/files/prosody.tmpfilesd-r2
new file mode 100644
index 00000000000..78949f3db82
--- /dev/null
+++ b/net-im/prosody/files/prosody.tmpfilesd-r2
@@ -0,0 +1 @@
+d /run/prosody 750 prosody prosody - -
diff --git a/net-im/prosody/prosody-0.11.12.ebuild b/net-im/prosody/prosody-0.11.12.ebuild
deleted file mode 100644
index 1b9f77dd570..00000000000
--- a/net-im/prosody/prosody-0.11.12.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..3} 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 mysql postgres selinux +sqlite +ssl test +zlib"
-REQUIRED_USE="
- ^^ ( icu idn )
- ${LUA_REQUIRED_USE}
-"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
- $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
- net-im/jabber-base
- icu? ( dev-libs/icu:= )
- idn? ( net-dns/libidn:= )
- 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.11.7-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/spool/jabber"
- --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/jabber"
- --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/spool/jabber
-
- newinitd "${FILESDIR}"/prosody.initd-r5 prosody
- systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
-
- newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
-}
-
-pkg_postinst() {
- tmpfiles_process prosody.conf
-}
diff --git a/net-im/prosody/prosody-0.12.0.ebuild b/net-im/prosody/prosody-0.12.0.ebuild
new file mode 100644
index 00000000000..569a5077e12
--- /dev/null
+++ b/net-im/prosody/prosody-0.12.0.ebuild
@@ -0,0 +1,164 @@
+# 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
new file mode 100644
index 00000000000..e9cab9fb7d6
--- /dev/null
+++ b/net-im/prosody/prosody-0.12.1.ebuild
@@ -0,0 +1,164 @@
+# 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/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 64f2fd8a487..6dc0701912e 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="${PSI_URI}/${PN}.git"
PSI_LANGS_URI="${PSI_URI}/psi-l10n.git"
PSI_PLUS_LANGS_URI="${PSI_PLUS_URI}/psi-plus-l10n.git"
EGIT_MIN_CLONE_TYPE="single"
-LICENSE="GPL-2"
+LICENSE="GPL-2 iconsets? ( all-rights-reserved )"
SLOT="0"
KEYWORDS=""
IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets keyring webengine xscreensaver"
diff --git a/net-im/purple-events/purple-events-0.99.1.ebuild b/net-im/purple-events/purple-events-0.99.1.ebuild
index e4d139ae3b6..b415329f383 100644
--- a/net-im/purple-events/purple-events-0.99.1.ebuild
+++ b/net-im/purple-events/purple-events-0.99.1.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
@@ -6,7 +6,7 @@ EAPI=7
inherit autotools
DESCRIPTION="Allows a fine-grained control over libpurple events"
-HOMEPAGE="http://purple-events.sardemff7.net/"
+HOMEPAGE="https://github.com/sardemff7/purple-events"
SRC_URI="https://github.com/sardemff7/purple-events/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index e044567d91c..89cce77a2b8 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -1,2 +1,3 @@
-DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c
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/files/qtox-1.16.3-qt-5.13.patch b/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
deleted file mode 100644
index 16805843253..00000000000
--- a/net-im/qtox/files/qtox-1.16.3-qt-5.13.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt 2020-01-15 22:17:59.921502029 +0100
-+++ b/CMakeLists.txt 2020-01-15 22:19:55.834885195 +0100
-@@ -48,7 +48,6 @@
- set(RCC_OPTIONS -compress 9 -threshold 0)
-
- # Use C++11.
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-
-@@ -56,7 +55,6 @@
- set(POSITION_INDEPENDENT_CODE True)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-overflow")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-aliasing")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-
- if (NOT WIN32)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all")
diff --git a/net-im/qtox/qtox-1.16.3-r1.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild
deleted file mode 100644
index d29e70e3f7b..00000000000
--- a/net-im/qtox/qtox-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="qTox-${PV}"
-inherit cmake xdg
-
-DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
-HOMEPAGE="https://github.com/qTox/qTox"
-SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="notification test X"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-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/qtgui:5[gif,jpeg,png,xcb(-)]
- )
- 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-2.6.3:=[webp,v4l]
- net-libs/tox:0/0.2[av]
- notification? ( x11-libs/gtk+:2 )
- X? ( x11-libs/libX11
- x11-libs/libXScrnSaver )
-"
-DEPEND="${RDEPEND}
- test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
-
-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=(
- -DENABLE_STATUSNOTIFIER=$(usex notification)
- -DENABLE_GTK_SYSTRAY=$(usex notification)
- -DPLATFORM_EXTENSIONS=$(usex X)
- -DUSE_FILTERAUDIO=OFF
- -DGIT_DESCRIBE="${PV}"
- )
-
- cmake_src_configure
-}
diff --git a/net-im/qtox/qtox-1.17.4.ebuild b/net-im/qtox/qtox-1.17.4.ebuild
new file mode 100644
index 00000000000..825ce6aa14d
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.4.ebuild
@@ -0,0 +1,91 @@
+# 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.ebuild
new file mode 100644
index 00000000000..825ce6aa14d
--- /dev/null
+++ b/net-im/qtox/qtox-1.17.6.ebuild
@@ -0,0 +1,91 @@
+# 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-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index f3d034bc3f3..f9ff34f329b 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-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=8
@@ -9,8 +9,10 @@ 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"
@@ -41,9 +43,9 @@ RDEPEND="
media-libs/libexif
media-libs/openal
media-video/ffmpeg:=[webp,v4l]
- net-libs/tox:=[av]
- net-libs/toxext
- net-libs/tox_extension_messages
+ >=net-libs/tox-0.2.13:=[av]
+ >=net-libs/toxext-0.0.3
+ >=net-libs/tox_extension_messages-0.0.3
notification? ( x11-libs/snorenotify )
spellcheck? ( kde-frameworks/sonnet:5 )
X? (
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 72297308a4e..877f346ea07 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1 +1 @@
-DIST rocketchat-3.7.5.x86_64.rpm 72083048 BLAKE2B 136b0a1051d52b5a9c3c5d66eba8e0cde809bf5086bf6d0dbeb1dc319cbe73ff26c5d33f0a0e989b18c18f38406dedcad344f14ba532953679c7da53aebf4d74 SHA512 48fb9ce3602e7b3ebd2e049975941795cd00a1c89987b267988357af48bdaad958f2c1976c848a7be7e29f4726619531fbb6994cab927d39f13f50f182519818
+DIST rocketchat-3.8.7-linux-x86_64.rpm 62302012 BLAKE2B 2e5b36191abcb783e126e92bc608716efc910151484399cbbaf2fe0837fe8a40eb5c84b71e33052c5a950adfa0851d30be2e964754b08f3a9f3754169c5dc169 SHA512 833abf90425b5f9d0feb28acba4559d8d410ef2f5276b03fac8c781b9eab3ae7e0eebd613bc84e28a0dfa6005778a9afd91d528b6fa67ab825564e98241548c6
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
deleted file mode 100644
index 4a153a7e320..00000000000
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit rpm xdg
-
-DESCRIPTION="The Ultimate Open Source Web Chat Platform"
-HOMEPAGE="https://rocket.chat"
-SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm"
-
-KEYWORDS="-* ~amd64"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- app-accessibility/at-spi2-atk:2
- dev-libs/atk
- dev-libs/expat
- dev-libs/libappindicator
- dev-libs/nspr
- dev-libs/nss
- media-fonts/noto-emoji
- media-libs/alsa-lib
- net-print/cups
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libnotify
- x11-libs/libxcb
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- x11-libs/pango
-"
-
-QA_PREBUILT="/opt/Rocket.Chat/*"
-
-S="${WORKDIR}"
-
-src_install() {
- # remove files useless for Gentoo
- rm -r usr/lib || die
- mv "${S}"/* "${ED}" || die
-}
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.7.ebuild
new file mode 100644
index 00000000000..355c5e06379
--- /dev/null
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop rpm xdg
+
+DESCRIPTION="The Ultimate Open Source Web Chat Platform"
+HOMEPAGE="https://rocket.chat"
+SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}-linux-x86_64.rpm"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64"
+# Electron bundles a bunch of things
+LICENSE="
+ MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
+ unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/libappindicator
+ dev-libs/nspr
+ dev-libs/nss
+ media-fonts/noto-emoji
+ media-libs/alsa-lib
+ net-print/cups
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+ x11-libs/libxcb
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXScrnSaver
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/Rocket.Chat/*"
+
+pkg_pretend() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+ default
+ # cleanup languages
+ pushd "opt/Rocket.Chat/locales" || die
+ chromium_remove_language_paks
+ popd || die
+}
+
+src_configure() {
+ chromium_suid_sandbox_check_kernel_config
+ default
+}
+
+src_install() {
+ for size in {16,32,48,64,128,256,512}; do
+ doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/rocketchat-desktop.png"
+ done
+
+ domenu usr/share/applications/rocketchat-desktop.desktop
+
+ local DESTDIR="/opt/Rocket.Chat"
+ pushd "opt/Rocket.Chat" || die
+
+ exeinto "${DESTDIR}"
+ doexe chrome-sandbox rocketchat-desktop *.so*
+
+ exeinto "${DESTDIR}/swiftshader"
+ doexe swiftshader/*.so*
+
+ insinto "${DESTDIR}"
+ doins *.pak *.bin *.json *.dat
+ insopts -m0755
+ doins -r locales resources
+
+ # Chrome-sandbox requires the setuid bit to be specifically set.
+ # see https://github.com/electron/electron/issues/17972
+ fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+ dosym "${DESTDIR}"/rocketchat-desktop /opt/bin/rocketchat-desktop
+ popd || die
+}
diff --git a/net-im/sendxmpp-amm/metadata.xml b/net-im/sendxmpp-amm/metadata.xml
index 87a759d410c..a7fa285c747 100644
--- a/net-im/sendxmpp-amm/metadata.xml
+++ b/net-im/sendxmpp-amm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<name>Florian Schmaus</name>
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
index 49c9aed8817..faee439560d 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
@@ -11,9 +11,6 @@ HOMEPAGE="https://github.com/flowdalic/sendxmpp"
if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
EGIT_REPO_URI="https://github.com/Flowdalic/${ORIG_PN}.git"
inherit git-r3
- if [[ "${PV}" == "9999" ]]; then
- MY_KEYWORDS=""
- fi
else
SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64"
diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
index ef6656d8a9f..782316d1702 100644
--- a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
+++ b/net-im/sendxmpp-amm/sendxmpp-amm-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=8
@@ -11,9 +11,6 @@ HOMEPAGE="https://github.com/flowdalic/sendxmpp"
if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
EGIT_REPO_URI="https://github.com/Flowdalic/${ORIG_PN}.git"
inherit git-r3
- if [[ "${PV}" == "9999" ]]; then
- MY_KEYWORDS=""
- fi
else
SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 5080764d631..570dbe52032 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,3 +1,6 @@
+DIST signal-cli-bin-0.10.6.README.md 5916 BLAKE2B e7fc8646b1bcafe5145fec9d14450dcc235380d8f1e776f30432b3235a2ed87043a55ba4da48c058f83b04750e0e1dcd97ee5e50ce079e7bb906f04f9e77fb38 SHA512 a7347ea5134982fa76442702b9d7892b1bbdbf5f36b1823461e14c320cf38cdf3f2379178c7864ef21285f8f3a0c26d4e2fb9ea9546b2fb4d1271d552bf7c37e
+DIST signal-cli-bin-0.10.6.signal-cli.1.adoc 19971 BLAKE2B 1642c6e463d0c536abfba4fa2e5c91f5fbb7c9d9817684924be82a43c7fbca7b92f07718507582721c63c32d1844c5c016f02dfb7b03b8ae7494f090ffdb7d00 SHA512 361098a70d3ee7f114a8f0f95794c24380363f782b4778d70a1cb2cc8bfee107e9b0f88c4cdd236f51960a14bcf18d60cb9920d4abac09fe58c0df9f5d4a5551
+DIST signal-cli-bin-0.10.6.tar.gz 34191841 BLAKE2B 3a0d4ae9c938aaadb59803550d56d4ae17cb8c0d3ea1f2874654207423679ca42ab42d1aa7894b897794298f94b2f57eac84120b7fbf7a0e4d6e0153a9565681 SHA512 4a7d5381bbcdde516d25e6a580854213ba5b144aa942d3cdea48b3e587d9db9e448c1bcf8c91a7632157747d00c5da4a4dbf1c366ae5a332f922c6d9a6ad33d1
DIST signal-cli-bin-0.8.5.README.md 5626 BLAKE2B e8a70135622a7eeaa9b4c965f75f001e641745c60a10d61ab96a014194034a1daf2ec077cb7798bf32c5f9218af6103dc9de7bbb2811b9a4aa162f55697f2232 SHA512 feed6673b56c4ac812d5038157f08bef36b48725211ad06a146a0f349c20213527eec814a5e940aacc0de0fdf7d74931fcd12a0d764df82340025a71a7f22a35
DIST signal-cli-bin-0.8.5.signal-cli.1.adoc 15222 BLAKE2B d5075011c82bb79f2de7f7b2f2cbf060428281b0f1d054e1cba09632e6e2b7dd472e8dfa3f0d7863acd9d8e93cfa51af1e241153baeb4d5f2e0e8698a158e6a1 SHA512 cd076fde6cdeca70734bb385d7dbf574fa859da9b2ba01c5dfbd8fde0f3457c400be41d790cd7cdc05932731693f4114e4708b7d42e405bf8dd6f982309c0ca2
DIST signal-cli-bin-0.8.5.tar.gz 17563403 BLAKE2B d400285d513c893475c74cbbfa7cb01391545d88e5e1504d9a5175428b31e7308cfc1c9526dc8cef4aab9a75e916a1b596f7939eeeaf5544ffb351c7dfcb3b59 SHA512 1d1931a568d9f95e020ee21dbf2d594b0d43d59e4621a7ef1ff21ab2e3cd4ea00da363bd5d86e12745015c643e4ebde4f58bec4a51be807e401ebb127430fa70
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch
new file mode 100644
index 00000000000..02b77bc54dd
--- /dev/null
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch
@@ -0,0 +1,33 @@
+This patch searches the jre 17 binary in the gentoo specific directories.
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+
+--- a/bin/signal-cli
++++ b/bin/signal-cli
+@@ -118,13 +118,19 @@
+
+
+ # Determine the Java command to use to start the JVM.
+-if [ -n "$JAVA_HOME" ] ; then
+- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+- # IBM's JDK on AIX uses strange locations for the executables
+- JAVACMD=$JAVA_HOME/jre/sh/java
+- else
+- JAVACMD=$JAVA_HOME/bin/java
+- fi
++# This package needs Java 17,
++# so we must search for matching java binaries
++for I in /usr/lib*/openjdk-17 /opt/openjdk-bin-17 /opt/openjdk-jre-bin-17; do
++ J_TRY="$I/bin/java"
++ if [ -x "$J_TRY" ] ; then
++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17."
++ if [ $? -eq 0 ] ; then
++ JAVACMD="$J_TRY"
++ break
++ fi
++ fi
++done
++if [ -n "$JAVACMD" ] ; then
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
new file mode 100644
index 00000000000..29710caad87
--- /dev/null
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="signal-cli-${PV}"
+DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface"
+HOMEPAGE="https://github.com/AsamK/signal-cli/wiki"
+SRC_URI="
+ https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}-Linux.tar.gz -> ${P}.tar.gz
+ https://github.com/AsamK/signal-cli/raw/v${PV}/README.md -> ${P}.README.md
+ https://github.com/AsamK/signal-cli/raw/v${PV}/man/signal-cli.1.adoc -> ${P}.signal-cli.1.adoc
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ || ( virtual/jdk:17 virtual/jre:17 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ app-text/asciidoc
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-use-working-java-version.patch"
+)
+
+src_unpack() {
+ default
+ cp "${DISTDIR}/${P}.signal-cli.1.adoc" signal-cli.1.adoc || die
+}
+
+src_compile() {
+ default
+ a2x --no-xmllint --doctype manpage --format manpage "${WORKDIR}/signal-cli.1.adoc" || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r lib
+ dobin bin/signal-cli
+ newdoc "${DISTDIR}/${P}.README.md" README.md
+ doman "${WORKDIR}/signal-cli.1"
+}
+
+pkg_postinst() {
+ elog "Please read /usr/share/doc/${PF}/README.md.bz2"
+ elog "how to register signal-cli with the signal service and how to send"
+ elog "and receive messages"
+}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index e87426fabca..aa4e75dbbcd 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,2 +1 @@
-DIST signal-desktop_5.26.1_amd64.deb 127893190 BLAKE2B 0d7dedf5370c1010d204ad0e13e1ca46f886eef4e2e51af1fd6f3cf163c7d6bc464d21719018dbc168818b696550fbc709a1ce6dbc242125ea856d62b2a24a4f SHA512 dffd694e637528587b4bcfa6303e41129e2872022f9e97b338ad71b4a763fedc52650d5b94a5cd1282119163968df599cf3b8bb7639879dfc4132fdcedfe7b2f
-DIST signal-desktop_5.27.1_amd64.deb 125206928 BLAKE2B 67f39b1c52564f8768307b56ef3f879e2130a3cb2aa1f650c8cfee3bf6d26f1ece6b4267fc3911802bc23c2c91875e1aff0d9f5d4cdb7e5f02d1a022063e35fd SHA512 1e81e2bb7c94b5866f7fcb93800c606c88696df5fb06791c52071dad1b7c9df2d7a2936a006c55d3d7a1b9155d4681212a6b41123447f2d76120ecbbeaba51a3
+DIST signal-desktop_5.48.0_amd64.deb 116776998 BLAKE2B cd1e7f9c83234e11a70c9ff1664e9e013e50c31863bc6d8e21c1f76be8d91e802ccf7127221287672245c5c69c33e36ed0c85a1781c8978695aa44869beb7375 SHA512 a2cfe0289cee3f8837f14a428f9d3f11238e0aacdcaff4d665162e01b41b318e2e6fe88ce88bade8167d8db1df54a8c5cb466d5fd13d2e6d570aa2d4e81ed4bd
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild
deleted file mode 100644
index f2db453688b..00000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.26.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
- https://github.com/signalapp/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="+sound"
-RESTRICT="splitdebug"
-
-RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
- dev-libs/atk
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- 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
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libxkbcommon
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libxshmfence
- x11-libs/pango
- sound? (
- || (
- media-sound/pulseaudio
- media-sound/apulse
- )
- )
-"
-
-QA_PREBUILT="
- opt/Signal/chrome_crashpad_handler
- opt/Signal/chrome-sandbox
- opt/Signal/libEGL.so
- opt/Signal/libGLESv2.so
- opt/Signal/libffmpeg.so
- opt/Signal/libvk_swiftshader.so
- opt/Signal/libvulkan.so.1
- opt/Signal/resources/app.asar.unpacked/node_modules/*
- opt/Signal/signal-desktop
- opt/Signal/swiftshader/libEGL.so
- opt/Signal/swiftshader/libGLESv2.so"
-
-src_prepare() {
- default
- sed -e 's| --no-sandbox||g' \
- -i usr/share/applications/signal-desktop.desktop || die
- unpack usr/share/doc/signal-desktop/changelog.gz
-}
-
-src_install() {
- insinto /
- dodoc changelog
- doins -r opt
- insinto /usr/share
-
- if has_version media-sound/apulse[-sdk] && ! has_version media-sound/pulseaudio; then
- sed -i 's/Exec=/Exec=apulse /g' usr/share/applications/signal-desktop.desktop || die
- fi
-
- doins -r usr/share/applications
- doins -r usr/share/icons
- fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox
- fperms u+s /opt/Signal/chrome-sandbox
- pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox
-
- dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- elog "For using the tray icon on compatible desktop environments, start Signal with"
- elog " '--start-in-tray' or '--use-tray-icon'."
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.27.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild
index 47f9a77095d..75db5c2f804 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.27.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
IUSE="+sound"
RESTRICT="splitdebug"
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 3225d8ad508..9743d4a4c37 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,4 +1,5 @@
-DIST skypeforlinux_8.77.0.90-1.x86_64.rpm 123643165 BLAKE2B 12c578f99f482012f54d5f9faa2d017358376902aa6879fd35ce6eba1b16e3458d4831450574158c69436b9c6103a8dd00233451b56415542e2b6e81eb9346b8 SHA512 ee1fdae1ad10f1fba91886bea52eef261151463e184746af288150bebb69d4bf0dd87d0ac4030d8d11f86054f7b2cb663b8647ce795b1bf924f23c2b7559574b
-DIST skypeforlinux_8.78.0.161-1.x86_64.rpm 123910012 BLAKE2B 560b9548f99d681c916e55a939659ab925096c7bd135a44cca99f12fa9fe913a1fbdbeaf584414e626215f313d09aec4320bfa2859892029c822b5adfc388f23 SHA512 fca1f839611d1ec46eebeacc0e90141a36fc305da90e02df1eecd529256e2609726d180b4839a2874973eb6f842bc332302f041b0b3be49293f64f2a18e7060f
-DIST skypeforlinux_8.79.0.92-1.x86_64.rpm 117949890 BLAKE2B a7150c362f117096d554c446357789f51595ff403061f81adf8be3e59452b7bf7970ff10e2fe31413f793a0a137f8f0822fd6710932e9aea2197959ef2976cfa SHA512 2094870f227acb7e0a24af4d96d39bc0cf94ea0d3e5fb5907c75ad0ff6704c55882b104a306ad5d1e350c4adf5fd4f0d8444a9ddb07d7a39ef79a8cacd7faf3d
-DIST skypeforlinux_8.79.0.95-1.x86_64.rpm 118002157 BLAKE2B 0e836e3fd0c06bb5bd57d2806b3a51772e307a9555e573fdc366ebf1b82f2f8f1e422d64981f1973962d0ed1fa689c26482a48bf8193eedb65fe009056ff651c SHA512 eda292a1cd624c9a4819362820430769ead67f08113c66e58d6a4db17af4323f5483b6dadec41075b53feb25e7d7ef4c7ab738289246724678d2af9414fe58ad
+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
diff --git a/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild b/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild
index 9627b561f6f..911974eaca8 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.79.0.95.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.81.0.268.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=8
@@ -33,6 +33,7 @@ RDEPEND="
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}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild b/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild
index 9627b561f6f..911974eaca8 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.79.0.92.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.82.0.403.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=8
@@ -33,6 +33,7 @@ RDEPEND="
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}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild b/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild
index a44feb7c892..911974eaca8 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild
@@ -1,7 +1,7 @@
-# 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 )
@@ -10,12 +10,12 @@ 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"
-S="${WORKDIR}"
QA_PREBUILT="*"
RESTRICT="mirror bindist strip" #299368
@@ -33,6 +33,7 @@ RDEPEND="
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}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild
index 69bae224b92..911974eaca8 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.78.0.161-r2.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild
@@ -1,7 +1,7 @@
-# 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 )
@@ -10,17 +10,15 @@ 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"
-S="${WORKDIR}"
QA_PREBUILT="*"
RESTRICT="mirror bindist strip" #299368
-# Need to drop -clone3(+) from glibc once Electron is updated
-# bug #823790
RDEPEND="
app-crypt/libsecret[${MULTILIB_USEDEP}]
dev-libs/atk[${MULTILIB_USEDEP}]
@@ -34,8 +32,8 @@ RDEPEND="
media-libs/libv4l[${MULTILIB_USEDEP}]
net-print/cups[${MULTILIB_USEDEP}]
sys-apps/dbus[${MULTILIB_USEDEP}]
- || ( <sys-libs/glibc-2.34 >=sys-libs/glibc-2.34[-clone3(+)] )
sys-devel/gcc[cxx]
+ sys-libs/glibc
virtual/ttf-fonts
x11-libs/cairo[${MULTILIB_USEDEP}]
x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
diff --git a/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild b/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild
new file mode 100644
index 00000000000..911974eaca8
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild
@@ -0,0 +1,100 @@
+# 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/slack/Manifest b/net-im/slack/Manifest
index 83d828ff213..935a53b48b4 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1 +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
diff --git a/net-im/slack/slack-4.23.0.ebuild b/net-im/slack/slack-4.23.0.ebuild
new file mode 100644
index 00000000000..16e9577cda1
--- /dev/null
+++ b/net-im/slack/slack-4.23.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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"
+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}]
+ 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}]
+ media-libs/mesa: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/libXdamage:0[${MULTILIB_USEDEP}]
+ x11-libs/libXext:0[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+ x11-libs/libxkbcommon:0[${MULTILIB_USEDEP}]
+ x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+ x11-libs/pango:0[${MULTILIB_USEDEP}]
+ appindicator? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="opt/slack/chrome-sandbox
+ opt/slack/chrome_crashpad_handler
+ opt/slack/libEGL.so
+ opt/slack/libGLESv2.so
+ opt/slack/libffmpeg.so
+ opt/slack/libvk_swiftshader.so
+ opt/slack/libvulkan.so.1
+ opt/slack/resources/app.asar.unpacked/node_modules/*
+ opt/slack/slack
+ opt/slack/swiftshader/libEGL.so
+ opt/slack/swiftshader/libGLESv2.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+
+ # remove hardcoded path, logging noise (wrt 694058, 711494)
+ sed -i -e '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+ -e '/Exec/s|slack|slack -s|' \
+ usr/share/applications/slack.desktop \
+ || die "sed failed in Icon for slack.desktop"
+
+ if use appindicator ; then
+ sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+ usr/share/applications/slack.desktop \
+ || die "sed failed for slack.desktop"
+ fi
+
+ rm usr/lib/slack/LICENSE{,S-linux.json} \
+ || die "rm licenses failed"
+}
+
+src_install() {
+ doicon usr/share/pixmaps/slack.png
+ doicon -s 512 usr/share/pixmaps/slack.png
+ domenu usr/share/applications/slack.desktop
+
+ insinto /opt # wrt 720134
+ cp -a usr/lib/slack "${ED}"/opt || die "cp failed"
+
+ use suid && fperms u+s /opt/slack/chrome-sandbox # wrt 713094
+ dosym ../../opt/slack/slack usr/bin/slack
+
+ pax-mark -m "${ED}"/opt/slack/slack
+}
+
+pkg_postinst() {
+ optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
+
+ xdg_pkg_postinst
+}
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index de10b87706e..f3c75bead36 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1 @@
-DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B 3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45 SHA512 53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
+DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B 8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77 SHA512 b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8
diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml
index 233e8e3037c..6de46eb88c9 100644
--- a/net-im/spectrum2/metadata.xml
+++ b/net-im/spectrum2/metadata.xml
@@ -5,10 +5,6 @@
<email>conikost@gentoo.org</email>
<name>Conrad Kostecki</name>
</maintainer>
- <maintainer type="person">
- <email>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
<longdescription>
Spectrum is an open source instant messaging transport.
It allows users to chat together even when they are using
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild b/net-im/spectrum2/spectrum2-2.1.3.ebuild
index 4678773061b..9578b2864a3 100644
--- a/net-im/spectrum2/spectrum2-2.1.0.ebuild
+++ b/net-im/spectrum2/spectrum2-2.1.3.ebuild
@@ -1,7 +1,7 @@
-# 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
inherit cmake systemd tmpfiles
diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
index 0b39e59c61c..9246b510f67 100644
--- a/net-im/swift/metadata.xml
+++ b/net-im/swift/metadata.xml
@@ -5,10 +5,6 @@
<email>conikost@gentoo.org</email>
<name>Conrad Kostecki</name>
</maintainer>
- <maintainer type="person">
- <email>andrey_utkin@gentoo.org</email>
- <name>Andrey Utkin</name>
- </maintainer>
<longdescription>
Swift is an elegant, secure, adaptable and intuitive XMPP client,
with features that make it suitable for a wide range of use scenarios.
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index fd916d991d3..7d1ad8f51ca 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,3 +1,4 @@
DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c
DIST teams_1.4.00.26453_amd64.deb 84503304 BLAKE2B a9d9fb27d42c53b12747fd229214d4d5db8197c870effd201dc7ba9feea143b18138c7bed15d18e70326781577e8bda8640ea463125abc8f0bef08292ad850d5 SHA512 bdc050e813f1237d7774270a8a5229a975e5bb28706b957f5cb03eb481870ca8e81562096e5041f060414d1c727f5b7d6aff7ef66bce96f2fac86f535aade058
DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac
+DIST teams_1.5.00.10453_amd64.deb 84485626 BLAKE2B f9570bedd12dc9113c956d0b9c34c4124939b0a855f73a7611ce640b00fd4a7d8288af94aa3f087482040619c11f79a144e2292dd853254fe4f55fe694165a26 SHA512 69d95e06c67265358f1d995ad9faa21a1af753241031569e7ac88d0cc9c4781985a0839b4fa7e58d176472c7ab15bc8d0876733a2eb710d5d087d2662bc04c30
diff --git a/net-im/teams/teams-1.4.00.13653-r2.ebuild b/net-im/teams/teams-1.4.00.13653-r2.ebuild
index 683f09cd29b..3dd90b904b9 100644
--- a/net-im/teams/teams-1.4.00.13653-r2.ebuild
+++ b/net-im/teams/teams-1.4.00.13653-r2.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
@@ -41,6 +41,7 @@ RDEPEND="
net-print/cups
sys-apps/dbus
sys-apps/util-linux
+ sys-libs/glibc
x11-libs/cairo
x11-libs/libdrm
x11-libs/gdk-pixbuf
diff --git a/net-im/teams/teams-1.4.00.26453-r1.ebuild b/net-im/teams/teams-1.4.00.26453-r1.ebuild
index 1c5e90e606b..3f93b3cfb66 100644
--- a/net-im/teams/teams-1.4.00.26453-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.26453-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
@@ -41,6 +41,7 @@ RDEPEND="
net-print/cups
sys-apps/dbus
sys-apps/util-linux
+ sys-libs/glibc
x11-libs/cairo
x11-libs/libdrm
x11-libs/gdk-pixbuf
diff --git a/net-im/teams/teams-1.4.00.7556-r1.ebuild b/net-im/teams/teams-1.4.00.7556-r1.ebuild
index dcee637a6d4..295d2e9e2bd 100644
--- a/net-im/teams/teams-1.4.00.7556-r1.ebuild
+++ b/net-im/teams/teams-1.4.00.7556-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
@@ -35,6 +35,7 @@ RDEPEND="
net-print/cups
sys-apps/dbus
sys-apps/util-linux
+ sys-libs/glibc
x11-libs/cairo
x11-libs/cairo
x11-libs/gdk-pixbuf
diff --git a/net-im/teams/teams-1.5.00.10453.ebuild b/net-im/teams/teams-1.5.00.10453.ebuild
new file mode 100644
index 00000000000..3fd38c8df20
--- /dev/null
+++ b/net-im/teams/teams-1.5.00.10453.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 desktop unpacker xdg
+
+DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release"
+HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/"
+SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb"
+
+LICENSE="ms-teams-pre"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist mirror splitdebug test"
+IUSE="swiftshader system-ffmpeg"
+
+QA_PREBUILT="*"
+# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0)
+# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0),
+# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0),
+# libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), 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-crypt/libsecret
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/mesa[gbm(+)]
+ net-print/cups
+ sys-apps/dbus
+ sys-apps/util-linux
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/libdrm
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ x11-libs/pango
+ system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] )
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+ sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die
+ sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/${PN}/${PN}@" \
+ -i usr/bin/${PN} || die
+}
+
+src_install() {
+ rm _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
+
+ insinto /opt
+ doins -r usr/share/${PN}
+
+ dobin usr/bin/${PN}
+ domenu usr/share/applications/${PN}.desktop
+ doicon usr/share/pixmaps/${PN}.png
+
+ pushd "${ED}/opt/${PN}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ if use system-ffmpeg; then
+ rm "${ED}/opt/${PN}/libffmpeg.so" || die
+ dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "opt/${PN}/libffmpeg.so" || die
+ elog "Using system ffmpeg. This is experimental and may lead to crashes."
+ fi
+
+ if ! use swiftshader; then
+ rm -r "${ED}/opt/${PN}/swiftshader" || die
+ elog "Running without SwiftShader OpenGL implementation. If Teams doesn't start "
+ elog "or you experience graphic issues, then try with USE=swiftshader enabled."
+ fi
+
+ fperms +x /usr/bin/${PN}
+ fperms +x /opt/${PN}/${PN}
+}
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 8c1ce2faf88..419f550db27 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,4 @@
-DIST tdesktop-3.3.0.tar.gz 16276886 BLAKE2B c75da01d8cfe440c8cbeb3cc580d49c7cb2494b776b48d9da1005ff7627fcffb0f7f7d6c43887d162cc0c8f261d1b67e3af6544dbf616732c8dbfd785cf9e8e3 SHA512 fd9eee472579edd902e9e31c1442f7a21ada86af3a59f1ab0310ec41134b9a345ddf7972e638b3551c0de1b95a3ffc36e7714e2657b95b25bd3436ebd507a7ef
-DIST tdesktop-3.4.3.tar.gz 16234851 BLAKE2B a94fcdbd5254858b8bb5e51ac8423d3c3e407892782b3773985f3f7f60cb8db0c95ffa2bc1c7bcbf56bcb26948d9c080c86606954284fcbe80ae8dbd1ec0ec9d SHA512 ce40e3c58f5d422de7c26fc105ca9888239069c24f42896ad38d30bb059b91e0e3556f62d0e6aa3b5a817f86409b090ab54ade1763a90cbca2043a4b3f744183
-DIST tsetup.3.3.0.tar.xz 41132564 BLAKE2B 7d3cc8de1cd56f21b988b7ae15ec96ec66fdba30cedb7f609a9c15d0a45b10cc5e0b94d5d9ed32e36c850e678e34835a44b527f7a62aac68376d2c1d09073f6e SHA512 665662f5a177475d32b49515600789374f989db1c3e7972fc5b9360c936f9d2a197e0bb0599bcb1d7b2707eb85f214e65fe7d6f9809aac3ae5c20a2c6f9dd04c
-DIST tsetup.3.4.3.tar.xz 41258788 BLAKE2B 5c5d5056807a92884a93ec1d27c57da2cc96e131df6856b2d41d1e7db28f93a9c63602a0e294dd0cc48dbc22156203e0d8d19da4916091ef40bb3550e779296e SHA512 92be9f69c7ad0e4f2bead886da636ed58e0ff63b1aeaa1ed0d9ee08b3964df4ff446d53b05de1fa9cbf1769463867158c7faadb0ae9e2c1fc71ebfecca507792
+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
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild
index 015193a01c6..40ecf6ecfb9 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.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=8
@@ -17,8 +17,12 @@ 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
dev-libs/glib:2
>=media-libs/fontconfig-2.13
media-libs/freetype:2
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild
index e9f44cea6d8..d0558b78394 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild
@@ -19,6 +19,7 @@ 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
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index e5931abb904..5e1ddfb6238 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,3 +1,2 @@
-DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
-DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
-DIST tdesktop-3.4.3-full.tar.gz 40647558 BLAKE2B 220a7b29dbc7a48d53e53fe9609dba804e5fe536feebc1225fd5400a8eec703e64f65decb8b503ed77e843c011c8b5fd12916534d4a1ecbc84724f277dcc301a SHA512 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b
+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
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
deleted file mode 100644
index 2b92e8adce4..00000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix openssl 3.x compatibility
-
-FIPS_mode_set was merely used to clean up resources. This isn't necessary
-anymore on the newer openssl version.
-
-There's still a lot of functions that are used that were deprecated. I hope
-upstream can fix those, as I'm unsure what to do with them.
-
---- tdesktop-3.1.0-full.orig/Telegram/SourceFiles/core/utils.cpp
-+++ tdesktop-3.1.0-full/Telegram/SourceFiles/core/utils.cpp
-@@ -124,7 +124,7 @@
-
- void finish() {
- CRYPTO_cleanup_all_ex_data();
--#ifndef LIBRESSL_VERSION_NUMBER
-+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20000000L
- FIPS_mode_set(0);
- #endif
- ENGINE_cleanup();
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
deleted file mode 100644
index 7ad3e75e49b..00000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,35 +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.1.0-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.1.0-full/Telegram/CMakeLists.txt
-@@ -1256,6 +1256,11 @@
- endif()
- endif()
- else()
-+ target_link_libraries(Telegram
-+ PRIVATE
-+ desktop-app::external_jemalloc
-+ )
-+
- if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
- target_link_libraries(Telegram
- PRIVATE
---- tdesktop-3.1.0-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.1.0-full/cmake/options_linux.cmake
-@@ -45,11 +45,6 @@
- target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
- endif()
-
--target_link_libraries(common_options
--INTERFACE
-- desktop-app::external_jemalloc
--)
--
- if (DESKTOP_APP_USE_ALLOCATION_TRACER)
- target_link_options(common_options
- INTERFACE
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
new file mode 100644
index 00000000000..4f5c7017e6a
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 00000000000..bd3595858c2
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
@@ -0,0 +1,71 @@
+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.5.2-musl.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
new file mode 100644
index 00000000000..4c34d107913
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
@@ -0,0 +1,33 @@
+Stub out some glibc-specific functions
+
+This allows support for alternative libcs like musl
+
+--- tdesktop-3.5.2-full.orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
++++ tdesktop-3.5.2-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
+@@ -22,7 +22,7 @@
+
+ #include <sys/utsname.h>
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include <gnu/libc-version.h>
+ #endif // Q_OS_LINUX
+
+@@ -200,7 +200,7 @@
+ }
+
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ return "glibc";
+ #endif // Q_OS_LINUX
+
+@@ -208,7 +208,7 @@
+ }
+
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ static const auto result = [&] {
+ const auto version = QString::fromLatin1(gnu_get_libc_version());
+ return QVersionNumber::fromString(version).isNull() ? QString() : version;
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
new file mode 100644
index 00000000000..6836e693504
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
@@ -0,0 +1,41 @@
+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.6.0-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt
+@@ -1376,6 +1376,14 @@
+ desktop-app::external_kwayland
+ )
+ 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-3.6.0-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.6.0-full/cmake/options_linux.cmake
+@@ -62,14 +62,6 @@
+ target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
+ 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()
+-
+ target_link_libraries(common_options
+ INTERFACE
+ ${CMAKE_DL_LIBS}
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
new file mode 100644
index 00000000000..32959acd548
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
@@ -0,0 +1,75 @@
+Support FFmpeg 5
+
+I'm not comfortable changing the _durationInMilliseconds formula on older
+versions of ffmpeg. Doing that only for newer versions also reduces the amount
+of testing this patch needs (of which it'll get very minimal amounts, this is a
+job better left for upstream when they get to it).
+
+Also it doesn't compile under ffmpeg 4 if the variables are constants :/
+
+--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
++++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
+@@ -104,7 +104,11 @@
+
+ _frame = av_frame_alloc();
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++ const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#else
+ AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#endif
+ if (!inputFormat) {
+ _didReadToEnd = true;
+ return;
+@@ -144,7 +148,11 @@
+
+ _streamId = i;
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++ _durationInMilliseconds = inStream->duration * 1000 / 48000;
++#else
+ _durationInMilliseconds = (int)((inStream->duration + inStream->first_dts) * 1000 / 48000);
++#endif
+
+ if (inStream->metadata) {
+ AVDictionaryEntry *entry = av_dict_get(inStream->metadata, "TG_META", nullptr, 0);
+--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
++++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
+@@ -32,7 +32,11 @@
+ AudioStreamingPartPersistentDecoderState(AVCodecParameters const *codecParameters, AVRational timeBase) :
+ _codecParameters(codecParameters),
+ _timeBase(timeBase) {
++#ifdef LIBAVCODEC_VERSION_MAJOR >= 59
++ const AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
++#else
+ AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
++#endif
+ if (codec) {
+ _codecContext = avcodec_alloc_context3(codec);
+ int ret = avcodec_parameters_to_context(_codecContext, codecParameters);
+--- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
++++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
+@@ -280,7 +280,11 @@
+
+ int ret = 0;
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 59
++ const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#else
+ AVInputFormat *inputFormat = av_find_input_format(container.c_str());
++#endif
+ if (!inputFormat) {
+ _didReadToEnd = true;
+ return;
+@@ -323,7 +327,11 @@
+ }
+
+ if (videoCodecParameters && videoStream) {
++#if LIBAVCODEC_VERSION_MAJOR >= 59
++ const AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
++#else
+ AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
++#endif
+ if (codec) {
+ _codecContext = avcodec_alloc_context3(codec);
+ ret = avcodec_parameters_to_context(_codecContext, videoCodecParameters);
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
new file mode 100644
index 00000000000..e818ffe4645
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
@@ -0,0 +1,55 @@
+Fix compatibility with kwayland-5.93.0
+
+The header files were moved, the include directory wasn't being added correctly.
+
+https://bugs.gentoo.org/837569
+
+--- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
++++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+@@ -9,10 +9,10 @@
+
+ #include "base/platform/base_platform_info.h"
+
+-#include <connection_thread.h>
+-#include <registry.h>
+-#include <surface.h>
+-#include <plasmashell.h>
++#include <KWayland/Client/connection_thread.h>
++#include <KWayland/Client/registry.h>
++#include <KWayland/Client/surface.h>
++#include <KWayland/Client/plasmashell.h>
+
+ using namespace KWayland::Client;
+
+--- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
++++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
+@@ -13,11 +13,11 @@
+ #include <QtCore/QPointer>
+ #include <QtGui/QWindow>
+
+-#include <connection_thread.h>
+-#include <registry.h>
+-#include <surface.h>
+-#include <xdgforeign.h>
+-#include <idleinhibit.h>
++#include <KWayland/Client/connection_thread.h>
++#include <KWayland/Client/registry.h>
++#include <KWayland/Client/surface.h>
++#include <KWayland/Client/xdgforeign.h>
++#include <KWayland/Client/idleinhibit.h>
+
+ using namespace KWayland::Client;
+
+--- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
++++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
+@@ -24,8 +24,8 @@
+ #include <private/qwaylandwindow_p.h>
+ #include <private/qwaylandshellsurface_p.h>
+
+-#include <connection_thread.h>
+-#include <registry.h>
++#include <KWayland/Client/connection_thread.h>
++#include <KWayland/Client/registry.h>
+
+ Q_DECLARE_METATYPE(QMargins);
+
diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch
new file mode 100644
index 00000000000..5a8e6ceedd6
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch
@@ -0,0 +1,44 @@
+Description: Do not capture buttons in AccountsList that belong to inner VerticalLayout widget
+ This fixes a use-after-free error (double destruction) in the main menu right after account switching.
+Bug-Debian: https://bugs.debian.org/1008156
+Bug-Ubuntu: https://launchpad.net/bugs/1967673
+Forwarded: https://github.com/telegramdesktop/tdesktop/pull/24301
+Author: Nicholas Guriev <guriev-ns@ya.ru>
+Last-Update: Sat, 09 Apr 2022 13:47:55 +0300
+
+--- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/settings/settings_information.cpp
++++ tdesktop-3.6.1-full/Telegram/SourceFiles/settings/settings_information.cpp
+@@ -78,9 +78,7 @@
+ int _outerIndex = 0;
+
+ Ui::SlideWrap<Ui::SettingsButton> *_addAccount = nullptr;
+- base::flat_map<
+- not_null<Main::Account*>,
+- base::unique_qptr<Ui::SettingsButton>> _watched;
++ base::flat_map<not_null<Main::Account*>, Ui::SettingsButton*> _watched;
+
+ base::unique_qptr<Ui::PopupMenu> _contextMenu;
+ std::unique_ptr<Ui::VerticalLayoutReorder> _reorder;
+@@ -730,7 +728,7 @@
+ order.reserve(inner->count());
+ for (auto i = 0; i < inner->count(); i++) {
+ for (const auto &[account, button] : _watched) {
+- if (button.get() == inner->widgetAt(i)) {
++ if (button == inner->widgetAt(i)) {
+ order.push_back(account->session().uniqueId());
+ }
+ }
+@@ -769,11 +767,11 @@
+ account,
+ std::move(activate));
+ };
+- button.reset(inner->add(MakeAccountButton(
++ button = inner->add(MakeAccountButton(
+ inner,
+ _controller,
+ account,
+- std::move(callback))));
++ std::move(callback)));
+ }
+ }
+ inner->resizeToWidth(_outer->width());
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
deleted file mode 100644
index 9a17e6963f6..00000000000
--- a/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Official desktop client for Telegram"
-HOMEPAGE="https://desktop.telegram.org"
-
-MY_P="tdesktop-${PV}-full"
-SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
-REQUIRED_USE="
- spell? (
- ^^ ( enchant hunspell )
- )
- webkit? ( dbus )
-"
-
-RDEPEND="
- !net-im/telegram-desktop-bin
- app-arch/lz4:=
- dev-cpp/abseil-cpp:=
- dev-libs/jemalloc:=[-lazy-lock]
- 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_p20210302
- >=media-libs/libtgvoip-2.4.4_p20210302-r2
- media-libs/openal
- media-libs/opus:=
- media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20210914[screencast=,X=]
- media-video/ffmpeg:=[opus]
- sys-libs/zlib:=[minizip]
- dbus? (
- dev-cpp/glibmm:2
- dev-qt/qtdbus:5
- dev-libs/libdbusmenu-qt[qt5(+)]
- )
- enchant? ( app-text/enchant:= )
- hunspell? ( >=app-text/hunspell-1.7:= )
- wayland? ( kde-frameworks/kwayland:= )
- webkit? ( net-libs/webkit-gtk:= )
- X? ( x11-libs/libxcb:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/range-v3
- =dev-cpp/ms-gsl-3*
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-util/cmake-3.16
- virtual/pkgconfig
-"
-# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
- "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
-)
-
-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"
- ewarn
- fi
-}
-
-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
-
- cmake_src_prepare
-}
-
-src_configure() {
- # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
- local mycmakeargs=(
- -DTDESKTOP_LAUNCHER_BASENAME="${PN}"
- -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
-
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
- -DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended)
- -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell
- )
-
- if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
- einfo "Found custom API credentials"
- mycmakeargs+=(
- -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
- -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
- )
- else
- # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
- # Building with snapcraft API credentials by default
- # Custom API credentials can be obtained here:
- # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
- # After getting credentials you can export variables:
- # export MY_TDESKTOP_API_ID="17349""
- # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
- # and restart the build"
- # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
- # portage will use custom variable every build automatically
- mycmakeargs+=(
- -DTDESKTOP_API_ID="611335"
- -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
- )
- fi
-
- cmake_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!"
- 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"
- ewarn "to crash when pasting big images from the clipboard."
- fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
index 21f0978de9d..757e0eab2ba 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit xdg cmake python-any-r1 optfeature flag-o-matic
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
REQUIRED_USE="
spell? (
^^ ( enchant hunspell )
@@ -28,7 +28,6 @@ RDEPEND="
!net-im/telegram-desktop-bin
app-arch/lz4:=
dev-cpp/abseil-cpp:=
- dev-libs/jemalloc:=[-lazy-lock]
dev-libs/libdispatch
dev-libs/openssl:=
dev-libs/xxhash
@@ -40,11 +39,11 @@ RDEPEND="
>=dev-qt/qtwidgets-5.15:5[png,X?]
media-fonts/open-sans
media-libs/fontconfig:=
- ~media-libs/libtgvoip-2.4.4_p20211129
+ ~media-libs/libtgvoip-2.4.4_p20220117
media-libs/openal
media-libs/opus:=
media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20211207[screencast=,X=]
+ ~media-libs/tg_owt-0_pre20220209[screencast=,X=]
media-video/ffmpeg:=[opus]
sys-libs/zlib:=[minizip]
dbus? (
@@ -54,6 +53,7 @@ RDEPEND="
)
enchant? ( app-text/enchant:= )
hunspell? ( >=app-text/hunspell-1.7:= )
+ jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
wayland? ( kde-frameworks/kwayland:= )
X? ( x11-libs/libxcb:= )
"
@@ -69,8 +69,11 @@ BDEPEND="
# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
PATCHES=(
- "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+ "${FILESDIR}/tdesktop-3.5.2-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"
)
pkg_pretend() {
@@ -88,26 +91,24 @@ src_prepare() {
sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
cmake/external/rlottie/CMakeLists.txt || die
- # fix linking with missing libdl (introduced in 3.2.0->3.2.4 upgrade,
- # not sure if thanks to removing the -pie flag in the cmakelists...)
- sed -i 's/${JEMALLOC_LINK_LIBRARIES}/& dl/' \
- cmake/external/jemalloc/CMakeLists.txt || die
-
cmake_src_prepare
}
src_configure() {
- # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
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
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended)
+ -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
+ -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+ -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)
)
if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -133,10 +134,6 @@ src_configure() {
)
fi
- # Fix for RISCV, as well as any other platforms that might generate libatomic calls
- # Upstreamed in >3.4.3
- append-ldflags '-pthread'
-
cmake_src_configure
}
@@ -144,10 +141,17 @@ 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
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"
ewarn "to crash when pasting big images from the clipboard."
+ ewarn
+ fi
+ if ! use jemalloc && use elibc_glibc; then
+ 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
optfeature_header
optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
diff --git a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
index 04a19cbd9bf..ed70c3f67a7 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit xdg cmake python-any-r1 optfeature
@@ -12,11 +12,12 @@ HOMEPAGE="https://desktop.telegram.org"
MY_P="tdesktop-${PV}-full"
SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
REQUIRED_USE="
spell? (
^^ ( enchant hunspell )
@@ -27,7 +28,7 @@ RDEPEND="
!net-im/telegram-desktop-bin
app-arch/lz4:=
dev-cpp/abseil-cpp:=
- dev-libs/jemalloc:=[-lazy-lock]
+ dev-libs/libdispatch
dev-libs/openssl:=
dev-libs/xxhash
>=dev-qt/qtcore-5.15:5
@@ -38,11 +39,11 @@ RDEPEND="
>=dev-qt/qtwidgets-5.15:5[png,X?]
media-fonts/open-sans
media-libs/fontconfig:=
- ~media-libs/libtgvoip-2.4.4_p20211129
+ ~media-libs/libtgvoip-2.4.4_p20220117
media-libs/openal
media-libs/opus:=
media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20211207[screencast=,X=]
+ ~media-libs/tg_owt-0_pre20220209[screencast=,X=]
media-video/ffmpeg:=[opus]
sys-libs/zlib:=[minizip]
dbus? (
@@ -52,7 +53,11 @@ RDEPEND="
)
enchant? ( app-text/enchant:= )
hunspell? ( >=app-text/hunspell-1.7:= )
- wayland? ( kde-frameworks/kwayland:= )
+ jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
+ wayland? (
+ dev-qt/qtwayland:=
+ kde-frameworks/kwayland:=
+ )
X? ( x11-libs/libxcb:= )
"
DEPEND="${RDEPEND}
@@ -66,12 +71,13 @@ BDEPEND="
"
# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
-S="${WORKDIR}/${MY_P}"
-
PATCHES=(
- "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
- "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
+ "${FILESDIR}/tdesktop-3.6.0-jemalloc-only-telegram.patch"
"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
+ "${FILESDIR}/tdesktop-3.5.2-musl.patch"
+ "${FILESDIR}/tdesktop-3.6.0-support-ffmpeg5.patch"
+ "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch"
+ "${FILESDIR}/tdesktop-3.6.1-fix-use-after-free.patch"
)
pkg_pretend() {
@@ -89,26 +95,24 @@ src_prepare() {
sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
cmake/external/rlottie/CMakeLists.txt || die
- # fix linking with missing libdl (introduced in 3.2.0->3.2.4 upgrade,
- # not sure if thanks to removing the -pie flag in the cmakelists...)
- sed -i 's/${JEMALLOC_LINK_LIBRARIES}/& dl/' \
- cmake/external/jemalloc/CMakeLists.txt || die
-
cmake_src_prepare
}
src_configure() {
- # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
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
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended)
+ -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
+ -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+ -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)
)
if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -141,10 +145,17 @@ 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
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"
ewarn "to crash when pasting big images from the clipboard."
+ ewarn
+ fi
+ if ! use jemalloc && use elibc_glibc; then
+ 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
optfeature_header
optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
index c68b09c31f3..299724308b1 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+PYTHON_REQ_USE="xml(+)"
PYTHON_COMPAT=( python3_{8..10} )
inherit gnome2 python-any-r1
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index cec989e95f3..21f2738184f 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,3 +1,2 @@
-DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
diff --git a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 68cb0bb59cc..00000000000
--- a/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c 2021-07-26 15:04:59.172715491 -0400
-+++ src/autocomplete.c 2021-07-26 15:22:06.652686609 -0400
-@@ -25,10 +25,12 @@
- #include <string.h>
-
- #ifdef __APPLE__
--#include <sys/types.h>
- #include <sys/dir.h>
-+#include <sys/types.h>
-+#include <sys/sysinfo.h>
- #else
- #include <dirent.h>
-+#include <linux/limits.h>
- #endif /* __APPLE__ */
-
- #include "configdir.h"
-diff -ruN src/file_transfers.h src/file_transfers.h
---- src/file_transfers.h 2021-07-26 15:39:36.765990567 -0400
-+++ src/file_transfers.h 2021-07-26 15:39:41.899323757 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
-
- #include <limits.h>
-+//This includes NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
-
- #include "notify.h"
- #include "toxic.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h 2021-07-26 15:04:59.176048823 -0400
-+++ src/settings.h 2021-07-26 15:12:01.772703590 -0400
-@@ -24,6 +24,12 @@
- #define SETTINGS_H
-
- #include <limits.h>
-+//This includes NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
-
- #include <tox/tox.h>
-
diff --git a/net-im/toxic/toxic-0.10.1-r1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
deleted file mode 100644
index 931dd62fc29..00000000000
--- a/net-im/toxic/toxic-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="A curses-based client for Tox"
-HOMEPAGE="https://github.com/JFreegman/toxic"
-SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- video? ( sound X ) "
-
-BDEPEND="dev-libs/libconfig"
-
-RDEPEND="net-libs/tox:=
- net-misc/curl
- sys-libs/ncurses:=
- sys-kernel/linux-headers
- audio-notify? (
- media-libs/freealut
- media-libs/openal
- )
- notification? ( x11-libs/libnotify )
- debug? ( llvm? ( sys-devel/llvm:* ) )
- python? ( ${PYTHON_DEPS} )
- qrcode? (
- media-gfx/qrencode:=
- png? ( media-libs/libpng )
- )
- sound? (
- media-libs/openal
- net-libs/tox:=[av]
- )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- #prevent man files from being compressed.
- sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
- #Fix incorrect linkage of pthread (may be optional)
- sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
- #Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
- #This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
- #look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
- sed -i -e 's/?=/=/g' Makefile || die "Unable to force CFLAGS and LDFLAGS"
- #Fix incomplete invocation of python-config
- sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
- #Fix incorrect include statements for NAME_MAX and PATH_MAX macros
- eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix header inclusion"
-}
-
-src_configure() {
- if ! use audio-notify; then
- USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
- fi
- if use debug; then
- USER_CFLAGS+="-DENABLE_RELEASE=0 "
- if use llvm; then
- USER_CFLAGS+="-DENABLE_ASAN=1 "
- fi
- fi
- if ! use notification; then
- USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
- fi
- if ! use png; then
- USER_CFLAGS+="-DDISABLE_QRPNG=1 "
- fi
- if use python; then
- USER_CFLAGS+="-DENABLE_PYTHON=1"
- fi
- if ! use qrcode; then
- USER_CFLAGS+="-DDISABLE_QRCODE=1"
- fi
- if ! use sound; then
- USER_CFLAGS+="-DDISABLE_AV=1 "
- fi
- if ! use video; then
- USER_CFLAGS+="-DDISABLE_VI=1"
- fi
- if ! use X; then
- USER_CFLAGS+="-DDISABLE_X11=1 "
- fi
- USER_CFLAGS+="${CFLAGS}"
- export USER_CFLAGS
- export USER_LDFLAGS="${LDFLAGS}"
- #set install directory to /usr.
- sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
-}
-
-src_install() {
- default
- if ! use audio-notify; then
- rm -r "${ED}"/usr/share/"${PN}"/sounds || die "Could not remove sounds directory"
- fi
-}
diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild
index 338805c70b2..f35a0c3ca42 100644
--- a/net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild
@@ -1,7 +1,7 @@
-# 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
EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165"
PYTHON_COMPAT=( python3_{8..10} )
diff --git a/net-im/wazzapp-bin/Manifest b/net-im/wazzapp-bin/Manifest
new file mode 100644
index 00000000000..e46027a9a1d
--- /dev/null
+++ b/net-im/wazzapp-bin/Manifest
@@ -0,0 +1 @@
+DIST wazzapp-0.4.2.x86_64.rpm 56402809 BLAKE2B 11a6f8db4fe91014218b09992e1e3fa36819eb73efc9081ef56af5e6aa5b0dbee78e8974eca86b28701160eb823ae58350f9da4c6d5c0e1826ee95a7ea413a55 SHA512 808fa3721d62def5d93b4b3411f1f7489d22d5c70af07174b41579263d562bb139e951434a211c36e08e7c672925f89e60eb7fdb1d79148c3adc1a9c7beafad7
diff --git a/net-im/wazzapp-bin/metadata.xml b/net-im/wazzapp-bin/metadata.xml
new file mode 100644
index 00000000000..2b6f2305c1f
--- /dev/null
+++ b/net-im/wazzapp-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">diospiroverde/WazzApp</remote-id>
+ <bugs-to>https://github.com/diospiroverde/WazzApp/issues</bugs-to>
+ </upstream>
+ <maintainer type="person">
+ <email>andrewammerlaan@gentoo.org</email>
+ <name>Andrew Ammerlaan</name>
+ </maintainer>
+</pkgmetadata>
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
new file mode 100644
index 00000000000..878a21a4c1b
--- /dev/null
+++ b/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop rpm xdg
+
+DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
+HOMEPAGE="https://github.com/diospiroverde/WazzApp"
+SRC_URI="https://lx-dynamics.com/wazzapp-${PV}.x86_64.rpm"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64"
+# Electron bundles a bunch of things
+LICENSE="
+ MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2
+ unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk
+ app-accessibility/at-spi2-core
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/wazzapp/*"
+
+pkg_pretend() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+ default
+ # Fix desktop file to pass validation
+ sed -i -e '/MimeType=whatsapp/d' usr/share/applications/wazzapp.desktop || die
+ # cleanup languages
+ pushd "opt/wazzapp/locales" || die
+ chromium_remove_language_paks
+ popd || die
+}
+
+src_configure() {
+ chromium_suid_sandbox_check_kernel_config
+ default
+}
+
+src_install() {
+ for size in {64,128,512}; do
+ doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/wazzapp.png"
+ done
+
+ domenu usr/share/applications/wazzapp.desktop
+
+ local DESTDIR="/opt/wazzapp"
+ pushd "opt/wazzapp" || die
+
+ exeinto "${DESTDIR}"
+ doexe chrome-sandbox wazzapp *.so*
+
+ exeinto "${DESTDIR}/swiftshader"
+ doexe swiftshader/*.so*
+
+ insinto "${DESTDIR}"
+ doins *.pak *.bin *.json *.dat
+ insopts -m0755
+ doins -r locales resources
+
+ # Chrome-sandbox requires the setuid bit to be specifically set.
+ # see https://github.com/electron/electron/issues/17972
+ fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+ dosym "${DESTDIR}"/wazzapp /opt/bin/wazzapp
+ popd || die
+}
diff --git a/net-im/whatsapp-desktop-bin/Manifest b/net-im/whatsapp-desktop-bin/Manifest
index 71daa64f982..797f52ec5c1 100644
--- a/net-im/whatsapp-desktop-bin/Manifest
+++ b/net-im/whatsapp-desktop-bin/Manifest
@@ -1,2 +1,2 @@
-DIST whatsapp-desktop-bin-amd64-0.5.1.deb 39705544 BLAKE2B abdf7091f8b10e614e78e457e501bf878f7462f54257e5b96ca2118ddd872bd71fc4c000c24f881741a252932d7bd0bb3d8654cdaeddf2e42ee2d8de5788f565 SHA512 96411b1bcf064a9b5836b64687389898bebf3b8636a95adb8c55b74b4405b9b5c45d099fb594947130b6618520f1f0d1bd84618537fa8a19c001db4ddc630f7c
-DIST whatsapp-desktop-bin-x86-0.5.1.deb 40671520 BLAKE2B 06f6b2c3168c48de9caa2b834ab41ee47a43a534751eac6ddffc29acc981281e3d0d54b96bbd44dfc870257c9561f88ba72fd26a85cd13168fd1eb4a3ddb56dd SHA512 b87fa9b901fec104284e55c2747ad742da9d484fb13b9e8259ae99f60b5d293ae93831ca7daefa38cab04ea50c764de089b0422c797e693ebebaa136932fd6e0
+DIST whatsapp-desktop-bin-amd64-0.5.2.deb 79421814 BLAKE2B db9a2c29b1fc02a265f42d87c3582917bdbbeb99debf09a0e4ba97446b962483f6b6c06f36c1bbae826142085f9445b895f16c98e1f1d847f8730cd81889ace8 SHA512 4b5fecfeea2eebeadebacc96bcb217fe030f23a37b7979f3ea2444f5f7bccada3d126512853ad431b997c7b46ca8d86e396143c8dd36ffdc6a0beb542b77b41e
+DIST whatsapp-desktop-bin-x86-0.5.2.deb 68963072 BLAKE2B fb03f73e489369a5911cc5bf44595227cdc6de7a3c08a89dae8077c940a8a59b99829fc59885f276efa4829e43e94ad2ad5abd8373f673461753d07500f3f327 SHA512 f388a7db11b84de6283501057a28b42aaa4834582ed6e389c8d0ffff20146f890842e266cca40cd2ac71c4eae6d9f43eb2a794c5d4db4f1b435a93fcf7c25b83
diff --git a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
deleted file mode 100644
index 1358c9b70bc..00000000000
--- a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker xdg
-
-DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
-HOMEPAGE="https://github.com/oOthkOo/whatsapp-desktop"
-SRC_URI="
- amd64? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x64.deb -> ${PN}-amd64-${PV}.deb )
- x86? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x32.deb -> ${PN}-x86-${PV}.deb )
-"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
- app-accessibility/at-spi2-atk:2
- dev-libs/atk
- dev-libs/expat
- dev-libs/libappindicator
- dev-libs/nspr
- dev-libs/nss
- media-fonts/noto-emoji
- media-libs/alsa-lib
- net-print/cups
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libnotify
- x11-libs/libxcb
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- x11-libs/pango
-"
-
-QA_PREBUILT="/opt/whatsapp-desktop/*"
-
-S="${WORKDIR}"
-
-src_install() {
- cp -a "${S}"/* "${ED}" || die
-}
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.ebuild
new file mode 100644
index 00000000000..dec45a3a26f
--- /dev/null
+++ b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web"
+HOMEPAGE="https://github.com/oOthkOo/whatsapp-desktop"
+SRC_URI="
+ amd64? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x64.deb -> ${PN}-amd64-${PV}.deb )
+ x86? ( https://github.com/oOthkOo/whatsapp-desktop/releases/download/v${PV}/whatsapp-desktop-x32.deb -> ${PN}-x86-${PV}.deb )
+"
+S="${WORKDIR}"
+
+KEYWORDS="-* ~amd64 ~x86"
+# Electron bundles a bunch of things
+LICENSE="
+ MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 GPL-3 LGPL-2.1 APSL-2
+ unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved
+"
+SLOT="0"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/libappindicator
+ dev-libs/nspr
+ dev-libs/nss
+ media-fonts/noto-emoji
+ media-libs/alsa-lib
+ net-print/cups
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+ x11-libs/libxcb
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXScrnSaver
+ x11-libs/pango
+"
+
+QA_PREBUILT="opt/whatsapp-desktop/*"
+
+pkg_pretend() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+ default
+ # cleanup languages
+ pushd "opt/whatsapp-desktop/locales" || die
+ chromium_remove_language_paks
+ popd || die
+}
+
+src_configure() {
+ chromium_suid_sandbox_check_kernel_config
+ default
+}
+
+src_install() {
+ for size in {64,128}; do
+ doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/whatsapp.png"
+ done
+
+ domenu usr/share/applications/whatsapp.desktop
+
+ local DESTDIR="/opt/whatsapp-desktop"
+ pushd "opt/whatsapp-desktop" || die
+
+ exeinto "${DESTDIR}"
+ doexe chrome-sandbox WhatsApp *.so*
+
+ exeinto "${DESTDIR}/swiftshader"
+ doexe swiftshader/*.so*
+
+ insinto "${DESTDIR}"
+ doins *.pak *.bin *.json *.dat
+ insopts -m0755
+ doins -r locales resources
+
+ # Chrome-sandbox requires the setuid bit to be specifically set.
+ # see https://github.com/electron/electron/issues/17972
+ fperms 4755 "${DESTDIR}"/chrome-sandbox
+
+ dosym "${DESTDIR}"/WhatsApp /opt/bin/WhatsApp
+ popd || die
+}
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index 36bedc4cf10..50b4c8766b0 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1 +1 @@
-DIST yowsup-3.2.3_p20190905.tar.gz 150149 BLAKE2B 149c49df1a3b4df9163abcb1625b7e15e41d81f6a1a649c08d8cca88cce6cf10488778301fc96af3b2fe9e668e855023e56da6e6e8b3b9038994273f19404b78 SHA512 4b59a30bf73797750b92aecf45bf2e551fcbb249688efac631400bf532e21b739e9a6628ed01da4d520ed9296657ae8c5463c3560b165c5d696fd18f1e700be7
+DIST yowsup-3.3.0.tar.gz 155950 BLAKE2B 7ade7f7e05aff14d5154d35d5c2a1841ee66893059bd995facb8297d7e6f1dde4468105dc3f03b5462efbf92cbd079c457440bb1580235bbbcfaddeab2244b56 SHA512 304409f02aa3720b0f70a83fe4dbe288fa1c5659642878d7bd1354359524a66c39b9f5baa9899224497f61f974d9b64ba67e07d866fda2589413070bb9ef1aad
diff --git a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild b/net-im/yowsup/yowsup-3.3.0.ebuild
index 05be23ec4c1..8c23695dc49 100644
--- a/net-im/yowsup/yowsup-3.2.3_p20190905.ebuild
+++ b/net-im/yowsup/yowsup-3.3.0.ebuild
@@ -1,10 +1,9 @@
-# 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
DISTUTILS_USE_SETUPTOOLS="bdepend"
-EGIT_COMMIT="2adc067f306d9e7d8b634f66e96c52d80a42e1ff"
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="readline"
@@ -12,8 +11,7 @@ inherit distutils-r1
DESCRIPTION="A library that enables you to build applications which use the WhatsApp service"
HOMEPAGE="https://github.com/tgalal/yowsup"
-SRC_URI="https://github.com/tgalal/yowsup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+SRC_URI="https://github.com/tgalal/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -34,19 +32,12 @@ RDEPEND="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PF}-fix-install-path.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.2.3_p20190905-fix-install-path.patch" )
src_prepare() {
default
# After talking to upstream, version restriction can be lifted
# and also 'argparse' needs to be removed.
- sed -e 's/==0.1.3-1//' -e 's/==0.2.2//' -e 's/==1.10//' -e 's/argparse//' -i setup.py || die
-}
-
-pkg_postinst() {
- einfo "Warning: It seems that recently yowsup gets detected during registration"
- einfo "resulting in an instant ban for your number right after registering"
- einfo "with the code you receive by sms/voice."
- einfo "See https://github.com/tgalal/yowsup/issues/2829 for more information."
+ sed -e 's/==0.1.5//' -e 's/==0.2.2//' -e 's/==1.10//' -e 's/>=3.6.0//' -e 's/argparse//' -i setup.py || die
}
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 331c54df6b4..2e53b525ace 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,4 +1,3 @@
-DIST zoom-5.4.53391.1108_i686.tar.xz 40384800 BLAKE2B 0d449103e16799e6e6bcaf6ef1c105d6a75ce8728bfedb5107a9c6deedd9e8ef1988e19ddc33da43de8eb925d386460a84b5efe13c0709de6901239a688b4fb0 SHA512 d77357ab669ade90d4b8ae99116372db8b8b9a251625ed0566e89a8cc4d3f7aced07fd08d4646a223fad58f588e1dc2484464bd70e203b875ac9866fb92fe2ea
-DIST zoom-5.4.53391.1108_x86_64.tar.xz 44660944 BLAKE2B 7152f4daccdbce56e2c83971f507bc70d5b77e8edd558f311e67f0e2ab127967cdd15c90b92ca95735b2fad3e11d692b206c32c5f7d65cd116050e8e6579fcdd SHA512 f52e2fda15a29c2232656e8f34a5d65c3c401eb50f249d5436a949c09efd5b821d1c5e1f59dc4c27b5f4aadc1c24f474854498664b5d333d340d03f4998c59ba
-DIST zoom-5.8.6.739_x86_64.tar.xz 55756408 BLAKE2B 5a0def3ebc239a55fbcba3aebfcf47d9121d0c7ad7bfb10477a0adce40fba278a15e74253261960c7c8fe452c1b0661c05aa9f48a79cd20e0e33048c247d9aba SHA512 5b2dbc9c914a8ec75978664b1cab19c3c7f8bc4a1e75772e5194b45c35e7ae8a2e5ed6c6fedd4be6ffd8af8736805163581ea5daefca1c9b914eff450f250200
-DIST zoom-5.9.1.1380_x86_64.tar.xz 57213592 BLAKE2B 5ff5202f36d97f7396d7b416ac84278177b3d15e42f05ab25420128b67ce69b5caab87b6df0737a143cc38a2afdb3cc245d05a17e7a82a2c1000b6ff875abe18 SHA512 95bc9572d94648ccbfdec95779ae8e9fc3d8be87da014263b744031e4144b3c7930f31b20443c9c4ff8651dff8cb9b1f93582de32eda97a21126e999d0e9b939
+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
diff --git a/net-im/zoom/files/README.gentoo b/net-im/zoom/files/README.gentoo
deleted file mode 100644
index 12e5058b397..00000000000
--- a/net-im/zoom/files/README.gentoo
+++ /dev/null
@@ -1,8 +0,0 @@
-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:
-- Enable compositing in your window manager if it is supported
-- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)
-
-To enable screen sharing on GNOME Wayland, edit ~/.config/zoomus.conf
-and change the value of enableWaylandShare to true.
diff --git a/net-im/zoom/zoom-5.9.1.1380.ebuild b/net-im/zoom/zoom-5.10.7.3311.ebuild
index ace44f92c15..de370171be3 100644
--- a/net-im/zoom/zoom-5.9.1.1380.ebuild
+++ b/net-im/zoom/zoom-5.10.7.3311.ebuild
@@ -17,27 +17,43 @@ 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 )
- !pulseaudio? ( media-libs/alsa-lib )
wayland? ( dev-libs/wayland )
!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
!bundled-qt? (
@@ -67,7 +83,7 @@ src_prepare() {
default
# The tarball doesn't contain an icon, so extract it from the binary
- bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+ 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"
@@ -88,7 +104,7 @@ src_prepare() {
src_install() {
insinto /opt/zoom
exeinto /opt/zoom
- doins -r json ringtone sip timezones translations
+ 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
@@ -118,9 +134,8 @@ src_install() {
( # Remove libs and plugins with unresolved soname dependencies
cd "${ED}"/opt/zoom || die
- rm -r Qt/labs/location QtQml/RemoteObjects \
- QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
- QtQuick/Scene3D QtQuick/XmlListModel \
+ 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
@@ -135,23 +150,32 @@ src_install() {
fi
fi
- make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
+ make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef
make_desktop_entry "zoom %U" Zoom videoconference-zoom \
"Network;VideoConference;" \
- "MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+ "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
-
- local FORCE_PRINT_ELOG v
- for v in ${REPLACING_VERSIONS}; do
- ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
- done
readme.gentoo_print_elog
}
diff --git a/net-im/zoom/zoom-5.8.6.739.ebuild b/net-im/zoom/zoom-5.11.0.3540.ebuild
index 2d83cbfbf22..de370171be3 100644
--- a/net-im/zoom/zoom-5.8.6.739.ebuild
+++ b/net-im/zoom/zoom-5.11.0.3540.ebuild
@@ -17,27 +17,43 @@ 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 )
- !pulseaudio? ( media-libs/alsa-lib )
wayland? ( dev-libs/wayland )
!bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 )
!bundled-qt? (
@@ -67,8 +83,8 @@ src_prepare() {
default
# The tarball doesn't contain an icon, so extract it from the binary
- bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
- >zoom-icon.svg && [[ -s zoom-icon.svg ]] \
+ 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
@@ -88,7 +104,7 @@ src_prepare() {
src_install() {
insinto /opt/zoom
exeinto /opt/zoom
- doins -r json ringtone sip timezones translations
+ 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
@@ -118,9 +134,8 @@ src_install() {
( # Remove libs and plugins with unresolved soname dependencies
cd "${ED}"/opt/zoom || die
- rm -r Qt/labs/location QtQml/RemoteObjects \
- QtQuick/LocalStorage QtQuick/Particles.2 QtQuick/Scene2D \
- QtQuick/Scene3D QtQuick/XmlListModel \
+ 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
@@ -135,22 +150,32 @@ src_install() {
fi
fi
- make_wrapper zoom /opt/zoom{/zoom,} $(usev bundled-qt /opt/zoom)
- make_desktop_entry "zoom %U" Zoom zoom-icon "" \
- "MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
- doicon zoom-icon.svg
- doicon -s scalable zoom-icon.svg
+ 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
-
- local FORCE_PRINT_ELOG v
- for v in ${REPLACING_VERSIONS}; do
- ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1
- done
readme.gentoo_print_elog
}
diff --git a/net-im/zoom/zoom-5.11.1.3595.ebuild b/net-im/zoom/zoom-5.11.1.3595.ebuild
new file mode 100644
index 00000000000..de370171be3
--- /dev/null
+++ b/net-im/zoom/zoom-5.11.1.3595.ebuild
@@ -0,0 +1,185 @@
+# 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.4.53391.1108-r3.ebuild b/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
deleted file mode 100644
index 6b437d523e6..00000000000
--- a/net-im/zoom/zoom-5.4.53391.1108-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eapi8-dosym readme.gentoo-r1 wrapper xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
- x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
- dev-libs/glib:2
- dev-libs/icu
- dev-libs/quazip:0=
- 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/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-sound/mpg123
- sys-apps/dbus
- sys-apps/util-linux
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
- pulseaudio? ( media-sound/pulseaudio )
- !pulseaudio? ( media-libs/alsa-lib )"
-
-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"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
- >zoom-icon.svg && [[ -s zoom-icon.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 json ringtone sip timezones translations
- doins *.pcm *.pem *.sh Embedded.properties version.txt
- doexe zoom zoom.sh zopen ZoomLauncher
- dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
- local quazip_so="libquazip1-qt5.so"
- if has_version "<dev-libs/quazip-1.0"; then
- quazip_so="libquazip5.so"
- fi
- dosym8 -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
-
- if use bundled-libjpeg-turbo; then
- doexe libturbojpeg.so
- else
- dosym8 -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so
- fi
-
- make_wrapper zoom /opt/zoom{/zoom,}
- make_desktop_entry "zoom %U" Zoom zoom-icon "" \
- "MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
- doicon zoom-icon.svg
- doicon -s scalable zoom-icon.svg
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-
- local FORCE_PRINT_ELOG v
- for v in ${REPLACING_VERSIONS}; do
- ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}