From 401101f9c8077911929d3f2b60a37098460a5d89 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Mar 2022 23:59:54 +0000 Subject: gentoo resync : 25.03.2022 --- net-im/Manifest.gz | Bin 10425 -> 10591 bytes net-im/cawbird/Manifest | 3 + net-im/cawbird/cawbird-1.5-r1.ebuild | 66 +++++ net-im/cawbird/metadata.xml | 11 + net-im/coturn/Manifest | 4 +- net-im/coturn/coturn-4.5.2-r1.ebuild | 76 ++++++ net-im/coturn/coturn-4.5.2.ebuild | 76 ------ net-im/coturn/coturn-9999.ebuild | 8 +- net-im/ejabberd/Manifest | 12 +- net-im/ejabberd/ejabberd-20.04.ebuild | 294 --------------------- net-im/ejabberd/ejabberd-21.04-r2.ebuild | 245 ----------------- net-im/ejabberd/ejabberd-21.04.ebuild | 275 ------------------- net-im/ejabberd/ejabberd-21.12-r1.ebuild | 235 ++++++++++++++++ net-im/ejabberd/ejabberd-21.12.ebuild | 231 ---------------- ...rd-17.04-0002-Dont-overwrite-service-file.patch | 15 -- net-im/ejabberd/files/ejabberd.tmpfiles.conf | 2 - net-im/ejabberd/metadata.xml | 1 - net-im/pidgin/Manifest | 1 + net-im/pidgin/pidgin-2.14.8-r1.ebuild | 291 ++++++++++++++++++++ net-im/rocketchat-desktop-bin/Manifest | 4 +- .../rocketchat-desktop-bin-3.7.9.ebuild | 54 ---- .../rocketchat-desktop-bin-3.8.0.ebuild | 54 ++++ net-im/telegram-desktop/Manifest | 6 +- .../telegram-desktop-3.5.2-r1.ebuild | 2 +- .../telegram-desktop/telegram-desktop-3.6.0.ebuild | 163 ------------ .../telegram-desktop/telegram-desktop-3.6.1.ebuild | 163 ++++++++++++ net-im/zoom/Manifest | 6 +- net-im/zoom/zoom-5.10.0.2450-r2.ebuild | 179 +++++++++++++ net-im/zoom/zoom-5.8.6.739.ebuild | 160 ----------- net-im/zoom/zoom-5.9.3.1911.ebuild | 162 ------------ 30 files changed, 1096 insertions(+), 1703 deletions(-) create mode 100644 net-im/cawbird/Manifest create mode 100644 net-im/cawbird/cawbird-1.5-r1.ebuild create mode 100644 net-im/cawbird/metadata.xml create mode 100644 net-im/coturn/coturn-4.5.2-r1.ebuild delete mode 100644 net-im/coturn/coturn-4.5.2.ebuild delete mode 100644 net-im/ejabberd/ejabberd-20.04.ebuild delete mode 100644 net-im/ejabberd/ejabberd-21.04-r2.ebuild delete mode 100644 net-im/ejabberd/ejabberd-21.04.ebuild create mode 100644 net-im/ejabberd/ejabberd-21.12-r1.ebuild delete mode 100644 net-im/ejabberd/ejabberd-21.12.ebuild delete mode 100644 net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch delete mode 100644 net-im/ejabberd/files/ejabberd.tmpfiles.conf create mode 100644 net-im/pidgin/pidgin-2.14.8-r1.ebuild delete mode 100644 net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.9.ebuild create mode 100644 net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.0.ebuild delete mode 100644 net-im/telegram-desktop/telegram-desktop-3.6.0.ebuild create mode 100644 net-im/telegram-desktop/telegram-desktop-3.6.1.ebuild create mode 100644 net-im/zoom/zoom-5.10.0.2450-r2.ebuild delete mode 100644 net-im/zoom/zoom-5.8.6.739.ebuild delete mode 100644 net-im/zoom/zoom-5.9.3.1911.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index a435f74c290f..852106375f79 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/cawbird/Manifest b/net-im/cawbird/Manifest new file mode 100644 index 000000000000..361159e7bf85 --- /dev/null +++ b/net-im/cawbird/Manifest @@ -0,0 +1,3 @@ +DIST cawbird-1.5.tar.gz 675527 BLAKE2B d94bf61faba01fc1159fabbf0da24ab49a697112ccd5bb631133c21f52ffe29e9ede214c9eccf553cbbb039b08e487467e4ecc56d0e0ef63f68d4c23d39414aa SHA512 917480ac79606a1ab572f0837fd48e100bbb6d70ad3551a8d86486843d9bfb0e4814c75c56ff0e2aa41fd7d32a614bbff4e6121831b3da7da7614fb5a0d3f6e1 +EBUILD cawbird-1.5-r1.ebuild 1357 BLAKE2B 21e0cbbbc8667d56ae263780a21f7ae4abef9ecc4e9881fe20e5726b04dea5f404757c820c23a7e94b2c2ac423994881854a223c9065e9fc4a9a69b2db74a71f SHA512 e30f1ba05839dd9a09c5f5fd2617f7fb692ac798ef90eb8e4185ecf53ad49e70b35514e06b6f4a0e75ebc076d76e18b5174bf205cc44283021ce6ff17ba067fb +MISC metadata.xml 324 BLAKE2B f548750610b0b02bf35efb78ee01ef1d2d7a68d65d9d1e88b29639ad576b139fecd3d8b40a2c9ff88f4613a1b6e8fea28efccfcdbc6e83d32855c4414ede7728 SHA512 4aed49f42c279faf8c819e1a1cb1bf0aad5ccd46de295fff062734e68f98aee1cdc96f383a3c45a452fb7cf9e344ddde1f33e3b9287535fec1edfb4f710d6a8a diff --git a/net-im/cawbird/cawbird-1.5-r1.ebuild b/net-im/cawbird/cawbird-1.5-r1.ebuild new file mode 100644 index 000000000000..f7f08d155805 --- /dev/null +++ b/net-im/cawbird/cawbird-1.5-r1.ebuild @@ -0,0 +1,66 @@ +# 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-meta[ffmpeg,http,X] ) + spell? ( app-text/gspell:=[vala] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + $(vala_depend) + virtual/pkgconfig +" + +src_prepare() { + default + vala_setup +} + +src_configure() { + local emesonargs=( + # these keys are taken from the readme of cawbird + -Dconsumer_key_base64='VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==' + -Dconsumer_secret_base64='MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=' + -Dexamples=false + $(meson_use spell spellcheck) + $(meson_use gstreamer video) + -Dx11=true + ) + meson_src_configure +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/net-im/cawbird/metadata.xml b/net-im/cawbird/metadata.xml new file mode 100644 index 000000000000..d1905ebb02b4 --- /dev/null +++ b/net-im/cawbird/metadata.xml @@ -0,0 +1,11 @@ + + + + + matthew@gentoo.org + Matthew Smith + + + IBBoard/cawbird + + diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest index f3a95ce1af2c..c8e419557e39 100644 --- a/net-im/coturn/Manifest +++ b/net-im/coturn/Manifest @@ -3,6 +3,6 @@ AUX coturn.service 470 BLAKE2B 21b1cc005b5b91a8cb80b05a45afc16d73ad88e5b0a851294 AUX logrotate.coturn 345 BLAKE2B 26edd2ad44d947bf943757fb3e3255cafea64fac5d495402bbc3a7088ed6ffd822cc8f07010669f9faf856eb8a893d9ba9ab48d4b417f8c3fd27772ffb71cae0 SHA512 ebfadc7e6435061b7120baffce76a65c224768ab85e59e3b8cd140e394fa6e4eaa258eccce76f3152fd6a1adab0c84e39feb51663c76359401e04df4d8db2c1d AUX turnserver.init 633 BLAKE2B 78da89afc2be30bac969bb2a393d454d32ba77e199f2ccb5e34557ce34cf3a242402210afe6e30400b4a47ef9dc7880cded44a1932f7769f21f4143261a3569e SHA512 3b86b2186499c96ec0cfd3a124ea058a622c21cc870e079414f6055f7ba85830a5b85c424c809c010144f9270fcada80ef20bcab4cbc9c7fe0949b24fef02b59 DIST coturn-4.5.2.tar.gz 442745 BLAKE2B c18d5f5cfedd600875c0bfa08b874ef6316a5aa9af34c27e2901825da412b794d437e08f0706f9651bdf6d3d19e151486af39a42f2326c7ab6bb802d33fd0ba4 SHA512 00e86a3a273a8e4e69deaefd338bdd6c44739a807f21a72a2d68efc089053e16efd1d5b34b0c6dea7a0fa2b66f70821d8c3e1107561e1f08dfac2c93933a6121 -EBUILD coturn-4.5.2.ebuild 2194 BLAKE2B f2beeea9270851ec33b4a1c28151dea494998f1cd04da288796e8c86d0fa29b76ff72f810f5409c2f45c55592f6de7d152c70a22d756ab56677325294eac7bbd SHA512 3f27c40e27614d0272f681e11bc5882495dfe7bfefd96298bcead707d081310e3ffb22403ae1a49bc38b6d734621b7774ef502666a545858c2cf44daf24551b8 -EBUILD coturn-9999.ebuild 2201 BLAKE2B 11b741a774240b20e58d98e9ba8eb65b8ced1058cc526818946ad9b2b879ff6a00472c77605a3a80e36eb414f7ae58879ffb0fc7e7cbb54b8dbc5b0f399d2486 SHA512 1111bb530147683d5419a132cfdbe396d26252761b0086f11465bb8c9c81afe09ef468fb024f6d15d5fae2c6c0fa84a8df27bd109210d3e403b3e426b48d0ada +EBUILD coturn-4.5.2-r1.ebuild 2200 BLAKE2B 38032e1b8dc5a675cb571a39b3163310c37a859b30e0da9e127ee98850d887b273b4fe510588cc1f517bc1f41cdc0e40546ecce41a2d00ca6d8491d83d494b5b SHA512 db86075f9d5eb20191880496c9fc4ed483031638fef2cf35ab08baa3b621fc2f3e00d78f3b014aa8f7df0acc2e207eccb264e046afbf296b82912be6e4c73dbd +EBUILD coturn-9999.ebuild 2207 BLAKE2B bf6f18e15176d185d60983d84c0c19ec32d60f0426e13f449d8d1aceba9fa64d860749b958d2b3e23cda3fa0a884d4f101e27f7f61c6731d1b7d0810cb53a4a2 SHA512 c7de60a0b5f5af1c9edf1ccff8c9a6a26a012f92c4b041a8b2767e9a3d214e794f100cd6cd49c9d9b350c13b8243c1d3386817b685cd1bdc38486a825a58ce1f MISC metadata.xml 498 BLAKE2B 59313fc116427a965c6b1583f6d0832d52da36ef4e9e62d1ed2039cd750281e82679d351f960dbff0ec9077d8c6f4bc44a2aba237748aea668f2237fa4ffdfbf SHA512 23c885a01456773028feab711122e844a61022b6c2aae440c41f5def70a504ac0842c1a3ef43349d248011e1256e7dde37516d13dac36435a6c8d8b972e4319f diff --git a/net-im/coturn/coturn-4.5.2-r1.ebuild b/net-im/coturn/coturn-4.5.2-r1.ebuild new file mode 100644 index 000000000000..37dde1c42c28 --- /dev/null +++ b/net-im/coturn/coturn-4.5.2-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd tmpfiles +DESCRIPTION="coturn TURN server project" +HOMEPAGE="https://github.com/coturn/coturn" + +if [ ${PV} = 9999 ]; then + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" + inherit git-r3 + DEPEND="dev-vcs/git" +# S="${WORKDIR}/${PN}-master" +else + KEYWORDS="~amd64 ~x86" + 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 + acct-user/turnserver + >dev-libs/libevent-2.1.8:= + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:* ) + redis? ( dev-libs/hiredis:= ) + sqlite? ( dev-db/sqlite )" + +DEPEND="${RDEPEND}" + +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 + 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 /etc/turnserver.conf.default to" + elog "/etc/turnserver.conf and do your settings there." +} diff --git a/net-im/coturn/coturn-4.5.2.ebuild b/net-im/coturn/coturn-4.5.2.ebuild deleted file mode 100644 index a183b67dbeae..000000000000 --- a/net-im/coturn/coturn-4.5.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd tmpfiles -DESCRIPTION="coturn TURN server project" -HOMEPAGE="https://github.com/coturn/coturn" - -if [ ${PV} = 9999 ]; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 - DEPEND="dev-vcs/git" -# S="${WORKDIR}/${PN}-master" -else - KEYWORDS="~amd64 ~x86" - 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 - acct-user/turnserver - >dev-libs/libevent-2.1.8 - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - redis? ( dev-libs/hiredis ) - sqlite? ( dev-db/sqlite )" - -DEPEND="${RDEPEND}" - -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 - 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 /etc/turnserver.conf.default to" - elog "/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 4830d0550d0b..4f65686782b4 100644 --- a/net-im/coturn/coturn-9999.ebuild +++ b/net-im/coturn/coturn-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,11 +21,11 @@ SLOT="0" IUSE="mongodb mysql postgres redis sqlite" RDEPEND="acct-group/turnserver acct-user/turnserver - >dev-libs/libevent-2.1.8 + >dev-libs/libevent-2.1.8:= mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c ) + mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) - redis? ( dev-libs/hiredis ) + redis? ( dev-libs/hiredis:= ) sqlite? ( dev-db/sqlite )" DEPEND="${RDEPEND}" diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index 95c712d11cf4..ee0df6e66aba 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,16 +1,10 @@ AUX adjust-ejabberd.service.template-to-Gentoo.patch 1088 BLAKE2B 38405d4fa1119a8eca09fb22c1055182e7dfc5f4ce89440382694ba4da2bebf85934bde40204884e777343276448a8d7f256ae795db0c61e02ae82a8021116af SHA512 6c1417d40c17951c8187a4df72fbd755a4b408405a23aaed879e6cd7c01d4df0b7c52f3b8f64c2950f3a3d9996dfc4b29e77ebc5f035d5b13ab5c741c24038b6 -AUX ejabberd-17.04-0002-Dont-overwrite-service-file.patch 470 BLAKE2B 0dd597eaa63ccedafbb5c2903f948cc078c4951c551f76827f66198b4a25ac71f81dfaa36a0e0f443a8567c5d4309d00bc7ed59732a945dd0696d08edea5189f SHA512 a6b38ae82a0fe5d5d643eb2a122921aff3a9701381f6162213cee11b4950bdb9f16add78465a01eb6df5824dfa4ba2adae6dc0451749f76eefd224f5f97b8b01 AUX ejabberd-19.08-ejabberdctl.patch 1238 BLAKE2B 04b4317661afb77525b3d09fc2b1499faeb8ba49f32971f5302e64849808d7da21530d351aa728790e00cef076b8d679d1ca2ebb39e72d999ba3e628637ba00f SHA512 34e3aaecae83b8c00998dec3c8f26389a00af4aebf59592dcc0fa0afb917fbe33b057e83b38d3f5c24dad9e877d0a02c6b14a6d3396a6549e98e372fc293e9be AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb AUX ejabberd.initd 1071 BLAKE2B 226a0d4593df3504e30fbf40e9daffed6d903cf797b4ce0ce19b23ed29059d52a4e43d9f94354f6a1724966413cff7dcf0c13a4ede7dd2fff0da405c59bf8f39 SHA512 64839da9c369bf570389e95b0b1b67e1c4b339927c2f1fd4ca113a18410deb3fbe1ecdd41bb46df3d3b52b38149218dfe26b798ff43398151f08799566515352 AUX ejabberd.logrotate 203 BLAKE2B f523a30cf927d403523f618a6ab28fe4281a95ce6a1e639b4075b0ce98a8a985deec5446655c41288258a286a1ceb46cb64422be554d1de754fd97fc86e67555 SHA512 53cead768a76d18c01b229d0a1c0f38561c7a872fd751f1bb9b427c107f36a5536654a0047c5aef05507223f75c0e0f91e9a83b6c283fb9eceb8e31938de00d2 -AUX ejabberd.tmpfiles.conf 78 BLAKE2B d516116f500baf9972b4bdee069ab9930bcc8aa309de4d25a38c93bfa82ac216211341d047078eed1346a39f327d856e8e9021e87d4c63ea9b26c0d581a0e2a0 SHA512 21953448f1695cf6b45d2eccf2eca7611d45c8407759fcc62b347afd22a4f25b79514275e18c473debc8070345b25bb49e1457e10bc37766f0590cb70f7f0230 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449 -DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca -DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579 DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c -EBUILD ejabberd-20.04.ebuild 9084 BLAKE2B eaf5b71f770f15df5697b52aafcd06c45f7f23ceae80e488bb9d815a2b6996349470541b6d4dc94bf1a98d2f78733f39236263dd6bec70a852ee800d1f9af994 SHA512 963b849ffb6d2a6879777205a7bc84349fb379eb00b8afbd4d574c77fa276246e943c92598bfeba0badfe0a7b92e4b07c6357e0b91ca7cb49cce90c1b8653d60 -EBUILD ejabberd-21.04-r2.ebuild 7518 BLAKE2B fd8b91125137ce9317ee54bacddadda34178128c1f34984aeec826e3cb5f5d2b3e2695966bb89a6f6490a4a5fe212d96e7d4b8e195b71bac5cbf931745cdf5af SHA512 8a5589b0e14c66e32ecc23643c5cd609ea883b1e0d87d32a23c936475e649f95b8d1eebcc626dfe856f284bfb6521d4345a14b47d2cc0cb29956fed17c1be5a9 -EBUILD ejabberd-21.04.ebuild 8513 BLAKE2B d6f4f4b124f0adadf319caedbf6fe29f63423c8a1b204f9e7577f8b2752264cd754682b7ea61ada493326c41dee9d2b77f819d833a4b9179cc6f4686924ce752 SHA512 606f72c427143783f2f0555c2aca330fff0c8e10dee3e6c1c267f537d8eebaaf7ac4a6ef723e3e8cbfe900bc9b8fe91529268b08f19ecfda43e54317472ea8f2 -EBUILD ejabberd-21.12.ebuild 6993 BLAKE2B a36c94f7b9bd08479b678c43cb881a086bfe36245028ab68afea96441b8a9db54a0d919e099d3d72d337b5a5d38c8e78a078d2114299121b6d373c4909e1b90c SHA512 2fdfe51005e975228fae04eeb7bbb15d12500885321af3bcefa69a3dedbf215db3ca56268e4cb58be0203cae43b78a7e9dd3e0832acaced05a361f26d966d7ee -MISC metadata.xml 1517 BLAKE2B 5db739eeebcfcb1be6ee3fe281e40bbd3f98943c26910247fce1d491f6300b6c5e1814906838b846a2716b2a50bc8ed26219db49cd1101a9263e23d607d5afdb SHA512 a1856f7fea3d1add4503f1c3b92c6318bbfce0946f44d8e18c44be98d11e814bf56d73b626ee825787871a5adc834541853c7350709ef8204182fafd6dec1710 +DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1 +EBUILD ejabberd-21.12-r1.ebuild 7369 BLAKE2B 66110d244c7f54eab73be0a34b02be5e3cd6f754e5a19fbe4d4e784973cc3174443f4f390c191f5e42dde24601f553a827def643c00de82e88db56d05f8bc294 SHA512 cdcb08aed7802b5ab13bba4c10671552c6b35290ffcbbd9ba1365d748a1023cdeef1f20c9c8d8e703b5e8042d25f31fedbd20ad8e0d6b772aa382eb36caa01fe +MISC metadata.xml 1446 BLAKE2B 0e3200841024d54c2a47184239ba3266ebd3cecb22e51d16d0d98c2e07ec592b9d87c27ae0d9a01f9260aa6132e565ecadf8109948e5a317af8937f321338c2c SHA512 05d59e6213d8408197706db55f3ff35bdd93717872e85a58f34dd26d4edcef1704d195b87a62b215862f53d4bf7cdf98081267e96efb3b5b73b20b0235a0be32 diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild deleted file mode 100644 index 90c657f64b01..000000000000 --- a/net-im/ejabberd/ejabberd-20.04.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit eutils pam rebar ssl-cert systemd tmpfiles - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz - -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis - roster-gw sip sqlite +stun zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/luerl-0.3 -# TODO: ) -DEPEND=">=dev-lang/erlang-19.3[hipe(-)?,odbc?,ssl] - >=dev-erlang/cache_tab-1.0.22 - >=dev-erlang/eimp-1.0.14 - >=dev-erlang/fast_tls-1.1.5 - >=dev-erlang/fast_xml-1.1.40 - >=dev-erlang/fast_yaml-1.0.24 - >=dev-erlang/yconf-1.0.4 - >=dev-erlang/jiffy-1.0.1 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.6 - >=dev-erlang/p1_utils-1.0.18 - >=dev-erlang/stringprep-1.0.19 - >=dev-erlang/xmpp-1.4.6 - >=dev-erlang/pkix-1.0.5 - >=dev-erlang/mqtree-1.0.7 - >=dev-erlang/idna-6.0.0 - >=dev-erlang/p1_acme-1.0.5 - >=dev-erlang/base64url-1.0 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.14 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.7 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.9 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.32 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.6 ) - stun? ( >=dev-erlang/stun-1.0.32 ) - zlib? ( >=dev-erlang/ezlib-1.0.7 )" -RDEPEND="${DEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] )" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch") - -EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" -# Paths in net-im/jabber-base -JABBER_ETC="${EPREFIX}/etc/jabber" -JABBER_LOG="${EPREFIX}/var/log/jabber" -JABBER_SPOOL="${EPREFIX}/var/spool/jabber" - -# Adjust example configuration file to Gentoo. -# - Use our sample certificate. -adjust_config() { - sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' - sed -re 's/^#\s+(certfiles)/\1/' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' -} - -# Set paths to ejabberd lib directory consistently to point always to directory -# suffixed with version. -correct_ejabberd_paths() { - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' -} - -# Get epam-wrapper from 'files' directory and correct path to lib directory in -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper -# file exists there already. -customize_epam_wrapper() { - local epam_wrapper_src="$1" - local epam_wrapper_dst="${S}/epam-wrapper" - - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' -} - -# Check if we are missing a default certificate. -ejabberd_cert_missing() { - if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then - if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then - # default certificate is present in config and exists - not installing - return 1 - else - # default certificate is present in config - # but doesn't exist - need to install one - return 0 - fi - fi - # no default certificate in config - not installing - return 1 -} - -# Generate and install sample ejabberd certificate. It's installed into -# EJABBERD_CERT path. -ejabberd_cert_install() { - SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" - install_cert "${EJABBERD_CERT%.*}" - chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die - chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die -} - -# Get path to ejabberd lib directory. -# -# This is the path ./configure script Base for this path is path set in -# ./configure script which is /usr/lib by default. If libdir is explicitely set -# to something else than this should be adjusted here as well. -get_ejabberd_path() { - echo "/usr/$(get_libdir)/${P}" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!g' \ - -e 's!^(User|Group)=(.*)!\1=jabber!' \ - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \ - -e '/^After=/ a Requires=epmd.service' \ - "${PN}.service.template" >"${PN}.service" \ - || die 'failed to make ejabberd.service' -} - -# Set paths to defined by net-im/jabber-base. -set_jabberbase_paths() { - sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ - -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ - -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set paths in Makefile.in' - sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \ - -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \ - -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set paths ejabberdctl.template' -} - -# Skip installing docs because it's only COPYING that's installed by Makefile. -skip_docs() { - gawk -i inplace ' -/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ { - if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) { - print $0; - } else { - next; - } -} -1 -' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in' -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - set_jabberbase_paths - make_ejabberd_service - skip_docs - adjust_config - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - rebar_fix_include_path fast_xml - rebar_fix_include_path p1_utils - rebar_fix_include_path xmpp - - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory - # rather than its parent which is default. That way ejabberd directory - # takes precedence is module lookup. - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ERL_LIBS in ejabberdctl.template' - - sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \ - -i configure.ac || die "Failed to write correct version to configure" - # eautoreconf # required in case of download from github -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-user=jabber \ - --disable-system-deps \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable hipe) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable sip) \ - $(use_enable stun) \ - $(use_enable zlib) - - # more options to support - # --enable-elixir requires https://github.com/elixir-lang/elixir -} - -src_compile() { - emake REBAR='rebar -v' src -} - -src_install() { - default - - keepdir /var/lib/lock/ejabberdctl - rm -rf "${ED%/}/var/log" || die - rm -rf "${ED%/}/var/spool" || die - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account || die "cannot create pam.d file" - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_preinst() { - if use pam; then - einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # . - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam jabber || die - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - fi - if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then - ewarn If you are updating from an older version like 17.x - ewarn you may need to add an access_rules section to your - ewarn ejabberd.yml config file. - ewarn Otherwise authentication will be broken and users - ewarn will not be able to log in. - echo - fi - - if ejabberd_cert_missing; then - ejabberd_cert_install - fi -} diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild b/net-im/ejabberd/ejabberd-21.04-r2.ebuild deleted file mode 100644 index d8911b3b288c..000000000000 --- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis - roster-gw selinux sip sqlite +stun zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/luerl-0.3 -# TODO: ) -DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.28 - >=dev-erlang/eimp-1.0.20 - >=dev-erlang/fast_tls-1.1.12 - >=dev-erlang/fast_xml-1.1.46 - >=dev-erlang/fast_yaml-1.0.31 - >=dev-erlang/yconf-1.0.11 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.9 - >=dev-erlang/p1_utils-1.0.22 - >=dev-erlang/stringprep-1.0.25 - >=dev-erlang/xmpp-1.5.3 - >=dev-erlang/pkix-1.0.7 - >=dev-erlang/mqtree-1.0.13 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.12 - >=dev-erlang/base64url-1.0.1 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.18 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.10 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.11 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.42 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.12 ) - stun? ( >=dev-erlang/stun-1.0.43 ) - zlib? ( >=dev-erlang/ezlib-1.0.9 )" -RDEPEND="${DEPEND} - acct-user/ejabberd - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch") - -# Set paths to ejabberd lib directory consistently to point always to directory -# suffixed with version. -correct_ejabberd_paths() { - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' -} - -# Get epam-wrapper from 'files' directory and correct path to lib directory in -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper -# file exists there already. -customize_epam_wrapper() { - local epam_wrapper_src="${1}" - local epam_wrapper_dst="${S}/epam-wrapper" - - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' -} - -# Get path to ejabberd lib directory. -# -# This is the path ./configure script Base for this path is path set in -# ./configure script which is /usr/lib by default. If libdir is explicitely set -# to something else than this should be adjusted here as well. -get_ejabberd_path() { - echo "/usr/$(get_libdir)/${P}" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!g' \ - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \ - -e '/^After=/ a Requires=epmd.service' \ - "${PN}.service.template" >"${PN}.service" \ - || die 'failed to make ejabberd.service' -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - make_ejabberd_service - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - rebar_fix_include_path fast_xml - rebar_fix_include_path p1_utils - rebar_fix_include_path xmpp - - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory - # rather than its parent which is default. That way ejabberd directory - # takes precedence is module lookup. - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ERL_LIBS in ejabberdctl.template' -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --localstatedir="${EPREFIX}/var" \ - --enable-user=${PN} \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable sip) \ - $(use_enable stun) \ - $(use_enable zlib) - - # more options to support - # --enable-elixir requires https://github.com/elixir-lang/elixir -} - -src_compile() { - emake REBAR='rebar -v' src -} - -src_install() { - default - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - # /var/lock/ejabberdctl is unused, see - # https://github.com/processone/ejabberd/pull/3724 - rmdir "${ED}/var/lock/ejabberdctl" || die - rmdir "${ED}/var/lock" || die - - 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 - # . - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam ejabberd || die - fi -} - -pkg_postinst() { - local migrate_to_ejabberd_user=false - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - else - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 21.04-r1; then - migrate_to_ejabberd_user=true - break - fi - done - fi - - # Sarting with >=21.04-r1, the ejabberd configuration is now in - # /etc/ejabberd and no longer in /etc/jabber. See if we need to - # migrate the configuration. Furthermore, ejabberd no longer runs - # under the, shared via net-im/jabber-base, 'jabber' use, but under - # its own user. This increase isolation and hence robustness and - # security. - if $migrate_to_ejabberd_user; then - 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 - - 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 where copied to /etc/ejabberd." - ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." - ewarn "Please check your configuration." - fi -} diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild b/net-im/ejabberd/ejabberd-21.04.ebuild deleted file mode 100644 index 245c006f1141..000000000000 --- a/net-im/ejabberd/ejabberd-21.04.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SSL_CERT_MANDATORY=1 - -inherit pam rebar ssl-cert systemd tmpfiles - -DESCRIPTION="Robust, scalable and extensible XMPP server" -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" -SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz - -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis - roster-gw selinux sip sqlite +stun zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/luerl-0.3 -# TODO: ) -DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.28 - >=dev-erlang/eimp-1.0.20 - >=dev-erlang/fast_tls-1.1.12 - >=dev-erlang/fast_xml-1.1.46 - >=dev-erlang/fast_yaml-1.0.31 - >=dev-erlang/yconf-1.0.11 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.9.0 - >=dev-erlang/lager-3.6.10 - >=dev-erlang/p1_oauth2-0.6.9 - >=dev-erlang/p1_utils-1.0.22 - >=dev-erlang/stringprep-1.0.25 - >=dev-erlang/xmpp-1.5.3 - >=dev-erlang/pkix-1.0.7 - >=dev-erlang/mqtree-1.0.13 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.12 - >=dev-erlang/base64url-1.0.1 - >=net-im/jabber-base-0.01 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.18 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.10 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.11 ) - redis? ( >=dev-erlang/eredis-1.0.8 ) - sip? ( >=dev-erlang/esip-1.0.42 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.12 ) - stun? ( >=dev-erlang/stun-1.0.43 ) - zlib? ( >=dev-erlang/ezlib-1.0.9 )" -RDEPEND="${DEPEND} - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch") - -EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" -# Paths in net-im/jabber-base -JABBER_ETC="${EPREFIX}/etc/jabber" -JABBER_LOG="${EPREFIX}/var/log/jabber" -JABBER_SPOOL="${EPREFIX}/var/spool/jabber" - -# Adjust example configuration file to Gentoo. -# - Use our sample certificate. -adjust_config() { - sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' - sed -re 's/^#\s+(certfiles)/\1/' \ - -i "${S}/ejabberd.yml.example" \ - || die 'failed to adjust example config' -} - -# Set paths to ejabberd lib directory consistently to point always to directory -# suffixed with version. -correct_ejabberd_paths() { - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' -} - -# Get epam-wrapper from 'files' directory and correct path to lib directory in -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper -# file exists there already. -customize_epam_wrapper() { - local epam_wrapper_src="${1}" - local epam_wrapper_dst="${S}/epam-wrapper" - - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' -} - -# Check if we are missing a default certificate. -ejabberd_cert_missing() { - if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then - if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then - # default certificate is present in config and exists - not installing - return 1 - else - # default certificate is present in config - # but doesn't exist - need to install one - return 0 - fi - fi - # no default certificate in config - not installing - return 1 -} - -# Generate and install sample ejabberd certificate. It's installed into -# EJABBERD_CERT path. -ejabberd_cert_install() { - SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" - install_cert "${EJABBERD_CERT%.*}" - chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die - chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die -} - -# Get path to ejabberd lib directory. -# -# This is the path ./configure script Base for this path is path set in -# ./configure script which is /usr/lib by default. If libdir is explicitely set -# to something else than this should be adjusted here as well. -get_ejabberd_path() { - echo "/usr/$(get_libdir)/${P}" -} - -# Make ejabberd.service for systemd from upstream provided template. -make_ejabberd_service() { - sed -r \ - -e 's!@ctlscriptpath@!/usr/sbin!g' \ - -e 's!^(User|Group)=(.*)!\1=jabber!' \ - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \ - -e '/^After=/ a Requires=epmd.service' \ - "${PN}.service.template" >"${PN}.service" \ - || die 'failed to make ejabberd.service' -} - -# Set paths to defined by net-im/jabber-base. -set_jabberbase_paths() { - sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ - -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ - -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set paths in Makefile.in' - sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \ - -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \ - -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set paths ejabberdctl.template' -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - set_jabberbase_paths - make_ejabberd_service - adjust_config - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - rebar_fix_include_path fast_xml - rebar_fix_include_path p1_utils - rebar_fix_include_path xmpp - - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory - # rather than its parent which is default. That way ejabberd directory - # takes precedence is module lookup. - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ERL_LIBS in ejabberdctl.template' -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-user=jabber \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable sip) \ - $(use_enable stun) \ - $(use_enable zlib) - - # more options to support - # --enable-elixir requires https://github.com/elixir-lang/elixir -} - -src_compile() { - emake REBAR='rebar -v' src -} - -src_install() { - default - - keepdir /var/lib/lock/ejabberdctl - rm -rf "${ED%/}/var/log" || die - rm -rf "${ED%/}/var/spool" || die - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" -} - -pkg_preinst() { - if use pam; then - einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # . - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam jabber || die - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - fi - if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then - ewarn If you are updating from an older version like 17.x - ewarn you may need to add an access_rules section to your - ewarn ejabberd.yml config file. - ewarn Otherwise authentication will be broken and users - ewarn will not be able to log in. - echo - fi - - if ejabberd_cert_missing; then - ejabberd_cert_install - fi -} diff --git a/net-im/ejabberd/ejabberd-21.12-r1.ebuild b/net-im/ejabberd/ejabberd-21.12-r1.ebuild new file mode 100644 index 000000000000..51abb0f8f050 --- /dev/null +++ b/net-im/ejabberd/ejabberd-21.12-r1.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pam rebar systemd verify-sig + +DESCRIPTION="Robust, scalable and extensible XMPP server" +HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" +SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz + -> ${P}.tar.gz + verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +REQUIRED_USE="mssql? ( odbc )" +# TODO: Add 'tools' flag. +IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis + roster-gw selinux sip sqlite +stun zlib" + +RESTRICT="test" + +# TODO: Add dependencies for 'tools' flag enabled. +# TODO: tools? ( +# TODO: >=dev-erlang/luerl-0.3 +# TODO: ) +DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] + >=dev-erlang/cache_tab-1.0.29 + >=dev-erlang/eimp-1.0.21 + >=dev-erlang/fast_tls-1.1.13 + >=dev-erlang/fast_xml-1.1.48 + >=dev-erlang/fast_yaml-1.0.32 + >=dev-erlang/yconf-1.0.12 + >=dev-erlang/jiffy-1.0.5 + >=dev-erlang/jose-1.11.2 + >=dev-erlang/lager-3.9.1 + >=dev-erlang/p1_oauth2-0.6.10 + >=dev-erlang/p1_utils-1.0.23 + >=dev-erlang/stringprep-1.0.27 + >=dev-erlang/xmpp-1.5.6 + >=dev-erlang/pkix-1.0.8 + >=dev-erlang/mqtree-1.0.14 + >=dev-erlang/idna-6.0.0-r1 + >=dev-erlang/p1_acme-1.0.16 + >=dev-erlang/base64url-1.0.1 + ldap? ( =net-nds/openldap-2* ) + mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) + odbc? ( dev-db/unixODBC ) + pam? ( >=dev-erlang/epam-1.0.12 ) + postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) + redis? ( >=dev-erlang/eredis-1.2.0 ) + sip? ( >=dev-erlang/esip-1.0.45 ) + sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) + stun? ( >=dev-erlang/stun-1.0.47 ) + zlib? ( >=dev-erlang/ezlib-1.0.10 )" +RDEPEND="${DEPEND} + acct-user/ejabberd + captcha? ( media-gfx/imagemagick[truetype,png] ) + selinux? ( sec-policy/selinux-jabber ) +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" + +DOCS=( CHANGELOG.md README.md ) +PATCHES=( + "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" + "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" +) + +# Set paths to ejabberd lib directory consistently to point always to directory +# suffixed with version. +correct_ejabberd_paths() { + sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ + -i "${S}/Makefile.in" \ + || die 'failed to set ejabberd path in Makefile.in' + sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ejabberd path in ejabberdctl.template' +} + +# Get epam-wrapper from 'files' directory and correct path to lib directory in +# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper +# file exists there already. +customize_epam_wrapper() { + local epam_wrapper_src="${1}" + local epam_wrapper_dst="${S}/epam-wrapper" + + [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' + sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ + "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ + || die 'failed to install epam-wrapper' +} + +# Get path to ejabberd lib directory. +# +# This is the path ./configure script Base for this path is path set in +# ./configure script which is /usr/lib by default. If libdir is explicitely set +# to something else than this should be adjusted here as well. +get_ejabberd_path() { + echo "/usr/$(get_libdir)/${P}" +} + +src_prepare() { + default + + rebar_remove_deps + correct_ejabberd_paths + customize_epam_wrapper "${FILESDIR}/epam-wrapper" + + rebar_fix_include_path fast_xml + rebar_fix_include_path p1_utils + rebar_fix_include_path xmpp + + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory + # rather than its parent which is default. That way ejabberd directory + # takes precedence is module lookup. + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" + sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ + -i "${S}/ejabberdctl.template" \ + || die 'failed to set ERL_LIBS in ejabberdctl.template' +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --localstatedir="${EPREFIX}/var" \ + --enable-user=${PN} \ + $(use_enable debug) \ + $(use_enable full-xml) \ + $(use_enable mssql) \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable redis) \ + $(use_enable roster-gw roster-gateway-workaround) \ + $(use_enable sqlite) \ + $(use_enable sip) \ + $(use_enable stun) \ + $(use_enable zlib) + + # more options to support + # --enable-elixir requires https://github.com/elixir-lang/elixir +} + +src_compile() { + emake REBAR='rebar -v' src +} + +src_install() { + default + + if use pam; then + local epam_path="$(get_ejabberd_path)/priv/bin/epam" + + pamd_mimic_system xmpp auth account + into "$(get_ejabberd_path)/priv" + newbin epam-wrapper epam + fi + + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + systemd_dounit "${PN}.service" + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" "${PN}" + + keepdir /var/{lib,log}/ejabberd +} + +pkg_preinst() { + if use pam; then + einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \ + "authentication" + # See + # . + # epam binary is installed by dev-erlang/epam package, therefore SUID + # is set by that package. Instead of jabber group it uses epam group, + # therefore we need to add jabber user to epam group. + usermod -a -G epam ejabberd || die + fi +} + +pkg_postinst() { + local migrate_to_ejabberd_user=false + + if [[ ! ${REPLACING_VERSIONS} ]]; then + echo + elog "For configuration instructions, please see" + elog " https://docs.ejabberd.im/" + echo + else + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 21.04-r1; then + migrate_to_ejabberd_user=true + break + fi + done + fi + + # Sarting with >=21.04-r1, the ejabberd configuration is now in + # /etc/ejabberd and no longer in /etc/jabber. See if we need to + # migrate the configuration. Furthermore, ejabberd no longer runs + # under the, shared via net-im/jabber-base, 'jabber' use, but under + # its own user. This increase isolation and hence robustness and + # security. + if $migrate_to_ejabberd_user; then + ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd" + ewarn "(just as upstream) and *not* /etc/jabber." + ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd." + ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." + ewarn "Please check your configuration, and finish the migration by stopping ejabberd" + ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." + + local -A dirs_to_migrate=( + [/etc/jabber]=/etc/ejabberd + [/var/spool/jabber]=/var/lib/ejabberd + ) + + for src_dir in "${!dirs_to_migrate[@]}"; do + local eroot_src_dir="${EROOT}${src_dir}" + local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}" + + cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}" + + if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then + rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die + fi + if ! use prefix; then + chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die + fi + done + fi +} diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild b/net-im/ejabberd/ejabberd-21.12.ebuild deleted file mode 100644 index 2b533f549d33..000000000000 --- a/net-im/ejabberd/ejabberd-21.12.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" -REQUIRED_USE="mssql? ( odbc )" -# TODO: Add 'tools' flag. -IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis - roster-gw selinux sip sqlite +stun zlib" - -RESTRICT="test" - -# TODO: Add dependencies for 'tools' flag enabled. -# TODO: tools? ( -# TODO: >=dev-erlang/luerl-0.3 -# TODO: ) -DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] - >=dev-erlang/cache_tab-1.0.29 - >=dev-erlang/eimp-1.0.21 - >=dev-erlang/fast_tls-1.1.13 - >=dev-erlang/fast_xml-1.1.48 - >=dev-erlang/fast_yaml-1.0.32 - >=dev-erlang/yconf-1.0.12 - >=dev-erlang/jiffy-1.0.5 - >=dev-erlang/jose-1.11.1 - >=dev-erlang/lager-3.9.1 - >=dev-erlang/p1_oauth2-0.6.10 - >=dev-erlang/p1_utils-1.0.23 - >=dev-erlang/stringprep-1.0.27 - >=dev-erlang/xmpp-1.5.6 - >=dev-erlang/pkix-1.0.8 - >=dev-erlang/mqtree-1.0.14 - >=dev-erlang/idna-6.0.0-r1 - >=dev-erlang/p1_acme-1.0.16 - >=dev-erlang/base64url-1.0.1 - ldap? ( =net-nds/openldap-2* ) - mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) - odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.12 ) - postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) - redis? ( >=dev-erlang/eredis-1.2.0 ) - sip? ( >=dev-erlang/esip-1.0.45 ) - sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) - stun? ( >=dev-erlang/stun-1.0.47 ) - zlib? ( >=dev-erlang/ezlib-1.0.10 )" -RDEPEND="${DEPEND} - acct-user/ejabberd - captcha? ( media-gfx/imagemagick[truetype,png] ) - selinux? ( sec-policy/selinux-jabber ) -" - -DOCS=( CHANGELOG.md README.md ) -PATCHES=( - "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" - "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" -) - -# Set paths to ejabberd lib directory consistently to point always to directory -# suffixed with version. -correct_ejabberd_paths() { - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ - -i "${S}/Makefile.in" \ - || die 'failed to set ejabberd path in Makefile.in' - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ejabberd path in ejabberdctl.template' -} - -# Get epam-wrapper from 'files' directory and correct path to lib directory in -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper -# file exists there already. -customize_epam_wrapper() { - local epam_wrapper_src="${1}" - local epam_wrapper_dst="${S}/epam-wrapper" - - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ - || die 'failed to install epam-wrapper' -} - -# Get path to ejabberd lib directory. -# -# This is the path ./configure script Base for this path is path set in -# ./configure script which is /usr/lib by default. If libdir is explicitely set -# to something else than this should be adjusted here as well. -get_ejabberd_path() { - echo "/usr/$(get_libdir)/${P}" -} - -src_prepare() { - default - - rebar_remove_deps - correct_ejabberd_paths - customize_epam_wrapper "${FILESDIR}/epam-wrapper" - - rebar_fix_include_path fast_xml - rebar_fix_include_path p1_utils - rebar_fix_include_path xmpp - - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory - # rather than its parent which is default. That way ejabberd directory - # takes precedence is module lookup. - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ - -i "${S}/ejabberdctl.template" \ - || die 'failed to set ERL_LIBS in ejabberdctl.template' -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --localstatedir="${EPREFIX}/var" \ - --enable-user=${PN} \ - $(use_enable debug) \ - $(use_enable full-xml) \ - $(use_enable mssql) \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_enable pam) \ - $(use_enable postgres pgsql) \ - $(use_enable redis) \ - $(use_enable roster-gw roster-gateway-workaround) \ - $(use_enable sqlite) \ - $(use_enable sip) \ - $(use_enable stun) \ - $(use_enable zlib) - - # more options to support - # --enable-elixir requires https://github.com/elixir-lang/elixir -} - -src_compile() { - emake REBAR='rebar -v' src -} - -src_install() { - default - - if use pam; then - local epam_path="$(get_ejabberd_path)/priv/bin/epam" - - pamd_mimic_system xmpp auth account - into "$(get_ejabberd_path)/priv" - newbin epam-wrapper epam - fi - - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${PN}.service" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - keepdir /var/{lib,log}/ejabberd -} - -pkg_preinst() { - if use pam; then - einfo "Adding ejabberd user to epam group to allow ejabberd to use PAM" \ - "authentication" - # See - # . - # epam binary is installed by dev-erlang/epam package, therefore SUID - # is set by that package. Instead of jabber group it uses epam group, - # therefore we need to add jabber user to epam group. - usermod -a -G epam ejabberd || die - fi -} - -pkg_postinst() { - local migrate_to_ejabberd_user=false - - if [[ ! ${REPLACING_VERSIONS} ]]; then - echo - elog "For configuration instructions, please see" - elog " https://docs.ejabberd.im/" - echo - else - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 21.04-r1; then - migrate_to_ejabberd_user=true - break - fi - done - fi - - # Sarting with >=21.04-r1, the ejabberd configuration is now in - # /etc/ejabberd and no longer in /etc/jabber. See if we need to - # migrate the configuration. Furthermore, ejabberd no longer runs - # under the, shared via net-im/jabber-base, 'jabber' use, but under - # its own user. This increase isolation and hence robustness and - # security. - if $migrate_to_ejabberd_user; then - 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 - - 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 where copied to /etc/ejabberd." - ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." - ewarn "Please check your configuration." - fi -} diff --git a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch b/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch deleted file mode 100644 index 2bea750ef04e..000000000000 --- a/net-im/ejabberd/files/ejabberd-17.04-0002-Dont-overwrite-service-file.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index a0b4553d..4675b88a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -204,8 +204,8 @@ install: all copy-files - chmod 755 ejabberd.init - # - # Service script -- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \ -- > ejabberd.service -+ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \ -+ ejabberd.service.template > ejabberd.service - chmod 644 ejabberd.service - # - # Spool directory diff --git a/net-im/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf deleted file mode 100644 index 6a9cc9e61b7a..000000000000 --- a/net-im/ejabberd/files/ejabberd.tmpfiles.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /run/lock/ejabberdctl 0750 jabber jabber -d /run/ejabberd 0750 jabber jabber diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml index 787de61bb992..df085f63589b 100644 --- a/net-im/ejabberd/metadata.xml +++ b/net-im/ejabberd/metadata.xml @@ -12,7 +12,6 @@ Support for CAPTCHA Forms (XEP-158) on registration Use XML features in XMPP stream (ex: CDATA), requires XML compliant clients - Compile natively with HiPE, not recommended Enable Microsoft SQL Server support (via ODBC) for data storage Enable MySQL support for data storage diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 1065ab95f687..415ec76f68c9 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,5 +1,6 @@ AUX pidgin-2.14.8-libpurple_test_fix.patch 1895 BLAKE2B 2174772177ff0b906dc9dc90545469207e96671171e4f3b5bd60e361c935160362687b373aa89eacdd22c80bdb2291718a2e6165e628b7bb86b8f76f4f4c3da1 SHA512 9b328516173c8c81bc99c3045fc91c1cd99a4b74a26b37b93ba9ec2fbfb7560bcaf0c5b8890a8ee02bbb19052a774f608d9a4061eb9966f70e5b19cd1dc144eb DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf DIST pidgin-2.14.8.tar.bz2 8683281 BLAKE2B 757ae81cc17db61bb5d434920f230d18c25639179c0584346b2bc6f34620d5ef499fd564ded5bfb649cf619700bbfd7eab6a222fdaf0324903bb92d81f77d182 SHA512 23975501b07d14829edab7b92628703962d7a8f90849b303e2a765ec6e47d1fcbdeff62539811e26682e300a2f94520193369844de3b1c0e87f99721ca0255e6 +EBUILD pidgin-2.14.8-r1.ebuild 7635 BLAKE2B e5989009c4a6e797438ce49b56b6253b41c60495d68752e08cc5429004d15ecaabffcb6ef96dd8e1d02e307635d8f78de57a5f014b3da8b4b63465ab6859769f SHA512 70ba3ba4402d18abb5579622b63124a356277a1e9752ac4d5b0644bdbb2e38fbdfc1c1a31fa2b523f37636a9a7fc9ff90ae5294e90c89cf16d72054e621beb9c EBUILD pidgin-2.14.8.ebuild 7541 BLAKE2B 1a17044f45b46eeb68c2fdf5a26bc5108fdd04e80e2e48e9fbc962d2253de698f04fe3e18ac504250a50647e3537a7ebbf9f399f0a8fc3f6e3eb4463dc162d55 SHA512 c08924d8ae02003f8aaf69210207fddb31480ea1d7fd180841a1f011f7976efd4d7073c955b5d06f49d8500fb61ec54a74e7404673c9d8f0dbf2300d668993d0 MISC metadata.xml 1419 BLAKE2B 6b87c11749b1e15503eddb0d73d18ed264e86d8d8e515cd30ba6787117401f8f07ea5030accd5cbf86da7c059eaf4f4d2fa3ff5d0c2bf5db1f987f5f536ac448 SHA512 c7bc589c6ddd1fb628832105691f08555f0fd7e5578bd3c5905a6b082198c36a34f86182a8772b8e8aa14b75f2b99eeba99c2c77ef480f3d80fa199aa792067d diff --git a/net-im/pidgin/pidgin-2.14.8-r1.ebuild b/net-im/pidgin/pidgin-2.14.8-r1.ebuild new file mode 100644 index 000000000000..028282d415c0 --- /dev/null +++ b/net-im/pidgin/pidgin-2.14.8-r1.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{8..9} ) + +inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="https://pidgin.im/" +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.bz2 + https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch" + +LICENSE="GPL-2" +SLOT="0/2" # libpurple version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn +meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl +tk v4l +xscreensaver zephyr zeroconf" + +# dbus requires python to generate C code for dbus bindings (thus DEPEND only). +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is +# no way to build dbus and avoid libgnt linkage with python. If you want this +# send patch upstream. +# purple-url-handler and purple-remote require dbus-python thus in reality we +# rdepend on python if dbus enabled. But it is possible to separate this dep. +RDEPEND=" + >=dev-libs/glib-2.16 + >=dev-libs/libxml2-2.6.18 + dbus? ( + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-0.90 + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + ') + ) + 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= ) + 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} + gtk? ( + x11-base/xorg-proto + ${NLS_DEPEND} + ) + dbus? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + dev-lang/perl + dev-perl/XML-Parser + virtual/pkgconfig + doc? ( app-doc/doxygen ) + !gtk? ( nls? ( ${NLS_DEPEND} ) ) +" + +DOCS=( AUTHORS HACKING NEWS README ChangeLog ) + +REQUIRED_USE=" + dbus? ( ${PYTHON_REQUIRED_USE} ) + networkmanager? ( dbus ) + python? ( ${PYTHON_REQUIRED_USE} ) + v4l? ( gstreamer ) +" + +# Enable Default protocols +DYNAMIC_PRPLS="irc,jabber,simple" + +# List of plugins +# app-accessibility/pidgin-festival +# net-im/librvp +# x11-plugins/guifications +# x11-plugins/msn-pecan +# x11-plugins/pidgin-encryption +# x11-plugins/pidgin-extprefs +# x11-plugins/pidgin-hotkeys +# x11-plugins/pidgintex +# x11-plugins/pidgin-libnotify +# x11-plugins/pidgin-mbpurple +# x11-plugins/pidgin-bot-sentry +# x11-plugins/pidgin-otr +# x11-plugins/pidgin-rhythmbox +# x11-plugins/purple-plugin_pack +# x11-themes/pidgin-smileys +# x11-plugins/pidgin-knotify +# Plugins in Sunrise: +# x11-plugins/pidgin-audacious-remote +# x11-plugins/pidgin-autoanswer +# x11-plugins/pidgin-birthday-reminder +# x11-plugins/pidgin-blinklight +# x11-plugins/pidgin-convreverse +# x11-plugins/pidgin-embeddedvideo +# x11-plugins/pidgin-extended-blist-sort +# x11-plugins/pidgin-gfire +# x11-plugins/pidgin-lastfm +# x11-plugins/pidgin-sendscreenshot +# x11-plugins/pidgimpd + +PATCHES=( + "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286 + "${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" + elog "will be built." + fi + + # dbus is enabled, no way to disable linkage with python => python is enabled + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" + if use gtk && ! use nls ; then + ewarn "gtk build => nls is enabled!" + fi + if use dbus && ! use python ; then + elog "dbus is enabled, no way to disable linkage with python => python is enabled" + fi +} + +pkg_setup() { + if use python || use dbus ; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + xdg_src_prepare + eautoreconf +} + +src_configure() { + # Stabilize things, for your own good + strip-flags + replace-flags -O? -O2 + use pie && append-cflags -fPIE -pie + + use gadu && DYNAMIC_PRPLS+=",gg" + use groupwise && DYNAMIC_PRPLS+=",novell" + use meanwhile && DYNAMIC_PRPLS+=",sametime" + use zephyr && DYNAMIC_PRPLS+=",zephyr" + use zeroconf && DYNAMIC_PRPLS+=",bonjour" + + local myconf=( + --disable-mono + --disable-static + --with-dynamic-prpls="${DYNAMIC_PRPLS}" + --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" + --x-includes="${EPREFIX}"/usr/include/X11 + $(use_enable dbus) + $(use_enable debug) + $(use_enable doc doxygen) + $(use_enable gstreamer) + $(use_enable gtk gtkui) + $(use_enable gtk sm) + $(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 v4l farstream) + $(use_enable v4l gstreamer-video) + $(use_enable v4l vv) + $(use_enable zeroconf avahi) + $(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 + einfo "Disabling NSS, using GnuTLS" + myconf+=( + --enable-gnutls=yes + --enable-nss=no + --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" + --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" + ) + else + einfo "Disabling GnuTLS, using NSS" + myconf+=( + --enable-gnutls=no + --enable-nss=yes + ) + fi + + if use dbus || { use ncurses && use python ; } ; then + myconf+=( --with-python3=${PYTHON} ) + else + myconf+=( --without-python3 ) + fi + + econf "${myconf[@]}" +} + +src_install() { + # setting this here because we no longer use gnome2.eclass + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" + default + + if use gtk ; then + # Fix tray paths for e16 (x11-wm/enlightenment) and other + # implementations that are not compliant with new hicolor theme yet, #323355 + local d f pixmapdir + for d in 16 22 32 48 ; do + pixmapdir="${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions" + mkdir "${pixmapdir}" || die + pushd "${pixmapdir}" >/dev/null || die + for f in ../status/*; do + ln -s ${f} || die + done + popd >/dev/null || die + done + fi + use perl && perl_delete_localpod + + use dbus && python_fix_shebang "${ED}" + if use python || use dbus ; then + python_optimize + fi + + dodoc ${DOCS[@]} finch/plugins/pietray.py + docompress -x /usr/share/doc/${PF}/pietray.py + + find "${ED}" -type f -name "*.la" -delete || die +} + +src_test() { + # make default build logs slightly more useful + local -x GST_PLUGIN_SYSTEM_PATH_1_0= + emake check VERBOSE=1 +} + +pkg_preinst() { + gnome2_gconf_savelist + xdg_pkg_preinst +} + +pkg_postinst() { + gnome2_gconf_install + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_gconf_uninstall + gnome2_schemas_update + xdg_pkg_postrm +} diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest index 6388f10978f2..5e056c87f585 100644 --- a/net-im/rocketchat-desktop-bin/Manifest +++ b/net-im/rocketchat-desktop-bin/Manifest @@ -1,3 +1,3 @@ -DIST rocketchat-3.7.9.x86_64.rpm 62177412 BLAKE2B 0acb4fb3c36e758073e81cfe41a2a2b184091e22ce9bf92290c9df6ba5c73da8bdd8525829d6b5795ed4c7910eb26aa761c08ec8f9efc84b6ec94182dc0ccd3d SHA512 6e1a65723ed7e419d94d58bb71d35596a0d261d92f1bcb56cc9341b3108714c4d9ff0e09982bfafd26e42e0ba48a6e7a181f4cfdb630f59659e6823c8aa9b39c -EBUILD rocketchat-desktop-bin-3.7.9.ebuild 1088 BLAKE2B c4b37c17d6ab3950b7838af4133ccf73af81a07e72f3b352bceaa2fdf5363b9e5c7dca6667a573c5464f6d0e083bcc0a9dbd5d0b8e78057a23882cdfddb2d7d2 SHA512 b86078cf202510eb06386832757e14533b78663c2bde803526fa43ae5ee9d6f520365085e2520dbfb870065fa90064124ccfae249e524cbe56d8c93e0fa429be +DIST rocketchat-3.8.0.x86_64.rpm 62219204 BLAKE2B 60c6a1d46138007da82214347790d5fce2cd8e8616ec0fa1d1344f064ab58281843c6692830f8a860cfb6e4ab4f41a5b2ad3bcde928c133e694b2c4fe365d885 SHA512 68b0a1c455b7d3c68bafcf2007470d89301a17b922b61cc3d1b38485235120aeacc449157f76b1629971c4329fb12244d23fb6a0b22a77082da6e37a24b6141e +EBUILD rocketchat-desktop-bin-3.8.0.ebuild 1088 BLAKE2B c4b37c17d6ab3950b7838af4133ccf73af81a07e72f3b352bceaa2fdf5363b9e5c7dca6667a573c5464f6d0e083bcc0a9dbd5d0b8e78057a23882cdfddb2d7d2 SHA512 b86078cf202510eb06386832757e14533b78663c2bde803526fa43ae5ee9d6f520365085e2520dbfb870065fa90064124ccfae249e524cbe56d8c93e0fa429be MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0 diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.9.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.9.ebuild deleted file mode 100644 index 194a95979a80..000000000000 --- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.9.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit rpm xdg - -DESCRIPTION="The Ultimate Open Source Web Chat Platform" -HOMEPAGE="https://rocket.chat" -SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm" -S="${WORKDIR}" - -KEYWORDS="-* ~amd64" -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - app-accessibility/at-spi2-atk:2 - dev-libs/atk - dev-libs/expat - dev-libs/libappindicator - dev-libs/nspr - dev-libs/nss - media-fonts/noto-emoji - media-libs/alsa-lib - net-print/cups - sys-libs/glibc - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify - x11-libs/libxcb - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/libXScrnSaver - x11-libs/pango -" - -QA_PREBUILT="opt/Rocket.Chat/*" - -src_install() { - # remove files useless for Gentoo - rm -r usr/lib || die - mv "${S}"/* "${ED}" || die -} diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.0.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.0.ebuild new file mode 100644 index 000000000000..194a95979a80 --- /dev/null +++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.8.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit rpm xdg + +DESCRIPTION="The Ultimate Open Source Web Chat Platform" +HOMEPAGE="https://rocket.chat" +SRC_URI="https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${PV}/rocketchat-${PV}.x86_64.rpm" +S="${WORKDIR}" + +KEYWORDS="-* ~amd64" +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + app-accessibility/at-spi2-atk:2 + dev-libs/atk + dev-libs/expat + dev-libs/libappindicator + dev-libs/nspr + dev-libs/nss + media-fonts/noto-emoji + media-libs/alsa-lib + net-print/cups + sys-libs/glibc + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + x11-libs/libxcb + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libXScrnSaver + x11-libs/pango +" + +QA_PREBUILT="opt/Rocket.Chat/*" + +src_install() { + # remove files useless for Gentoo + rm -r usr/lib || die + mv "${S}"/* "${ED}" || die +} diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 9fa642f77b48..0ae522009d94 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -7,8 +7,8 @@ AUX tdesktop-3.6.0-jemalloc-only-telegram.patch 1343 BLAKE2B bc257ee3bc3577b05a7 AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814adc2402981836ab7853be1dad9c4eb74b621e1084a2167ad5ea86d500c98d627317ffd48288bcb4df897f5ca6858516ecf86c8f0 SHA512 811f42f8372102910be20ac92030b98ad98704cb1378a90d17a01b15dc4a9aa8e9b6bb179a9dc4d09687ad7b60030f0f7367f8058674244b080748bf2c913044 DIST tdesktop-3.4.8-full.tar.gz 41220984 BLAKE2B e75e7d7432a863e7a35b73bb2a378970f8aab74d99a425e631947fd894e51d931ee2390e2f885831d165d73541cf2151840467e2ef02ece175cc6a18f3e2c81c SHA512 cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1 DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e -DIST tdesktop-3.6.0-full.tar.gz 41227365 BLAKE2B 2d2c66d3110ef83b88d74fc2ca90e444fb34ffb1e96b71d0871b1477598c75b487d8f932f4ba244b99391390317efa90b017bc8a4f562e31461c330d425410e5 SHA512 e5d4278229dc6033e1d40509d54fe52844dd8bad036bfec1fb9683505c9a626e821c15a487db5f1be5951dd5ed0db3ff5a4cbcbba73627f5e527e88cb06925f3 +DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba EBUILD telegram-desktop-3.4.8.ebuild 4642 BLAKE2B aa59d84e4c523b559e1f161fdd9a59eea7c720e6955bf196c5da7a6f504bd912abd4a7c6cecd2b455b5fb0e006f0107883e156f39c1f89591708b726458a6e4e SHA512 fd7f2ec36c03f312a6e5462527872684b5b75dbe2ab4252b6a4051385c8ff13aeda047bb9134da27d07dc16d0899fe0a342279319802bc4028ee7a43d9248471 -EBUILD telegram-desktop-3.5.2-r1.ebuild 4891 BLAKE2B 998aabd95c928ea254c78abfcca8ebdd614e7d68b12ce717c563bb1b4c4e2ba1a495ef08e4210e7b2ff810d3506e9e3f42062a46ebd412e9ed30af333d25b9a7 SHA512 5f7de7682a4ae7796c12560b8a381624ced00c4bd3521bc498ba957838a8eae419efdbb52a38cb1afa13fc04b210a68a4ee1b84b20d7507ec5a91480da90dc3f -EBUILD telegram-desktop-3.6.0.ebuild 4900 BLAKE2B 6a1441f676fc1bb6f3739a4ff32774c4b08db7090be2b18ed56c0c6213f2a3f85c68d57ba45c9b5321610b565b1cce511ec30c54f60d390091ee089fc978c857 SHA512 e671b6439f2cf249a2c5f737e01f8e199d1fa82bf6b42486f2601eb66c4429a3469cd63622cc0a2fd719dd5997edb86f157d641f10069ebc13514afeda6b5cf5 +EBUILD telegram-desktop-3.5.2-r1.ebuild 4890 BLAKE2B 4752d6368a03bd08fedecd8a5fda8afd3796c3ec0faa65587949079908bddb23e2985423bffdf36be30843aa6c05e0433d8316bcdd5b900c7a9d91ac4a63f47b SHA512 3d83ceb78dd06d47ba9666b90f57dbd1f28b7a6d942232f69ffab4dc51efabc87686e3b27cc9994da3e1f9e908a2afde026df6d9009f853e68ea4eb7237d6902 +EBUILD telegram-desktop-3.6.1.ebuild 4900 BLAKE2B 6a1441f676fc1bb6f3739a4ff32774c4b08db7090be2b18ed56c0c6213f2a3f85c68d57ba45c9b5321610b565b1cce511ec30c54f60d390091ee089fc978c857 SHA512 e671b6439f2cf249a2c5f737e01f8e199d1fa82bf6b42486f2601eb66c4429a3469cd63622cc0a2fd719dd5997edb86f157d641f10069ebc13514afeda6b5cf5 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e 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 index 98ffdd9164d6..fd97841de5b2 100644 --- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X" REQUIRED_USE=" spell? ( diff --git a/net-im/telegram-desktop/telegram-desktop-3.6.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.6.0.ebuild deleted file mode 100644 index 5d77d8964fd7..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-3.6.0.ebuild +++ /dev/null @@ -1,163 +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" -) - -# Current desktop-file-utils-0.26 does not understand Version=1.5 -QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn - ewarn "ccache does not work with ${PN} out of the box" - ewarn "due to usage of precompiled headers" - ewarn "check bug https://bugs.gentoo.org/715114 for more info" - 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 ' 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" +) + +# Current desktop-file-utils-0.26 does not understand Version=1.5 +QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop" + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + 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 '\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 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 + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + + local FORCE_PRINT_ELOG v + for v in ${REPLACING_VERSIONS}; do + ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1 + done + readme.gentoo_print_elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-im/zoom/zoom-5.8.6.739.ebuild b/net-im/zoom/zoom-5.8.6.739.ebuild deleted file mode 100644 index 2d83cbfbf221..000000000000 --- a/net-im/zoom/zoom-5.8.6.739.ebuild +++ /dev/null @@ -1,160 +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 - dev-libs/glib:2 - >=dev-libs/quazip-1.0:0= - media-libs/fdk-aac:0/2 - media-libs/fontconfig - media-libs/freetype - media-sound/mpg123 - sys-apps/dbus - sys-apps/util-linux - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon[X] - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - opencl? ( virtual/opencl ) - pulseaudio? ( media-sound/pulseaudio ) - !pulseaudio? ( media-libs/alsa-lib ) - wayland? ( dev-libs/wayland ) - !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 '/\n/' -e 'J 1;D' zoom \ - >zoom-icon.svg && [[ -s zoom-icon.svg ]] \ - || die "Extraction of icon failed" - - if ! use pulseaudio; then - # For some strange reason, zoom cannot use any ALSA sound devices if - # it finds libpulse. This causes breakage if media-sound/apulse[sdk] - # is installed. So, force zoom to ignore libpulse. - bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die - mv zoom.tmp zoom || die - fi - - if use bundled-libjpeg-turbo; then - # Remove insecure RPATH from bundled lib - patchelf --remove-rpath libturbojpeg.so || die - fi -} - -src_install() { - insinto /opt/zoom - exeinto /opt/zoom - doins -r json ringtone sip timezones translations - doins *.pcm 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 QtQml/RemoteObjects \ - 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,} $(usev bundled-qt /opt/zoom) - make_desktop_entry "zoom %U" Zoom zoom-icon "" \ - "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" - doicon zoom-icon.svg - doicon -s scalable zoom-icon.svg - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - local FORCE_PRINT_ELOG v - for v in ${REPLACING_VERSIONS}; do - ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1 - done - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/net-im/zoom/zoom-5.9.3.1911.ebuild b/net-im/zoom/zoom-5.9.3.1911.ebuild deleted file mode 100644 index b30f73c773bf..000000000000 --- a/net-im/zoom/zoom-5.9.3.1911.ebuild +++ /dev/null @@ -1,162 +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 - dev-libs/glib:2 - >=dev-libs/quazip-1.0:0= - media-libs/fdk-aac:0/2 - media-libs/fontconfig - media-libs/freetype - media-sound/mpg123 - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon[X] - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - opencl? ( virtual/opencl ) - pulseaudio? ( media-sound/pulseaudio ) - !pulseaudio? ( media-libs/alsa-lib ) - wayland? ( dev-libs/wayland ) - !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 '/\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 json ringtone 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 QtQml/RemoteObjects \ - 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,} $(usev bundled-qt /opt/zoom) - make_desktop_entry "zoom %U" Zoom videoconference-zoom \ - "Network;VideoConference;" \ - "MimeType=x-scheme-handler/zoommtg;application/x-zoom;" - doicon videoconference-zoom.svg - doicon -s scalable videoconference-zoom.svg - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - local FORCE_PRINT_ELOG v - for v in ${REPLACING_VERSIONS}; do - ver_test ${v} -lt 5.7.28852.0718 && use wayland && FORCE_PRINT_ELOG=1 - done - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} -- cgit v1.2.3