net-im/gajim: version bump to 1.1.1

dev-python/python-nbxmpp/Manifest

@@ -1,20 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST python-nbxmpp-0.6.6.tar.gz 1332465 BLAKE2B b6e28842c8cd42b3e259c62cedc917c8e142d916bc4d2f711e0e804c69b08a0d362cd3951b40373d1be18e3bdfa29f7c7f56ee10e0bf543214cb4d73db508e24 SHA512 729ec2c5d170cb5784e0a7a0097276e0cfcf98671af6c1304bc8c890cbd81349d91ccbe68af88e9f3b95803e33371cf2bf7fbc3891d7d6106ccc06bb9036e2fe
------BEGIN PGP SIGNATURE-----
+DIST python-nbxmpp-0.6.8.tar.gz 1337085 BLAKE2B 8c971e020fd3a8c90140b82fc6b8cad88546906689dc84138afdc323421e6348eb34f63f4e50b10a1169af138f468f3761edf99a8afe5403c1331d560bba0131 SHA512 60eab408989fb483c771c1d65f1adc76edb12ced0930910352fa27569d0ce39049b9667d201ee56f2aec8b1630ad16506b9b9db76af2cdd8623c7477be0bf50a
-
-iQIzBAEBCAAdFiEEvspus3YPILi6jN5f5JDkP2w2P2wFAlsD9VUACgkQ5JDkP2w2
-P2wnbRAAsCvQxDrbBlKnuZUi7UoOaBtf+j2j3zEucZSO+SpOGCWLOatN+ZonDjQ4
-BnoKORBrClklw2//KdBCTXufD82qX9AWMbaoeT832nNgT551CeLBeZC3mpr6ex+o
-iUW+ypgCVcCOpyOH/gJr54hlOA+baTH2kHpvK7jq6WSwO9KvPUKRE/L8VO2ruuOq
-iyp9Ak72Cj9EnwqdryNrFBh8Dt/bCXGQXuQ5+fUJEWK8hvwxdPCFLZzoX/PVsTXI
-0mWDh6SFUgWsb5aT8OM2JbfjnamgcC3PKTjL65ty+6av4XJqScrQQ6FEwTJCQrfk
-8wttzp2bTPGBTJCdM4f0A9glJEj3kluGUP8+um95H8FGnRk7sxXgDgLJy/gMx79i
-hG2AVRXswOkNwmibV1M4r/+m/qooT9NwzrbEnQ2qYx80uT1qJj2prGp7/78xkD6C
-Nivn1x4UQTkbDIb7AYY6gXlK6YAYYxGEFV3AMQx7f0JTis7Rk2mpISX8xMhoCwnb
-dXwjMaOZ0ndp/GbruNN9bARPxHTzLoRkyGSEkAkSM/2unLrGFfPWHuf+syN5DANO
-JyvWYxPk17MM9FspkSlB6TGcu8gzzikp/j2DBKysa0bLj84jHP4Zvw07fngQzA/J
-HKZiiKjKOH1AkHB50DDZ0hTuMn4TnVcfJcd8mxX3WtS7KRGSXps=
-=9JN1
------END PGP SIGNATURE-----

dev-python/python-nbxmpp/python-nbxmpp-0.6.8.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""

net-im/gajim/Manifest

@@ -1,20 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
+DIST gajim-gajim-1.1.1.tar.bz2 8065929 BLAKE2B 9c4d41b63f9273e727863977c3ba566b823d1b0e27d583175478364791660b307ce6006d5429a0cad52d597bd74387553dabbe00c8e623244aa73281e1f0bfa5 SHA512 89a483aeb40be44a6fa313a6e6637a082804bf09f090da4d68943b01767af2c68cb48e5012a59f889c38b64f9c5a4891a086db11e843c855eda3eaf665f152e7
-Hash: SHA256
-
-DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEvspus3YPILi6jN5f5JDkP2w2P2wFAlsD2VYACgkQ5JDkP2w2
-P2ybOQ//b9UXNtYxiIFpHRCowTN2RLQv7ged51nsjkYcDJFfb0kw8aHbW4yH4pMF
-iQVvqedAge3bO4niLXZf0w2VjUnabTyVrT/XKmvDAju2c2TA4KEFFOyWC37sCxGX
-c1hqKsNMIDWA0JIokZNi0xNFTMiiGmS5+1xkU1GIpM8ZBDXFW0SOaJY5CN0P7SB4
-9MUhs2cMWgpV+yAgoGx09kszwJ7TP1N6S/Qv6LL4fwt0d+YZpacrnJXDDvj00eRA
-VwSxi5AfhOFqs+OpQqfvh0grLxJcSnbavhelM7ZV7OiPzJ9A6sRkOYuoOgL57Kn0
-p8JPAHogxh2a9B7iUGufjncWX8prq5I+rzAFH15AP2k1y8lzTlO4FTS5R5EcdMpS
-hF/gKh/xUriHtWtPY2POlWVId6nYkRBxVznIby7/Jaxh0/yucbd927vo+Uk0pEEX
-uVELXWfUQahibxUEYsaBvx0q8boVScsHzw7LiqQfgetGC9IingUPjzrqXUNiJKt+
-70z5hycGi86W/qAY2621W6xoHy1gO3cEqynt3CGLXMqMrzXi2iQzIbBEJAqVkZV0
-93fKyu/XurnRRscSC8i1qVLhNy1Bdr8ayrRkDj6wwTYndMpZLrS2em28rKrqMzTh
-Nge35mfquKfbCc/Y+sPAVDflXVKEpl5wTm5PZ7seiLc0G5aq6/A=
-=p2e6
------END PGP SIGNATURE-----

