gentoo resync : 24.07.2021

7 files changed, 60 insertions, 273 deletions

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 67ed4e8f5197..028e804b811f 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,11 +1,6 @@
-DIST gajim-1.2.1.tar.gz 9421625 BLAKE2B 890c4ac30506a771a3158f46c687723aacfed5fe7b7da3984e8de7354d8a448508cf98e5b224060078571bb27eecb2bb74927d610dae23709a522d77bb018961 SHA512 1a1ebc3a0605a12b5f459c576037359543814686a170199148e44e409d4f054cefdb66505e68ed4c28bd8c64a7910a70301c2d90d1d4b31b9587d9126329e8c4
-DIST gajim-1.2.2.tar.gz 9416794 BLAKE2B ab1dd2997422175bb7591bc11b230c47f9b72326fbf5b652ae15710bb46798ac8a1514dc2e1361e89bef4a80f43d5f64cf09879f3faffa927aa4407fe696b564 SHA512 297afa2b0ac44aad59b203907b1479fb8f004e2dc2a00681fa8034d76e4fb89ee3dcb4fb96011028382659bcb978cf214c396073d29b3dd0a7a711454915057b
-DIST gajim-1.3.0.tar.gz 9886259 BLAKE2B c9d0912f4d2cb76668978ca48fb1bc2db203cae7ea8dba7fd03c40d1cfee3da84131e2cd82ed6b27ed4c9a70a37328c57551fe1190e29bbd0c9a3cd6f9fa4a66 SHA512 4b68b97f6e4edcc2aa4b009a0131e4781c4ca52340ce98369154c602f7ee71e974e0840af0ae6ab28fc9e2fd34433ec0f304e10847e6cc257de3cde60b90b349
+AUX gajim-1.3.2-fix-historymanager.diff 1315 BLAKE2B b3520b7730f3b408759003498963fe6dd77bb0b4b313a3cf49ce4f77fde99763ee0c8616c839aed6edfe2e47a5aa992b7c71f1e3b9ba5e8bb04599137e6fb90c SHA512 5708f62c7f3903ff8b01808d955e51930281dc1e9d818897681e5368464b191b2c24f76a82ad015711e60b59504c43db21db5f54fa684f6d78b48acfa961e5b6
 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
-EBUILD gajim-1.2.1.ebuild 2354 BLAKE2B 6f3ce6c6363e69d6be10a0fdbb20195b68a2ded9f037c9e40948e8897e4a0234f4c111fdb408684d50ea3f3bdbd886318263fe712a04e5317506436273c8b614 SHA512 da1f7e0e70fb08e81ac7ff9fed60f694af7002a77047c3c89f352aa30bf090929defc1a032fb3b410f4fa3c16c651060ccac1d2474525d4059d47e76c368405f
-EBUILD gajim-1.2.2.ebuild 2356 BLAKE2B 2b8063e45e51d32f0d2399f802c658f256a54be2f2e92d5127627ded7c367391a1899aeeb1b6fe456ea6a9acb722f2ac78c4aab4ffb335a69d1d9f8c53193721 SHA512 7902589bc9b94037bf8d4867b4ba9777900ba0b9ff8e75a5409efb63b7eb4953fd6cbfa228a77a01ef26f601203ef63ba61f565a4bf936b5acaadccaafb1587d
-EBUILD gajim-1.3.0.ebuild 2377 BLAKE2B 45da45a8eb0c7548af69ae436a732148c96d900523f408625d4db037ec3363ff6be23c0ebcfbd3c76244fd178ff5a0ef76702b632292181900dbe3a216ad072a SHA512 ea8e95ec72c246013699c595c174450d34959757c31dda003abf53a3f5ed965fdd70ec8307898610ea42d6751605e1bedde5de809cc06503554ac91af6980215
-EBUILD gajim-1.3.1.ebuild 2375 BLAKE2B 79eb66fd1c81029f25b9a65205ec6eb9d97933ca6df45879e8f4d01b80d08ad52bb304839502c2ceeb3accd18fe20e119b007edaff95330169dce44b4a7484cf SHA512 a772430a49f87279ebcb2b9dfaf1b4694ce9570b74bde0e1525ff5838e7340b16a448cc5c8cc0a9debf224fe94c8f457ff0418f59a3a3f19bf8b3286b504d3ee
+DIST gajim-1.3.2.tar.gz 9538320 BLAKE2B 9af561d4316a34480d073dcbf95fbc04ffd30bb4195633141ad1e9fa96145e61b54acff32891aadbdb93d0a775d69f2491e56f97fc67d2a1b2a76fcaab09f7ef SHA512 92c86d1fa2fab51b402b6ddc0b838f321ab744c9c2add743b3f1820215eef84cafabc50227606088d077bdd9f52998f4ca6f98ad153346b9fb37691b71e9c267
 EBUILD gajim-1.3.1_p2.ebuild 2393 BLAKE2B 29e9137608241890d52a59ce27beec4f38f9789e66627c7d03d8646614149adeaaa1ea728a59b6ee62f3fe3b6b9eacc63f186b779abd29d6dc1687dedf373837 SHA512 809c01bfb5cd847ebdfa087877695be7d644ace122e546df1e47c1b2b848a02029dd42fd2735ec00b575f4822d4c8a755836afabfd0e8109e88854dd4b72c747
