summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/bitlbee-facebook/metadata.xml2
-rw-r--r--net-im/bitlbee-steam/metadata.xml2
-rw-r--r--net-im/bitlbee/metadata.xml2
-rw-r--r--net-im/centerim/metadata.xml2
-rw-r--r--net-im/choqok/metadata.xml5
-rw-r--r--net-im/corebird/corebird-1.7.4-r2.ebuild (renamed from net-im/corebird/corebird-1.7.4-r1.ebuild)4
-rw-r--r--net-im/corebird/metadata.xml2
-rw-r--r--net-im/coturn/metadata.xml2
-rw-r--r--net-im/cpop/metadata.xml2
-rw-r--r--net-im/dianara/metadata.xml2
-rw-r--r--net-im/dino/Manifest1
-rw-r--r--net-im/dino/dino-0.2.1.ebuild24
-rw-r--r--net-im/dino/dino-0.2.2.ebuild79
-rw-r--r--net-im/dino/dino-9999.ebuild28
-rw-r--r--net-im/dino/files/README.gentoo23
-rw-r--r--net-im/dino/metadata.xml2
-rw-r--r--net-im/discord-bin/Manifest2
-rw-r--r--net-im/discord-bin/discord-bin-0.0.16-r1.ebuild (renamed from net-im/discord-bin/discord-bin-0.0.15.ebuild)35
-rw-r--r--net-im/discord-bin/metadata.xml7
-rw-r--r--net-im/ejabberd/ejabberd-20.04.ebuild2
-rw-r--r--net-im/ejabberd/ejabberd-21.04.ebuild2
-rw-r--r--net-im/ejabberd/metadata.xml2
-rw-r--r--net-im/ekg2/metadata.xml2
-rw-r--r--net-im/element-desktop-bin/Manifest2
-rw-r--r--net-im/element-desktop-bin/element-desktop-bin-1.9.2.ebuild (renamed from net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild)2
-rw-r--r--net-im/element-desktop-bin/metadata.xml2
-rw-r--r--net-im/empathy/metadata.xml2
-rw-r--r--net-im/err/metadata.xml2
-rw-r--r--net-im/gajim/Manifest1
-rw-r--r--net-im/gajim/gajim-1.3.3-r1.ebuild93
-rw-r--r--net-im/gajim/metadata.xml2
-rw-r--r--net-im/gg-transport/metadata.xml2
-rw-r--r--net-im/gitter-bin/metadata.xml2
-rw-r--r--net-im/jabber-base/metadata.xml2
-rw-r--r--net-im/kouchat/metadata.xml2
-rw-r--r--net-im/libcommuni/metadata.xml2
-rw-r--r--net-im/librvp/metadata.xml2
-rw-r--r--net-im/mattermost-desktop-bin/Manifest8
-rw-r--r--net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.1.ebuild (renamed from net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.0.ebuild)20
-rw-r--r--net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.2.ebuild88
-rw-r--r--net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild88
-rw-r--r--net-im/mattermost-desktop-bin/metadata.xml2
-rw-r--r--net-im/mcabber/metadata.xml2
-rw-r--r--net-im/metadata.xml2
-rw-r--r--net-im/minbif/Manifest1
-rw-r--r--net-im/minbif/files/minbif-1.0.5-gcc47.patch76
-rw-r--r--net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch26
-rw-r--r--net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch13
-rw-r--r--net-im/minbif/files/minbif.initd23
-rw-r--r--net-im/minbif/metadata.xml5
-rw-r--r--net-im/minbif/minbif-1.0.5-r3.ebuild83
-rw-r--r--net-im/neochat/metadata.xml5
-rw-r--r--net-im/openmittsu/metadata.xml2
-rw-r--r--net-im/pidgin/Manifest3
-rw-r--r--net-im/pidgin/files/pidgin-2.10.11-tinfo.patch24
-rw-r--r--net-im/pidgin/metadata.xml2
-rw-r--r--net-im/pidgin/pidgin-2.14.6-r1.ebuild5
-rw-r--r--net-im/pidgin/pidgin-2.14.7.ebuild (renamed from net-im/pidgin/pidgin-2.14.5-r1.ebuild)7
-rw-r--r--net-im/pidgin/pidgin-2.14.8.ebuild288
-rw-r--r--net-im/poezio/metadata.xml2
-rw-r--r--net-im/poezio/poezio-0.13.1-r1.ebuild52
-rw-r--r--net-im/poezio/poezio-0.13.1-r2.ebuild2
-rw-r--r--net-im/profanity/Manifest1
-rw-r--r--net-im/profanity/metadata.xml2
-rw-r--r--net-im/profanity/profanity-0.11.0-r1.ebuild50
-rw-r--r--net-im/prosody-modules/Manifest2
-rw-r--r--net-im/prosody-modules/metadata.xml2
-rw-r--r--net-im/prosody-modules/prosody-modules-0_pre20210901.ebuild (renamed from net-im/prosody-modules/prosody-modules-0_pre20210515.ebuild)0
-rw-r--r--net-im/prosody/Manifest2
-rw-r--r--net-im/prosody/metadata.xml2
-rw-r--r--net-im/prosody/prosody-0.11.10.ebuild (renamed from net-im/prosody/prosody-0.11.9.ebuild)0
-rw-r--r--net-im/psi/metadata.xml2
-rw-r--r--net-im/psimedia/metadata.xml2
-rw-r--r--net-im/purple-events/metadata.xml2
-rw-r--r--net-im/qtox/metadata.xml14
-rw-r--r--net-im/qtox/qtox-9999.ebuild65
-rw-r--r--net-im/ricochet/metadata.xml2
-rw-r--r--net-im/rocketchat-desktop-bin/Manifest3
-rw-r--r--net-im/rocketchat-desktop-bin/metadata.xml2
-rw-r--r--net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.3.0.ebuild53
-rw-r--r--net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.5.7.ebuild (renamed from net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild)5
-rw-r--r--net-im/sendxmpp/metadata.xml2
-rw-r--r--net-im/signal-cli-bin/Manifest9
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch31
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch9
-rw-r--r--net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch (renamed from net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch)12
-rw-r--r--net-im/signal-cli-bin/metadata.xml2
-rw-r--r--net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild61
-rw-r--r--net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild)0
-rw-r--r--net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild (renamed from net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild)2
-rw-r--r--net-im/signal-desktop-bin/Manifest2
-rw-r--r--net-im/signal-desktop-bin/metadata.xml2
-rw-r--r--net-im/signal-desktop-bin/signal-desktop-bin-5.20.0.ebuild (renamed from net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild)56
-rw-r--r--net-im/skype-dbus-mock/metadata.xml2
-rw-r--r--net-im/skypeforlinux/Manifest3
-rw-r--r--net-im/skypeforlinux/metadata.xml2
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.75.0.140.ebuild (renamed from net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild)0
-rw-r--r--net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild99
-rw-r--r--net-im/slack/Manifest5
-rw-r--r--net-im/slack/metadata.xml2
-rw-r--r--net-im/slack/slack-4.13.0.ebuild100
-rw-r--r--net-im/slack/slack-4.18.0.ebuild (renamed from net-im/slack/slack-4.12.2.ebuild)5
-rw-r--r--net-im/slack/slack-4.19.2.ebuild (renamed from net-im/slack/slack-4.14.0.ebuild)5
-rw-r--r--net-im/spectrum2/Manifest1
-rw-r--r--net-im/spectrum2/metadata.xml2
-rw-r--r--net-im/spectrum2/spectrum2-2.0.13-r2.ebuild6
-rw-r--r--net-im/spectrum2/spectrum2-2.1.0.ebuild109
-rw-r--r--net-im/swift/metadata.xml2
-rw-r--r--net-im/teams/Manifest1
-rw-r--r--net-im/teams/metadata.xml2
-rw-r--r--net-im/teams/teams-1.4.00.26453.ebuild105
-rw-r--r--net-im/telegram-desktop-bin/Manifest8
-rw-r--r--net-im/telegram-desktop-bin/files/telegram-desktop-bin9
-rw-r--r--net-im/telegram-desktop-bin/metadata.xml2
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild)19
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.8.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild)20
-rw-r--r--net-im/telegram-desktop/Manifest6
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch10
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch72
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch21
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch262
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch25
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch31
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch122
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch31
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch15
-rw-r--r--net-im/telegram-desktop/files/tdesktop-2.9.3-jemalloc-only-telegram.patch (renamed from net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch)18
-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/metadata.xml3
-rw-r--r--net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild)41
-rw-r--r--net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild)46
-rw-r--r--net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild (renamed from net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild)84
-rw-r--r--net-im/telepathy-connection-managers/metadata.xml2
-rw-r--r--net-im/telepathy-logger/metadata.xml2
-rw-r--r--net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild2
-rw-r--r--net-im/telepathy-mission-control/metadata.xml2
-rw-r--r--net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild2
-rw-r--r--net-im/tkabber/metadata.xml2
-rw-r--r--net-im/toxic/Manifest2
-rw-r--r--net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch49
-rw-r--r--net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch48
-rw-r--r--net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch49
-rw-r--r--net-im/toxic/metadata.xml3
-rw-r--r--net-im/toxic/toxic-0.10.1-r1.ebuild (renamed from net-im/toxic/toxic-0.10.1.ebuild)14
-rw-r--r--net-im/toxic/toxic-0.11.1.ebuild (renamed from net-im/toxic/toxic-0.10.0-r1.ebuild)42
-rw-r--r--net-im/toxic/toxic-0.8.3-r3.ebuild (renamed from net-im/toxic/toxic-0.8.3-r2.ebuild)11
-rw-r--r--net-im/transwhat/metadata.xml2
-rw-r--r--net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild (renamed from net-im/transwhat/transwhat-0.2.2_p20190426-r1.ebuild)1
-rw-r--r--net-im/vacuum/metadata.xml2
-rw-r--r--net-im/webex/metadata.xml7
-rw-r--r--net-im/whatsapp-desktop-bin/metadata.xml2
-rw-r--r--net-im/yowsup/metadata.xml2
-rw-r--r--net-im/ysm/metadata.xml2
-rw-r--r--net-im/zoom/Manifest4
-rw-r--r--net-im/zoom/metadata.xml15
-rw-r--r--net-im/zoom/zoom-5.7.31792.0820.ebuild (renamed from net-im/zoom/zoom-5.7.28852.0718.ebuild)9
-rw-r--r--net-im/zoom/zoom-5.8.0.16.ebuild (renamed from net-im/zoom/zoom-5.7.28991.0726.ebuild)18
158 files changed, 1675 insertions, 1549 deletions
diff --git a/net-im/bitlbee-facebook/metadata.xml b/net-im/bitlbee-facebook/metadata.xml
index e6d3bd37d2d6..4e8c1c1c58ad 100644
--- a/net-im/bitlbee-facebook/metadata.xml
+++ b/net-im/bitlbee-facebook/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" proxied="yes">
<email>arkamar@atlas.cz</email>
diff --git a/net-im/bitlbee-steam/metadata.xml b/net-im/bitlbee-steam/metadata.xml
index af61b42a1bcb..5e02b3f0fed5 100644
--- a/net-im/bitlbee-steam/metadata.xml
+++ b/net-im/bitlbee-steam/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-needed-->
<longdescription lang="en">
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index f217f56395fb..4d61638429f9 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/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" proxied="yes">
<email>arkamar@atlas.cz</email>
diff --git a/net-im/centerim/metadata.xml b/net-im/centerim/metadata.xml
index a5a5d9728be5..53d5fd602372 100644
--- a/net-im/centerim/metadata.xml
+++ b/net-im/centerim/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">
<email>swegener@gentoo.org</email>
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index 625636c5e6fd..1b71d886242e 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -1,10 +1,13 @@
<?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="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
<use>
<flag name="attica">Build Open Collaboration Services plugin using <pkg>kde-frameworks/attica</pkg></flag>
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
diff --git a/net-im/corebird/corebird-1.7.4-r1.ebuild b/net-im/corebird/corebird-1.7.4-r2.ebuild
index ff61481ab0a2..08f06c7b7339 100644
--- a/net-im/corebird/corebird-1.7.4-r1.ebuild
+++ b/net-im/corebird/corebird-1.7.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="dev-db/sqlite:3
media-plugins/gst-plugins-meta:1.0[X]
media-plugins/gst-plugins-soup:1.0 )
spellcheck? ( app-text/gspell:=[vala] )
- net-libs/libsoup
+ net-libs/libsoup:2.4
x11-libs/gtk+:3"
DEPEND="${RDEPEND}
$(vala_depend)
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
index 5b4d772c5be8..9e83bd6d9566 100644
--- a/net-im/corebird/metadata.xml
+++ b/net-im/corebird/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-needed -->
<use>
diff --git a/net-im/coturn/metadata.xml b/net-im/coturn/metadata.xml
index 2baddb2216a4..37bda90badca 100644
--- a/net-im/coturn/metadata.xml
+++ b/net-im/coturn/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">
<email>nativemad@gentoo.org</email>
diff --git a/net-im/cpop/metadata.xml b/net-im/cpop/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/net-im/cpop/metadata.xml
+++ b/net-im/cpop/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-needed -->
</pkgmetadata>
diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
index f33e939c94d9..211f6fdfa6ba 100644
--- a/net-im/dianara/metadata.xml
+++ b/net-im/dianara/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-needed -->
<upstream>
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index ba33a251e4dc..800169e77e53 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1 +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
diff --git a/net-im/dino/dino-0.2.1.ebuild b/net-im/dino/dino-0.2.1.ebuild
index c640a0cc338e..b9cbc662d434 100644
--- a/net-im/dino/dino-0.2.1.ebuild
+++ b/net-im/dino/dino-0.2.1.ebuild
@@ -5,13 +5,15 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="ninja"
VALA_MIN_API_VERSION="0.34"
-inherit cmake gnome2-utils vala xdg-utils
+inherit cmake vala xdg
DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
HOMEPAGE="https://dino.im"
+
LICENSE="GPL-3"
SLOT="0"
-IUSE="+gpg +http +omemo +notification-sound"
+IUSE="+gpg +http +omemo +notification-sound test"
+RESTRICT="!test? ( test )"
MY_REPO_URI="https://github.com/dino/dino"
if [[ ${PV} == "9999" ]]; then
@@ -66,28 +68,12 @@ src_configure() {
"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
"-DVALA_EXECUTABLE=${VALAC}"
+ "-DBUILD_TESTS=$(usex test)"
)
- if has test ${FEATURES}; then
- mycmakeargs+=("-DBUILD_TESTS=yes")
- fi
-
cmake_src_configure
}
src_test() {
"${BUILD_DIR}"/xmpp-vala-test || die
}
-
-update_caches() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- update_caches
-}
-
-pkg_postrm() {
- update_caches
-}
diff --git a/net-im/dino/dino-0.2.2.ebuild b/net-im/dino/dino-0.2.2.ebuild
new file mode 100644
index 000000000000..169e9707eef1
--- /dev/null
+++ b/net-im/dino/dino-0.2.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 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
+
+DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
+HOMEPAGE="https://dino.im"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gpg +http +omemo +notification-sound test"
+RESTRICT="!test? ( test )"
+
+MY_REPO_URI="https://github.com/dino/dino"
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="${MY_REPO_URI}.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm64"
+ SRC_URI="${MY_REPO_URI}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+RDEPEND="
+ app-text/gspell[vala]
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/icu
+ dev-libs/libgee:0.8
+ net-libs/glib-networking
+ net-libs/libsignal-protocol-c
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ gpg? ( app-crypt/gpgme:1 )
+ http? ( net-libs/libsoup:2.4 )
+ omemo? (
+ dev-libs/libgcrypt:0
+ media-gfx/qrencode
+ )
+ notification-sound? ( media-libs/libcanberra:0[sound] )
+"
+DEPEND="
+ $(vala_depend)
+ ${RDEPEND}
+ sys-devel/gettext
+"
+
+src_prepare() {
+ cmake_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local disabled_plugins=(
+ $(usex gpg "" "openpgp")
+ $(usex omemo "" "omemo")
+ $(usex http "" "http-files")
+ )
+ local enabled_plugins=(
+ $(usex notification-sound "notification-sound" "")
+ )
+ local mycmakeargs+=(
+ "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
+ "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
+ "-DVALA_EXECUTABLE=${VALAC}"
+ "-DBUILD_TESTS=$(usex test)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}"/xmpp-vala-test || die
+}
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index e0058ccbf6e7..29103bf879ef 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -5,13 +5,15 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="ninja"
VALA_MIN_API_VERSION="0.34"
-inherit cmake gnome2-utils vala xdg-utils
+inherit cmake vala xdg readme.gentoo-r1
DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
HOMEPAGE="https://dino.im"
+
LICENSE="GPL-3"
SLOT="0"
-IUSE="+gpg +http +omemo +notification-sound"
+IUSE="+gpg +http +omemo +notification-sound test"
+RESTRICT="!test? ( test )"
MY_REPO_URI="https://github.com/dino/dino"
if [[ ${PV} == "9999" ]]; then
@@ -47,6 +49,8 @@ RDEPEND="
DEPEND="
$(vala_depend)
${RDEPEND}
+ media-libs/gst-plugins-base
+ media-libs/gstreamer
sys-devel/gettext
"
@@ -68,12 +72,9 @@ src_configure() {
"-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")"
"-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")"
"-DVALA_EXECUTABLE=${VALAC}"
+ "-DBUILD_TESTS=$(usex test)"
)
- if has test ${FEATURES}; then
- mycmakeargs+=("-DBUILD_TESTS=yes")
- fi
-
cmake_src_configure
}
@@ -81,15 +82,12 @@ src_test() {
"${BUILD_DIR}"/xmpp-vala-test || die
}
-update_caches() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- update_caches
+src_install() {
+ cmake_src_install
+ readme.gentoo_create_doc
}
-pkg_postrm() {
- update_caches
+src_postinst() {
+ xdg_pkg_postinst
+ readme.gentoo_print_elog
}
diff --git a/net-im/dino/files/README.gentoo b/net-im/dino/files/README.gentoo
new file mode 100644
index 000000000000..b51e4391562e
--- /dev/null
+++ b/net-im/dino/files/README.gentoo
@@ -0,0 +1,23 @@
+To enable video calls, install the following packages.
+
+Transport level security:
+- gst-plugins-srtp
+- gst-plugins-dtls
+
+Peer to peer connection reliability:
+- gst-plugins-libnice
+
+Video output into a window:
+- gst-plugins-gtk
+
+At least one codec is needed in common with the other end of the call, as they
+are negotiated when the call begins.
+
+Video codecs:
+- gst-plugins-x264
+- gst-plugins-vpx
+
+Audio codecs:
+- gst-plugins-good
+- gst-plugins-speex
+- gst-plugins-opus
diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml
index 65da392eaa06..b2e7c53af48d 100644
--- a/net-im/dino/metadata.xml
+++ b/net-im/dino/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">
<email>andrey_utkin@gentoo.org</email>
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index fbd6fcc865df..9865c4817508 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1 +1 @@
-DIST discord-0.0.15.deb 71614892 BLAKE2B b97488d0d1b9e1d2cbf5bd92b689b63ca2cd83adda55b18283409bd47914f83193299d07102ab779149e405dd0fbeb327cf63fa98d58e7e59e40f3948342c9ad SHA512 32d6fb819d419b0b7dd1929ad88d5210361136ff3d159af55efde0db6281ff85bdea74be401b3a2235fdc0e0f7b1411bee57d623fe26fe940d658e9f97dd2675
+DIST discord-0.0.16.deb 77079990 BLAKE2B 17cb04baa4eab3494593c54bc556a8e1d01352aa1ba7d1d27da722e53f5445386054b038b57281c5955f46416eccef9fc3521c1b91b3b593c495c29e2537d0c0 SHA512 4ea06420b27cc6dff813798c23d44478bbe4fea2919011796d271f94fcc2e25bae65e7c5c952a6723daa928d3ac99b913198a8500c76a0eef56138dda610c5de
diff --git a/net-im/discord-bin/discord-bin-0.0.15.ebuild b/net-im/discord-bin/discord-bin-0.0.16-r1.ebuild
index 085aa80b0b9c..dc38d87ff9f5 100644
--- a/net-im/discord-bin/discord-bin-0.0.15.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.16-r1.ebuild
@@ -1,16 +1,17 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-MY_PN=${PN/-bin/}
-MY_BIN="D${MY_PN/d/}"
+MY_PN="${PN%-bin}"
+MY_BIN="${MY_PN^}"
-inherit desktop linux-info pax-utils unpacker xdg
+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"
@@ -26,31 +27,25 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
media-libs/alsa-lib
- media-libs/fontconfig:1.0
- media-libs/freetype:2
+ media-libs/mesa[gbm(+)]
net-print/cups
sys-apps/dbus
- sys-apps/util-linux
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libxcb
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/libdrm
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
+ x11-libs/libxshmfence
x11-libs/pango
"
-S="${WORKDIR}"
-
QA_PREBUILT="
opt/discord/${MY_BIN}
opt/discord/chrome-sandbox
@@ -71,7 +66,7 @@ src_prepare() {
default
sed -i \
- -e "s:/usr/share/discord/Discord:/opt/${MY_PN}/${MY_BIN}:g" \
+ -e "s:/usr/share/discord/Discord:discord:" \
usr/share/${MY_PN}/${MY_PN}.desktop || die
}
@@ -82,7 +77,13 @@ src_install() {
insinto /opt/${MY_PN}
doins -r usr/share/${MY_PN}/.
fperms +x /opt/${MY_PN}/${MY_BIN}
- dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
+ 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/metadata.xml b/net-im/discord-bin/metadata.xml
index 15fd2f3a22be..115e9d64a669 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -1,8 +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">
- <email>johu@gentoo.org</email>
- <name>Johannes Huber</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild
index e2df234b563a..90c657f64b01 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -271,6 +271,8 @@ pkg_preinst() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.tmpfiles.conf
+
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild
index 3cf528129054..245c006f1141 100644
--- a/net-im/ejabberd/ejabberd-21.04.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -252,6 +252,8 @@ pkg_preinst() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.tmpfiles.conf
+
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index b81bfc19a41d..787de61bb992 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/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="project">
<email>ejabberd@gentoo.org</email>
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index 56d35d283099..254271117728 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/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">
<email>mgorny@gentoo.org</email>
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index ad8efd1368d5..536cdcc814c7 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.7.32_amd64.deb 81626504 BLAKE2B af4cc2e7e853988fe4a89301943f3a72b45f21a3b3023ceb2ebc735ec89b6e011e40312057289d5856084f1a5415f040410b355c5da655465202a646202708d0 SHA512 69bba229161f303c6e69761db2356a561838e3047da7f7a766886fc55c627f78029958bf3ec93be7c7cd24eff1ac0396fc92eb443905024c35f2d12f642c6a08
+DIST element-desktop_1.9.2_amd64.deb 81260260 BLAKE2B 3ae8e5d6f369a32c08616b67576bac2d90078b2af0e528da40e074fec5f91086a1f905bab8dd7cbe1ec3d1fad5590bdaeeefec70c44ec470f7cf4f6904253129 SHA512 a219d2d85fc13128c29ab989096d8893a3d9f95914c1da11764d8f3695b1c8be12f7f8e6abe62c59daf81a858d210779b2aab87307b2c563bca8bc40fa4d4570
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.9.2.ebuild
index acb8fc1ce31c..52197085f09a 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.32.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.9.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit unpacker xdg
diff --git a/net-im/element-desktop-bin/metadata.xml b/net-im/element-desktop-bin/metadata.xml
index 96ca38826cec..1af1ffc2b2e0 100644
--- a/net-im/element-desktop-bin/metadata.xml
+++ b/net-im/element-desktop-bin/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">
<email>steils@gentoo.org</email>
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 54f02c7adf8b..d381ce76949d 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/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="project">
<email>gnome@gentoo.org</email>
diff --git a/net-im/err/metadata.xml b/net-im/err/metadata.xml
index 6c33b0c08be1..ad3280d31150 100644
--- a/net-im/err/metadata.xml
+++ b/net-im/err/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-needed -->
<stabilize-allarches/>
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 8aa6dc2e9628..81fc64dc5ef7 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,2 +1,3 @@
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.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
diff --git a/net-im/gajim/gajim-1.3.3-r1.ebuild b/net-im/gajim/gajim-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..92c1b423ac5c
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.3-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+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}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${PN}-${P}"
+
+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}
+ $(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-2.0.4[${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
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index c9ce2f629c37..37921b88236a 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/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">
<email>hanno@gentoo.org</email>
diff --git a/net-im/gg-transport/metadata.xml b/net-im/gg-transport/metadata.xml
index 163724893272..65f7546ff4b9 100644
--- a/net-im/gg-transport/metadata.xml
+++ b/net-im/gg-transport/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-needed -->
<longdescription>
diff --git a/net-im/gitter-bin/metadata.xml b/net-im/gitter-bin/metadata.xml
index f70ca4806d5e..6a40236a6aa9 100644
--- a/net-im/gitter-bin/metadata.xml
+++ b/net-im/gitter-bin/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" proxied="yes">
<email>spiderx@spiderx.dp.ua</email>
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
index 3052e573aa4c..3ee268c59de6 100644
--- a/net-im/jabber-base/metadata.xml
+++ b/net-im/jabber-base/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/kouchat/metadata.xml b/net-im/kouchat/metadata.xml
index 62957fbb082d..ddb383dcaaf6 100644
--- a/net-im/kouchat/metadata.xml
+++ b/net-im/kouchat/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="project">
<email>java@gentoo.org</email>
diff --git a/net-im/libcommuni/metadata.xml b/net-im/libcommuni/metadata.xml
index bc1ec760bfba..c5a66b1305b1 100644
--- a/net-im/libcommuni/metadata.xml
+++ b/net-im/libcommuni/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/librvp/metadata.xml b/net-im/librvp/metadata.xml
index df410a0e3a73..9513683eeb85 100644
--- a/net-im/librvp/metadata.xml
+++ b/net-im/librvp/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-needed -->
<longdescription>
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 117bf7fa8086..90a4e7a2a5b9 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,2 +1,6 @@
-DIST mattermost-desktop-4.7.0-linux-ia32.tar.gz 83111746 BLAKE2B 81b7f50570e29a562b5abb9f84296212d7e0b48f9346a0cd9b3f46411010aaf4da05ce96508743f083f7519b2e5ee6fdaedae211228d2e9ea1a00b62eda4d70e SHA512 7520384b61efa0cf80feb9028fcb632d5e4fc29b907a53436c59359aa1d4f2ebbed0be4da41ead97f7450fe389815e69f2513acc9e63cd3cea2286a49e96ff83
-DIST mattermost-desktop-4.7.0-linux-x64.tar.gz 84882264 BLAKE2B b9667ee63fe9fe756d431efbe53c259a96cccf05d29a8a47e660f835ebad3ae826bc274aa8a8daa481c333a28d38bce9025b5a22dd730927bab901d87538c5de SHA512 225fa12e684f3735f4c55869ee27ee3cf26385bdfadeedc01c1fe070ebe585277fd701611a7275bd5bc894a0d0460e484ff31f959aa41a0b0b98c19d486986b6
+DIST mattermost-desktop-4.7.1-linux-ia32.tar.gz 83083553 BLAKE2B 75a914adab3d080ca95f76cb2bd8e11a1e9bb7b434ffd55c477ff38295b84e57c01f22596810ba6b4beb28e663e134ce36fce18ed71440213f0595db4b3ad256 SHA512 3d9264030f1b68ce052c5d453259e8e68f8b09a84e4854c84db1fb48beff5e0d67b0be5ac31a6b650c30baf53cd5eb2b024df8bafe37706ad1b721bfd8ef7f02
+DIST mattermost-desktop-4.7.1-linux-x64.tar.gz 84864146 BLAKE2B f0166d52fa49babd4ab13258edabd567f5114544af9dc9c59f094d5751cc3bfc26085523fa345d9cd252f7bc81763ecbeac55b921988a4ca9571fec9e5d5321e SHA512 2698e2fab7bf53554138618b20c54a70feb022d4a0d822f3e65d800cd9de8d0cdf53145f79074f7beb3dc29168c5a9c67f05dae3b3e628db1881c7cdd6c699b6
+DIST mattermost-desktop-4.7.2-linux-ia32.tar.gz 83097780 BLAKE2B a348655796bb84f5c31f5c4c964a6adac804db3b14f28a0c1b7dc103eb94b98eff8ecf1457206401268701e37070ca68c12a1582c6ce9a03fb029bff68505fd6 SHA512 e0eba172e49e5ebe74a7f901f0f4b383d8004171b8cc18e349e945adfa080803ad06b4dcef97c52fc182f1d1376bbb1d999b8c1ccef25f81dfbe7b209557c61d
+DIST mattermost-desktop-4.7.2-linux-x64.tar.gz 84872358 BLAKE2B e82497c1fe15ccff40649b1fe7410b04d48b5bc7ecf934cc210fbdc5c316e4eeaf265cab5784980a0687cb69e7c0078b0066adaa3632b2e2625080442bcc272a SHA512 04a82af251caeb7a59538d2b1ebbebd3a914d9d9f6317fdac2ab3c1950d315783153850fe8f61b8ef354da566442b147fe5496985d8f52fd5c21dccbef29c2d0
+DIST mattermost-desktop-5.0.0-linux-ia32.tar.gz 86955404 BLAKE2B 7c28fd55390c5a216cb2dc902809c230a7eb6fc3da6ee22fb3644c3e1891098322bd2147dfa06654a57bf12c75c909e0a23011f2390fa4ba64865849764dee53 SHA512 afcff8617fb3b267df455f8b56da552272719daac2f63d05bcbf2369dc42301b93c5fc031c1350ab6bb7280e259354e8b27bb0755d16a87aa4cb345921b0166e
+DIST mattermost-desktop-5.0.0-linux-x64.tar.gz 87313050 BLAKE2B 1993f2d42b288ac5fc396489645fae90f5c94dd71647eba06f2b30035b5c8bc3b131b4a6174da2c010a64f83cd2fc3121651be475429321a5c5e4e7c9ea3aeaa SHA512 6fcef95e93074a1338c1953fb7c8124f77abaecedf2c9b5b3b8db07f6fbdd4ebf9c1598707843886d12875944095da407ec526620d0fd4af6aa5b5cd1dd9c511
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.1.ebuild
index c160cee4a147..e767c09c1e07 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.0.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_PN="${PN%-*}"
@@ -22,13 +22,29 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
app-accessibility/at-spi2-atk:2
app-accessibility/at-spi2-core:2[X]
+ 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[X]
- x11-libs/libXScrnSaver
+ x11-libs/libX11
+ 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="
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.2.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.2.ebuild
new file mode 100644
index 000000000000..e767c09c1e07
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.7.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-*}"
+
+inherit desktop
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+ amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+ x86? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2[X]
+ 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[X]
+ x11-libs/libX11
+ 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/mattermost-desktop/mattermost-desktop
+ opt/mattermost-desktop/libnode.so
+ opt/mattermost-desktop/libffmpeg.so
+ opt/mattermost-desktop/libGLESv2.so
+ opt/mattermost-desktop/libEGL.so
+ opt/mattermost-desktop/libvk_swiftshader.so
+"
+
+DOCS=(
+ NOTICE.txt
+)
+
+S="${WORKDIR}"
+
+src_install() {
+ if use amd64; then
+ cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+ elif use x86; then
+ cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+ fi
+
+ insinto "/opt/${MY_PN}/locales"
+ doins locales/*.pak
+
+ insinto "/opt/${MY_PN}/resources"
+ doins resources/*.asar
+
+ insinto "/opt/${MY_PN}"
+ doins *.pak *.bin *.dat
+ exeinto "/opt/${MY_PN}"
+ doexe *.so "${MY_PN}"
+
+ dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+ make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+ einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild
new file mode 100644
index 000000000000..e767c09c1e07
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="${PN%-*}"
+
+inherit desktop
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+ amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+ x86? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2[X]
+ 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[X]
+ x11-libs/libX11
+ 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/mattermost-desktop/mattermost-desktop
+ opt/mattermost-desktop/libnode.so
+ opt/mattermost-desktop/libffmpeg.so
+ opt/mattermost-desktop/libGLESv2.so
+ opt/mattermost-desktop/libEGL.so
+ opt/mattermost-desktop/libvk_swiftshader.so
+"
+
+DOCS=(
+ NOTICE.txt
+)
+
+S="${WORKDIR}"
+
+src_install() {
+ if use amd64; then
+ cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+ elif use x86; then
+ cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+ fi
+
+ insinto "/opt/${MY_PN}/locales"
+ doins locales/*.pak
+
+ insinto "/opt/${MY_PN}/resources"
+ doins resources/*.asar
+
+ insinto "/opt/${MY_PN}"
+ doins *.pak *.bin *.dat
+ exeinto "/opt/${MY_PN}"
+ doexe *.so "${MY_PN}"
+
+ dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+ make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+ einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/metadata.xml b/net-im/mattermost-desktop-bin/metadata.xml
index 413869a3fa99..0d00bec64a33 100644
--- a/net-im/mattermost-desktop-bin/metadata.xml
+++ b/net-im/mattermost-desktop-bin/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" proxied="yes">
<email>ceamac.paragon@gmail.com</email>
diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml
index d217e5f63a4e..654e184b3ccc 100644
--- a/net-im/mcabber/metadata.xml
+++ b/net-im/mcabber/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">
<email>andrey_utkin@gentoo.org</email>
diff --git a/net-im/metadata.xml b/net-im/metadata.xml
index 150e1b5637dc..55f0a269d69c 100644
--- a/net-im/metadata.xml
+++ b/net-im/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The net-im category contains instant messaging software.
diff --git a/net-im/minbif/Manifest b/net-im/minbif/Manifest
deleted file mode 100644
index f22b7b17b0b8..000000000000
--- a/net-im/minbif/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST minbif-1.0.5.tar.gz 176039 BLAKE2B 195af3dbb45f0c2b6499fd440c4ffc637d7e4e723879282a4914538d562c2833f30ae562098ebc5c47ac694b37f558984e599cb3701d6b1af6256db32ad91152 SHA512 e84c6f38ad35a660f9c319b702ae5743cece167c8e116976a9ca0caf527ad23ea17ea8f518f9bd76536e87283362d2087201a5307128740fc7f05dccabacfbcd
diff --git a/net-im/minbif/files/minbif-1.0.5-gcc47.patch b/net-im/minbif/files/minbif-1.0.5-gcc47.patch
deleted file mode 100644
index 8566406a318f..000000000000
--- a/net-im/minbif/files/minbif-1.0.5-gcc47.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit fe71fd989a4501c77314b2906756f4e9a328ff31
-Author: Romain Bignon <romain@symlink.me>
-Date: Tue May 8 16:46:35 2012 +0200
-
- fixes for gcc 4.7
-
---- a/src/im/account.cpp
-+++ b/src/im/account.cpp
-@@ -18,6 +18,7 @@
-
- #include <cassert>
- #include <cstring>
-+#include <unistd.h>
- #ifdef HAVE_IMLIB
- #include <Imlib2.h>
- #endif /* HAVE_IMLIB */
---- a/src/im/request.cpp
-+++ b/src/im/request.cpp
-@@ -18,6 +18,7 @@
-
- #include <errno.h>
- #include <string.h>
-+#include <unistd.h>
-
- #include "request.h"
- #include "buddy.h"
---- a/src/irc/dcc.cpp
-+++ b/src/irc/dcc.cpp
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <netinet/in.h>
-+#include <unistd.h>
-
- #include "dcc.h"
- #include "nick.h"
---- a/src/irc/irc.cpp
-+++ b/src/irc/irc.cpp
-@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const
- Buddy* IRC::getNick(const im::Buddy& buddy) const
- {
- map<string, Nick*>::const_iterator it;
-- Buddy* nb;
-+ Buddy* nb = NULL;
- for(it = users.begin();
- it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy);
- ++it)
-@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const
- ConvNick* IRC::getNick(const im::Conversation& conv) const
- {
- map<string, Nick*>::const_iterator it;
-- ConvNick* n;
-+ ConvNick* n = NULL;
- for(it = users.begin();
- it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv);
- ++it)
---- a/src/server_poll/inetd.cpp
-+++ b/src/server_poll/inetd.cpp
-@@ -18,6 +18,7 @@
-
- #include <cassert>
- #include <glib.h>
-+#include <unistd.h>
-
- #include "inetd.h"
- #include "irc/irc.h"
---- a/src/sockwrap/sockwrap.cpp
-+++ b/src/sockwrap/sockwrap.cpp
-@@ -22,6 +22,7 @@
- # include "sockwrap_tls.h"
- #endif
- #include "core/util.h"
-+#include <unistd.h>
-
- namespace sock
- {
diff --git a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch b/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
deleted file mode 100644
index 599355eb502c..000000000000
--- a/net-im/minbif/files/minbif-1.0.5-glib-single-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: minbif-1.0.5/src/server_poll/daemon_fork.cpp
-===================================================================
---- minbif-1.0.5.orig/src/server_poll/daemon_fork.cpp
-+++ minbif-1.0.5/src/server_poll/daemon_fork.cpp
-@@ -20,7 +20,7 @@
- #include <cassert>
- #include <cstring>
- #include <cerrno>
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <arpa/inet.h>
-Index: minbif-1.0.5/src/server_poll/inetd.cpp
-===================================================================
---- minbif-1.0.5.orig/src/server_poll/inetd.cpp
-+++ minbif-1.0.5/src/server_poll/inetd.cpp
-@@ -17,7 +17,7 @@
- */
-
- #include <cassert>
--#include <glib/gmain.h>
-+#include <glib.h>
-
- #include "inetd.h"
- #include "irc/irc.h"
diff --git a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
deleted file mode 100644
index e9fa875d247c..000000000000
--- a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/im/account.cpp b/src/im/account.cpp
-index f155334..f040fcd 100644
---- a/src/im/account.cpp
-+++ b/src/im/account.cpp
-@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename)
- else
- {
- char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0);
-- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN;
-+ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN;
-
- close(temp_fd);
- /* Try to encode in a supported format. */
diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd
deleted file mode 100644
index 06cac415f61d..000000000000
--- a/net-im/minbif/files/minbif.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MINBIF_EXEC="/usr/bin/minbif"
-
-depend() {
- need logger net
-}
-
-start() {
- ebegin "Starting minbif"
- start-stop-daemon --start --startas ${MINBIF_EXEC} \
- -c minbif:minbif --exec ${MINBIF_EXEC} -- \
- /etc/minbif/minbif.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping minbif"
- start-stop-daemon --stop --exec ${MINBIF_EXEC}
- eend $?
-}
diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-im/minbif/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-im/minbif/minbif-1.0.5-r3.ebuild b/net-im/minbif/minbif-1.0.5-r3.ebuild
deleted file mode 100644
index d438c5b97a63..000000000000
--- a/net-im/minbif/minbif-1.0.5-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="IRC gateway to IM networks"
-HOMEPAGE="https://symlink.me/projects/minbif/wiki/"
-SRC_URI="https://symlink.me/attachments/download/148/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gnutls +imlib +libcaca pam xinetd"
-REQUIRED_USE="libcaca? ( imlib )"
-
-DEPEND="
- acct-group/minbif
- acct-user/minbif
- net-im/pidgin
- gnutls? ( net-libs/gnutls )
- imlib? ( media-libs/imlib2 )
- libcaca? (
- media-libs/imlib2
- media-libs/libcaca
- )
- pam? ( sys-libs/pam )
-"
-RDEPEND="
- ${DEPEND}
- virtual/logger
- xinetd? ( sys-apps/xinetd )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch"
- "${FILESDIR}/${PN}-1.0.5-gcc47.patch"
- "${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed "s/-Werror//g" -i CMakeLists.txt || die
-
- if use xinetd; then
- sed "s/type\s=\s[0-9]/type = 0/" -i minbif.conf || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCONF_PREFIX="${EPREFIX}"/etc/minbif
- -DDOC_PREFIX="${EPREFIX}"/usr/share/doc/"${PF}"
- -DENABLE_VIDEO=OFF
- -DENABLE_TLS=$(usex gnutls)
- -DENABLE_IMLIB=$(usex imlib)
- -DENABLE_CACA=$(usex libcaca)
- -DENABLE_PAM=$(usex pam)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- keepdir /var/lib/minbif
- fperms 700 /var/lib/minbif
- fowners minbif:minbif /var/lib/minbif
-
- doman man/minbif.8
-
- if use xinetd; then
- insinto /etc/xinetd.d
- newins doc/minbif.xinetd minbif
- fi
-
- newinitd "${FILESDIR}"/minbif.initd minbif
-
- insinto /usr/share/minbif
- doins -r scripts
-}
diff --git a/net-im/neochat/metadata.xml b/net-im/neochat/metadata.xml
index 2fdbf33d963d..d925f2439758 100644
--- a/net-im/neochat/metadata.xml
+++ b/net-im/neochat/metadata.xml
@@ -1,8 +1,11 @@
<?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="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/net-im/openmittsu/metadata.xml b/net-im/openmittsu/metadata.xml
index c665e48637be..10e4ea021b98 100644
--- a/net-im/openmittsu/metadata.xml
+++ b/net-im/openmittsu/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">
<email>ulm@gentoo.org</email>
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 4cba9a44dc50..e3f6cfe153b4 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,3 +1,4 @@
DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
-DIST pidgin-2.14.5.tar.bz2 8696780 BLAKE2B 4563b6aabdaba8af7dd7a1f8978418bcdcc347fc10731606e44de537d2a451c9cec17d17c44d88e0eefda110927c471788ae6128a7e006666603bdc6d842c9b1 SHA512 3aa00156e73643c7a23bc3a1ff26ecd7ee89c0d91571a23bf00e54aa87f25d2b604990d33263e8f74f6499d8e08646aa524e14063e8000e60d1b49d74c5cc784
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.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
deleted file mode 100644
index 370ac62a6e23..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 51471b1..81c57ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
- [compile finch against the ncurses includes in DIR])],
- [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
- if test "x$enable_consoleui" = "xyes"; then
-+ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
-+ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
- AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_consoleui=no])
- AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
- [enable_consoleui=no], [$GNT_LIBS])
-@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
- fi
- fi
- fi
-+ ])])
- fi
-
- if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index c7542a5eab79..4ae4682ad008 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/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">
<email>polynomial-c@gentoo.org</email>
diff --git a/net-im/pidgin/pidgin-2.14.6-r1.ebuild b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
index 6983523531df..685ae4aacb45 100644
--- a/net-im/pidgin/pidgin-2.14.6-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.6-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
@@ -161,7 +161,7 @@ pkg_setup() {
}
src_prepare() {
- default
+ xdg_src_prepare
eautoreconf
}
@@ -267,6 +267,7 @@ src_install() {
src_test() {
# make default build logs slightly more useful
+ local -x GST_PLUGIN_SYSTEM_PATH_1_0=
emake check VERBOSE=1
}
diff --git a/net-im/pidgin/pidgin-2.14.5-r1.ebuild b/net-im/pidgin/pidgin-2.14.7.ebuild
index b3ff977ba24c..5cd269016d6a 100644
--- a/net-im/pidgin/pidgin-2.14.5-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 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"
@@ -134,9 +134,7 @@ DYNAMIC_PRPLS="irc,jabber,simple"
# x11-plugins/pidgimpd
PATCHES=(
- "${FILESDIR}/${PN}-2.10.11-tinfo.patch"
"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
- "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
)
pkg_pretend() {
@@ -162,7 +160,7 @@ pkg_setup() {
}
src_prepare() {
- default
+ xdg_src_prepare
eautoreconf
}
@@ -268,6 +266,7 @@ src_install() {
src_test() {
# make default build logs slightly more useful
+ local -x GST_PLUGIN_SYSTEM_PATH_1_0=
emake check VERBOSE=1
}
diff --git a/net-im/pidgin/pidgin-2.14.8.ebuild b/net-im/pidgin/pidgin-2.14.8.ebuild
new file mode 100644
index 000000000000..5cd269016d6a
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.14.8.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="https://pidgin.im/"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.bz2
+ https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+LICENSE="GPL-2"
+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"
+
+# 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
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+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
+ $(python_gen_cond_dep '
+ 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
+ )
+ meanwhile? ( net-libs/meanwhile )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ idn? ( net-dns/libidn:= )
+"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+ gtk? (
+ x11-base/xorg-proto
+ ${NLS_DEPEND}
+ )
+ dbus? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+ dev-lang/perl
+ dev-perl/XML-Parser
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )
+"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+ dbus? ( ${PYTHON_REQUIRED_USE} )
+ networkmanager? ( dbus )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,simple"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+PATCHES=(
+ "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+)
+
+pkg_pretend() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only libpurple"
+ elog "will be built."
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls ; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python ; then
+ elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+ fi
+}
+
+pkg_setup() {
+ if use python || use dbus ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ xdg_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ 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"
+
+ local myconf=(
+ --disable-mono
+ --disable-static
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}"
+ --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+ --x-includes="${EPREFIX}"/usr/include/X11
+ $(use_enable ncurses consoleui)
+ $(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 perl)
+ $(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 zeroconf avahi)
+ $(use_enable idn)
+ )
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=(
+ --enable-nss=no
+ --enable-gnutls=yes
+ --with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
+ --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
+ )
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=(
+ --enable-gnutls=no
+ --enable-nss=yes
+ )
+ fi
+
+ if use dbus || { use ncurses && use python ; } ; then
+ myconf+=( --with-python3=${PYTHON} )
+ else
+ myconf+=( --without-python3 )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ # setting this here because gnome2.eclass is not EAPI-7 ready
+ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+ default
+
+ if use gtk ; then
+ # Fix tray paths for e16 (x11-wm/enlightenment) and other
+ # implementations that are not compliant with new hicolor theme yet, #323355
+ local d f pixmapdir
+ for d in 16 22 32 48 ; do
+ pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions"
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null || die
+ done
+ fi
+ use perl && perl_delete_localpod
+
+ use dbus && python_fix_shebang "${ED}"
+ if use python || use dbus ; then
+ python_optimize
+ fi
+
+ dodoc ${DOCS[@]} finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
+
+src_test() {
+ # make default build logs slightly more useful
+ local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+ emake check VERBOSE=1
+}
+
+pkg_preinst() {
+ gnome2_gconf_savelist
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_gconf_install
+ gnome2_schemas_update
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_gconf_uninstall
+ gnome2_schemas_update
+ xdg_pkg_postrm
+}
diff --git a/net-im/poezio/metadata.xml b/net-im/poezio/metadata.xml
index 836717da3813..eb783ed6ad95 100644
--- a/net-im/poezio/metadata.xml
+++ b/net-im/poezio/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">
<email>flow@gentoo.org</email>
diff --git a/net-im/poezio/poezio-0.13.1-r1.ebuild b/net-im/poezio/poezio-0.13.1-r1.ebuild
deleted file mode 100644
index a080438c959f..000000000000
--- a/net-im/poezio/poezio-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Console XMPP client that looks like most famous IRC clients"
-HOMEPAGE="https://poez.io/"
-LICENSE="ZLIB"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64"
-fi
-
-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}]
-"
-
-distutils_enable_tests pytest
-
-DOC_CONTENTS="
-Install these optional runtime dependencies for additional features.
-* dev-python/pyinotify for screen autoaway plugin support.
-"
-DISABLE_AUTOFORMATTING=true
-
-src_prepare() {
- default
- # Delete unmaintained plugin which requires an excessive external dep
- rm plugins/mpd_client.py || die
-}
-
-src_install() {
- distutils-r1_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/net-im/poezio/poezio-0.13.1-r2.ebuild b/net-im/poezio/poezio-0.13.1-r2.ebuild
index df3051da179c..a43f1e0504f7 100644
--- a/net-im/poezio/poezio-0.13.1-r2.ebuild
+++ b/net-im/poezio/poezio-0.13.1-r2.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
BDEPEND="dev-python/sphinx"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
RDEPEND="
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 3bc881c2e234..10964d81786e 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1 +1,2 @@
DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
+DIST profanity-0.11.0.tar.gz 887566 BLAKE2B 373b49670d00aa741e1957a8d3ca0282f6e7215c53c6c89088268d92fa6bd8f396e6c8e69f17aeb65f9183f620376613672c7f71c879ece31b97382df5d7a781 SHA512 14164921e151a9201728afc3835e08649036702d1fcdef6e37f83de6da4b9bd9c5e9ba54db69e3a9e16fb7e360369b4e92b6b771bc5e005e343a9a526738a268
diff --git a/net-im/profanity/metadata.xml b/net-im/profanity/metadata.xml
index bda58896c061..2be4233605ae 100644
--- a/net-im/profanity/metadata.xml
+++ b/net-im/profanity/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">
<email>andrey_utkin@gentoo.org</email>
diff --git a/net-im/profanity/profanity-0.11.0-r1.ebuild b/net-im/profanity/profanity-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..1ca09eb39937
--- /dev/null
+++ b/net-im/profanity/profanity-0.11.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A console based XMPP client inspired by Irssi"
+HOMEPAGE="https://profanity-im.github.io"
+SRC_URI="https://profanity-im.github.io/${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
+ dev-libs/expat
+ dev-libs/glib
+ dev-libs/libstrophe:=
+ dev-libs/openssl:0=
+ net-misc/curl
+ sys-apps/util-linux
+ sys-libs/ncurses:=[unicode(+)]
+ virtual/libcrypt:=
+ gpg? ( app-crypt/gpgme:= )
+ libnotify? ( x11-libs/libnotify )
+ omemo? (
+ net-libs/libsignal-protocol-c
+ dev-libs/libgcrypt
+ )
+ otr? ( net-libs/libotr )
+ 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)
+}
diff --git a/net-im/prosody-modules/Manifest b/net-im/prosody-modules/Manifest
index 157f4cacbad2..244bd0a91caf 100644
--- a/net-im/prosody-modules/Manifest
+++ b/net-im/prosody-modules/Manifest
@@ -1 +1 @@
-DIST prosody-modules-0_pre20210515.tar.xz 1196276 BLAKE2B 66e9dddeba1e139b16ecc1ea0b786a85cb9181e0bfa0123a9c9ce99f1aa64cc12ba92ffa6b83d63cbc0f45962a13ac8ec508030d99c5e58d645c708a1078dab3 SHA512 1cd48cfa66e72de843db2a593a524636aaa0f36cb5b848e19238d4c2951525882fb30a354e503d71e0fb4b6c8efe0aa09acc16285ac3357d4c8d353a2f48b120
+DIST prosody-modules-0_pre20210901.tar.xz 1205504 BLAKE2B 10959ffdecd107593777398ee1019f77bae3bb28a829b3f5a974c6715607904e79ce01020ac76585b35115a7cd97f400575c8ed20e9ca333bfdb3e83b6005554 SHA512 f27d7372c4e95d3a942c16ebcd00392d3faeaea525a8c18ff5da293a5be3493730200de008d249cb946fbe8c15039934b35278e30bda018c942c1d38faa3fd29
diff --git a/net-im/prosody-modules/metadata.xml b/net-im/prosody-modules/metadata.xml
index ff3eb65b8dfc..ef7d6f03aa22 100644
--- a/net-im/prosody-modules/metadata.xml
+++ b/net-im/prosody-modules/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/prosody-modules/prosody-modules-0_pre20210515.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20210901.ebuild
index ff13c951991f..ff13c951991f 100644
--- a/net-im/prosody-modules/prosody-modules-0_pre20210515.ebuild
+++ b/net-im/prosody-modules/prosody-modules-0_pre20210901.ebuild
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 0df7e66655ae..ca2de8c1fd52 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1 +1 @@
-DIST prosody-0.11.9.tar.gz 431647 BLAKE2B b6cf013a53c91675b50f601031b4843a826d011c4e06b06b27968413f4807a083811465b836531652fb47adc3bdb2ac82308a3c79953d80d6839ca23c669ab80 SHA512 fabbbbb1acb3de4ff01e3e8c6e9e4dc37cb161259f1649683a1f9d925ed9f1709e052bfc831cba3f1861a9cca599f2b725ee739bfcb57164d6f50ac07011b52a
+DIST prosody-0.11.10.tar.gz 438888 BLAKE2B 590f97f4eb8a333701eca516de3c3bcee9cf093267d2000af03b48d32396a1be21a0cf2f8ff542e7fbcb8419138bab5cf411f71b17666593559004a8a9674367 SHA512 419d8f8465f1807015f0a52d8f35ee89892b0869084dae38b60fc833d63c3d70892d8e59ae00039cd15e0e25f46d042954896f51f8c0520650a877f5296707cb
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index c67f0b41b88d..0cde39ba3d07 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/prosody/prosody-0.11.9.ebuild b/net-im/prosody/prosody-0.11.10.ebuild
index a89c56614eb0..a89c56614eb0 100644
--- a/net-im/prosody/prosody-0.11.9.ebuild
+++ b/net-im/prosody/prosody-0.11.10.ebuild
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 8dc1aaf84a2b..957def7ed28e 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/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" proxied="yes">
<email>rion4ik@gmail.com</email>
diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
index 79aac7809427..fc9e6ec39274 100644
--- a/net-im/psimedia/metadata.xml
+++ b/net-im/psimedia/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" proxied="yes">
<email>rion4ik@gmail.com</email>
diff --git a/net-im/purple-events/metadata.xml b/net-im/purple-events/metadata.xml
index 98db88e3ccce..6390d982e4e5 100644
--- a/net-im/purple-events/metadata.xml
+++ b/net-im/purple-events/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-needed-->
<upstream>
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 697f99071d07..51bdfe56b855 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -1,10 +1,18 @@
<?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-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>chiitoo@gentoo.org</email>
+ <name>Jimi Huotari</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="notification">Use snorenotify for desktop notifications</flag>
- <flag name="spellcheck">Enable spell cheching support</flag>
+ <flag name="spellcheck">Enable spell checking support</flag>
+ <flag name="X">Enable auto-away support</flag>
</use>
<upstream>
<remote-id type="github">qTox/qTox</remote-id>
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild
index 8e6526263d3a..f3d034bc3f34 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-9999.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake git-r3 xdg
+inherit cmake xdg
-DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
-HOMEPAGE="https://github.com/qTox/qTox"
-EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/qTox/qTox.git"
+else
+ SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol"
+HOMEPAGE="https://qtox.github.io/"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS=""
-IUSE="notification test X"
+IUSE="notification +spellcheck test X"
RESTRICT="!test? ( test )"
@@ -25,29 +31,33 @@ RDEPEND="
dev-libs/libsodium:=
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
- || (
- dev-qt/qtgui:5[gif,jpeg,png,X(-)]
- dev-qt/qtgui:5[gif,jpeg,png,xcb(-)]
- )
+ dev-qt/qtgui:5[gif,jpeg,png,X(-)]
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/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 )
+ media-video/ffmpeg:=[webp,v4l]
+ net-libs/tox:=[av]
+ net-libs/toxext
+ net-libs/tox_extension_messages
+ 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
@@ -60,11 +70,22 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DENABLE_STATUSNOTIFIER=$(usex notification)
- -DENABLE_GTK_SYSTRAY=$(usex notification)
-DPLATFORM_EXTENSIONS=$(usex X)
- -DUSE_FILTERAUDIO=OFF
+ -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/ricochet/metadata.xml b/net-im/ricochet/metadata.xml
index 4d62759742c9..3c27f902e41b 100644
--- a/net-im/ricochet/metadata.xml
+++ b/net-im/ricochet/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" proxied="yes">
<email>lucianposton@pm.me</email>
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 66c5388bfd4d..b782c46cc23e 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,2 +1 @@
-DIST rocketchat-3.2.3.x86_64.rpm 55375960 BLAKE2B e72e0f29662bc9667c782866c42d334239fbe39b20a7ca232aeafe5f16244248ee940f301b0a0f4d2101150746e48d0ff47bdf55d99371a06226937876dd9765 SHA512 ced1fce3b7f12ceda10a1879612065a0e65dc6ccc4cb3a3a282cae578267a03468ea85820a6a765af3d1d72dbde9a04a0d5199a150ce257dd4d44151e4d6ca06
-DIST rocketchat-3.3.0.x86_64.rpm 56322356 BLAKE2B 9d1caaceb16fa68fdfb11d41dae4a7d464e7bb9f92fa3f734f273447228faee53e958e0e87934e9cc5c4b1a133e18ebe610dcf429b780993a20e9a44251d7480 SHA512 e3bda69d0395823a40c56909ef4ae6faee1dcc733eee20ef3067cd7bf57066056505efa2a3817d2640ea7bee0cc0920cdf187dddd53320c224cbe2c3efc21088
+DIST rocketchat-3.5.7.x86_64.rpm 58632660 BLAKE2B 8003d269256fc5dc6b2d06bf17bf86de96ce9b8803f2dbe767051d286761516eb125226d5ca8d29979da60c58bc5560fcaa50ce2437a904f8ac1ea6f80eb609f SHA512 a42830f7c38ae5882a03e880a2ba5dd96735cfdc8635f8cf02441feaf2de360f2904bb44306bc9349f8fbda3dfb4bfcf6ad70474d2e62a4e574af02584c5ece4
diff --git a/net-im/rocketchat-desktop-bin/metadata.xml b/net-im/rocketchat-desktop-bin/metadata.xml
index 355f962599cc..49b40b0d68a8 100644
--- a/net-im/rocketchat-desktop-bin/metadata.xml
+++ b/net-im/rocketchat-desktop-bin/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>
<upstream>
<remote-id type="github">RocketChat/Rocket.Chat.Electron</remote-id>
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.3.0.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.3.0.ebuild
deleted file mode 100644
index 0c6ba72c3682..000000000000
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/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
- cp -a "${S}"/* "${ED}" || die
-}
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.5.7.ebuild
index 0c6ba72c3682..46fc3d26d958 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.3.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.5.7.ebuild
@@ -1,7 +1,7 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit rpm xdg
@@ -35,6 +35,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
+ x11-libs/libxkbcommon
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXtst
@@ -49,5 +50,5 @@ S="${WORKDIR}"
src_install() {
# remove files useless for Gentoo
rm -r usr/lib || die
- cp -a "${S}"/* "${ED}" || die
+ mv "${S}"/* "${ED}" || die
}
diff --git a/net-im/sendxmpp/metadata.xml b/net-im/sendxmpp/metadata.xml
index 560b8ad5f525..9bfda17c308c 100644
--- a/net-im/sendxmpp/metadata.xml
+++ b/net-im/sendxmpp/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-needed -->
<upstream>
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest
index 4681021f9406..bcc9ea47788c 100644
--- a/net-im/signal-cli-bin/Manifest
+++ b/net-im/signal-cli-bin/Manifest
@@ -1,9 +1,6 @@
-DIST signal-cli-bin-0.7.4.README.md 4403 BLAKE2B 77b75170e18b302d8808a73297221d524b69ccd4fb66456086c7a9288ec2e023ed78de5baadd154c9ff508ba91c58abcdfa327931f559243d1b6f3efe99426c3 SHA512 7530e4a36ddc9d77e0cb7c8cec23aaaf3b7b7d1488ef86f675d7fb8b3debae1314d49ca23e1a68ff78ecfc58d9e00b28ff09f378fc7e9bc4bfc9e0ef883aa13f
-DIST signal-cli-bin-0.7.4.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
-DIST signal-cli-bin-0.7.4.tar.gz 16408829 BLAKE2B 169e9e7b5eafb8308c248d976326fbd11f3044f2a73d32af8c62d5f6fd88929ac90ab331a188cf8376818102e59b5d0a11457494f3fca07ba830b5288aaa41cd SHA512 b7e2f1da17c2ebcb1174739cf9c287dd335fa70c1c9417137a07bcaf16cdd121cccfdd9ba345130bccdfe877e16d6dba9bf3ef1cb12d301fd3f674617233fcd5
-DIST signal-cli-bin-0.8.0.README.md 5216 BLAKE2B 18c481074db03bbe3895389f81bc76c2dba63cf728d7595567c2b19a35b5254009b83c1fd3e05be23d4d63990603f01a8270d59afd8397b8135d85f9102d2a6b SHA512 bd8bf9d329c6ec6b844b0a87e0b728352a615beca0e1c64161057911a76dfd942372a7e9b92e193b374e3773eae20331d19e33190547fd6072f79ae4afee9370
-DIST signal-cli-bin-0.8.0.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
-DIST signal-cli-bin-0.8.0.tar.gz 16852501 BLAKE2B 2792935fa20bf6d31638157febfd771a254c2e962342236891cc0e8bc60a872af0f400852bd4b2cfc449a81e81dbdd34c19437a78df86d07a3648b748086fa85 SHA512 60029ff8b0013667743eb14340cb1367b527ebf2ba74a54fc2d1f70a21721fdb826c9af63a80d26f0dc951670172df7346a9bbea61a9e865e5625df10187c965
DIST signal-cli-bin-0.8.1.README.md 5216 BLAKE2B 18c481074db03bbe3895389f81bc76c2dba63cf728d7595567c2b19a35b5254009b83c1fd3e05be23d4d63990603f01a8270d59afd8397b8135d85f9102d2a6b SHA512 bd8bf9d329c6ec6b844b0a87e0b728352a615beca0e1c64161057911a76dfd942372a7e9b92e193b374e3773eae20331d19e33190547fd6072f79ae4afee9370
DIST signal-cli-bin-0.8.1.signal-cli.1.adoc 12817 BLAKE2B aad7e2870d4a65de0218e2af3b806fa2cf39a519a216b002d3710ac967f5019a841fb41af7bc5dd1498d131cd18b09ec0142de4702c8fc530b40a7475c5dfc85 SHA512 4891b3579cc27cb1f478cdd3ad29b59d13dddba608dbac844b3eec7e343f8022741956f78bbb9ef6f27f95d09457ef98976a9799339ce1f39976471260e843e2
DIST signal-cli-bin-0.8.1.tar.gz 16870784 BLAKE2B e08f740fef6da4e7b1e4751e5cc83130a260f637f6f8a56e54dc8f91f417df9f037b7ab2e5e416e89db2e211137091132631755a3af05658eb1f30e3ef20f4f7 SHA512 3507c14730ab4a77ebb8f403d0ab13f3e42e8e91aa94c6dfc066fe494f0acb2a92aed562c55a13a5b88c69addca96c5f2aacbe731e913bf39d33f2eae0e6d9f4
+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.7.4-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch
deleted file mode 100644
index 4aa458fd7444..000000000000
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.7.4-use-working-java-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur a/bin/signal-cli b/bin/signal-cli
---- a/bin/signal-cli 2020-10-14 18:39:40.000000000 +0200
-+++ b/bin/signal-cli 2020-11-04 09:20:25.397469784 +0100
-@@ -84,13 +84,20 @@
-
-
- # 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 11, but Java 11 is currently not part of the gentoo eselect config system
-+# so we must search for matching java binaries
-+JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11"
-+for I in $JAVA_DIRS ; do
-+ J_TRY="$I/bin/java"
-+ if [ -x "$J_TRY" ] ; then
-+ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11."
-+ 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/files/signal-cli-bin-0.8.1-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
index 4a550e410bfb..b39745214944 100644
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.1-use-working-java-version.patch
@@ -1,7 +1,7 @@
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
---- a/bin/signal-cli 2021-03-02 20:56:06.000000000 +0100
-+++ b/bin/signal-cli 2021-05-03 12:05:45.406811750 +0200
-@@ -84,13 +84,20 @@
+--- a/bin/signal-cli
++++ b/bin/signal-cli
+@@ -84,13 +84,19 @@
# Determine the Java command to use to start the JVM.
@@ -14,8 +14,7 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
- fi
+# This package needs Java 11, but Java 11 is currently not part of the gentoo eselect config system
+# so we must search for matching java binaries
-+JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11"
-+for I in $JAVA_DIRS ; do
++for I in /usr/lib*/openjdk-11 /opt/openjdk-bin-11 /opt/openjdk-jre-bin-11; do
+ J_TRY="$I/bin/java"
+ if [ -x "$J_TRY" ] ; then
+ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11."
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
index 5d9bd2909968..840c249b976f 100644
--- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.0-use-working-java-version.patch
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch
@@ -1,11 +1,10 @@
Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-diff -Naur a/bin/signal-cli b/bin/signal-cli
--- a/bin/signal-cli
+++ b/bin/signal-cli
-@@ -84,13 +84,20 @@
-
-
+@@ -84,13 +84,19 @@
+
+
# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -16,8 +15,7 @@ diff -Naur a/bin/signal-cli b/bin/signal-cli
- fi
+# This package needs Java 11, but Java 11 is currently not part of the gentoo eselect config system
+# so we must search for matching java binaries
-+JAVA_DIRS="$JAVA_HOME /opt/openjdk-jre-bin-11 /opt/openjdk-bin-11"
-+for I in $JAVA_DIRS ; do
++for I in /usr/lib*/openjdk-11 /opt/openjdk-bin-11 /opt/openjdk-jre-bin-11; do
+ J_TRY="$I/bin/java"
+ if [ -x "$J_TRY" ] ; then
+ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11."
@@ -30,4 +28,4 @@ diff -Naur a/bin/signal-cli b/bin/signal-cli
+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/metadata.xml b/net-im/signal-cli-bin/metadata.xml
index 807eeb2b38c2..f16c98dc3065 100644
--- a/net-im/signal-cli-bin/metadata.xml
+++ b/net-im/signal-cli-bin/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" proxied="yes">
<email>martin.dummer@gmx.net</email>
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild
deleted file mode 100644
index 39268d6e891f..000000000000
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}.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"
-
-# signal-cli-bin depends on Java 11
-#
-# virtual/jre:11 exists but it's masked with this message:
-# Java 11 is not yet fully supported on Gentoo. Packages cannot depend
-# on it so these virtuals are not yet required. If you wish to use
-# Java 11 then install openjdk-(jdk|jre)-bin directly.
-
-DEPEND="
- || ( dev-java/openjdk-jre-bin:11 dev-java/openjdk:11 dev-java/openjdk-bin:11 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- app-text/asciidoc
-"
-
-PATCHES=(
- "${FILESDIR}/signal-cli-bin-${PV}-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-cli-bin/signal-cli-bin-0.7.4.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
index e49d162dba04..e49d162dba04 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.7.4.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.1-r1.ebuild
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild
index 39268d6e891f..e49d162dba04 100644
--- a/net-im/signal-cli-bin/signal-cli-bin-0.8.1.ebuild
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/signal-cli-bin-${PV}-use-working-java-version.patch"
+ "${FILESDIR}/${P}-use-working-java-version.patch"
)
src_unpack() {
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 72b1abb6465b..3afc43c19031 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_5.8.0_amd64.deb 111604106 BLAKE2B 33a6e3a6cc57e193f4a5d85fee99f10a20a3eeacf39d8fc82bd23a7b62f43d17a605e1111b84ad1ded7292ca04f4cd1dcb367b5b44d69edc91fe32084a3ab7b1 SHA512 a85242647370913de2e623798f0851ff9c50c3dd67e7990637450537120ad75d8473424ef7c41efc08df549384392844df9e6851a19600bd3a436309db5da3b7
+DIST signal-desktop_5.20.0_amd64.deb 114463244 BLAKE2B f0414f17e5486493bcc40c37f7fc88348cbc9b09f7cd849b426ababe48840bc772b2ad0231331b866a56de72072250f2aca3c12746e54ae6f7d401083e61d094 SHA512 64b81c1b96cb3e4d5954ae930a034376c66b2d5743ab8cd21ba4b330e275bd9183d15169119c66ef1406a503495170284a627e503a9014039d0c4c3ed2d7d92b
diff --git a/net-im/signal-desktop-bin/metadata.xml b/net-im/signal-desktop-bin/metadata.xml
index 4b0c2c48464b..32de5fb23877 100644
--- a/net-im/signal-desktop-bin/metadata.xml
+++ b/net-im/signal-desktop-bin/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" proxied="yes">
<email>gentoo.2019@r123.de</email>
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.20.0.ebuild
index 4af36932f98e..e6ca382563fa 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-5.8.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-5.20.0.ebuild
@@ -11,40 +11,39 @@ DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your
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
- app-accessibility/at-spi2-core
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
dev-libs/atk
dev-libs/expat
- dev-libs/glib
+ 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/gdk-pixbuf
x11-libs/gtk+:3[X]
+ x11-libs/libdrm
x11-libs/libX11
x11-libs/libxcb
x11-libs/libxkbcommon
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/libXScrnSaver
- x11-libs/libXtst
+ x11-libs/libxshmfence
x11-libs/pango
sound? (
|| (
@@ -54,44 +53,17 @@ RDEPEND="
)
"
-QA_PREBUILT="opt/Signal/signal-desktop
+QA_PREBUILT="
opt/Signal/chrome-sandbox
- opt/Signal/crashpad_handler
opt/Signal/libEGL.so
- opt/Signal/libffmpeg.so
opt/Signal/libGLESv2.so
- opt/Signal/libnode.so
- opt/Signal/libvulkan.so.1
- opt/Signal/libVkICD_mock_icd.so
+ opt/Signal/libffmpeg.so
opt/Signal/libvk_swiftshader.so
- opt/Signal/libvulkan.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
- opt/Signal/resources/app.asar.unpacked/node_modules/@journeyapps/sqlcipher/lib/binding/napi-v6-linux-x64/node_sqlite3.node
- opt/Signal/resources/app.asar.unpacked/node_modules/@signalapp/signal-client/prebuilds/linux-x64/node.napi.node
- opt/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node
- opt/Signal/resources/app.asar.unpacked/node_modules/curve25519-n/build/Release/curve.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/build/Release/ffi_bindings.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/prebuilds/linux-x64/node.napi.uv1.node
- opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux.node
- opt/Signal/resources/app.asar.unpacked/node_modules/libsignal-client/build/libsignal_client_linux_x64.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ref-array-napi/node_modules/ref-napi/build/Release/binding.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/build/Release/binding.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/electron.napi.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ref-napi/prebuilds/linux-x64/node.napi.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
- opt/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node
- opt/Signal/resources/app.asar.unpacked/node_modules/sharp/build/Release/sharp.node
- opt/Signal/resources/app.asar.unpacked/node_modules/sharp/vendor/8.10.6/lib/libvips-cpp.so.42
- opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup.so
- opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/libzkgroup-x64.so
- opt/Signal/resources/app.asar.unpacked/node_modules/zkgroup/node_modules/ref-napi/build/Release/binding.node"
-
-RESTRICT="splitdebug"
-
-S="${WORKDIR}"
+ opt/Signal/swiftshader/libGLESv2.so"
src_prepare() {
default
diff --git a/net-im/skype-dbus-mock/metadata.xml b/net-im/skype-dbus-mock/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/net-im/skype-dbus-mock/metadata.xml
+++ b/net-im/skype-dbus-mock/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-needed -->
</pkgmetadata>
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index fbe088f8e3f5..c471f81ee6e2 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,4 +1,5 @@
-DIST skypeforlinux_8.72.0.94-1.x86_64.rpm 118230043 BLAKE2B 9d7d8609c117947fbab4e2ac68a9bbe909f94f2ae82bc910cad66412aaced2ba13f35ce785a4f0d95690125c42789cbc4bbec6831bc0038add7fe7a98469f20b SHA512 349550d69efce07e3c9fa92ea659fc0d4b87e4e110c0bdfac9ecd365685b4d5623362b315cb3eaab7eb91078dde7e1c286165ce487e8b93585e59272e8cca3e3
DIST skypeforlinux_8.73.0.129-1.x86_64.rpm 123370656 BLAKE2B 831188ea01a8ae27b6c5b557f7e752740a3f32928bd113bd6d8fffd31badfbff4a8f088e8e0b8fdc1b1b133ff5e6b692db3b83df4669da5d92725847a3555280 SHA512 153afbf9e7b3ad8d3ca9002835d54038e8450868df2506a61cd278ddfe3329241a913d0caef9ad0179c3f8a6a2d8f7138e4fff74c7ef7b12ddbdbe60f78e58a2
DIST skypeforlinux_8.73.0.92-1.x86_64.rpm 119323419 BLAKE2B e201be43c6f331555d3759e9484d13c1d0613dd9e60ce67c3dafec27fa9d183ddc89e1c23feb1722ace2fd492185f8402be6abec80c748e6ad1f666878a72025 SHA512 dc6b72dc43443ad7747a30adef7b08afb50b4cc40a61cff2eb8989c9f68ae817c221d4ce2812d5d54cb9a4ac5f2accfe350efdfab622096d2d0805953fbddd13
DIST skypeforlinux_8.74.0.152-1.x86_64.rpm 123390893 BLAKE2B 746f1ac2f777ff79a47444052fdad86d2a67f7278eb809d57fedc681ca5648320d16b32e100b50b36bcaea853dff266eb0b47bdb9c8ba48582c63a09b3eeabda SHA512 f1c40c58305cecec899f9be1a477103ff9dc7e0d02ea68a9ebc15b4e80292d5a3925fbcf6451cae0c2b854b3b3f74abe101715a7f3afdc2ea954e18759cab37d
+DIST skypeforlinux_8.75.0.140-1.x86_64.rpm 123300996 BLAKE2B a1b0d4696489be33721fb38a832756edc0a437b93c269e512aba6ccd882e66fc9c84ba7d7a741e2761a097d7697985e32b0a65766c556cf17045a26fec6fc010 SHA512 21eb3cea11878e41f0694951dbf6447d225983c026ab7572ed8a9a5f31c38231c7b7f3ca7363535f27ef958c58db500c6d61ddfb95056145500500a9f0b30aed
+DIST skypeforlinux_8.77.0.90-1.x86_64.rpm 123643165 BLAKE2B 12c578f99f482012f54d5f9faa2d017358376902aa6879fd35ce6eba1b16e3458d4831450574158c69436b9c6103a8dd00233451b56415542e2b6e81eb9346b8 SHA512 ee1fdae1ad10f1fba91886bea52eef261151463e184746af288150bebb69d4bf0dd87d0ac4030d8d11f86054f7b2cb663b8647ce795b1bf924f23c2b7559574b
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
index ca0f90d43ac2..49817ac247ca 100644
--- a/net-im/skypeforlinux/metadata.xml
+++ b/net-im/skypeforlinux/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">
<email>soap@gentoo.org</email>
diff --git a/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild b/net-im/skypeforlinux/skypeforlinux-8.75.0.140.ebuild
index a44feb7c8927..a44feb7c8927 100644
--- a/net-im/skypeforlinux/skypeforlinux-8.72.0.94.ebuild
+++ b/net-im/skypeforlinux/skypeforlinux-8.75.0.140.ebuild
diff --git a/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild b/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild
new file mode 100644
index 000000000000..a44feb7c8927
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.77.0.90.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+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
+
+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]
+ 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 bf33169a8377..b381e2b2386f 100644
--- a/net-im/slack/Manifest
+++ b/net-im/slack/Manifest
@@ -1,3 +1,2 @@
-DIST slack-desktop-4.12.2-amd64.deb 57734610 BLAKE2B 249565bcb3f5fd9467d2b48e683978f406be6e3fd77f56c8e6ee328a3745800e53504f9bd618ea1764ffe429256ca5610b53996f82442e399d47f46ee5991b78 SHA512 7c0ef6e007f67c9a95c43e6544536af35d9bb55008524dade5b707aa4473db8e0837547bb91f8398728fcdc9e4ec732655cd390b49f1b5f820dc3f0b73ef9f71
-DIST slack-desktop-4.13.0-amd64.deb 57716072 BLAKE2B b8f1a793239b1e101bb6eb738a8a75883bf67468886f954226552074b769355b5444bbe9273eed48575b5f245fb47bdc78e264e7329ef052305afbec88f496f4 SHA512 d324637cb96a73f6d93fb36cfee52625d9c3571115ca6a8f0e7891417dd5fa88172dcc001e1a4fc9396392fe4885c5b14d9618d82c6a97b7c688ae14f5cbe8d9
-DIST slack-desktop-4.14.0-amd64.deb 59988434 BLAKE2B 38bc579bb493c9e2c82713d8578167c268c2c44a028f6ebeb7c95a98832f265393df988f01ea5149fd3fd7bbdd24129fcb28b68cd70d0c3444cdb566e7991947 SHA512 babfcd416b3551a1a6390899fdd89ef20cd3d4731f32b3947b99ab02a566a92a5092f8e78a09f43a1363a9de8699be40d263c47d3a6b123a6cc5e7bbcac16352
+DIST slack-desktop-4.18.0-amd64.deb 61001506 BLAKE2B 45e37972be8946102f77c60acbe781215c12a004b9d799a695c89776350f673e54427d9db07c1dc17b7c10d2706afe39616c19e19c149cb0a357b3cf8b9df7b5 SHA512 e826116d45aafb7885a8af0682f3dc69df66799929878f18232d6cf4b26165a23b0f12cf9ab43d08432629c9c6a15b31f002c8297e311c9f085af699404d901f
+DIST slack-desktop-4.19.2-amd64.deb 62407682 BLAKE2B 2ee89d96b71898878d5c82e4095a6e46b3b5d5acdc815174c1d06c8df4e95f7279674e799e3564aa863cf2feba8f88d57c5529435a3ae3dde9b4556ca539ff52 SHA512 414e0738ebee8f328447a4926cfd788d4123059c37c33b927b70bbb136c4aaefb01f886dbcc21b25b2c0d76c12547af4677ef099fd77d54f557ec46b1422f35c
diff --git a/net-im/slack/metadata.xml b/net-im/slack/metadata.xml
index 1911198d26a0..8361ed63d9fa 100644
--- a/net-im/slack/metadata.xml
+++ b/net-im/slack/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" proxied="yes">
<email>spiderx@spiderx.dp.ua</email>
diff --git a/net-im/slack/slack-4.13.0.ebuild b/net-im/slack/slack-4.13.0.ebuild
deleted file mode 100644
index ddd396fdeba5..000000000000
--- a/net-im/slack/slack-4.13.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/linux_releases/${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/libEGL.so
- /opt/slack/libffmpeg.so
- /opt/slack/libGLESv2.so
- /opt/slack/libvk_swiftshader.so
- /opt/slack/libvulkan.so
- /opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/*/bin/linux-x64-85/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/bin/linux-x64-85/*.node
- /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/slack/slack-4.12.2.ebuild b/net-im/slack/slack-4.18.0.ebuild
index 2a34f4ae27fa..4e9ba7d637c3 100644
--- a/net-im/slack/slack-4.12.2.ebuild
+++ b/net-im/slack/slack-4.18.0.ebuild
@@ -49,9 +49,8 @@ QA_PREBUILT="/opt/slack/chrome-sandbox
/opt/slack/libffmpeg.so
/opt/slack/libGLESv2.so
/opt/slack/libvk_swiftshader.so
- /opt/slack/libvulkan.so
- /opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
+ /opt/slack/libvulkan.so*
+ /opt/slack/resources/app.asar.unpacked/node_modules/*
/opt/slack/slack
/opt/slack/swiftshader/libEGL.so
/opt/slack/swiftshader/libGLESv2.so"
diff --git a/net-im/slack/slack-4.14.0.ebuild b/net-im/slack/slack-4.19.2.ebuild
index 8c346d7f7dd5..4e9ba7d637c3 100644
--- a/net-im/slack/slack-4.14.0.ebuild
+++ b/net-im/slack/slack-4.19.2.ebuild
@@ -50,10 +50,7 @@ QA_PREBUILT="/opt/slack/chrome-sandbox
/opt/slack/libGLESv2.so
/opt/slack/libvk_swiftshader.so
/opt/slack/libvulkan.so*
- /opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/*/bin/linux-x64-87/*.node
- /opt/slack/resources/app.asar.unpacked/node_modules/*/bin/linux-x64-87/*.node
+ /opt/slack/resources/app.asar.unpacked/node_modules/*
/opt/slack/slack
/opt/slack/swiftshader/libEGL.so
/opt/slack/swiftshader/libGLESv2.so"
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index bdab4cc72da9..811f573d638f 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1 +1,2 @@
DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7
+DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B 3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45 SHA512 53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321
diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml
index 4a71c17c49c2..233e8e3037c3 100644
--- a/net-im/spectrum2/metadata.xml
+++ b/net-im/spectrum2/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
index ea3909e6addc..e270aa2de67e 100644
--- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -108,3 +108,7 @@ src_install() {
einstalldocs
}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+}
diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild b/net-im/spectrum2/spectrum2-2.1.0.ebuild
new file mode 100644
index 000000000000..2f4fdacf2aed
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd tmpfiles
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="
+ || ( mysql postgres sqlite )
+ test? ( irc )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/spectrum
+ acct-user/spectrum
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/libev:=
+ dev-libs/log4cxx
+ dev-libs/jsoncpp:=
+ dev-libs/openssl:0=
+ dev-libs/popt
+ dev-libs/protobuf:=
+ net-dns/libidn:0=
+ >=net-im/swift-4.0.2-r2:=
+ net-misc/curl
+ sys-libs/zlib:=
+ frotz? ( !games-engines/frotz )
+ irc? ( net-im/libcommuni )
+ mysql? (
+ || (
+ dev-db/mariadb-connector-c
+ dev-db/mysql-connector-c
+ )
+ )
+ postgres? ( dev-libs/libpqxx:= )
+ purple? (
+ dev-libs/glib
+ net-im/pidgin:=
+ )
+ sms? ( app-mobilephone/smstools )
+ sqlite? ( dev-db/sqlite:3 )
+ twitter? ( net-misc/curl )
+ whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ # Respect users LDFLAGS
+ sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS="$(usex doc)"
+ -DENABLE_FROTZ="$(usex frotz)"
+ -DENABLE_IRC="$(usex irc)"
+ -DENABLE_MYSQL="$(usex mysql)"
+ -DENABLE_PQXX="$(usex postgres)"
+ -DENABLE_PURPLE="$(usex purple)"
+ $(usex irc '-DENABLE_QT4=OFF' '')
+ -DENABLE_SMSTOOLS3="$(usex sms)"
+ -DENABLE_SQLITE3="$(usex sqlite)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_TWITTER="$(usex twitter)"
+ -DENABLE_XMPP="$(usex xmpp)"
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}/tests/libtransport" || die
+ ./libtransport_test || die
+}
+
+src_install() {
+ cmake_src_install
+
+ diropts -o spectrum -g spectrum
+ keepdir /var/log/spectrum2 /var/lib/spectrum2
+ diropts
+
+ newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+ systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+ newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process spectrum2.conf
+}
diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
index 0047368b4bc6..0b39e59c61c1 100644
--- a/net-im/swift/metadata.xml
+++ b/net-im/swift/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest
index 09ea43658066..fd916d991d3e 100644
--- a/net-im/teams/Manifest
+++ b/net-im/teams/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml
index fa147c289cb9..ce53992ec4dd 100644
--- a/net-im/teams/metadata.xml
+++ b/net-im/teams/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">
<email>sultan@gentoo.org</email>
diff --git a/net-im/teams/teams-1.4.00.26453.ebuild b/net-im/teams/teams-1.4.00.26453.ebuild
new file mode 100644
index 000000000000..1c5e90e606b9
--- /dev/null
+++ b/net-im/teams/teams-1.4.00.26453.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 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
+ 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 1bec7129250e..ff10789fec96 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,4 +1,4 @@
-DIST tdesktop-2.8.1.tar.gz 15334528 BLAKE2B 915823eef057634404dd2bf1e75afdeb5c8768d7c7c7435216f31eec058b1cb8e5f96a47b1faeeecdfa46b4d0acb9dd1839978c3120ef8d41144608d89e45710 SHA512 2da82e6f6c33b5f404d20687e849aff17ce5de24c741adf2276e252643273f558a822c449d1acfd7deeb64644da94d472ddb55eb1881464390efa5d95219e489
-DIST tdesktop-2.8.9.tar.gz 15383963 BLAKE2B 2b156a5b4557c4aa5f358dbc6105cca2ff9d838160e71d6476332c2d4d9b78ea13b659cd95e7620e854d3116e44c537d2080dee424f6a942a0d9c0aa97c73e0d SHA512 537177e47d37772ae623ea4cca68df1e068362edd56a9af86fa02cabc44693403afe020460af709454148333711a34f34169dd239a9ef56e9996b5b0b44ef9c5
-DIST tsetup.2.8.1.tar.xz 37205872 BLAKE2B 915041cf403feca63b796747c3a072be555b729401a4290ad3773794a0d6df22eddbfea930fb2b17d8aa5aab337e6d8b45e28e710ffe34b80a7e033ae10e83be SHA512 e84cbec26420a633c93adcebe514b530bcb7fe425926795521d06f8f60377107f4174b57713fe248b9bfa7642ef1ff7709a825e96cf0b8d76e0e7e2ec7454aa2
-DIST tsetup.2.8.9.tar.xz 38714912 BLAKE2B fa1049d2c921dd8e7bfcf4777c5017ec1deb3508d24c79250dae774194c7e4e26bcc9313378e6c58255012baef7302545cd12a70ab64d908d68ef1475af1677a SHA512 b8c6ac6be16b4bc143c17c711ee46c73c986712f0fd89e3d4467f108c3b9e675f83a479569cf5cfc06c81c581080b75c2610fecf54644e600985d9b650d2f55a
+DIST tdesktop-3.1.1.tar.gz 16116770 BLAKE2B 7352164a9800cb12dbf4f473cf604648f750e590038940c0a13f40a240cf9c15a7c6d616512a401f076611b6f8992be8a24e4f2659abb2b0238b2ba13c74c33b SHA512 39ccc0f54cd3ca304cf4afcf026f6721c6f7f06135a4fe0b4a4e150808236f7183a670405f76b65e90704a4ef0fe3e75398c227777756f7eacf4cb0c608b6ee2
+DIST tdesktop-3.1.8.tar.gz 16141828 BLAKE2B add5fa113baee0ba945c5f6355c4c6faa95ea0832d4b4866350b5eb12cd0e109e3d0d07c57740f9f42808c99760ef060a7e0f8a47ad3b8b0cfcd51f661ded2d3 SHA512 90d3cba93af7752815624f0cf7b004393e286f934d059f11ce7f83380e4595482c1d8f21b06d07ff260232442adb6e50284bd58ecbe70b20eec6b2ae6d4f961c
+DIST tsetup.3.1.1.tar.xz 37505484 BLAKE2B ca9d33055d57f741b3b432072315e87f0910ec584f2d7a92e71080b094e5e2b34edddce688345c83da510607957fa60d27ae116a36acbf4914942b61f420bb7a SHA512 3fe99bd0131845261b42028bfb4695bf21f8ca7b0a30c978c1c1093e0fc33dd210d4b97777c1ab356932e4ff078acd3d570f0e2c641b33bc09c8ec802d273be3
+DIST tsetup.3.1.8.tar.xz 38670944 BLAKE2B 33479660ef3e73de9612e5dbc3d95fa0b0d9bff9b8cd43ebae62e5969f012b6d288ee8b8709bd6698672ed983125c6c0835482df15ae464ab190f1202a5a1f1e SHA512 f690d548cf05792d87c981141f9507e49ec9f4ec2d0653129f7f6cbab726c1ab333714ccbb4de4e227e452b0a08cc4acddd85b1000df724e8276f53a711d1781
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
deleted file mode 100644
index 954b3bdeaea5..000000000000
--- a/net-im/telegram-desktop-bin/files/telegram-desktop-bin
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# this wrapper disables the auto-updater of telegram-desktop
-# This program is licensed under the same license as telegram-desktop
-
-# telegram-desktop fails to set RestartCommand with the session manager
-# exclude it from session management to prevent restarts without the argument
-unset SESSION_MANAGER
-
-exec /usr/lib/telegram-desktop-bin/Telegram -externalupdater $@
diff --git a/net-im/telegram-desktop-bin/metadata.xml b/net-im/telegram-desktop-bin/metadata.xml
index 7f7ec804e3eb..c54fafcb7a57 100644
--- a/net-im/telegram-desktop-bin/metadata.xml
+++ b/net-im/telegram-desktop-bin/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" proxied="yes">
<email>henning@hennsch.de</email>
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild
index 5d9bb593c191..015193a01c6f 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.9.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.1-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop optfeature xdg
@@ -16,21 +16,13 @@ LICENSE="GPL-3-with-openssl-exception"
SLOT="0"
KEYWORDS="-* ~amd64"
-QA_PREBUILT="usr/lib/${PN}/Telegram"
+QA_PREBUILT="usr/bin/telegram-desktop"
RDEPEND="
dev-libs/glib:2
- dev-libs/gobject-introspection
>=media-libs/fontconfig-2.13
media-libs/freetype:2
- media-libs/libglvnd[X]
- >=sys-apps/dbus-1.4.2[X]
- sys-libs/zlib
virtual/opengl
- x11-libs/libSM
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
x11-libs/libX11
>=x11-libs/libxcb-1.10[xkb]
"
@@ -38,9 +30,10 @@ RDEPEND="
S="${WORKDIR}/Telegram"
src_install() {
- exeinto /usr/lib/${PN}
- doexe "Telegram"
- newbin "${FILESDIR}"/${PN} "telegram-desktop"
+ newbin Telegram telegram-desktop
+
+ insinto /etc/tdesktop
+ newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
local icon_size
for icon_size in 16 32 48 64 128 256 512; do
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.8.ebuild
index 6821536278c0..015193a01c6f 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.8.1.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-3.1.8.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit desktop optfeature xdg
@@ -16,20 +16,13 @@ LICENSE="GPL-3-with-openssl-exception"
SLOT="0"
KEYWORDS="-* ~amd64"
-QA_PREBUILT="usr/lib/${PN}/Telegram"
+QA_PREBUILT="usr/bin/telegram-desktop"
RDEPEND="
dev-libs/glib:2
- dev-libs/gobject-introspection
>=media-libs/fontconfig-2.13
media-libs/freetype:2
- media-libs/libglvnd[X]
- >=sys-apps/dbus-1.4.2[X]
- sys-libs/zlib
- x11-libs/libSM
- x11-libs/libdrm
- x11-libs/libICE
- x11-libs/libSM
+ virtual/opengl
x11-libs/libX11
>=x11-libs/libxcb-1.10[xkb]
"
@@ -37,9 +30,10 @@ RDEPEND="
S="${WORKDIR}/Telegram"
src_install() {
- exeinto /usr/lib/${PN}
- doexe "Telegram"
- newbin "${FILESDIR}"/${PN} "telegram-desktop"
+ newbin Telegram telegram-desktop
+
+ insinto /etc/tdesktop
+ newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop"
local icon_size
for icon_size in 16 32 48 64 128 256 512; do
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 8aaae69ec846..cee361d221ee 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,3 +1,3 @@
-DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
-DIST tdesktop-2.8.1-full.tar.gz 37129127 BLAKE2B 06f2a3050f0e0f321c766c54e19faf3ea172c41088e2ffdbb5928a41ba01de1fc845a84addded17d113316857c68f265642a8ab32feb79a87beef548c739b56c SHA512 df35cc00dc47a8c65b32b62c139cc3a49333f573aa88fb70cc65197524f9b9b4756c58752866c843704ea4df5d6224eb4cba5b32953dd9a4d721b0ee0e1efc69
-DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860
+DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4
+DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
+DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
deleted file mode 100644
index 491a8cd3e1dc..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -12,6 +12,7 @@ extern "C" {
- #undef signals
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
-+#include <gdk/gdkx.h>
- #include <webkit2/webkit2.h>
- #include <X11/Xlib.h>
- #define signals public
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch
deleted file mode 100644
index e54aca2ffa05..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-disable-webkit-separately.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/CMakeLists.txt
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/CMakeLists.txt
-@@ -116,7 +116,7 @@
- desktop-app::lib_webview_winrt
- )
- elseif (LINUX)
-- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-+ if (NOT DESKTOP_APP_DISABLE_WEBKIT)
- find_package(PkgConfig REQUIRED)
-
- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-@@ -11,14 +11,14 @@
- namespace Webview {
-
- Available Availability() {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- return WebKit2Gtk::Availability();
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT
- return Available{
- .error = Available::Error::NoGtkOrWebkit2Gtk,
- .details = "This feature was disabled at build time.",
- };
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT
- }
-
- bool SupportsEmbedAfterCreate() {
-@@ -26,11 +26,11 @@
- }
-
- std::unique_ptr<Interface> CreateInstance(Config config) {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- return WebKit2Gtk::CreateInstance(std::move(config));
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT
- return nullptr;
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT
- }
-
- } // namespace Webview
---- tdesktop-2.7.4-full.orig/cmake/options.cmake
-+++ tdesktop-2.7.4-full/cmake/options.cmake
-@@ -49,6 +49,13 @@
- )
- endif()
-
-+if (DESKTOP_APP_DISABLE_WEBKIT)
-+ target_compile_definitions(common_options
-+ INTERFACE
-+ DESKTOP_APP_DISABLE_WEBKIT
-+ )
-+endif()
-+
- if (DESKTOP_APP_USE_PACKAGED)
- target_compile_definitions(common_options
- INTERFACE
---- tdesktop-2.7.4-full.orig/cmake/variables.cmake
-+++ tdesktop-2.7.4-full/cmake/variables.cmake
-@@ -38,6 +38,7 @@
- option(DESKTOP_APP_USE_PACKAGED_LAZY_PLATFORMTHEMES "Bundle recommended Qt platform themes for self-contained packages. (Linux only)" ${DESKTOP_APP_USE_PACKAGED_LAZY})
- option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
- option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
-+option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (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-2.7.4-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
deleted file mode 100644
index 941a4ecc09cb..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-fix-disable-dbus-integration.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tdesktop-2.7.4-full.orig/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
-+++ tdesktop-2.7.4-full/Telegram/SourceFiles/platform/linux/notifications_manager_linux_dummy.cpp
-@@ -13,15 +13,15 @@
- namespace Platform {
- namespace Notifications {
-
--bool SkipAudio() {
-+bool SkipAudioForCustom() {
- return false;
- }
-
--bool SkipToast() {
-+bool SkipToastForCustom() {
- return false;
- }
-
--bool SkipFlashBounce() {
-+bool SkipFlashBounceForCustom() {
- return false;
- }
-
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch
deleted file mode 100644
index 41e447989cb2..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 71deaa48afab2bcf9df67b9b347b1f44aad3a9ce Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Thu, 13 May 2021 15:17:54 +0400
-Subject: [PATCH] Don't crash on voice recording error.
-
-Fixes #16217.
----
- .../media/audio/media_audio_capture.cpp | 89 +++++++++++--------
- 1 file changed, 54 insertions(+), 35 deletions(-)
-
-diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-index a5965e0d1988..deb2474d7891 100644
---- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-@@ -47,17 +47,17 @@ class Instance::Inner final : public QObject {
- void start(Fn<void(Update)> updated, Fn<void()> error);
- void stop(Fn<void(Result&&)> callback = nullptr);
-
-- void timeout();
--
- private:
-- void processFrame(int32 offset, int32 framesize);
-+ void process();
-+
-+ [[nodiscard]] bool processFrame(int32 offset, int32 framesize);
- void fail();
-
-- void writeFrame(AVFrame *frame);
-+ [[nodiscard]] bool writeFrame(AVFrame *frame);
-
- // Writes the packets till EAGAIN is got from av_receive_packet()
- // Returns number of packets written or -1 on error
-- int writePackets();
-+ [[nodiscard]] int writePackets();
-
- Fn<void(Update)> _updated;
- Fn<void()> _error;
-@@ -150,6 +150,7 @@ struct Instance::Inner::Private {
- AVCodec *codec = nullptr;
- AVCodecContext *codecContext = nullptr;
- bool opened = false;
-+ bool processing = false;
-
- int srcSamples = 0;
- int dstSamples = 0;
-@@ -217,7 +218,7 @@ struct Instance::Inner::Private {
-
- Instance::Inner::Inner(QThread *thread)
- : d(std::make_unique<Private>())
--, _timer(thread, [=] { timeout(); }) {
-+, _timer(thread, [=] { process(); }) {
- moveToThread(thread);
- }
-
-@@ -226,10 +227,10 @@ Instance::Inner::~Inner() {
- }
-
- void Instance::Inner::fail() {
-- Expects(_error != nullptr);
--
- stop();
-- _error();
-+ if (const auto error = base::take(_error)) {
-+ InvokeQueued(this, error);
-+ }
- }
-
- void Instance::Inner::start(Fn<void(Update)> updated, Fn<void()> error) {
-@@ -384,13 +385,21 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- }
- _timer.cancel();
-
-- if (d->device) {
-+ const auto needResult = (callback != nullptr);
-+ const auto hadDevice = (d->device != nullptr);
-+ if (hadDevice) {
- alcCaptureStop(d->device);
-- timeout(); // get last data
-+ if (d->processing) {
-+ Assert(!needResult); // stop in the middle of processing - error.
-+ } else {
-+ process(); // get last data
-+ }
-+ alcCaptureCloseDevice(d->device);
-+ d->device = nullptr;
- }
-
- // Write what is left
-- if (!_captured.isEmpty()) {
-+ if (needResult && !_captured.isEmpty()) {
- auto fadeSamples = kCaptureFadeInDuration * kCaptureFrequency / 1000;
- auto capturedSamples = static_cast<int>(_captured.size() / sizeof(short));
- if ((_captured.size() % sizeof(short)) || (d->fullSamples + capturedSamples < kCaptureFrequency) || (capturedSamples < fadeSamples)) {
-@@ -414,11 +423,13 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
-
- int32 framesize = d->srcSamples * d->codecContext->channels * sizeof(short), encoded = 0;
- while (_captured.size() >= encoded + framesize) {
-- processFrame(encoded, framesize);
-+ if (!processFrame(encoded, framesize)) {
-+ break;
-+ }
- encoded += framesize;
- }
-- writeFrame(nullptr); // drain the codec
-- if (encoded != _captured.size()) {
-+ // Drain the codec.
-+ if (!writeFrame(nullptr) || encoded != _captured.size()) {
- d->fullSamples = 0;
- d->dataPos = 0;
- d->data.clear();
-@@ -436,14 +447,14 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- _captured = QByteArray();
-
- // Finish stream
-- if (d->device) {
-+ if (needResult && hadDevice) {
- av_write_trailer(d->fmtContext);
- }
-
- QByteArray result = d->fullSamples ? d->data : QByteArray();
- VoiceWaveform waveform;
- qint32 samples = d->fullSamples;
-- if (samples && !d->waveform.isEmpty()) {
-+ if (needResult && samples && !d->waveform.isEmpty()) {
- int64 count = d->waveform.size(), sum = 0;
- if (count >= Player::kWaveformSamplesCount) {
- QVector<uint16> peaks;
-@@ -472,11 +483,7 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- }
- }
- }
-- if (d->device) {
-- alcCaptureStop(d->device);
-- alcCaptureCloseDevice(d->device);
-- d->device = nullptr;
--
-+ if (hadDevice) {
- if (d->codecContext) {
- avcodec_free_context(&d->codecContext);
- d->codecContext = nullptr;
-@@ -528,12 +535,17 @@ void Instance::Inner::stop(Fn<void(Result&&)> callback) {
- d->waveform.clear();
- }
-
-- if (callback) {
-+ if (needResult) {
- callback({ result, waveform, samples });
- }
- }
-
--void Instance::Inner::timeout() {
-+void Instance::Inner::process() {
-+ Expects(!d->processing);
-+
-+ d->processing = true;
-+ const auto guard = gsl::finally([&] { d->processing = false; });
-+
- if (!d->device) {
- _timer.cancel();
- return;
-@@ -582,7 +594,9 @@ void Instance::Inner::timeout() {
- // Write frames
- int32 framesize = d->srcSamples * d->codecContext->channels * sizeof(short), encoded = 0;
- while (uint32(_captured.size()) >= encoded + framesize + fadeSamples * sizeof(short)) {
-- processFrame(encoded, framesize);
-+ if (!processFrame(encoded, framesize)) {
-+ return;
-+ }
- encoded += framesize;
- }
-
-@@ -597,13 +611,13 @@ void Instance::Inner::timeout() {
- }
- }
-
--void Instance::Inner::processFrame(int32 offset, int32 framesize) {
-+bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
- // Prepare audio frame
-
- if (framesize % sizeof(short)) { // in the middle of a sample
- LOG(("Audio Error: Bad framesize in writeFrame() for capture, framesize %1, %2").arg(framesize));
- fail();
-- return;
-+ return false;
- }
- auto samplesCnt = static_cast<int>(framesize / sizeof(short));
-
-@@ -650,7 +664,7 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
- if ((res = av_samples_alloc(d->dstSamplesData, 0, d->codecContext->channels, d->dstSamples, d->codecContext->sample_fmt, 1)) < 0) {
- LOG(("Audio Error: Unable to av_samples_alloc for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
- fail();
-- return;
-+ return false;
- }
- d->dstSamplesSize = av_samples_get_buffer_size(0, d->codecContext->channels, d->maxDstSamples, d->codecContext->sample_fmt, 0);
- }
-@@ -658,7 +672,7 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
- if ((res = swr_convert(d->swrContext, d->dstSamplesData, d->dstSamples, (const uint8_t **)srcSamplesData, d->srcSamples)) < 0) {
- LOG(("Audio Error: Unable to swr_convert for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
- fail();
-- return;
-+ return false;
- }
-
- // Write audio frame
-@@ -670,45 +684,50 @@ void Instance::Inner::processFrame(int32 offset, int32 framesize) {
-
- avcodec_fill_audio_frame(frame, d->codecContext->channels, d->codecContext->sample_fmt, d->dstSamplesData[0], d->dstSamplesSize, 0);
-
-- writeFrame(frame);
-+ if (!writeFrame(frame)) {
-+ return false;
-+ }
-
- d->fullSamples += samplesCnt;
-
- av_frame_free(&frame);
-+ return true;
- }
-
--void Instance::Inner::writeFrame(AVFrame *frame) {
-+bool Instance::Inner::writeFrame(AVFrame *frame) {
- int res = 0;
- char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
-
- res = avcodec_send_frame(d->codecContext, frame);
- if (res == AVERROR(EAGAIN)) {
-- int packetsWritten = writePackets();
-+ const auto packetsWritten = writePackets();
- if (packetsWritten < 0) {
- if (frame && packetsWritten == AVERROR_EOF) {
- LOG(("Audio Error: EOF in packets received when EAGAIN was got in avcodec_send_frame()"));
- fail();
- }
-- return;
-+ return false;
- } else if (!packetsWritten) {
- LOG(("Audio Error: No packets received when EAGAIN was got in avcodec_send_frame()"));
- fail();
-- return;
-+ return false;
- }
- res = avcodec_send_frame(d->codecContext, frame);
- }
- if (res < 0) {
- LOG(("Audio Error: Unable to avcodec_send_frame for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res)));
- fail();
-- return;
-+ return false;
- }
-
- if (!frame) { // drain
- if ((res = writePackets()) != AVERROR_EOF) {
- LOG(("Audio Error: not EOF in packets received when draining the codec, result %1").arg(res));
- fail();
-+ return false;
- }
- }
-+ return true;
- }
-
- int Instance::Inner::writePackets() {
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch
deleted file mode 100644
index 4156956032d4..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8807bc915f2439acc7c84f06d931d96d6ca602a Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@gmail.com>
-Date: Thu, 13 May 2021 15:33:42 +0400
-Subject: [PATCH] Fix voice recoding with FFmpeg 4.4.
-
-Fixes #16217.
----
- Telegram/SourceFiles/media/audio/media_audio_capture.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-index deb2474d789..d129168783d 100644
---- a/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-+++ b/Telegram/SourceFiles/media/audio/media_audio_capture.cpp
-@@ -679,6 +679,10 @@ bool Instance::Inner::processFrame(int32 offset, int32 framesize) {
-
- AVFrame *frame = av_frame_alloc();
-
-+ frame->format = d->codecContext->sample_fmt;
-+ frame->channels = d->codecContext->channels;
-+ frame->channel_layout = d->codecContext->channel_layout;
-+ frame->sample_rate = d->codecContext->sample_rate;
- frame->nb_samples = d->dstSamples;
- frame->pts = av_rescale_q(d->fullSamples, AVRational { 1, d->codecContext->sample_rate }, d->codecContext->time_base);
-
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
deleted file mode 100644
index 7f4b3f2601f5..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
-@@ -6,6 +6,7 @@
- //
- #include "webview/platform/linux/webview_linux_webkit_gtk.h"
-
-+#include "base/optional.h"
- #include "base/platform/linux/base_linux_gtk_integration.h"
- #include "base/platform/linux/base_linux_gtk_integration_p.h"
-
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
-@@ -14,7 +14,6 @@
-
- #include <QtWidgets/QWidget>
- #include <QtGui/QWindow>
--#include <QtCore/QJsonDocument>
-
- namespace Webview {
- namespace {
---- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
-+++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
-@@ -9,6 +9,8 @@
- #include "base/unique_qptr.h"
- #include "base/basic_types.h"
-
-+#include <QtCore/QJsonDocument>
-+
- class QString;
- class QWidget;
- class QWindow;
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch
deleted file mode 100644
index 388e09fa58d2..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Allow controlling the use of webkit-gtk
-
-WebKitGTK is used to display payment pages when buying things in Telegram
-shops. This library can be disabled properly alongside the GTK integration with
-its flag. However, I reckon *most* users want the GTK integration (fixes
-pasting big images, amongst other things), but hardly anyone actually buys
-things through Telegram. Controlling these two things separately is trivial, and
-the user gets a nice dialog telling them WebKitGTK isn't available in the event
-they *do* attempt to use the related features.
-
-NOTE: GTK integration *must* be enabled for WebKitGTK to work.
-
---- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
-+++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
-@@ -587,9 +587,11 @@
- if (const auto integration = BaseGtkIntegration::Instance()) {
- return integration->exec(parentDBusName);
- }
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- } else if (type == Type::Webview) {
- Webview::WebKit2Gtk::SetServiceName(serviceName.toStdString());
- return Webview::WebKit2Gtk::Exec(parentDBusName.toStdString());
-+#endif
- } else if (type == Type::TDesktop) {
- ServiceName = serviceName.toStdString();
- if (const auto integration = Instance()) {
-@@ -602,7 +604,9 @@
-
- void GtkIntegration::Start(Type type) {
- if (type != Type::Base
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- && type != Type::Webview
-+#endif
- && type != Type::TDesktop) {
- return;
- }
-@@ -613,11 +617,13 @@
-
- if (type == Type::Base) {
- BaseGtkIntegration::SetServiceName(kBaseService.utf16().arg(h));
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- } else if (type == Type::Webview) {
- Webview::WebKit2Gtk::SetServiceName(
- kWebviewService.utf16().arg(h).arg("%1").toStdString());
-
- return;
-+#endif
- } else {
- ServiceName = kService.utf16().arg(h).toStdString();
- }
---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/CMakeLists.txt
-+++ tdesktop-2.8.9-full/Telegram/lib_webview/CMakeLists.txt
-@@ -48,7 +48,7 @@
- nuget_add_webview(lib_webview)
- nuget_add_winrt(lib_webview)
- elseif (LINUX)
-- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-+ if (NOT DESKTOP_APP_DISABLE_WEBKIT)
- find_package(PkgConfig REQUIRED)
-
- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-+++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-@@ -11,14 +11,14 @@
- namespace Webview {
-
- Available Availability() {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- return WebKit2Gtk::Availability();
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT
- return Available{
- .error = Available::Error::NoGtkOrWebkit2Gtk,
- .details = "This feature was disabled at build time.",
- };
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT
- }
-
- bool SupportsEmbedAfterCreate() {
-@@ -26,11 +26,11 @@
- }
-
- std::unique_ptr<Interface> CreateInstance(Config config) {
--#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#ifndef DESKTOP_APP_DISABLE_WEBKIT
- return WebKit2Gtk::CreateInstance(std::move(config));
--#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#else // !DESKTOP_APP_DISABLE_WEBKIT
- return nullptr;
--#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
-+#endif // DESKTOP_APP_DISABLE_WEBKIT
- }
-
- } // namespace Webview
---- tdesktop-2.8.9-full.orig/cmake/options.cmake
-+++ tdesktop-2.8.9-full/cmake/options.cmake
-@@ -49,6 +49,13 @@
- )
- endif()
-
-+if (DESKTOP_APP_DISABLE_WEBKIT)
-+ target_compile_definitions(common_options
-+ INTERFACE
-+ DESKTOP_APP_DISABLE_WEBKIT
-+ )
-+endif()
-+
- if (DESKTOP_APP_USE_PACKAGED)
- target_compile_definitions(common_options
- INTERFACE
---- tdesktop-2.8.9-full.orig/cmake/variables.cmake
-+++ tdesktop-2.8.9-full/cmake/variables.cmake
-@@ -37,6 +37,7 @@
- option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
- option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
- option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
-+option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (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-2.8.9-webview-fix-glib.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch
deleted file mode 100644
index 02c96d28b2c1..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fixes an issue with glib headers including a C++ header inside extern "C"
-
-This patch is a hacky workaround, proper solution doesn't seem trivial.
-
-In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
- from /usr/include/glib-2.0/glib/gthread.h:32,
- from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
- from /usr/include/glib-2.0/glib.h:32,
- from /usr/include/gtk-3.0/gdk/gdkconfig.h:13,
- from /usr/include/gtk-3.0/gdk/gdk.h:30,
- from /usr/include/gtk-3.0/gtk/gtk.h:30,
- from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:11,
- from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7:
-/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/include/g++-v11/type_traits:56:3: error: template with C linkage
- 56 | template<typename _Tp, _Tp __v>
- | ^~~~~~~~
-In file included from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7:
-/var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:9:1: note: extern "C" linkage started here
- 9 | extern "C" {
- | ^~~~~~~~~~
-
---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-+++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-@@ -6,6 +6,7 @@
- //
- #pragma once
-
-+#include <type_traits> // Required for glib/gatomic.h
- extern "C" {
- #include <JavaScriptCore/JavaScript.h>
- #include <gtk/gtk.h>
diff --git a/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch b/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch
new file mode 100644
index 000000000000..3df0601b454b
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch
@@ -0,0 +1,15 @@
+Add missed dependency on libdl
+
+https://github.com/desktop-app/lib_webview/commit/3cb51ac668d4e1b4f7f2b95fed1192350ba403af
+
+--- tdesktop-2.9.3-full.orig/Telegram/lib_webview/CMakeLists.txt
++++ tdesktop-2.9.3-full/Telegram/lib_webview/CMakeLists.txt
+@@ -56,6 +56,8 @@
+
+ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+ target_include_directories(lib_webview SYSTEM PUBLIC ${WEBKIT_INCLUDE_DIRS})
++
++ target_link_libraries(lib_webview PUBLIC ${CMAKE_DL_LIBS})
+ else()
+ remove_target_sources(lib_webview ${src_loc}
+ webview/platform/linux/webview_linux_webkit_gtk.cpp
diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.9.3-jemalloc-only-telegram.patch
index 8604acc6a74d..f90270fccee3 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.9.3-jemalloc-only-telegram.patch
@@ -5,9 +5,9 @@ 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-2.8.10-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-2.8.10-full/Telegram/CMakeLists.txt
-@@ -87,6 +87,7 @@
+--- tdesktop-2.9.3-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-2.9.3-full/Telegram/CMakeLists.txt
+@@ -1264,6 +1264,7 @@
PRIVATE
desktop-app::external_glibmm
desktop-app::external_glib
@@ -15,9 +15,9 @@ improve runtime memory use, it's unnecessary to use it for anything else.
)
if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
---- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake
-+++ tdesktop-2.8.10-full/cmake/options_linux.cmake
-@@ -58,11 +58,6 @@
+--- tdesktop-2.9.3-full.orig/cmake/options_linux.cmake
++++ tdesktop-2.9.3-full/cmake/options_linux.cmake
+@@ -45,11 +45,6 @@
endif()
endif()
@@ -26,6 +26,6 @@ improve runtime memory use, it's unnecessary to use it for anything else.
- desktop-app::external_jemalloc
-)
-
- if (DESKTOP_APP_USE_PACKAGED)
- find_library(ATOMIC_LIBRARY atomic)
- else()
+ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
+ target_link_options(common_options
+ INTERFACE
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
new file mode 100644
index 000000000000..2b92e8adce4f
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000000..7ad3e75e49ba
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
@@ -0,0 +1,35 @@
+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/metadata.xml b/net-im/telegram-desktop/metadata.xml
index bb15e2ab9e52..d0e2c0f4aa4f 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/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" proxied="yes">
<email>esteve.varela@gmail.com</email>
@@ -12,5 +12,6 @@
<use>
<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
+ <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
</use>
</pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
index aaa30fc0f334..eda146962285 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.8.11.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
@@ -15,8 +15,8 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
+KEYWORDS="amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X"
REQUIRED_USE="
spell? (
^^ ( enchant hunspell )
@@ -24,19 +24,22 @@ REQUIRED_USE="
webkit? ( gtk )
gtk? ( dbus )
"
+# Future: webkit doesn't depend on gtk anymore (version: >2.9.3)
RDEPEND="
!net-im/telegram-desktop-bin
app-arch/lz4:=
+ dev-cpp/abseil-cpp:=
dev-cpp/glibmm:2
- dev-libs/jemalloc:=
+ 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/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(-)?]
+ >=dev-qt/qtwidgets-5.15:5[png,X?]
media-fonts/open-sans
media-libs/fontconfig:=
~media-libs/libtgvoip-2.4.4_p20210302
@@ -44,7 +47,7 @@ RDEPEND="
media-libs/openal
media-libs/opus:=
media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20210626
+ ~media-libs/tg_owt-0_pre20210626[screencast=,X=]
media-video/ffmpeg:=[opus]
sys-libs/zlib:=[minizip]
dbus? (
@@ -71,13 +74,8 @@ BDEPEND="
S="${WORKDIR}/${MY_P}"
PATCHES=(
- # https://github.com/desktop-app/cmake_helpers/pull/91
- # https://github.com/desktop-app/lib_webview/pull/2
- "${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch"
- # Not a proper fix, not upstreamed
- "${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
- # Not upstreamed (yet)
- "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch"
+ "${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch"
+ "${FILESDIR}/tdesktop-2.9.3-add-libdl-dependency.patch"
)
pkg_pretend() {
@@ -104,13 +102,13 @@ src_configure() {
-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 OFF ON)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
- -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
- -DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended)
- -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell
+ -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_GTK_INTEGRATION=$(usex gtk 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
@@ -142,4 +140,7 @@ src_configure() {
pkg_postinst() {
xdg_pkg_postinst
use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
+ if ! use X && ! use screencast; then
+ elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+ fi
}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
index ceaf8f8b8b03..090b6a2773bc 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.8.1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit xdg cmake python-any-r1 flag-o-matic
@@ -15,26 +15,30 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="+dbus enchant +gtk +hunspell +spell wayland webkit +X"
+KEYWORDS="amd64 ~ppc64"
+IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X"
REQUIRED_USE="
spell? (
^^ ( enchant hunspell )
)
- webkit? ( gtk )
+ gtk? ( dbus )
+ webkit? ( dbus )
"
RDEPEND="
!net-im/telegram-desktop-bin
app-arch/lz4:=
+ dev-cpp/abseil-cpp:=
dev-cpp/glibmm:2
+ 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/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(-)?]
+ >=dev-qt/qtwidgets-5.15:5[png,X?]
media-fonts/open-sans
media-libs/fontconfig:=
~media-libs/libtgvoip-2.4.4_p20210302
@@ -42,7 +46,7 @@ RDEPEND="
media-libs/openal
media-libs/opus:=
media-libs/rnnoise
- ~media-libs/tg_owt-0_pre20210626
+ ~media-libs/tg_owt-0_pre20210626[screencast=,X=]
media-video/ffmpeg:=[opus]
sys-libs/zlib:=[minizip]
dbus? (
@@ -65,16 +69,13 @@ BDEPEND="
>=dev-util/cmake-3.16
virtual/pkgconfig
"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
S="${WORKDIR}/${MY_P}"
PATCHES=(
- # https://github.com/desktop-app/cmake_helpers/pull/91
- # https://github.com/desktop-app/lib_webview/pull/2
- "${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch"
- # https://github.com/desktop-app/lib_webview/pull/3
- # https://github.com/desktop-app/lib_base/commit/01d152af4c6282756585f1405c4bcbb75960a509 (landed in 2.8.0, patch is harmless)
- "${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
+ "${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch"
+ "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
)
pkg_pretend() {
@@ -101,13 +102,13 @@ src_configure() {
-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 OFF ON)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
- -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
- -DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended)
- -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell
+ -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_GTK_INTEGRATION=$(usex gtk 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
@@ -138,5 +139,8 @@ src_configure() {
pkg_postinst() {
xdg_pkg_postinst
- use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
+ use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
+ if ! use X && ! use screencast; then
+ elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+ fi
}
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
index 1f51780319cc..65f4899c98bf 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
@@ -3,46 +3,56 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
-inherit xdg cmake python-any-r1 flag-o-matic
-
-MY_P="tdesktop-${PV}-full"
+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 +gtk +hunspell +spell wayland webkit +X"
+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/glibmm:2
+ dev-cpp/abseil-cpp:=
+ dev-libs/jemalloc:=[-lazy-lock]
+ dev-libs/openssl:=
dev-libs/xxhash
- dev-qt/qtcore:5
- dev-qt/qtgui:5[dbus?,jpeg,png,wayland?,X(-)?]
- dev-qt/qtimageformats:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5[png,X(-)?]
+ >=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/opus:=
~media-libs/libtgvoip-2.4.4_p20210302
+ >=media-libs/libtgvoip-2.4.4_p20210302-r2
media-libs/openal
- ~media-libs/tg_owt-0_pre20210422
+ 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:= )
- gtk? ( x11-libs/gtk+:3[X?] )
hunspell? ( >=app-text/hunspell-1.7:= )
wayland? ( kde-frameworks/kwayland:= )
webkit? ( net-libs/webkit-gtk:= )
@@ -57,28 +67,13 @@ BDEPEND="
>=dev-util/cmake-3.16
virtual/pkgconfig
"
-REQUIRED_USE="
- spell? (
- ^^ ( enchant hunspell )
- )
- webkit? ( gtk )
-"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
S="${WORKDIR}/${MY_P}"
PATCHES=(
- # https://github.com/desktop-app/cmake_helpers/pull/91
- # https://github.com/desktop-app/lib_webview/pull/2
- "${FILESDIR}/tdesktop-2.7.4-disable-webkit-separately.patch"
- # https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a
- "${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
- # https://github.com/desktop-app/lib_webview/pull/3
- "${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
- # https://github.com/telegramdesktop/tdesktop/issues/16217
- "${FILESDIR}/tdesktop-2.7.4-voice-crash.patch"
- "${FILESDIR}/tdesktop-2.7.4-voice-ffmpeg44.patch"
- # https://github.com/telegramdesktop/tdesktop/commit/404538c98968d44d207671de3adde91b8df50721
- "${FILESDIR}/tdesktop-2.7.4-fix-disable-dbus-integration.patch"
+ "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+ "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
)
pkg_pretend() {
@@ -105,13 +100,12 @@ src_configure() {
-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 OFF ON)
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
- -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
- -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
- -DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
- -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended)
- -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell
+ -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
@@ -142,5 +136,11 @@ src_configure() {
pkg_postinst() {
xdg_pkg_postinst
- use gtk || elog "enable 'gtk' useflag if you have image copy-paste problems"
+ 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/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
index 25bf943ffb69..686567207bad 100644
--- a/net-im/telepathy-connection-managers/metadata.xml
+++ b/net-im/telepathy-connection-managers/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="project">
<email>gnome@gentoo.org</email>
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
index 39980802b1da..7b343b06be8a 100644
--- a/net-im/telepathy-logger/metadata.xml
+++ b/net-im/telepathy-logger/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="project">
<email>gnome@gentoo.org</email>
diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
index e565d8475d7e..a319bc8e49fe 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2
LICENSE="LGPL-2.1+"
SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
IUSE="+introspection"
RDEPEND="
diff --git a/net-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml
index 91b0f11bc72b..1f6611a0af7e 100644
--- a/net-im/telepathy-mission-control/metadata.xml
+++ b/net-im/telepathy-mission-control/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="project">
<email>gnome@gentoo.org</email>
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 fdf7162dfdf0..8befb67a258e 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
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug networkmanager"
RDEPEND="
diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml
index 59548fbeeef0..965a9fddebaf 100644
--- a/net-im/tkabber/metadata.xml
+++ b/net-im/tkabber/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-needed -->
<longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's writen in Tcl/Tk, and works on many platforms.</longdescription>
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index dc0f8b1a5187..5f20858fcd7b 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,3 +1,3 @@
-DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f58b7d3e47ec1a12a87055f10cdb723211f38d1028a3fb149cd76aa7771591e37f7961cda37b7bcbb8e21b33181 SHA512 bfbe8e4c90b4fcbdbe7cc96cb402e4c2f1609e2970e51d6d2ad2c8596350ce96ac9f4d06fbb71350e56d8892e2ed4ee8c5adf4f66cdad6b152c959802bddc6cc
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.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
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
new file mode 100644
index 000000000000..68cb0bb59ccc
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,49 @@
+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/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..09845d294a2e
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,48 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c 2021-08-09 18:52:27.090248882 -0400
++++ src/autocomplete.c 2021-08-11 14:57:39.029828530 -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>//This should contain PATH_MAX and NAME_MAX
+ #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-08-11 14:59:41.223159195 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+
+ #include <limits.h>
++//This should include 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-08-09 18:52:27.093582216 -0400
++++ src/settings.h 2021-08-11 15:00:46.889824433 -0400
+@@ -24,6 +24,12 @@
+ #define SETTINGS_H
+
+ #include <limits.h>
++//This should include 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/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..11dc43c6b778
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,49 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c 2021-07-26 10:43:37.453154392 -0400
++++ src/autocomplete.c 2021-07-26 10:59:29.856460938 -0400
+@@ -27,8 +27,11 @@
+ #ifdef __APPLE__
+ #include <sys/types.h>
+ #include <sys/dir.h>
+-#else
++//This include NAME_MAX
++#include <sys/sysinfo.h>
++#elif __linux__
+ #include <dirent.h>
++#include <linux/limits.h>//This includes NAME_MAX
+ #endif /* __APPLE__ */
+
+ #include "windows.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h 2021-07-26 10:43:37.456487724 -0400
++++ src/file_transfers.h 2021-07-26 11:41:30.513057111 -0400
+@@ -24,6 +24,12 @@
+ #define FILE_TRANSFERS_H
+
+ #include <limits.h>
++//This includes PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
+
+ #include "toxic.h"
+ #include "windows.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h 2021-07-26 10:43:37.459821058 -0400
++++ src/settings.h 2021-07-26 11:45:46.709716594 -0400
+@@ -25,6 +25,13 @@
+
+ #include <limits.h>
+
++//This includes PATH_MAX
++#ifdef __APPLE__
++#include <sys/sysinfo.h>
++#elif __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+
+ /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 799dd08bb740..cdcd3b5220b7 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/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" proxied="yes">
<email>JoMull01@protonmail.com</email>
@@ -21,6 +21,7 @@
</longdescription>
<use>
<flag name="audio-notify">Enables native sound notifications</flag>
+ <flag name="games">Enables some small mini-games</flag>
<flag name="llvm">Enables support for LLVM Address Sanitizer</flag>
<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
<flag name="qrcode">Enables QR code support</flag>
diff --git a/net-im/toxic/toxic-0.10.1.ebuild b/net-im/toxic/toxic-0.10.1-r1.ebuild
index 4f0639961dc5..931dd62fc29a 100644
--- a/net-im/toxic/toxic-0.10.1.ebuild
+++ b/net-im/toxic/toxic-0.10.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-single-r1 xdg
@@ -18,10 +18,12 @@ IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
video? ( sound X ) "
-RDEPEND="dev-libs/libconfig:=
- net-libs/tox:=
+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
@@ -58,6 +60,10 @@ src_prepare() {
#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() {
@@ -101,6 +107,6 @@ src_configure() {
src_install() {
default
if ! use audio-notify; then
- rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+ rm -r "${ED}"/usr/share/"${PN}"/sounds || die "Could not remove sounds directory"
fi
}
diff --git a/net-im/toxic/toxic-0.10.0-r1.ebuild b/net-im/toxic/toxic-0.11.1.ebuild
index de5dde5af0f2..d2d629d69b60 100644
--- a/net-im/toxic/toxic-0.10.0-r1.ebuild
+++ b/net-im/toxic/toxic-0.11.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
inherit python-single-r1 xdg
@@ -14,14 +14,16 @@ 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"
+IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
video? ( sound X ) "
-RDEPEND="
- dev-libs/libconfig:=
- net-libs/tox:=
+BDEPEND="dev-libs/libconfig:=
+ virtual/pkgconfig"
+
+RDEPEND="net-libs/tox:=
net-misc/curl
+ sys-kernel/linux-headers
sys-libs/ncurses:=
audio-notify? (
media-libs/freealut
@@ -59,41 +61,47 @@ src_prepare() {
#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 change assignment of 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"
+ #This is to fix incorrect include statements of NAME_MAX and PATH_MAX macros
+ eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
}
src_configure() {
if ! use audio-notify; then
- USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
+ export DISABLE_SOUND_NOTIFY=1
fi
if use debug; then
- USER_CFLAGS+="-DENABLE_RELEASE=0 "
+ export ENABLE_RELEASE=0
if use llvm; then
- USER_CFLAGS+="-DENABLE_ASAN=1 "
+ export ENABLE_ASAN=1
fi
fi
+ if ! use games; then
+ export DISABLE_GAMES=1
+ fi
if ! use notification; then
- USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
+ export DISABLE_DESKTOP_NOTIFY=1
fi
if ! use png; then
- USER_CFLAGS+="-DDISABLE_QRPNG=1 "
+ export DISABLE_QRPNG=1
fi
if use python; then
- USER_CFLAGS+="-DENABLE_PYTHON=1"
+ export ENABLE_PYTHON=1
fi
if ! use qrcode; then
- USER_CFLAGS+="-DDISABLE_QRCODE=1"
+ export DISABLE_QRCODE=1
fi
if ! use sound; then
- USER_CFLAGS+="-DDISABLE_AV=1 "
+ export DISABLE_AV=1
fi
if ! use video; then
- USER_CFLAGS+="-DDISABLE_VI=1"
+ export DISABLE_VI=1
fi
if ! use X; then
- USER_CFLAGS+="-DDISABLE_X11=1 "
+ export DISABLE_X11=1
fi
- USER_CFLAGS+="${CFLAGS}"
- export USER_CFLAGS
+ export USER_CFLAGS="${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!"
diff --git a/net-im/toxic/toxic-0.8.3-r2.ebuild b/net-im/toxic/toxic-0.8.3-r3.ebuild
index fb4792fc89e0..97ed2aa0ae38 100644
--- a/net-im/toxic/toxic-0.8.3-r2.ebuild
+++ b/net-im/toxic/toxic-0.8.3-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
inherit python-single-r1 xdg
@@ -17,11 +17,12 @@ KEYWORDS="amd64 x86"
IUSE="notification python qrcode +sound +video +X"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="
- dev-libs/libconfig:=
- >=net-libs/tox-0.2.8:=
+BDEPEND="dev-libs/libconfig"
+
+RDEPEND="net-libs/tox:=
net-misc/curl
sys-libs/ncurses:=
+ sys-kernel/linux-headers
notification? ( x11-libs/libnotify )
python? ( ${PYTHON_DEPS} )
qrcode? ( media-gfx/qrencode:= )
@@ -45,6 +46,8 @@ 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 include declarations for NAME_MAX and PATH_MAX.
+ eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
}
src_configure() {
diff --git a/net-im/transwhat/metadata.xml b/net-im/transwhat/metadata.xml
index 2f2dfe350832..7449ea2792c3 100644
--- a/net-im/transwhat/metadata.xml
+++ b/net-im/transwhat/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426-r1.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild
index 1e7dc74cbe12..338805c70b2c 100644
--- a/net-im/transwhat/transwhat-0.2.2_p20190426-r1.ebuild
+++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r2.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-DISTUTILS_USE_SETUPTOOLS="rdepend"
EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165"
PYTHON_COMPAT=( python3_{8..10} )
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 7dc45761cae5..3873cad96d32 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/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" proxied="yes">
<email>reagentoo@gmail.com</email>
diff --git a/net-im/webex/metadata.xml b/net-im/webex/metadata.xml
index 765a8e365b52..115e9d64a669 100644
--- a/net-im/webex/metadata.xml
+++ b/net-im/webex/metadata.xml
@@ -1,8 +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">
- <email>dilfridge@gentoo.org</email>
- <name>Andreas K. Huettel</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-im/whatsapp-desktop-bin/metadata.xml b/net-im/whatsapp-desktop-bin/metadata.xml
index 61d3b6a82fce..e16a94e5f9eb 100644
--- a/net-im/whatsapp-desktop-bin/metadata.xml
+++ b/net-im/whatsapp-desktop-bin/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>
<upstream>
<remote-id type="github">oOthkOo/whatsapp-desktop</remote-id>
diff --git a/net-im/yowsup/metadata.xml b/net-im/yowsup/metadata.xml
index 9ca4163e5fe2..6e05a0b22210 100644
--- a/net-im/yowsup/metadata.xml
+++ b/net-im/yowsup/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">
<email>conikost@gentoo.org</email>
diff --git a/net-im/ysm/metadata.xml b/net-im/ysm/metadata.xml
index bf2e0f5bcd39..2687f43304ff 100644
--- a/net-im/ysm/metadata.xml
+++ b/net-im/ysm/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-needed -->
<upstream>
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index ee8f96c00c9f..6a60188d9f69 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,4 +1,4 @@
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.7.28852.0718_x86_64.tar.xz 52589228 BLAKE2B 61337f7722a48b258c13cd389f7bae9d3cbc4c2c3468c7b413bde4a87b24e5f64989a516f3073882cbf70f898b6ad188c9a5876ab3d75e2dd5f688ff94f706a4 SHA512 8a00fb01f5af0dfcc1a9e13058f7d3e492545d827d157effe3d19a0846a53ce2427172ce4b33a95f0420259876b5e16c44122f5753632278e5967ec222657f2b
-DIST zoom-5.7.28991.0726_x86_64.tar.xz 52594424 BLAKE2B 3dde3b96505c86d610acb85482e43733c01c4a12b45ade2e1cde762065c52f56e543f29cb9025322e9b58f75e3baa65927b9bd174e5e68a2b38af0cb8fc744e6 SHA512 dc4e532d6bab81be9af978feebba0083b648230e8a3b8173173dafc98ee49374bcc60e05677048d3987c5834d29888551f9deeb958cc00fc96820767916e47d3
+DIST zoom-5.7.31792.0820_x86_64.tar.xz 62059660 BLAKE2B bb15170f9a87143b50171041006ad65ffe5ce80b711769c83f0c5936bcad3e8f9417b32cb9f1f71734eb990744cb4be5d3e4b10c93b579af59b8fcc6337b75e9 SHA512 0248eb4b1d5d8b289eb67d8e55da7f20eb06c33698fc9f1beeaf8c36a133a9edae2aa2fd51f8866049c88e7bc6c47df80dfe9a0c8c24776dc6ddfe8ca646b27b
+DIST zoom-5.8.0.16_x86_64.tar.xz 55714984 BLAKE2B 1e9cecc3ae838976cdd7e343d9eca27a615290df079e60edef44d03fe66ff6be8715162a66ceb0030a9f798123b4a7c68622b5ad402f0d4c5f6d76c5f315b74c SHA512 ddc20b57a58c9f102651b3361f7eb7daecbcf943684470247ba23f911dc52c4ea015aeaf9f2ed7d9b378617dc6fa69d2b37103ea7826f5bfd61b150d6e6cb3c6
diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml
index e6786c75fd45..641677fd6fef 100644
--- a/net-im/zoom/metadata.xml
+++ b/net-im/zoom/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">
<email>ulm@gentoo.org</email>
@@ -11,9 +11,14 @@
<email>mva@gentoo.org</email>
</maintainer>
<use>
- <flag name="bundled-libjpeg-turbo">Use bundled libturbojpeg
- instead of <pkg>media-libs/libjpeg-turbo</pkg></flag>
- <flag name="bundled-qt">Use bundled Qt and icu instead of
- system-wide libs</flag>
+ <flag name="bundled-libjpeg-turbo">
+ Use bundled libturbojpeg instead of <pkg>media-libs/libjpeg-turbo</pkg>
+ </flag>
+ <flag name="bundled-qt">
+ Use bundled Qt and icu instead of system-wide libs
+ </flag>
+ <flag name="opencl">
+ Use OpenCL for virtual background support (<pkg>virtual/opencl</pkg>)
+ </flag>
</use>
</pkgmetadata>
diff --git a/net-im/zoom/zoom-5.7.28852.0718.ebuild b/net-im/zoom/zoom-5.7.31792.0820.ebuild
index 2d1b6688d0d6..ea68d8725e60 100644
--- a/net-im/zoom/zoom-5.7.28852.0718.ebuild
+++ b/net-im/zoom/zoom-5.7.31792.0820.ebuild
@@ -18,7 +18,7 @@ RESTRICT="mirror bindist strip"
RDEPEND="!games-engines/zoom
dev-libs/glib:2
- dev-libs/quazip:0=
+ >=dev-libs/quazip-1.0:0=
media-libs/fdk-aac:0/2
media-libs/fontconfig
media-libs/freetype
@@ -92,12 +92,7 @@ src_install() {
doexe zoom zopen ZoomLauncher
dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-
- local quazip_so="libquazip1-qt5.so"
- if has_version "<dev-libs/quazip-1.0"; then
- quazip_so="libquazip5.so"
- fi
- dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
+ dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
if use bundled-libjpeg-turbo; then
doexe libturbojpeg.so
diff --git a/net-im/zoom/zoom-5.7.28991.0726.ebuild b/net-im/zoom/zoom-5.8.0.16.ebuild
index 2d1b6688d0d6..263454606292 100644
--- a/net-im/zoom/zoom-5.7.28991.0726.ebuild
+++ b/net-im/zoom/zoom-5.8.0.16.ebuild
@@ -13,12 +13,12 @@ S="${WORKDIR}/${PN}"
LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="-* ~amd64"
-IUSE="bundled-libjpeg-turbo +bundled-qt pulseaudio wayland"
+IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland"
RESTRICT="mirror bindist strip"
RDEPEND="!games-engines/zoom
dev-libs/glib:2
- dev-libs/quazip:0=
+ >=dev-libs/quazip-1.0:0=
media-libs/fdk-aac:0/2
media-libs/fontconfig
media-libs/freetype
@@ -35,6 +35,7 @@ RDEPEND="!games-engines/zoom
x11-libs/libXtst
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 )
@@ -51,7 +52,6 @@ RDEPEND="!games-engines/zoom
dev-qt/qtnetwork:5
dev-qt/qtquickcontrols:5[widgets]
dev-qt/qtquickcontrols2:5
- dev-qt/qtscript:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
wayland? ( dev-qt/qtwayland )
@@ -88,16 +88,16 @@ src_install() {
insinto /opt/zoom
exeinto /opt/zoom
doins -r json ringtone sip timezones translations
- doins *.pcm *.sh Embedded.properties version.txt
- doexe zoom zopen ZoomLauncher
+ 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
- local quazip_so="libquazip1-qt5.so"
- if has_version "<dev-libs/quazip-1.0"; then
- quazip_so="libquazip5.so"
+ if use opencl; then
+ doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so
+ dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
fi
- dosym -r "/usr/$(get_libdir)/${quazip_so}" /opt/zoom/libquazip.so
if use bundled-libjpeg-turbo; then
doexe libturbojpeg.so