[gentoo-commits] repo/gentoo:master commit in: net-im/gajim/, net-im/gajim/files/

[Hanno Böck]

commit:     4db904f48b88ec7574ab92698b2de5321d6eb15c
Author:     Hanno Böck <hanno <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 11:54:08 2021 +0000
Commit:     Hanno Böck <hanno <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 11:54:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db904f4

net-im/gajim: Version bump.

Fix gajim-history-manager (patch is merged upstream).
Add missing jingle dependency.
Add omemo use flag.

Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
Closes: https://bugs.gentoo.org/789381
Closes: https://github.com/gentoo/gentoo/pull/20827
Closes: https://bugs.gentoo.org/790437
Closes: https://bugs.gentoo.org/791001
Closes: https://bugs.gentoo.org/790995
Package-Manager: Portage-3.0.20, Repoman-3.0.3

 net-im/gajim/Manifest                              |  1 +
 .../files/gajim-1.3.2-fix-historymanager.diff      | 44 ++++++++++
 net-im/gajim/gajim-1.3.2.ebuild                    | 97 ++++++++++++++++++++++
 net-im/gajim/metadata.xml                          |  1 +
 4 files changed, 143 insertions(+)

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index d52cae25e93..d30aa934956 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -3,3 +3,4 @@ DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326
 DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
 DIST gajim-1.3.1-2.tar.gz 9538193 BLAKE2B 2517b3eeaf3d8b9304e72c82e533d7424b7deb48d2543f366b91b8cf9a3e278f5b4d271d9128529f8e623f6b6fa26b5b97932112598118bf4ec24f97c4199669 SHA512 01d0e77e856935c7d388144fdc8c33271f41752a3544f713eb0ffe070bb7aee6fb3ae28aeddcda69298e405de21bc2ef004e8d7f4c59b3b09eb9366bbd6b0642
 DIST gajim-1.3.1.tar.gz 9885129 BLAKE2B ee1fac7f1354576879c5ef14d167d4f7248e497f5b7c468d4bdeb9bf93b749482e221e4ad7a965c86799baa959020303b1b3e49ca99ce1607fc721d0722cbffd SHA512 840b9424c4f93281fe32569331917ba3bdd0afc51428d778ec357b1b0dfc9aecdf77a48c44fa4b66259d82633ca277ccab6b4d6ead47e7eb66d22f078e8ebb84
+DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267

diff --git a/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
new file mode 100644
index 00000000000..04428d3acbe
--- /dev/null
+++ b/net-im/gajim/files/gajim-1.3.2-fix-historymanager.diff
@@ -0,0 +1,44 @@
+diff --git a/gajim/history_manager.py b/gajim/history_manager.py
+index 1598ea46b385951710a9298093f491dd29e5e6f8..3e767840295f5404687ec6bb298fbdc4e369b4ca 100644
+--- a/gajim/history_manager.py
++++ b/gajim/history_manager.py
+@@ -55,7 +55,6 @@
+ from gajim.common.const import JIDConstant
+ from gajim.common.const import KindConstant
+ from gajim.common.const import ShowConstant
+-from gajim.common.settings import Settings
+ 
+ 
+ def is_standalone():
+@@ -76,6 +75,8 @@ def init_gtk():
+ if is_standalone():
+     init_gtk()
+ 
++    from gajim.common.settings import Settings
++
+     try:
+         shortargs = 'hvsc:l:p:'
+         longargs = 'help verbose separate config-path= loglevel= profile='
+@@ -100,6 +101,8 @@ def init_gtk():
+     app.settings = Settings()
+     app.settings.init()
+     app.load_css_config()
++else:
++    from gajim.common.settings import Settings
+ 
+ from gajim.common import helpers
+ from gajim.gui.dialogs import ErrorDialog
+diff --git a/test/unit/test_gui_interface.py b/test/unit/test_gui_interface.py
+index 41274dfd4447a89b6ea33bdd36538212e4d28d8c..6ad2d734b5bcc093e1d2e8e627cfbd3a0653b53e 100644
+--- a/test/unit/test_gui_interface.py
++++ b/test/unit/test_gui_interface.py
+@@ -3,6 +3,9 @@
+ '''
+ import unittest
+ 
++import gajim.gui
++gajim.gui.init('gtk')
++
+ from test import lib
+ lib.setup_env()
+ 

diff --git a/net-im/gajim/gajim-1.3.2.ebuild b/net-im/gajim/gajim-1.3.2.ebuild
new file mode 100644
index 00000000000..82b5ea43e3a
--- /dev/null
+++ b/net-im/gajim/gajim-1.3.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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"
+
+# See https://dev.gajim.org/gajim/gajim/-/merge_requests/761
+PATCHES=( "${FILESDIR}/gajim-1.3.2-fix-historymanager.diff" )
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp omemo"
+S="${WORKDIR}/${P}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-2.0.2[${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
+		)
+		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}] )
+		omemo? (
+			dev-python/python-axolotl[${PYTHON_USEDEP}]
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		)
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}

diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index d4e7cc8f23d..c9ce2f629c3 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -13,5 +13,6 @@
     <flag name="spell">Spellchecking of composed messages</flag>
     <flag name="upnp">Ability to request your router to forward port for file transfer</flag>
     <flag name="webp">Support WebP avatars</flag>
+    <flag name="omemo">Install dependencies for OMEMO encryption plugin</flag>
   </use>
 </pkgmetadata>