summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/gajim')
-rw-r--r--net-im/gajim/Manifest9
-rw-r--r--net-im/gajim/gajim-1.3.3-r2.ebuild93
-rw-r--r--net-im/gajim/gajim-1.3.3_p2-r1.ebuild97
-rw-r--r--net-im/gajim/gajim-1.7.3-r1.ebuild (renamed from net-im/gajim/gajim-1.4.2.ebuild)39
-rw-r--r--net-im/gajim/gajim-1.7.3.ebuild (renamed from net-im/gajim/gajim-1.4.1.ebuild)27
-rw-r--r--net-im/gajim/gajim-1.8.0.ebuild (renamed from net-im/gajim/gajim-1.4.0-r1.ebuild)56
-rw-r--r--net-im/gajim/gajim-1.8.1.ebuild (renamed from net-im/gajim/gajim-1.4.0.ebuild)57
-rw-r--r--net-im/gajim/gajim-1.8.4.ebuild105
-rw-r--r--net-im/gajim/metadata.xml4
9 files changed, 209 insertions, 278 deletions
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 90421df2906f..56614ec8e60c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,4 @@
-DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba68348fad51fe2f114199972a0fc998ae2c6efba1ea48ecb17b819509c1b45745e98e41f99f2e4afd4a4c1daff4865 SHA512 e7a2564710ffdf0b971d005f8b84c60d72c471727be2bd1b75e564f70a25101a4eb44603fc9f98163bc12a5049dc876f50cdaf8eb5b7d596203c986e55de7442
-DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
-DIST gajim-1.4.0.tar.gz 8932710 BLAKE2B 66924bf2e0f39c74e0ce45bfb24c6bd41c547f170c149611dc08e45db1f665f1159be6586dde1a64f1037de029dc2d83c1146545c36645dd67b63509ce156043 SHA512 9fb2b967325d04d7cfa8cb97d0dcebdd5cfd8b8a0a4f8928e7d8c547d90567b7fb0d84d48cdd151b5e38ce72f65de2679c8cc1543ff3ed25d792e6de070042a0
-DIST gajim-1.4.1.tar.gz 7321296 BLAKE2B 2b170800a1ee6304831e1ec7c006e2133c577dd6b34da4e89ab35a6032677c7db61939834a5b3ad73026b7417703321dc43bb63aa2d0c03676cddb728c7294e6 SHA512 614b96d1e64e8601992d608de279abdd38fcfa637094eeffef6adab725446b8955d07725a3d7577d71be4b883943e3341f84540a86e9a61c32ec51ae8999cfcc
-DIST gajim-1.4.2.tar.gz 7315938 BLAKE2B 2315be3d8efa98bf45cc7479a38a83f6d297bc4af9550ce70ccbb9f4fce681cdec57658f2c5c12c4b3b1b97d7623b1da32b675be971e186623957a267010d85c SHA512 d3402b39c9253334523538b86c3e2d6f272f576824048b344a235a12982c53280c3638b0b299c536ed38bcb8648388ba5bea8056c722cc8a5dc5d98012f6d57c
+DIST gajim-1.7.3.tar.gz 3753831 BLAKE2B c7b8b1dc47b1faf9f1c0803e7931cb00bfbf31075fe481d557ec0f308c79e7580d0054d224781a67eaeea24dba40e40de5faf55d633d71f759022a1ac113f6e4 SHA512 66135e88784350bab79b61debc1b65144a82f8eee2c1841d21e4f511b3792361e57b60304d2478654e563687e8302426d76063e748236f4e1c959511c7c28665
+DIST gajim-1.8.0.tar.gz 3835799 BLAKE2B 030293fc8114877c6d060cd0feae0fecdcecbb26aac8817e1db7db59aee3ee79973efc94584434641ccd39adcf809e0c7a86a017ab46c9695666d898fb7b7905 SHA512 724290de6d438aacd929a9759d7a712068c303caf9002a1a70ddc0e9aa16387054d3e4efacf84eced28f49ef79749c764d5fe67fcb23c3baef3a2b7714df218e
+DIST gajim-1.8.1.tar.gz 3844796 BLAKE2B b7bbd751a051cd2a46e814a9b3ebc08f10a6570dc071752838a2463019cdf6ea4198f2a349f3935c33d988cd6908cf31dba572bac31f9363675433328e6d679b SHA512 b417d76a4225f16730441dee7befacd6db5be782c9271b789d5f9c10232e342f2d46930eef79a58839c13b2887926591d953a87a7544e32c7bf80d2c65390e31
+DIST gajim-1.8.4.tar.gz 3710470 BLAKE2B e23eafe707bc482a050fcef44df9e68af552444cce173c506538ebe01557a894dc0ba8b9afe18f195fd0b00b717b1268531a960b1c8b868c22081135d14e3079 SHA512 1a5b028c0e308eb15417c8c11584bc0e8b0218fead5155093ede4bc3961b6bee2b47bc3510f751dc70194634d6ca94d4a675f6891c8f050859fb4729020e52cb
diff --git a/net-im/gajim/gajim-1.3.3-r2.ebuild b/net-im/gajim/gajim-1.3.3-r2.ebuild
deleted file mode 100644
index 726c404f14f1..000000000000
--- a/net-im/gajim/gajim-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${PN}-${P}"
-
-COMMON_DEPEND="
- dev-libs/gobject-introspection[cairo(+)]
- >=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
- app-arch/unzip
- virtual/pkgconfig
- >=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- dev-python/idna[${PYTHON_USEDEP}]
- dev-python/precis-i18n[${PYTHON_USEDEP}]
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- <dev-python/python-nbxmpp-3[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
- x11-libs/libXScrnSaver
- app-crypt/libsecret[crypt,introspection]
- dev-python/keyring[${PYTHON_USEDEP}]
- >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
- dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- net-libs/libsoup[introspection]
- media-libs/gsound[introspection]
- crypt? (
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
- geolocation? ( app-misc/geoclue[introspection] )
- jingle? (
- net-libs/farstream:0.2[introspection]
- media-libs/gstreamer:1.0[introspection]
- media-libs/gst-plugins-base:1.0[introspection]
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-gtk
- )
- omemo? (
- dev-python/python-axolotl[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- )
- remote? (
- >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
- sys-apps/dbus[X]
- )
- rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
- spell? (
- app-text/gspell[introspection]
- app-text/hunspell
- )
- upnp? ( net-libs/gupnp-igd[introspection] )
- webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
- ')"
-
-src_install() {
- distutils-r1_src_install
-
- # avoid precompressed man pages
- rm -r "${D}/usr/share/man"
- doman data/*.1
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild b/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
deleted file mode 100644
index 9228c4d00e2f..000000000000
--- a/net-im/gajim/gajim-1.3.3_p2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://gajim.org/"
-SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P%_p2}"
-
-COMMON_DEPEND="
- dev-libs/gobject-introspection[cairo(+)]
- >=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
- app-arch/unzip
- virtual/pkgconfig
- >=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep '
- dev-python/idna[${PYTHON_USEDEP}]
- dev-python/precis-i18n[${PYTHON_USEDEP}]
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- <dev-python/python-nbxmpp-3[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-2.0.4[${PYTHON_USEDEP}]
- x11-libs/libXScrnSaver
- app-crypt/libsecret[crypt,introspection]
- dev-python/keyring[${PYTHON_USEDEP}]
- >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
- dev-python/css-parser[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- net-libs/libsoup[introspection]
- media-libs/gsound[introspection]
- crypt? (
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
- geolocation? ( app-misc/geoclue[introspection] )
- jingle? (
- net-libs/farstream:0.2[introspection]
- media-libs/gstreamer:1.0[introspection]
- media-libs/gst-plugins-base:1.0[introspection]
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-gtk
- )
- omemo? (
- dev-python/python-axolotl[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- )
- remote? (
- >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
- sys-apps/dbus[X]
- )
- rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
- spell? (
- app-text/gspell[introspection]
- app-text/hunspell
- )
- upnp? ( net-libs/gupnp-igd[introspection] )
- webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
- ')"
-
-src_install() {
- distutils-r1_src_install
-
- # avoid precompressed man pages
- rm -r "${D}/usr/share/man"
- doman data/*.1
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-# tests in this release don't work, see also:
-# https://dev.gajim.org/gajim/gajim/-/issues/10755
-RESTRICT="test"
diff --git a/net-im/gajim/gajim-1.4.2.ebuild b/net-im/gajim/gajim-1.7.3-r1.ebuild
index 60900668dd5d..8cdd33907dc9 100644
--- a/net-im/gajim/gajim-1.4.2.ebuild
+++ b/net-im/gajim/gajim-1.7.3-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
@@ -15,14 +16,13 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P%_p2}"
COMMON_DEPEND="
dev-libs/gobject-introspection[cairo(+)]
>=x11-libs/gtk+-3.22:3[introspection]
- x11-libs/gtksourceview:4"
+ x11-libs/gtksourceview:4[introspection]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
virtual/pkgconfig
@@ -30,22 +30,22 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(python_gen_cond_dep '
dev-python/idna[${PYTHON_USEDEP}]
+ >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+ <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
dev-python/precis-i18n[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
- <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
x11-libs/libXScrnSaver
app-crypt/libsecret[crypt,introspection]
dev-python/keyring[${PYTHON_USEDEP}]
>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
dev-python/css-parser[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
- net-libs/libsoup[introspection]
+ net-libs/libsoup:3.0[introspection]
media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
crypt? (
dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
@@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-gtk
)
omemo? (
+ dev-python/jaraco-classes[${PYTHON_USEDEP}]
dev-python/python-axolotl[${PYTHON_USEDEP}]
dev-python/qrcode[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
@@ -71,15 +72,19 @@ RDEPEND="${COMMON_DEPEND}
app-text/gspell[introspection]
app-text/hunspell
)
- upnp? ( net-libs/gupnp-igd[introspection] )
- webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ upnp? ( net-libs/gupnp-igd:0[introspection] )
')"
-src_install() {
- distutils-r1_src_install
+python_compile() {
+ distutils-r1_python_compile
+ ./pep517build/build_metadata.py -o dist/metadata
+}
+
+python_install() {
+ distutils-r1_python_install
+ ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
- # avoid precompressed man pages
- rm -r "${D}/usr/share/man"
+ rm "${D}"/usr/share/man/man1/*.gz
doman data/*.1
}
diff --git a/net-im/gajim/gajim-1.4.1.ebuild b/net-im/gajim/gajim-1.7.3.ebuild
index 60900668dd5d..125c2e7bd15e 100644
--- a/net-im/gajim/gajim-1.4.1.ebuild
+++ b/net-im/gajim/gajim-1.7.3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
@@ -17,12 +18,11 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P%_p2}"
COMMON_DEPEND="
dev-libs/gobject-introspection[cairo(+)]
>=x11-libs/gtk+-3.22:3[introspection]
- x11-libs/gtksourceview:4"
+ x11-libs/gtksourceview:4[introspection]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
virtual/pkgconfig
@@ -30,22 +30,22 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(python_gen_cond_dep '
dev-python/idna[${PYTHON_USEDEP}]
+ >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+ <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
dev-python/precis-i18n[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
- <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
x11-libs/libXScrnSaver
app-crypt/libsecret[crypt,introspection]
dev-python/keyring[${PYTHON_USEDEP}]
>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
dev-python/css-parser[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
- net-libs/libsoup[introspection]
+ net-libs/libsoup:3.0[introspection]
media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
crypt? (
dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
@@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-gtk
)
omemo? (
+ dev-python/jaraco-classes[${PYTHON_USEDEP}]
dev-python/python-axolotl[${PYTHON_USEDEP}]
dev-python/qrcode[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
@@ -71,15 +72,11 @@ RDEPEND="${COMMON_DEPEND}
app-text/gspell[introspection]
app-text/hunspell
)
- upnp? ( net-libs/gupnp-igd[introspection] )
- webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ upnp? ( net-libs/gupnp-igd:0[introspection] )
')"
src_install() {
distutils-r1_src_install
-
- # avoid precompressed man pages
- rm -r "${D}/usr/share/man"
doman data/*.1
}
diff --git a/net-im/gajim/gajim-1.4.0-r1.ebuild b/net-im/gajim/gajim-1.8.0.ebuild
index 60900668dd5d..0e911bf76b48 100644
--- a/net-im/gajim/gajim-1.4.0-r1.ebuild
+++ b/net-im/gajim/gajim-1.8.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
@@ -15,37 +16,46 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P%_p2}"
+# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+# Gajim depends now on omemo-dr. Add KEYWORDS again,
+# when https://bugs.gentoo.org/912285 is fixed.
+
+KEYWORDS="~amd64"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
COMMON_DEPEND="
dev-libs/gobject-introspection[cairo(+)]
>=x11-libs/gtk+-3.22:3[introspection]
- x11-libs/gtksourceview:4"
+ x11-libs/gtksourceview:4[introspection]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
virtual/pkgconfig
+ >=x11-libs/pango-1.5.0
>=sys-devel/gettext-0.17-r1"
RDEPEND="${COMMON_DEPEND}
$(python_gen_cond_dep '
dev-python/idna[${PYTHON_USEDEP}]
+ >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+ <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
dev-python/precis-i18n[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
- <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
x11-libs/libXScrnSaver
app-crypt/libsecret[crypt,introspection]
dev-python/keyring[${PYTHON_USEDEP}]
>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
dev-python/css-parser[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
- net-libs/libsoup[introspection]
+ net-libs/libsoup:3.0[introspection]
media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/jaraco-classes[${PYTHON_USEDEP}]
+ dev-python/python-axolotl[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/omemo-dr[${PYTHON_USEDEP}]
crypt? (
dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
@@ -57,11 +67,6 @@ RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-ugly:1.0
media-plugins/gst-plugins-gtk
)
- omemo? (
- dev-python/python-axolotl[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- )
remote? (
>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
sys-apps/dbus[X]
@@ -71,16 +76,19 @@ RDEPEND="${COMMON_DEPEND}
app-text/gspell[introspection]
app-text/hunspell
)
- upnp? ( net-libs/gupnp-igd[introspection] )
- webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ upnp? ( net-libs/gupnp-igd:0[introspection] )
')"
-src_install() {
- distutils-r1_src_install
+python_compile() {
+ distutils-r1_python_compile
+ ./pep517build/build_metadata.py -o dist/metadata
+}
+
+python_install() {
+ distutils-r1_python_install
+ ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
- # avoid precompressed man pages
- rm -r "${D}/usr/share/man"
- doman data/*.1
+ gzip -d "${ED}"/usr/share/man/man1/*.gz || die
}
pkg_postinst() {
diff --git a/net-im/gajim/gajim-1.4.0.ebuild b/net-im/gajim/gajim-1.8.1.ebuild
index dbb2ac846a85..b66f62a0dc62 100644
--- a/net-im/gajim/gajim-1.4.0.ebuild
+++ b/net-im/gajim/gajim-1.8.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite,xml"
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 xdg-utils
@@ -15,36 +16,46 @@ SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
-S="${WORKDIR}/${P%_p2}"
+# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+# Gajim depends now on omemo-dr. Add KEYWORDS again,
+# when https://bugs.gentoo.org/912285 is fixed.
+
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
COMMON_DEPEND="
dev-libs/gobject-introspection[cairo(+)]
- >=x11-libs/gtk+-3.22:3[introspection]"
+ >=x11-libs/gtk+-3.22:3[introspection]
+ x11-libs/gtksourceview:4[introspection]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip
virtual/pkgconfig
+ >=x11-libs/pango-1.5.0
>=sys-devel/gettext-0.17-r1"
RDEPEND="${COMMON_DEPEND}
$(python_gen_cond_dep '
dev-python/idna[${PYTHON_USEDEP}]
+ >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+ <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
dev-python/precis-i18n[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pycurl[${PYTHON_USEDEP}]
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- >=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
- <dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
x11-libs/libXScrnSaver
app-crypt/libsecret[crypt,introspection]
dev-python/keyring[${PYTHON_USEDEP}]
>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
dev-python/css-parser[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
- net-libs/libsoup[introspection]
+ net-libs/libsoup:3.0[introspection]
media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/jaraco-classes[${PYTHON_USEDEP}]
+ dev-python/python-axolotl[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/omemo-dr[${PYTHON_USEDEP}]
crypt? (
dev-python/pycryptodome[${PYTHON_USEDEP}]
>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
@@ -56,11 +67,6 @@ RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-ugly:1.0
media-plugins/gst-plugins-gtk
)
- omemo? (
- dev-python/python-axolotl[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- )
remote? (
>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
sys-apps/dbus[X]
@@ -70,16 +76,19 @@ RDEPEND="${COMMON_DEPEND}
app-text/gspell[introspection]
app-text/hunspell
)
- upnp? ( net-libs/gupnp-igd[introspection] )
- webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+ upnp? ( net-libs/gupnp-igd:0[introspection] )
')"
-src_install() {
- distutils-r1_src_install
+python_compile() {
+ distutils-r1_python_compile
+ ./pep517build/build_metadata.py -o dist/metadata
+}
+
+python_install() {
+ distutils-r1_python_install
+ ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
- # avoid precompressed man pages
- rm -r "${D}/usr/share/man"
- doman data/*.1
+ gzip -d "${ED}"/usr/share/man/man1/*.gz || die
}
pkg_postinst() {
diff --git a/net-im/gajim/gajim-1.8.4.ebuild b/net-im/gajim/gajim-1.8.4.ebuild
new file mode 100644
index 000000000000..32d9ec5bc5a5
--- /dev/null
+++ b/net-im/gajim/gajim-1.8.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+# Gajim depends now on omemo-dr. Add KEYWORDS again,
+# when https://bugs.gentoo.org/912285 is fixed.
+
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+
+COMMON_DEPEND="
+ dev-libs/gobject-introspection[cairo(+)]
+ >=x11-libs/gtk+-3.22:3[introspection]
+ x11-libs/gtksourceview:4[introspection]"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+ virtual/pkgconfig
+ >=x11-libs/pango-1.5.0
+ >=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/idna[${PYTHON_USEDEP}]
+ >=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+ <dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
+ dev-python/precis-i18n[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+ x11-libs/libXScrnSaver
+ app-crypt/libsecret[crypt,introspection]
+ dev-python/keyring[${PYTHON_USEDEP}]
+ >=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+ dev-python/css-parser[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ net-libs/libsoup:3.0[introspection]
+ media-libs/gsound[introspection]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/jaraco-classes[${PYTHON_USEDEP}]
+ dev-python/python-axolotl[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/omemo-dr[${PYTHON_USEDEP}]
+ crypt? (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+ geolocation? ( app-misc/geoclue[introspection] )
+ jingle? (
+ net-libs/farstream:0.2[introspection]
+ media-libs/gstreamer:1.0[introspection]
+ media-libs/gst-plugins-base:1.0[introspection]
+ media-libs/gst-plugins-ugly:1.0
+ media-plugins/gst-plugins-gtk
+ )
+ remote? (
+ >=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+ sys-apps/dbus[X]
+ )
+ rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+ spell? (
+ app-text/gspell[introspection]
+ app-text/hunspell
+ )
+ upnp? ( net-libs/gupnp-igd:0[introspection] )
+ ')"
+
+python_compile() {
+ distutils-r1_python_compile
+ ./pep517build/build_metadata.py -o dist/metadata
+}
+
+python_install() {
+ distutils-r1_python_install
+ ./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
+
+ gzip -d "${ED}"/usr/share/man/man1/*.gz || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+# Tests are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 37921b88236a..543a6366d0ff 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hanno@gentoo.org</email>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="crypt">End to end encryption and GPG encryption</flag>
<flag name="geolocation">Sharing your location</flag>