-MISC metadata.xml 787 BLAKE2B addb4c1ccffe612899495903543df528872a87ab0128459e34fdca346fa7c8c3fe45f27cba541baae9971eba00d282d77f88d964de5ebde47181a8d417d0ef60 SHA512 5425930f8c15ba0a4f9fb13eab27f11b6874453732b1fec601cf1811a796431ee7feaff62c7967f3ac1dfa4009b9acd5de1d0f42ef28543444e7cb887088be09
+EBUILD gajim-1.3.2.ebuild 2680 BLAKE2B 7c42ef6db2251790a159475c9ad6235f2329c700316cee4487b008546467bac85ab1efc206bfe5cfa93ec0fca63bba0b88337905a6c6dc0cb2dca69c78452eb5 SHA512 e5a9fef65f8415d8510888a2d4bac393115cb969d246f23eb0504891979f5e53e305e11d7456121fc89c240d80ae10323eb00595800d4b4708e15c016d8ff78a
+MISC metadata.xml 866 BLAKE2B 5199f029cac2e80f2e3acf9d0373d65f7a2c5e70c2c9a7e1a2af812ea8b9570778f9cd3bf9be0ca5480846648ed4ea4199e13195ab2bea84958b4762204fb832 SHA512 745b3c132ff83fa300e21c01ba9fac2958dcbbb0eabe38652a287836f144510a61891eecbaface58896f9f9b0620547dda57b9958e1fe88256beca549b99951c
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 000000000000..04428d3acbe5
--- /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.2.1.ebuild b/net-im/gajim/gajim-1.2.1.ebuild
deleted file mode 100644
index 94a9cb349704..000000000000
--- a/net-im/gajim/gajim-1.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-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-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.0.1[${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
-		)
-		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.2.2.ebuild b/net-im/gajim/gajim-1.2.2.ebuild
deleted file mode 100644
index 92a23399d45c..000000000000
--- a/net-im/gajim/gajim-1.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
-
-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-0.14[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-1.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
-		)
-		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.1.ebuild b/net-im/gajim/gajim-1.3.1.ebuild
deleted file mode 100644
index 192769880a80..000000000000
--- a/net-im/gajim/gajim-1.3.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle 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
-	>=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
-		)
-		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.0.ebuild b/net-im/gajim/gajim-1.3.2.ebuild
index 3e2cb3f1105e..3786de899854 100644
--- a/net-im/gajim/gajim-1.3.0.ebuild
+++ b/net-im/gajim/gajim-1.3.2.ebuild
@@ -14,11 +14,14 @@ 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"
-S="${WORKDIR}/${PN}-${P}"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P}"
 
 COMMON_DEPEND="
 	dev-libs/gobject-introspection[cairo(+)]
@@ -55,6 +58,12 @@ RDEPEND="${COMMON_DEPEND}
 			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}]
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index d4e7cc8f23d5..c9ce2f629c37 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>