net-im/gajim/files/disable-gspell-1.1.0.patch

@@ -0,0 +1,21 @@
+--- a/gajim/common/app.py	2018-11-06 23:57:20.088079001 +0100
++++ a/gajim/common/app.py	2018-11-06 23:58:36.638834033 +0100
+@@ -299,17 +299,7 @@
+         pass
+ 
+     # GSPELL
+-    try:
+-        gi.require_version('Gspell', '1')
+-        from gi.repository import Gspell
+-        langs = Gspell.language_get_available()
+-        for lang in langs:
+-            log('gajim').info('%s (%s) dict available',
+-                              lang.get_name(), lang.get_code())
+-        if langs:
+-            _dependencies['GSPELL'] = True
+-    except (ImportError, ValueError):
+-        pass
++    # [REMOVED BY EBUILD]
+ 
+     # Print results
+     for dep, val in _dependencies.items():

net-im/gajim/gajim-1.0.3.ebuild

@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-#https://ftp.gajim.org/plugins_1/plugin_installer.zip -> ${P}-plugin_installer.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86-fbsd"
-IUSE="+crypt +dbus idle jingle libsecret networkmanager upnp geoclue spell webp rst"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
-	x11-libs/gtk+: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}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	idle? ( x11-libs/libXScrnSaver )
-	dbus? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	libsecret? ( app-crypt/libsecret[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-v4l2:1.0
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	geoclue? ( app-misc/geoclue[introspection] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
-"
-#	dev-python/precis_i18n[${PYTHON_USEDEP}]
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}

net-im/gajim/gajim-1.1.1.ebuild

@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eapi7-ver gnome2-utils xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/gajim/-/archive/gajim-${PV}/gajim-gajim-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpg +crypt remote idle jingle keyring networkmanager upnp geoclue spell +webp rst omemo"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	x11-libs/gtk+: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}
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/python-nbxmpp-0.6.8[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	crypt? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )
+	gpg? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+	idle? ( x11-libs/libXScrnSaver )
+	remote? (
+		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+		dev-libs/dbus-glib
+	)
+	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	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
+	)
+	networkmanager? ( net-misc/networkmanager[introspection] )
+	upnp? ( net-libs/gupnp-igd[introspection] )
+	geoclue? ( app-misc/geoclue[introspection] )
+	spell? (
+		app-text/gspell[introspection]
+		app-text/hunspell
+	)
+	omemo? (
+		dev-python/python-axolotl[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+	)
+	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="test"
+
+S="${WORKDIR}/gajim-${P}"
+
+src_prepare() {
+	default
+
+	use spell || eapply "${FILESDIR}/disable-gspell-1.1.0.patch"
+	use keyring || sed -i 's/keyring//' setup.cfg || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Gajims build script compresses the man pages. Gentoo would like to
+	# compress them itself.
+	gunzip "${D}/usr/share/man/man1/gajim.1.gz"
+	gunzip "${D}/usr/share/man/man1/gajim-history-manager.1.gz"
+	use remote && gunzip "${D}/usr/share/man/man1/gajim-remote.1.gz"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	ewarn "If you run into segfaults upon starting, you most likely ran into an issue"
+	ewarn "with app-text/enchant (bug 662484). Use USE=\"-spell\" to remedy."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}

net-im/gajim/metadata.xml

@@ -8,9 +8,12 @@
     A fully featured and easy to use GTK+ Jabber client written in PyGTK.
   </longdescription>
   <use>
-    <flag name="idle">support idle</flag>
+    <flag name="geoclue">Use app-misc/geoclue</flag>
-    <flag name="geoclue">support geoclue</flag>
+    <flag name="gpg">Install dependencies for the GPG plugin</flag>
-    <flag name="rst">support rst</flag>
+    <flag name="idle">Enable idle module</flag>
-    <flag name="libsecret">support libsecret</flag>
+    <flag name="keyring">Use dev-python/keyring</flag>
+    <flag name="omemo">Install dependencies for the OMEMO plugin</flag>
+    <flag name="remote">Enable remote control utility</flag>
+    <flag name="rst">Enable dev-python/docutils for formatting</flag>
   </use>
 </pkgmetadata>