diff options
Diffstat (limited to 'net-im')
232 files changed, 4801 insertions, 4766 deletions
diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest index 34c6c222de56..aebf9822cad1 100644 --- a/net-im/biboumi/Manifest +++ b/net-im/biboumi/Manifest @@ -1 +1,2 @@ +DIST biboumi-9.0-fix-missing-include.patch 663 BLAKE2B b81558e1b85bb7612e68e4e4723234e1fe51fd23a3941c59865ad94e922e095ddccc7a62d04ca73295fd0845a854010e98ac2aa6c67a63980b3e7ceb3a917375 SHA512 923f3333ae5bbaeccd0690a063e20206a18f1b7a65d829c6a04df52e7c2cc3549d0da592f0021538f080a119cb80390f8fc517d0d4c15d96fc76a1fb5fc32f84 DIST biboumi-9.0.tar.xz 161192 BLAKE2B 27c19f5c44e23caae07bd579b01d663e73cd8b432203ac95ae77e651936eea7cc443f389e589acebe5b36c32e96f215fdf0a86c97193726d601b53b709a2d66e SHA512 cfaacd831b56031906922472275c55fd6f1a5307ebe54959d21e3799ad4612499e8beeb34e8736df9eabc9fec1a861d17567250d64f316ace47395fd6c8f3c18 diff --git a/net-im/biboumi/biboumi-9.0-r4.ebuild b/net-im/biboumi/biboumi-9.0-r4.ebuild index 2c45760b3892..0383c5bd9893 100644 --- a/net-im/biboumi/biboumi-9.0-r4.ebuild +++ b/net-im/biboumi/biboumi-9.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,11 +9,15 @@ MY_PV="${PV/_/-}" DESCRIPTION="XMPP gateway to IRC" HOMEPAGE="https://biboumi.louiz.org/" -SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz" +SRC_URI=" + https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz + https://lab.louiz.org/flow/biboumi/-/commit/f9d58a44871931ef9b60354fade6f8d7b24cc668.patch -> + ${PN}-9.0-fix-missing-include.patch +" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+idn postgres +sqlite +ssl systemd test udns" RESTRICT="!test? ( test )" @@ -31,7 +35,7 @@ COMMON_DEPEND=" " DEPEND=" ${COMMON_DEPEND} - test? ( dev-cpp/catch:0 ) + test? ( <dev-cpp/catch-3:0 ) " BDEPEND="dev-python/sphinx" RDEPEND=" @@ -46,6 +50,7 @@ DOCS=( README.rst CHANGELOG.rst doc/user.rst ) PATCHES=( "${FILESDIR}/${PN}-9.0-do-not-use-as-a-namespace-separator-with-expat.patch" "${FILESDIR}/${PN}-9.0-use-system-catch2.patch" + "${DISTDIR}/${PN}-9.0-fix-missing-include.patch" ) src_configure() { diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml index 294112cad842..1ba5005dccac 100644 --- a/net-im/biboumi/metadata.xml +++ b/net-im/biboumi/metadata.xml @@ -11,11 +11,12 @@ any XMPP client as if these channels were XMPP MUCs. </longdescription> <upstream> - <doc>https://doc.biboumi.louiz.org/</doc> - <bugs-to> https://lab.louiz.org/louiz/biboumi/-/issues</bugs-to> + <remote-id type="codeberg">poezio/biboumi</remote-id> + <doc>https://doc.biboumi.louiz.org</doc> + <bugs-to>https://codeberg.org/poezio/biboumi/issues</bugs-to> </upstream> <use> <flag name="udns">Asynchronously resolve domain names using - net-libs/udns</flag> + <pkg>net-libs/udns</pkg></flag> </use> </pkgmetadata> diff --git a/net-im/bitlbee-facebook/metadata.xml b/net-im/bitlbee-facebook/metadata.xml index 4e8c1c1c58ad..1edcb6c6986c 100644 --- a/net-im/bitlbee-facebook/metadata.xml +++ b/net-im/bitlbee-facebook/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <maintainer status="active"> <email>jgeboski@gmail.com</email> diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild index 485f9d30d9b9..e49b0bf478ea 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-1.4.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -23,8 +23,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libgcrypt:0= >=net-im/bitlbee-3.4[plugins]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild index 485f9d30d9b9..e49b0bf478ea 100644 --- a/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild +++ b/net-im/bitlbee-steam/bitlbee-steam-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -23,8 +23,8 @@ RDEPEND=" dev-libs/glib:2 dev-libs/libgcrypt:0= >=net-im/bitlbee-3.4[plugins]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r3.ebuild index 592437d7f4bb..5978987e6e22 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 systemd toolchain-funcs @@ -20,22 +20,22 @@ HOMEPAGE="https://www.bitlbee.org/" LICENSE="GPL-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE_PROTOCOLS="purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" REQUIRED_USE=" - || ( purple xmpp msn oscar ) + || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) - xmpp? ( !nss ) + test? ( xmpp ) " COMMON_DEPEND=" acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 + dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) @@ -61,10 +61,11 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}"/${PN}-3.5-systemd-user.patch - "${FILESDIR}"/${PN}-3.5-libcheck.patch - "${FILESDIR}"/${PN}-3.5-libevent.patch - "${FILESDIR}"/${P}-disabled-plugins-use.patch + "${FILESDIR}/${PN}-3.5-systemd-user.patch" + "${FILESDIR}/${PN}-3.5-libcheck.patch" + "${FILESDIR}/${PN}-3.5-libevent.patch" + "${FILESDIR}/${P}-disabled-plugins-use.patch" + "${FILESDIR}/${P}-system-json-parser.patch" ) src_configure() { @@ -114,8 +115,10 @@ src_configure() { --prefix=/usr \ --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ - --plugindir=/usr/$(get_libdir)/bitlbee \ + --libdir=/usr/$(get_libdir) \ --pcdir=/usr/$(get_libdir)/pkgconfig \ + --plugindir=/usr/$(get_libdir)/bitlbee \ + --externaljsonparser=1 \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index 075402136f9c..8fe3918c4465 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 systemd toolchain-funcs @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" @@ -20,22 +20,22 @@ HOMEPAGE="https://www.bitlbee.org/" LICENSE="GPL-2" SLOT="0" -IUSE_PROTOCOLS="msn oscar purple twitter +xmpp" +IUSE_PROTOCOLS="purple twitter +xmpp" IUSE="debug +gnutls ipv6 libevent nss otr +plugins selinux test xinetd ${IUSE_PROTOCOLS}" RESTRICT="!test? ( test )" REQUIRED_USE=" - || ( purple xmpp msn oscar ) + || ( purple xmpp ) purple? ( plugins ) - test? ( plugins ) - xmpp? ( !nss ) + test? ( xmpp ) " COMMON_DEPEND=" acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 + dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) @@ -61,7 +61,7 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}"/${PN}-3.5-systemd-user.patch + "${FILESDIR}/${PN}-3.5-systemd-user.patch" ) src_configure() { @@ -111,8 +111,10 @@ src_configure() { --prefix=/usr \ --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ - --plugindir=/usr/$(get_libdir)/bitlbee \ + --libdir=/usr/$(get_libdir) \ --pcdir=/usr/$(get_libdir)/pkgconfig \ + --plugindir=/usr/$(get_libdir)/bitlbee \ + --external_json_parser=1 \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch new file mode 100644 index 000000000000..0a9c197d763d --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.6-system-json-parser.patch @@ -0,0 +1,99 @@ +This is adapted patch from upstream PR 151. Original PR defines +--external-json-parser which breaks configuration, see [1]. It was changed to +--externaljsonparser and $external_json_parser to $externaljsonparser. +Additionally, LDFLAGS_CHECK variable was introduced in order to make +tests working, see [2] and #865667. + +[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 +[2] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1219254239 + +Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 + +diff --git a/configure b/configure +index fd8d363a..39495515 100755 +--- a/configure ++++ b/configure +@@ -47,6 +47,7 @@ plugins=1 + otr=0 + + events=glib ++externaljsonparser=auto + ssl=auto + + pam=0 +@@ -148,6 +149,7 @@ Option Description Default + --events=... Event handler (glib, libevent) $events + --ssl=... SSL library to use (gnutls, nss, openssl, auto) + $ssl ++--externaljsonparser=0/1/auto Use External JSON parser $externaljsonparser + + + --target=... Cross compilation target same as host +@@ -398,6 +400,21 @@ else + fi + echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings + ++if [ "$externaljsonparser" = "auto" ]; then ++ if pkg-config --exists json-parser; then ++ externaljsonparser=1 ++ else ++ externaljsonparser=0 ++ fi ++fi ++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings ++if [ "$externaljsonparser" = "1" ]; then ++ echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings ++ echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings ++ echo "LDFLAGS_CHECK+=$(pkg-config --libs json-parser)" >> Makefile.settings ++fi ++ ++ + detect_gnutls() + { + if $PKG_CONFIG --exists gnutls; then +@@ -979,6 +996,12 @@ else + echo ' systemd disabled.' + fi + ++if [ "$externaljsonparser" = "1" ]; then ++ echo ' Using system JSON parser.' ++else ++ echo ' Using bundled JSON parser.' ++fi ++ + echo ' Using event handler: '$events + echo ' Using SSL library: '$ssl + #echo ' Building with these storage backends: '$STORAGES +diff --git a/lib/Makefile b/lib/Makefile +index fc46aedc..ad95d9cb 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/ + endif + + # [SH] Program variables +-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++ ++ifneq ($(EXTERNAL_JSON_PARSER),1) ++objects += json.o ++endif + + LFLAGS += -r + +diff --git a/tests/Makefile b/tests/Makefile +index 76122a2f..2235bf1d 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -20,7 +20,7 @@ test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc. + + check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o + @echo '*' Linking $@ +- $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS) ++ $(VERBOSE) $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LDFLAGS_CHECK) $(EFLAGS) + + %.o: $(_SRCDIR_)%.c + @echo '*' Compiling $< +-- +2.35.1 + diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml index 4d61638429f9..99fc3dd0270a 100644 --- a/net-im/bitlbee/metadata.xml +++ b/net-im/bitlbee/metadata.xml @@ -1,19 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> <flag name="libevent">Use libevent for event handling</flag> - <flag name="msn">Enable MSN Messenger IM protocol support.</flag> - <flag name="nss">Use NSS for SSL support in MSN and Jabber</flag> - <flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag> + <flag name="nss">Prefer <pkg>dev-libs/nss</pkg> as SSL/TLS provider</flag> <flag name="otr">Enable support for encrypted conversations</flag> <flag name="plugins">Enable support for plugins</flag> <flag name="purple">Use libpurple instead of the built-in IM protocol support</flag> @@ -21,7 +15,9 @@ </use> <longdescription> Bitlbee as an IRC to IM gateway. It provides an irc server that allows - you to log on and then connect to various instant messaging protocols - (AIM, MSN, Yahoo, Jabber, etc). + you to log on and then connect to various instant messaging protocols. </longdescription> + <upstream> + <remote-id type="github">bitlbee/bitlbee</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest deleted file mode 100644 index 8c822e3f91a8..000000000000 --- a/net-im/cawbird/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1 diff --git a/net-im/cawbird/cawbird-1.5-r2.ebuild b/net-im/cawbird/cawbird-1.5-r2.ebuild deleted file mode 100644 index aee227728983..000000000000 --- a/net-im/cawbird/cawbird-1.5-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome2-utils meson vala xdg - -DESCRIPTION="Twitter client" -HOMEPAGE="https://ibboard.co.uk/cawbird/ https://github.com/IBBoard/cawbird" -SRC_URI="https://github.com/IBBoard/cawbird/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${P} - -LICENSE="CC-BY-3.0 GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gstreamer spell" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/atk - dev-libs/glib:2 - dev-libs/json-glib - net-libs/liboauth - net-libs/libsoup:2.4 - net-libs/rest:0.7 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - gstreamer? ( - media-plugins/gst-plugins-gtk - media-plugins/gst-plugins-hls - media-plugins/gst-plugins-meta[ffmpeg,http,X] - ) - spell? ( app-text/gspell:=[vala] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - $(vala_depend) - virtual/pkgconfig -" - -src_prepare() { - default - vala_setup -} - -src_configure() { - local emesonargs=( - # these keys are taken from the readme of cawbird - -Dconsumer_key_base64='VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==' - -Dconsumer_secret_base64='MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=' - -Dexamples=false - $(meson_use spell spellcheck) - $(meson_use gstreamer video) - -Dx11=true - ) - meson_src_configure -} - -pkg_postinst() { - gnome2_schemas_update - xdg_pkg_postinst -} - -pkg_postrm() { - gnome2_schemas_update - xdg_pkg_postrm -} diff --git a/net-im/cawbird/metadata.xml b/net-im/cawbird/metadata.xml deleted file mode 100644 index d1905ebb02b4..000000000000 --- a/net-im/cawbird/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>matthew@gentoo.org</email> - <name>Matthew Smith</name> -</maintainer> -<upstream> - <remote-id type="github">IBBoard/cawbird</remote-id> -</upstream> -</pkgmetadata> diff --git a/net-im/centerim/centerim-5.0.1-r1.ebuild b/net-im/centerim/centerim-5.0.1-r2.ebuild index 9645e450a652..1b0105e0b4fd 100644 --- a/net-im/centerim/centerim-5.0.1-r1.ebuild +++ b/net-im/centerim/centerim-5.0.1-r2.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 MY_P="${PN}5-${PV/_}" DESCRIPTION="Ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal client" -SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz" HOMEPAGE="http://www.centerim.org/" -SLOT="0" +SRC_URI="http://www.centerim.org/download/cim5/${MY_P}.tar.gz" + LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 x86" IUSE="debug nls" @@ -19,20 +20,20 @@ DEPEND=">=sys-libs/ncurses-5.2:= >=dev-libs/libsigc++-2.2.0:2" RDEPEND="${DEPEND} nls? ( sys-devel/gettext )" -DEPEND="${DEPEND} - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}"/${MY_P} src_configure() { - econf \ + CONFIG_SHELL="${BROOT}"/bin/bash econf \ $(use_enable debug) \ $(use_enable nls) } src_install() { emake DESTDIR="${D}" install - rm -f "${D}"/usr/lib*/libcppconsui.{a,la} + + find "${ED}" -name '*.la' -delete || die dodoc AUTHORS HACKING NEWS README TODO } diff --git a/net-im/choqok/choqok-1.7.0-r1.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild index 347ae3c26c3d..907f34b30bfc 100644 --- a/net-im/choqok/choqok-1.7.0-r1.ebuild +++ b/net-im/choqok/choqok-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ SLOT="5" IUSE="attica share telepathy" DEPEND=" - >=app-crypt/qca-2.3.0:2 + >=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetworkauth-${QTMIN}:5 @@ -60,6 +60,7 @@ PATCHES=( "${WORKDIR}/${P}-choqokplugin.patch" "${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938 "${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297 + "${FILESDIR}/${P}-fix-KCModule-warning.patch" # bug 871546, git master ) src_configure() { diff --git a/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch new file mode 100644 index 000000000000..26721514ca04 --- /dev/null +++ b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch @@ -0,0 +1,43 @@ +From 9c488d8f776b5e7462e8e57dc2b15db5fe28815a Mon Sep 17 00:00:00 2001 +From: Andrea Scarpino <scarpino@kde.org> +Date: Sat, 8 Feb 2020 16:06:18 +0100 +Subject: [PATCH] Fix warning about KCModule::changed + +--- + choqok/config/behavior/behaviorconfig.cpp | 4 ++-- + choqok/config/plugins/choqokpluginconfig.cpp | 3 +-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/choqok/config/behavior/behaviorconfig.cpp b/choqok/config/behavior/behaviorconfig.cpp +index a25b0196..fb1d16b3 100644 +--- a/choqok/config/behavior/behaviorconfig.cpp ++++ b/choqok/config/behavior/behaviorconfig.cpp +@@ -95,9 +95,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList &args) + d->mBehaviorTabCtl->addTab(d->proxyModule, proxyInfo.moduleName()); + + connect(d->mPrfsShorten, (void (BehaviorConfig_Shorten::*)(bool))&BehaviorConfig_Shorten::changed, +- this, (void (KCModule::*)())&KCModule::changed); ++ this, &BehaviorConfig::markAsChanged); + connect(d->proxyModule, (void (KCModuleProxy::*)(KCModuleProxy*))&KCModuleProxy::changed, +- this, (void (KCModule::*)())&KCModule::changed); ++ this, &BehaviorConfig::markAsChanged); + + load(); + +diff --git a/choqok/config/plugins/choqokpluginconfig.cpp b/choqok/config/plugins/choqokpluginconfig.cpp +index 1a5f4fc2..4f36d608 100644 +--- a/choqok/config/plugins/choqokpluginconfig.cpp ++++ b/choqok/config/plugins/choqokpluginconfig.cpp +@@ -46,8 +46,7 @@ ChoqokPluginConfig::ChoqokPluginConfig(QWidget *parent, const QVariantList &args + mainLayout->setMargin(0); + mainLayout->addWidget(m_pluginSelector); + +- connect(m_pluginSelector, &KPluginSelector::changed, this, +- (void (KCModule::*)())&KCModule::changed); ++ connect(m_pluginSelector, &KPluginSelector::changed, this, &ChoqokPluginConfig::markAsChanged); + connect(m_pluginSelector, &KPluginSelector::configCommitted, + this, &ChoqokPluginConfig::reparseConfiguration); + +-- +GitLab + diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest index f6b191a10c62..b7be62479570 100644 --- a/net-im/coturn/Manifest +++ b/net-im/coturn/Manifest @@ -1 +1,2 @@ DIST coturn-4.5.2.tar.gz 442745 BLAKE2B c18d5f5cfedd600875c0bfa08b874ef6316a5aa9af34c27e2901825da412b794d437e08f0706f9651bdf6d3d19e151486af39a42f2326c7ab6bb802d33fd0ba4 SHA512 00e86a3a273a8e4e69deaefd338bdd6c44739a807f21a72a2d68efc089053e16efd1d5b34b0c6dea7a0fa2b66f70821d8c3e1107561e1f08dfac2c93933a6121 +DIST coturn-4.6.0.tar.gz 474423 BLAKE2B b70ecd1f333f4f9f37adcab6f5fd3406aa0eb962488b7cae4a30c9339cf7b11b2bfedd1fa70bd3b0c32bf82702d39eb22278506521f71e0cb6aaadee9d3c3d05 SHA512 a80ea1b8d9c78b8f9fc632517a0246cb0d2d4ff21c59d53827f026fb3a145a01b3bec637af94a96b525c35251cb5e9e209ba7f368f08e12ef61220bcb784637c diff --git a/net-im/coturn/coturn-4.6.0.ebuild b/net-im/coturn/coturn-4.6.0.ebuild new file mode 100644 index 000000000000..8c10c10306aa --- /dev/null +++ b/net-im/coturn/coturn-4.6.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs systemd tmpfiles + +DESCRIPTION="coturn TURN server project" +HOMEPAGE="https://github.com/coturn/coturn" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/coturn/coturn.git" + inherit git-r3 + #S="${WORKDIR}/${PN}-master" +else + SRC_URI="https://github.com/coturn/coturn/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="mongodb mysql postgres redis sqlite" + +RDEPEND=" + acct-group/turnserver + acct-user/turnserver + >dev-libs/libevent-2.1.8:= + dev-libs/openssl:= + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:* ) + redis? ( dev-libs/hiredis:= ) + sqlite? ( dev-db/sqlite ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-4.5.2-respect-TMPDIR.patch + "${FILESDIR}"/${P}-openssl3.patch +) + +src_configure() { + if [[ -n "${AR}" ]]; then + sed 's:ARCHIVERCMD="ar -r":ARCHIVERCMD="${AR} -r":g' -i "${S}/configure" + fi + + sed 's:MANPREFIX}/man/:MANPREFIX}/:g' -i "${S}/Makefile.in" || die "sed for mandir failed" + sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \ + -i "${S}/examples/etc/turnserver.conf" || die "sed for logdir failed" + sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \ + || die "sed for simple-log failed" + sed '/INSTALL_DIR} examples\/script/a \ \${INSTALL_DIR} examples\/ca \${DESTDIR}${EXAMPLESDIR}' \ + -i "${S}/Makefile.in" || die "sed for example ca failed" + + if ! use mongodb; then + export TURN_NO_MONGO=yes + fi + if ! use mysql; then + export TURN_NO_MYSQL=yes + fi + if ! use postgres; then + export TURN_NO_PQ=yes + fi + if ! use redis; then + export TURN_NO_HIREDIS=yes + fi + if ! use sqlite; then + export TURN_NO_SQLITE=yes + fi + + tc-export CC + + export ARCHIVERCMD="$(tc-getAR) -r" + export PKGCONFIG="$(tc-getPKG_CONFIG)" + export DOCSDIR="/usr/share/doc/${PN}-${PV}" + + econf $(use_with sqlite) +} + +src_install() { + default + + newinitd "${FILESDIR}/turnserver.init" turnserver + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate.${PN}" "${PN}" + + systemd_dounit "${FILESDIR}/${PN}.service" + dotmpfiles "${FILESDIR}/${PN}.conf" +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + + elog "You need to copy ${EROOT}/etc/turnserver.conf.default to" + elog "${EROOT}/etc/turnserver.conf and do your settings there." +} diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild index d3a3c8813604..8c10c10306aa 100644 --- a/net-im/coturn/coturn-9999.ebuild +++ b/net-im/coturn/coturn-9999.ebuild @@ -4,22 +4,25 @@ EAPI=7 inherit toolchain-funcs systemd tmpfiles + DESCRIPTION="coturn TURN server project" HOMEPAGE="https://github.com/coturn/coturn" -if [ ${PV} = 9999 ]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/coturn/coturn.git" inherit git-r3 -# S="${WORKDIR}/${PN}-master" + #S="${WORKDIR}/${PN}-master" else + SRC_URI="https://github.com/coturn/coturn/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi LICENSE="BSD" SLOT="0" IUSE="mongodb mysql postgres redis sqlite" -RDEPEND="acct-group/turnserver + +RDEPEND=" + acct-group/turnserver acct-user/turnserver >dev-libs/libevent-2.1.8:= dev-libs/openssl:= @@ -27,18 +30,21 @@ RDEPEND="acct-group/turnserver mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis:= ) - sqlite? ( dev-db/sqlite )" + sqlite? ( dev-db/sqlite ) +" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-4.5.2-respect-TMPDIR.patch + "${FILESDIR}"/${P}-openssl3.patch ) src_configure() { - if [ -n "${AR}" ]; then + if [[ -n "${AR}" ]]; then sed 's:ARCHIVERCMD="ar -r":ARCHIVERCMD="${AR} -r":g' -i "${S}/configure" fi + sed 's:MANPREFIX}/man/:MANPREFIX}/:g' -i "${S}/Makefile.in" || die "sed for mandir failed" sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \ -i "${S}/examples/etc/turnserver.conf" || die "sed for logdir failed" @@ -46,6 +52,7 @@ src_configure() { || die "sed for simple-log failed" sed '/INSTALL_DIR} examples\/script/a \ \${INSTALL_DIR} examples\/ca \${DESTDIR}${EXAMPLESDIR}' \ -i "${S}/Makefile.in" || die "sed for example ca failed" + if ! use mongodb; then export TURN_NO_MONGO=yes fi @@ -73,15 +80,19 @@ src_configure() { src_install() { default + newinitd "${FILESDIR}/turnserver.init" turnserver + insinto /etc/logrotate.d newins "${FILESDIR}/logrotate.${PN}" "${PN}" + systemd_dounit "${FILESDIR}/${PN}.service" dotmpfiles "${FILESDIR}/${PN}.conf" } pkg_postinst() { - tmpfiles_process "${PN}.conf" - elog "You need to copy /etc/turnserver.conf.default to" - elog "/etc/turnserver.conf and do your settings there." + tmpfiles_process ${PN}.conf + + elog "You need to copy ${EROOT}/etc/turnserver.conf.default to" + elog "${EROOT}/etc/turnserver.conf and do your settings there." } diff --git a/net-im/coturn/files/coturn-4.6.0-openssl3.patch b/net-im/coturn/files/coturn-4.6.0-openssl3.patch new file mode 100644 index 000000000000..19b88048af50 --- /dev/null +++ b/net-im/coturn/files/coturn-4.6.0-openssl3.patch @@ -0,0 +1,356 @@ +https://github.com/coturn/coturn/commit/9af9f6306ab73c3403f9e11086b1936e9148f7de +https://github.com/coturn/coturn/commit/4ce784a8781ab086c150e2b9f5641b1a37fd9b31 +https://github.com/coturn/coturn/commit/9370bb742d976166a51032760da1ecedefb92267 +https://github.com/coturn/coturn/commit/d72a2a8920b80ce66b36e22b2c22f308ad06c424 + +From 9af9f6306ab73c3403f9e11086b1936e9148f7de Mon Sep 17 00:00:00 2001 +From: Pavel Punsky <eakraly@users.noreply.github.com> +Date: Wed, 14 Sep 2022 03:29:26 -0700 +Subject: [PATCH] Fix renegotiation flag for older version of openssl (#978) + +`SSL_OP_NO_RENEGOTIATION` is only supported in openssl-1.1.0 and above +Older versions have `SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS ` + +Fixes #977 and #952 + +Test: +Build in a docker container running running openssl-1.0.2g (ubuntu +16.04) successfully (without the fix getting the same errors) +--- a/src/apps/relay/dtls_listener.c ++++ b/src/apps/relay/dtls_listener.c +@@ -295,8 +295,17 @@ static ioa_socket_handle dtls_server_input_handler(dtls_listener_relay_server_ty + SSL_set_accept_state(connecting_ssl); + + SSL_set_bio(connecting_ssl, NULL, wbio); +- SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE | SSL_OP_NO_RENEGOTIATION); +- ++ SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) ++ | SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS ++#endif ++#else ++#if defined(SSL_OP_NO_RENEGOTIATION) ++ | SSL_OP_NO_RENEGOTIATION ++#endif ++#endif ++ ); + SSL_set_max_cert_list(connecting_ssl, 655350); + + ioa_socket_handle rc = dtls_accept_client_connection(server, s, connecting_ssl, +@@ -581,7 +590,17 @@ static int create_new_connected_udp_socket( + + SSL_set_bio(connecting_ssl, NULL, wbio); + +- SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE | SSL_OP_NO_RENEGOTIATION); ++ SSL_set_options(connecting_ssl, SSL_OP_COOKIE_EXCHANGE ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) ++ | SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS ++#endif ++#else ++#if defined(SSL_OP_NO_RENEGOTIATION) ++ | SSL_OP_NO_RENEGOTIATION ++#endif ++#endif ++ ); + + SSL_set_max_cert_list(connecting_ssl, 655350); + int rc = ssl_read(ret->fd, connecting_ssl, server->sm.m.sm.nd.nbh, +--- a/src/apps/relay/ns_ioalib_engine_impl.c ++++ b/src/apps/relay/ns_ioalib_engine_impl.c +@@ -1428,7 +1428,17 @@ static void set_socket_ssl(ioa_socket_handle s, SSL *ssl) + if(ssl) { + SSL_set_app_data(ssl,s); + SSL_set_info_callback(ssl, (ssl_info_callback_t)ssl_info_callback); +- SSL_set_options(ssl, SSL_OP_NO_RENEGOTIATION); ++ SSL_set_options(ssl, ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) ++ SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS ++#endif ++#else ++#if defined(SSL_OP_NO_RENEGOTIATION) ++ SSL_OP_NO_RENEGOTIATION ++#endif ++#endif ++ ); + } + } + } + +From 4ce784a8781ab086c150e2b9f5641b1a37fd9b31 Mon Sep 17 00:00:00 2001 +From: Pavel Punsky <eakraly@users.noreply.github.com> +Date: Fri, 16 Sep 2022 00:46:45 -0700 +Subject: [PATCH] Improve openssl3 and FIPS support (#955) + +openssl-3.0 deprecated some APIs and introduced new APIs instead: + +`SSL_get_peer_certificate ` -> `SSL_get1_peer_certificate ` +`FIPS_mode()`->`EVP_default_properties_is_fips_enabled()` +`EVP_MD_CTX_set_flags()`->`EVP_default_properties_enable_fips()` +specifically for enabling FIPS mode + +This change should workaround that by ifdef-ing old/new versions of +openssl and APIs - so pre-3.0 use existing APIs (so not change there) +and >=3.0 will use new APIs (whether it actually works or not is still +TBD as this is just a first step in openssl-3.0 support) + +Should fix #886 + +Test Plan: +Run CI build that supports ubuntu-20.04 (openssl-1.1.1) and ubuntu-22.04 +(openssl-3.0.2) +Both builds pass +None of them have FIPS support (which for 1.1.x stays the same as +before) + +Co-authored-by: Pavel Punsky <pavel.punsky@epicgames.com> +--- a/src/apps/relay/ns_ioalib_engine_impl.c ++++ b/src/apps/relay/ns_ioalib_engine_impl.c +@@ -1868,7 +1868,11 @@ int ssl_read(evutil_socket_t fd, SSL* ssl, ioa_network_buffer_handle nbh, int ve + + } else if (!if1 && if2) { + ++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) ++ if(verbose && SSL_get1_peer_certificate(ssl)) { ++#else + if(verbose && SSL_get_peer_certificate(ssl)) { ++#endif + printf("\n------------------------------------------------------------\n"); + X509_NAME_print_ex_fp(stdout, X509_get_subject_name(SSL_get_peer_certificate(ssl)), 1, + XN_FLAG_MULTILINE); +--- a/src/apps/uclient/startuclient.c ++++ b/src/apps/uclient/startuclient.c +@@ -138,7 +138,11 @@ static SSL* tls_connect(ioa_socket_raw fd, ioa_addr *remote_addr, int *try_again + if (rc > 0) { + TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,"%s: client session connected with cipher %s, method=%s\n",__FUNCTION__, + SSL_get_cipher(ssl),turn_get_ssl_method(ssl,NULL)); ++#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) ++ if(clnet_verbose && SSL_get1_peer_certificate(ssl)) { ++#else + if(clnet_verbose && SSL_get_peer_certificate(ssl)) { ++#endif + TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "------------------------------------------------------------\n"); + X509_NAME_print_ex_fp(stdout, X509_get_subject_name(SSL_get_peer_certificate(ssl)), 1, + XN_FLAG_MULTILINE); +--- a/src/client/ns_turn_msg.c ++++ b/src/client/ns_turn_msg.c +@@ -248,12 +248,22 @@ int stun_produce_integrity_key_str(const uint8_t *uname, const uint8_t *realm, c + if (FIPS_mode()) { + EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); + } +-#endif ++#endif // defined EVP_MD_CTX_FLAG_NON_FIPS_ALLOW && !defined(LIBRESSL_VERSION_NUMBER) + EVP_DigestInit_ex(&ctx,EVP_md5(), NULL); + EVP_DigestUpdate(&ctx,str,strl); + EVP_DigestFinal(&ctx,key,&keylen); + EVP_MD_CTX_cleanup(&ctx); +-#else ++#elif OPENSSL_VERSION_NUMBER >= 0x30000000L ++ unsigned int keylen = 0; ++ EVP_MD_CTX *ctx = EVP_MD_CTX_new(); ++ if (EVP_default_properties_is_fips_enabled(NULL)) { ++ EVP_default_properties_enable_fips(NULL, 0); ++ } ++ EVP_DigestInit_ex(ctx,EVP_md5(), NULL); ++ EVP_DigestUpdate(ctx,str,strl); ++ EVP_DigestFinal(ctx,key,&keylen); ++ EVP_MD_CTX_free(ctx); ++#else // OPENSSL_VERSION_NUMBER < 0x10100000L + unsigned int keylen = 0; + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); + #if defined EVP_MD_CTX_FLAG_NON_FIPS_ALLOW && ! defined(LIBRESSL_VERSION_NUMBER) +@@ -265,7 +275,7 @@ int stun_produce_integrity_key_str(const uint8_t *uname, const uint8_t *realm, c + EVP_DigestUpdate(ctx,str,strl); + EVP_DigestFinal(ctx,key,&keylen); + EVP_MD_CTX_free(ctx); +-#endif ++#endif // OPENSSL_VERSION_NUMBER < 0X10100000L + ret = 0; + } + + +From 9370bb742d976166a51032760da1ecedefb92267 Mon Sep 17 00:00:00 2001 +From: Pavel Punsky <eakraly@users.noreply.github.com> +Date: Fri, 16 Sep 2022 23:29:32 -0700 +Subject: [PATCH] Fix a warning (#988) + +There are too many defines that are, eventually, used in one place so +just inlining. + +Current code generates following warning: +``` +warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] +``` + +With the fix there is no warning + +Co-authored-by: Pavel Punsky <pavel.punsky@epicgames.com> +--- a/src/apps/relay/netengine.c ++++ b/src/apps/relay/netengine.c +@@ -31,13 +31,7 @@ + #include "mainrelay.h" + + //////////// Backward compatibility with OpenSSL 1.0.x ////////////// +-#define HAVE_OPENSSL11_API (!(OPENSSL_VERSION_NUMBER < 0x10100001L || defined LIBRESSL_VERSION_NUMBER)) +- +-#ifndef HAVE_SSL_CTX_UP_REF +-#define HAVE_SSL_CTX_UP_REF HAVE_OPENSSL11_API +-#endif +- +-#if !HAVE_SSL_CTX_UP_REF ++#if (OPENSSL_VERSION_NUMBER < 0x10100001L || defined LIBRESSL_VERSION_NUMBER) + #define SSL_CTX_up_ref(ctx) CRYPTO_add(&(ctx)->references, 1, CRYPTO_LOCK_SSL_CTX) + #endif + + +From d72a2a8920b80ce66b36e22b2c22f308ad06c424 Mon Sep 17 00:00:00 2001 +From: Pavel Punsky <eakraly@users.noreply.github.com> +Date: Mon, 24 Oct 2022 13:06:35 -0700 +Subject: [PATCH] Cleanup openssl initialization (#1012) + +Rewriting openssl initialization code (threading support to make it +cleaner + +- Regroup functions so that there is one ifdef (for old code and new +code) +- Modern openssl (>1.0.2) does not need any synchornization routines so +they are empty +- Old openssl (<=1.0.2) now require `OPENSSL_THREADS` which allows +running multiple threads in turnserver. Not having turnserver +multi-threaded is a huge waste. `OPENSSL_THREADS` is now a requirement. + + +Test Plan: +- CI builds pass for openssl versions 1.0.2, 1.1.1, 3.0, including tests +--- a/src/apps/relay/mainrelay.c ++++ b/src/apps/relay/mainrelay.c +@@ -1345,7 +1345,6 @@ static void set_option(int c, char *value) + STRCPY(turn_params.relay_ifname, value); + break; + case 'm': +-#if defined(OPENSSL_THREADS) + if(atoi(value)>MAX_NUMBER_OF_GENERAL_RELAY_SERVERS) { + TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: max number of relay threads is 128.\n"); + turn_params.general_relay_servers_number = MAX_NUMBER_OF_GENERAL_RELAY_SERVERS; +@@ -1354,9 +1353,6 @@ static void set_option(int c, char *value) + } else { + turn_params.general_relay_servers_number = atoi(value); + } +-#else +- TURN_LOG_FUNC(TURN_LOG_LEVEL_WARNING, "WARNING: OpenSSL version is too old OR does not support threading,\n I am using single thread for relaying.\n"); +-#endif + break; + case 'd': + STRCPY(turn_params.listener_ifname, value); +@@ -2645,9 +2641,8 @@ int main(int argc, char **argv) + + ////////// OpenSSL locking //////////////////////////////////////// + +-#if defined(OPENSSL_THREADS) +- +-static char some_buffer[65536]; ++#if defined(OPENSSL_THREADS) ++#if OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0 + + //array larger than anything that OpenSSL may need: + static pthread_mutex_t mutex_buf[256]; +@@ -2665,76 +2660,52 @@ void coturn_locking_function(int mode, int n, const char *file, int line) { + } + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L + void coturn_id_function(CRYPTO_THREADID *ctid); + void coturn_id_function(CRYPTO_THREADID *ctid) + { + UNUSED_ARG(ctid); + CRYPTO_THREADID_set_numeric(ctid, (unsigned long)pthread_self()); + } +-#else +-unsigned long coturn_id_function(void); +-unsigned long coturn_id_function(void) +-{ +- return (unsigned long)pthread_self(); +-} +-#endif +- +-#endif + + static int THREAD_setup(void) { +- +-#if defined(OPENSSL_THREADS) +- +- int i; +- +- some_buffer[0] = 0; +- ++ int i; + for (i = 0; i < CRYPTO_num_locks(); i++) { + pthread_mutex_init(&(mutex_buf[i]), NULL); + } + + mutex_buf_initialized = 1; +- +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER <= OPENSSL_VERSION_1_1_1 + CRYPTO_THREADID_set_callback(coturn_id_function); +-#else +- CRYPTO_set_id_callback(coturn_id_function); +-#endif +- + CRYPTO_set_locking_callback(coturn_locking_function); +-#endif +- + return 1; + } + + int THREAD_cleanup(void); + int THREAD_cleanup(void) { ++ int i; + +-#if defined(OPENSSL_THREADS) ++ if (!mutex_buf_initialized) ++ return 0; + +- int i; +- +- if (!mutex_buf_initialized) +- return 0; ++ CRYPTO_THREADID_set_callback(NULL); ++ CRYPTO_set_locking_callback(NULL); ++ for (i = 0; i < CRYPTO_num_locks(); i++) { ++ pthread_mutex_destroy(&(mutex_buf[i])); ++ } + +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER <= OPENSSL_VERSION_1_1_1 +- CRYPTO_THREADID_set_callback(NULL); ++ mutex_buf_initialized = 0; ++ return 1; ++} + #else +- CRYPTO_set_id_callback(NULL); +-#endif +- +- CRYPTO_set_locking_callback(NULL); +- for (i = 0; i < CRYPTO_num_locks(); i++) { +- pthread_mutex_destroy(&(mutex_buf[i])); +- } +- +- mutex_buf_initialized = 0; +- +-#endif ++static int THREAD_setup(void) { ++ return 1; ++} + +- return 1; ++int THREAD_cleanup(void); ++int THREAD_cleanup(void){ ++ return 1; + } ++#endif /* OPENSSL_VERSION_NUMBER < OPENSSL_VERSION_1_1_0 */ ++#endif /* defined(OPENSSL_THREADS) */ + + static void adjust_key_file_name(char *fn, const char* file_title, int critical) + { + diff --git a/net-im/coturn/metadata.xml b/net-im/coturn/metadata.xml index 37bda90badca..1801b91d9921 100644 --- a/net-im/coturn/metadata.xml +++ b/net-im/coturn/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>nativemad@gentoo.org</email> - <name>Andreas Schuerch</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">coturn/coturn</remote-id> </upstream> diff --git a/net-im/cpop/cpop-0.0.4-r1.ebuild b/net-im/cpop/cpop-0.0.4-r2.ebuild index 9315a2381ea0..77c21027edcc 100644 --- a/net-im/cpop/cpop-0.0.4-r1.ebuild +++ b/net-im/cpop/cpop-0.0.4-r2.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol" HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop" @@ -11,14 +13,24 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -RDEPEND="dev-libs/glib:2 - x11-libs/gtk+:2" +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:2 +" DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch + "${FILESDIR}"/${P}-implicit-func-decls.patch ) +src_prepare() { + default + + # Clang 16, bug #900072 + eautoreconf +} + src_install() { emake DESTDIR="${D}" install dodoc README diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch b/net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch new file mode 100644 index 000000000000..ff3977e18055 --- /dev/null +++ b/net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/885705 +--- a/pop_client.c ++++ b/pop_client.c +@@ -2,6 +2,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/socket.h> ++#include <unistd.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <errno.h> +--- a/pop_common.h ++++ b/pop_common.h +@@ -3,4 +3,5 @@ + #define CP_MSGSIZE 2048 + #define CP_PORT 3233 + void errquit(char *message); ++void printquit(char *message); + #endif diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml index 211f6fdfa6ba..87eb3c5383c3 100644 --- a/net-im/dianara/metadata.xml +++ b/net-im/dianara/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to> - </upstream> + <!-- maintainer-needed --> + <upstream> + <bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to> + <remote-id type="savannah-nongnu">dianara</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest index 0c5caf3183b0..674adcabd18e 100644 --- a/net-im/dino/Manifest +++ b/net-im/dino/Manifest @@ -1,2 +1,2 @@ -DIST dino-0.2.1.tar.gz 514504 BLAKE2B 42fae18bb7cda276c1eadeefdea130069f9929dfde62855f00ab6b88912fe9db3374315f40ff8f53350cf38e45fe61b0fd6256ef390cdbed6a65a3f2d79ac80a SHA512 b71497ec115945eadf7d33bb973f68465a20284aa75f37f1ae25fc30c1c423ce28cb10f7e9123c47f82e77e97170b8fa72c75389dacc3a2aa3d487a9c9610d49 -DIST dino-0.3.0.tar.gz 804810 BLAKE2B cb6365f6fad051d0308909c6d5d2c59d7f57cb94f9f691516e27b7bb3aba214fdffa95066d8203d8ac5bd770bec1580e81baad313beef7fe5c058e1e94a37556 SHA512 e3d885208451b00b0416a1401780a94a169fb1179b2f609f7965e3445873d6b72ded84cb471d534616892ec89b5edcd6701fc97c36f19d690f4b894399000515 +DIST dino-0.4.2.tar.gz 882421 BLAKE2B 36c0487a19202506e4de69afd923991c912e82c974f61e787ff4af37a40133fdbdb02315e82f7e85ccb8b3cd7d734aed7f8508ca31c1ffec49674ef68f71793b SHA512 b5d5b9e2ab2ff24f53778303e5428ed0613537944cf5d9139aa7e13558ee40ffb1566c6e9267dd802938a6abf0f0d5fbe94ef17fb3e18a11d47cc0d040928d19 +DIST dino-0.4.3.tar.gz 883558 BLAKE2B 31ea5eafedcaabbc1ec99c72b5a0c1a6f80462ce3f8288b2d54d68106cfb9a31d3ac525660cd1ff7bf0faf2fbfdb2f47dd37672cc0f2b3283121fd364f670092 SHA512 c3e5e3ba05d7190206a8a3144002eac94f162525ab229edd420215eff3d5644293d0c8737266f0ed9f112313b2e6e83fb02fcc10d0f568fb5b2295238ebe78ea diff --git a/net-im/dino/dino-0.2.1-r1.ebuild b/net-im/dino/dino-0.4.2-r2.ebuild index 4a660b77b34b..de4977426bc8 100644 --- a/net-im/dino/dino-0.2.1-r1.ebuild +++ b/net-im/dino/dino-0.4.2-r2.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_MAKEFILE_GENERATOR="ninja" -VALA_MIN_API_VERSION="0.34" -inherit cmake vala xdg +inherit cmake vala xdg readme.gentoo-r1 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala" HOMEPAGE="https://dino.im" LICENSE="GPL-3" SLOT="0" -IUSE="+gpg +http +omemo +notification-sound test" +IUSE="+gpg +http +omemo +notification-sound +rtp test" RESTRICT="!test? ( test )" MY_REPO_URI="https://github.com/dino/dino" @@ -20,54 +18,66 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="${MY_REPO_URI}.git" inherit git-r3 else - KEYWORDS="amd64 arm64" + 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 + dev-libs/icu:= + dev-libs/libgee:0.8= + gui-libs/gtk:4 + >=gui-libs/libadwaita-1.2.0:1[vala] + media-libs/graphene net-libs/glib-networking + net-libs/gnutls:= + >=net-libs/libnice-0.1.15 net-libs/libsignal-protocol-c + net-libs/libsrtp:2= x11-libs/cairo x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 x11-libs/pango gpg? ( app-crypt/gpgme:= ) http? ( net-libs/libsoup:2.4 ) + notification-sound? ( media-libs/libcanberra:0[sound] ) omemo? ( - dev-libs/libgcrypt:0 - media-gfx/qrencode + dev-libs/libgcrypt:= + media-gfx/qrencode:= + ) + rtp? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + media-libs/webrtc-audio-processing:0 ) - notification-sound? ( media-libs/libcanberra:0[sound] ) " DEPEND=" - $(vala_depend) ${RDEPEND} + media-libs/gst-plugins-base + media-libs/gstreamer +" +BDEPEND=" sys-devel/gettext + $(vala_depend) " -src_prepare() { - cmake_src_prepare - vala_src_prepare -} - src_configure() { + vala_setup + local disabled_plugins=( $(usex gpg "" "openpgp") $(usex omemo "" "omemo") $(usex http "" "http-files") + $(usex rtp "" rtp) ) local enabled_plugins=( $(usex notification-sound "notification-sound" "") ) - local mycmakeargs+=( + local mycmakeargs=( "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" + "-DSOUP_VERSION=2" "-DBUILD_TESTS=$(usex test)" ) @@ -77,3 +87,13 @@ src_configure() { src_test() { "${BUILD_DIR}"/xmpp-vala-test || die } + +src_install() { + cmake_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/net-im/dino/dino-0.4.3-r1.ebuild b/net-im/dino/dino-0.4.3-r1.ebuild new file mode 100644 index 000000000000..0badcf1fd992 --- /dev/null +++ b/net-im/dino/dino-0.4.3-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 +rtp 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=" + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libgee:0.8= + gui-libs/gtk:4 + >=gui-libs/libadwaita-1.2.0:1[vala] + media-libs/graphene + net-libs/glib-networking + net-libs/gnutls:= + >=net-libs/libnice-0.1.15 + net-libs/libsignal-protocol-c + net-libs/libsrtp:2= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango + gpg? ( app-crypt/gpgme:= ) + http? ( net-libs/libsoup:2.4 ) + notification-sound? ( media-libs/libcanberra:0[sound] ) + omemo? ( + dev-libs/libgcrypt:= + media-gfx/qrencode:= + ) + rtp? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + media-libs/webrtc-audio-processing:0 + ) +" +DEPEND=" + ${RDEPEND} + media-libs/gst-plugins-base + media-libs/gstreamer +" +BDEPEND=" + sys-devel/gettext + $(vala_depend) +" + +PATCHES=( + "${FILESDIR}"/${P}-c99.patch +) + +src_configure() { + vala_setup + + local disabled_plugins=( + $(usex gpg "" "openpgp") + $(usex omemo "" "omemo") + $(usex http "" "http-files") + $(usex rtp "" rtp) + ) + 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}" + "-DSOUP_VERSION=2" + "-DBUILD_TESTS=$(usex test)" + ) + + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}"/xmpp-vala-test || die +} + +src_install() { + cmake_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + readme.gentoo_print_elog +} diff --git a/net-im/dino/dino-0.3.0.ebuild b/net-im/dino/dino-0.4.3.ebuild index dcefefcd1c83..443a60ca974f 100644 --- a/net-im/dino/dino-0.3.0.ebuild +++ b/net-im/dino/dino-0.4.3.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_MAKEFILE_GENERATOR="ninja" -VALA_MIN_API_VERSION="0.34" inherit cmake vala xdg readme.gentoo-r1 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala" @@ -12,7 +10,7 @@ HOMEPAGE="https://dino.im" LICENSE="GPL-3" SLOT="0" -IUSE="+gpg +http +omemo +notification-sound test" +IUSE="+gpg +http +omemo +notification-sound +rtp test" RESTRICT="!test? ( test )" MY_REPO_URI="https://github.com/dino/dino" @@ -25,53 +23,61 @@ else fi RDEPEND=" - app-text/gspell[vala] dev-db/sqlite:3 dev-libs/glib:2 - dev-libs/icu - dev-libs/libgee:0.8 + dev-libs/icu:= + dev-libs/libgee:0.8= + gui-libs/gtk:4 + >=gui-libs/libadwaita-1.2.0:1[vala] + media-libs/graphene net-libs/glib-networking + net-libs/gnutls:= >=net-libs/libnice-0.1.15 net-libs/libsignal-protocol-c - net-libs/libsrtp:2 + net-libs/libsrtp:2= x11-libs/cairo x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 x11-libs/pango gpg? ( app-crypt/gpgme:= ) http? ( net-libs/libsoup:2.4 ) + notification-sound? ( media-libs/libcanberra:0[sound] ) omemo? ( - dev-libs/libgcrypt:0 - media-gfx/qrencode + dev-libs/libgcrypt:= + media-gfx/qrencode:= + ) + rtp? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + media-libs/webrtc-audio-processing:0 ) - notification-sound? ( media-libs/libcanberra:0[sound] ) " DEPEND=" - $(vala_depend) ${RDEPEND} media-libs/gst-plugins-base media-libs/gstreamer +" +BDEPEND=" sys-devel/gettext + $(vala_depend) " -src_prepare() { - cmake_src_prepare - vala_src_prepare -} - src_configure() { + vala_setup + local disabled_plugins=( $(usex gpg "" "openpgp") $(usex omemo "" "omemo") $(usex http "" "http-files") + $(usex rtp "" rtp) ) local enabled_plugins=( $(usex notification-sound "notification-sound" "") ) - local mycmakeargs+=( + local mycmakeargs=( "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" + "-DSOUP_VERSION=2" "-DBUILD_TESTS=$(usex test)" ) @@ -87,7 +93,7 @@ src_install() { readme.gentoo_create_doc } -src_postinst() { +pkg_postinst() { xdg_pkg_postinst readme.gentoo_print_elog } diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild index dcefefcd1c83..443a60ca974f 100644 --- a/net-im/dino/dino-9999.ebuild +++ b/net-im/dino/dino-9999.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_MAKEFILE_GENERATOR="ninja" -VALA_MIN_API_VERSION="0.34" inherit cmake vala xdg readme.gentoo-r1 DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala" @@ -12,7 +10,7 @@ HOMEPAGE="https://dino.im" LICENSE="GPL-3" SLOT="0" -IUSE="+gpg +http +omemo +notification-sound test" +IUSE="+gpg +http +omemo +notification-sound +rtp test" RESTRICT="!test? ( test )" MY_REPO_URI="https://github.com/dino/dino" @@ -25,53 +23,61 @@ else fi RDEPEND=" - app-text/gspell[vala] dev-db/sqlite:3 dev-libs/glib:2 - dev-libs/icu - dev-libs/libgee:0.8 + dev-libs/icu:= + dev-libs/libgee:0.8= + gui-libs/gtk:4 + >=gui-libs/libadwaita-1.2.0:1[vala] + media-libs/graphene net-libs/glib-networking + net-libs/gnutls:= >=net-libs/libnice-0.1.15 net-libs/libsignal-protocol-c - net-libs/libsrtp:2 + net-libs/libsrtp:2= x11-libs/cairo x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 x11-libs/pango gpg? ( app-crypt/gpgme:= ) http? ( net-libs/libsoup:2.4 ) + notification-sound? ( media-libs/libcanberra:0[sound] ) omemo? ( - dev-libs/libgcrypt:0 - media-gfx/qrencode + dev-libs/libgcrypt:= + media-gfx/qrencode:= + ) + rtp? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + media-libs/webrtc-audio-processing:0 ) - notification-sound? ( media-libs/libcanberra:0[sound] ) " DEPEND=" - $(vala_depend) ${RDEPEND} media-libs/gst-plugins-base media-libs/gstreamer +" +BDEPEND=" sys-devel/gettext + $(vala_depend) " -src_prepare() { - cmake_src_prepare - vala_src_prepare -} - src_configure() { + vala_setup + local disabled_plugins=( $(usex gpg "" "openpgp") $(usex omemo "" "omemo") $(usex http "" "http-files") + $(usex rtp "" rtp) ) local enabled_plugins=( $(usex notification-sound "notification-sound" "") ) - local mycmakeargs+=( + local mycmakeargs=( "-DENABLED_PLUGINS=$(local IFS=";"; echo "${enabled_plugins[*]}")" "-DDISABLED_PLUGINS=$(local IFS=";"; echo "${disabled_plugins[*]}")" "-DVALA_EXECUTABLE=${VALAC}" + "-DSOUP_VERSION=2" "-DBUILD_TESTS=$(usex test)" ) @@ -87,7 +93,7 @@ src_install() { readme.gentoo_create_doc } -src_postinst() { +pkg_postinst() { xdg_pkg_postinst readme.gentoo_print_elog } diff --git a/net-im/dino/files/dino-0.4.3-c99.patch b/net-im/dino/files/dino-0.4.3-c99.patch new file mode 100644 index 000000000000..d21ff5e4adec --- /dev/null +++ b/net-im/dino/files/dino-0.4.3-c99.patch @@ -0,0 +1,57 @@ +https://bugs.gentoo.org/926073 +https://github.com/dino/dino/commit/0c45387bf903e5b0d02502d27642dd2a78aa6539 + +From 0c45387bf903e5b0d02502d27642dd2a78aa6539 Mon Sep 17 00:00:00 2001 +From: fiaxh <git@lightrise.org> +Date: Sat, 7 Oct 2023 13:56:38 +0200 +Subject: [PATCH] Fix implicit-function-declaration compiler warnings + +--- a/xmpp-vala/src/module/xep/0384_omemo/omemo_encryptor.vala ++++ b/xmpp-vala/src/module/xep/0384_omemo/omemo_encryptor.vala +@@ -72,27 +72,27 @@ namespace Xmpp.Xep.Omemo { + } + + public class EncryptionResult { +- public int lost { get; internal set; } +- public int success { get; internal set; } +- public int unknown { get; internal set; } +- public int failure { get; internal set; } ++ public int lost { get; set; } ++ public int success { get; set; } ++ public int unknown { get; set; } ++ public int failure { get; set; } + } + + public class EncryptState { +- public bool encrypted { get; internal set; } +- public int other_devices { get; internal set; } +- public int other_success { get; internal set; } +- public int other_lost { get; internal set; } +- public int other_unknown { get; internal set; } +- public int other_failure { get; internal set; } +- public int other_waiting_lists { get; internal set; } +- +- public int own_devices { get; internal set; } +- public int own_success { get; internal set; } +- public int own_lost { get; internal set; } +- public int own_unknown { get; internal set; } +- public int own_failure { get; internal set; } +- public bool own_list { get; internal set; } ++ public bool encrypted { get; set; } ++ public int other_devices { get; set; } ++ public int other_success { get; set; } ++ public int other_lost { get; set; } ++ public int other_unknown { get; set; } ++ public int other_failure { get; set; } ++ public int other_waiting_lists { get; set; } ++ ++ public int own_devices { get; set; } ++ public int own_success { get; set; } ++ public int own_lost { get; set; } ++ public int own_unknown { get; set; } ++ public int own_failure { get; set; } ++ public bool own_list { get; set; } + + public void add_result(EncryptionResult enc_res, bool own) { + if (own) { + diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml index 9f5aee117e5c..8798c1dab8d4 100644 --- a/net-im/dino/metadata.xml +++ b/net-im/dino/metadata.xml @@ -11,5 +11,6 @@ <flag name="http">Enable HTTP file upload plugin</flag> <flag name="omemo">Enable OMEMO encryption plugin</flag> <flag name="notification-sound">notification sounds plugin</flag> + <flag name="rtp">Enable Audio/Video calls over XMPP using RTP</flag> </use> </pkgmetadata> diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest deleted file mode 100644 index 7db891be33a3..000000000000 --- a/net-im/discord-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST discord-0.0.18.tar.gz 77398558 BLAKE2B e25ad448dd9f89e460a4380cde850506298a443be2b70fb243b92ab6a139815fea36260b879ece044c5c607561fde6adf36a188c186c48c34052ec105b23d732 SHA512 a9c5de48186542fa4385c5cf4ffb54484dee008cde5230a9f8a0e71a84e1e7ce680e170aca2018ad2217618ed2d4a4882836a408a5d0a5cab054c0954c1b55be diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest new file mode 100644 index 000000000000..733d92e23fac --- /dev/null +++ b/net-im/discord/Manifest @@ -0,0 +1 @@ +DIST discord-0.0.51.tar.gz 101529628 BLAKE2B 7bc457c1d994556a06b086d7360f0010619e9355e71a464d289fc6b27f0d0d11d8cba2153fa65ebb891cc5781500f5a9e6ab6694c8818f1326697b49f0a774ea SHA512 b98072a64cfb593176e7e057b926fcf2d9e1a4aa555a659cebb8abe20fe463ff135a8028fd0fc36dc6c1bd40235da98c7c055c372e707cae00b882c8b0462dd9 diff --git a/net-im/discord-bin/discord-bin-0.0.18.ebuild b/net-im/discord/discord-0.0.51.ebuild index e40d2077e427..fefed5b524d7 100644 --- a/net-im/discord-bin/discord-bin-0.0.18.ebuild +++ b/net-im/discord/discord-0.0.51.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -MY_PN="${PN/-bin}" -MY_PV="${PV/-r*}" +MY_PN="${PN/-bin/}" +MY_PV="${PV/-r*/}" CHROMIUM_LANGS=" - am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi + af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk vi zh-CN zh-TW + sw ta te th tr uk ur vi zh-CN zh-TW " inherit chromium-2 desktop linux-info optfeature unpacker xdg @@ -17,26 +17,31 @@ inherit chromium-2 desktop linux-info optfeature unpacker xdg DESCRIPTION="All-in-one voice and text chat for gamers" HOMEPAGE="https://discordapp.com" SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${MY_PN^}" LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" + +IUSE="appindicator +seccomp" +RESTRICT="bindist mirror strip test" -# libXScrnSaver is used through dlopen (bug #825370) RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib + media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus + sys-apps/util-linux sys-libs/glibc x11-libs/cairo + x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 @@ -46,47 +51,26 @@ RDEPEND=" x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr - x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango + appindicator? ( dev-libs/libayatana-appindicator ) " -RESTRICT="bindist mirror strip test" - DESTDIR="/opt/${MY_PN}" -QA_PREBUILT=" - ${DESTDIR#/}/${MY_PN^} - ${DESTDIR#/}/chrome-sandbox - ${DESTDIR#/}/libffmpeg.so - ${DESTDIR#/}/libvk_swiftshader.so - ${DESTDIR#/}/libvulkan.so - ${DESTDIR#/}/libEGL.so - ${DESTDIR#/}/libGLESv2.so - ${DESTDIR#/}/libVkICD_mock_icd.so - ${DESTDIR#/}/swiftshader/libEGL.so - ${DESTDIR#/}/swiftshader/libGLESv2.so - ${DESTDIR#/}/swiftshader/libvk_swiftshader.so -" +QA_PREBUILT="*" CONFIG_CHECK="~USER_NS" -S="${WORKDIR}/${MY_PN^}" - -pkg_pretend() { - chromium_suid_sandbox_check_kernel_config -} - src_unpack() { unpack ${MY_PN}-${MY_PV}.tar.gz } src_configure() { - chromium_suid_sandbox_check_kernel_config - default + chromium_suid_sandbox_check_kernel_config } src_prepare() { @@ -94,38 +78,58 @@ src_prepare() { # remove post-install script rm postinst.sh || die "the removal of the unneeded post-install script failed" # cleanup languages - pushd "locales/" || die "location change for language cleanup failed" + pushd "locales/" >/dev/null || die "location change for language cleanup failed" chromium_remove_language_paks - popd || die "location reset for language cleanup failed" + popd >/dev/null || die "location reset for language cleanup failed" # fix .desktop exec location - sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" ${MY_PN}.desktop || die "fixing of exec location on .desktop failed" + sed -i "/Exec/s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" \ + "${MY_PN}.desktop" || + die "fixing of exec location on .desktop failed" + # USE seccomp + if ! use seccomp; then + sed -i '/Exec/s/Discord/Discord --disable-seccomp-filter-sandbox/' \ + "${MY_PN}.desktop" || + die "sed failed for seccomp" + fi } src_install() { - doicon -s 256 ${MY_PN}.png + doicon -s 256 "${MY_PN}.png" # install .desktop file - domenu ${MY_PN}.desktop + domenu "${MY_PN}.desktop" exeinto "${DESTDIR}" - doexe ${MY_PN^} chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so + + doexe "${MY_PN^}" chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so insinto "${DESTDIR}" doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin insopts -m0755 - doins -r locales resources swiftshader + doins -r locales resources # Chrome-sandbox requires the setuid bit to be specifically set. # see https://github.com/electron/electron/issues/17972 - fperms 4755 "${DESTDIR}"/chrome-sandbox + fowners root "${DESTDIR}/chrome-sandbox" + fperms 4711 "${DESTDIR}/chrome-sandbox" + + # Crashpad is included in the package once in a while and when it does, it must be installed. + # See #903616 and #890595 + [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler + + dosym "${DESTDIR}/${MY_PN^}" "/usr/bin/${MY_PN}" - dosym "${DESTDIR}"/${MY_PN^} /usr/bin/${MY_PN} + # https://bugs.gentoo.org/898912 + if use appindicator; then + dosym ../../usr/lib64/libayatana-appindicator3.so /opt/discord/libappindicator3.so + fi } pkg_postinst() { xdg_pkg_postinst + optfeature_header "Install the following packages for additional support:" optfeature "sound support" \ media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire - optfeature "system tray support" dev-libs/libappindicator + optfeature "emoji support" media-fonts/noto-emoji } diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord/metadata.xml index f485c452f77f..f5ecac7fcf8c 100644 --- a/net-im/discord-bin/metadata.xml +++ b/net-im/discord/metadata.xml @@ -9,4 +9,8 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <maintainer type="person"> + <email>sarnex@gentoo.org</email> + <name>Nick Sarnie</name> + </maintainer> </pkgmetadata> diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index e8815deaf151..87fa8a24c949 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,4 +1,8 @@ -DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c -DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1 -DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865 -DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da +DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4 SHA512 3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b +DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B 292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d SHA512 2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab +DIST ejabberd-23.10-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d +DIST ejabberd-23.10-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa SHA512 aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5 +DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B 0c3adfac5d99a33f37b0bd9970489f7a9e32bc1a832efe510be3281cd4ac2df890aa7eeab5758149b3cb16a2e6a71937ee955a86113bba14540d5c685f900ef6 SHA512 d42af356b0b6ebbba757de4256e308766f046d6c2a7df355330fbc9a9fb329635a22c2f9e5fc4d0a9dbe2d7e5488efe85000c4d04a9a0ce12921d839899e0c45 +DIST ejabberd-24.02-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d +DIST ejabberd-24.02-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa SHA512 aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5 +DIST ejabberd-24.02.tar.gz 2531049 BLAKE2B 6d18393dd909ef580fdcc173fb927a1302f7d444e5587c30f36e5bbfe7634b61c14e06d31f386123ec8732f0c49180a10b0abbd7dea42589d1d0ec9df54ca0f4 SHA512 43dcf1c0f1a2a0390de9edfa24705be6b5bcfdc83b307c175effeae043b4a67dd00c4930c5e43fda98c7c3e0060fac7198313cd27b7962a8997e006ef255df0c diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild b/net-im/ejabberd/ejabberd-23.01.ebuild index 39a5d3e79270..82b509558d13 100644 --- a/net-im/ejabberd/ejabberd-22.05-r1.ebuild +++ b/net-im/ejabberd/ejabberd-23.01.ebuild @@ -1,17 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools pam rebar systemd verify-sig +inherit autotools pam rebar systemd DESCRIPTION="Robust, scalable and extensible XMPP server" HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" SRC_URI=" https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - verify-sig? ( https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc ) " -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc LICENSE="GPL-2" SLOT="0" @@ -31,44 +29,43 @@ DEPEND=" >=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.30 >=dev-erlang/eimp-1.0.22 - >=dev-erlang/fast_tls-1.1.15 + >=dev-erlang/fast_tls-1.1.16 >=dev-erlang/fast_xml-1.1.49 - >=dev-erlang/fast_yaml-1.0.33 - >=dev-erlang/yconf-1.0.13 + >=dev-erlang/fast_yaml-1.0.36 + >=dev-erlang/yconf-1.0.15 >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.2 + >=dev-erlang/jose-1.11.5 >=dev-erlang/lager-3.9.1 >=dev-erlang/p1_oauth2-0.6.11 >=dev-erlang/p1_utils-1.0.25 - >=dev-erlang/stringprep-1.0.28 - >=dev-erlang/xmpp-1.5.6 + >=dev-erlang/stringprep-1.0.29 + >=dev-erlang/xmpp-1.6.1 >=dev-erlang/pkix-1.0.9 >=dev-erlang/mqtree-1.0.15 >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.19 + >=dev-erlang/p1_acme-1.0.22 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) + mysql? ( >=dev-erlang/p1_mysql-1.0.21 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.12 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.18 ) + pam? ( >=dev-erlang/epam-1.0.14 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.20 ) redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.45 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) - stun? ( >=dev-erlang/stun-1.2.2 ) + sip? ( >=dev-erlang/esip-1.0.49 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) + stun? ( >=dev-erlang/stun-1.2.7 ) zlib? ( >=dev-erlang/ezlib-1.0.12 ) " RDEPEND=" ${DEPEND} - >=acct-user/ejabberd-1 + >=acct-user/ejabberd-2[pam?] captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) " -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" DOCS=( CHANGELOG.md README.md ) PATCHES=( - "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" + "${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch" ) # Get path to ejabberd lib directory. @@ -150,7 +147,7 @@ src_compile() { # invoke the 'install' target (in src_install below), DESTDIR is # set, which causes DESTDIR to scope into the ejabberdctl.example # generation. - emake REBAR='rebar -v' src ejabberdctl.example + emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service } src_install() { @@ -174,19 +171,6 @@ src_install() { keepdir /var/{lib,log}/ejabberd } -pkg_preinst() { - if use pam; then - einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>. - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam ejabberd || die - fi -} - pkg_postinst() { local migrate_to_ejabberd_user=false diff --git a/net-im/ejabberd/ejabberd-21.12-r1.ebuild b/net-im/ejabberd/ejabberd-23.04.ebuild index 51abb0f8f050..69ddba1b5199 100644 --- a/net-im/ejabberd/ejabberd-21.12-r1.ebuild +++ b/net-im/ejabberd/ejabberd-23.04.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit pam rebar systemd verify-sig +inherit autotools pam rebar systemd DESCRIPTION="Robust, scalable and extensible XMPP server" HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz - -> ${P}.tar.gz - verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc +SRC_URI=" + https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz +" LICENSE="GPL-2" SLOT="0" @@ -26,72 +25,49 @@ RESTRICT="test" # TODO: tools? ( # TODO: >=dev-erlang/luerl-0.3 # TODO: ) -DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.29 - >=dev-erlang/eimp-1.0.21 - >=dev-erlang/fast_tls-1.1.13 - >=dev-erlang/fast_xml-1.1.48 - >=dev-erlang/fast_yaml-1.0.32 - >=dev-erlang/yconf-1.0.12 +DEPEND=" + >=dev-lang/erlang-19.3[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.30 + >=dev-erlang/eimp-1.0.22 + >=dev-erlang/fast_tls-1.1.16 + >=dev-erlang/fast_xml-1.1.49 + >=dev-erlang/fast_yaml-1.0.36 + >=dev-erlang/yconf-1.0.15 >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.2 + >=dev-erlang/jose-1.11.5 >=dev-erlang/lager-3.9.1 - >=dev-erlang/p1_oauth2-0.6.10 - >=dev-erlang/p1_utils-1.0.23 - >=dev-erlang/stringprep-1.0.27 - >=dev-erlang/xmpp-1.5.6 - >=dev-erlang/pkix-1.0.8 - >=dev-erlang/mqtree-1.0.14 + >=dev-erlang/p1_oauth2-0.6.11 + >=dev-erlang/p1_utils-1.0.25 + >=dev-erlang/stringprep-1.0.29 + >=dev-erlang/xmpp-1.6.2 + >=dev-erlang/pkix-1.0.9 + >=dev-erlang/mqtree-1.0.15 >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.16 + >=dev-erlang/p1_acme-1.0.22 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) + mysql? ( >=dev-erlang/p1_mysql-1.0.21 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.12 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) + pam? ( >=dev-erlang/epam-1.0.14 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.22 ) redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.45 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) - stun? ( >=dev-erlang/stun-1.0.47 ) - zlib? ( >=dev-erlang/ezlib-1.0.10 )" -RDEPEND="${DEPEND} - acct-user/ejabberd + sip? ( >=dev-erlang/esip-1.0.49 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) + stun? ( >=dev-erlang/stun-1.2.7 ) + zlib? ( >=dev-erlang/ezlib-1.0.12 ) +" +RDEPEND=" + ${DEPEND} + >=acct-user/ejabberd-2[pam?] captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) " -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" DOCS=( CHANGELOG.md README.md ) PATCHES=( - "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" + "${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch" ) -# Set paths to ejabberd lib directory consistently to point always to directory -# suffixed with version. -correct_ejabberd_paths() { - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' -} - -# Get epam-wrapper from 'files' directory and correct path to lib directory in -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper -# file exists there already. -customize_epam_wrapper() { - local epam_wrapper_src="${1}" - local epam_wrapper_dst="${S}/epam-wrapper" - - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' -} - # Get path to ejabberd lib directory. # # This is the path ./configure script Base for this path is path set in @@ -104,9 +80,25 @@ get_ejabberd_path() { src_prepare() { default + eautoreconf + rebar_remove_deps - correct_ejabberd_paths - customize_epam_wrapper "${FILESDIR}/epam-wrapper" + + # Set paths to ejabberd lib directory consistently to point always to directory + # suffixed with version. + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + + # Get epam-wrapper from 'files' directory and correct path to lib directory in + # it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper + # file exists there already. + local epam_wrapper_src="${FILESDIR}/epam-wrapper" + local epam_wrapper_dst="${S}/epam-wrapper" + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' rebar_fix_include_path fast_xml rebar_fix_include_path p1_utils @@ -116,7 +108,7 @@ src_prepare() { # rather than its parent which is default. That way ejabberd directory # takes precedence is module lookup. local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ + sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \ -i "${S}/ejabberdctl.template" \ || die 'failed to set ERL_LIBS in ejabberdctl.template' } @@ -145,7 +137,14 @@ src_configure() { } src_compile() { - emake REBAR='rebar -v' src + # Note that we also add ejabberdctl.example, which will be used by + # ejabberd's build system to create /usr/sbin/ejabberdctl, as + # target. Otherwise, ejabberdctl.example is due to be created by the + # 'install' target (as per upstream's Makefile.in). However when + # invoke the 'install' target (in src_install below), DESTDIR is + # set, which causes DESTDIR to scope into the ejabberdctl.example + # generation. + emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service } src_install() { @@ -160,37 +159,19 @@ src_install() { fi newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}" systemd_dounit "${PN}.service" insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" + newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}" keepdir /var/{lib,log}/ejabberd } -pkg_preinst() { - if use pam; then - einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>. - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam ejabberd || die - fi -} - pkg_postinst() { local migrate_to_ejabberd_user=false - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - else + if [[ ${REPLACING_VERSIONS} ]]; then for v in ${REPLACING_VERSIONS}; do if ver_test "${v}" -lt 21.04-r1; then migrate_to_ejabberd_user=true diff --git a/net-im/ejabberd/ejabberd-23.10-r1.ebuild b/net-im/ejabberd/ejabberd-23.10-r1.ebuild new file mode 100644 index 000000000000..6a842d1ea221 --- /dev/null +++ b/net-im/ejabberd/ejabberd-23.10-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools pam rebar systemd + +DESCRIPTION="Robust, scalable and extensible XMPP server" +HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" +SRC_URI=" + https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch -> + ${P}-fix-ejabberdctl.patch + https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch -> + ${P}-set-ejabberd-opts.patch +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +REQUIRED_USE="mssql? ( odbc )" +# TODO: Add 'tools' flag. +IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis + roster-gw selinux sip sqlite +stun zlib" + +RESTRICT="test" + +# TODO: Add dependencies for 'tools' flag enabled. +# TODO: tools? ( +# TODO: >=dev-erlang/luerl-0.3 +# TODO: ) +DEPEND=" + >=dev-lang/erlang-20[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.30 + >=dev-erlang/eimp-1.0.22 + >=dev-erlang/fast_tls-1.1.16 + >=dev-erlang/fast_xml-1.1.49 + >=dev-erlang/fast_yaml-1.0.36 + >=dev-erlang/yconf-1.0.15 + >=dev-erlang/jiffy-1.0.5 + >=dev-erlang/jose-1.11.5 + >=dev-erlang/lager-3.9.1 + >=dev-erlang/p1_oauth2-0.6.11 + >=dev-erlang/p1_utils-1.0.25 + >=dev-erlang/stringprep-1.0.29 + >=dev-erlang/xmpp-1.7.0 + >=dev-erlang/pkix-1.0.9 + >=dev-erlang/mqtree-1.0.15 + >=dev-erlang/idna-6.0.0-r1 + >=dev-erlang/p1_acme-1.0.22 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.22 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.14 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.23 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.50 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) + stun? ( >=dev-erlang/stun-1.2.10 ) + zlib? ( >=dev-erlang/ezlib-1.0.12 ) +" +RDEPEND=" + ${DEPEND} + >=acct-user/ejabberd-2[pam?] + captcha? ( media-gfx/imagemagick[truetype,png] ) + selinux? ( sec-policy/selinux-jabber ) +" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch" + # Both patches for https://bugs.gentoo.org/919711 + "${DISTDIR}/${P}-fix-ejabberdctl.patch" + "${DISTDIR}/${P}-set-ejabberd-opts.patch" +) + +# Get path to ejabberd lib directory. +# +# This is the path ./configure script Base for this path is path set in +# ./configure script which is /usr/lib by default. If libdir is explicitely set +# to something else than this should be adjusted here as well. +get_ejabberd_path() { + echo "/usr/$(get_libdir)/${P}" +} + +src_prepare() { + default + + eautoreconf + + rebar_remove_deps + + # Set paths to ejabberd lib directory consistently to point always to directory + # suffixed with version. + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + + # Get epam-wrapper from 'files' directory and correct path to lib directory in + # it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper + # file exists there already. + local epam_wrapper_src="${FILESDIR}/epam-wrapper" + local epam_wrapper_dst="${S}/epam-wrapper" + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' + + rebar_fix_include_path fast_xml + rebar_fix_include_path p1_utils + rebar_fix_include_path xmpp + + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory + # rather than its parent which is default. That way ejabberd directory + # takes precedence is module lookup. + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" + sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ERL_LIBS in ejabberdctl.template' +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --localstatedir="${EPREFIX}/var" \ + --enable-user=${PN} \ + $(use_enable debug) \ + $(use_enable full-xml) \ + $(use_enable mssql) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable redis) \ + $(use_enable roster-gw roster-gateway-workaround) \ + $(use_enable sqlite) \ + $(use_enable sip) \ + $(use_enable stun) \ + $(use_enable zlib) + + # more options to support + # --enable-elixir requires https://github.com/elixir-lang/elixir +} + +src_compile() { + # Note that we also add ejabberdctl.example, which will be used by + # ejabberd's build system to create /usr/sbin/ejabberdctl, as + # target. Otherwise, ejabberdctl.example is due to be created by the + # 'install' target (as per upstream's Makefile.in). However when + # invoke the 'install' target (in src_install below), DESTDIR is + # set, which causes DESTDIR to scope into the ejabberdctl.example + # generation. + emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service +} + +src_install() { + default + + if use pam; then + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + + pamd_mimic_system xmpp auth account + into "$(get_ejabberd_path)/priv" + newbin epam-wrapper epam + fi + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}" + systemd_dounit "${PN}.service" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}" + + keepdir /var/{lib,log}/ejabberd +} + +pkg_postinst() { + local migrate_to_ejabberd_user=false + + if [[ ${REPLACING_VERSIONS} ]]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 21.04-r1; then + migrate_to_ejabberd_user=true + break + fi + done + fi + + # Sarting with >=21.04-r1, the ejabberd configuration is now in + # /etc/ejabberd and no longer in /etc/jabber. See if we need to + # migrate the configuration. Furthermore, ejabberd no longer runs + # under the, shared via net-im/jabber-base, 'jabber' use, but under + # its own user. This increase isolation and hence robustness and + # security. + if $migrate_to_ejabberd_user; then + ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd" + ewarn "(just as upstream) and *not* /etc/jabber." + ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd." + ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." + ewarn "Please check your configuration, and finish the migration by stopping ejabberd" + ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." + + local -A dirs_to_migrate=( + [/etc/jabber]=/etc/ejabberd + [/var/spool/jabber]=/var/lib/ejabberd + ) + + for src_dir in "${!dirs_to_migrate[@]}"; do + local eroot_src_dir="${EROOT}${src_dir}" + local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}" + + cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}" + + if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then + rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die + fi + if ! use prefix; then + chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die + fi + done + fi +} diff --git a/net-im/ejabberd/ejabberd-24.02-r1.ebuild b/net-im/ejabberd/ejabberd-24.02-r1.ebuild new file mode 100644 index 000000000000..c6595ebb5cd8 --- /dev/null +++ b/net-im/ejabberd/ejabberd-24.02-r1.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools pam rebar systemd + +DESCRIPTION="Robust, scalable and extensible XMPP server" +HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" +SRC_URI=" + https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch -> + ${P}-fix-ejabberdctl.patch + https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch -> + ${P}-set-ejabberd-opts.patch +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +REQUIRED_USE="mssql? ( odbc )" +# TODO: Add 'tools' flag. +IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis + roster-gw selinux sip sqlite +stun zlib" + +RESTRICT="test" + +# TODO: Add dependencies for 'tools' flag enabled. +# TODO: tools? ( +# TODO: >=dev-erlang/luerl-0.3 +# TODO: ) +DEPEND=" + >=dev-lang/erlang-20[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.30 + >=dev-erlang/eimp-1.0.22 + >=dev-erlang/fast_tls-1.1.19 + >=dev-erlang/fast_xml-1.1.51 + >=dev-erlang/fast_yaml-1.0.36 + >=dev-erlang/yconf-1.0.15 + >=dev-erlang/jiffy-1.0.5 + >=dev-erlang/jose-1.11.5 + >=dev-erlang/lager-3.9.1 + >=dev-erlang/p1_oauth2-0.6.14 + >=dev-erlang/p1_utils-1.0.25 + >=dev-erlang/stringprep-1.0.29 + >=dev-erlang/xmpp-1.8.1 + >=dev-erlang/pkix-1.0.9 + >=dev-erlang/mqtree-1.0.16 + >=dev-erlang/idna-6.0.0-r1 + >=dev-erlang/p1_acme-1.0.22 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.23 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.14 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.25 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.52 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.14 ) + stun? ( >=dev-erlang/stun-1.2.12 ) + zlib? ( >=dev-erlang/ezlib-1.0.12 ) +" +RDEPEND=" + ${DEPEND} + >=acct-user/ejabberd-2[pam?] + captcha? ( media-gfx/imagemagick[truetype,png] ) + selinux? ( sec-policy/selinux-jabber ) +" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch" +) + +# Get path to ejabberd lib directory. +# +# This is the path ./configure script Base for this path is path set in +# ./configure script which is /usr/lib by default. If libdir is explicitely set +# to something else than this should be adjusted here as well. +get_ejabberd_path() { + echo "/usr/$(get_libdir)/${P}" +} + +src_prepare() { + default + + eautoreconf + + rebar_remove_deps + + # Set paths to ejabberd lib directory consistently to point always to directory + # suffixed with version. + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + + # Get epam-wrapper from 'files' directory and correct path to lib directory in + # it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper + # file exists there already. + local epam_wrapper_src="${FILESDIR}/epam-wrapper" + local epam_wrapper_dst="${S}/epam-wrapper" + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' + + rebar_fix_include_path fast_xml + rebar_fix_include_path p1_utils + rebar_fix_include_path xmpp + + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory + # rather than its parent which is default. That way ejabberd directory + # takes precedence is module lookup. + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" + sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ERL_LIBS in ejabberdctl.template' +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --localstatedir="${EPREFIX}/var" \ + --enable-user=${PN} \ + --with-rebar=rebar \ + $(use_enable debug) \ + $(use_enable full-xml) \ + $(use_enable mssql) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable redis) \ + $(use_enable roster-gw roster-gateway-workaround) \ + $(use_enable sqlite) \ + $(use_enable sip) \ + $(use_enable stun) \ + $(use_enable zlib) + + # more options to support + # --enable-elixir requires https://github.com/elixir-lang/elixir +} + +src_compile() { + # Note that we also add ejabberdctl.example, which will be used by + # ejabberd's build system to create /usr/sbin/ejabberdctl, as + # target. Otherwise, ejabberdctl.example is due to be created by the + # 'install' target (as per upstream's Makefile.in). However when + # invoke the 'install' target (in src_install below), DESTDIR is + # set, which causes DESTDIR to scope into the ejabberdctl.example + # generation. + emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service +} + +src_install() { + default + + if use pam; then + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + + pamd_mimic_system xmpp auth account + into "$(get_ejabberd_path)/priv" + newbin epam-wrapper epam + fi + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}" + systemd_dounit "${PN}.service" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}" + + keepdir /var/{lib,log}/ejabberd +} + +pkg_postinst() { + local migrate_to_ejabberd_user=false + + if [[ ${REPLACING_VERSIONS} ]]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 21.04-r1; then + migrate_to_ejabberd_user=true + break + fi + done + fi + + # Sarting with >=21.04-r1, the ejabberd configuration is now in + # /etc/ejabberd and no longer in /etc/jabber. See if we need to + # migrate the configuration. Furthermore, ejabberd no longer runs + # under the, shared via net-im/jabber-base, 'jabber' use, but under + # its own user. This increase isolation and hence robustness and + # security. + if $migrate_to_ejabberd_user; then + ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd" + ewarn "(just as upstream) and *not* /etc/jabber." + ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd." + ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." + ewarn "Please check your configuration, and finish the migration by stopping ejabberd" + ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." + + local -A dirs_to_migrate=( + [/etc/jabber]=/etc/ejabberd + [/var/spool/jabber]=/var/lib/ejabberd + ) + + for src_dir in "${!dirs_to_migrate[@]}"; do + local eroot_src_dir="${EROOT}${src_dir}" + local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}" + + cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}" + + if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then + rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die + fi + if ! use prefix; then + chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die + fi + done + fi +} diff --git a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch deleted file mode 100644 index 0fb1f5ce602e..000000000000 --- a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup - -Set SHELL since the generic jabber user used on Gentoo for jabber -servers doesn't have a valid shell set by default and fix EXEC_CMD -otherwise it fails with This account is currently not available again -due to jabber not having a valid shell. - -Also, workaround the assumption that jabber's /root is a directory when -instead it defaults to /dev/null on Gentoo. ---- - -diff --git a/ejabberdctl.template b/ejabberdctl.template -index 571b90b..71336c0 100755 ---- a/ejabberdctl.template -+++ b/ejabberdctl.template -@@ -82,6 +82,7 @@ fi - ERL_LIBS={{libdir}} - ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump - ERL_INETRC="$ETC_DIR"/inetrc -+HOME=$SPOOL_DIR - - # define ejabberd parameters - EJABBERD_OPTS="$EJABBERD_OPTS\ -@@ -105,12 +106,13 @@ export ERL_MAX_ETS_TABLES - export CONTRIB_MODULES_PATH - export CONTRIB_MODULES_CONF_DIR - export ERL_LIBS -+export HOME - - # run command either directly or via su $INSTALLUSER - exec_cmd() - { - case $EXEC_CMD in -- as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; -+ as_install_user) su -p -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; - as_current_user) "$@" ;; - esac - } diff --git a/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch b/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch new file mode 100644 index 000000000000..f607f48037ae --- /dev/null +++ b/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch @@ -0,0 +1,16 @@ +From c0af543fc3b6047f66bfe820e7ce75abd3ed2049 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <flo@geekplace.eu> +Date: Fri, 10 Dec 2021 12:36:45 +0100 +Subject: [PATCH] Adjust ejabberd.service.template to Gentoo + +--- a/ejabberd.service.template ++++ b/ejabberd.service.template +@@ -1,6 +1,7 @@ + [Unit] + Description=XMPP Server +-After=network.target ++After=epmd.service network.target ++Requires=epmd.service + + [Service] + Type=notify diff --git a/net-im/ejabberd/files/ejabberd.initd b/net-im/ejabberd/files/ejabberd.initd deleted file mode 100644 index 94ac2ae8e465..000000000000 --- a/net-im/ejabberd/files/ejabberd.initd +++ /dev/null @@ -1,54 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - use dns - need epmd net - provide jabber-server -} - -start() { - if ejabberdctl status >/dev/null 2>&1; then - ewarn "ejabberd is already started (manually?)." - return 0 - fi - ebegin "Starting ejabberd" - /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start - eend $? -} - -reload() { - ebegin "Reloading ejabberd configuration" - /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config - eend $? -} - -stop() { - ejabberdctl status >/dev/null 2>&1 - if test $? = 3; then - ewarn "ejabberd is already stopped (manually?)." - return 0 - fi - ebegin "Stopping ejabberd" - if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then - cnt=0 - sleep 1 - while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do - echo -n . - cnt=`expr $cnt + 1` - if [ $cnt -ge 60 ] ; then - eend 1 - break - fi - sleep 1 - done - eend 0 - else - eend 1 - einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on." - fi - eend 0 -} diff --git a/net-im/ejabberd/files/ejabberd.logrotate b/net-im/ejabberd/files/ejabberd.logrotate deleted file mode 100644 index 4f324729dba8..000000000000 --- a/net-im/ejabberd/files/ejabberd.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/jabber/*.log { - su jabber jabber - weekly - rotate 4 - missingok - nocreate - sharedscripts - notifempty - compress - postrotate - /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true - endscript -} diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest deleted file mode 100644 index 38cae254de61..000000000000 --- a/net-im/ekg2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44 diff --git a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild deleted file mode 100644 index 3dfe36b6ea6c..000000000000 --- a/net-im/ekg2/ekg2-0.4_pre20190315-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -EGIT_COMMIT="f427d083ee899d42532c046100490a915b0e8a82" -DESCRIPTION="Text-based, multi-protocol instant messenger" -HOMEPAGE="https://github.com/ekg2/ekg2/" -SRC_URI="https://github.com/ekg2/ekg2/archive/${EGIT_COMMIT}.tar.gz - -> ${PN}-${EGIT_COMMIT}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl - perl readline rss spell sqlite ssl xmpp unicode zlib" - -RDEPEND="dev-libs/glib:2 - gadu? ( <net-libs/libgadu-1.12:0= ) - gpg? ( app-crypt/gpgme:= ) - gtk? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl:0= ) - openssl? ( dev-libs/openssl:0= ) - perl? ( dev-lang/perl:0= ) - readline? ( sys-libs/readline:0= ) - rss? ( dev-libs/expat:0= ) - ssl? ( net-libs/gnutls:0= ) - xmpp? ( dev-libs/expat:0= ) - zlib? ( sys-libs/zlib:0= ) - - ncurses? ( sys-libs/ncurses:=[unicode(+)=] - gpm? ( sys-libs/gpm:0= ) - spell? ( app-text/aspell:0= ) ) - sqlite? ( dev-db/sqlite:3= )" - -DEPEND="${RDEPEND} - sys-devel/gettext" - -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -DOCS=( - AUTHORS README.md docs/README docs/TODO - docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt - docs/themes.txt docs/themes-en.txt - docs/ui-ncurses.txt docs/ui-ncurses-en.txt -) - -pkg_pretend() { - if ! use gtk && ! use ncurses && ! use readline; then - ewarn 'ekg2 is being compiled without any frontend. You should consider' - ewarn 'enabling at least one of following USEflags:' - ewarn ' gtk, ncurses, readline.' - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - # direct plugin references - $(use_enable gadu gg) - $(use_enable gpg) - $(use_enable gtk) - $(use_enable ncurses) - $(use_enable nntp) - $(use_enable openssl sim) - $(use_enable perl) - --disable-python - $(use_enable readline) - $(use_enable rss) - $(use_enable sqlite logsqlite) - $(use_enable xmpp jabber) - - $(use_enable !minimal autoresponder) - $(use_enable !minimal jogger) - $(use_enable !minimal mail) - $(use_enable !minimal polchat) - $(use_enable !minimal rivchat) - $(use_enable !minimal sms) - - # sqlite switch - --with-sqlite3 - - # optional deps - $(use_with gpm) - # do not pass --with-inotify as it will fail if check fails - $(use_with spell aspell) - $(use_with ssl gnutls) - $(use_with zlib) - - # other magic - $(use_enable nls) - --with-perl-module-build-flags='INSTALLDIRS=vendor' - --enable-fast-configure - ) - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild deleted file mode 100644 index 3243fa4af2fd..000000000000 --- a/net-im/ekg2/ekg2-9999.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -DESCRIPTION="Text-based, multi-protocol instant messenger" -HOMEPAGE="https://github.com/ekg2/ekg2/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/ekg2/${PN}.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl - perl readline rss spell sqlite ssl xmpp unicode zlib" - -RDEPEND="dev-libs/glib:2 - gadu? ( <net-libs/libgadu-1.12:0= ) - gpg? ( app-crypt/gpgme:= ) - gtk? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl:0= ) - openssl? ( dev-libs/openssl:0= ) - perl? ( dev-lang/perl:0= ) - readline? ( sys-libs/readline:0= ) - rss? ( dev-libs/expat:0= ) - ssl? ( net-libs/gnutls:0= ) - xmpp? ( dev-libs/expat:0= ) - zlib? ( sys-libs/zlib:0= ) - - ncurses? ( sys-libs/ncurses:=[unicode(+)=] - gpm? ( sys-libs/gpm:0= ) - spell? ( app-text/aspell:0= ) ) - sqlite? ( dev-db/sqlite:3= )" - -DEPEND="${RDEPEND} - sys-devel/gettext" - -DOCS=( - AUTHORS README.md docs/README docs/TODO - docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt - docs/themes.txt docs/themes-en.txt - docs/ui-ncurses.txt docs/ui-ncurses-en.txt -) - -pkg_pretend() { - if ! use gtk && ! use ncurses && ! use readline; then - ewarn 'ekg2 is being compiled without any frontend. You should consider' - ewarn 'enabling at least one of following USEflags:' - ewarn ' gtk, ncurses, readline.' - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - # direct plugin references - $(use_enable gadu gg) - $(use_enable gpg) - $(use_enable gtk) - $(use_enable ncurses) - $(use_enable nntp) - $(use_enable openssl sim) - $(use_enable perl) - --disable-python - $(use_enable readline) - $(use_enable rss) - $(use_enable sqlite logsqlite) - $(use_enable xmpp jabber) - - $(use_enable !minimal autoresponder) - $(use_enable !minimal jogger) - $(use_enable !minimal mail) - $(use_enable !minimal polchat) - $(use_enable !minimal rivchat) - $(use_enable !minimal sms) - - # sqlite switch - --with-sqlite3 - - # optional deps - $(use_with gpm) - # do not pass --with-inotify as it will fail if check fails - $(use_with spell aspell) - $(use_with ssl gnutls) - $(use_with zlib) - - # other magic - $(use_enable nls) - --with-perl-module-build-flags='INSTALLDIRS=vendor' - --enable-fast-configure - ) - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml deleted file mode 100644 index 254271117728..000000000000 --- a/net-im/ekg2/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - - <use> - <flag name="gadu">Enable Gadu-Gadu protocol support (requires - <pkg>net-libs/libgadu</pkg>).</flag> - <flag name="gpg">Enable jabber message encryption through - <pkg>app-crypt/gpgme</pkg>.</flag> - <flag name="minimal">Disable building extra plugins with no additional - deps.</flag> - <flag name="openssl">Support encryption in sim plugin, using OpenSSL.</flag> - <flag name="sqlite">Support logging messages into SQLite3 database.</flag> - </use> -</pkgmetadata> diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest index c236958eda29..9ea60ab694b6 100644 --- a/net-im/element-desktop-bin/Manifest +++ b/net-im/element-desktop-bin/Manifest @@ -1 +1 @@ -DIST element-desktop_1.10.15_amd64.deb 77384226 BLAKE2B 3681293b6838c5ee20024784d9348d8d213316b260e883bd3de2655a675702d41179498711203dd04f0c0bbabc1e83422d4294cc511f8ae59443f8fbdf1043e6 SHA512 57a81d8d89c850a0103414c1605cec04cbdebab7a7d9ad58363f56f3242a46acce2ce88ab324cba3c76273423e6247e49acb2e4d81e656e32a1b059f66bac6e6 +DIST element-desktop_1.11.54_amd64.deb 94677944 BLAKE2B dac8908b263734b6c1cbf8a62e99c9f2eb7e40c70715c7e0456561ca70ec4d8b8f1f41181d7b0c8dd3a980285184f0dfd9284aa72fb1a5539ed6c3c92f1e09c7 SHA512 1e266cb08404bb622a5ab0f3a769e16944322274cfdadbea66f92839da863b45e8afd3f14b4d6c0d6c8c49f77953f5914a7abaf6abe888eec56ebec197b3ee71 diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.54.ebuild index 82b460c20465..afefcad54396 100644 --- a/net-im/element-desktop-bin/element-desktop-bin-1.10.15.ebuild +++ b/net-im/element-desktop-bin/element-desktop-bin-1.11.54.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,21 +9,21 @@ MY_PN="${PN/-bin}" DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)" HOMEPAGE="https://element.io" -SRC_URI="https://packages.riot.im/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb" +SRC_URI="https://packages.element.io/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb" S="${WORKDIR}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RESTRICT="splitdebug" -RDEPEND="app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-db/sqlcipher - dev-libs/atk dev-libs/expat dev-libs/glib:2 + dev-libs/nettle dev-libs/nspr dev-libs/nss media-libs/alsa-lib @@ -52,8 +52,8 @@ QA_PREBUILT="opt/Element/chrome-sandbox opt/Element/libffmpeg.so opt/Element/libvk_swiftshader.so opt/Element/libvulkan.so.1 - opt/Element/swiftshader/libEGL.so - opt/Element/swiftshader/libGLESv2.so" + opt/Element/resources/app.asar.unpacked/node_modules/matrix-seshat/index.node + opt/Element/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node" src_prepare() { default diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest deleted file mode 100644 index c79a8ccd4fd1..000000000000 --- a/net-im/empathy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST empathy-3.12.14.tar.xz 5017776 BLAKE2B 15f4c71a4f40988afd51d0665ee24164fb7e1d14994e577c23fa29a995503e78f8b784d26edd90503f9825c64dc814f07860aa6792eec6948c566dc3ff669dad SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123 diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild deleted file mode 100644 index c8262cd9b808..000000000000 --- a/net-im/empathy/empathy-3.12.14.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{8..10} ) - -inherit gnome2 python-any-r1 virtualx - -DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME" -HOMEPAGE="https://wiki.gnome.org/Attic/Empathy" - -LICENSE="GPL-2 CC-BY-SA-3.0 FDL-1.3 LGPL-2.1" -SLOT="0" -IUSE="debug +geolocation gnome gnome-online-accounts +map spell test +v4l" -RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm ~ppc64 x86 ~x86-linux" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# gdk-pixbuf and pango extensively used in libempathy-gtk -COMMON_DEPEND=" - >=dev-libs/glib-2.48:2[dbus] - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.9.4:3 - x11-libs/pango - >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.9.5:=[telepathy] - dev-libs/libgee:0.8= - >=app-crypt/libsecret-0.5 - >=media-libs/libcanberra-0.25[gtk3] - >=net-libs/webkit-gtk-2.10:4 - >=x11-libs/libnotify-0.7:= - - media-libs/gstreamer:1.0 - >=media-libs/clutter-1.10.0:1.0 - >=media-libs/clutter-gtk-1.1.2:1.0 - media-libs/clutter-gst:3.0 - >=media-libs/cogl-1.14:1.0= - - net-libs/farstream:0.2= - >=net-libs/telepathy-farstream-0.6.0:= - >=net-libs/telepathy-glib-0.23.2 - >=net-im/telepathy-logger-0.8.0:= - - app-crypt/gcr[gtk] - dev-libs/libxml2:2 - gnome-base/gsettings-desktop-schemas - media-sound/pulseaudio[glib] - net-libs/libsoup:2.4 - x11-libs/libX11 - - geolocation? ( - >=app-misc/geoclue-2.1:2.0 - >=sci-geosciences/geocode-glib-3.10 ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1:= ) - map? ( - >=media-libs/clutter-1.7.14:1.0 - >=media-libs/clutter-gtk-0.90.3:1.0 - >=media-libs/libchamplain-0.12.1:0.12[gtk] ) - spell? ( - >=app-text/enchant-1.2:0 - >=app-text/iso-codes-0.35 ) - v4l? ( - dev-libs/libgudev:= - media-plugins/gst-plugins-v4l2:1.0 - >=media-video/cheese-3.4:= ) -" - -# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 -RDEPEND="${COMMON_DEPEND} - media-libs/gst-plugins-base:1.0 - net-im/telepathy-connection-managers - !<net-voip/telepathy-rakia-0.7 - x11-themes/adwaita-icon-theme - gnome? ( gnome-extra/gnome-contacts ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-util/intltool-0.50.0 - dev-util/itstool - virtual/pkgconfig - test? ( - sys-apps/grep - >=dev-libs/check-0.9.4 ) -" -PDEPEND=">=net-im/telepathy-mission-control-5.14" - -pkg_setup() { - python-any-r1_pkg_setup - export PYTHONIOENCODING=UTF-8 # See bug 489774 -} - -src_configure() { - DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" - gnome2_src_configure \ - --disable-coding-style-checks \ - --disable-static \ - --disable-ubuntu-online-accounts \ - --enable-gst-1.0 \ - $(use_enable debug) \ - $(use_enable geolocation geocode) \ - $(use_enable geolocation location) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable map) \ - $(use_enable spell) \ - $(use_enable v4l gudev) \ - $(use_with v4l cheese) -} - -src_test() { - dbus-launch virtx emake check #504516 -} diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml deleted file mode 100644 index d381ce76949d..000000000000 --- a/net-im/empathy/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="gnome-online-accounts">Enable using - <pkg>net-libs/gnome-online-accounts</pkg> for authorization (e.g. - for Google Talk)</flag> - <flag name="map">Enable world map support through - <pkg>media-libs/libchamplain</pkg></flag> - </use> - <longdescription> - Empathy consists of a rich set of reusable instant messaging widgets, - and a GNOME client using those widgets. It uses Telepathy and Nokia's - Mission Control. The main goal is to permit desktop integration by - providing libempathy and libempathy-gtk libraries. libempathy-gtk is a - set of powerful widgets that can be embeded into any GNOME application. - A client application is provided. - </longdescription> -</pkgmetadata> diff --git a/net-im/err/Manifest b/net-im/err/Manifest index 8acdb8c9e6ba..56c41525b4c0 100644 --- a/net-im/err/Manifest +++ b/net-im/err/Manifest @@ -1,3 +1 @@ -DIST err-6.1.7.tar.gz 1359383 BLAKE2B 400bbf4a4180f74993a4414dc55f07a69b34b04277fecd073bd860df9dcd5da4873949df766c0c2f6b7a43b4e87153d0aa77b0abaf95bf9702d76c3c7b290abe SHA512 cd0dadc5ff380c71631bae7711bdba7345046fbe14e369c8efa8eed98752b9ea03f6e4fa3171df257a9d76686c610e28fac5f39f7e8e107348a5746e4354694b -DIST err-6.1.8.tar.gz 1609310 BLAKE2B e3682bfccd548c92160322287a17e26448322abd3956d464b393f333c0cc521d6d5183dab799d280603995a4508a2eb300fefb9c6159da6ed1c550247fa375d9 SHA512 5413f667ee4e121134b791f0dc8fd709ecbd9093a237b9637d282f41458c40076615ffc9167cfa95f297ae416c38b16ded8ae97aece55a81d88dc46b324ec851 DIST err-6.1.9.tar.gz 1554146 BLAKE2B 62a715d57c213b8d68c40afad92c14d26ff23fdce1df6b489be23817d33d8bc01c7c400ca7360546abc880b4a7e6205f92a3787cabfce3e14500ef8918a4b010 SHA512 cc8f7a00bc9bd7680d978b4c2e6c9ac78f32e0a99796cc9933802206b2c2998caf060d474aca374d8102923bf8eb64f69a01846c5761b13a8624641796893c9b diff --git a/net-im/err/err-6.1.7.ebuild b/net-im/err/err-6.1.7.ebuild deleted file mode 100644 index c5e128e55c30..000000000000 --- a/net-im/err/err-6.1.7.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -MY_PN="errbot" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable" -HOMEPAGE="https://errbot.readthedocs.io/en/latest/" -SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -KEYWORDS="~amd64" -LICENSE="GPL-3" -SLOT="0" -IUSE="irc +xmpp" - -DEPEND=" - acct-group/err - acct-user/err" -RDEPEND="${DEPEND} - dev-python/ansi[${PYTHON_USEDEP}] - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/colorlog[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/daemonize[${PYTHON_USEDEP}] - dev-python/deepmerge[${PYTHON_USEDEP}] - dev-python/dulwich[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/webtest[${PYTHON_USEDEP}] - irc? ( - dev-python/irc[${PYTHON_USEDEP}] - ) - xmpp? ( - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/slixmpp[${PYTHON_USEDEP}] - )" -BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -i -e '/pygments-markdown-lexer/d' setup.py || die - - # NameError: name 'slack' is not defined - rm tests/backend_tests/slack_test.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local deselect=( - --deselect tests/commands_test.py::test_plugin_cycle - --deselect tests/commands_test.py::test_broken_plugin - --deselect tests/commands_test.py::test_backup - --deselect tests/plugin_management_test.py::test_check_dependencies_requi - ) - - pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - newinitd "${FILESDIR}"/errd.initd.2 errd - newconfd "${FILESDIR}"/errd.confd errd - - dodir /etc/${PN} - keepdir /var/lib/${PN} - keepdir /var/log/${PN} - fowners -R err:err /var/lib/${PN} - fowners -R err:err /var/log/${PN} - - insinto /etc/${PN} - newins errbot/config-template.py config.py -} diff --git a/net-im/err/err-6.1.8-r1.ebuild b/net-im/err/err-6.1.8-r1.ebuild deleted file mode 100644 index d81238c7980a..000000000000 --- a/net-im/err/err-6.1.8-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -MY_PN="errbot" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Multiprotocol chatbot designed to be easily deployable and maintainable" -HOMEPAGE="https://errbot.readthedocs.io/en/latest/" -SRC_URI="https://github.com/errbotio/errbot/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -PATCHES="${FILESDIR}/err-6.1.8-fix-irc-backend.patch" - -KEYWORDS="~amd64 ~riscv" -LICENSE="GPL-3" -SLOT="0" -IUSE="irc +xmpp" - -DEPEND=" - acct-group/err - acct-user/err" -RDEPEND="${DEPEND} - dev-python/ansi[${PYTHON_USEDEP}] - dev-python/bottle[${PYTHON_USEDEP}] - dev-python/colorlog[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/daemonize[${PYTHON_USEDEP}] - dev-python/deepmerge[${PYTHON_USEDEP}] - dev-python/dulwich[${PYTHON_USEDEP}] - dev-python/flask[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markdown[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/webtest[${PYTHON_USEDEP}] - irc? ( - dev-python/irc[${PYTHON_USEDEP}] - ) - xmpp? ( - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/slixmpp[${PYTHON_USEDEP}] - )" -BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -i -e '/pygments-markdown-lexer/d' setup.py || die - - # NameError: name 'slack' is not defined - rm tests/backend_tests/slack_test.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local deselect=( - tests/commands_test.py::test_plugin_cycle - tests/commands_test.py::test_broken_plugin - tests/commands_test.py::test_backup - tests/plugin_management_test.py::test_check_dependencies_requi - ) - - epytest ${deselect[@]/#/--deselect } -} - -python_install_all() { - distutils-r1_python_install_all - - newinitd "${FILESDIR}"/errd.initd.2 errd - newconfd "${FILESDIR}"/errd.confd errd - - dodir /etc/${PN} - keepdir /var/lib/${PN} - keepdir /var/log/${PN} - fowners -R err:err /var/lib/${PN} - fowners -R err:err /var/log/${PN} - - insinto /etc/${PN} - newins errbot/config-template.py config.py -} - -pkg_postinst() { - elog "For more backends (Hipchat, Slact, Telegram) support, use pip" -} diff --git a/net-im/err/err-6.1.9.ebuild b/net-im/err/err-6.1.9.ebuild index 850051e19231..2abe868affb0 100644 --- a/net-im/err/err-6.1.9.ebuild +++ b/net-im/err/err-6.1.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/net-im/err/files/err-6.1.8-fix-irc-backend.patch b/net-im/err/files/err-6.1.8-fix-irc-backend.patch deleted file mode 100644 index 0874e7352bc1..000000000000 --- a/net-im/err/files/err-6.1.8-fix-irc-backend.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 34df1dd98a7ce3a17c22081fadb427827b431d7f Mon Sep 17 00:00:00 2001 -From: Carlos <nzlosh@yahoo.com> -Date: Fri, 22 Apr 2022 23:45:44 +0200 -Subject: [PATCH] Fixes #1566 remove unsupport argument reconnection_interval - from irc backend. - -diff --git a/errbot/backends/irc.py b/errbot/backends/irc.py -index 95a8757d4..9f7e75b29 100644 ---- a/errbot/backends/irc.py -+++ b/errbot/backends/irc.py -@@ -377,7 +377,6 @@ def __init__( - [(server, port, password)], - nickname, - username, -- reconnection_interval=reconnect_on_disconnect, - ) - - def connect(self, *args, **kwargs) -> None: diff --git a/net-im/fractal/Manifest b/net-im/fractal/Manifest new file mode 100644 index 000000000000..869ecbcd8733 --- /dev/null +++ b/net-im/fractal/Manifest @@ -0,0 +1,3 @@ +DIST fractal-6.tar.bz2 1430986 BLAKE2B 2388771eb34b527ce758efc9a81a5134cb5558ba64bbdf2cbb4911e56698dff7fcf175280b1a8126ffe59189024dbdb3fb847a88e991b86adb81b5e0f64a4ef7 SHA512 78f5ae06117b8f7218084946c883022ec08ae213a433c17386cdf84a30dcb2796f957c13b5b21cef1e500df0b1a86794aff144698c014fdeb42b782bf5583280 +DIST fractal-6_beta-crates.tar.xz 45123596 BLAKE2B 88bd065066367943dc84af70a514f79e96382d62fb47caf80844a0c5532cc065fe5aa72bc737f240d6f64cd5e9f123be467c9fef0fd64e8f7a4aa496e613a408 SHA512 23cfff457be78c6ba2e71342d54605adad28dd0a21dcf3d3415477a36e78c52c921fd92083551798b6fccb4569814a33606812752c5b9c4ca2952e94f7f2f596 +DIST matrix-rust-sdk-19526cea6bce133fc48904838956846aeb966dc6.gh.tar.gz 1743912 BLAKE2B 48b6352fbad17eb1651e5ca57bca25ea64dacecf0e97b63502fa54fd86ac65728656e799c0b50fddec575d05aa408c8347815f30afbf78413e973c35e0d8768f SHA512 a330250bf25dcb4a4a4a8bfc3bdda1a19d389080fb6a4983f00cc9cddc2f12b7a8f652942a58b9ed78b9c52802f94fd391e3dfd6971add8a44dbf66460488a1b diff --git a/net-im/fractal/fractal-6.ebuild b/net-im/fractal/fractal-6.ebuild new file mode 100644 index 000000000000..975db0e74b70 --- /dev/null +++ b/net-im/fractal/fractal-6.ebuild @@ -0,0 +1,95 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +" + +declare -A GIT_CRATES=( + [matrix-sdk-base]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-base' + [matrix-sdk-common]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-common' + [matrix-sdk-crypto]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-crypto' + [matrix-sdk-indexeddb]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-indexeddb' + [matrix-sdk-qrcode]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-qrcode' + [matrix-sdk-sqlite]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-sqlite' + [matrix-sdk-store-encryption]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-store-encryption' + [matrix-sdk-ui]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk-ui' + [matrix-sdk]='https://github.com/matrix-org/matrix-rust-sdk;19526cea6bce133fc48904838956846aeb966dc6;matrix-rust-sdk-%commit%/crates/matrix-sdk' +) + +inherit cargo gnome2-utils meson + +MY_P=${P/_/.} +DESCRIPTION="Matrix messaging app for GNOME written in Rust" +HOMEPAGE=" + https://wiki.gnome.org/Apps/Fractal + https://gitlab.gnome.org/World/fractal/ +" +SRC_URI=" + https://gitlab.gnome.org/World/fractal/-/archive/${PV/_/.}/${MY_P}.tar.bz2 + ${CARGO_CRATE_URIS} +" +if [[ ${PKGBUMPING} != ${PVR} ]]; then + SRC_URI+=" + https://dev.gentoo.org/~mgorny/dist/${P}_beta-crates.tar.xz + " +fi +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-3+" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD GPL-3+ ISC MIT + MPL-2.0 MPL-2.0 Unicode-DFS-2016 ZLIB +" +# ring crate +LICENSE+=" openssl" +SLOT="0" +KEYWORDS="amd64 arm64" + +DEPEND=" + >=dev-libs/glib-2.72 + >=gui-libs/gtk-4.10.0:4 + >=gui-libs/libadwaita-1.4.0:1 + + >=media-libs/gstreamer-1.20:1.0 + >=media-libs/gst-plugins-bad-1.20:1.0 + >=media-libs/gst-plugins-base-1.20:1.0 + + >=gui-libs/gtksourceview-5.0.0:5 + >=media-video/pipewire-0.3.0:=[gstreamer] + >=dev-libs/openssl-1.0.1:= + >=media-libs/libshumate-1.0.0:1.0 + >=dev-db/sqlite-3.24.0:3 + >=sys-apps/xdg-desktop-portal-1.14.1 +" +RDEPEND=" + ${DEPEND} + virtual/secret-service +" +# clang needed by bindgen +BDEPEND=" + sys-devel/clang + >=virtual/rust-1.75.0 +" + +# Rust +QA_FLAGS_IGNORED="usr/bin/fractal" + +src_configure() { + meson_src_configure + ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die +} + +pkg_postinst() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-im/fractal/metadata.xml b/net-im/fractal/metadata.xml new file mode 100644 index 000000000000..7090f1871134 --- /dev/null +++ b/net-im/fractal/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">World/fractal</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest index 90421df2906f..56614ec8e60c 100644 --- a/net-im/gajim/Manifest +++ b/net-im/gajim/Manifest @@ -1,5 +1,4 @@ -DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba68348fad51fe2f114199972a0fc998ae2c6efba1ea48ecb17b819509c1b45745e98e41f99f2e4afd4a4c1daff4865 SHA512 e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442 -DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2 -DIST gajim-1.4.0.tar.gz 8932710 BLAKE2B 66924bf2e0f39c74e0ce45bfb24c6bd41c547f170c149611dc08e45db1f665f1159be6586dde1a64f1037de029dc2d83c1146545c36645dd67b63509ce156043 SHA512 9fb2b967325d04d7cfa8cb97d0dcebdd5cfd8b8a0a4f8928e7d8c547d90567b7fb0d84d48cdd151b5e38ce72f65de2679c8cc1543ff3ed25d792e6de070042a0 -DIST gajim-1.4.1.tar.gz 7321296 BLAKE2B 2b170800a1ee6304831e1ec7c006e2133c577dd6b34da4e89ab35a6032677c7db61939834a5b3ad73026b7417703321dc43bb63aa2d0c03676cddb728c7294e6 SHA512 614b96d1e64e8601992d608de279abdd38fcfa637094eeffef6adab725446b8955d07725a3d7577d71be4b883943e3341f84540a86e9a61c32ec51ae8999cfcc -DIST gajim-1.4.2.tar.gz 7315938 BLAKE2B 2315be3d8efa98bf45cc7479a38a83f6d297bc4af9550ce70ccbb9f4fce681cdec57658f2c5c12c4b3b1b97d7623b1da32b675be971e186623957a267010d85c SHA512 d3402b39c9253334523538b86c3e2d6f272f576824048b344a235a12982c53280c3638b0b299c536ed38bcb8648388ba5bea8056c722cc8a5dc5d98012f6d57c +DIST gajim-1.7.3.tar.gz 3753831 BLAKE2B c7b8b1dc47b1faf9f1c0803e7931cb00bfbf31075fe481d557ec0f308c79e7580d0054d224781a67eaeea24dba40e40de5faf55d633d71f759022a1ac113f6e4 SHA512 66135e88784350bab79b61debc1b65144a82f8eee2c1841d21e4f511b3792361e57b60304d2478654e563687e8302426d76063e748236f4e1c959511c7c28665 +DIST gajim-1.8.0.tar.gz 3835799 BLAKE2B 030293fc8114877c6d060cd0feae0fecdcecbb26aac8817e1db7db59aee3ee79973efc94584434641ccd39adcf809e0c7a86a017ab46c9695666d898fb7b7905 SHA512 724290de6d438aacd929a9759d7a712068c303caf9002a1a70ddc0e9aa16387054d3e4efacf84eced28f49ef79749c764d5fe67fcb23c3baef3a2b7714df218e +DIST gajim-1.8.1.tar.gz 3844796 BLAKE2B b7bbd751a051cd2a46e814a9b3ebc08f10a6570dc071752838a2463019cdf6ea4198f2a349f3935c33d988cd6908cf31dba572bac31f9363675433328e6d679b SHA512 b417d76a4225f16730441dee7befacd6db5be782c9271b789d5f9c10232e342f2d46930eef79a58839c13b2887926591d953a87a7544e32c7bf80d2c65390e31 +DIST gajim-1.8.4.tar.gz 3710470 BLAKE2B e23eafe707bc482a050fcef44df9e68af552444cce173c506538ebe01557a894dc0ba8b9afe18f195fd0b00b717b1268531a960b1c8b868c22081135d14e3079 SHA512 1a5b028c0e308eb15417c8c11584bc0e8b0218fead5155093ede4bc3961b6bee2b47bc3510f751dc70194634d6ca94d4a675f6891c8f050859fb4729020e52cb diff --git a/net-im/gajim/gajim-1.3.3-r2.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild deleted file mode 100644 index 726c404f14f1..000000000000 --- a/net-im/gajim/gajim-1.3.3-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{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 ~arm64 ~riscv 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 - virtual/pkgconfig - >=sys-devel/gettext-0.17-r1" -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - dev-python/idna[${PYTHON_USEDEP}] - dev-python/precis-i18n[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - <dev-python/python-nbxmpp-3[${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/gajim-1.3.3_p2-r1.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild deleted file mode 100644 index 9228c4d00e2f..000000000000 --- a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="sqlite,xml" -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 xdg-utils - -DESCRIPTION="Jabber client written in PyGTK" -HOMEPAGE="https://gajim.org/" -SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" - -COMMON_DEPEND=" - dev-libs/gobject-introspection[cairo(+)] - >=x11-libs/gtk+-3.22:3[introspection]" -DEPEND="${COMMON_DEPEND} - app-arch/unzip - virtual/pkgconfig - >=sys-devel/gettext-0.17-r1" -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - dev-python/idna[${PYTHON_USEDEP}] - dev-python/precis-i18n[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - <dev-python/python-nbxmpp-3[${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 -} - -# tests in this release don't work, see also: -# https://dev.gajim.org/gajim/gajim/-/issues/10755 -RESTRICT="test" diff --git a/net-im/gajim/gajim-1.4.0-r1.ebuild b/net-im/gajim/gajim-1.7.3-r1.ebuild index 60900668dd5d..8cdd33907dc9 100644 --- a/net-im/gajim/gajim-1.4.0-r1.ebuild +++ b/net-im/gajim/gajim-1.7.3-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="sqlite,xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 xdg-utils @@ -15,14 +16,13 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" COMMON_DEPEND=" dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] - x11-libs/gtksourceview:4" + x11-libs/gtksourceview:4[introspection]" DEPEND="${COMMON_DEPEND} app-arch/unzip virtual/pkgconfig @@ -30,22 +30,22 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} $(python_gen_cond_dep ' dev-python/idna[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}] dev-python/precis-i18n[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}] - <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[${PYTHON_USEDEP}] >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}] dev-python/css-parser[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - net-libs/libsoup[introspection] + net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] + dev-python/pillow[${PYTHON_USEDEP}] crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) @@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND} media-plugins/gst-plugins-gtk ) omemo? ( + dev-python/jaraco-classes[${PYTHON_USEDEP}] dev-python/python-axolotl[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] @@ -71,15 +72,19 @@ RDEPEND="${COMMON_DEPEND} app-text/gspell[introspection] app-text/hunspell ) - upnp? ( net-libs/gupnp-igd[introspection] ) - webp? ( dev-python/pillow[${PYTHON_USEDEP}] ) + upnp? ( net-libs/gupnp-igd:0[introspection] ) ')" -src_install() { - distutils-r1_src_install +python_compile() { + distutils-r1_python_compile + ./pep517build/build_metadata.py -o dist/metadata +} + +python_install() { + distutils-r1_python_install + ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr" - # avoid precompressed man pages - rm -r "${D}/usr/share/man" + rm "${D}"/usr/share/man/man1/*.gz doman data/*.1 } diff --git a/net-im/gajim/gajim-1.4.2.ebuild b/net-im/gajim/gajim-1.7.3.ebuild index 60900668dd5d..125c2e7bd15e 100644 --- a/net-im/gajim/gajim-1.4.2.ebuild +++ b/net-im/gajim/gajim-1.7.3.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="sqlite,xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 xdg-utils @@ -17,12 +18,11 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64 ~riscv ~x86" IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" COMMON_DEPEND=" dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] - x11-libs/gtksourceview:4" + x11-libs/gtksourceview:4[introspection]" DEPEND="${COMMON_DEPEND} app-arch/unzip virtual/pkgconfig @@ -30,22 +30,22 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} $(python_gen_cond_dep ' dev-python/idna[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}] dev-python/precis-i18n[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}] - <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[${PYTHON_USEDEP}] >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}] dev-python/css-parser[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - net-libs/libsoup[introspection] + net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] + dev-python/pillow[${PYTHON_USEDEP}] crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) @@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND} media-plugins/gst-plugins-gtk ) omemo? ( + dev-python/jaraco-classes[${PYTHON_USEDEP}] dev-python/python-axolotl[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] @@ -71,15 +72,11 @@ RDEPEND="${COMMON_DEPEND} app-text/gspell[introspection] app-text/hunspell ) - upnp? ( net-libs/gupnp-igd[introspection] ) - webp? ( dev-python/pillow[${PYTHON_USEDEP}] ) + upnp? ( net-libs/gupnp-igd:0[introspection] ) ')" src_install() { distutils-r1_src_install - - # avoid precompressed man pages - rm -r "${D}/usr/share/man" doman data/*.1 } diff --git a/net-im/gajim/gajim-1.4.1.ebuild b/net-im/gajim/gajim-1.8.0.ebuild index 60900668dd5d..0e911bf76b48 100644 --- a/net-im/gajim/gajim-1.4.1.ebuild +++ b/net-im/gajim/gajim-1.8.0.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="sqlite,xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 xdg-utils @@ -15,37 +16,46 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" +# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +# Gajim depends now on omemo-dr. Add KEYWORDS again, +# when https://bugs.gentoo.org/912285 is fixed. + +KEYWORDS="~amd64" +IUSE="+crypt geolocation jingle remote rst +spell upnp +webp" COMMON_DEPEND=" dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] - x11-libs/gtksourceview:4" + x11-libs/gtksourceview:4[introspection]" DEPEND="${COMMON_DEPEND} app-arch/unzip virtual/pkgconfig + >=x11-libs/pango-1.5.0 >=sys-devel/gettext-0.17-r1" RDEPEND="${COMMON_DEPEND} $(python_gen_cond_dep ' dev-python/idna[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}] dev-python/precis-i18n[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}] - <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[${PYTHON_USEDEP}] >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}] dev-python/css-parser[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - net-libs/libsoup[introspection] + net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/jaraco-classes[${PYTHON_USEDEP}] + dev-python/python-axolotl[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/omemo-dr[${PYTHON_USEDEP}] crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) @@ -57,11 +67,6 @@ RDEPEND="${COMMON_DEPEND} 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] @@ -71,16 +76,19 @@ RDEPEND="${COMMON_DEPEND} app-text/gspell[introspection] app-text/hunspell ) - upnp? ( net-libs/gupnp-igd[introspection] ) - webp? ( dev-python/pillow[${PYTHON_USEDEP}] ) + upnp? ( net-libs/gupnp-igd:0[introspection] ) ')" -src_install() { - distutils-r1_src_install +python_compile() { + distutils-r1_python_compile + ./pep517build/build_metadata.py -o dist/metadata +} + +python_install() { + distutils-r1_python_install + ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr" - # avoid precompressed man pages - rm -r "${D}/usr/share/man" - doman data/*.1 + gzip -d "${ED}"/usr/share/man/man1/*.gz || die } pkg_postinst() { diff --git a/net-im/gajim/gajim-1.4.0.ebuild b/net-im/gajim/gajim-1.8.1.ebuild index dbb2ac846a85..b66f62a0dc62 100644 --- a/net-im/gajim/gajim-1.4.0.ebuild +++ b/net-im/gajim/gajim-1.8.1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9,10} ) -PYTHON_REQ_USE="sqlite,xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 xdg-utils @@ -15,36 +16,46 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp" -S="${WORKDIR}/${P%_p2}" +# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +# Gajim depends now on omemo-dr. Add KEYWORDS again, +# when https://bugs.gentoo.org/912285 is fixed. + +KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" +IUSE="+crypt geolocation jingle remote rst +spell upnp +webp" COMMON_DEPEND=" dev-libs/gobject-introspection[cairo(+)] - >=x11-libs/gtk+-3.22:3[introspection]" + >=x11-libs/gtk+-3.22:3[introspection] + x11-libs/gtksourceview:4[introspection]" DEPEND="${COMMON_DEPEND} app-arch/unzip virtual/pkgconfig + >=x11-libs/pango-1.5.0 >=sys-devel/gettext-0.17-r1" RDEPEND="${COMMON_DEPEND} $(python_gen_cond_dep ' dev-python/idna[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}] dev-python/precis-i18n[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pycurl[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}] - <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[${PYTHON_USEDEP}] >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}] dev-python/css-parser[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - net-libs/libsoup[introspection] + net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/jaraco-classes[${PYTHON_USEDEP}] + dev-python/python-axolotl[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/omemo-dr[${PYTHON_USEDEP}] crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) @@ -56,11 +67,6 @@ RDEPEND="${COMMON_DEPEND} 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] @@ -70,16 +76,19 @@ RDEPEND="${COMMON_DEPEND} app-text/gspell[introspection] app-text/hunspell ) - upnp? ( net-libs/gupnp-igd[introspection] ) - webp? ( dev-python/pillow[${PYTHON_USEDEP}] ) + upnp? ( net-libs/gupnp-igd:0[introspection] ) ')" -src_install() { - distutils-r1_src_install +python_compile() { + distutils-r1_python_compile + ./pep517build/build_metadata.py -o dist/metadata +} + +python_install() { + distutils-r1_python_install + ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr" - # avoid precompressed man pages - rm -r "${D}/usr/share/man" - doman data/*.1 + gzip -d "${ED}"/usr/share/man/man1/*.gz || die } pkg_postinst() { diff --git a/net-im/gajim/gajim-1.8.4.ebuild b/net-im/gajim/gajim-1.8.4.ebuild new file mode 100644 index 000000000000..32d9ec5bc5a5 --- /dev/null +++ b/net-im/gajim/gajim-1.8.4.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite,xml(+)" +DISTUTILS_USE_PEP517=standalone +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 xdg-utils + +DESCRIPTION="Jabber client written in PyGTK" +HOMEPAGE="https://gajim.org/" +SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +# Gajim depends now on omemo-dr. Add KEYWORDS again, +# when https://bugs.gentoo.org/912285 is fixed. + +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+crypt geolocation jingle remote rst +spell upnp +webp" + +COMMON_DEPEND=" + dev-libs/gobject-introspection[cairo(+)] + >=x11-libs/gtk+-3.22:3[introspection] + x11-libs/gtksourceview:4[introspection]" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + virtual/pkgconfig + >=x11-libs/pango-1.5.0 + >=sys-devel/gettext-0.17-r1" +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/idna[${PYTHON_USEDEP}] + >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}] + <dev-python/nbxmpp-5.0.0[${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}] + 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:3.0[introspection] + media-libs/gsound[introspection] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/jaraco-classes[${PYTHON_USEDEP}] + dev-python/python-axolotl[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/omemo-dr[${PYTHON_USEDEP}] + crypt? ( + dev-python/pycryptodome[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] ) + geolocation? ( app-misc/geoclue[introspection] ) + jingle? ( + net-libs/farstream:0.2[introspection] + media-libs/gstreamer:1.0[introspection] + media-libs/gst-plugins-base:1.0[introspection] + media-libs/gst-plugins-ugly:1.0 + media-plugins/gst-plugins-gtk + ) + 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:0[introspection] ) + ')" + +python_compile() { + distutils-r1_python_compile + ./pep517build/build_metadata.py -o dist/metadata +} + +python_install() { + distutils-r1_python_install + ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr" + + gzip -d "${ED}"/usr/share/man/man1/*.gz || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +# Tests are unfortunately regularly broken +RESTRICT="test" diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml index 37921b88236a..543a6366d0ff 100644 --- a/net-im/gajim/metadata.xml +++ b/net-im/gajim/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hanno@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="crypt">End to end encryption and GPG encryption</flag> <flag name="geolocation">Sharing your location</flag> diff --git a/net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild b/net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild new file mode 100644 index 000000000000..e4dd3c659d02 --- /dev/null +++ b/net-im/gitter-bin/gitter-bin-5.0.1-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) + +inherit desktop multilib-build pax-utils unpacker xdg + +MY_PN="${PN/-bin/}" + +DESCRIPTION="Chat and network platform" +HOMEPAGE="https://gitter.im" +SRC_URI="amd64? ( https://update.gitter.im/linux64/${MY_PN}_${PV}_amd64.deb ) + x86? ( https://update.gitter.im/linux32/${MY_PN}_${PV}_i386.deb )" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="abi_x86_32 +abi_x86_64" +RESTRICT="bindist mirror strip" + +RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] + dev-libs/atk:0[${MULTILIB_USEDEP}] + dev-libs/expat:0[${MULTILIB_USEDEP}] + dev-libs/glib:2[${MULTILIB_USEDEP}] + dev-libs/nspr:0[${MULTILIB_USEDEP}] + dev-libs/nss:0[${MULTILIB_USEDEP}] + media-libs/alsa-lib:0[${MULTILIB_USEDEP}] + net-print/cups:0[${MULTILIB_USEDEP}] + sys-apps/dbus:0[${MULTILIB_USEDEP}] + x11-libs/cairo:0[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + x11-libs/libdrm:0[${MULTILIB_USEDEP}] + x11-libs/libX11:0[${MULTILIB_USEDEP}] + x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}] + x11-libs/libXcomposite:0[${MULTILIB_USEDEP}] + x11-libs/libXcursor:0[${MULTILIB_USEDEP}] + x11-libs/libXdamage:0[${MULTILIB_USEDEP}] + x11-libs/libXext:0[${MULTILIB_USEDEP}] + x11-libs/libXfixes:0[${MULTILIB_USEDEP}] + x11-libs/libXi:0[${MULTILIB_USEDEP}] + x11-libs/libXrandr:0[${MULTILIB_USEDEP}] + x11-libs/libXrender:0[${MULTILIB_USEDEP}] + x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}] + x11-libs/libXtst:0[${MULTILIB_USEDEP}] + x11-libs/pango:0[${MULTILIB_USEDEP}]" + +S="${WORKDIR}" + +QA_EXECSTACK="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a*" +QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe + opt/gitter/pnacl/pnacl_public_x86_64_ld_nexe + opt/gitter/pnacl/pnacl_public_x86_64_pnacl_sz_nexe + opt/gitter/payload + opt/gitter/swiftshader/libEGL.so + opt/gitter/swiftshader/libGLESv2.so + opt/gitter/chromedriver + opt/gitter/lib/libnw.so + opt/gitter/lib/libnode.so + opt/gitter/lib/libffmpeg.so + opt/gitter/nacl_helper + opt/gitter/nwjc + opt/gitter/nacl_irt_x86_64.nexe + opt/gitter/Gitter" +QA_FLAGS_IGNORED="opt/gitter/minidump_stackwalk + opt/gitter/nacl_helper_bootstrap + opt/gitter/crashpad_handler + opt/gitter/lib/libEGL.so + opt/gitter/lib/libGLESv2.so" + +src_prepare() { + default + + local arch + multilib_get_enabled_abis + arch="$(usex amd64 "64" "32")" + + # Remove hardcoded paths + sed -i \ + -e '/Exec/s/=.*/=gitter/' \ + -e '/Icon/s/=.*/=gitter/' \ + opt/Gitter/linux"${arch}"/gitter.desktop || die "sed failed" +} + +src_install() { + local arch + arch="$(usex amd64 "64" "32")" + + newicon opt/Gitter/linux"${arch}"/logo.png gitter.png + newicon -s 256 opt/Gitter/linux"${arch}"/logo.png gitter.png + domenu opt/Gitter/linux"${arch}"/gitter.desktop + + insinto /opt/gitter + doins -r opt/Gitter/linux"${arch}"/. + fperms -R +x /opt/gitter/lib/ /opt/gitter/swiftshader/ \ + /opt/gitter/pnacl/pnacl_public_x86_64_{ld_nexe,pnacl_llc_nexe,pnacl_sz_nexe} \ + /opt/gitter/{Gitter,chromedriver,crashpad_handler,minidump_stackwalk,nwjc,payload} \ + /opt/gitter/nacl_{helper,helper_bootstrap,irt_x86_64.nexe} + + dosym ../../opt/gitter/Gitter /usr/bin/gitter + + pax-mark -m "${ED}"/opt/gitter/Gitter +} diff --git a/net-im/libcommuni/metadata.xml b/net-im/libcommuni/metadata.xml index c5a66b1305b1..e5cca9123839 100644 --- a/net-im/libcommuni/metadata.xml +++ b/net-im/libcommuni/metadata.xml @@ -14,4 +14,7 @@ <flag name="qml">Install optional qml files.</flag> <flag name="uchardet">Use <pkg>app-i18n/uchardet</pkg>, which is upstreams default, instead of <pkg>dev-libs/icu</pkg>, which makes impossible to run tests.</flag> </use> + <upstream> + <remote-id type="github">communi/libcommuni</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/librvp/librvp-0.9.7.ebuild b/net-im/librvp/librvp-0.9.7.ebuild index b87866183e5c..c51d20139da9 100644 --- a/net-im/librvp/librvp-0.9.7.ebuild +++ b/net-im/librvp/librvp-0.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND="net-im/pidgin[gtk]" +RDEPEND="net-im/pidgin[gtk] + virtual/libcrypt:=" DEPEND="virtual/pkgconfig ${RDEPEND}" diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest index 9c096b333e70..e7ff804a5cb5 100644 --- a/net-im/mattermost-desktop-bin/Manifest +++ b/net-im/mattermost-desktop-bin/Manifest @@ -1,2 +1,4 @@ -DIST mattermost-desktop-5.1.1-linux-ia32.tar.gz 102392038 BLAKE2B ad18b2c654e9d1b7d575a0e877ae8ac702d0e5b37c2654ff5b000404f25cf1a67995cc9a63ce833c7779285ed4a038aadc00d2e5dab9de1737142bc98d77f632 SHA512 57e1901d0d9c106e16a3ff7df332cfb0716c0e6b1bdf0dd447cd81059df628c445164079baa464751980583f4de12d704f46f3601df1823eab05cd83b850d73f -DIST mattermost-desktop-5.1.1-linux-x64.tar.gz 102908239 BLAKE2B 34bb28894aa8a4dc5e2c9ea2ad601665db4a1a1eaf888f3eaeeabf01aedab07a51da0a3cb25e11bbf08b16e12a24af7e8d8dec308be3951d8d52953a0c9abd43 SHA512 576f41d0a5f7a6217c13594a7b5328442203d143b7ee54843167a38d0cdcb38d93732bcf3f42d6e329107917989f261483a303a2780f7639b0d91666d5a82c73 +DIST mattermost-desktop-5.7.0-linux-arm64.tar.gz 104464404 BLAKE2B 08caa572a986826f212dde6235c8ab36a31e559d14ca5a4e1a5e1e9024efc7f6a4126e56f96ad9f6dbc0fcc5798c466328791d9dccc6a5dcd83e0e0b80664930 SHA512 8e83d2105daa5a701b0f067203f7a0466a440962be2764f59ad7fa7ad892d6dcc07a1df8d5d924456b4038fae568a65efd52adc2c6f5c953f5ee7106468d526a +DIST mattermost-desktop-5.7.0-linux-x64.tar.gz 104733209 BLAKE2B 3da6c25a3b197f60169b8178208e7dd2d14585c8d1e83247720f1cebd71e7f8a663df1ad479cca47931abcb016f3d576ece435ea6ab9a9ea3dbef9d653216d88 SHA512 e993f30d19adc5ee619f2708b0e7e91872b07ff8d4cba102097239e8928ea6464efd87d80a66d39219a79393719fe5db7d7b28df7fd9d53fae3a72e84ee7e718 +DIST mattermost-desktop-5.8.0-rc.1-linux-arm64.tar.gz 103062689 BLAKE2B cfe5c2e3dd8f6a8fb4e792fb8539b37364126ba4cea1d89692ed770c1c36bdeb6b4d737e1fab111942a2277ec33c6ce173a1b52c99b57ca2760df5b4e8c8ce52 SHA512 272c1d4fe9213450e1e77a9551d2f991aad775b9b7fbf737655ee27336e559d9f629fa0c5e0c286b4bbb7a455fceb6fe2c41dfe7a4657475000b8f2875ce5433 +DIST mattermost-desktop-5.8.0-rc.1-linux-x64.tar.gz 103008224 BLAKE2B f02c619df0ed714961e1ec145e46ee403ee20d3107eb5367809046711ce9049c756abea1679b6f15b2f63241fb19c12c0b2b96e71eea946284cb9dab614b56d9 SHA512 7129b253b2e56757cd31787f1c4468050f68f023a2795f05a7f14826e33187346894c5fd7650c8d64d003205b1ca4ffd351290a939b88354f4811ef732ca02f0 diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.7.0.ebuild index d3d4259d992a..8db20297843a 100644 --- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.1.ebuild +++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.7.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MY_PN="${PN%-*}" -MY_PV="${PV/_rc/-rc}" +MY_PV="${PV/_rc/-rc.}" inherit desktop xdg @@ -13,28 +13,30 @@ HOMEPAGE="https://mattermost.com/" SRC_URI=" amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz ) - x86? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-ia32.tar.gz ) + arm64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-arm64.tar.gz ) " +S="${WORKDIR}" LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +# Starting with 5.2.0 upstream dropped x86 for their binary release #879519 +if [[ ${PV} != *rc* ]]; then + KEYWORDS="~amd64 ~arm64" +fi RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2[X] - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2[X] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss + dev-libs/wayland media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo - x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite @@ -45,7 +47,6 @@ RDEPEND=" x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon - x11-libs/libxshmfence x11-libs/pango " @@ -56,37 +57,39 @@ QA_PREBUILT=" opt/mattermost-desktop/libGLESv2.so opt/mattermost-desktop/libEGL.so opt/mattermost-desktop/libvk_swiftshader.so + opt/mattermost-desktop/libvulkan.so.1 + opt/mattermost-desktop/resources/* " DOCS=( NOTICE.txt ) -S="${WORKDIR}" - src_install() { if use amd64; then - cd "${WORKDIR}/mattermost-desktop-${MY_PV}-linux-x64" || die - elif use x86; then - cd "${WORKDIR}/mattermost-desktop-${MY_PV}-linux-ia32" || die + cd mattermost-desktop-${MY_PV}-linux-x64 || die + elif use arm64; then + cd mattermost-desktop-${MY_PV}-linux-arm64 || die fi - newicon app_icon.png ${MY_PN}.png insinto "/opt/${MY_PN}/locales" doins locales/*.pak insinto "/opt/${MY_PN}/resources" - doins resources/*.asar + doins -r resources/*.asar* insinto "/opt/${MY_PN}" doins *.pak *.bin *.dat exeinto "/opt/${MY_PN}" - doexe *.so "${MY_PN}" + doexe *.so *.so.* "${MY_PN}" - dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}" + dosym -r "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}" - make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}" + make_desktop_entry \ + "${MY_PN} --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto %U" \ + Mattermost "${MY_PN}" "Network;InstantMessaging;" \ + "MimeType=x-scheme-handler/mattermost;" einstalldocs } diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.8.0_rc1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.8.0_rc1.ebuild new file mode 100644 index 000000000000..8db20297843a --- /dev/null +++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.8.0_rc1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN%-*}" +MY_PV="${PV/_rc/-rc.}" + +inherit desktop xdg + +DESCRIPTION="Mattermost Desktop application" +HOMEPAGE="https://mattermost.com/" + +SRC_URI=" + amd64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-x64.tar.gz ) + arm64? ( https://releases.mattermost.com/desktop/${MY_PV}/mattermost-desktop-${MY_PV}-linux-arm64.tar.gz ) +" +S="${WORKDIR}" + +LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT" +SLOT="0" +# Starting with 5.2.0 upstream dropped x86 for their binary release #879519 +if [[ ${PV} != *rc* ]]; then + KEYWORDS="~amd64 ~arm64" +fi + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2[X] + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + dev-libs/wayland + media-libs/alsa-lib + media-libs/mesa + net-print/cups + sys-apps/dbus + sys-libs/glibc + x11-libs/cairo + 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/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 + opt/mattermost-desktop/libvulkan.so.1 + opt/mattermost-desktop/resources/* +" + +DOCS=( + NOTICE.txt +) + +src_install() { + if use amd64; then + cd mattermost-desktop-${MY_PV}-linux-x64 || die + elif use arm64; then + cd mattermost-desktop-${MY_PV}-linux-arm64 || die + fi + newicon app_icon.png ${MY_PN}.png + + insinto "/opt/${MY_PN}/locales" + doins locales/*.pak + + insinto "/opt/${MY_PN}/resources" + doins -r resources/*.asar* + + insinto "/opt/${MY_PN}" + doins *.pak *.bin *.dat + exeinto "/opt/${MY_PN}" + doexe *.so *.so.* "${MY_PN}" + + dosym -r "/opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}" + + make_desktop_entry \ + "${MY_PN} --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto %U" \ + Mattermost "${MY_PN}" "Network;InstantMessaging;" \ + "MimeType=x-scheme-handler/mattermost;" + + einstalldocs +} diff --git a/net-im/mattermost-desktop-bin/metadata.xml b/net-im/mattermost-desktop-bin/metadata.xml index 0d00bec64a33..f9342913d57d 100644 --- a/net-im/mattermost-desktop-bin/metadata.xml +++ b/net-im/mattermost-desktop-bin/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ceamac.paragon@gmail.com</email> + <maintainer type="person"> + <email>ceamac@gentoo.org</email> <name>Viorel Munteanu</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <upstream> <remote-id type="github">mattermost/desktop</remote-id> </upstream> diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest deleted file mode 100644 index f7fef12c8c7c..000000000000 --- a/net-im/mcabber/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mcabber-1.1.2.tar.bz2 651528 BLAKE2B d2160409d3a6e3c1a579bd1259438b11fae79612919a202a69a13c98c77fb5dbe4bc685939783f2a454ad5796c7d7f93e31d5fc92d96f2c6cc03e4efd4169f74 SHA512 bf53d593e84a4b4b2cf0230a4d94ea75f55008e3c2a839af5839519151209a61cce1685f9db14b65f5c4fa438bfabfeb25eb8e78e666b092c5c66af249788106 diff --git a/net-im/mcabber/files/README.gentoo b/net-im/mcabber/files/README.gentoo deleted file mode 100644 index dc394e6e5a4a..000000000000 --- a/net-im/mcabber/files/README.gentoo +++ /dev/null @@ -1,17 +0,0 @@ -MCabber requires you to create a subdirectory .mcabber in your home -directory and to place a configuration file there. -An example mcabberrc was installed as part of the documentation. -To create a new mcabberrc based on the example mcabberrc, execute the -following commands: - - mkdir -p ~/.mcabber - bzcat /usr/share/doc/mcabber*/mcabberrc.example.bz2 > ~/.mcabber/mcabberrc - -Then edit ~/.mcabber/mcabberrc with your favorite editor. - -See the CONFIGURATION FILE and FILES sections of the mcabber -manual page (section 1) for more information. - -MCabber supports PGP encryption of messages. See README_PGP.txt for details. - -Check out /usr/share/mcabber/ for contributed themes and event scripts. diff --git a/net-im/mcabber/mcabber-1.1.2-r1.ebuild b/net-im/mcabber/mcabber-1.1.2-r1.ebuild deleted file mode 100644 index bd5a83f961ef..000000000000 --- a/net-im/mcabber/mcabber-1.1.2-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 - -DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP" -HOMEPAGE="http://mcabber.com/" - -if [[ "${PV}" == 9999 ]]; then - inherit mercurial - EHG_REPO_URI="https://mcabber.com/hg/" - EHG_CHECKOUT_DIR="${WORKDIR}" - EHG_BOOTSTRAP="autogen.sh" - S="${WORKDIR}/${PN}" -else - SRC_URI="http://mcabber.com/files/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="aspell crypt idn otr spell ssl vim-syntax" - -LANGS="cs de fr it nl pl ru uk" -# localized help versions are installed only, when L10N var is set -for i in ${LANGS}; do - IUSE="${IUSE} l10n_${i}" -done; - -RDEPEND="crypt? ( app-crypt/gpgme:= ) - otr? ( >=net-libs/libotr-3.1.0 ) - aspell? ( app-text/aspell ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - idn? ( net-dns/libidn:= ) - spell? ( app-text/enchant:0 ) - dev-libs/glib:2 - net-libs/libnsl:0= - sys-libs/ncurses:0= - >=net-libs/loudmouth-1.4.3-r1[ssl?]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt ) - -pkg_setup() { - if use aspell && use spell; then - ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred." - fi -} - -src_configure() { - econf \ - --enable-modules \ - $(use_enable crypt gpgme) \ - $(use_enable otr) \ - $(use_enable aspell) \ - $(use_enable spell enchant) \ - $(use_with idn libidn) -} - -src_install() { - default - - # clean unneeded language documentation - for i in ${LANGS}; do - use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i} - done - - # contrib themes - insinto /usr/share/${PN}/themes - doins "${S}"/contrib/themes/* - - # contrib generic scripts - exeinto /usr/share/${PN}/scripts - doexe "${S}"/contrib/*.{pl,py} - - # contrib event scripts - exeinto /usr/share/${PN}/scripts/events - doexe "${S}"/contrib/events/* - - if use vim-syntax; then - cd contrib/vim/ || die - - insinto /usr/share/vim/vimfiles/syntax - doins mcabber_log-syntax.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins mcabber_log-ftdetect.vim - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild deleted file mode 100644 index eb94b6002a7b..000000000000 --- a/net-im/mcabber/mcabber-9999.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 - -DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP" -HOMEPAGE="http://mcabber.com/" - -if [[ "${PV}" == 9999 ]]; then - inherit mercurial - EHG_REPO_URI="https://mcabber.com/hg/" - EHG_CHECKOUT_DIR="${WORKDIR}" - EHG_BOOTSTRAP="autogen.sh" - S="${WORKDIR}/${PN}" -else - SRC_URI="http://mcabber.com/files/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="aspell crypt idn otr spell ssl vim-syntax" - -LANGS="cs de fr it nl pl ru uk" -# localized help versions are installed only, when L10N var is set -for i in ${LANGS}; do - IUSE="${IUSE} l10n_${i}" -done; - -RDEPEND="crypt? ( app-crypt/gpgme:= ) - otr? ( >=net-libs/libotr-3.1.0 ) - aspell? ( app-text/aspell ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - idn? ( net-dns/libidn:= ) - spell? ( app-text/enchant:0 ) - dev-libs/glib:2 - net-libs/libnsl:0= - sys-libs/ncurses:0= - >=net-libs/loudmouth-1.4.3-r1[ssl?]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README TODO mcabberrc.example doc/README_PGP.txt ) - -pkg_setup() { - if use aspell && use spell; then - ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred." - fi -} - -src_configure() { - econf \ - --enable-modules \ - $(use_enable crypt gpgme) \ - $(use_enable otr) \ - $(use_enable aspell) \ - $(use_enable spell enchant) \ - $(use_with idn libidn) -} - -src_install() { - default - - # clean unneeded language documentation - for i in ${LANGS}; do - use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i} - done - - # contrib themes - insinto /usr/share/${PN}/themes - doins "${S}"/contrib/themes/* - - # contrib generic scripts - exeinto /usr/share/${PN}/scripts - doexe "${S}"/contrib/*.{pl,py} - - # contrib event scripts - exeinto /usr/share/${PN}/scripts/events - doexe "${S}"/contrib/events/* - - if use vim-syntax; then - cd contrib/vim/ || die - - insinto /usr/share/vim/vimfiles/syntax - doins mcabber_log-syntax.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins mcabber_log-ftdetect.vim - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-im/mcabber/metadata.xml b/net-im/mcabber/metadata.xml deleted file mode 100644 index 0abc7b5f4923..000000000000 --- a/net-im/mcabber/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - MCabber is a small Jabber console client that features - such as GPG encryption, SSL support, MUC (Multi-User Chat) support, - history logging, commands completion, and external actions triggers. - </longdescription> - <use> - <flag name="aspell">Adds support for app-text/aspell spell - checker.</flag> - <flag name="otr">Enable encrypted conversations using Off-The-Records - messaging - </flag> - </use> -</pkgmetadata> diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest index c151cad22052..e398b36c9b25 100644 --- a/net-im/neochat/Manifest +++ b/net-im/neochat/Manifest @@ -1 +1,2 @@ -DIST neochat-1.2.0.tar.xz 244064 BLAKE2B dcf728036269e3aefc524c1fea56f07f76c4132d810e2edb2c199ff8df7fd77ff8d90a5fbd6d13d59dae8894ccc312cf38107a3b5ba5a08fd80b31a0f8a53a0c SHA512 50837f44b899999753208363283c20a6b858bdaf26bba9e9762a04c2e65534014df88a9404ce7659a87d5e896e08a5e5f4ac23e3922ebe4cb6c7715b07058af7 +DIST neochat-23.08.5.tar.xz 795564 BLAKE2B 1f6dec3376f059e9d70e8be5461719bc74d631a0f98b4d417cd5b8709b4ed1ce9fc48e90a57c8f32889ad2fbf3089f80d9b29a7a73a1944fb54db81f837c4a67 SHA512 936e8112818bc925121d71fcc23d43bc448387af7c8c7857f2ce8b5d128f1acedc9c3c2b6d66e50fb317418cbd144c5262e2fb9e6d80364d48e08e42b27316bf +DIST neochat-24.02.2.tar.xz 884660 BLAKE2B 38298089b6034f955e0285e13f652750e6593ab8201b8177a77e4fb524c188a1cd73f0254a548daadb564e7cbd42b097dbb26f6c7088971038f1dfcd83e458c7 SHA512 726ae34b6e714f34d4f88070ef3e173cfb2893530e65efdaf294b835ab9c1e1f8c600c6accf6124bd7f509079acacf2e9b36f3b43956ba37b531677f25a4f18c diff --git a/net-im/neochat/neochat-1.2.0.ebuild b/net-im/neochat/neochat-23.08.5.ebuild index 357579f37efd..468a4b99124e 100644 --- a/net-im/neochat/neochat-1.2.0.ebuild +++ b/net-im/neochat/neochat-23.08.5.ebuild @@ -1,46 +1,54 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.77.0 -QTMIN=5.15.2 -inherit ecm kde.org +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Client for Matrix, the decentralized communication protocol" HOMEPAGE="https://apps.kde.org/neochat/" -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64" -fi - -LICENSE="GPL-3" +LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )" SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64 x86" DEPEND=" app-text/cmark:= - dev-libs/qtkeychain:= + >=dev-libs/kirigami-addons-0.7.2:5 + dev-libs/qcoro5 + dev-libs/qtkeychain:=[qt5(+)] >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + >=kde-frameworks/knotifications-${KFMIN}:5[qml] + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5[qml] media-libs/kquickimageeditor:5 - >=net-libs/libquotient-0.6 + >=net-libs/libquotient-0.8:=[qt5(+)] " RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtlocation-${QTMIN}:5 >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=dev-qt/qtpositioning-${QTMIN}:5[qml] + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-frameworks/purpose-${KFMIN}:5 " BDEPEND="virtual/pkgconfig" diff --git a/net-im/neochat/neochat-24.02.2.ebuild b/net-im/neochat/neochat-24.02.2.ebuild new file mode 100644 index 000000000000..9e2ad8fc04a0 --- /dev/null +++ b/net-im/neochat/neochat-24.02.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Client for Matrix, the decentralized communication protocol" +HOMEPAGE="https://apps.kde.org/neochat/" + +LICENSE="GPL-3+ handbook? ( CC-BY-SA-4.0 )" +SLOT="0" +KEYWORDS="~amd64" + +# TODO: Wire up kunifiedpush once packaged? (1a3055df8673802076bc0c269ec24274abef375b) +DEPEND=" + app-text/cmark:= + dev-libs/kirigami-addons:6 + >=dev-libs/icu-61.0:= + dev-libs/qcoro[network] + >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwebview-${QTMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6[qml] + media-libs/kquickimageeditor:6 + >=net-libs/libquotient-0.8.1.2-r1:=[qt6] +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtlocation-${QTMIN}:6 + >=dev-qt/qtmultimedia-${QTMIN}:6[qml] + >=dev-qt/qtpositioning-${QTMIN}:6[qml] + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + >=kde-frameworks/prison-${KFMIN}:6[qml] +" +BDEPEND="virtual/pkgconfig" diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest index 8381d6e3e48f..f396862e2e46 100644 --- a/net-im/openmittsu/Manifest +++ b/net-im/openmittsu/Manifest @@ -1 +1 @@ -DIST openmittsu-0.9.15.0.tar.xz 2302908 BLAKE2B 2800004968a1965d0c91197402618ae4ebaeb7a7d977e79654f296d7d2ca1466d26b86d99810e0502e9eced27e5a664dbb4b0113ec344367fb7b85557ebc0381 SHA512 9e00828053506cf233a4cede49c501da903cc36d49379b891e4186cf10cacfbd596b4d2b7ac551e2e6340a878bfa1155f8696e179ed9dd1c2ecbff61430ed7f9 +DIST openmittsu-0.10.0.0.tar.xz 2345724 BLAKE2B 407fe07147b17e6ac6ec2381e77256d09824fce87f1d9d141d2940e566191e911b05fb3d6701d342be9bb667551903f4f8913cbb25f504100e92ab4a38339555 SHA512 d4334c8516efcd63a3e9dfcf9f9655922aa14b2574f39269cf7019a8c951144569138c2a0a75abb16e2746a33002f0c07ef6c86dbdb5405e11c315ec630eb0d0 diff --git a/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch new file mode 100644 index 000000000000..7935ff5530d4 --- /dev/null +++ b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch @@ -0,0 +1,25 @@ +Fix compilation with MUSL libc +https://bugs.gentoo.org/907754 + +Patch backported from spdlog repository: +https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96 + +commit 287a00d364990edbb621fe5e392aeb550135fb96 +Author: Khem Raj <raj.khem@gmail.com> +Date: Tue Jan 3 09:54:50 2023 -0800 + + Do not use LFS64 functions on linux/musl (#2589) + +--- openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h ++++ openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h +@@ -230,8 +230,8 @@ + #else + int fd = ::fileno(f); + #endif +-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated) +-#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) ++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated) ++#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) + struct stat64 st; + if (::fstat64(fd, &st) == 0) + { diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch deleted file mode 100644 index c89d24536ae9..000000000000 --- a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openmittsu-0.9.13.32-orig/CMakeLists.txt -+++ openmittsu-0.9.13.32/CMakeLists.txt -@@ -570,7 +570,7 @@ - target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql) - target_link_libraries(openMittsuVersionInfo Qt5::Core) - if (OPENMITTSU_ENABLE_TESTS) -- target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest) -+ target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread) - endif (OPENMITTSU_ENABLE_TESTS) - - # Link against libc++abi if requested. diff --git a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild index 945996c436ae..dc31c3a2ca06 100644 --- a/net-im/openmittsu/openmittsu-0.9.15.0.ebuild +++ b/net-im/openmittsu/openmittsu-0.10.0.0.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake desktop DESCRIPTION="Open source chat client for Threema-style end-to-end encrypted chat networks" HOMEPAGE="https://www.openmittsu.de/" -# git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git +# snapshot of https://github.com/blizzard4591/openMittsu.git +# git-archive-all.sh --prefix ${P}/ -- - | xz > ${P}.tar.xz SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD" @@ -17,7 +18,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND="dev-db/qt5-sqlcipher - >=dev-libs/libsodium-1.0.11:= + >=dev-libs/libsodium-1.0.18:= >=dev-qt/qtcore-5.7.1:5= >=dev-qt/qtgui-5.7.1:5= >=dev-qt/qtmultimedia-5.7.1:5=[widgets] @@ -28,9 +29,7 @@ RDEPEND="dev-db/qt5-sqlcipher DEPEND="${RDEPEND} test? ( >=dev-cpp/gtest-1.8.0 )" -PATCHES=( - "${FILESDIR}"/${PN}-0.9.13.32-fix-tests.patch -) +PATCHES=( "${FILESDIR}"/${P}-musl.patch ) DOCS=( README.md @@ -38,6 +37,8 @@ DOCS=( Example-contacts-file.txt ) +CMAKE_BUILD_TYPE="Gentoo" + src_configure() { local mycmakeargs=( # set version manually, since autodetection works only with git diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 52bc481c3d89..e56f63e61b80 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,4 +1,3 @@ -DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf DIST pidgin-2.14.10.tar.bz2 8229328 BLAKE2B 9f004abda0f00b315e763e8b17e4e938b44b8a971d5411d775b9428363ab2ae071462d6d16654fcc09270123c434ef2d1f639d7f6d85c08a83b05c0ba4342c21 SHA512 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d -DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6 -DIST pidgin-2.14.9.tar.bz2 8254729 BLAKE2B 3151e1ba21894f3c16ce615223e56e8ebff8f4098fe448b15752ed93e26d7895094fe584dfe0ebc6d8e4e0dba8a51ac57e90e2b7e286f4a840edcac2630df7c2 SHA512 fa610b49f77711df9ec76d886c836a80c5ea1563da4e861cbfcc7f7aba3130eeb5db7bb217e2aac571f9aea5d03da8b15c1aeec300468ab2ede6c409cce60d4f +DIST pidgin-2.14.12.tar.bz2 8226145 BLAKE2B 0f0bec301c196fb722b88998a2a420af4084aedb7563215bb44c2c74a670a20db030ac207f226cef7989477dba04a9655c71269564ccc3680b42946ee84fdb16 SHA512 ce016ab4c48448653ae22eead1ddc16f1d10f446c601f8abd2c85b4ea83a4e80092e1ce8182834d998b6587f42a92a9a91105b4db976e170ec7043bb6af3c54c +DIST pidgin-2.14.13.tar.bz2 8230755 BLAKE2B 38dc8bbd8966b0fce9bdcc043077628df172568490c390e1b6730a326398557b0df2f6289c8fbcb55bee0dd73fad6efc4ca0341c0d172326ba69a6cc5afbd35c SHA512 8bce143079c9421370ec4762d6fdb9b4cacf41c754eecf55c678943b834b709af9c1969070f30361341c0f51576cad4dfcaff89935c2160446be46deb8d2d3ef diff --git a/net-im/pidgin/files/pidgin-2.10.9-irc_join_sleep.patch b/net-im/pidgin/files/pidgin-2.10.9-irc_join_sleep.patch new file mode 100644 index 000000000000..860a43a9551a --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.10.9-irc_join_sleep.patch @@ -0,0 +1,11 @@ +diff -ur ./pidgin-2.10.9.orig/libpurple/protocols/irc/irc.c pidgin-2.10.9/libpurple/protocols/irc/irc.c +--- ./pidgin-2.10.9.orig/libpurple/protocols/irc/irc.c 2014-02-02 15:29:18.000000000 -0600 ++++ pidgin-2.10.9/libpurple/protocols/irc/irc.c 2014-09-02 10:30:24.830599697 -0500 +@@ -742,6 +742,7 @@ + struct irc_conn *irc = gc->proto_data; + const char *args[2]; + ++ g_usleep(500000); + args[0] = g_hash_table_lookup(data, "channel"); + args[1] = g_hash_table_lookup(data, "password"); + irc_cmd_join(irc, "join", NULL, args); diff --git a/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch b/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch deleted file mode 100644 index 30caaa92e9c5..000000000000 --- a/net-im/pidgin/files/pidgin-2.14.8-libpurple_test_fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -# HG changeset patch -# Node ID e8f8e1558e11 -# Parent 930e4fb71321 -diff --git a/libpurple/tests/test_util.c b/libpurple/tests/test_util.c ---- a/libpurple/tests/test_util.c -+++ b/libpurple/tests/test_util.c -@@ -172,7 +172,7 @@ - fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL)); - fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21.3234", TRUE, NULL, NULL, NULL)); - fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21Z", TRUE, NULL, NULL, NULL)); -- fail_unless(1631512800 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL)); -+ fail_unless(1631491200 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL)); - - /* For testing local time we use Asia/Kathmandu because it's +05:45 and - * doesn't have DST which means the test should always pass regardless of -@@ -195,9 +195,14 @@ - * localtime. - */ - timestamp = purple_str_to_time("09/13/202115:34:34", TRUE, NULL, NULL, &rest); -- fail_unless(1631470500 == timestamp); -+ fail_unless(1631491200 == timestamp); - assert_string_equal("15:34:34", rest); - -+ timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest); -+ fail_unless(1282941722 == timestamp); -+ fail_unless((-7 * 60 * 60) == tz_off); -+ assert_string_equal("PDT", rest); -+ - /* finally revert the TZ environment variable */ - if(oldtz != NULL) { - g_setenv("TZ", oldtz, TRUE); -diff --git a/libpurple/util.c b/libpurple/util.c ---- a/libpurple/util.c -+++ b/libpurple/util.c -@@ -887,6 +887,17 @@ - t.tm_isdst = -1; /* -1 means dst info is not available */ - } - } -+ } else { -+ /* If we have a time, figure out if we need to adjust our tz offset. */ -+ if(!mktime_with_utc) { -+ if(utc) { -+ mktime_with_utc = TRUE; -+ tzoff = 0; -+ } else { -+ /* Local Time */ -+ t.tm_isdst = -1; /* -1 means dst info is not available */ -+ } -+ } - } - - g_free(hours); diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml index 9d0e3f3f6588..8875dc41710e 100644 --- a/net-im/pidgin/metadata.xml +++ b/net-im/pidgin/metadata.xml @@ -1,9 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>nativemad@gentoo.org</email> + <name>Andreas Schuerch</name> + </maintainer> <longdescription> - Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE, and Zephyr. + Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes. + You can talk to your friends using AIM, ICQ, Jabber/XMPP, MSN Messenger, Yahoo!, + Bonjour, Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SIMPLE, + and Zephyr. </longdescription> <use> <flag name="gadu">Enable Gadu Gadu protocol support</flag> diff --git a/net-im/pidgin/pidgin-2.14.10.ebuild b/net-im/pidgin/pidgin-2.14.10-r1.ebuild index e8df9c8671e5..384fc9483316 100644 --- a/net-im/pidgin/pidgin-2.14.10.ebuild +++ b/net-im/pidgin/pidgin-2.14.10-r1.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit autotools gnome2-utils flag-o-matic 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" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/2" # libpurple version -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong 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 test tk v4l +xscreensaver zephyr zeroconf" @@ -89,7 +87,7 @@ BDEPEND=" dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) !gtk? ( nls? ( ${NLS_DEPEND} ) ) test? ( >=dev-libs/check-0.9.4 ) " @@ -136,9 +134,7 @@ DEFAULT_PRPLS="irc,jabber,simple" # x11-plugins/pidgin-sendscreenshot # x11-plugins/pidgimpd -PATCHES=( - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 -) +PATCHES=( "${FILESDIR}/${PN}-2.10.9-irc_join_sleep.patch" ) # 577286 pkg_pretend() { if ! use gtk && ! use ncurses ; then @@ -183,6 +179,8 @@ src_configure() { local myconf=( --disable-mono --disable-static + # Don't downgrade F_S, we already set it in toolchain, bug #890276 + --disable-fortify --with-dynamic-prpls="${DEFAULT_PRPLS}" --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" --x-includes="${EPREFIX}"/usr/include/X11 diff --git a/net-im/pidgin/pidgin-2.14.9.ebuild b/net-im/pidgin/pidgin-2.14.12.ebuild index 5fa3ae3e271a..de2d6665b465 100644 --- a/net-im/pidgin/pidgin-2.14.9.ebuild +++ b/net-im/pidgin/pidgin-2.14.12.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools gnome2-utils flag-o-matic 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" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0/2" # libpurple version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong 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 v4l +xscreensaver zephyr zeroconf" +test tk v4l +xscreensaver zephyr zeroconf" +RESTRICT="!test? ( test )" # dbus requires python to generate C code for dbus bindings (thus DEPEND only). # finch uses libgnt that links with libpython - {R,}DEPEND. But still there is @@ -75,9 +74,12 @@ RDEPEND=" " # We want nls in case gtk is enabled, bug # -NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" - -DEPEND="${RDEPEND} +NLS_DEPEND=" + >=dev-util/intltool-0.41.1 + sys-devel/gettext +" +DEPEND=" + ${RDEPEND} gtk? ( x11-base/xorg-proto ${NLS_DEPEND} @@ -88,8 +90,9 @@ BDEPEND=" dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) !gtk? ( nls? ( ${NLS_DEPEND} ) ) + test? ( >=dev-libs/check-0.9.4 ) " DOCS=( AUTHORS HACKING NEWS README ChangeLog ) @@ -134,10 +137,6 @@ DEFAULT_PRPLS="irc,jabber,simple" # 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" @@ -181,6 +180,8 @@ src_configure() { local myconf=( --disable-mono --disable-static + # Don't downgrade F_S, we already set it in toolchain, bug #890276 + --disable-fortify --with-dynamic-prpls="${DEFAULT_PRPLS}" --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" --x-includes="${EPREFIX}"/usr/include/X11 diff --git a/net-im/pidgin/pidgin-2.14.8.ebuild b/net-im/pidgin/pidgin-2.14.13.ebuild index dfdb2ffb0211..9b4c8c0a4078 100644 --- a/net-im/pidgin/pidgin-2.14.8.ebuild +++ b/net-im/pidgin/pidgin-2.14.13.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{9..12} ) -inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg +inherit autotools gnome2-utils flag-o-matic perl-module python-single-r1 xdg DESCRIPTION="GTK Instant Messenger client" HOMEPAGE="https://pidgin.im/" -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" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" 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 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +# The new gui useflag depends on the gtk useflag, as most pidgin plugins depend +# on the gtk flag. As soon as all plugins have been updated to use the new +# gui flag, the gtk flag can get removed. +IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk +gui idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl -tk +xscreensaver zephyr zeroconf" +test tk v4l +xscreensaver zephyr zeroconf" +RESTRICT="!test? ( test )" # dbus requires python to generate C code for dbus bindings (thus DEPEND only). # finch uses libgnt that links with libpython - {R,}DEPEND. But still there is @@ -30,27 +32,6 @@ tk +xscreensaver zephyr zeroconf" RDEPEND=" >=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 - ncurses? ( - >=dev-libs/libgnt-$(ver_cut 1-2) - sys-libs/ncurses:=[unicode(+)] - dbus? ( ${PYTHON_DEPS} ) - python? ( ${PYTHON_DEPS} ) - ) - gtk? ( - >=x11-libs/gtk+-2.10:2[aqua=] - x11-libs/libSM - >=x11-libs/pango-1.4.0 - xscreensaver? ( x11-libs/libXScrnSaver ) - spell? ( >=app-text/gtkspell-2.0.2:2 ) - eds? ( >=gnome-extra/evolution-data-server-3.6:= ) - prediction? ( >=dev-db/sqlite-3.3:3 ) - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=net-libs/farstream-0.2.7:0.2 - ) - zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 @@ -58,25 +39,50 @@ RDEPEND=" dev-python/dbus-python[${PYTHON_USEDEP}] ') ) - perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=net-libs/farstream-0.2.7:0.2 + ) + gtk? ( + >=x11-libs/gtk+-2.10:2[aqua=] + x11-libs/libSM + >=x11-libs/pango-1.4.0 + xscreensaver? ( x11-libs/libXScrnSaver ) + spell? ( >=app-text/gtkspell-2.0.2:2 ) + eds? ( >=gnome-extra/evolution-data-server-3.6:= ) + prediction? ( >=dev-db/sqlite-3.3:3 ) + ) + idn? ( net-dns/libidn:= ) meanwhile? ( net-libs/meanwhile ) + ncurses? ( + >=dev-libs/libgnt-$(ver_cut 1-2) + sys-libs/ncurses:=[unicode(+)] + dbus? ( ${PYTHON_DEPS} ) + python? ( ${PYTHON_DEPS} ) + ) + networkmanager? ( net-misc/networkmanager ) + perl? ( >=dev-lang/perl-5.16:= ) + sasl? ( dev-libs/cyrus-sasl:2 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - idn? ( net-dns/libidn:= ) + v4l? ( media-plugins/gst-plugins-v4l2 ) + zeroconf? ( net-dns/avahi[dbus] ) " # We want nls in case gtk is enabled, bug # -NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" - -DEPEND="${RDEPEND} +NLS_DEPEND=" + >=dev-util/intltool-0.41.1 + sys-devel/gettext +" +DEPEND=" + ${RDEPEND} gtk? ( x11-base/xorg-proto ${NLS_DEPEND} @@ -87,16 +93,20 @@ BDEPEND=" dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) !gtk? ( nls? ( ${NLS_DEPEND} ) ) + test? ( >=dev-libs/check-0.9.4 ) " DOCS=( AUTHORS HACKING NEWS README ChangeLog ) REQUIRED_USE=" dbus? ( ${PYTHON_REQUIRED_USE} ) + gtk? ( gui ) + gui? ( gtk ) networkmanager? ( dbus ) python? ( ${PYTHON_REQUIRED_USE} ) + v4l? ( gstreamer ) " # Enable Default protocols @@ -132,11 +142,6 @@ DEFAULT_PRPLS="irc,jabber,simple" # x11-plugins/pidgin-sendscreenshot # x11-plugins/pidgimpd -PATCHES=( - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 - "${FILESDIR}/${P}-libpurple_test_fix.patch" #819774 -) - pkg_pretend() { if ! use gtk && ! use ncurses ; then elog "You did not pick the ncurses or gtk use flags, only libpurple" @@ -160,7 +165,8 @@ pkg_setup() { } src_prepare() { - xdg_src_prepare + xdg_environment_reset + default eautoreconf } @@ -179,39 +185,42 @@ src_configure() { local myconf=( --disable-mono --disable-static + # Don't downgrade F_S, we already set it in toolchain, bug #890276 + --disable-fortify --with-dynamic-prpls="${DEFAULT_PRPLS}" --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" --x-includes="${EPREFIX}"/usr/include/X11 - $(use_enable ncurses consoleui) + $(use_enable dbus) + $(use_enable debug) + $(use_enable doc doxygen) + $(use_enable gstreamer) $(use_enable gtk gtkui) $(use_enable gtk sm) - $(usex gtk '--enable-nls' "$(use_enable nls)") - $(use gtk && use_enable xscreensaver screensaver) - $(use gtk && use_enable prediction cap) - $(use gtk && use_enable eds gevolution) - $(use gtk && use_enable spell gtkspell) + $(use_enable idn) + $(use_enable meanwhile) + $(use_enable networkmanager nm) + $(use_enable ncurses consoleui) $(use_enable perl) + $(use_enable sasl cyrus-sasl ) $(use_enable tk) $(use_enable tcl) - $(use_enable debug) - $(use_enable dbus) - $(use_enable meanwhile) - $(use_enable gstreamer) - $(use_with gstreamer gstreamer 1.0) - $(use_enable gstreamer farstream) - $(use_enable gstreamer vv) - $(use_enable sasl cyrus-sasl ) - $(use_enable doc doxygen) - $(use_enable networkmanager nm) + $(use_enable v4l farstream) + $(use_enable v4l gstreamer-video) + $(use_enable v4l vv) $(use_enable zeroconf avahi) - $(use_enable idn) + $(use_with gstreamer gstreamer 1.0) + $(usex gtk '--enable-nls' "$(use_enable nls)") + $(use gtk && use_enable eds gevolution) + $(use gtk && use_enable prediction cap) + $(use gtk && use_enable spell gtkspell) + $(use gtk && use_enable xscreensaver screensaver) ) - if use gnutls; then + if use gnutls ; then einfo "Disabling NSS, using GnuTLS" myconf+=( - --enable-nss=no --enable-gnutls=yes + --enable-nss=no --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" ) @@ -228,12 +237,12 @@ src_configure() { else myconf+=( --without-python3 ) fi - - econf "${myconf[@]}" + # set variable to prevent configure script from calling gconftool-2 + GCONF_SCHEMA_INSTALL_SOURCE=/etc/gconf/schemas econf "${myconf[@]}" } src_install() { - # setting this here because gnome2.eclass is not EAPI-7 ready + # setting this here because we no longer use gnome2.eclass export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" default diff --git a/net-im/poezio/metadata.xml b/net-im/poezio/metadata.xml index 47243d5ddc22..116cdcfb8474 100644 --- a/net-im/poezio/metadata.xml +++ b/net-im/poezio/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="pypi">poezio</remote-id> + <remote-id type="codeberg">poezio/poezio</remote-id> </upstream> </pkgmetadata> diff --git a/net-im/poezio/poezio-0.14.ebuild b/net-im/poezio/poezio-0.14.ebuild index b89e69da45ff..31269b9415ce 100644 --- a/net-im/poezio/poezio-0.14.ebuild +++ b/net-im/poezio/poezio-0.14.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 optfeature xdg DESCRIPTION="Console XMPP client that looks like most famous IRC clients" -HOMEPAGE="https://poez.io/" +HOMEPAGE="https://poez.io/ https://codeberg.org/poezio/poezio" LICENSE="GPL-3+" SLOT="0" if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git" + EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git https://github.com/poezio/poezio.git" inherit git-r3 # We build the html documentation using sphinx. BDEPEND="dev-python/sphinx" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi KEYWORDS="amd64" fi diff --git a/net-im/poezio/poezio-9999.ebuild b/net-im/poezio/poezio-9999.ebuild index 162044b8bbf3..65ae78d42495 100644 --- a/net-im/poezio/poezio-9999.ebuild +++ b/net-im/poezio/poezio-9999.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 optfeature xdg DESCRIPTION="Console XMPP client that looks like most famous IRC clients" -HOMEPAGE="https://poez.io/" +HOMEPAGE="https://poez.io/ https://codeberg.org/poezio/poezio" LICENSE="GPL-3+" SLOT="0" if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git" + EGIT_REPO_URI="https://lab.louiz.org/${PN}/${PN}.git https://github.com/poezio/poezio.git" inherit git-r3 # We build the html documentation using sphinx. BDEPEND="dev-python/sphinx" else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + inherit pypi KEYWORDS="~amd64" fi diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest index f343d5aa16e5..5c33bdd43b21 100644 --- a/net-im/profanity/Manifest +++ b/net-im/profanity/Manifest @@ -1,3 +1,6 @@ -DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898 -DIST profanity-0.11.0.tar.gz 887566 BLAKE2B 373b49670d00aa741e1957a8d3ca0282f6e7215c53c6c89088268d92fa6bd8f396e6c8e69f17aeb65f9183f620376613672c7f71c879ece31b97382df5d7a781 SHA512 14164921e151a9201728afc3835e08649036702d1fcdef6e37f83de6da4b9bd9c5e9ba54db69e3a9e16fb7e360369b4e92b6b771bc5e005e343a9a526738a268 -DIST profanity-0.12.1.tar.gz 895566 BLAKE2B 8e9a0e21ad598c5fdde293e38b9b6fb363ae06f424e7fd11d12a01ec6d5ce39a83849e56e284c15a842f01d66f3a4011f9518aef3a521459f690a7d052fe591f SHA512 ca3ea92fd439336cd0bf0be42afdda464e25be85b910aef837738b8d1787ac174ac93ccee4fb2fb385228ed7be8e9bac5e96a1f89a68df162785b17d7671463f +DIST profanity-0.13.1.tar.xz 621836 BLAKE2B e038fa01272150cb7974b03f88f64335bf1690115dbbb1c6fe04c79acb69db18c556edf41316af1d363f9715cd2e7aeb3f3bd867836704b620d9a87976b64fa9 SHA512 6d7d3c96c65e26c15cac1157bd296c1dbd3e2471aec959d6c319c68b70ec21cef0c40d7b4eed40c30c377a766db9f13a774ccb4880c227ee368e4dd607d9c267 +DIST profanity-0.14.0-fix-test-lto.patch 751 BLAKE2B b73a35c643845979dab9079dc38adfbb4b62d6c07c31533cb79d0e10aba6476c6570000dc5f8b71e9507c0fe713fb27a00dcb9b3e869c84a3d81f28b7a702c24 SHA512 ad82ddd06282ec56bfab88a4094216378f56c08b517a03beefd8fbc7b5c5d0a328ac75103cd99fb0c18b2418c65cee6517d600a100d0bc6d42a448687e253f9c +DIST profanity-0.14.0-ox-carbons.patch 1525 BLAKE2B 85fe9a76a8c735047365d56555c8e1df7906b5a676740a165fc5d9eab3933124b58abf6bdd0b448b5030a51cd1fad3ce8627cc03a2fbdacdd20c5dcc71d194e1 SHA512 36cfbb12ef7889ae5f318e35da2b0edf39dca067cefb9ac921f27cba0f52746eaae9d65b7631be392dd6e9a15d1fc8f8a3de36efe8707c756e9b008291e7f55e +DIST profanity-0.14.0-plugins-install.patch 2295 BLAKE2B 8b67718abdb620875b9040f550685189acf5a2776aa5f45422e3471c13ae05bd773c05652048940d5b8d10d88c9a013c3262742db7c84b0ff0c108f5f78ead45 SHA512 a8912d5a33d4d6eebf85733f616ed729a05688b4acf70c927aa733755527fd4e523c3a485bbb0390b2006225e8420e1d76db7e91d2122af41496c0081e3b0cea +DIST profanity-0.14.0-xscreensaver.patch 1678 BLAKE2B fe350b2249e45224b6510bb5730f38eafeb47e60a44035eaf88771940c9f0e556cc72ca737cb68c0b148b9faff442b9c9b6cdf9169a3db7ff6c7a60c2bdfc025 SHA512 2875df728b9957fc3bc8734a87c0e1a48913170b9718d6664ea65187327e26da1a7b2f5b80fe243a5ce5ab74983e4f3d22113747f44f8b8e8c13c871d31cf651 +DIST profanity-0.14.0.tar.gz 936272 BLAKE2B ec2ae625950a838ee50d6d3a87910bec76f28777bd662e909f394f18c277662694611a59d3be6c7f66821c2800a94b08f94b27a68d82e4de33b7d2f7b14ddf18 SHA512 25afd2f3146e6ed9f573f0e073cad0f06f7f8a21441c3c2c61641442d1aa5b9a7a817cdccc17354b32045ab9a965a95495a30c49088577a5060e8969725ea86e diff --git a/net-im/profanity/metadata.xml b/net-im/profanity/metadata.xml index 3089b326461a..7b75b4cdd81c 100644 --- a/net-im/profanity/metadata.xml +++ b/net-im/profanity/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>jubalh@iodoru.org</email> + <name>Michael Vetter</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. @@ -9,7 +16,9 @@ <use> <flag name="gpg">Enable OpenPGP encryption</flag> <flag name="omemo">Enable OMEMO encryption</flag> + <flag name="omemo-qrcode">Enable exchanging OMEMO information via QR code</flag> <flag name="otr">Enable encrypted conversations using Off-The-Records messaging</flag> + <flag name="python">Enable Python plugins support</flag> </use> <upstream> <remote-id type="github">profanity-im/profanity</remote-id> diff --git a/net-im/profanity/profanity-0.11.0-r1.ebuild b/net-im/profanity/profanity-0.11.0-r1.ebuild deleted file mode 100644 index 1ca09eb39937..000000000000 --- a/net-im/profanity/profanity-0.11.0-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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/profanity/profanity-0.12.1-r1.ebuild b/net-im/profanity/profanity-0.13.1.ebuild index 4dbaba2f82a7..e4e9ada1cc2d 100644 --- a/net-im/profanity/profanity-0.12.1-r1.ebuild +++ b/net-im/profanity/profanity-0.13.1.ebuild @@ -1,60 +1,63 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="A console based XMPP client inspired by Irssi" HOMEPAGE="https://profanity-im.github.io" -SRC_URI="https://profanity-im.github.io/tarballs/${P}.tar.gz" +SRC_URI="https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" - +KEYWORDS="amd64 ~arm64" IUSE="libnotify omemo otr gpg test xscreensaver" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" dev-db/sqlite:3 - dev-libs/atk + || ( app-accessibility/at-spi2-atk dev-libs/atk ) dev-libs/glib:2 dev-libs/libassuan dev-libs/libgpg-error - >=dev-libs/libstrophe-0.11.0 + >=dev-libs/libstrophe-0.12.2 + media-libs/harfbuzz:= net-misc/curl sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info virtual/libcrypt:= - media-libs/harfbuzz:= gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( - net-libs/libsignal-protocol-c dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c ) otr? ( net-libs/libotr ) - sys-libs/readline:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-util/cmocka ) " -RDEPEND="${COMMON_DEPEND}" src_configure() { - econf \ - $(use_enable libnotify notifications) \ - $(use_enable omemo) \ - $(use_enable otr) \ - $(use_enable gpg pgp) \ + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable otr) + $(use_enable gpg pgp) $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" } src_compile() { @@ -63,5 +66,6 @@ src_compile() { src_install() { default + find "${ED}" -type f -name '*.la' -delete || die } diff --git a/net-im/profanity/profanity-0.14.0-r1.ebuild b/net-im/profanity/profanity-0.14.0-r1.ebuild new file mode 100644 index 000000000000..7ffbb30da303 --- /dev/null +++ b/net-im/profanity/profanity-0.14.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-single-r1 + +DESCRIPTION="A console based XMPP client inspired by Irssi" +HOMEPAGE="https://profanity-im.github.io" +SRC_URI=" + https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz + https://github.com/profanity-im/profanity/commit/122434a.patch + -> ${PN}-0.14.0-ox-carbons.patch + https://github.com/profanity-im/profanity/commit/2ed6211c.patch + -> ${PN}-0.14.0-xscreensaver.patch +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver python" +RESTRICT="!test? ( test )" +REQUIRED_USE="omemo-qrcode? ( omemo ) python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + dev-db/sqlite:3 + dev-libs/glib:2 + >=dev-libs/libstrophe-0.12.3:= + media-libs/harfbuzz:= + net-misc/curl + sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info + gpg? ( app-crypt/gpgme:= ) + libnotify? ( x11-libs/libnotify ) + omemo? ( + dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c + ) + omemo-qrcode? ( media-gfx/qrencode:= ) + otr? ( net-libs/libotr ) + python? ( ${PYTHON_DEPS} ) + xscreensaver? ( + x11-libs/libXScrnSaver + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${DISTDIR}/${PN}-0.14.0-ox-carbons.patch" + "${DISTDIR}/${PN}-0.14.0-xscreensaver.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable omemo-qrcode) + $(use_enable otr) + $(use_enable python python-plugins) + $(use_enable gpg pgp) + $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-im/profanity/profanity-0.14.0-r2.ebuild b/net-im/profanity/profanity-0.14.0-r2.ebuild new file mode 100644 index 000000000000..3df1e94dec4e --- /dev/null +++ b/net-im/profanity/profanity-0.14.0-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit python-single-r1 + +DESCRIPTION="A console based XMPP client inspired by Irssi" +HOMEPAGE="https://profanity-im.github.io" +SRC_URI=" + https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz + https://github.com/profanity-im/profanity/commit/122434a.patch + -> ${PN}-0.14.0-ox-carbons.patch + https://github.com/profanity-im/profanity/commit/2ed6211c.patch + -> ${PN}-0.14.0-xscreensaver.patch + https://github.com/profanity-im/profanity/commit/b8817470.patch + -> ${PN}-0.14.0-plugins-install.patch + https://github.com/profanity-im/profanity/commit/6b9d0e86.patch + -> ${PN}-0.14.0-fix-test-lto.patch +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver python" +RESTRICT="!test? ( test )" +REQUIRED_USE="omemo-qrcode? ( omemo ) python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + dev-db/sqlite:3 + dev-libs/glib:2 + >=dev-libs/libstrophe-0.12.3:= + media-libs/harfbuzz:= + net-misc/curl + sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info + gpg? ( app-crypt/gpgme:= ) + libnotify? ( x11-libs/libnotify ) + omemo? ( + dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c + ) + omemo-qrcode? ( media-gfx/qrencode:= ) + otr? ( net-libs/libotr ) + python? ( ${PYTHON_DEPS} ) + xscreensaver? ( + x11-libs/libXScrnSaver + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${DISTDIR}/${PN}-0.14.0-ox-carbons.patch" + "${DISTDIR}/${PN}-0.14.0-xscreensaver.patch" + "${DISTDIR}/${PN}-0.14.0-plugins-install.patch" + "${DISTDIR}/${PN}-0.14.0-fix-test-lto.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable omemo-qrcode) + $(use_enable otr) + $(use_enable python python-plugins) + $(use_enable gpg pgp) + $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-im/profanity/profanity-0.14.0.ebuild b/net-im/profanity/profanity-0.14.0.ebuild new file mode 100644 index 000000000000..1c3dbeb86ba2 --- /dev/null +++ b/net-im/profanity/profanity-0.14.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A console based XMPP client inspired by Irssi" +HOMEPAGE="https://profanity-im.github.io" +SRC_URI="https://github.com/profanity-im/profanity/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64" +IUSE="libnotify omemo omemo-qrcode otr gpg test xscreensaver" +RESTRICT="!test? ( test )" +REQUIRED_USE="omemo-qrcode? ( omemo )" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 + dev-db/sqlite:3 + dev-libs/glib:2 + >=dev-libs/libstrophe-0.12.3:= + media-libs/harfbuzz:= + net-misc/curl + sys-libs/ncurses:=[unicode(+)] + sys-libs/readline:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + x11-misc/shared-mime-info + gpg? ( app-crypt/gpgme:= ) + libnotify? ( x11-libs/libnotify ) + omemo? ( + dev-libs/libgcrypt:= + net-libs/libsignal-protocol-c + ) + omemo-qrcode? ( media-gfx/qrencode:= ) + otr? ( net-libs/libotr ) + xscreensaver? ( + x11-libs/libXScrnSaver + x11-libs/libX11 + ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) +" + +src_configure() { + local myeconfargs=( + --enable-gdk-pixbuf + $(use_enable libnotify notifications) + $(use_enable omemo) + $(use_enable omemo-qrcode) + $(use_enable otr) + $(use_enable gpg pgp) + $(use_with xscreensaver) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/net-im/profanity/profanity-0.9.5-r1.ebuild b/net-im/profanity/profanity-0.9.5-r1.ebuild deleted file mode 100644 index 24acf02ba694..000000000000 --- a/net-im/profanity/profanity-0.9.5-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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(+)] - 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 10ff3c2864a9..f201aea92483 100644 --- a/net-im/prosody-modules/Manifest +++ b/net-im/prosody-modules/Manifest @@ -1 +1 @@ -DIST prosody-modules-0_pre20220319.tar.xz 1221828 BLAKE2B bb9482a60b15fd456125b512017ee93223bd139ed5b664236db4313b65985729ad4f5b8adb5d76bb9099ff4de816457fffd1277b7d36c556d00ce789d8ecf15f SHA512 a288d082e3bc2f9450c0b09e4f02816322d0db073134b315b2fa19be4d176037b399d763854c6c9a006eef85153c7bbbabddf5da85225d599082bfc7c0101450 +DIST prosody-modules-0_pre20230221.tar.xz 1243536 BLAKE2B d9bf42acf22f94ab0e3a530ca09e3cdac066c46f8b3e443b1c6e0768e6e0a516175452f673edf85832e527e0533c7ab65f51f328af4f01883d02d91e45880c84 SHA512 b49f4e05ed7b2dbac319380a929240366b2da559bd612838ab447b2b705a962b5d006f1a087d3bbd9df0b6ab307030811747fb2cc78fa2d2e1ab6c8020767c84 diff --git a/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild index a120ace96588..2950cf906871 100644 --- a/net-im/prosody-modules/prosody-modules-0_pre20220319.ebuild +++ b/net-im/prosody-modules/prosody-modules-0_pre20230221.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit savedconfig @@ -51,5 +51,6 @@ pkg_postinst() { einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'" einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'" einfo "" - einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\", \"/usr/$(get_libdir)/prosody/community-modules\" };" + einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\"," + einfo "\"/usr/$(get_libdir)/prosody/community-modules\" };" } diff --git a/net-im/prosody-modules/prosody-modules-9999.ebuild b/net-im/prosody-modules/prosody-modules-9999.ebuild index 5c9701070e68..fe62bc7a36e7 100644 --- a/net-im/prosody-modules/prosody-modules-9999.ebuild +++ b/net-im/prosody-modules/prosody-modules-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit mercurial savedconfig @@ -51,5 +51,6 @@ pkg_postinst() { einfo "'/usr/$(get_libdir)/prosody/community-modules' into 'plugin_paths'" einfo "into your prosody configuration file '/etc/jabber/prosody.cfg.lua.'" einfo "" - einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\", \"/usr/$(get_libdir)/prosody/community-modules\" };" + einfo "Example: plugin_paths = { \"/usr/$(get_libdir)/prosody/modules\"," + einfo "\"/usr/$(get_libdir)/prosody/community-modules\" };" } diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index a5cf62919db7..8454059a66ea 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -1,2 +1 @@ -DIST prosody-0.12.0.tar.gz 610330 BLAKE2B 14694ee95dc6eb6d053278a9d7718fd7487fe7ef862b4e2ee0d57f2b60cdeb22d1c74eac4a4df7447ea3e9ff57fb3734a9c9997f2767ed3aa04682f265b82185 SHA512 b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce -DIST prosody-0.12.1.tar.gz 611898 BLAKE2B 0b65ffbd6d4703f9e5fbac80e8887a4a41297afd22a776fb2eaa718b309f46c55a9d78f1d3ea97d4434c6ea2ebfe7a9051532ceda25ad78611769bd031894084 SHA512 705d2bcd38ffb19e90dab19992711aebf3d81f7bca7f9791ae5149510d465ec837ddf26a8c547eff2f2d131e5a694ddc3d0aac0b8921df65808192ae00527a85 +DIST prosody-0.12.4.tar.gz 616043 BLAKE2B 6bbe779424a6de6b5d266c3f6301282e010b96c9baca79d8dff46ab91365e6c5fdaa1b52c3caaaf33dad0990fa2c298f0447d37fcc018067f6efcc23d633b4fc SHA512 e035ec9af3831c596ababbc0320f352b7253d3ee968c9937998ffc255839173c9278912a0897fa9f0a0665bc43603f8570b5e15dfd1cba4571599e86a98d8cf4 diff --git a/net-im/prosody/prosody-0.12.1.ebuild b/net-im/prosody/prosody-0.12.1.ebuild deleted file mode 100644 index e9cab9fb7d64..000000000000 --- a/net-im/prosody/prosody-0.12.1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} luajit ) -LUA_REQ_USE="deprecated(+)" - -inherit lua-single systemd tmpfiles toolchain-funcs - -DESCRIPTION="Prosody is a modern XMPP communication server" -HOMEPAGE="https://prosody.im/" -SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib" -REQUIRED_USE=" - ^^ ( icu idn ) - ${LUA_REQUIRED_USE} -" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-group/prosody - acct-user/prosody - $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]') - $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]') - dev-lua/luarocks[${LUA_SINGLE_USEDEP}] - $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]') - $(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]') - $(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]') - icu? ( dev-libs/icu:= ) - idn? ( net-dns/libidn:= ) - ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') ) - libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') ) - dev-libs/openssl:0= - lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') ) - mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') ) - postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') ) - sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') ) - ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') ) - zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') ) - ${LUA_DEPS} -" - -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-jabber ) -" - -BDEPEND=" - virtual/pkgconfig - test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') ) -" - -PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" ) - -src_prepare() { - default - - # Set correct plugin path for optional net-im/prosody-modules package - sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die -} - -src_configure() { - local myeconfargs=( - --add-cflags="${CFLAGS}" - --add-ldflags="${LDFLAGS}" - --c-compiler="$(tc-getCC)" - --datadir="${EPREFIX}/var/lib/prosody" - --idn-library="$(usex idn 'idn' 'icu')" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --linker="$(tc-getCC)" - --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))" - --no-example-certs - --ostype="linux" - --prefix="${EPREFIX}/usr" - --runwith="${ELUA}" - --sysconfdir="${EPREFIX}/etc/prosody" - --with-lua-include="${EPREFIX}/$(lua_get_include_dir)" - --with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)" - ) - - # Since the configure script is handcrafted, - # and yells at unknown options, do not use 'econf'. - ./configure "${myeconfargs[@]}" || die - - rm makefile || die - mv GNUmakefile Makefile || die -} - -src_install() { - default - - keepdir /var/lib/prosody - - newinitd "${FILESDIR}"/prosody.initd-r6 prosody - systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service - - newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf -} - -pkg_postinst() { - local migrate_to_prosody_user="false" - tmpfiles_process prosody.conf - - if [[ ${REPLACING_VERSIONS} ]]; then - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 0.12.0; then - migrate_to_prosody_user="true" - break - fi - done - fi - - # Sarting with >=0.12.0, the prosody configuration is now in - # /etc/prosody and no longer in /etc/jabber. - # See if we need to migrate the configuration. Furthermore, - # prosody no longer runs under the, shared via net-im/jabber-base, - # 'jabber' use, but under its own user. - # This increase isolation and hence robustness and security. - if ${migrate_to_prosody_user}; then - local -A dirs_to_migrate=( - [/etc/jabber]=/etc/prosody - [/var/log/jabber]=/var/log/prosody - [/var/spool/jabber]=/var/lib/prosody - ) - - for src_dir in "${!dirs_to_migrate[@]}"; do - local eroot_src_dir="${EROOT}/${src_dir}" - local eroot_dst_dir="${EROOT}/${dirs_to_migrate[${src_dir}]}" - - cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}" - - if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then - rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die - fi - - if ! use prefix; then - chown --recursive prosody:prosody "${eroot_dst_dir}" || die - fi - done - - # Update configuration file to match new pathes and permissions - local mysedargs=( - -e "'s#/etc/jabber#/etc/prosody#g'" - -e "'s#/run/jabber#/run/prosody#g'" - -e "'s#/var/log/jabber#/var/log/prosody#g'" - -e "'s/prosody_user.*/prosody_user = \"prosody\";/g'" - -e "'s/prosody_group.*/prosody_group = \"prosody\";/g'" - -i /etc/prosody/prosody.cfg.lua - ) - - eval sed "${mysedargs[@]}" || die - - ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody" - ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber." - ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody." - ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)." - ewarn "Please check your configuration." - fi -} diff --git a/net-im/prosody/prosody-0.12.0.ebuild b/net-im/prosody/prosody-0.12.4.ebuild index 569a5077e12b..29ac71036832 100644 --- a/net-im/prosody/prosody-0.12.0.ebuild +++ b/net-im/prosody/prosody-0.12.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml index 957def7ed28e..305df6d7d537 100644 --- a/net-im/psi/metadata.xml +++ b/net-im/psi/metadata.xml @@ -18,7 +18,6 @@ <flag name="extras">Enable Psi+ patchset</flag> <flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag> <flag name="iconsets">Install additional iconsets, some of them have no clear licensing</flag> - <flag name="keyring">Enable storing password in system keyring manager</flag> <flag name="webengine">Enable themed, html-based chatlogs using <pkg>dev-qt/qtwebengine</pkg></flag> <flag name="whiteboarding">Enable experimental interactive SVG drawing</flag> <flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag> diff --git a/net-im/psi/psi-1.5.ebuild b/net-im/psi/psi-1.5-r2.ebuild index 51720b881c72..2d7af1d75ec5 100644 --- a/net-im/psi/psi-1.5.ebuild +++ b/net-im/psi/psi-1.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="aspell crypt dbus debug doc enchant +hunspell webengine whiteboarding xscreensaver" REQUIRED_USE=" @@ -25,10 +25,10 @@ REQUIRED_USE=" BDEPEND=" dev-qt/linguist-tools:5 virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen[dot] ) " DEPEND=" - app-crypt/qca:2[ssl] + app-crypt/qca:2[qt5(+),ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 6dc0701912e8..6feefa2675ff 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,11 +30,11 @@ REQUIRED_USE=" BDEPEND=" dev-qt/linguist-tools:5 virtual/pkgconfig - doc? ( app-doc/doxygen ) - extras? ( >=sys-devel/qconf-2.4 ) + doc? ( app-text/doxygen[dot] ) + extras? ( >=dev-build/qconf-2.4 ) " DEPEND=" - app-crypt/qca:2[ssl] + app-crypt/qca:2[qt5(+),ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -55,7 +55,7 @@ DEPEND=" dbus? ( dev-qt/qtdbus:5 ) enchant? ( app-text/enchant:2 ) hunspell? ( app-text/hunspell:= ) - keyring? ( dev-libs/qtkeychain:= ) + keyring? ( dev-libs/qtkeychain:=[qt5(+)] ) webengine? ( dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] diff --git a/net-im/psimedia/psimedia-9999.ebuild b/net-im/psimedia/psimedia-9999.ebuild index 1dc21a73f501..7b5e885b9d42 100644 --- a/net-im/psimedia/psimedia-9999.ebuild +++ b/net-im/psimedia/psimedia-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="" IUSE="extras" -BDEPEND="sys-devel/qconf" +BDEPEND="dev-build/qconf" DEPEND=" dev-libs/glib dev-qt/qtcore:5 diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest index 89cce77a2b83..26687b415f4c 100644 --- a/net-im/qtox/Manifest +++ b/net-im/qtox/Manifest @@ -1,3 +1 @@ -DIST qTox-1.17.3.tar.gz 4765213 BLAKE2B 3bffa351da01b436edc9c80c481845f6c6399c930ac1601e1676b7dec22ccfbf37c082c3a30ab71e2295c96bb427b36a718f960ffc75e700d5c29605f7bf0ac0 SHA512 e7534e40aed06aaeba57a201b7315ae2bd361f80971969b95b00fea0a6cbe106c2ea337485c47b350c07a9e3b74947c8b2feb206899292c29621e057b630ca56 -DIST qTox-1.17.4.tar.gz 4778657 BLAKE2B 5edcb6b6f997eeb4a332c23477d4c5021085cf8c62be596b0eb4771963f450bc96de6c2dc30ec3cfc98577f20bf618e8fc2478fc34af8a8810fc538a5ccc787b SHA512 00dd2b4492e6dbf90b038bd1e5263ba96c969fb5d879b5680401ad090ffe6aaa70ff487f2e88f93c573f2e1a7e6ca50a75dfe7b51fc56fc4d08cac076bfd75d0 DIST qTox-1.17.6.tar.gz 4777590 BLAKE2B d67ea8c1d5c478a791fd8594866130874c036f22ec9fd991e0f6c81fb7919824bba8e13675b0ffaf613188215a4fce6d07545476ab5565922b3989519aedd91f SHA512 840dfbca2cb1a3db4b5ab27cb408e183b152fcd87c0cb915ee58245e7c311b8682605e73497248072a5a48b239058b101a85235ed169d19606dc7bf61865f208 diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml index 51bdfe56b855..fe84ae06f1e7 100644 --- a/net-im/qtox/metadata.xml +++ b/net-im/qtox/metadata.xml @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> + <maintainer type="person"> <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 checking support</flag> <flag name="X">Enable auto-away support</flag> </use> diff --git a/net-im/qtox/qtox-1.17.3.ebuild b/net-im/qtox/qtox-1.17.3.ebuild deleted file mode 100644 index 41932b6c4516..000000000000 --- a/net-im/qtox/qtox-1.17.3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="qTox-${PV}" -inherit cmake xdg - -DESCRIPTION="qTox is an instant messaging client using the encrypted p2p Tox protocol" -HOMEPAGE="https://qtox.github.io/" -SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="notification spellcheck test X" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/qTox" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - || ( - dev-qt/qtgui:5[gif,jpeg,png,X(-)] - dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] - ) - dev-db/sqlcipher - dev-libs/libsodium:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/qrencode:= - media-libs/libexif:= - media-libs/openal - media-video/ffmpeg:=[webp,v4l] - net-libs/tox:0/0.2[av] - notification? ( x11-libs/snorenotify ) - spellcheck? ( kde-frameworks/sonnet:5 ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -src_prepare() { - cmake_src_prepare - - # bug 628574 - if ! use test; then - sed -i CMakeLists.txt -e "/include(Testing)/d" || die - sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE="Release" - -DPLATFORM_EXTENSIONS=$(usex X) - -DUPDATE_CHECK=OFF - -DUSE_CCACHE=ON - -DSPELL_CHECK=$(usex spellcheck) - -DSVGZ_ICON=ON - -DASAN=OFF - -DDESKTOP_NOTIFICATIONS=$(usex notification) - -DSTRICT_OPTIONS=OFF - -DGIT_DESCRIBE="${PV}" - ) - - cmake_src_configure -} - -src_test() { - # The excluded tests require network access. - cmake_src_test -E "test_(bsu|core)" -} diff --git a/net-im/qtox/qtox-1.17.4.ebuild b/net-im/qtox/qtox-1.17.6-r2.ebuild index 825ce6aa14d1..ca93183efb05 100644 --- a/net-im/qtox/qtox-1.17.4.ebuild +++ b/net-im/qtox/qtox-1.17.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then else MY_P="qTox-${PV}" SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" S="${WORKDIR}/qTox" fi @@ -20,7 +20,7 @@ HOMEPAGE="https://qtox.github.io/" LICENSE="GPL-3+" SLOT="0" -IUSE="notification +spellcheck test X" +IUSE="+spellcheck test X" RESTRICT="!test? ( test )" @@ -33,7 +33,7 @@ RDEPEND=" dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,X(-)] + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 @@ -44,7 +44,6 @@ RDEPEND=" media-libs/openal media-video/ffmpeg:=[webp,v4l] >=net-libs/tox-0.2.13:=[av] - notification? ( x11-libs/snorenotify ) spellcheck? ( kde-frameworks/sonnet:5 ) X? ( x11-libs/libX11 @@ -76,7 +75,7 @@ src_configure() { -DSPELL_CHECK=$(usex spellcheck) -DSVGZ_ICON=ON -DASAN=OFF - -DDESKTOP_NOTIFICATIONS=$(usex notification) + -DDESKTOP_NOTIFICATIONS=OFF -DSTRICT_OPTIONS=OFF ) diff --git a/net-im/qtox/qtox-1.17.6.ebuild b/net-im/qtox/qtox-1.17.6.ebuild deleted file mode 100644 index 825ce6aa14d1..000000000000 --- a/net-im/qtox/qtox-1.17.6.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/qTox/qTox.git" -else - MY_P="qTox-${PV}" - SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/qTox" -fi - -DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol" -HOMEPAGE="https://qtox.github.io/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="notification +spellcheck test X" - -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - dev-db/sqlcipher - dev-libs/libsodium:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,X(-)] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/qrencode:= - media-libs/libexif - media-libs/openal - media-video/ffmpeg:=[webp,v4l] - >=net-libs/tox-0.2.13:=[av] - notification? ( x11-libs/snorenotify ) - spellcheck? ( kde-frameworks/sonnet:5 ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) - X? ( x11-base/xorg-proto ) -" - -DOCS=( CHANGELOG.md README.md doc/user_manual_en.md ) - -src_prepare() { - cmake_src_prepare - - # bug 628574 - if ! use test; then - sed -i CMakeLists.txt -e "/include(Testing)/d" || die - sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die - fi -} - -src_configure() { - local mycmakeargs=( - -DPLATFORM_EXTENSIONS=$(usex X) - -DUPDATE_CHECK=OFF - -DUSE_CCACHE=OFF - -DSPELL_CHECK=$(usex spellcheck) - -DSVGZ_ICON=ON - -DASAN=OFF - -DDESKTOP_NOTIFICATIONS=$(usex notification) - -DSTRICT_OPTIONS=OFF - ) - - [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} ) - - cmake_src_configure -} - -src_test() { - # The excluded tests require network access. - cmake_src_test -E "test_(bsu|core)" -} diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index f9ff34f329b6..efe18c5045f9 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ HOMEPAGE="https://qtox.github.io/" LICENSE="GPL-3+" SLOT="0" -IUSE="notification +spellcheck test X" +IUSE="+spellcheck test X" RESTRICT="!test? ( test )" @@ -33,7 +33,7 @@ RDEPEND=" dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,X(-)] + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 @@ -46,7 +46,6 @@ RDEPEND=" >=net-libs/tox-0.2.13:=[av] >=net-libs/toxext-0.0.3 >=net-libs/tox_extension_messages-0.0.3 - notification? ( x11-libs/snorenotify ) spellcheck? ( kde-frameworks/sonnet:5 ) X? ( x11-libs/libX11 @@ -78,7 +77,7 @@ src_configure() { -DSPELL_CHECK=$(usex spellcheck) -DSVGZ_ICON=ON -DASAN=OFF - -DDESKTOP_NOTIFICATIONS=$(usex notification) + -DDESKTOP_NOTIFICATIONS=OFF -DSTRICT_OPTIONS=OFF ) diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest deleted file mode 100644 index 5b3657813636..000000000000 --- a/net-im/ricochet/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1 diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml deleted file mode 100644 index 3c27f902e41b..000000000000 --- a/net-im/ricochet/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>lucianposton@pm.me</email> - <name>Lucian Poston</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild deleted file mode 100644 index 016274c26dde..000000000000 --- a/net-im/ricochet/ricochet-1.1.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ricochet-im/ricochet" -else - SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Privacy-focused instant messaging through Tor hidden services" -HOMEPAGE="https://ricochet.im" - -LICENSE="BSD" -SLOT="0" -IUSE="debug hardened" - -RDEPEND=" - dev-libs/openssl:0= - dev-libs/protobuf:0= - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtwidgets:5 - net-vpn/tor" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -src_configure() { - local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' ) - qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') ) - qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') ) - - eqmake5 "${qmakeargs[@]}" -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-im/ricochet/ricochet-9999.ebuild b/net-im/ricochet/ricochet-9999.ebuild deleted file mode 100644 index 2caa9d50609c..000000000000 --- a/net-im/ricochet/ricochet-9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ricochet-im/ricochet" -else - SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Privacy-focused instant messaging through Tor hidden services" -HOMEPAGE="https://ricochet.im" - -LICENSE="BSD" -SLOT="0" -IUSE="debug hardened" - -RDEPEND=" - dev-libs/openssl:0= - dev-libs/protobuf:0= - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtwidgets:5 - net-vpn/tor" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -src_prepare() { - default - - # workaround bug https://github.com/ricochet-im/ricochet/issues/582 - cp contrib/usr.bin.ricochet-apparmor contrib/usr.bin.ricochet -} - -src_configure() { - local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' ) - qmakeargs+=( 'DEFINES+=APPARMOR' ) - qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') ) - qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') ) - - eqmake5 "${qmakeargs[@]}" -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest index 877f346ea074..4ffcf7efd980 100644 --- a/net-im/rocketchat-desktop-bin/Manifest +++ b/net-im/rocketchat-desktop-bin/Manifest @@ -1 +1,2 @@ -DIST rocketchat-3.8.7-linux-x86_64.rpm 62302012 BLAKE2B 2e5b36191abcb783e126e92bc608716efc910151484399cbbaf2fe0837fe8a40eb5c84b71e33052c5a950adfa0851d30be2e964754b08f3a9f3754169c5dc169 SHA512 833abf90425b5f9d0feb28acba4559d8d410ef2f5276b03fac8c781b9eab3ae7e0eebd613bc84e28a0dfa6005778a9afd91d528b6fa67ab825564e98241548c6 +DIST rocketchat-3.8.16-linux-x86_64.rpm 68712989 BLAKE2B b572047c535b6bcbca9e2a7b37060674aca9a4b356955e8ddf2b3e396b9f60e169d65fe5ffae292e43962b2045eb27c440f497fe950c6d66764b903e7e1700e1 SHA512 3a891396c3f92b5a47f2436047a6724089072bc3f4bd8a56830dfcb3347550dd71e7a2c3ce7c56b5c2c3de99384cdd470ea1005c705649a40a642404dc9e689f +DIST rocketchat-3.9.10-linux-x86_64.rpm 73538525 BLAKE2B be674b902c9c75481c51b50d3de3922a296adbf44eade04a4e1b01988254d4635aa2915f7566b59535fb0026aa41bf8fee121f5748b29ccc44c89b271df3d484 SHA512 75df8faef6b775eaa0e405319ae3d9f69244a93c38b1cc4ccd87be21c7f66f1f03246b0fe1de09c9eeeb70e6898609e6906c64914e57d2a24b7ada908f2737d2 diff --git a/net-im/rocketchat-desktop-bin/metadata.xml b/net-im/rocketchat-desktop-bin/metadata.xml index 49b40b0d68a8..42dd05249f7c 100644 --- a/net-im/rocketchat-desktop-bin/metadata.xml +++ b/net-im/rocketchat-desktop-bin/metadata.xml @@ -5,8 +5,5 @@ <remote-id type="github">RocketChat/Rocket.Chat.Electron</remote-id> <bugs-to>https://github.com/RocketChat/Rocket.Chat.Electron/issues</bugs-to> </upstream> - <maintainer type="person"> - <email>andrewammerlaan@gentoo.org</email> - <name>Andrew Ammerlaan</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.16.ebuild index 355c5e06379d..75bd8b080cc3 100644 --- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.7.ebuild +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.16.ebuild @@ -1,12 +1,12 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CHROMIUM_LANGS=" - am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi - hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk vi zh-CN zh-TW + af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk ur vi zh-CN zh-TW " inherit chromium-2 desktop rpm xdg @@ -26,10 +26,9 @@ SLOT="0" RESTRICT="bindist mirror" RDEPEND=" - app-accessibility/at-spi2-atk:2 - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat - dev-libs/libappindicator + dev-libs/libayatana-appindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji @@ -76,21 +75,22 @@ src_configure() { } src_install() { - for size in {16,32,48,64,128,256,512}; do + for size in {16,32,48,64,128,256,512,1024}; do doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/rocketchat-desktop.png" done domenu usr/share/applications/rocketchat-desktop.desktop local DESTDIR="/opt/Rocket.Chat" + + # https://github.com/RocketChat/Rocket.Chat.Electron/issues/2536 + dosym ../../usr/lib64/libayatana-appindicator3.so "${DESTDIR}"/libappindicator3.so + pushd "opt/Rocket.Chat" || die exeinto "${DESTDIR}" doexe chrome-sandbox rocketchat-desktop *.so* - exeinto "${DESTDIR}/swiftshader" - doexe swiftshader/*.so* - insinto "${DESTDIR}" doins *.pak *.bin *.json *.dat insopts -m0755 diff --git a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.9.10.ebuild index 878a21a4c1b2..75bd8b080cc3 100644 --- a/net-im/wazzapp-bin/wazzapp-bin-0.4.2-r1.ebuild +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.9.10.ebuild @@ -1,19 +1,19 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 CHROMIUM_LANGS=" - am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi - hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk vi zh-CN zh-TW + af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk ur vi zh-CN zh-TW " inherit chromium-2 desktop rpm xdg -DESCRIPTION="Unofficial electron-based wrapper around WhatsApp Web" -HOMEPAGE="https://github.com/diospiroverde/WazzApp" -SRC_URI="https://lx-dynamics.com/wazzapp-${PV}.x86_64.rpm" +DESCRIPTION="The Ultimate Open Source Web Chat Platform" +HOMEPAGE="https://rocket.chat" +SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}-linux-x86_64.rpm" S="${WORKDIR}" KEYWORDS="-* ~amd64" @@ -26,34 +26,36 @@ SLOT="0" RESTRICT="bindist mirror" RDEPEND=" - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat - dev-libs/glib + dev-libs/libayatana-appindicator dev-libs/nspr dev-libs/nss + media-fonts/noto-emoji media-libs/alsa-lib - media-libs/mesa net-print/cups - sys-apps/dbus sys-libs/glibc x11-libs/cairo - x11-libs/gdk-pixbuf + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 - x11-libs/libdrm - x11-libs/libX11 + x11-libs/libnotify x11-libs/libxcb + x11-libs/libX11 x11-libs/libXcomposite + x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes + x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver x11-libs/pango " -QA_PREBUILT="opt/wazzapp/*" +QA_PREBUILT="opt/Rocket.Chat/*" pkg_pretend() { chromium_suid_sandbox_check_kernel_config @@ -61,10 +63,8 @@ pkg_pretend() { src_prepare() { default - # Fix desktop file to pass validation - sed -i -e '/MimeType=whatsapp/d' usr/share/applications/wazzapp.desktop || die # cleanup languages - pushd "opt/wazzapp/locales" || die + pushd "opt/Rocket.Chat/locales" || die chromium_remove_language_paks popd || die } @@ -75,20 +75,21 @@ src_configure() { } src_install() { - for size in {64,128,512}; do - doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/wazzapp.png" + for size in {16,32,48,64,128,256,512,1024}; do + doicon -s ${size} "usr/share/icons/hicolor/${size}x${size}/apps/rocketchat-desktop.png" done - domenu usr/share/applications/wazzapp.desktop + domenu usr/share/applications/rocketchat-desktop.desktop - local DESTDIR="/opt/wazzapp" - pushd "opt/wazzapp" || die + local DESTDIR="/opt/Rocket.Chat" - exeinto "${DESTDIR}" - doexe chrome-sandbox wazzapp *.so* + # https://github.com/RocketChat/Rocket.Chat.Electron/issues/2536 + dosym ../../usr/lib64/libayatana-appindicator3.so "${DESTDIR}"/libappindicator3.so - exeinto "${DESTDIR}/swiftshader" - doexe swiftshader/*.so* + pushd "opt/Rocket.Chat" || die + + exeinto "${DESTDIR}" + doexe chrome-sandbox rocketchat-desktop *.so* insinto "${DESTDIR}" doins *.pak *.bin *.json *.dat @@ -99,6 +100,6 @@ src_install() { # see https://github.com/electron/electron/issues/17972 fperms 4755 "${DESTDIR}"/chrome-sandbox - dosym "${DESTDIR}"/wazzapp /opt/bin/wazzapp + dosym "${DESTDIR}"/rocketchat-desktop /opt/bin/rocketchat-desktop popd || die } diff --git a/net-im/sendxmpp-amm/metadata.xml b/net-im/sendxmpp-amm/metadata.xml index a7fa285c7476..89250bb227b0 100644 --- a/net-im/sendxmpp-amm/metadata.xml +++ b/net-im/sendxmpp-amm/metadata.xml @@ -5,4 +5,8 @@ <name>Florian Schmaus</name> <email>flow@gentoo.org</email> </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">flowdalic/sendxmpp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1-r1.ebuild index faee439560d1..0f3324d28b3a 100644 --- a/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild +++ b/net-im/sendxmpp-amm/sendxmpp-amm-1.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then inherit git-r3 else SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" + KEYWORDS="amd64 ~arm64" S="${WORKDIR}/${ORIG_PN}-${PV}" fi @@ -22,10 +22,20 @@ LICENSE="GPL-3+" SLOT="0" RDEPEND=" - dev-lang/ammonite-repl-bin + dev-lang/ammonite-repl-bin[scala2-13] !net-im/sendxmpp " +src_prepare() { + default + # Ensure that the script is using the right Scala version. + sed -i '1 s;^.*$;#!/usr/bin/env amm-2.13;' sendxmpp || die +} + +src_compile() { + : +} + src_install() { default dobin sendxmpp diff --git a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild index 782316d17024..c5dec761f9fd 100644 --- a/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild +++ b/net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then inherit git-r3 else SRC_URI="https://github.com/flowdalic/${ORIG_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" S="${WORKDIR}/${ORIG_PN}-${PV}" fi @@ -22,6 +22,21 @@ LICENSE="GPL-3+" SLOT="0" RDEPEND=" - dev-lang/ammonite-repl-bin + dev-lang/ammonite-repl-bin[scala2-13] !net-im/sendxmpp " + +src_prepare() { + default + # Ensure that the script is using the right Scala version. + sed -i '1 s;^.*$;#!/usr/bin/env amm-2.13;' sendxmpp.sc || die +} + +src_compile() { + : +} + +src_install() { + default + newbin sendxmpp.sc sendxmpp +} diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest index 570dbe52032d..4f0bd3a1a471 100644 --- a/net-im/signal-cli-bin/Manifest +++ b/net-im/signal-cli-bin/Manifest @@ -1,9 +1,9 @@ -DIST signal-cli-bin-0.10.6.README.md 5916 BLAKE2B e7fc8646b1bcafe5145fec9d14450dcc235380d8f1e776f30432b3235a2ed87043a55ba4da48c058f83b04750e0e1dcd97ee5e50ce079e7bb906f04f9e77fb38 SHA512 a7347ea5134982fa76442702b9d7892b1bbdbf5f36b1823461e14c320cf38cdf3f2379178c7864ef21285f8f3a0c26d4e2fb9ea9546b2fb4d1271d552bf7c37e -DIST signal-cli-bin-0.10.6.signal-cli.1.adoc 19971 BLAKE2B 1642c6e463d0c536abfba4fa2e5c91f5fbb7c9d9817684924be82a43c7fbca7b92f07718507582721c63c32d1844c5c016f02dfb7b03b8ae7494f090ffdb7d00 SHA512 361098a70d3ee7f114a8f0f95794c24380363f782b4778d70a1cb2cc8bfee107e9b0f88c4cdd236f51960a14bcf18d60cb9920d4abac09fe58c0df9f5d4a5551 -DIST signal-cli-bin-0.10.6.tar.gz 34191841 BLAKE2B 3a0d4ae9c938aaadb59803550d56d4ae17cb8c0d3ea1f2874654207423679ca42ab42d1aa7894b897794298f94b2f57eac84120b7fbf7a0e4d6e0153a9565681 SHA512 4a7d5381bbcdde516d25e6a580854213ba5b144aa942d3cdea48b3e587d9db9e448c1bcf8c91a7632157747d00c5da4a4dbf1c366ae5a332f922c6d9a6ad33d1 -DIST signal-cli-bin-0.8.5.README.md 5626 BLAKE2B e8a70135622a7eeaa9b4c965f75f001e641745c60a10d61ab96a014194034a1daf2ec077cb7798bf32c5f9218af6103dc9de7bbb2811b9a4aa162f55697f2232 SHA512 feed6673b56c4ac812d5038157f08bef36b48725211ad06a146a0f349c20213527eec814a5e940aacc0de0fdf7d74931fcd12a0d764df82340025a71a7f22a35 -DIST signal-cli-bin-0.8.5.signal-cli.1.adoc 15222 BLAKE2B d5075011c82bb79f2de7f7b2f2cbf060428281b0f1d054e1cba09632e6e2b7dd472e8dfa3f0d7863acd9d8e93cfa51af1e241153baeb4d5f2e0e8698a158e6a1 SHA512 cd076fde6cdeca70734bb385d7dbf574fa859da9b2ba01c5dfbd8fde0f3457c400be41d790cd7cdc05932731693f4114e4708b7d42e405bf8dd6f982309c0ca2 -DIST signal-cli-bin-0.8.5.tar.gz 17563403 BLAKE2B d400285d513c893475c74cbbfa7cb01391545d88e5e1504d9a5175428b31e7308cfc1c9526dc8cef4aab9a75e916a1b596f7939eeeaf5544ffb351c7dfcb3b59 SHA512 1d1931a568d9f95e020ee21dbf2d594b0d43d59e4621a7ef1ff21ab2e3cd4ea00da363bd5d86e12745015c643e4ebde4f58bec4a51be807e401ebb127430fa70 -DIST signal-cli-bin-0.9.2.README.md 5715 BLAKE2B 17be982049fd2ecadf009f2d4e2988c1d58105b2c9cf43c733a9f4e573565861be1c9707d0fd23f2c7a09e1d149671b854b98ed23da96a3df18cf3ec51cf437b SHA512 ea0f89513b9a9180d8d59fafffbe7a2ec253e0907c5666d9d9a50bc853a8ab1ec270850ca73cf3eb4d66b3c40d101ca641a00520fdbe1190c3ce3f34b775908c -DIST signal-cli-bin-0.9.2.signal-cli.1.adoc 16754 BLAKE2B 5bb5423496c84d450eba4039c45d23da9f927470a152b59d2e6b3cea3c8f3166237964588759d70a5e17086dfc69b0da3674bdb47a4eda0e2a258e87d1f5e6ff SHA512 2e3a8075b7c45901c762e410b9ec50ee9674439af861174aa116f74e8133e0804c9ddded9593e90bf916c50f5a74205edda2691204a320dcae1db291fe52dc20 -DIST signal-cli-bin-0.9.2.tar.gz 22875145 BLAKE2B d650629e5b7667f6d40f18e4bf364843d1e348019eb47d76e73a5a48652850c17e045667409e2b3c0adf2586dc69a7423a8a502ce18dc349a48f472f764012b3 SHA512 944d6ec443d17219feebd7712e783b238017cd1a74b7595a37ca865738a83b67f1a044eb3f7b2435687fb94d20ee94353866ed33a25d3abea3bb5aa79ef8fb77 +DIST signal-cli-bin-0.12.7.README.md 5634 BLAKE2B 18cc55c1e00c3011921633d41c7510b20420cb74f874d811c802f523b0095afd31941a3151411bf232d8e17e6c9f6294ea4d340afdc9e7a2275a9e7e935949b7 SHA512 4df477726ed1f06dcc4079ac1d5931ed0fc73c6f18a46bb96fc7ce0efbc8441b7c615c3dcdc9eec6ef64e1b02e1545a23bbfbf6f26e3b1af7f9bd1b27f586102 +DIST signal-cli-bin-0.12.7.gh.tar.gz 52233248 BLAKE2B 0f4279a80740c6d9c8a803a99c2365d6ecd2e0e9b6304f3dfd44d8209b469d4353d3d93512fb818b96a3ddd8fe2d3b0f03d2dd57ea33a6697f4f63cf04460f55 SHA512 a241c489ed7993a4a26002bed2a0539295567548c6286fe1f2e102eeadabdfc3f49a72634ddd7c91eabd3dfe489f042d1c5105d31074368282dabecca1e48053 +DIST signal-cli-bin-0.12.7.signal-cli.1.adoc 25618 BLAKE2B e971d8752c57a0b49677d84cbdbd21e2303c3fdac36dfbecc1ab1d4141c89b27dc563be06d7df472682c3fce684b9c9b572e10d155af266b7ac516edeed0b282 SHA512 ad9fd60e164ec1649ea9abddd3de51bb8b055d183e0e690e33ccca92f5a7afb2b35bf6c982fe21375d38eb8ed400da38b886e742cb63562ef0dcde0d14f07266 +DIST signal-cli-bin-0.13.1.README.md 5538 BLAKE2B 9cef6c3db846dada9e855e445d2a0465b1ba6495e27cf4366bdf34e5c505ec5bf76c8d898a1d36a564e4a983eefd401cc94ab71804c6bd30367c84af065504d4 SHA512 575d355a7969dd748958c945c7d3c92de77882a63bf7111062d417127e465b1975e55a13853b83ccecf1307c0baf9eb1057c48363bd78a729b6f1c9e19ab134d +DIST signal-cli-bin-0.13.1.gh.tar.gz 51796574 BLAKE2B dad3d4c3b1ac450b14edbdedd42abc62ece2941ea57d11239adb8cbf5bd82781b714260a62f7552a3879bfdfd2dd7b63dcb9d3ea33c65499c5aa4783a4bc253f SHA512 c82a1dadfbc37cc316fefb663a07d5e2366d31fa49a7a207fb3b2f1d68f55b41074f01704bada55b528bf60a3177a7ab74b612bc644ae57f8cb4a8115138d825 +DIST signal-cli-bin-0.13.1.signal-cli.1.adoc 28070 BLAKE2B 6530cefd79ca26673f8dda7b6e19574ed057aa92a2b940f55e951487254629d1f7c6ac03d30b682e7afc638ac859c31c1f3ac0542183316e1ba56c6dcd0e7d4c SHA512 8f98357f2ee2fb0102c847fb9ff91f0475386fb58708d9e37871ccb351fae7ab852c73eac5c3eedf154dc4bd4038c1d0f53f9024d1c0e0cb45bbd145f7dd09f9 +DIST signal-cli-bin-0.13.2.README.md 5538 BLAKE2B 9cef6c3db846dada9e855e445d2a0465b1ba6495e27cf4366bdf34e5c505ec5bf76c8d898a1d36a564e4a983eefd401cc94ab71804c6bd30367c84af065504d4 SHA512 575d355a7969dd748958c945c7d3c92de77882a63bf7111062d417127e465b1975e55a13853b83ccecf1307c0baf9eb1057c48363bd78a729b6f1c9e19ab134d +DIST signal-cli-bin-0.13.2.gh.tar.gz 57251017 BLAKE2B a9a34e8e4bcab9e0825a4c037cc9b69255d46aaefbe8185eeb9b7d56fe7cd40e5a2f65a3873b72c6e1dbbd1251d6ff1b9206c68dc7db09df72be200dd77a48cc SHA512 472a558038a21e323c4f56c7698b31a2901ffcf318844fa787bb2b611621b7ae34a883bb3465cebf3495fa4b5b450b9ef5a6c9298f44996628cc4f517d79bd25 +DIST signal-cli-bin-0.13.2.signal-cli.1.adoc 28146 BLAKE2B a8bb25ccaed0cb3bf8583985f103b628b344646e5eb3aa62171b2e97a2f5131da3026891abc6e98ebae9107e55ad0846a0f9ce4f8e5d5e072e00f85b8d372ee6 SHA512 df82d33c0f53bbb641cb5fc4c85182b5f937ad30c0784ef2d183c91bf2ae23367960169a05bbf2e1d2f72aa76e26cd1d14c72ddf7ea369d5cefc0bed28607561 diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch index 02b77bc54dd4..02b77bc54dd4 100644 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.11.3-use-working-java-version.patch diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch index b7ead7d0327a..452435a6751c 100644 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.9.2-use-working-java-version.patch +++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.13.1-use-working-java-version.patch @@ -1,9 +1,9 @@ -This patch searches the jre 11 binary in the gentoo specific directories. +This patch searches the jre 21 binary in the gentoo specific directories. -Signed-off-by: Martin Dummer <martin.dummer@gmx.net> +Signed-off-by: Julien Roy <julien@jroy.ca> ---- a/bin/signal-cli 1970-01-02 01:00:00.000000000 +0100 -+++ b/bin/signal-cli 2021-12-08 20:43:30.490613238 +0100 +--- a/bin/signal-cli ++++ b/bin/signal-cli @@ -118,13 +118,19 @@ @@ -15,12 +15,12 @@ Signed-off-by: Martin Dummer <martin.dummer@gmx.net> - 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 ++# This package needs Java 21, +# so we must search for matching java binaries -+for I in /usr/lib*/openjdk-11 /opt/openjdk-bin-11 /opt/openjdk-jre-bin-11; do ++for I in /usr/lib*/openjdk-21 /opt/openjdk-bin-21 /opt/openjdk-jre-bin-21; do + J_TRY="$I/bin/java" + if [ -x "$J_TRY" ] ; then -+ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "11." ++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17." + if [ $? -eq 0 ] ; then + JAVACMD="$J_TRY" + break diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch deleted file mode 100644 index 840c249b976f..000000000000 --- a/net-im/signal-cli-bin/files/signal-cli-bin-0.8.5-use-working-java-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -Signed-off-by: Martin Dummer <martin.dummer@gmx.net> - ---- a/bin/signal-cli -+++ b/bin/signal-cli -@@ -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 -- # 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 -+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." -+ 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/metadata.xml b/net-im/signal-cli-bin/metadata.xml index f16c98dc3065..4ccd37ebb6e5 100644 --- a/net-im/signal-cli-bin/metadata.xml +++ b/net-im/signal-cli-bin/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>julien@jroy.ca</email> + <name>Julien Roy</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>martin.dummer@gmx.net</email> <name>Martin Dummer</name> </maintainer> @@ -9,4 +13,10 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <bugs-to>https://github.com/AsamK/signal-cli/issues</bugs-to> + <changelog>https://github.com/AsamK/signal-cli/releases</changelog> + <doc>https://github.com/AsamK/signal-cli/wiki</doc> + <remote-id type="github">AsamK/signal-cli</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.12.7.ebuild index 29710caad87a..3898a8985c79 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.12.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,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}-Linux.tar.gz -> ${P}.tar.gz + https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.gh.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 " @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" DEPEND=" || ( virtual/jdk:17 virtual/jre:17 ) @@ -26,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-use-working-java-version.patch" + "${FILESDIR}/${PN}-0.11.3-use-working-java-version.patch" ) src_unpack() { diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild index e49d162dba04..134539b98724 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.8.5.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="signal-cli-${PV}" DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface" -HOMEPAGE="https://github.com/AsamK/signal-cli/wiki" +HOMEPAGE="https://github.com/AsamK/signal-cli" 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/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.gh.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 " @@ -17,15 +17,8 @@ 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 ) + || ( virtual/jdk:21 virtual/jre:21 ) " RDEPEND="${DEPEND}" BDEPEND=" @@ -33,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-use-working-java-version.patch" + "${FILESDIR}/${PN}-0.13.1-use-working-java-version.patch" ) src_unpack() { @@ -47,9 +40,12 @@ src_compile() { } src_install() { - insinto /usr + dodir /opt/signal-cli/{lib,bin} + insinto /opt/signal-cli doins -r lib + into /opt/signal-cli dobin bin/signal-cli + dosym -r /opt/signal-cli/bin/signal-cli /usr/bin/signal-cli newdoc "${DISTDIR}/${P}.README.md" README.md doman "${WORKDIR}/signal-cli.1" } diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild index e49d162dba04..134539b98724 100644 --- a/net-im/signal-cli-bin/signal-cli-bin-0.9.2.ebuild +++ b/net-im/signal-cli-bin/signal-cli-bin-0.13.2.ebuild @@ -1,13 +1,13 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="signal-cli-${PV}" DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface" -HOMEPAGE="https://github.com/AsamK/signal-cli/wiki" +HOMEPAGE="https://github.com/AsamK/signal-cli" 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/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.gh.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 " @@ -17,15 +17,8 @@ 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 ) + || ( virtual/jdk:21 virtual/jre:21 ) " RDEPEND="${DEPEND}" BDEPEND=" @@ -33,7 +26,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-use-working-java-version.patch" + "${FILESDIR}/${PN}-0.13.1-use-working-java-version.patch" ) src_unpack() { @@ -47,9 +40,12 @@ src_compile() { } src_install() { - insinto /usr + dodir /opt/signal-cli/{lib,bin} + insinto /opt/signal-cli doins -r lib + into /opt/signal-cli dobin bin/signal-cli + dosym -r /opt/signal-cli/bin/signal-cli /usr/bin/signal-cli newdoc "${DISTDIR}/${P}.README.md" README.md doman "${WORKDIR}/signal-cli.1" } diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest index aa4e75dbbcd9..9758d7380912 100644 --- a/net-im/signal-desktop-bin/Manifest +++ b/net-im/signal-desktop-bin/Manifest @@ -1 +1 @@ -DIST signal-desktop_5.48.0_amd64.deb 116776998 BLAKE2B cd1e7f9c83234e11a70c9ff1664e9e013e50c31863bc6d8e21c1f76be8d91e802ccf7127221287672245c5c69c33e36ed0c85a1781c8978695aa44869beb7375 SHA512 a2cfe0289cee3f8837f14a428f9d3f11238e0aacdcaff4d665162e01b41b318e2e6fe88ce88bade8167d8db1df54a8c5cb466d5fd13d2e6d570aa2d4e81ed4bd +DIST signal-desktop_7.5.1_amd64.deb 118830110 BLAKE2B ec52c9aaf5a6536074c67ffb43d0cd3d5d5b5ef962eb92f6547d1e5ca2e783f9e32e28e8c92c5aea2750f930e96b52109d6c4bdc9285461480bb031c35c4ee9f SHA512 25105faa46294047d31e532691b364855213bf5d36cda4ba5ff021ff316e9812f44bb646c42316b0c54496080f48224a24dd68c30db388931858efd4e2c1df40 diff --git a/net-im/signal-desktop-bin/metadata.xml b/net-im/signal-desktop-bin/metadata.xml index 32de5fb23877..dfd4d77b4377 100644 --- a/net-im/signal-desktop-bin/metadata.xml +++ b/net-im/signal-desktop-bin/metadata.xml @@ -9,4 +9,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">signalapp/Signal-Desktop</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-7.5.1.ebuild index 75db5c2f8043..4ddfe8d854e5 100644 --- a/net-im/signal-desktop-bin/signal-desktop-bin-5.48.0.ebuild +++ b/net-im/signal-desktop-bin/signal-desktop-bin-7.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit pax-utils unpacker xdg DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer" HOMEPAGE="https://signal.org/ https://github.com/signalapp/Signal-Desktop" -SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb" +SRC_URI="https://updates.signal.org/desktop/apt/pool/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" @@ -20,18 +20,16 @@ IUSE="+sound" RESTRICT="splitdebug" RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss + >=media-fonts/noto-emoji-20231130 media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] - x11-libs/gdk-pixbuf:2 x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm @@ -46,7 +44,7 @@ RDEPEND=" x11-libs/pango sound? ( || ( - media-sound/pulseaudio + media-libs/libpulse media-sound/apulse ) ) @@ -84,11 +82,11 @@ src_install() { doins -r usr/share/applications doins -r usr/share/icons - fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox + fperms +x /opt/Signal/signal-desktop /opt/Signal/chrome-sandbox /opt/Signal/chrome_crashpad_handler fperms u+s /opt/Signal/chrome-sandbox - pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox + pax-mark m opt/Signal/signal-desktop opt/Signal/chrome-sandbox opt/Signal/chrome_crashpad_handler - dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN} + dosym -r /opt/Signal/${MY_PN} /usr/bin/${MY_PN} } pkg_postinst() { diff --git a/net-im/skype-dbus-mock/Manifest b/net-im/skype-dbus-mock/Manifest deleted file mode 100644 index 891c4cd4f5f8..000000000000 --- a/net-im/skype-dbus-mock/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST skype-dbus-mock-0_pre20181011.tar.gz 2851 BLAKE2B fbb2d476d6a0402ea6ac70198d0aac87c24d7c9815fe27b03631625df10f24c71634f7f22eec2256869746cbf9d308ab3275380a755455ebbbb23ad2adcdd5a2 SHA512 d566a91cb279fe07626744e6196e3dcf7b36a5535bb8fe3cd7e6245d874bdf82f7948bd7f476f73c72f972894ee250d89a9eb055fdf55af9cbe97b1b05e39e16 diff --git a/net-im/skype-dbus-mock/metadata.xml b/net-im/skype-dbus-mock/metadata.xml deleted file mode 100644 index 115e9d64a669..000000000000 --- a/net-im/skype-dbus-mock/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild b/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild deleted file mode 100644 index 10a65d6831c3..000000000000 --- a/net-im/skype-dbus-mock/skype-dbus-mock-0_pre20181011.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit python-single-r1 - -GIT_COMMIT="3a9e2882ac5c0ad6be3c5cb5c7da008b4cfa51da" -DESCRIPTION="Mocked systemd dbus interface for skype 8.30+" -HOMEPAGE="https://github.com/maelnor/skype-dbus-mock" -S="${WORKDIR}/${PN}-${GIT_COMMIT}" -SRC_URI="https://github.com/maelnor/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]') - >=net-im/skypeforlinux-8.30 - !sys-apps/systemd - !sys-auth/elogind" - -src_install() { - python_doscript skype-dbus-mock.py - insinto /usr/share/dbus-1/system-services - doins org.freedesktop.login1.service - insinto /usr/share/dbus-1/system.d - doins skype-dbus-mock.conf -} - -pkg_postinst() { - ewarn "Restart dbus service to apply changes" -} diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest index 9743d4a4c379..a21a682fc0fc 100644 --- a/net-im/skypeforlinux/Manifest +++ b/net-im/skypeforlinux/Manifest @@ -1,5 +1,2 @@ -DIST skypeforlinux_8.81.0.268-1.x86_64.rpm 140540850 BLAKE2B 5d6cca460c5ad663ba5ac90d3d22f7c7eab7869b6b34413de7e8a479d7461d8b7aa9112798722a38c6b9ed0bf0321a37300bf410fc123e0bb8c7164cb027b2a7 SHA512 e2b077cca85c9fdbdac7b50cbfe3fa5bb628c7321dc30d5d6eac5d3c8b83d2a365bbe226f33cf35d2e5614a1b48eb9971ada4c87b98dd161c985e99a5008a9c9 -DIST skypeforlinux_8.82.0.403-1.x86_64.rpm 140817695 BLAKE2B 94a1038a534dce77e014e3823e4e5f2a8e6a951d3a644ed1562a5d50dad92f73152910286d797c50b882662f6f85cbf30bc4d80e5fcee7ac956f2c18177c00e1 SHA512 97920148290f9a4e7091f90a9e46f20ba663ad3f07c15a8540947d4b9a4390c217ac4eea5e80a5aad3a83e4110588fb7038b6359f34f4774ca6912f91db76346 -DIST skypeforlinux_8.83.0.408-1.x86_64.rpm 140847167 BLAKE2B 79d00a80bdb9cfa131094de2d702b1c8031307c6614ed962567cfeb3868bd542f5483b4ef87ab7146f9aa94e4548d9339ce7f4f28e65c2bfb5add25a3d3e5d26 SHA512 66865836f6e44ec54f14b26bdb0bcf2b9aec11379d4b16386814a44137e6eb1dd83cfbe2f4248cf6b2b4ba2513ebdcc64fec5f1819ee3a67e2ae04bcf4f7e028 -DIST skypeforlinux_8.83.0.411-1.x86_64.rpm 140568859 BLAKE2B 3e429e5c60fe812092a2da1cd6ed4012d81e65a4f69c18772a7e34721c1549e18c401ea2fc6d0263bdbace85265c48467835e97f7fa50eca1ae8dbbbf4cf0b3c SHA512 ebab053e75e81e294e434aa7f573843017a97d749cdf9fdf1768ba35a8172e17b1c98f5cb68e7445ab19bd44c4b1d6b8defdcff6bcd24128b5fa176466f10752 -DIST skypeforlinux_8.85.0.409-1.x86_64.rpm 125943432 BLAKE2B 7300c53c85387df71a7b1ccdd56a12a659a0e8ddbf8b274c32ac956e0bd67269815bc56e4d3a91cbc3f8214a3259026147ae3e8467efec934d06424495bf502d SHA512 2ee36ea93259390bb1061aae5ea86ac5617ac411f058b62607324fc36debbd7c914e872b9a2741ff72b37bc5e1b4683d862d3c01b84f9a3fe98de2e20959c911 +DIST skypeforlinux_8.108.0.205_amd64.deb 121989382 BLAKE2B 9881f81d46e8b89e737a78b8671fbdc0739eb349751791539531e0191a44512d2130371b40e302c6dccc3d15d3b6d6ddb006546732a1d39fca386bb3869bb57f SHA512 2d84ea37635f8b725f4654cf163202a372423eb6695af66b8e7cdd52f8780f6360571f67d780f11a4df08b3f0e99349b9e0253f3887d0821c79183ab0adc446b +DIST skypeforlinux_8.110.76.107_amd64.deb 122006300 BLAKE2B 124cb482280c17b0582f3ac67ec7e657de28d2be397e133fd1c552ad6738169fa902ea7b8e0d487e4e188e69049e977e7a18350b60ec6850f13140b749da6a26 SHA512 6f58b7589cc3e539d2b4f3cdcadcbcda8eea5f08ead406dd87891ad9f2e140fe4c7efb9c57842957a8c15f2d01f0d674fc13d8192ed270724c6e6480d1a58deb diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml index 49817ac247ca..254b22aa40cc 100644 --- a/net-im/skypeforlinux/metadata.xml +++ b/net-im/skypeforlinux/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>soap@gentoo.org</email> - <name>David Seifert</name> - </maintainer> + <!-- maintainer-needed --> <longdescription>Skype is for doing things together, whenever you're apart. Skype's text, voice and video make it simple to share experiences with the people that matter to you, wherever they are.</longdescription> </pkgmetadata> diff --git a/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild b/net-im/skypeforlinux/skypeforlinux-8.108.0.205.ebuild index 911974eaca88..a96df6bc8f2e 100644 --- a/net-im/skypeforlinux/skypeforlinux-8.82.0.403.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-8.108.0.205.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MULTILIB_COMPAT=( abi_x86_64 ) -inherit chromium-2 desktop pax-utils rpm multilib-build xdg +inherit chromium-2 desktop pax-utils unpacker 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" +SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb" S="${WORKDIR}" LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" SLOT="0" KEYWORDS="-* ~amd64" +IUSE="selinux" QA_PREBUILT="*" RESTRICT="mirror bindist strip" #299368 RDEPEND=" app-crypt/libsecret[${MULTILIB_USEDEP}] - dev-libs/atk[${MULTILIB_USEDEP}] + app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] dev-libs/expat[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] dev-libs/nspr[${MULTILIB_USEDEP}] @@ -52,14 +53,16 @@ RDEPEND=" x11-libs/libxcb[${MULTILIB_USEDEP}] x11-libs/libxkbcommon[${MULTILIB_USEDEP}] x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" + x11-libs/pango[${MULTILIB_USEDEP}] + selinux? ( sec-policy/selinux-skype ) +" pkg_setup() { chromium_suid_sandbox_check_kernel_config } src_unpack() { - rpm_src_unpack ${A} + unpack_deb ${A} } src_prepare() { diff --git a/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild b/net-im/skypeforlinux/skypeforlinux-8.110.76.107.ebuild index 911974eaca88..7013112b81ac 100644 --- a/net-im/skypeforlinux/skypeforlinux-8.83.0.411.ebuild +++ b/net-im/skypeforlinux/skypeforlinux-8.110.76.107.ebuild @@ -1,27 +1,28 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MULTILIB_COMPAT=( abi_x86_64 ) -inherit chromium-2 desktop pax-utils rpm multilib-build xdg +inherit chromium-2 desktop pax-utils unpacker 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" +SRC_URI="https://repo.skype.com/deb/pool/main/s/skypeforlinux/${PN}_${PV}_amd64.deb" S="${WORKDIR}" LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" SLOT="0" KEYWORDS="-* ~amd64" +IUSE="selinux" QA_PREBUILT="*" RESTRICT="mirror bindist strip" #299368 RDEPEND=" app-crypt/libsecret[${MULTILIB_USEDEP}] - dev-libs/atk[${MULTILIB_USEDEP}] + app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] dev-libs/expat[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] dev-libs/nspr[${MULTILIB_USEDEP}] @@ -52,14 +53,16 @@ RDEPEND=" x11-libs/libxcb[${MULTILIB_USEDEP}] x11-libs/libxkbcommon[${MULTILIB_USEDEP}] x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" + x11-libs/pango[${MULTILIB_USEDEP}] + selinux? ( sec-policy/selinux-skype ) +" pkg_setup() { chromium_suid_sandbox_check_kernel_config } src_unpack() { - rpm_src_unpack ${A} + unpack_deb ${A} } src_prepare() { diff --git a/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild b/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild deleted file mode 100644 index 911974eaca88..000000000000 --- a/net-im/skypeforlinux/skypeforlinux-8.81.0.268.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit chromium-2 desktop pax-utils rpm multilib-build xdg - -DESCRIPTION="Instant messaging client, with support for audio and video" -HOMEPAGE="https://www.skype.com/" -SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" -S="${WORKDIR}" - -LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="*" -RESTRICT="mirror bindist strip" #299368 - -RDEPEND=" - app-crypt/libsecret[${MULTILIB_USEDEP}] - dev-libs/atk[${MULTILIB_USEDEP}] - dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/libv4l[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-devel/gcc[cxx] - sys-libs/glibc - virtual/ttf-fonts - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - rpm_src_unpack ${A} -} - -src_prepare() { - default - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux || die - sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -e "/^OnlyShowIn=/d" \ - -i usr/share/applications/skypeforlinux.desktop || die -} - -src_install() { - dodir /opt - cp -a usr/share/skypeforlinux "${ED}"/opt || die - - # remove chrome-sandbox binary, users should use kernel namespaces - # https://bugs.gentoo.org/692692#c18 - rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die - - dobin usr/bin/skypeforlinux - - dodoc usr/share/skypeforlinux/*.html - dodoc -r usr/share/doc/skypeforlinux/. - # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) - dosym ${PF} usr/share/doc/skypeforlinux - - doicon usr/share/pixmaps/skypeforlinux.png - - local res - for res in 16 32 256 512; do - newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png - done - - domenu usr/share/applications/skypeforlinux.desktop - - pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux - pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node -} diff --git a/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild b/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild deleted file mode 100644 index 911974eaca88..000000000000 --- a/net-im/skypeforlinux/skypeforlinux-8.83.0.408.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit chromium-2 desktop pax-utils rpm multilib-build xdg - -DESCRIPTION="Instant messaging client, with support for audio and video" -HOMEPAGE="https://www.skype.com/" -SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" -S="${WORKDIR}" - -LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="*" -RESTRICT="mirror bindist strip" #299368 - -RDEPEND=" - app-crypt/libsecret[${MULTILIB_USEDEP}] - dev-libs/atk[${MULTILIB_USEDEP}] - dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/libv4l[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-devel/gcc[cxx] - sys-libs/glibc - virtual/ttf-fonts - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - rpm_src_unpack ${A} -} - -src_prepare() { - default - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux || die - sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -e "/^OnlyShowIn=/d" \ - -i usr/share/applications/skypeforlinux.desktop || die -} - -src_install() { - dodir /opt - cp -a usr/share/skypeforlinux "${ED}"/opt || die - - # remove chrome-sandbox binary, users should use kernel namespaces - # https://bugs.gentoo.org/692692#c18 - rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die - - dobin usr/bin/skypeforlinux - - dodoc usr/share/skypeforlinux/*.html - dodoc -r usr/share/doc/skypeforlinux/. - # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) - dosym ${PF} usr/share/doc/skypeforlinux - - doicon usr/share/pixmaps/skypeforlinux.png - - local res - for res in 16 32 256 512; do - newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png - done - - domenu usr/share/applications/skypeforlinux.desktop - - pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux - pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node -} diff --git a/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild b/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild deleted file mode 100644 index 911974eaca88..000000000000 --- a/net-im/skypeforlinux/skypeforlinux-8.85.0.409.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_64 ) - -inherit chromium-2 desktop pax-utils rpm multilib-build xdg - -DESCRIPTION="Instant messaging client, with support for audio and video" -HOMEPAGE="https://www.skype.com/" -SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm" -S="${WORKDIR}" - -LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1" -SLOT="0" -KEYWORDS="-* ~amd64" - -QA_PREBUILT="*" -RESTRICT="mirror bindist strip" #299368 - -RDEPEND=" - app-crypt/libsecret[${MULTILIB_USEDEP}] - dev-libs/atk[${MULTILIB_USEDEP}] - dev-libs/expat[${MULTILIB_USEDEP}] - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/nspr[${MULTILIB_USEDEP}] - dev-libs/nss[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/libv4l[${MULTILIB_USEDEP}] - net-print/cups[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-devel/gcc[cxx] - sys-libs/glibc - virtual/ttf-fonts - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - x11-libs/libxkbfile[${MULTILIB_USEDEP}] - x11-libs/pango[${MULTILIB_USEDEP}]" - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - rpm_src_unpack ${A} -} - -src_prepare() { - default - sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \ - -i usr/bin/skypeforlinux || die - sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \ - -e "/^OnlyShowIn=/d" \ - -i usr/share/applications/skypeforlinux.desktop || die -} - -src_install() { - dodir /opt - cp -a usr/share/skypeforlinux "${ED}"/opt || die - - # remove chrome-sandbox binary, users should use kernel namespaces - # https://bugs.gentoo.org/692692#c18 - rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die - - dobin usr/bin/skypeforlinux - - dodoc usr/share/skypeforlinux/*.html - dodoc -r usr/share/doc/skypeforlinux/. - # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open) - dosym ${PF} usr/share/doc/skypeforlinux - - doicon usr/share/pixmaps/skypeforlinux.png - - local res - for res in 16 32 256 512; do - newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png - done - - domenu usr/share/applications/skypeforlinux.desktop - - pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux - pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node -} diff --git a/net-im/slack/Manifest b/net-im/slack/Manifest index 935a53b48b4b..e3adb451e913 100644 --- a/net-im/slack/Manifest +++ b/net-im/slack/Manifest @@ -1,2 +1,2 @@ -DIST slack-desktop-4.22.0-amd64.deb 65772046 BLAKE2B e0178bb0118fa22699c459f7e289ba17fa116ba4f231a5fca6d4a889b737110c8de036651ca753a282500b168bba0fbae83c03a42e1a6df0096d1ca31761adcf SHA512 085122d454c9cf66091c167d16017d051a37dcf3cec07dcc8b4e28f40bc1b77bc98315b63219b1bd56c65305b3b49b9fb4161f8271a03e4bf7d42889b9c282f1 -DIST slack-desktop-4.23.0-amd64.deb 65626830 BLAKE2B a4b49e71b956e74a915ea9f2e26272d8ef15191c92479b1ed2615108569cc4c6cb97de53ff8d4099e4348b81c97447c0edfc1b0fbeacda3833953de9463e877f SHA512 f7885d78f712624ec8c3a26787a1876f4c6a35fedeec824ed4b1d7cc57dd23b9402254a7cfa9f585c3869a920d6fcfc868b9875a477fde1eab9d42a01d43d550 +DIST slack-desktop-4.37.101-amd64.deb 78933422 BLAKE2B b98574309a07812c9439aa18ce061eac5f8d3a8bbe1ec207b96dcd6ef5d32bb796348ada207123a4c9f75244b65f8de57b2290058b891f026c182e3697959fc9 SHA512 7ade44d443067c3330b28ec2ded8fabe84035c051d5e23e9f9f29a759833f7289491796ad2ca3855c840aa591e092048a2754ff429e7a2502c109577c0cef82d +DIST slack-desktop-4.37.94-amd64.deb 78908138 BLAKE2B 7bf8690bce4edfc613bab77b0705b570366044249f83f98a8c725544264cbdde2f666b7e4a184901446693ef81c61004e6cbc45fb857d80b8de2d25f45545990 SHA512 95a7ea03b1d393462ddd0a2c1129895fd053175f97eefc5a02069d93fc1d1075de6a6a0489d9eee749381ed18d5154ec58d0bdd4151191e9ca283f8df721ee75 diff --git a/net-im/slack/metadata.xml b/net-im/slack/metadata.xml index 8361ed63d9fa..79be733db06d 100644 --- a/net-im/slack/metadata.xml +++ b/net-im/slack/metadata.xml @@ -5,6 +5,10 @@ <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> @@ -16,6 +20,6 @@ and people. </longdescription> <upstream> - <doc>https://get.slack.help/hc/en-us</doc> + <doc>https://slack.com/intl/en-us/help</doc> </upstream> </pkgmetadata> diff --git a/net-im/slack/slack-4.23.0.ebuild b/net-im/slack/slack-4.37.101.ebuild index 16e9577cda1b..3d7a4b0058ab 100644 --- a/net-im/slack/slack-4.23.0.ebuild +++ b/net-im/slack/slack-4.37.101.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,22 +8,21 @@ MULTILIB_COMPAT=( abi_x86_64 ) inherit desktop multilib-build optfeature pax-utils unpacker xdg DESCRIPTION="Team collaboration tool" -HOMEPAGE="https://www.slack.com" +HOMEPAGE="https://slack.com" SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="appindicator suid" +IUSE="appindicator +seccomp suid wayland" RESTRICT="bindist mirror" -RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/atk:0[${MULTILIB_USEDEP}] +RDEPEND="app-accessibility/at-spi2-core:2[${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}] + dev-libs/wayland[${MULTILIB_USEDEP}] media-libs/alsa-lib:0[${MULTILIB_USEDEP}] media-libs/mesa:0[${MULTILIB_USEDEP}] net-print/cups:0[${MULTILIB_USEDEP}] @@ -42,7 +41,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${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}] )" + appindicator? ( dev-libs/libayatana-appindicator )" QA_PREBUILT="opt/slack/chrome-sandbox opt/slack/chrome_crashpad_handler @@ -70,7 +69,19 @@ src_prepare() { if use appindicator ; then sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ usr/share/applications/slack.desktop \ - || die "sed failed for slack.desktop" + || die "sed failed for appindicator" + fi + + if ! use seccomp ; then + sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for seccomp" + fi + + if use wayland ; then + sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for wayland" fi rm usr/lib/slack/LICENSE{,S-linux.json} \ @@ -89,6 +100,11 @@ src_install() { dosym ../../opt/slack/slack usr/bin/slack pax-mark -m "${ED}"/opt/slack/slack + + # https://bugs.gentoo.org/898912 + if use appindicator; then + dosym ../../usr/lib64/libayatana-appindicator3.so /opt/slack/libappindicator3.so + fi } pkg_postinst() { diff --git a/net-im/slack/slack-4.22.0.ebuild b/net-im/slack/slack-4.37.94.ebuild index 8650535c9304..3d7a4b0058ab 100644 --- a/net-im/slack/slack-4.22.0.ebuild +++ b/net-im/slack/slack-4.37.94.ebuild @@ -1,29 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MULTILIB_COMPAT=( abi_x86_64 ) inherit desktop multilib-build optfeature pax-utils unpacker xdg DESCRIPTION="Team collaboration tool" -HOMEPAGE="https://www.slack.com" +HOMEPAGE="https://slack.com" SRC_URI="https://downloads.slack-edge.com/releases/linux/${PV}/prod/x64/${PN}-desktop-${PV}-amd64.deb" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="appindicator suid" +IUSE="appindicator +seccomp suid wayland" RESTRICT="bindist mirror" -RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}] - app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}] - dev-libs/atk:0[${MULTILIB_USEDEP}] +RDEPEND="app-accessibility/at-spi2-core:2[${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}] + dev-libs/wayland[${MULTILIB_USEDEP}] media-libs/alsa-lib:0[${MULTILIB_USEDEP}] media-libs/mesa:0[${MULTILIB_USEDEP}] net-print/cups:0[${MULTILIB_USEDEP}] @@ -42,7 +41,7 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${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}] )" + appindicator? ( dev-libs/libayatana-appindicator )" QA_PREBUILT="opt/slack/chrome-sandbox opt/slack/chrome_crashpad_handler @@ -70,7 +69,19 @@ src_prepare() { if use appindicator ; then sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \ usr/share/applications/slack.desktop \ - || die "sed failed for slack.desktop" + || die "sed failed for appindicator" + fi + + if ! use seccomp ; then + sed -i '/Exec/s/%U/%U --disable-seccomp-filter-sandbox/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for seccomp" + fi + + if use wayland ; then + sed -i '/Exec/s/%U/%U --enable-features=WebRTCPipeWireCapturer/' \ + usr/share/applications/slack.desktop \ + || die "sed failed for wayland" fi rm usr/lib/slack/LICENSE{,S-linux.json} \ @@ -89,6 +100,11 @@ src_install() { dosym ../../opt/slack/slack usr/bin/slack pax-mark -m "${ED}"/opt/slack/slack + + # https://bugs.gentoo.org/898912 + if use appindicator; then + dosym ../../usr/lib64/libayatana-appindicator3.so /opt/slack/libappindicator3.so + fi } pkg_postinst() { diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index f3c75bead36a..ff04b5209c99 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1 +1 @@ -DIST spectrum2-2.1.3.tar.gz 666005 BLAKE2B 8356b71506b5489780052eaf404a79f0f760fa3a8d35e80e30730c86b5e4acf21a1ac59fed46e472a1085dc29c6751f2c4e788ad60569bf15b48d198762f2a77 SHA512 b6bf39738998b56c8a90984446740c38547ffdaadaf280d3f4f29cb8a2e168898a7b010eff115394f473fd02c66f30ef383c4a542812d5abd03a87b064b446a8 +DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d SHA512 c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9a2222c6f399 diff --git a/net-im/spectrum2/files/spectrum2.initd b/net-im/spectrum2/files/spectrum2.initd index 8a35dbe75bc9..0ab25819804d 100644 --- a/net-im/spectrum2/files/spectrum2.initd +++ b/net-im/spectrum2/files/spectrum2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/spectrum2_manager" @@ -41,7 +41,7 @@ stop() { # Andrey Utkin <andrey_utkin@gentoo.org> (24 Nov 2018) # Conrad Kostecki <conrad@kostecki.com> (24 Nov 2018) # We are aware of many security issues caused by careless chowning, see -# http://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml +# https://michael.orlitzky.com/articles/end_root_chowning_now_(make_etc-init.d_great_again).xhtml # We believe none of these issues apply. # These pidfiles are not read by any privileged process. # checkpath here chowns only the dir itself and doesn't act recursively. diff --git a/net-im/spectrum2/metadata.xml b/net-im/spectrum2/metadata.xml index 6de46eb88c98..14c0f5b599ee 100644 --- a/net-im/spectrum2/metadata.xml +++ b/net-im/spectrum2/metadata.xml @@ -19,4 +19,7 @@ <flag name="whatsapp">Enables the WhatsApp backend, based on <pkg>net-im/transwhat</pkg>.</flag> <flag name="twitter">Enables the Twitter backend.</flag> </use> + <upstream> + <remote-id type="github">SpectrumIM/spectrum2</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/spectrum2/spectrum2-2.1.3.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild index 9578b2864a39..659d8085be5d 100644 --- a/net-im/spectrum2/spectrum2-2.1.3.ebuild +++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,12 +25,12 @@ RDEPEND=" dev-libs/boost:=[nls] dev-libs/expat dev-libs/libev:= - dev-libs/log4cxx + >=dev-libs/log4cxx-1.0.0:= dev-libs/jsoncpp:= - dev-libs/openssl:0= + dev-libs/openssl:= dev-libs/popt dev-libs/protobuf:= - net-dns/libidn:0= + net-dns/libidn:= >=net-im/swift-4.0.2-r2:= net-misc/curl sys-libs/zlib:= @@ -54,7 +54,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( dev-util/cppunit ) " @@ -67,6 +67,8 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" -DENABLE_DOCS="$(usex doc)" -DENABLE_FROTZ="$(usex frotz)" -DENABLE_IRC="$(usex irc)" @@ -79,7 +81,6 @@ src_configure() { -DENABLE_TESTS="$(usex test)" -DENABLE_TWITTER="$(usex twitter)" -DENABLE_XMPP="$(usex xmpp)" - -DLIB_INSTALL_DIR="$(get_libdir)" ) cmake_src_configure @@ -106,4 +107,15 @@ src_install() { pkg_postinst() { tmpfiles_process spectrum2.conf + + if [[ ${REPLACING_VERSIONS} ]]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 2.2.0; then + ewarn "Starting with Release 2.2.0, the path for spectrum2" + ewarn "executable helper files has been changed from '/usr/bin'" + ewarn "to '/usr/libexec'. Please update your config files!" + break + fi + done + fi } diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest index 197a384ef7aa..51cfbe5fc7ed 100644 --- a/net-im/swift/Manifest +++ b/net-im/swift/Manifest @@ -1,2 +1,2 @@ -DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba -DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167 +DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9 SHA512 95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f +DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07 SHA512 59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733 diff --git a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch b/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch deleted file mode 100644 index db633945b49d..000000000000 --- a/net-im/swift/files/swift-4.0.2-qt-5.11-compatibility.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1d18148c86377787a8c77042b12ea66f20cb2ca9 Mon Sep 17 00:00:00 2001 -From: Tobias Markmann <tm@ayena.de> -Date: Thu, 21 Jun 2018 13:04:56 +0200 -Subject: Add missing include for QAbstractItemModel - -This fixes building Swift with Qt 5.11. - -Test-Information: - -Builds and tests pass on macOS 10.13.5 with Qt 5.11.0. - -Change-Id: I1be2cd081d8a520ec38ab7cca5ada0d7fc39b777 - -diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -index 0714ac1..fe536ab 100644 ---- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h -+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2010-2016 Isode Limited. -+ * Copyright (c) 2010-2018 Isode Limited. - * All rights reserved. - * See the COPYING file for more information. - */ -@@ -8,6 +8,7 @@ - - #include <set> - -+#include <QAbstractItemModel> - #include <QWizard> - - #include <Swiften/Base/Override.h> --- -cgit v0.10.2-6-g49f6 - diff --git a/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch new file mode 100644 index 000000000000..4d94c2d10503 --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch @@ -0,0 +1,13 @@ +diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h +index 0d01ba1a0..5dc7197ff 100644 +--- a/Swift/Controllers/ShowProfileController.h ++++ b/Swift/Controllers/ShowProfileController.h +@@ -18,6 +18,8 @@ + + #include <Swift/Controllers/UIEvents/UIEvent.h> + ++#include <map> ++ + namespace Swift { + class VCardManager; + class ProfileWindow; diff --git a/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch new file mode 100644 index 000000000000..b08a480835f3 --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-libxml2-2.12-compatibility.patch @@ -0,0 +1,11 @@ +--- a/Swiften/Parser/LibXMLParser.cpp ++++ b/Swiften/Parser/LibXMLParser.cpp +@@ -97,7 +97,7 @@ + if (xmlParseChunk(p->context_, data.c_str(), boost::numeric_cast<int>(data.size()), false) == XML_ERR_OK) { + return true; + } +- xmlError* error = xmlCtxtGetLastError(p->context_); ++ const xmlError* error = xmlCtxtGetLastError(p->context_); + if (error->code == XML_WAR_NS_URI || error->code == XML_WAR_NS_URI_RELATIVE) { + xmlCtxtResetLastError(p->context_); + p->context_->errNo = XML_ERR_OK; diff --git a/net-im/swift/files/swift-4.0.3-reproducible-build.patch b/net-im/swift/files/swift-4.0.3-reproducible-build.patch new file mode 100644 index 000000000000..951678f2303f --- /dev/null +++ b/net-im/swift/files/swift-4.0.3-reproducible-build.patch @@ -0,0 +1,21 @@ +commit 39a684108ae5938105498e7744e70962308cde7b +Author: kpcyrd <git@rxv.cc> +Date: Wed Aug 25 23:30:17 2021 +0200 + + Reproducible Builds: Sort directory contents at build + +diff --git a/Swiften/SConscript b/Swiften/SConscript +index f52637bdb..334f4489e 100644 +--- a/Swiften/SConscript ++++ b/Swiften/SConscript +@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" : + swiften_includes = [] + swiften_public_includes = [] + top_path = env.Dir("..").abspath +- for root, dirs, files in os.walk(env.Dir(".").abspath) : ++ for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) : ++ dirs.sort() ++ files.sort() + if root.endswith("UnitTest") : + continue + for file in files : diff --git a/net-im/swift/swift-4.0.2-r102.ebuild b/net-im/swift/swift-4.0.3-r2.ebuild index df585e184aac..792b487871ed 100644 --- a/net-im/swift/swift-4.0.2-r102.ebuild +++ b/net-im/swift/swift-4.0.3-r2.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..2} luajit ) -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit lua-single python-any-r1 scons-utils toolchain-funcs DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client" HOMEPAGE="https://www.swift.im/" SRC_URI=" - https://swift.im/downloads/releases/${P}/${P}.tar.gz - https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz" + https://swift.im/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2 + https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz +" +S="${WORKDIR}/${PN}-${P}" LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1" SLOT="4/0" @@ -39,7 +41,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - >=dev-util/scons-3.0.1-r3 + >=dev-build/scons-3.0.1-r3 test? ( net-dns/avahi ) " @@ -53,10 +55,12 @@ DOCS=( ) PATCHES=( - "${FILESDIR}"/${P}-boost-1.69-compatibility.patch - "${WORKDIR}"/${P}-python3-compatibility.patch - "${FILESDIR}"/${P}-qt-5.11-compatibility.patch - "${FILESDIR}"/${P}-qt-5.15-compatibility.patch + "${FILESDIR}"/${PN}-4.0.2-boost-1.69-compatibility.patch + "${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-libxml2-2.12-compatibility.patch + "${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch + "${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch ) pkg_setup() { @@ -109,6 +113,11 @@ src_prepare() { else rm -fr 3rdParty || die fi + + if [[ ! -f VERSION.swift ]] ; then + # Source tarball from git doesn't include this file + echo "${PV}" > VERSION.swift || die + fi } src_configure() { diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest new file mode 100644 index 000000000000..e2d653a31d59 --- /dev/null +++ b/net-im/synapse/Manifest @@ -0,0 +1,58 @@ +DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b +DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5 +DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST blake2-0.10.6.crate 47234 BLAKE2B e1464e4ae61acf4a646ce548f1e7eeafe277737bff626e7e6813516ad4458459243bf13aeb3d8a8fa40860482b519a3e614e54dd4e906b4a8ff59c2d0df9ac1d SHA512 e88cc9de1bf8a5a86b6d22001fd23bb30c32868bfc55685b7a79d624332aec3122af98bc0618e2b62d5d5731b68ae738e7821bdccffbb83a2fd61a6f8afdb0c6 +DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST digest-0.10.5.crate 19503 BLAKE2B a73ef5f7b85869f8f6e2bd1c83f88f155ffab8ae1c687018ddd12f5806385a2664c163101aec84d4c20647a8bfd04095aa997e088a3f56e2664adabff1c5614f SHA512 3542fc0322a8b10dbc229ae83475a0df5f9beee4f879eacab1fda53a7b61136df2961265472ae66d896681bd17f8a68148b25827733bd782c6bae05d2f307951 +DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a +DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d26ccb3bdd798ac0e04d9a6a9307927c17558f1284fa5491464cfceba2f0b880d00673449b94c0fb783150 SHA512 a70bb6fbdbcab27fbb5a84041bcbad8e0c8fda58d55ca7ac757f7be5cd373101be40df99e9acd6ae49e637e40de037c6bc59560f96c9adeccb2b2e0bf6531e42 +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806 +DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc +DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 +DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e +DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c +DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df +DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c +DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247 +DIST pyo3-0.20.3.crate 434673 BLAKE2B 1dcb881fd1fe5c76e9b4951f4d95fcd1daa1845c226a4ab1db4283cabe67bda822ff03e3cc85d797fe4665a1614229e7406dea65ec5e99ce4aac96b973a7f55d SHA512 77cce558fa60bbd8d9981ff5e62fdfa9bac94bd650b287fbf14ac93ef1c326c8ae7fda82d744e3582df03cab8adf490e0f2752fabd9ae3de044e7d80984e0350 +DIST pyo3-build-config-0.20.3.crate 30060 BLAKE2B ef122b0b7d840d5362928bac76e1299b333775ec5c49a3bf23a19eccec074917931356bbf719c6d700999941bb6a396948ee7f8761e685c8e9251af07ba0cadc SHA512 70685415bba443787dabb9c61ca3702aefbcacb0705471b496b4f01efe34291735321d91243355b4be9aed8b243e393c09fb65556f1b926ac7f22f64560bd927 +DIST pyo3-ffi-0.20.3.crate 65024 BLAKE2B 33e79a02c7ab85f4767e02a39d8553ddc015c80d13bea674885ad8a18d89bd90f866cc39d81ecbf56270ebe87d29bca48f635c4e73ec99df02ce425f1427cb31 SHA512 3d1ced58e243be7cee4a3ca831dc08a1631fcd511c707dd3bada87d7662807dea2d88393d76e56ff19a6d1c2804d93b5b6b7b5efd36b9c275d66fa1bb1bfc384 +DIST pyo3-log-0.9.0.crate 14370 BLAKE2B 6a29d627c68763db465f22d4425849455a3e71da30f12346983c3dfb3893f908d4bc9f2c5ddef8a279ed1cbde9b33abc5009af6a9b9ab4c8c5f66675dec2efc8 SHA512 0aee9bdb7c57d9a341cc2ef757c7f0cfcd1585483f6ac71b66522bf94a3058cabe9f92568406dd0f966456b691f1cb9d346225f1dd593a9575e82d4ad349b25d +DIST pyo3-macros-0.20.3.crate 7920 BLAKE2B 0510accf51cd83390cbb7b6ba4ec9f4610e3dbb7448d1213994013487ae81bb087df1ba0076a3862e5ecfd172b7846f9439a2d86950a93b016aae565ced4f03b SHA512 454f3c0c054aa131ffe955e4be1af061005b9c81b4d80702827e19b983224c118dfea474da515d5fc2c79cfd3fa21204ed4af2d9e81427123e0a78bd246a23f8 +DIST pyo3-macros-backend-0.20.3.crate 49797 BLAKE2B 59c55d482577ce105db3e19a1db794eaab8221d7de01197716b75d5d2602e0f27c86aaae527eae7098eafad311144550bd597efe8cd6560c82dc435021f3428f SHA512 e177ee0d6a538a555fbe9108e3e2c20102622b2c9b9696ae309189e5c4d068efad2132afd4a97d734ebabb4d7146980a26cb68dc05d5eb88f338be2ad0cd651f +DIST pythonize-0.20.0.crate 11500 BLAKE2B 493efb20ef31e2f984ea6f874ae0d507d459c198d8df43b94fffa2f64ca12295011a94920ef5711b88a9fb42aacec39169259b0cedcdca44544223d0da176414 SHA512 7e6bb5fb5a2006c3268a9f85ce6c3c10a682e5ab1286bdf4185e05f3a39140049a7de4575fd6e6f67d7ab2c0d2125019c79b2e4ac8c55dac39e32f193b831622 +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b +DIST regex-automata-0.4.4.crate 617294 BLAKE2B 68f29fae9479a82dbecf8091250b65486c19af2e5c37c1b2df5d12906bac8aaa4d1e577dc0437a2eb46174a9580410e51a2c53ab265dd8af14e0c758888e92ac SHA512 9705f7949b270003c095f1787a3936ab7d4b0dc9f050ee046ef4e96f4f4630ac56cf0dabb0ac3b9120c462aca6344ca60636cb95e0c0d537ace506159c02b15a +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408 +DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22 +DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae +DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 +DIST synapse-1.105.1.gh.tar.gz 8484079 BLAKE2B e4e0f495f749b0dde103788204308b1eaeaca60e99580d5f23c02e5149294771bbf0e53d5a80190fe32e5fb5dac9c6e925b34f11586f9ef1e61f093340286329 SHA512 be597b90c63306bc39f39a1e26f2daa76dcd986b155bcb2a4d191fece3f743004ee5d94723aba0f7d5744f6bf827c4fa26b972c03c0b7216f35838b5f2fffe4d +DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06 +DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288 +DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c +DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001 +DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf +DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5 +DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737 +DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865 +DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631 diff --git a/net-im/synapse/files/synapse.initd-r1 b/net-im/synapse/files/synapse.initd-r1 new file mode 100644 index 000000000000..f4c53a0f117b --- /dev/null +++ b/net-im/synapse/files/synapse.initd-r1 @@ -0,0 +1,10 @@ +#!/sbin/openrc-run +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name="Matrix synapse daemon" +description="" +command=/usr/bin/synapse_homeserver +command_args="--daemonize --config-path /etc/synapse/homeserver.yaml" +command_user="synapse:synapse" +pidfile=/var/lib/synapse/homeserver.pid diff --git a/net-im/synapse/files/synapse.service b/net-im/synapse/files/synapse.service new file mode 100644 index 000000000000..19661e96257e --- /dev/null +++ b/net-im/synapse/files/synapse.service @@ -0,0 +1,22 @@ +[Unit] +Description=Synapse Matrix homeserver +After=network.target +After=postgresql-10.service +After=postgresql-11.service +After=postgresql-12.service +After=postgresql-13.service +After=postgresql-14.service +After=postgresql-15.service + +[Service] +ExecStart=/usr/bin/synctl --no-daemonize start /etc/synapse/homeserver.yaml +ExecStop=/usr/bin/synctl stop /etc/synapse/homeserver.yaml +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-failure +PrivateTmp=true +User=synapse +Group=synapse +WorkingDirectory=/var/lib/synapse + +[Install] +WantedBy=multi-user.target diff --git a/net-im/synapse/metadata.xml b/net-im/synapse/metadata.xml new file mode 100644 index 000000000000..e365de565af7 --- /dev/null +++ b/net-im/synapse/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> + </maintainer> + <upstream> + <remote-id type="github">element-hq/synapse</remote-id> + <remote-id type="pypi">matrix-synapse</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-im/synapse/synapse-1.105.1.ebuild b/net-im/synapse/synapse-1.105.1.ebuild new file mode 100644 index 000000000000..3d335e9cdf11 --- /dev/null +++ b/net-im/synapse/synapse-1.105.1.ebuild @@ -0,0 +1,211 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{10..12} ) + +CRATES=" + aho-corasick@1.0.2 + anyhow@1.0.81 + arc-swap@1.5.1 + autocfg@1.1.0 + bitflags@1.3.2 + blake2@0.10.6 + block-buffer@0.10.3 + cfg-if@1.0.0 + crypto-common@0.1.6 + digest@0.10.5 + generic-array@0.14.6 + heck@0.4.1 + hex@0.4.3 + indoc@2.0.4 + itoa@1.0.4 + lazy_static@1.4.0 + libc@0.2.135 + lock_api@0.4.9 + log@0.4.21 + memchr@2.6.3 + memoffset@0.9.0 + once_cell@1.15.0 + parking_lot@0.12.1 + parking_lot_core@0.9.3 + portable-atomic@1.6.0 + proc-macro2@1.0.76 + pyo3-build-config@0.20.3 + pyo3-ffi@0.20.3 + pyo3-log@0.9.0 + pyo3-macros-backend@0.20.3 + pyo3-macros@0.20.3 + pyo3@0.20.3 + pythonize@0.20.0 + quote@1.0.35 + redox_syscall@0.2.16 + regex-automata@0.4.4 + regex-syntax@0.8.2 + regex@1.10.4 + ryu@1.0.11 + scopeguard@1.1.0 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.115 + smallvec@1.10.0 + subtle@2.4.1 + syn@2.0.48 + target-lexicon@0.12.4 + typenum@1.15.0 + unicode-ident@1.0.5 + unindent@0.2.3 + version_check@0.9.4 + windows-sys@0.36.1 + windows_aarch64_msvc@0.36.1 + windows_i686_gnu@0.36.1 + windows_i686_msvc@0.36.1 + windows_x86_64_gnu@0.36.1 + windows_x86_64_msvc@0.36.1 +" + +inherit cargo distutils-r1 multiprocessing optfeature systemd + +DESCRIPTION="Reference implementation of Matrix homeserver" +HOMEPAGE=" + https://matrix.org/ + https://github.com/element-hq/synapse +" +SRC_URI=" + https://github.com/element-hq/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="AGPL-3+" +# Dependent crate licenses +LICENSE+=" + Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 + || ( Apache-2.0 Boost-1.0 ) +" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc64" +IUSE="postgres systemd test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/synapse + acct-group/synapse +" +RDEPEND=" + ${DEPEND} + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/bleach[${PYTHON_USEDEP}] + >=dev-python/canonicaljson-2[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/ijson[${PYTHON_USEDEP}] + dev-python/immutabledict[${PYTHON_USEDEP}] + >=dev-python/jinja-3.0[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + >=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/phonenumbers[${PYTHON_USEDEP}] + >=dev-python/pillow-10.0.1[${PYTHON_USEDEP},webp] + dev-python/prometheus-client[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + dev-python/pydantic[${PYTHON_USEDEP}] + dev-python/pymacaroons[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/service-identity[${PYTHON_USEDEP}] + dev-python/signedjson[${PYTHON_USEDEP}] + dev-python/sortedcontainers[${PYTHON_USEDEP}] + dev-python/treq[${PYTHON_USEDEP}] + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] + dev-python/unpaddedbase64[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] ) +" +BDEPEND=" + dev-python/setuptools-rust[${PYTHON_USEDEP}] + test? ( + dev-python/hiredis[${PYTHON_USEDEP}] + dev-python/idna[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pyicu[${PYTHON_USEDEP}] + dev-python/txredisapi[${PYTHON_USEDEP}] + postgres? ( dev-db/postgresql[server] ) + ) +" + +# Rust extension +QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so" + +src_test() { + if use postgres; then + einfo "Preparing postgres test instance" + initdb --pgdata="${T}/pgsql" || die + pg_ctl --wait --pgdata="${T}/pgsql" start \ + --options="-h '' -k '${T}'" || die + createdb --host="${T}" synapse_test || die + + # See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql + local -x SYNAPSE_POSTGRES=1 + local -x SYNAPSE_POSTGRES_HOST="${T}" + fi + + # This remove is necessary otherwise python is not able to locate + # synapse_rust.abi3.so. + rm -rf synapse || die + + nonfatal distutils-r1_src_test + local ret=${?} + + if use postgres; then + einfo "Stopping postgres test instance" + pg_ctl --wait --pgdata="${T}/pgsql" stop || die + fi + + [[ ${ret} -ne 0 ]] && die +} + +python_test() { + "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests +} + +src_install() { + distutils-r1_src_install + keepdir /var/{lib,log}/synapse /etc/synapse + fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse + fperms 0750 /var/{lib,log}/synapse /etc/synapse + newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}" + systemd_dounit "${FILESDIR}/synapse.service" +} + +pkg_postinst() { + optfeature "Improve user search for international display names" dev-python/pyicu + optfeature "Redis support" dev-python/txredisapi + optfeature "VoIP relaying on your homeserver with turn" net-im/coturn + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + einfo + elog "In order to generate initial configuration run:" + elog "sudo -u synapse synapse_homeserver \\" + elog " --server-name matrix.domain.tld \\" + elog " --config-path /etc/synapse/homeserver.yaml \\" + elog " --generate-config \\" + elog " --data-directory /var/lib/synapse \\" + elog " --report-stats=no" + einfo + else + einfo + elog "Please refer to upgrade notes if any special steps are required" + elog "to upgrade from the version you currently have installed:" + elog + elog " https://github.com/element-hq/synapse/blob/develop/docs/upgrade.md" + einfo + fi +} diff --git a/net-im/teams/Manifest b/net-im/teams/Manifest deleted file mode 100644 index 7d1ad8f51ca9..000000000000 --- a/net-im/teams/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST teams_1.4.00.13653_amd64.deb 83232268 BLAKE2B bc59aa1f4b9d5f1740fedc7bfc3c2cec6f8b4c1979a55e5a68742c36ea4399ba0e8c276de2d9e5b8de39363a9359136a5d1be59a6019af8bd5ac9922a5aab2c9 SHA512 d15b6cca0321e5e569e6a1f4ad0801f7a2de1e9312e8f584f07a4bc8bcac8a55626eb060a41baf31b9f4cfcd1cf2757e2f2b946f671f0e4c95c81f9eea0f8e2c -DIST teams_1.4.00.26453_amd64.deb 84503304 BLAKE2B a9d9fb27d42c53b12747fd229214d4d5db8197c870effd201dc7ba9feea143b18138c7bed15d18e70326781577e8bda8640ea463125abc8f0bef08292ad850d5 SHA512 bdc050e813f1237d7774270a8a5229a975e5bb28706b957f5cb03eb481870ca8e81562096e5041f060414d1c727f5b7d6aff7ef66bce96f2fac86f535aade058 -DIST teams_1.4.00.7556_amd64.deb 77232550 BLAKE2B f663a79a9edb29aecb240722f46cb29aa6f4e2cca6dbe1a29801aee2e9c408b1ad00ab0d2b8fac3c7c4c227429b0382a06b46114921d2f435fbe1c80415ea9d4 SHA512 0afe2714e290e8b2d30039e27a2af4d22cbd03bc4bfe90d6979714ae1cc75bc5226af8932dc38528a5dc5bd6b4820c4b9d9444abcb558a76438c62cff285ffac -DIST teams_1.5.00.10453_amd64.deb 84485626 BLAKE2B f9570bedd12dc9113c956d0b9c34c4124939b0a855f73a7611ce640b00fd4a7d8288af94aa3f087482040619c11f79a144e2292dd853254fe4f55fe694165a26 SHA512 69d95e06c67265358f1d995ad9faa21a1af753241031569e7ac88d0cc9c4781985a0839b4fa7e58d176472c7ab15bc8d0876733a2eb710d5d087d2662bc04c30 diff --git a/net-im/teams/metadata.xml b/net-im/teams/metadata.xml deleted file mode 100644 index ce53992ec4dd..000000000000 --- a/net-im/teams/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>sultan@gentoo.org</email> - <name>Stephan Hartmann</name> - </maintainer> - <use> - <flag name="swiftshader">Install SwiftShader OpenGL libaries.</flag> - <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag> - <flag name="system-mesa">Use the system-wide <pkg>media-libs/mesa</pkg> instead of bundled.</flag> - </use> -</pkgmetadata> diff --git a/net-im/teams/teams-1.4.00.13653-r2.ebuild b/net-im/teams/teams-1.4.00.13653-r2.ebuild deleted file mode 100644 index 3dd90b904b90..000000000000 --- a/net-im/teams/teams-1.4.00.13653-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk vi zh-CN zh-TW" - -inherit chromium-2 desktop unpacker xdg - -DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release" -HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/" -SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb" - -LICENSE="ms-teams-pre" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="bindist mirror splitdebug test" -IUSE="swiftshader system-ffmpeg" - -QA_PREBUILT="*" -# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0), -# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), -# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), -# libpangocairo-1.0-0 (>= 1.14.0), libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), -# libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, -# apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1) -RDEPEND=" - app-accessibility/at-spi2-core:2 - app-accessibility/at-spi2-atk:2 - app-crypt/libsecret - dev-libs/atk - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - x11-libs/cairo - x11-libs/libdrm - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libxcb - x11-libs/libxkbfile - x11-libs/pango - system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] ) -" - -S="${WORKDIR}" - -src_prepare() { - default - sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die - sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/teams/teams@" \ - -i usr/bin/teams || 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/teams/teams-1.4.00.26453-r1.ebuild b/net-im/teams/teams-1.4.00.26453-r1.ebuild deleted file mode 100644 index 3f93b3cfb662..000000000000 --- a/net-im/teams/teams-1.4.00.26453-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk vi zh-CN zh-TW" - -inherit chromium-2 desktop unpacker xdg - -DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release" -HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/" -SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb" - -LICENSE="ms-teams-pre" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="bindist mirror splitdebug test" -IUSE="swiftshader system-ffmpeg" - -QA_PREBUILT="*" -# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0), -# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), -# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), -# libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), -# libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), -# libstdc++6 (>= 4.8.1) -RDEPEND=" - app-accessibility/at-spi2-core:2 - app-accessibility/at-spi2-atk:2 - app-crypt/libsecret - dev-libs/atk - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - x11-libs/cairo - x11-libs/libdrm - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libxcb - x11-libs/libxkbfile - x11-libs/pango - system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] ) -" - -S="${WORKDIR}" - -src_prepare() { - default - sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die - sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/${PN}/${PN}@" \ - -i usr/bin/${PN} || die -} - -src_install() { - rm _gpgorigin || die - rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die - rm -r "usr/share/${PN}/resources/tmp" || die - rm "usr/share/${PN}/chrome-sandbox" || die - - insinto /opt - doins -r usr/share/${PN} - - dobin usr/bin/${PN} - domenu usr/share/applications/${PN}.desktop - doicon usr/share/pixmaps/${PN}.png - - pushd "${ED}/opt/${PN}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - if use system-ffmpeg; then - rm "${ED}/opt/${PN}/libffmpeg.so" || die - dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "opt/${PN}/libffmpeg.so" || die - elog "Using system ffmpeg. This is experimental and may lead to crashes." - fi - - if ! use swiftshader; then - rm -r "${ED}/opt/${PN}/swiftshader" || die - elog "Running without SwiftShader OpenGL implementation. If Teams doesn't start " - elog "or you experience graphic issues, then try with USE=swiftshader enabled." - fi - - fperms +x /usr/bin/${PN} - fperms +x /opt/${PN}/${PN} -} diff --git a/net-im/teams/teams-1.4.00.7556-r1.ebuild b/net-im/teams/teams-1.4.00.7556-r1.ebuild deleted file mode 100644 index 295d2e9e2bd5..000000000000 --- a/net-im/teams/teams-1.4.00.7556-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop unpacker xdg-utils chromium-2 - -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="system-ffmpeg system-mesa" - -QA_PREBUILT="*" - -# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.17), libcairo2 (>= 1.6.0), libcups2 (>= 1.4.0), -# libexpat1 (>= 2.0.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.8), libgtk-3-0 (>= 3.9.10), libnspr4 (>= 2:4.9-2~), libnss3 -# (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libuuid1 (>= 2.16), libx11-6 (>= 2:1.4.99.1), libx11-xcb1, -# libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxkbfile1, -# libxrandr2 (>= 2:1.2.99.3), libxrender1, libxss1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), libstdc++6 (>= 4.8.1) -RDEPEND=" - app-accessibility/at-spi2-atk - app-crypt/libsecret - dev-libs/atk - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - x11-libs/cairo - x11-libs/cairo - 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-mesa? ( media-libs/mesa ) - system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] ) -" - -S="${WORKDIR}" - -pkg_pretend() { - chromium_suid_sandbox_check_kernel_config -} - -src_configure() { - chromium_suid_sandbox_check_kernel_config - default -} - -src_install() { - rm _gpgorigin || die - doins -r . - - fperms +x /usr/bin/teams - fperms +x /usr/share/teams/teams - - if use system-ffmpeg ; then - rm -f "${ED}"/usr/share/teams/libffmpeg.so || die - - cat > 99teams <<-EOF - LDPATH="${EPREFIX}/usr/$(get_libdir)/chromium" - EOF - doenvd 99teams - elog "Using system ffmpeg. This is experimental and may lead to crashes." - fi - - if use system-mesa ; then - rm -f "${ED}"/usr/share/teams/libEGL.so || die - rm -f "${ED}"/usr/share/teams/libGLESv2.so || die - rm -f "${ED}"/usr/share/teams/swiftshader/libEGL.so || die - rm -f "${ED}"/usr/share/teams/swiftshader/libGLESv2.so || die - elog "Using system mesa. This is experimental and may lead to crashes." - fi - - rm -rf "${ED}"/usr/share/teams/resources/app.asar.unpacked/node_modules/keytar3 || die - - sed -i '/OnlyShowIn=/d' "${S}"/usr/share/applications/teams.desktop || die - domenu usr/share/applications/teams.desktop -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-im/teams/teams-1.5.00.10453.ebuild b/net-im/teams/teams-1.5.00.10453.ebuild deleted file mode 100644 index 3fd38c8df204..000000000000 --- a/net-im/teams/teams-1.5.00.10453.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk vi zh-CN zh-TW" - -inherit chromium-2 desktop unpacker xdg - -DESCRIPTION="Microsoft Teams, an Office 365 multimedia collaboration client, pre-release" -HOMEPAGE="https://products.office.com/en-us/microsoft-teams/group-chat-software/" -SRC_URI="https://packages.microsoft.com/repos/ms-teams/pool/main/t/${PN}/${PN}_${PV}_amd64.deb" - -LICENSE="ms-teams-pre" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="bindist mirror splitdebug test" -IUSE="swiftshader system-ffmpeg" - -QA_PREBUILT="*" -# libasound2 (>= 1.0.16), libatk-bridge2.0-0 (>= 2.5.3), libatk1.0-0 (>= 2.2.0), libatspi2.0-0 (>= 2.9.90), libc6 (>= 2.17), libcairo2 (>= 1.10.0) -# libcups2 (>= 1.7.0), libdrm2 (>= 2.4.38), libexpat1 (>= 2.0.1), libgbm1 (>= 17.1.0~rc2), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), -# libglib2.0-0 (>= 2.39.4), libgtk-3-0 (>= 3.19.12), libnspr4 (>= 2:4.9-2~), libnss3 (>= 2:3.22), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), -# libx11-6 (>= 2:1.4.99.1), libx11-xcb1, libxcb-dri3-0, libxcb1 (>= 1.6), libxcomposite1 (>= 1:0.3-1), libxcursor1 (>> 1.1.2), libxdamage1 (>= 1:1.1), -# libxext6, libxfixes3, libxi6 (>= 2:1.2.99.4), libxrandr2, libxrender1, libxtst6, apt-transport-https, libfontconfig1 (>= 2.11.0), libdbus-1-3 (>= 1.6.18), -# libstdc++6 (>= 4.8.1) -RDEPEND=" - app-accessibility/at-spi2-core:2 - app-accessibility/at-spi2-atk:2 - app-crypt/libsecret - dev-libs/atk - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - x11-libs/cairo - x11-libs/libdrm - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libxcb - x11-libs/libxkbfile - x11-libs/pango - system-ffmpeg? ( <media-video/ffmpeg-4.3[chromium] ) -" - -S="${WORKDIR}" - -src_prepare() { - default - sed -i '/OnlyShowIn=/d' usr/share/applications/${PN}.desktop || die - sed -e "s@^TEAMS_PATH=.*@TEAMS_PATH=${EPREFIX}/opt/${PN}/${PN}@" \ - -i usr/bin/${PN} || die -} - -src_install() { - rm _gpgorigin || die - rm -r "usr/share/${PN}/resources/assets/"{.gitignore,macos,tlb,windows,x86,x64,arm64} || die - rm -r "usr/share/${PN}/resources/tmp" || die - rm "usr/share/${PN}/chrome-sandbox" || die - - insinto /opt - doins -r usr/share/${PN} - - dobin usr/bin/${PN} - domenu usr/share/applications/${PN}.desktop - doicon usr/share/pixmaps/${PN}.png - - pushd "${ED}/opt/${PN}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - if use system-ffmpeg; then - rm "${ED}/opt/${PN}/libffmpeg.so" || die - dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "opt/${PN}/libffmpeg.so" || die - elog "Using system ffmpeg. This is experimental and may lead to crashes." - fi - - if ! use swiftshader; then - rm -r "${ED}/opt/${PN}/swiftshader" || die - elog "Running without SwiftShader OpenGL implementation. If Teams doesn't start " - elog "or you experience graphic issues, then try with USE=swiftshader enabled." - fi - - fperms +x /usr/bin/${PN} - fperms +x /opt/${PN}/${PN} -} diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest index 419f550db27d..bddecd66dc26 100644 --- a/net-im/telegram-desktop-bin/Manifest +++ b/net-im/telegram-desktop-bin/Manifest @@ -1,4 +1,6 @@ -DIST tdesktop-3.7.3.tar.gz 16335926 BLAKE2B 7e7760a3684b50541144c72c1b0e3e36f1b1e9bc6eef20c3fdc151f0658f7d3c867eb895242efdf916fa6057ee61ea54ce822bab8fc82a6e17e41c26f9dfdd84 SHA512 359325cf6fefc29234b7032235cc033b9844ff597aeb7b3c6b99e8e6923d52994e8767524ff37afd5d098e4005e03d1f9c8308d6a04481831fa53e22935ee049 -DIST tdesktop-4.0.2.tar.gz 16636296 BLAKE2B afd9e8277532b21367b9f75059e9bb4efa69231dae2ad9a78119fee3eddfd804507a647da663a26bcdf7ca0749eb1ab4e2824d81452836f4804dd7a19dedd0e6 SHA512 0a8f587e55e634b500346cd77508fc9b4f76f75eaf080d50c4f2a6867eeabcecb3f814624971b97cc465f6f8d88aa79998899c299b70ada43a43904a830b5ad0 -DIST tsetup.3.7.3.tar.xz 41978536 BLAKE2B 1ab5b63479acedee3b3059382761e887c7a9eca899e6496b223f32758a4f23a17da296940203765593cdac9df8a4d80264adbdf9a51b7f70d9ffc90a41661346 SHA512 05339778ea218c84406cceff7b6dfd357ff55d02f8082d222a9430aebe0a34561e9801fb4ebb44ce01c127cbca17ea53e3d61ab4d9288976d556453b9d06bce8 -DIST tsetup.4.0.2.tar.xz 43401944 BLAKE2B 705da23c4c68498c693e6908374447fd24a24434a866b4a51a11b7dbe250f6268d56f0a16a64b5aefb8ed5d4ca13fd1dacc4b1e0cf57df873403eb07f96e34cc SHA512 790a1bcc0e34ddc8d483978d9c32fe3409b1e42092647e106fef3731066cb5bd5b7c045143ef949d341be7981a8ba5d3906dd2b50eaf22c4e0b2d23ab4805c36 +DIST tdesktop-4.15.2.tar.gz 19263533 BLAKE2B 078d9b93f60f8eec5fe09e73628cafd9e6b20393a6445da149e0b85befc5a492aff2952f150f4e6895f1305d222022f1cb9ce1e124a68838141e470453820fdb SHA512 d30cd363e2eab9b38c448ebd4c22ee98cf46d6e7a932c7469be5f950fba6dbb0d73cb86ae8439d989e8985cc6eb382ca930cad3c2511404c3cebcaf7c92b8049 +DIST tdesktop-4.16.6.tar.gz 19360605 BLAKE2B 35ff32e1d04bc792327bbb744c6026ffc5dda940f1e547aab844458f557132757af7fbecf2ed235eb4f7c599cf3120f09a745ada4e7e8331a1866637e6def22e SHA512 f8439685d31446c1a5439522f445448e5eac37c32dfe5154941090ebeebb0181b918daa445dd5909be89e5757b4ef572de59987b85d31bd8725215fe501df35f +DIST tdesktop-4.16.8.tar.gz 19360758 BLAKE2B d939ca2296be93c02a552726b0cab3efff84adbe969d3659c8f1ff7ff14be01e4e19aea12630cabe2771c8ebfd00d8ef6284d1c94257b506c34a5c9a525e0f91 SHA512 77b9dd8b0207196d5e43501b3fa39cd77e46b846801efc00067dbe3c777f8b4874ee5840fdead1cdfd8c765582f9ce8038b48bb53b703c22427becdc4f498074 +DIST tsetup.4.15.2.tar.xz 54162852 BLAKE2B 6fa57b21de36f1e387bd9233f3e9045e30be73d33066dffc5756e6076267048fa8b959eece6bdd9ade1d3096faf0e6ace1d0c1f6565a9ac8b9a84c4423454c5b SHA512 12c72c02b8b69f4685ca5dcebdd784dd263a1cb0c117306b188e0d4fc79c978010bd697a2446692af6b9bd21382a9bf312bd27bb3da63b661a9e35578dd7b8a6 +DIST tsetup.4.16.6.tar.xz 57015068 BLAKE2B d5ee30156b6338138095a32a41ce8807e9e32b76d05fbb43834138e13183953df59820a30df0e2e55becefab777105a0ca94c591351ff2aa438a855c10cd8b0d SHA512 2f17fe18ce0baee75797a2686d2834b9c66b51fd29bca31490e4544aa17e25ae833fa657239afd011c5846e76a2b134ca64960db0e9f2d38d6e769cdf99b0aeb +DIST tsetup.4.16.8.tar.xz 56726632 BLAKE2B e3323903ca989d780f1a4ae20fa94eab6d17d2ee3505b689a7468e2e068ac68e17666a39400218a8cd40dbb59096a2a70e3a5767ea55eba0233a9fa9fe6e02cc SHA512 bc6d0bdee19286ccb06ceb6540d5f67b85735ec452ea69e0d550f64d3d54c718d309b211b19302849649b7fef979d91bf365f65c024f8891f387a2713629d711 diff --git a/net-im/telegram-desktop-bin/metadata.xml b/net-im/telegram-desktop-bin/metadata.xml index c54fafcb7a57..398b85731d09 100644 --- a/net-im/telegram-desktop-bin/metadata.xml +++ b/net-im/telegram-desktop-bin/metadata.xml @@ -5,10 +5,6 @@ <email>henning@hennsch.de</email> <name>Henning Schild</name> </maintainer> - <maintainer type="person"> - <email>np-hardass@gentoo.org</email> - <name>Adam Feldman</name> - </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.15.2.ebuild index 40ecf6ecfb9d..19bc56b0ce5c 100644 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-3.7.3.ebuild +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.15.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,26 +17,33 @@ SLOT="0" KEYWORDS="-* ~amd64" QA_PREBUILT="usr/bin/telegram-desktop" -# current desktop-file-utils-0.26 does not understand Version=1.5 -# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 -QA_DESKTOP_FILE="usr/share/applications/telegramdesktop.desktop" RDEPEND=" + !net-im/telegram-desktop sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl + x11-libs/gtk+:3[X,wayland] x11-libs/libX11 - >=x11-libs/libxcb-1.10[xkb] + >=x11-libs/libxcb-1.10 " S="${WORKDIR}/Telegram" +src_prepare() { + default + + sed -i -e \ + 's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \ + "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die +} + src_install() { newbin Telegram telegram-desktop - insinto /etc/tdesktop + insinto /usr/share/TelegramDesktop/externalupdater.d/ newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" local icon_size @@ -46,7 +53,9 @@ src_install() { telegram.png done - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop + insinto /usr/share/dbus-1/services + doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service } pkg_postinst() { diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.16.6.ebuild index d0558b783945..19bc56b0ce5c 100644 --- a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.0.2.ebuild +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.16.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,21 +19,31 @@ KEYWORDS="-* ~amd64" QA_PREBUILT="usr/bin/telegram-desktop" RDEPEND=" + !net-im/telegram-desktop sys-libs/glibc dev-libs/glib:2 >=media-libs/fontconfig-2.13 media-libs/freetype:2 virtual/opengl + x11-libs/gtk+:3[X,wayland] x11-libs/libX11 - >=x11-libs/libxcb-1.10[xkb] + >=x11-libs/libxcb-1.10 " S="${WORKDIR}/Telegram" +src_prepare() { + default + + sed -i -e \ + 's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \ + "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die +} + src_install() { newbin Telegram telegram-desktop - insinto /etc/tdesktop + insinto /usr/share/TelegramDesktop/externalupdater.d/ newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" local icon_size @@ -43,7 +53,9 @@ src_install() { telegram.png done - domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop + insinto /usr/share/dbus-1/services + doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service } pkg_postinst() { diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-4.16.8.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.16.8.ebuild new file mode 100644 index 000000000000..19bc56b0ce5c --- /dev/null +++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-4.16.8.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop optfeature xdg + +DESCRIPTION="Official desktop client for Telegram (binary package)" +HOMEPAGE="https://desktop.telegram.org" +SRC_URI=" + https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz + amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz ) +" + +LICENSE="GPL-3-with-openssl-exception" +SLOT="0" +KEYWORDS="-* ~amd64" + +QA_PREBUILT="usr/bin/telegram-desktop" + +RDEPEND=" + !net-im/telegram-desktop + sys-libs/glibc + dev-libs/glib:2 + >=media-libs/fontconfig-2.13 + media-libs/freetype:2 + virtual/opengl + x11-libs/gtk+:3[X,wayland] + x11-libs/libX11 + >=x11-libs/libxcb-1.10 +" + +S="${WORKDIR}/Telegram" + +src_prepare() { + default + + sed -i -e \ + 's/^Exec=@CMAKE_INSTALL_FULL_BINDIR@\/telegram-desktop/Exec=\/usr\/bin\/telegram-desktop/' \ + "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service || die +} + +src_install() { + newbin Telegram telegram-desktop + + insinto /usr/share/TelegramDesktop/externalupdater.d/ + newins - externalupdater <<<"${EPREFIX}/usr/bin/telegram-desktop" + + local icon_size + for icon_size in 16 32 48 64 128 256 512; do + newicon -s "${icon_size}" \ + "${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \ + telegram.png + done + + domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.desktop + insinto /usr/share/dbus-1/services + doins "${WORKDIR}/tdesktop-${PV}"/lib/xdg/org.telegram.desktop.service +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "spell checker support" app-text/enchant +} diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 5e1ddfb6238b..4bc494714237 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,2 +1,4 @@ -DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e -DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba +DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7eea114539edcff46ea30a5361cefeeb1de8a1954be91a1a420ddc1b1a30970944387c2cd3749badaa494e53862066c624ac3 SHA512 95aa5f14a9a88b9c6421049445f59f1c5c5d7ab4ca4e8b8f4ab7389bdb8f3cc6b29fea270574881633035acec769ba271261f84ec269010c63af28a03719da98 +DIST tdesktop-4.15.2-full.tar.gz 69539402 BLAKE2B 95d6cd3eead56f7cb2aeafd0cc1a05d740ec243644e6d318f415a7fa6c8ad94d3a95cfc9082ba04507a024c81bfc15700ad6adcbfd932ca1993a3310744ac196 SHA512 6e65183d5e77d17e11d0c70e1654373e69f6243f2879cf403701e23acd5aed9df6c6892a1c7c83fd975a858e90e20d73824d0754a2f96ad5af6e3de6515e2627 +DIST tdesktop-4.16.6-full.tar.gz 70435773 BLAKE2B 5b66ba9e7a4cbbadcfd271bd33940ccf928e32b7b008b60b710095ff3b60255257b56746b5344100f034164949f428cfd19727f5d5a9f364eba7e7f6b58853fb SHA512 5b580d36c8b8a90981c3541d4c148df37bb7ebdec0970bfbfe4c1a9a1175e3cf41c2a14d854d7d917482aa9086ee712844ec40780741df22ad6d42fcf3c48f1f +DIST tdesktop-4.16.8-full.tar.gz 70436084 BLAKE2B 5e64372de39a94b2fb7d4b0b8cb4896e9f4bb9eb1421898f30b686a6ce02141cebc42e2be280107ccbbda771f868de365267248dbdab393d88e204fa197f5e3d SHA512 7d9d8ab4c62cf9e4f44ff879953f3d543427f7fd80682f6d08b58fb3dec481b0082086c3958e38b809b886359a76b1f5450142dbcfb58c867014d78f5fa19f60 diff --git a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch deleted file mode 100644 index 35781fda0ced..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- tdesktop-3.3.0-full.orig/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp -+++ tdesktop-3.3.0-full/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp -@@ -34,7 +34,7 @@ - auto IsHebrew(const QString &word) { - // Words with mixed scripts will be automatically ignored, - // so this check should be fine. -- return ::Spellchecker::WordScript(&word) == QChar::Script_Hebrew; -+ return ::Spellchecker::WordScript(word) == QChar::Script_Hebrew; - } - - class EnchantSpellChecker { -@@ -154,7 +154,7 @@ - } - - auto EnchantSpellChecker::findSuggestions(const QString &word) { -- const auto wordScript = ::Spellchecker::WordScript(&word); -+ const auto wordScript = ::Spellchecker::WordScript(word); - auto w = word.toStdString(); - std::vector<QString> result; - if (!_validators.size()) { diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch deleted file mode 100644 index 4f5c7017e6ac..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch +++ /dev/null @@ -1,33 +0,0 @@ -Only link jemalloc for the Telegram binary - -Some combination of factors is making the different codegen tools hang when -jemalloc is linked for those, and they're ran under portage's sandbox. Since -this is only used during build-time, and jemalloc is merely necessary to -improve runtime memory use, it's unnecessary to use it for anything else. - ---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt -@@ -1357,6 +1357,12 @@ - desktop-app::external_kwayland - ) - endif() -+ -+ target_link_libraries(Telegram -+ PRIVATE -+ desktop-app::linux_jemalloc_helper -+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> -+ ) - endif() - - if (build_macstore) ---- tdesktop-3.5.2-full.orig/cmake/options_linux.cmake -+++ tdesktop-3.5.2-full/cmake/options_linux.cmake -@@ -64,8 +64,6 @@ - - target_link_libraries(common_options - INTERFACE -- desktop-app::linux_jemalloc_helper -- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> - ${CMAKE_DL_LIBS} - ) - diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch deleted file mode 100644 index bd3595858c20..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch +++ /dev/null @@ -1,71 +0,0 @@ -Optionally disable jemalloc - -Telegram upstream heavily insists you use the jemalloc allocator. This is due -to the high memory usage resulting from the glibc allocator. It is unknown why -this affects telegram the way it does, but upstream solved the issue by using a -different allocator. Initially they used mallocng, now jemalloc. - -However, other libcs don't necessarily need this, and as such this should be -optional. As mallocng is a fork of musl's allocator, and this was used before -the switch to jemalloc, the musl allocator should still be OK. - -Please warn glibc users about disabling jemalloc, don't report bugs about -memory usage upstream unless you're using jemalloc. - -Related info: -https://github.com/telegramdesktop/tdesktop/issues/16084 -https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 - ---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt -@@ -1358,11 +1358,13 @@ - ) - endif() - -- target_link_libraries(Telegram -- PRIVATE -- desktop-app::linux_jemalloc_helper -- $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> -- ) -+ if (NOT DESKTOP_APP_DISABLE_JEMALLOC) -+ target_link_libraries(Telegram -+ PRIVATE -+ desktop-app::linux_jemalloc_helper -+ $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> -+ ) -+ endif() - endif() - - if (build_macstore) ---- tdesktop-3.5.2-full.orig/cmake/CMakeLists.txt -+++ tdesktop-3.5.2-full/cmake/CMakeLists.txt -@@ -5,7 +5,7 @@ - # https://github.com/desktop-app/legal/blob/master/LEGAL - - add_subdirectory(external) --if (LINUX) -+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC) - add_subdirectory(linux_jemalloc_helper) - endif() - if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED) ---- tdesktop-3.5.2-full.orig/cmake/external/CMakeLists.txt -+++ tdesktop-3.5.2-full/cmake/external/CMakeLists.txt -@@ -37,7 +37,7 @@ - add_checked_subdirectory(hunspell) - endif() - add_checked_subdirectory(iconv) --if (LINUX) -+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC) - add_checked_subdirectory(jemalloc) - endif() - add_checked_subdirectory(jpeg) ---- tdesktop-3.5.2-full.orig/cmake/variables.cmake -+++ tdesktop-3.5.2-full/cmake/variables.cmake -@@ -26,6 +26,7 @@ - option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF) - option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF) - option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF) -+option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (Linux only)." OFF) - option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) - option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) - option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch deleted file mode 100644 index 4c34d107913e..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -Stub out some glibc-specific functions - -This allows support for alternative libcs like musl - ---- tdesktop-3.5.2-full.orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp -+++ tdesktop-3.5.2-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp -@@ -22,7 +22,7 @@ - - #include <sys/utsname.h> - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - #include <gnu/libc-version.h> - #endif // Q_OS_LINUX - -@@ -200,7 +200,7 @@ - } - - QString GetLibcName() { --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - return "glibc"; - #endif // Q_OS_LINUX - -@@ -208,7 +208,7 @@ - } - - QString GetLibcVersion() { --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) && defined(__GLIBC__) - static const auto result = [&] { - const auto version = QString::fromLatin1(gnu_get_libc_version()); - return QVersionNumber::fromString(version).isNull() ? QString() : version; diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch deleted file mode 100644 index 32959acd5482..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch +++ /dev/null @@ -1,75 +0,0 @@ -Support FFmpeg 5 - -I'm not comfortable changing the _durationInMilliseconds formula on older -versions of ffmpeg. Doing that only for newer versions also reduces the amount -of testing this patch needs (of which it'll get very minimal amounts, this is a -job better left for upstream when they get to it). - -Also it doesn't compile under ffmpeg 4 if the variables are constants :/ - ---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp -+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp -@@ -104,7 +104,11 @@ - - _frame = av_frame_alloc(); - -+#if LIBAVFORMAT_VERSION_MAJOR >= 59 -+ const AVInputFormat *inputFormat = av_find_input_format(container.c_str()); -+#else - AVInputFormat *inputFormat = av_find_input_format(container.c_str()); -+#endif - if (!inputFormat) { - _didReadToEnd = true; - return; -@@ -144,7 +148,11 @@ - - _streamId = i; - -+#if LIBAVFORMAT_VERSION_MAJOR >= 59 -+ _durationInMilliseconds = inStream->duration * 1000 / 48000; -+#else - _durationInMilliseconds = (int)((inStream->duration + inStream->first_dts) * 1000 / 48000); -+#endif - - if (inStream->metadata) { - AVDictionaryEntry *entry = av_dict_get(inStream->metadata, "TG_META", nullptr, 0); ---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp -+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp -@@ -32,7 +32,11 @@ - AudioStreamingPartPersistentDecoderState(AVCodecParameters const *codecParameters, AVRational timeBase) : - _codecParameters(codecParameters), - _timeBase(timeBase) { -+#ifdef LIBAVCODEC_VERSION_MAJOR >= 59 -+ const AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id); -+#else - AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id); -+#endif - if (codec) { - _codecContext = avcodec_alloc_context3(codec); - int ret = avcodec_parameters_to_context(_codecContext, codecParameters); ---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp -+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp -@@ -280,7 +280,11 @@ - - int ret = 0; - -+#if LIBAVFORMAT_VERSION_MAJOR >= 59 -+ const AVInputFormat *inputFormat = av_find_input_format(container.c_str()); -+#else - AVInputFormat *inputFormat = av_find_input_format(container.c_str()); -+#endif - if (!inputFormat) { - _didReadToEnd = true; - return; -@@ -323,7 +327,11 @@ - } - - if (videoCodecParameters && videoStream) { -+#if LIBAVCODEC_VERSION_MAJOR >= 59 -+ const AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id); -+#else - AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id); -+#endif - if (codec) { - _codecContext = avcodec_alloc_context3(codec); - ret = avcodec_parameters_to_context(_codecContext, videoCodecParameters); diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch deleted file mode 100644 index e818ffe46456..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix compatibility with kwayland-5.93.0 - -The header files were moved, the include directory wasn't being added correctly. - -https://bugs.gentoo.org/837569 - ---- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -+++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -@@ -9,10 +9,10 @@ - - #include "base/platform/base_platform_info.h" - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <plasmashell.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/plasmashell.h> - - using namespace KWayland::Client; - ---- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -+++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -@@ -13,11 +13,11 @@ - #include <QtCore/QPointer> - #include <QtGui/QWindow> - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <xdgforeign.h> --#include <idleinhibit.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/xdgforeign.h> -+#include <KWayland/Client/idleinhibit.h> - - using namespace KWayland::Client; - ---- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -+++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -@@ -24,8 +24,8 @@ - #include <private/qwaylandwindow_p.h> - #include <private/qwaylandshellsurface_p.h> - --#include <connection_thread.h> --#include <registry.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> - - Q_DECLARE_METATYPE(QMargins); - diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch deleted file mode 100644 index 5a8e6ceedd66..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Do not capture buttons in AccountsList that belong to inner VerticalLayout widget - This fixes a use-after-free error (double destruction) in the main menu right after account switching. -Bug-Debian: https://bugs.debian.org/1008156 -Bug-Ubuntu: https://launchpad.net/bugs/1967673 -Forwarded: https://github.com/telegramdesktop/tdesktop/pull/24301 -Author: Nicholas Guriev <guriev-ns@ya.ru> -Last-Update: Sat, 09 Apr 2022 13:47:55 +0300 - ---- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/settings/settings_information.cpp -+++ tdesktop-3.6.1-full/Telegram/SourceFiles/settings/settings_information.cpp -@@ -78,9 +78,7 @@ - int _outerIndex = 0; - - Ui::SlideWrap<Ui::SettingsButton> *_addAccount = nullptr; -- base::flat_map< -- not_null<Main::Account*>, -- base::unique_qptr<Ui::SettingsButton>> _watched; -+ base::flat_map<not_null<Main::Account*>, Ui::SettingsButton*> _watched; - - base::unique_qptr<Ui::PopupMenu> _contextMenu; - std::unique_ptr<Ui::VerticalLayoutReorder> _reorder; -@@ -730,7 +728,7 @@ - order.reserve(inner->count()); - for (auto i = 0; i < inner->count(); i++) { - for (const auto &[account, button] : _watched) { -- if (button.get() == inner->widgetAt(i)) { -+ if (button == inner->widgetAt(i)) { - order.push_back(account->session().uniqueId()); - } - } -@@ -769,11 +767,11 @@ - account, - std::move(activate)); - }; -- button.reset(inner->add(MakeAccountButton( -+ button = inner->add(MakeAccountButton( - inner, - _controller, - account, -- std::move(callback)))); -+ std::move(callback))); - } - } - inner->resizeToWidth(_outer->width()); diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch b/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch new file mode 100644 index 000000000000..39f30ff0d2d2 --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.0-system-cppgir.patch @@ -0,0 +1,32 @@ +Use system cppgir + +https://github.com/desktop-app/cmake_helpers/issues/282 +https://github.com/desktop-app/cmake_helpers/pull/305 +--- tdesktop-4.10.0-full.orig/cmake/external/glib/CMakeLists.txt ++++ tdesktop-4.10.0-full/cmake/external/glib/CMakeLists.txt +@@ -7,14 +7,6 @@ + add_library(external_glib INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_glib ALIAS external_glib) + +-function(add_cppgir) # isolate scope +- set(BUILD_TESTING OFF) +- set(BUILD_DOC OFF) +- set(BUILD_EXAMPLES OFF) +- add_subdirectory(cppgir EXCLUDE_FROM_ALL) +-endfunction() +-add_cppgir() +- + include(generate_cppgir.cmake) + generate_cppgir(external_glib Gio-2.0) + +--- tdesktop-4.10.0-full.orig/cmake/external/glib/generate_cppgir.cmake ++++ tdesktop-4.10.0-full/cmake/external/glib/generate_cppgir.cmake +@@ -4,6 +4,8 @@ + # For license and copyright information please follow this link: + # https://github.com/desktop-app/legal/blob/master/LEGAL + ++find_package(CppGir REQUIRED) ++ + function(generate_cppgir target_name gir) + # cppgir generates all the dependent headers everytime, better to have a global folder + set(gen_dst ${CMAKE_BINARY_DIR}/gen) diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch new file mode 100644 index 000000000000..f481ddd74d7c --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/lib_base/base/qt/qt_compare.h b/Telegram/lib_base/base/qt/qt_compare.h +index ca03fa2..d1eb6ab 100644 +--- a/Telegram/lib_base/base/qt/qt_compare.h ++++ b/Telegram/lib_base/base/qt/qt_compare.h +@@ -10,6 +10,7 @@ + #include <gsl/pointers> + + #include <QString> ++#include <variant> + + #if !defined(__apple_build_version__) || (__apple_build_version__ > 12000032) + diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch index 6836e6935049..d56bacea69f8 100644 --- a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch +++ b/net-im/telegram-desktop/files/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch @@ -5,16 +5,18 @@ jemalloc is linked for those, and they're ran under portage's sandbox. Since this is only used during build-time, and jemalloc is merely necessary to improve runtime memory use, it's unnecessary to use it for anything else. ---- tdesktop-3.6.0-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt -@@ -1376,6 +1376,14 @@ - desktop-app::external_kwayland +https://bugs.gentoo.org/802624 + +--- tdesktop-4.2.4-full.orig/Telegram/CMakeLists.txt ++++ tdesktop-4.2.4-full/Telegram/CMakeLists.txt +@@ -1478,6 +1478,14 @@ + desktop-app::external_wayland_client ) endif() + + if (NOT DESKTOP_APP_DISABLE_JEMALLOC) + target_link_libraries(Telegram -+ INTERFACE ++ PRIVATE + $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper> + $<LINK_ONLY:desktop-app::external_jemalloc> + ) @@ -22,10 +24,10 @@ improve runtime memory use, it's unnecessary to use it for anything else. endif() if (build_macstore) ---- tdesktop-3.6.0-full.orig/cmake/options_linux.cmake -+++ tdesktop-3.6.0-full/cmake/options_linux.cmake -@@ -62,14 +62,6 @@ - target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>) +--- tdesktop-4.2.4-full.orig/cmake/options_linux.cmake ++++ tdesktop-4.2.4-full/cmake/options_linux.cmake +@@ -78,14 +78,6 @@ + ) endif() -if (NOT DESKTOP_APP_DISABLE_JEMALLOC) @@ -36,6 +38,6 @@ improve runtime memory use, it's unnecessary to use it for anything else. - ) -endif() - - target_link_libraries(common_options - INTERFACE - ${CMAKE_DL_LIBS} + if (DESKTOP_APP_USE_ALLOCATION_TRACER) + target_link_options(common_options + INTERFACE diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml index d0e2c0f4aa4f..0b48d04a08ee 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -5,13 +5,27 @@ <email>esteve.varela@gmail.com</email> <name>Esteve Varela Colominas</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>aliaksei.urbanski@gmail.com</email> + <name>Aliaksei Urbanski</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="enchant">Enable the app-text/aspell spell-checking backend</flag> - <flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag> - <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag> + <flag name="enchant">Use the <pkg>app-text/enchant</pkg> spell-checking backend instead of <pkg>app-text/hunspell</pkg></flag> + <flag name="fonts">Use builtin patched copy of open-sans fonts (overrides fontconfig)</flag> + <flag name="qt6">Build with Qt6 support</flag> + <flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag> </use> + <upstream> + <remote-id type="github">telegramdesktop/tdesktop</remote-id> + <bugs-to>https://github.com/telegramdesktop/tdesktop/issues</bugs-to> + <changelog>https://github.com/telegramdesktop/tdesktop/releases</changelog> + </upstream> </pkgmetadata> diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild deleted file mode 100644 index 757e0eab2ba4..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit xdg cmake python-any-r1 optfeature flag-o-matic - -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" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X" -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) -" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - dev-libs/libdispatch - dev-libs/openssl:= - dev-libs/xxhash - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] - >=dev-qt/qtimageformats-5.15:5 - >=dev-qt/qtnetwork-5.15:5[ssl] - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5[png,X?] - media-fonts/open-sans - media-libs/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20220117 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20220209[screencast=,X=] - media-video/ffmpeg:=[opus] - sys-libs/zlib:=[minizip] - dbus? ( - dev-cpp/glibmm:2 - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) - wayland? ( kde-frameworks/kwayland:= ) - X? ( x11-libs/libxcb:= ) -" -DEPEND="${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - virtual/pkgconfig -" -# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 - -PATCHES=( - "${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" - "${FILESDIR}/tdesktop-3.5.2-musl.patch" - "${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch" - "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch" -) - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn - ewarn "ccache does not work with ${PN} out of the box" - ewarn "due to usage of precompiled headers" - ewarn "check bug https://bugs.gentoo.org/715114 for more info" - ewarn - fi -} - -src_prepare() { - # no explicit toggle, doesn't build with the system one #752417 - sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ - cmake/external/rlottie/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_QT6=OFF - - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus) - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell) # enables hunspell (recommended) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - - # This option is heavily discouraged by upstream. - # See files/tdesktop-*-jemalloc-optional.patch - -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - ) - - if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then - einfo "Found custom API credentials" - mycmakeargs+=( - -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" - -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" - ) - else - # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - # Building with snapcraft API credentials by default - # Custom API credentials can be obtained here: - # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md - # After getting credentials you can export variables: - # export MY_TDESKTOP_API_ID="17349"" - # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" - # and restart the build" - # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop - # portage will use custom variable every build automatically - mycmakeargs+=( - -DTDESKTOP_API_ID="611335" - -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" - ) - fi - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use X && ! use screencast; then - elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" - elog - fi - if has_version '<dev-qt/qtcore-5.15.2-r10'; then - ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram" - ewarn "to crash when pasting big images from the clipboard." - ewarn - fi - if ! use jemalloc && use elibc_glibc; then - ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" - ewarn "Do NOT report issues about RAM usage without enabling this flag first." - ewarn - fi - optfeature_header - optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk -} diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild deleted file mode 100644 index ed70c3f67a7b..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-3.6.1-r1.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit xdg cmake python-any-r1 optfeature - -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" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X" -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) -" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/abseil-cpp:= - dev-libs/libdispatch - dev-libs/openssl:= - dev-libs/xxhash - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] - >=dev-qt/qtimageformats-5.15:5 - >=dev-qt/qtnetwork-5.15:5[ssl] - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5[png,X?] - media-fonts/open-sans - media-libs/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20220117 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20220209[screencast=,X=] - media-video/ffmpeg:=[opus] - sys-libs/zlib:=[minizip] - dbus? ( - dev-cpp/glibmm:2 - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - hunspell? ( >=app-text/hunspell-1.7:= ) - jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) - wayland? ( - dev-qt/qtwayland:= - kde-frameworks/kwayland:= - ) - X? ( x11-libs/libxcb:= ) -" -DEPEND="${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - virtual/pkgconfig -" -# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 - -PATCHES=( - "${FILESDIR}/tdesktop-3.6.0-jemalloc-only-telegram.patch" - "${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch" - "${FILESDIR}/tdesktop-3.5.2-musl.patch" - "${FILESDIR}/tdesktop-3.6.0-support-ffmpeg5.patch" - "${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch" - "${FILESDIR}/tdesktop-3.6.1-fix-use-after-free.patch" -) - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn - ewarn "ccache does not work with ${PN} out of the box" - ewarn "due to usage of precompiled headers" - ewarn "check bug https://bugs.gentoo.org/715114 for more info" - ewarn - fi -} - -src_prepare() { - # no explicit toggle, doesn't build with the system one #752417 - sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ - cmake/external/rlottie/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_QT6=OFF - - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus) - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell) # enables hunspell (recommended) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell - - # This option is heavily discouraged by upstream. - # See files/tdesktop-*-jemalloc-optional.patch - -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) - ) - - if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then - einfo "Found custom API credentials" - mycmakeargs+=( - -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" - -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" - ) - else - # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - # Building with snapcraft API credentials by default - # Custom API credentials can be obtained here: - # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md - # After getting credentials you can export variables: - # export MY_TDESKTOP_API_ID="17349"" - # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" - # and restart the build" - # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop - # portage will use custom variable every build automatically - mycmakeargs+=( - -DTDESKTOP_API_ID="611335" - -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" - ) - fi - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - if ! use X && ! use screencast; then - elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" - elog - fi - if has_version '<dev-qt/qtcore-5.15.2-r10'; then - ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram" - ewarn "to crash when pasting big images from the clipboard." - ewarn - fi - if ! use jemalloc && use elibc_glibc; then - ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" - ewarn "Do NOT report issues about RAM usage without enabling this flag first." - ewarn - fi - optfeature_header - optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk -} diff --git a/net-im/telegram-desktop/telegram-desktop-4.15.0-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.15.0-r2.ebuild new file mode 100644 index 000000000000..bd0835bbd860 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.15.0-r2.ebuild @@ -0,0 +1,237 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +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" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv" +IUSE="dbus enchant +fonts screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20221208 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-0_p20240110 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-0_p20230926 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" + "${FILESDIR}/tdesktop-4.10.5-qt_compare.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} diff --git a/net-im/telegram-desktop/telegram-desktop-4.15.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.15.2-r1.ebuild new file mode 100644 index 000000000000..a33208b90fa5 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.15.2-r1.ebuild @@ -0,0 +1,237 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +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" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +IUSE="dbus enchant +fonts screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20221208 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-0_p20240110 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-0_p20230926 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" + "${FILESDIR}/tdesktop-4.10.5-qt_compare.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} diff --git a/net-im/telegram-desktop/telegram-desktop-4.16.6.ebuild b/net-im/telegram-desktop/telegram-desktop-4.16.6.ebuild new file mode 100644 index 000000000000..96d25257595e --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.16.6.ebuild @@ -0,0 +1,246 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +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" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20221208 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:= ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-2.0_p20240315 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-2.0_p20240315 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if ! use jemalloc && use elibc_glibc; then + # https://github.com/telegramdesktop/tdesktop/issues/16084 + # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 + ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" + ewarn "Do NOT report issues about RAM usage without enabling this flag first." + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} diff --git a/net-im/telegram-desktop/telegram-desktop-4.16.8.ebuild b/net-im/telegram-desktop/telegram-desktop-4.16.8.ebuild new file mode 100644 index 000000000000..96d25257595e --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-4.16.8.ebuild @@ -0,0 +1,246 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +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" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/libdispatch + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20221208 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20230921:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:= ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5 + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-2.0_p20240315 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-2.0_p20240315 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch" + "${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch" +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if ! use jemalloc && use elibc_glibc; then + # https://github.com/telegramdesktop/tdesktop/issues/16084 + # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 + ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" + ewarn "Do NOT report issues about RAM usage without enabling this flag first." + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml index 686567207bad..574ffb9cab54 100644 --- a/net-im/telepathy-connection-managers/metadata.xml +++ b/net-im/telepathy-connection-managers/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <!-- maintainer-needed --> <use> <flag name="gadu">Enable Gadu Gadu protocol support.</flag> <flag name="icq">Enable ICQ IM protocol support.</flag> diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml index 7b343b06be8a..7fc03b874eb5 100644 --- a/net-im/telepathy-logger/metadata.xml +++ b/net-im/telepathy-logger/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">telepathy/telepathy-logger</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild index 9e53f3cc8b69..4f96e3297777 100644 --- a/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild +++ b/net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" inherit gnome2 python-any-r1 virtualx DESCRIPTION="Daemon that centralizes the communication logging within the Telepathy framework" @@ -32,7 +32,7 @@ DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} dev-util/glib-utils - >=dev-util/gtk-doc-am-1.10 + >=dev-build/gtk-doc-am-1.10 >=dev-util/intltool-0.35 virtual/pkgconfig " diff --git a/net-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml index 1f6611a0af7e..0a7b35f12818 100644 --- a/net-im/telepathy-mission-control/metadata.xml +++ b/net-im/telepathy-mission-control/metadata.xml @@ -1,13 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<longdescription>Mission Control, or MC, is a telepathy component providing a -way for "end-user" applications to abstract some of the details of connection -managers, to provide a simple way to manipulate a bunch of connection managers -at once, and to remove the need to have in each program the account -definitions and credentials.</longdescription> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription> + Mission Control, or MC, is a telepathy component providing a way for + "end-user" applications to abstract some of the details of connection + managers, to provide a simple way to manipulate a bunch of connection + managers at once, and to remove the need to have in each program the account + definitions and credentials. + </longdescription> + <upstream> + <remote-id type="freedesktop-gitlab">telepathy/telepathy-mission-control</remote-id> + </upstream> </pkgmetadata> 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 299724308b1a..dd85f8fe6688 100644 --- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild +++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome2 python-any-r1 @@ -13,7 +13,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 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="debug networkmanager" RDEPEND=" @@ -27,7 +27,7 @@ DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} dev-libs/libxslt - >=dev-util/gtk-doc-am-1.17 + >=dev-build/gtk-doc-am-1.17 virtual/pkgconfig " diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml index 965a9fddebaf..a01af3c19be8 100644 --- a/net-im/tkabber/metadata.xml +++ b/net-im/tkabber/metadata.xml @@ -2,7 +2,7 @@ <!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> +<longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's written in Tcl/Tk, and works on many platforms.</longdescription> <use> <flag name="plugins">Enables installation the extra plugins</flag> </use> diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest new file mode 100644 index 000000000000..ba17f5285224 --- /dev/null +++ b/net-im/tokodon/Manifest @@ -0,0 +1,2 @@ +DIST tokodon-23.08.5.tar.xz 335920 BLAKE2B 620de13602a8f846c980fc0e57a3c13c73725fca16c2ca7cbcd362d9339a531466f496aa8d4dd0e3f310fd2d87399b34f0c78f74bd9312d2a49190897f92ffd7 SHA512 1f21df479ebe31d2bc891b01fc465f5711445fb1bfefba7a90aec7d9eef304618487f1992cad82f4207928bb7398642db97038817b2aa602e9d77135c216f404 +DIST tokodon-24.02.2.tar.xz 517828 BLAKE2B fd1d07464d44811800136b763e15f8264d8a3ad5140e81b0606bef5eb17420ec831e0c97f2199d88fb579bd5e119743c6d967226800e39f629d5c50a03efa1a8 SHA512 a0af63e1571a80f31823598645cd184797889ecf98cae5ba0663056c2f019d02562430f3026e8aef2553964b33aae459499e26e9b9f6d65b89202ef19baa4bb7 diff --git a/net-im/tokodon/metadata.xml b/net-im/tokodon/metadata.xml new file mode 100644 index 000000000000..02ce3e9d31e3 --- /dev/null +++ b/net-im/tokodon/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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> + <remote-id type="kde-invent">network/tokodon</remote-id> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> +</pkgmetadata> diff --git a/net-im/tokodon/tokodon-23.08.5.ebuild b/net-im/tokodon/tokodon-23.08.5.ebuild new file mode 100644 index 000000000000..085752b42a0b --- /dev/null +++ b/net-im/tokodon/tokodon-23.08.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Mastodon client for Plasma and Plasma Mobile" +HOMEPAGE="https://apps.kde.org/tokodon/" + +LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" +SLOT="0" +KEYWORDS="amd64 arm64 ~ppc64 x86" + +DEPEND=" + >=dev-libs/kirigami-addons-0.10.0:5 + media-video/mpv:=[libmpv] + dev-libs/qtkeychain:=[qt5(+)] + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebsockets-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5[qml] +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/net-im/tokodon/tokodon-24.02.2.ebuild b/net-im/tokodon/tokodon-24.02.2.ebuild new file mode 100644 index 000000000000..20ed8560f79d --- /dev/null +++ b/net-im/tokodon/tokodon-24.02.2.ebuild @@ -0,0 +1,45 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Mastodon client for Plasma and Plasma Mobile" +HOMEPAGE="https://apps.kde.org/tokodon/" + +LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-libs/kirigami-addons:6 + >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwebsockets-${QTMIN}:6 + >=dev-qt/qtwebview-${QTMIN}:6 + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + media-libs/mpvqt +" +RDEPEND="${DEPEND} + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6[qml] +" +BDEPEND="virtual/pkgconfig" diff --git a/net-im/toxic/toxic-0.11.1.ebuild b/net-im/toxic/toxic-0.11.1-r1.ebuild index de06e0e5aea2..1a535eb7fcaa 100644 --- a/net-im/toxic/toxic-0.11.1.ebuild +++ b/net-im/toxic/toxic-0.11.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10,11} ) inherit python-single-r1 xdg @@ -101,7 +101,9 @@ src_configure() { if ! use X; then export DISABLE_X11=1 fi - export USER_CFLAGS="${CFLAGS}" + #include strings.h fixes undefined reference to strcasecmp() + #defining _GNU_SOURCE fixes undefined reference to strcasestr() + export USER_CFLAGS="${CFLAGS} -include strings.h -D _GNU_SOURCE" 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.11.3.ebuild b/net-im/toxic/toxic-0.11.3-r1.ebuild index 540224d42d30..729b32f3fcc0 100644 --- a/net-im/toxic/toxic-0.11.3.ebuild +++ b/net-im/toxic/toxic-0.11.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10,11} ) inherit python-single-r1 xdg @@ -13,7 +13,7 @@ SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) video? ( sound X ) " @@ -101,7 +101,9 @@ src_configure() { if ! use X; then export DISABLE_X11=1 fi - export USER_CFLAGS="${CFLAGS}" + #Including strings.h fixes undefined reference to strcasecmp() + #Defining _GNU_SOURCE fixes undefined reference to strcasestr() + export USER_CFLAGS="${CFLAGS} -include strings.h -D _GNU_SOURCE" 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/transwhat/transwhat-0.2.2_p20190426-r3.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild index f35a0c3ca42c..3a1f9c589d2b 100644 --- a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild +++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 EGIT_COMMIT="d022243f6c7b23674d3c87a09819f00b10df1165" -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -32,5 +33,7 @@ src_prepare() { default # Spectrum2 must be lower case - sed -e 's/Spectrum2/spectrum2/g' -i transWhat/{buddy,group,registersession,session,transwhat,whatsappbackend}.py || die + sed \ + -e 's/Spectrum2/spectrum2/g' \ + -i transWhat/{buddy,group,registersession,session,transwhat,whatsappbackend}.py || die } diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest deleted file mode 100644 index e78a2c997862..000000000000 --- a/net-im/vacuum/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687 diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml deleted file mode 100644 index 3873cad96d32..000000000000 --- a/net-im/vacuum/metadata.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>reagentoo@gmail.com</email> - <name>Dmitry Baranov</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="annotations">Enable adding comments to the contacts in the roster</flag> - <flag name="autostatus">Change the status in accordance with the time of inactivity</flag> - <flag name="avatars">Enable assigning and displaying avatars</flag> - <flag name="birthdayreminder">Reminds about birthdays of your friends</flag> - <flag name="bitsofbinary">Allow other modules to receive or send a small amount of binary data in XMPP stanza</flag> - <flag name="bookmarks">Enable creating bookmarks of the Jabber conferences and Web pages</flag> - <flag name="captchaforms">Perform tests for humanity outside of Web browser</flag> - <flag name="chatstates">Post user's activity to the chat</flag> - <flag name="clientinfo">Enable sending and receiving peer's application version, local time and last activity info</flag> - <flag name="commands">Enable performing special commands provided by various services</flag> - <flag name="compress">Compress stream of messages</flag> - <flag name="console">Enable inspecting a raw XML stream</flag> - <flag name="dataforms">Allow other modules to process and display data forms intended for the user</flag> - <flag name="datastreamsmanager">Enable initiating a custom data stream between two XMPP entities</flag> - <flag name="emoticons">Enable using smiley images in messages</flag> - <flag name="filemessagearchive">Allows to save the history of conversations to local files</flag> - <flag name="filestreamsmanager">Enable transferring files between two XMPP entities</flag> - <flag name="filetransfer">Enable sending files to peers</flag> - <flag name="gateways">Simplify the interaction with gateways to other IM systems</flag> - <flag name="inbandstreams">Enable initiating in-band data stream between two XMPP enitites</flag> - <flag name="iqauth">Enable logging on Jabber servers withous SASL authentication support</flag> - <flag name="jabbersearch">Enable searching contacts in Jabber networks</flag> - <flag name="messagearchiver">Enable saving the communication history both locally and on the server</flag> - <flag name="messagecarbons">Allows to keep all user IM clients engaged in a conversation</flag> - <flag name="multiuserchat">Enable Jabber multi-user conferences</flag> - <flag name="pepmanager">Allows other plugins to receive and publish PEP events</flag> - <flag name="privacylists">Enable blocking the undesirable contacts</flag> - <flag name="privatestorage">Allow other modules to store arbitrary data on the server</flag> - <flag name="recentcontacts">Displays a recently used contacts</flag> - <flag name="registration">Enable creating accounts in Jabber services</flag> - <flag name="remotecontrol">Allows to remotely control the client</flag> - <flag name="rosteritemexchange">Allows to exchange contact list items</flag> - <flag name="rostersearch">Allows to search for contacts in the roster</flag> - <flag name="servermessagearchive">Allows to save the history of communications on the server</flag> - <flag name="servicediscovery">Enable receiving information about Jabber entities</flag> - <flag name="sessionnegotiation">Enable initiating the session between two entities with setting the rules for XMPP stanzas exchange</flag> - <flag name="shortcutmanager">Allows to setup user defined shortcuts</flag> - <flag name="socksstreams">Enable initiating SOCKS5 data streams between two XMPP entities</flag> - <flag name="urlprocessor">Allows other plugins to load data from custom types of URLs</flag> - <flag name="vcard">Enable obtaining peer's personal contact information</flag> - <flag name="xmppuriqueries">Allow other plugins to handle XMPP URI queries</flag> - <flag name="aspell">Select <pkg>app-text/aspell</pkg> spell checker backend</flag> - <flag name="enchant">Select <pkg>app-text/enchant</pkg> spell checker backend</flag> - <flag name="hunspell">Select <pkg>app-text/hunspell</pkg> spell checker backend</flag> - </use> -</pkgmetadata> diff --git a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild deleted file mode 100644 index 1ce002e1d41c..000000000000 --- a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLOCALES="de es pl ru uk" -inherit cmake plocale - -MY_PN="${PN}-im" -MY_PV="${PV/_pre/.}-Alpha" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Qt Crossplatform Jabber client" -HOMEPAGE="http://www.vacuum-im.org/" -SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/37" # subslot = libvacuumutils soname version -KEYWORDS="~amd64 ~x86" -PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) -SPELLCHECKER_BACKENDS="aspell +enchant hunspell" -IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" - -REQUIRED_USE=" - annotations? ( privatestorage ) - avatars? ( vcard ) - birthdayreminder? ( vcard ) - bookmarks? ( privatestorage ) - captchaforms? ( dataforms ) - commands? ( dataforms ) - datastreamsmanager? ( dataforms ) - filemessagearchive? ( messagearchiver ) - filestreamsmanager? ( datastreamsmanager ) - filetransfer? ( filestreamsmanager datastreamsmanager ) - messagecarbons? ( servicediscovery ) - pepmanager? ( servicediscovery ) - recentcontacts? ( privatestorage ) - registration? ( dataforms ) - remotecontrol? ( commands dataforms ) - servermessagearchive? ( messagearchiver ) - sessionnegotiation? ( dataforms ) - spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) ) -" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtlockedfile[qt5(+)] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - net-dns/libidn - sys-libs/zlib[minizip] - x11-libs/libXScrnSaver - filemessagearchive? ( dev-qt/qtsql:5[sqlite] ) - messagearchiver? ( dev-qt/qtsql:5[sqlite] ) - spell? ( - aspell? ( app-text/aspell ) - enchant? ( app-text/enchant:0 ) - hunspell? ( app-text/hunspell ) - ) -" -RDEPEND="${DEPEND} - !net-im/vacuum-spellchecker -" - -DOCS=( AUTHORS CHANGELOG README TRANSLATORS ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - cmake_src_prepare - - # Force usage of system libraries - rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die - - # Suppress find thirdparty library in the system - sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="$(get_libdir)" - -DINSTALL_SDK=ON - -DLANGS="$(plocale_get_locales)" - -DINSTALL_DOCS=OFF - -DFORCE_BUNDLED_MINIZIP=OFF - -DPLUGIN_adiummessagestyle=OFF - -DPLUGIN_statistics=OFF - -DPLUGIN_spellchecker=$(usex spell) - ) - - for x in ${PLUGINS[@]}; do - mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) ) - done - - for i in ${SPELLCHECKER_BACKENDS//+/}; do - use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" ) - done - - cmake_src_configure -} diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild deleted file mode 100644 index 7eecd922f0b9..000000000000 --- a/net-im/vacuum/vacuum-9999.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im" -PLOCALES="de es pl ru uk" -inherit cmake git-r3 plocale - -DESCRIPTION="Qt Crossplatform Jabber client" -HOMEPAGE="http://www.vacuum-im.org/" - -LICENSE="GPL-3" -SLOT="0/37" # subslot = libvacuumutils soname version -KEYWORDS="" -PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) -SPELLCHECKER_BACKENDS="aspell +enchant hunspell" -IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" - -REQUIRED_USE=" - annotations? ( privatestorage ) - avatars? ( vcard ) - birthdayreminder? ( vcard ) - bookmarks? ( privatestorage ) - captchaforms? ( dataforms ) - commands? ( dataforms ) - datastreamsmanager? ( dataforms ) - filemessagearchive? ( messagearchiver ) - filestreamsmanager? ( datastreamsmanager ) - filetransfer? ( filestreamsmanager datastreamsmanager ) - messagecarbons? ( servicediscovery ) - pepmanager? ( servicediscovery ) - recentcontacts? ( privatestorage ) - registration? ( dataforms ) - remotecontrol? ( commands dataforms ) - servermessagearchive? ( messagearchiver ) - sessionnegotiation? ( dataforms ) - spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) ) -" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtlockedfile[qt5(+)] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtxml:5 - net-dns/libidn - sys-libs/zlib[minizip] - x11-libs/libXScrnSaver - filemessagearchive? ( dev-qt/qtsql:5[sqlite] ) - messagearchiver? ( dev-qt/qtsql:5[sqlite] ) - spell? ( - aspell? ( app-text/aspell ) - enchant? ( app-text/enchant:0 ) - hunspell? ( app-text/hunspell ) - ) -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS CHANGELOG README TRANSLATORS ) - -src_prepare() { - cmake_src_prepare - - # Force usage of system libraries - rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die - - # Suppress find thirdparty library in the system - sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="$(get_libdir)" - -DINSTALL_SDK=ON - -DLANGS="$(plocale_get_locales)" - -DINSTALL_DOCS=OFF - -DFORCE_BUNDLED_MINIZIP=OFF - -DPLUGIN_adiummessagestyle=OFF - -DPLUGIN_statistics=OFF - -DPLUGIN_spellchecker=$(usex spell) - ) - - for x in ${PLUGINS[@]}; do - mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) ) - done - - for i in ${SPELLCHECKER_BACKENDS//+/}; do - use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" ) - done - - cmake_src_configure -} diff --git a/net-im/wazzapp-bin/Manifest b/net-im/wazzapp-bin/Manifest deleted file mode 100644 index e46027a9a1d9..000000000000 --- a/net-im/wazzapp-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wazzapp-0.4.2.x86_64.rpm 56402809 BLAKE2B 11a6f8db4fe91014218b09992e1e3fa36819eb73efc9081ef56af5e6aa5b0dbee78e8974eca86b28701160eb823ae58350f9da4c6d5c0e1826ee95a7ea413a55 SHA512 808fa3721d62def5d93b4b3411f1f7489d22d5c70af07174b41579263d562bb139e951434a211c36e08e7c672925f89e60eb7fdb1d79148c3adc1a9c7beafad7 diff --git a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2-r3.ebuild index dec45a3a26f8..1e3b3c9a8754 100644 --- a/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2.ebuild +++ b/net-im/whatsapp-desktop-bin/whatsapp-desktop-bin-0.5.2-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,10 +29,12 @@ SLOT="0" RESTRICT="bindist mirror" RDEPEND=" - app-accessibility/at-spi2-atk:2 - dev-libs/atk + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) dev-libs/expat - dev-libs/libappindicator + dev-libs/libayatana-appindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji @@ -44,6 +46,7 @@ RDEPEND=" x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb + x11-libs/libxkbcommon x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor @@ -85,6 +88,8 @@ src_install() { domenu usr/share/applications/whatsapp.desktop local DESTDIR="/opt/whatsapp-desktop" + dosym "../../usr/lib64/libayatana-appindicator3.so" "${DESTDIR}/libappindicator3.so" + pushd "opt/whatsapp-desktop" || die exeinto "${DESTDIR}" diff --git a/net-im/whatsie/Manifest b/net-im/whatsie/Manifest new file mode 100644 index 000000000000..c6c1fe39f53b --- /dev/null +++ b/net-im/whatsie/Manifest @@ -0,0 +1 @@ +DIST whatsie-4.14.2.tar.gz 21146777 BLAKE2B 3d923b9d4b109cbc894481fed9723fe84d992663ea953218cd4b128317aebe2fb8a60608d351cc9f4cfc5a976713ce2a3a642a122276068ed63a96e6cf656603 SHA512 b0b6ab0fab30723ee64b723f79776b6953229502e22f4c5e9fb809aa198e369ee05398abca218680adeea1acfcafd0026e13e424458fedad2c0260c2d956fffb diff --git a/net-im/wazzapp-bin/metadata.xml b/net-im/whatsie/metadata.xml index 2b6f2305c1f4..cbf7db3cb5c1 100644 --- a/net-im/wazzapp-bin/metadata.xml +++ b/net-im/whatsie/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <upstream> - <remote-id type="github">diospiroverde/WazzApp</remote-id> - <bugs-to>https://github.com/diospiroverde/WazzApp/issues</bugs-to> - </upstream> <maintainer type="person"> <email>andrewammerlaan@gentoo.org</email> <name>Andrew Ammerlaan</name> </maintainer> + <upstream> + <remote-id type="github">keshavbhatt/whatsie</remote-id> + </upstream> </pkgmetadata> diff --git a/net-im/whatsie/whatsie-4.14.2.ebuild b/net-im/whatsie/whatsie-4.14.2.ebuild new file mode 100644 index 000000000000..cecf52d1bc2d --- /dev/null +++ b/net-im/whatsie/whatsie-4.14.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +DESCRIPTION="Qt Based WhatsApp Client" +HOMEPAGE="https://github.com/keshavbhatt/whatsie" +SRC_URI="https://github.com/keshavbhatt/whatsie/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/src" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0" + +QT_MIN="5.15" + +DEPEND=" + x11-libs/libX11 + x11-libs/libxcb:= + >=dev-qt/qtcore-${QT_MIN}:5 + >=dev-qt/qtgui-${QT_MIN}:5 + >=dev-qt/qtnetwork-${QT_MIN}:5 + >=dev-qt/qtpositioning-${QT_MIN}:5 + >=dev-qt/qtwebengine-${QT_MIN}:5[widgets] + >=dev-qt/qtwidgets-${QT_MIN}:5 +" + +RDEPEND="${DEPEND}" + +src_configure() { + eqmake5 +} + +src_install() { + einstalldocs + INSTALL_ROOT="${ED}" emake install +} diff --git a/net-im/yowsup/yowsup-3.3.0.ebuild b/net-im/yowsup/yowsup-3.3.0.ebuild index 2c325425e65b..b1da807a7464 100644 --- a/net-im/yowsup/yowsup-3.3.0.ebuild +++ b/net-im/yowsup/yowsup-3.3.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DISTUTILS_USE_SETUPTOOLS="bdepend" -PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="readline" inherit distutils-r1 diff --git a/net-im/ysm/ysm-2.9.9.1-r2.ebuild b/net-im/ysm/ysm-2.9.9.1-r2.ebuild index c36878d19813..3da1e61c79c9 100644 --- a/net-im/ysm/ysm-2.9.9.1-r2.ebuild +++ b/net-im/ysm/ysm-2.9.9.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ KEYWORDS="amd64 ppc x86" RESTRICT="mirror" # Introduced by fix-configure.patch -BDEPEND="sys-devel/autoconf-archive" +BDEPEND="dev-build/autoconf-archive" PATCHES=( "${FILESDIR}"/${PN}-2.9.9.1-dont-strip-binary.patch diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest index 2e53b525aceb..eabb1df63e82 100644 --- a/net-im/zoom/Manifest +++ b/net-im/zoom/Manifest @@ -1,3 +1,2 @@ -DIST zoom-5.10.7.3311_x86_64.tar.xz 130117904 BLAKE2B d3ad7501ec6fc495c62bb783c79690f5424c7e07b0cad1a3e71e20633e9df088c918a0b9a4cc5a956b016e6144da4998567ebb3ef393452caf8814d4e300c186 SHA512 acf31bc5e983500f534ccfcfe0b935a735e4a259bcfb37d99109bed41d0f3f561a664c5cbf728f907feb8ec5e79a13a27dc39c01948ee2e9f1bab2288e450231 -DIST zoom-5.11.0.3540_x86_64.tar.xz 131577872 BLAKE2B 11d40635b83469672bd9da1aea3312b735ff924d85faf515f435dba1e11c2b957c76d56a05490b2d55d4f3db3fc84b46a96a3cdd23ab2e137e4f4e9d8c87d109 SHA512 6b58e1978710f1293438164edb02ab0920e479851f7fee137bdbdc13b9d70d168a253ec140f68c6922d523e183808a31bb3527fea893bf480e1a34f7e703b5f6 -DIST zoom-5.11.1.3595_x86_64.tar.xz 131583416 BLAKE2B 9848b198bc8c523287e68d85ec42bbb5c1fc6448210c4104273bf6680f4fa2f460a5f880f07d6d5d65aa83cd58c82b071be83205e505c097c205370cd1304c35 SHA512 9e02dcbd33369334521cc51f8a64db1f677fe887773fa73e4ade10f01a0e0ac48cce3ff6ce962d52208935ecf19f82c22c9d81702e9839c30f0cdaa3fd9fde4e +DIST zoom-5.17.11.3835_x86_64.tar.xz 186799104 BLAKE2B 84cc1dc046742392bd41a906050ec424e431c63a94224cadb021baf0463bd73697557f7344d91a759d49e288d36bb8fa1ebaf1690d4264caccce2dbb774ff0aa SHA512 5749ad8f472ad035e307e544f648e0d6e15625c0566abc5e0d005a1784b058ebe45aa5ddd48ed52a98781cb3406b15b0cbe1b593a77bd7a203493835d83e6c32 +DIST zoom-6.0.2.4680_x86_64.tar.xz 202434660 BLAKE2B b73103c759a6d41257aa31919e6d992663e1984364ee7a2d42ae61576afcb7e61c206088885f2adb076a446bec77da6fad59d40b446f37c4b3732908dc0b4982 SHA512 e8a842b281fea1f5399cb245208bed77689035226af5901e856f7d2542aa2e623a8a7f7647e312849deedac324853f945c26252d37bc0f98e8210a958e7f15fa diff --git a/net-im/zoom/metadata.xml b/net-im/zoom/metadata.xml index 641677fd6fef..9666965997b3 100644 --- a/net-im/zoom/metadata.xml +++ b/net-im/zoom/metadata.xml @@ -11,9 +11,6 @@ <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> diff --git a/net-im/zoom/zoom-5.11.1.3595.ebuild b/net-im/zoom/zoom-5.11.1.3595.ebuild deleted file mode 100644 index de370171be34..000000000000 --- a/net-im/zoom/zoom-5.11.1.3595.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop readme.gentoo-r1 wrapper xdg-utils - -DESCRIPTION="Video conferencing and web conferencing service" -HOMEPAGE="https://zoom.us/" -SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz" -S="${WORKDIR}/${PN}" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland" -RESTRICT="mirror bindist strip" - -RDEPEND="!games-engines/zoom - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - >=dev-libs/quazip-1.0:0= - media-libs/alsa-lib - media-libs/fdk-aac:0/2 - media-libs/fontconfig - media-libs/freetype - media-libs/mesa[gbm(+)] - media-sound/mpg123 - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - virtual/opengl - x11-libs/cairo - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon[X] - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libxshmfence - x11-libs/libXtst - x11-libs/pango - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - opencl? ( virtual/opencl ) - pulseaudio? ( media-sound/pulseaudio ) - wayland? ( dev-libs/wayland ) - !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) - !bundled-qt? ( - dev-libs/icu - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtdiag:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtlocation:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5[widgets] - dev-qt/qtquickcontrols2:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - wayland? ( dev-qt/qtwayland ) - )" - -BDEPEND="dev-util/bbe - bundled-libjpeg-turbo? ( dev-util/patchelf )" - -QA_PREBUILT="opt/zoom/*" - -src_prepare() { - default - - # The tarball doesn't contain an icon, so extract it from the binary - bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \ - >videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \ - || die "Extraction of icon failed" - - if ! use pulseaudio; then - # For some strange reason, zoom cannot use any ALSA sound devices if - # it finds libpulse. This causes breakage if media-sound/apulse[sdk] - # is installed. So, force zoom to ignore libpulse. - bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die - mv zoom.tmp zoom || die - fi - - if use bundled-libjpeg-turbo; then - # Remove insecure RPATH from bundled lib - patchelf --remove-rpath libturbojpeg.so || die - fi -} - -src_install() { - insinto /opt/zoom - exeinto /opt/zoom - doins -r cef json ringtone scheduler sip timezones translations - doins *.pcm Embedded.properties version.txt - doexe zoom zopen ZoomLauncher *.sh - dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so - dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so - dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so - - if use opencl; then - doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so - dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1 - fi - - if use bundled-libjpeg-turbo; then - doexe libturbojpeg.so - else - dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so - fi - - if use bundled-qt; then - doexe libicu*.so.56 libQt5*.so.5 - doins qt.conf - - local dirs="Qt* bearer generic iconengines imageformats \ - platforminputcontexts platforms wayland* xcbglintegrations" - doins -r ${dirs} - find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \ - -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die - - ( # Remove libs and plugins with unresolved soname dependencies - cd "${ED}"/opt/zoom || die - rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \ - QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \ - platforms/libqeglfs.so platforms/libqlinuxfb.so || die - use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \ - platforms/libqwayland*.so || die - ) - else - local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5) - if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then - ewarn "You have disabled the bundled-qt USE flag." - ewarn "You may experience problems when running Zoom with" - ewarn "a version of the system-wide Qt libs other than ${qtzoom}." - ewarn "See https://bugs.gentoo.org/798681 for details." - fi - fi - - make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef - make_desktop_entry "zoom %U" Zoom videoconference-zoom \ - "Network;VideoConference;" \ - "MimeType=$(printf '%s;' \ - x-scheme-handler/zoommtg \ - x-scheme-handler/zoomus \ - application/x-zoom)" - doicon videoconference-zoom.svg - doicon -s scalable videoconference-zoom.svg - - local DOC_CONTENTS="Some of Zoom's screen share features (e.g. - the whiteboard) require display compositing. If you encounter - a black window when sharing the screen, then one of the following - actions should help: - \\n- Enable compositing in your window manager if it is supported - \\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)" - use wayland \ - && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland, - edit ~/.config/zoomus.conf and change the value of - enableWaylandShare to true." - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-im/zoom/zoom-5.10.7.3311.ebuild b/net-im/zoom/zoom-5.17.11.3835.ebuild index de370171be34..17e2c56c3e85 100644 --- a/net-im/zoom/zoom-5.10.7.3311.ebuild +++ b/net-im/zoom/zoom-5.17.11.3835.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit desktop readme.gentoo-r1 wrapper xdg-utils +inherit desktop linux-info readme.gentoo-r1 xdg-utils DESCRIPTION="Video conferencing and web conferencing service" HOMEPAGE="https://zoom.us/" @@ -13,18 +13,17 @@ S="${WORKDIR}/${PN}" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland" +IUSE="+bundled-qt opencl pulseaudio wayland" RESTRICT="mirror bindist strip" RDEPEND="!games-engines/zoom - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/mit-krb5 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss - >=dev-libs/quazip-1.0:0= + >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig @@ -35,6 +34,7 @@ RDEPEND="!games-engines/zoom sys-apps/dbus sys-apps/util-linux sys-libs/glibc + sys-libs/zlib virtual/opengl x11-libs/cairo x11-libs/libdrm @@ -52,10 +52,11 @@ RDEPEND="!games-engines/zoom x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm opencl? ( virtual/opencl ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) - !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 @@ -71,12 +72,13 @@ RDEPEND="!games-engines/zoom dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + dev-qt/qtxml:5 wayland? ( dev-qt/qtwayland ) )" -BDEPEND="dev-util/bbe - bundled-libjpeg-turbo? ( dev-util/patchelf )" +BDEPEND="dev-util/bbe" +CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER" QA_PREBUILT="opt/zoom/*" src_prepare() { @@ -94,51 +96,49 @@ src_prepare() { bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die mv zoom.tmp zoom || die fi - - if use bundled-libjpeg-turbo; then - # Remove insecure RPATH from bundled lib - patchelf --remove-rpath libturbojpeg.so || die - fi } src_install() { insinto /opt/zoom exeinto /opt/zoom - doins -r cef json ringtone scheduler sip timezones translations + doins -r calendar cef email json ringtone scheduler sip timezones \ + translations doins *.pcm Embedded.properties version.txt - doexe zoom zopen ZoomLauncher *.sh + doexe zoom zopen ZoomLauncher *.sh \ + aomhost libaomagent.so libdvf.so libmkldnn.so \ + libavcodec.so* libavformat.so* libavutil.so* libswresample.so* + fperms a+x /opt/zoom/cef/chrome-sandbox dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so if use opencl; then - doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so + doexe libclDNN64.so dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1 fi - if use bundled-libjpeg-turbo; then - doexe libturbojpeg.so - else - dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so + if ! use wayland; then + # Soname dependency on libwayland-client.so.0 + rm "${ED}"/opt/zoom/cef/libGLESv2.so || die fi if use bundled-qt; then - doexe libicu*.so.56 libQt5*.so.5 - doins qt.conf - - local dirs="Qt* bearer generic iconengines imageformats \ - platforminputcontexts platforms wayland* xcbglintegrations" - doins -r ${dirs} - find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \ + doins -r Qt + find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \ -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die - - ( # Remove libs and plugins with unresolved soname dependencies - cd "${ED}"/opt/zoom || die - rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \ - QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \ - platforms/libqeglfs.so platforms/libqlinuxfb.so || die - use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \ - platforms/libqwayland*.so || die + ( # Remove libs and plugins with unresolved soname dependencies. + # Why does the upstream package contain such garbage? :-( + cd "${ED}"/opt/zoom/Qt || die + rm -r plugins/audio plugins/egldeviceintegrations \ + plugins/platforms/libqeglfs.so \ + plugins/platforms/libqlinuxfb.so \ + plugins/platformthemes/libqgtk3.so \ + qml/QtQml/RemoteObjects \ + qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \ + qml/QtQuick/Scene2D qml/QtQuick/Scene3D \ + qml/QtQuick/XmlListModel || die + use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \ + plugins/platforms/libqwayland*.so qml/QtWayland || die ) else local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5) @@ -150,7 +150,7 @@ src_install() { fi fi - make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef + dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom make_desktop_entry "zoom %U" Zoom videoconference-zoom \ "Network;VideoConference;" \ "MimeType=$(printf '%s;' \ @@ -166,10 +166,6 @@ src_install() { actions should help: \\n- Enable compositing in your window manager if it is supported \\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)" - use wayland \ - && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland, - edit ~/.config/zoomus.conf and change the value of - enableWaylandShare to true." readme.gentoo_create_doc } diff --git a/net-im/zoom/zoom-5.11.0.3540.ebuild b/net-im/zoom/zoom-6.0.2.4680.ebuild index de370171be34..ad8149eaf736 100644 --- a/net-im/zoom/zoom-5.11.0.3540.ebuild +++ b/net-im/zoom/zoom-6.0.2.4680.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit desktop readme.gentoo-r1 wrapper xdg-utils +inherit desktop linux-info readme.gentoo-r1 xdg-utils DESCRIPTION="Video conferencing and web conferencing service" HOMEPAGE="https://zoom.us/" @@ -13,18 +13,17 @@ S="${WORKDIR}/${PN}" LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland" +IUSE="+bundled-qt opencl pulseaudio wayland" RESTRICT="mirror bindist strip" RDEPEND="!games-engines/zoom - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/mit-krb5 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss - >=dev-libs/quazip-1.0:0= + >=dev-libs/quazip-1.0:0=[qt5(+)] media-libs/alsa-lib media-libs/fdk-aac:0/2 media-libs/fontconfig @@ -35,6 +34,7 @@ RDEPEND="!games-engines/zoom sys-apps/dbus sys-apps/util-linux sys-libs/glibc + sys-libs/zlib virtual/opengl x11-libs/cairo x11-libs/libdrm @@ -52,10 +52,11 @@ RDEPEND="!games-engines/zoom x11-libs/pango x11-libs/xcb-util-image x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm opencl? ( virtual/opencl ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) - !bundled-libjpeg-turbo? ( >=media-libs/libjpeg-turbo-2.0.5 ) !bundled-qt? ( dev-libs/icu dev-qt/qtcore:5 @@ -71,12 +72,13 @@ RDEPEND="!games-engines/zoom dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + dev-qt/qtxml:5 wayland? ( dev-qt/qtwayland ) )" -BDEPEND="dev-util/bbe - bundled-libjpeg-turbo? ( dev-util/patchelf )" +BDEPEND="dev-util/bbe" +CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER" QA_PREBUILT="opt/zoom/*" src_prepare() { @@ -94,51 +96,49 @@ src_prepare() { bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die mv zoom.tmp zoom || die fi - - if use bundled-libjpeg-turbo; then - # Remove insecure RPATH from bundled lib - patchelf --remove-rpath libturbojpeg.so || die - fi } src_install() { insinto /opt/zoom exeinto /opt/zoom - doins -r cef json ringtone scheduler sip timezones translations + doins -r calendar cef chatapp email json ringtone scheduler sip \ + timezones translations doins *.pcm Embedded.properties version.txt - doexe zoom zopen ZoomLauncher *.sh + doexe zoom zopen ZoomLauncher *.sh \ + aomhost libaomagent.so libdvf.so libmkldnn.so \ + libavcodec.so* libavformat.so* libavutil.so* libswresample.so* + fperms a+x /opt/zoom/cef/chrome-sandbox dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so if use opencl; then - doexe aomhost libaomagent.so libclDNN64.so libmkldnn.so + doexe libclDNN64.so dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1 fi - if use bundled-libjpeg-turbo; then - doexe libturbojpeg.so - else - dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so + if ! use wayland; then + # Soname dependency on libwayland-client.so.0 + rm "${ED}"/opt/zoom/cef/libGLESv2.so || die fi if use bundled-qt; then - doexe libicu*.so.56 libQt5*.so.5 - doins qt.conf - - local dirs="Qt* bearer generic iconengines imageformats \ - platforminputcontexts platforms wayland* xcbglintegrations" - doins -r ${dirs} - find ${dirs} -type f '(' -name '*.so' -o -name '*.so.*' ')' \ + doins -r Qt + find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \ -printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die - - ( # Remove libs and plugins with unresolved soname dependencies - cd "${ED}"/opt/zoom || die - rm -r Qt/labs/location QtQuick/LocalStorage QtQuick/Particles.2 \ - QtQuick/Scene2D QtQuick/Scene3D QtQuick/XmlListModel \ - platforms/libqeglfs.so platforms/libqlinuxfb.so || die - use wayland || rm -r libQt5Wayland*.so* QtWayland wayland* \ - platforms/libqwayland*.so || die + ( # Remove libs and plugins with unresolved soname dependencies. + # Why does the upstream package contain such garbage? :-( + cd "${ED}"/opt/zoom/Qt || die + rm -r plugins/audio plugins/egldeviceintegrations \ + plugins/platforms/libqeglfs.so \ + plugins/platforms/libqlinuxfb.so \ + plugins/platformthemes/libqgtk3.so \ + qml/QtQml/RemoteObjects \ + qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \ + qml/QtQuick/Scene2D qml/QtQuick/Scene3D \ + qml/QtQuick/XmlListModel || die + use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \ + plugins/platforms/libqwayland*.so qml/QtWayland || die ) else local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5) @@ -150,7 +150,7 @@ src_install() { fi fi - make_wrapper zoom /opt/zoom{/zoom,} /opt/zoom:/opt/zoom/cef + dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom make_desktop_entry "zoom %U" Zoom videoconference-zoom \ "Network;VideoConference;" \ "MimeType=$(printf '%s;' \ @@ -166,10 +166,6 @@ src_install() { actions should help: \\n- Enable compositing in your window manager if it is supported \\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)" - use wayland \ - && DOC_CONTENTS+="\\n\\nTo enable screen sharing on GNOME Wayland, - edit ~/.config/zoomus.conf and change the value of - enableWaylandShare to true." readme.gentoo_create_doc } |