From 99a0d936ab5cb06fdd70a52f6bf35c47dd8acc91 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Tue, 14 May 2024 01:44:08 +0200 Subject: [PATCH] net-im/*: fix variable order Signed-off-by: Lucio Sauer Signed-off-by: Julien Roy --- net-im/Quaternion/Quaternion-0.0.95.1.ebuild | 2 +- net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild | 6 +++--- .../discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild | 4 ++-- net-im/gajim-plugins/gajim-plugins-9999.ebuild | 10 +++++----- net-im/gomuks/gomuks-0.3.0.ebuild | 13 +++++++------ net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild | 3 ++- net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild | 4 ++-- net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild | 11 ++++++----- .../matterhorn-bin/matterhorn-bin-50200.13.0.ebuild | 4 ++-- .../matterhorn-bin/matterhorn-bin-50200.19.0.ebuild | 4 ++-- .../matterhorn-bin/matterhorn-bin-90000.0.0.ebuild | 4 ++-- net-im/pop/pop-8.0.21.ebuild | 7 ++++--- net-im/ruqola/ruqola-1.3.1.ebuild | 2 +- .../session-desktop-bin-1.10.8.ebuild | 3 ++- .../teams-for-linux/teams-for-linux-1.4.12.ebuild | 2 +- .../teams-for-linux/teams-for-linux-1.4.13.ebuild | 2 +- .../whatsapp-for-linux-1.5.3.ebuild | 2 +- .../whatsapp-for-linux-1.6.2.ebuild | 2 +- 18 files changed, 45 insertions(+), 40 deletions(-) diff --git a/net-im/Quaternion/Quaternion-0.0.95.1.ebuild b/net-im/Quaternion/Quaternion-0.0.95.1.ebuild index 64e5ed4388..33d2f89705 100644 --- a/net-im/Quaternion/Quaternion-0.0.95.1.ebuild +++ b/net-im/Quaternion/Quaternion-0.0.95.1.ebuild @@ -9,8 +9,8 @@ DESCRIPTION="A Qt-based IM client for Matrix" HOMEPAGE="https://github.com/quotient-im/Quaternion https://matrix.org/docs/projects/client/quaternion.html" SRC_URI="https://github.com/quotient-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="GPL-3" +SLOT="0" KEYWORDS="~amd64" IUSE="+keychain" diff --git a/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild b/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild index 8ae63b5ed3..70381f9fbc 100644 --- a/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild +++ b/net-im/Quaternion/Quaternion-0.0.96_beta4.ebuild @@ -10,13 +10,13 @@ HOMEPAGE="https://github.com/quotient-im/Quaternion https://matrix.org/ecosystem GITHUB_PV=${PV//_/-} SRC_URI="https://github.com/quotient-im/${PN}/archive/refs/tags/${GITHUB_PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" +S="${WORKDIR}/${PN}-${GITHUB_PV}" + LICENSE="GPL-3" +SLOT="0" KEYWORDS="~amd64" IUSE="qt6" -S="${WORKDIR}/${PN}-${GITHUB_PV}" - RDEPEND=" qt6? ( dev-qt/qtbase:6[widgets,network,gui] diff --git a/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild b/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild index e402b1eed8..8568d52ceb 100644 --- a/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild +++ b/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild @@ -13,6 +13,8 @@ DESCRIPTION="All-in-one voice and text chat" HOMEPAGE="https://discordapp.com/" SRC_URI="https://dl-ptb.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb" +S="${WORKDIR}" + LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64" @@ -49,8 +51,6 @@ RDEPEND=" x11-libs/pango " -S="${WORKDIR}" - QA_PREBUILT=" opt/discord-ptb/${MY_BIN} opt/discord-ptb/chrome-sandbox diff --git a/net-im/gajim-plugins/gajim-plugins-9999.ebuild b/net-im/gajim-plugins/gajim-plugins-9999.ebuild index f91cae101b..84807e8572 100644 --- a/net-im/gajim-plugins/gajim-plugins-9999.ebuild +++ b/net-im/gajim-plugins/gajim-plugins-9999.ebuild @@ -5,20 +5,20 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit python-single-r1 +inherit git-r3 python-single-r1 DESCRIPTION="Plugins developed fro Gajim XMPP client" HOMEPAGE="https://dev.gajim.org/gajim/gajim-plugins/" - -inherit git-r3 EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim-plugins.git" -MY_PLUGINS="acronyms_expander anti_spam clients_icons length_notifier message_box_size now_listen omemo openpgp pgp plugins_translations quick_replies triggers" +S="${WORKDIR}/${P%_p2}" LICENSE="GPL-3" SLOT="0" +MY_PLUGINS="acronyms_expander anti_spam clients_icons length_notifier + message_box_size now_listen omemo openpgp pgp plugins_translations + quick_replies triggers" IUSE="$(printf '+%s ' ${MY_PLUGINS[@]})" -S="${WORKDIR}/${P%_p2}" RDEPEND=" ${PYTHON_DEPS} diff --git a/net-im/gomuks/gomuks-0.3.0.ebuild b/net-im/gomuks/gomuks-0.3.0.ebuild index 1f9d940023..a8d2ed8ce4 100644 --- a/net-im/gomuks/gomuks-0.3.0.ebuild +++ b/net-im/gomuks/gomuks-0.3.0.ebuild @@ -3,12 +3,6 @@ EAPI=8 -DESCRIPTION="A terminal based Matrix client written in Go" -HOMEPAGE="https://github.com/tulir/gomuks" -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64" - inherit go-module EGO_SUM=( "github.com/alecthomas/chroma v0.10.0" @@ -143,11 +137,18 @@ EGO_SUM=( ) go-module_set_globals +DESCRIPTION="A terminal based Matrix client written in Go" +HOMEPAGE="https://github.com/tulir/gomuks" EGIT_COMMIT="09a927955810f6f0c6d3f4809d9b01eda365fd39" SRC_URI="https://github.com/tulir/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz ${EGO_SUM_SRC_URI}" + S=${WORKDIR}/${PN}-${EGIT_COMMIT} +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64" IUSE="+encryption" + DEPEND="encryption? ( >=dev-libs/olm-3 )" RDEPEND="${DEPEND}" diff --git a/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild b/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild index 1f9c0e91f9..d318fc63e4 100644 --- a/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild +++ b/net-im/gtkcord4/gtkcord4-0.0.16.1.ebuild @@ -328,6 +328,8 @@ MY_PV="0.0.16-1" SRC_URI="https://github.com/diamondburned/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz ${EGO_SUM_SRC_URI}" +S="${WORKDIR}"/${PN}-${MY_PV} + LICENSE="Apache-2.0 BSD BSD-2 GPL-3 ISC MIT MPL-2.0" SLOT="0" KEYWORDS="~amd64" @@ -345,7 +347,6 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/${PN}-${MY_PV} src_compile() { ego build } diff --git a/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild b/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild index cabbb5efa3..4b437c38f5 100644 --- a/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild +++ b/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild @@ -12,6 +12,8 @@ DESCRIPTION="Drop Discord, get Guilded" HOMEPAGE="https://www.guilded.gg" SRC_URI="https://www.guilded.gg/downloads/${MY_BIN}-Linux.deb -> ${P}.deb" +S="${WORKDIR}" + LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64" @@ -34,8 +36,6 @@ RDEPEND=" dev-libs/nss " -S="${WORKDIR}" - QA_PREBUILT=" opt/${MY_BIN}/${MY_PN} opt/${MY_BIN}/chrome-sandbox diff --git a/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild b/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild index f681fd0e00..a9ea8a41b3 100644 --- a/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild +++ b/net-im/jitsi-meet/jitsi-meet-2022.3.1-r1.ebuild @@ -12,15 +12,19 @@ DESCRIPTION="Desktop application for Jitsi Meet built with Electron" HOMEPAGE="https://github.com/jitsi/jitsi-meet-electron" SRC_URI="https://github.com/jitsi/jitsi-meet-electron/releases/download/v${PV}/jitsi-meet-amd64.deb -> ${P}.deb" +S="${WORKDIR}" + LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="~amd64" IUSE="swiftshader" RESTRICT="bindist mirror splitdebug test" -QA_PREBUILT="*" #Depends: libgtk-3-0, libnss3, libxtst6, xdg-utils, libatspi2.0-0, libuuid1 +# sys-libs/libuuid seems to be included in sys-apps/util-linux +# sys-fs/fuse RDEPEND=" x11-libs/gtk+:3 dev-libs/nss @@ -28,11 +32,8 @@ RDEPEND=" app-accessibility/at-spi2-core:2 app-accessibility/at-spi2-atk:2 " -# sys-libs/libuuid seems to be included in sys-apps/util-linux -# sys-fs/fuse -KEYWORDS="~amd64" -S=$WORKDIR +QA_PREBUILT="*" src_install() { rm "opt/Jitsi Meet/chrome-sandbox" || die diff --git a/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild index dde0a90c16..dbdbfd8702 100644 --- a/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild +++ b/net-im/matterhorn-bin/matterhorn-bin-50200.13.0.ebuild @@ -10,6 +10,8 @@ DESCRIPTION="Terminal based Mattermost client" HOMEPAGE="https://github.com/matterhorn-chat/matterhorn" SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + LICENSE="BSD" SLOT="0" KEYWORDS="-* ~amd64" @@ -23,8 +25,6 @@ RDEPEND=" QA_PREBUILT="*" -S="${WORKDIR}/${MY_P}" - src_install() { default diff --git a/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild index 3bb8a42079..548ad7db08 100644 --- a/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild +++ b/net-im/matterhorn-bin/matterhorn-bin-50200.19.0.ebuild @@ -10,6 +10,8 @@ DESCRIPTION="Terminal based Mattermost client" HOMEPAGE="https://github.com/matterhorn-chat/matterhorn" SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + LICENSE="BSD" SLOT="0" KEYWORDS="-* ~amd64" @@ -23,8 +25,6 @@ RDEPEND=" QA_PREBUILT="*" -S="${WORKDIR}/${MY_P}" - src_install() { default diff --git a/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild b/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild index c0f94a03a6..178617c2eb 100644 --- a/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild +++ b/net-im/matterhorn-bin/matterhorn-bin-90000.0.0.ebuild @@ -10,6 +10,8 @@ DESCRIPTION="Terminal based Mattermost client" HOMEPAGE="https://github.com/matterhorn-chat/matterhorn" SRC_URI="https://github.com/matterhorn-chat/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + LICENSE="BSD" SLOT="0" KEYWORDS="-* ~amd64" @@ -23,8 +25,6 @@ RDEPEND=" QA_PREBUILT="*" -S="${WORKDIR}/${MY_P}" - src_install() { default diff --git a/net-im/pop/pop-8.0.21.ebuild b/net-im/pop/pop-8.0.21.ebuild index 75493db46b..dde9794fa3 100644 --- a/net-im/pop/pop-8.0.21.ebuild +++ b/net-im/pop/pop-8.0.21.ebuild @@ -9,11 +9,12 @@ DESCRIPTION="Screen sharing with multiplayer control, with voice" HOMEPAGE="https://pop.com/home" SRC_URI="https://download.pop.com/desktop-app/linux/${PV}/${PN}_${PV}_amd64.deb" +S="${WORKDIR}" + LICENSE="all-rights-reserved" SLOT=0 -RESTRICT="strip" KEYWORDS="~amd64" -QA_PREBUILT="*" +RESTRICT="strip" RDEPEND=" app-accessibility/at-spi2-core @@ -34,7 +35,7 @@ RDEPEND=" x11-libs/pango " -S="${WORKDIR}" +QA_PREBUILT="*" src_unpack() { unpack_deb ${A} diff --git a/net-im/ruqola/ruqola-1.3.1.ebuild b/net-im/ruqola/ruqola-1.3.1.ebuild index 7c9721d868..c6ee64c762 100644 --- a/net-im/ruqola/ruqola-1.3.1.ebuild +++ b/net-im/ruqola/ruqola-1.3.1.ebuild @@ -14,9 +14,9 @@ DESCRIPTION="Rocket.Chat client for the KDE desktop" HOMEPAGE="https://invent.kde.org/network/ruqola" SRC_URI="https://invent.kde.org/network/ruqola/-/archive/${PV}/${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="GPL-2+" SLOT="0" +KEYWORDS="~amd64" IUSE="speech telemetry" diff --git a/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild b/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild index 6bb396c7b9..120cbdb622 100644 --- a/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild +++ b/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild @@ -17,6 +17,8 @@ DESCRIPTION="Session Desktop - Onion routing based messenger" HOMEPAGE="https://getsession.org/ https://github.com/oxen-io/session-desktop" SRC_URI="https://github.com/oxen-io/session-desktop/releases/download/v${PV}/session-desktop-linux-amd64-${PV}.deb" +S="${WORKDIR}" + LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" @@ -66,7 +68,6 @@ QA_PREBUILT=" " CONFIG_CHECK="~USER_NS" -S="${WORKDIR}" pkg_pretend(){ chromium_suid_sandbox_check_kernel_config diff --git a/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild b/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild index fdb913d9cc..26a74f3d87 100644 --- a/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild +++ b/net-im/teams-for-linux/teams-for-linux-1.4.12.ebuild @@ -20,13 +20,13 @@ SRC_URI=" " S="${WORKDIR}" -KEYWORDS="-* ~amd64 ~arm ~arm64" # Electron bundles a bunch of things LICENSE=" MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved " SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64" RESTRICT="bindist mirror" DEPEND=" diff --git a/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild b/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild index fdb913d9cc..26a74f3d87 100644 --- a/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild +++ b/net-im/teams-for-linux/teams-for-linux-1.4.13.ebuild @@ -20,13 +20,13 @@ SRC_URI=" " S="${WORKDIR}" -KEYWORDS="-* ~amd64 ~arm ~arm64" # Electron bundles a bunch of things LICENSE=" MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved " SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64" RESTRICT="bindist mirror" DEPEND=" diff --git a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild index bf1e3a51ba..0716a1f887 100644 --- a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild +++ b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.5.3.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="An unofficial WhatsApp desktop application for Linux" HOMEPAGE="https://github.com/eneshecan/whatsapp-for-linux" SRC_URI="https://github.com/eneshecan/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64" LANGUAGES="en es it ka nl pt-BR ru tr" for lang in ${LANGUAGES}; do diff --git a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild index bf1e3a51ba..0716a1f887 100644 --- a/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild +++ b/net-im/whatsapp-for-linux/whatsapp-for-linux-1.6.2.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="An unofficial WhatsApp desktop application for Linux" HOMEPAGE="https://github.com/eneshecan/whatsapp-for-linux" SRC_URI="https://github.com/eneshecan/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" LICENSE="GPL-3" SLOT="0" +KEYWORDS="~amd64" LANGUAGES="en es it ka nl pt-BR ru tr" for lang in ${LANGUAGES}; do