gentoo resync : 28.04.2019

8 files changed, 83 insertions, 340 deletions

diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 07ddd0bd226c..dfda25b2bb6c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,9 +1,4 @@
-AUX 0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch 2104 BLAKE2B 5108a1d471b78b5d5ca66d2979d286013457c014adb37e58514c2997dd1d5a3f131c9dee46a9dce3011701e802c23d40d0e0ccac0d2a473e10b5b321b504b681 SHA512 a9b8c351633aafcc881a4949e72e0ecd89314a93a3a011dad643ff0a64f208654961218e7d7e69af4ae76824d7de88dec3a572cc08aa6338bafa672ef07e4434
-AUX 1.0.3-0001-disable-gspell.patch 798 BLAKE2B 2d5c3d413f078e171e0e7cfc144731302e137c53b7b52cfac3aeb92fc8eb399f8865d25b89c589c1e017a43c4903ed11b1bc3f24f1001b538513a5096e6d29ff SHA512 6dfbbe82517c73412512916480bca049588728cac92099a418b1a2be47480131032cb7536cf67896e8511232d4ce1a9576406326bd237b4ae1f799ffc3a2c83c
-DIST gajim-0.16.6.tar.bz2 4564505 BLAKE2B 0446d826afc782ceba4fe67d6c7173d60264ec1b5a227f0da62285ea1d083143b4895e4472c2df499de419f9a34c59d9afa1ac2348052defb100438782a3df46 SHA512 6c8c2a38429468a1e6f02aae730ff947c649960e8cc672457c1e1733ab2dad6534b1e5ac2e1c0c385e331a6ba817c6e67c1a27443632b9fd43e7ab76ad66c935
-DIST gajim-0.16.9.tar.bz2 4469275 BLAKE2B 451f09cde9d177932429b9ece900e09c58ac43b5f97cd64cf70e75d13f2261ab52ee35e02e8680c83a5d81d7574bca561532dd1327f1109b0cc872956b1a05f7 SHA512 d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
-EBUILD gajim-0.16.6-r1.ebuild 3006 BLAKE2B 70c874dcacc3122ce27e3bf2b3b90581c83935b149b8b183f24a573b6fd37bddf0f001b1bb9c1a002e0d0222da120a5ee6ad828be38ef41d3bd1c70729924465 SHA512 a8262488317680b97871026f3aa27744646011ad5db1e37aab63d1dd6e1d8ad66dc4bf9199124159370d85e9475adf284872ef42765d1386a56a247ae4cb3be8
-EBUILD gajim-0.16.9.ebuild 2925 BLAKE2B b620ea38f3cb316c3b81d8d0f96e3f2e60d2895e7a55d215392a0207e92081a753b601764ec8dbeeb91ec463fd8916bc0d18e7f346d2db05f8887758d7839cbb SHA512 80d3ff43100a87ba1a933ac4374d5a1182deb9c03505ba17ed0fc506b7f18583f0de0cb400cacea13291c83c5a4a30ed369cf8b15d8f02cab1d91cb2bbe52275
-EBUILD gajim-1.0.3.ebuild 2274 BLAKE2B a2ea5f60e398b67466d3fff3813074b9c3ed33c0d3f7d369d8856573f0d02d81336fa7d992584fd3e09c74c896375b9bb3aa720a568b7be326e6bf53c5b3c1b7 SHA512 a6848ab9da4992d1f24d8041f7ff97be6a6b25e8fa067d20ad72f18d287cc1e94f8def5dafb24f5bcca25ed46ac47f89dc20a7dab2074254f84f2f5ae4871dae
-MISC metadata.xml 1306 BLAKE2B bf9a8fbf052f8fabb630101927891307e498f581c28e759c173691d911fd4934493f2f55a260a1a87a05f43540019cb1206290c88480bae339ae9b21ca6705b2 SHA512 00cab839ca70e443606f476a4c71211f60ba8613355330432d8b0803daae76441ed108688e58321eb1864e1d47c0197f020a28c4606568f29a2cf5296aedb37a
+EBUILD gajim-1.0.3-r1.ebuild 2175 BLAKE2B 8b4edb274123a0d6df82ee6776762e21848c47969c67a2d4b6bf9cbc863b2a479df6511959d932c8ebe25e2fe34d076a6dc5390c0f9ab1e30548552ebd5ed1b7 SHA512 3bb95be0156d410949d6237a5084c0e2b4d9b79a1742df8bf10d9f6b349864df9c2813116999ff688a1dd206df5703d52615d79a3e0350b3eeb7bbb3f6ab087b
+EBUILD gajim-1.0.3.ebuild 2173 BLAKE2B 2040e327866a96f479ea97d79975a7394ed4958505ffe02969f27b8e7a28e8f0a57aa3064b7ec6ae99485f287bc9b76f2956f608a01cbf0d80d4ae96a97d572a SHA512 b413d58eddec79a358b4407d40ae7808730e5f7a8b59c9eabcbad822aec7c8a7c114c966ef8640f3fda3ba16a172d8d48cbbaf7bed7e2015b3b7573dc8ecafba
+MISC metadata.xml 1063 BLAKE2B b36cbe426b80b9412e715fd3c66525ed89411e015d4cb2a68e34515e1f63086f75872fc6009d02e57cd0618c52c0a036a09b2a36567b8c390db254d672f72bd2 SHA512 6a045a2dc6ba1d1bd30139943fea34b88844bf8f8fefb6f2a2d389f28287e47ad349749ff240c3dfae96f542ef037417db5283b5169a715eb0788c567b1afdc1
diff --git a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch b/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
deleted file mode 100644
index 046c72c0ca2d..000000000000
--- a/net-im/gajim/files/0.16.6-0001-Add-config-option-to-activate-XEP-0146.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 285392b27db7cb01b0566b4bda3920e6559b75e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
-Date: Fri, 26 May 2017 23:10:05 +0200
-Subject: [PATCH] Add config option to activate XEP-0146 commands
-
-Some of the Commands have security implications, thats why we disable them per default
-Fixes #8378
----
- src/common/commands.py | 7 ++++---
- src/common/config.py   | 1 +
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/common/commands.py b/src/common/commands.py
-index 40d700710..46d6947f8 100644
---- a/src/common/commands.py
-+++ b/src/common/commands.py
-@@ -345,9 +345,10 @@ class ConnectionCommands:
-     def __init__(self):
-         # a list of all commands exposed: node -> command class
-         self.__commands = {}
--        for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
--        LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
--            self.__commands[cmdobj.commandnode] = cmdobj
-+        if gajim.config.get('remote_commands'):
-+            for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand,
-+            LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand):
-+                self.__commands[cmdobj.commandnode] = cmdobj
- 
-         # a list of sessions; keys are tuples (jid, sessionid, node)
-         self.__sessions = {}
-diff --git a/src/common/config.py b/src/common/config.py
-index 3884d9e1d..7c1313fc4 100644
---- a/src/common/config.py
-+++ b/src/common/config.py
-@@ -313,6 +313,7 @@ class Config:
-             'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')],
-             'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')],
-             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
-+            'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')],
-     }, {})
- 
-     __options_per_key = {
--- 
-2.12.2
-
diff --git a/net-im/gajim/files/1.0.3-0001-disable-gspell.patch b/net-im/gajim/files/1.0.3-0001-disable-gspell.patch
deleted file mode 100644
index fbffa1123342..000000000000
--- a/net-im/gajim/files/1.0.3-0001-disable-gspell.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gajim/common/app.py	2018-05-16 05:59:40.278703415 +0300
-+++ b/gajim/common/app.py	2018-05-16 06:00:14.520423471 +0300
-@@ -265,20 +265,6 @@
-     HAVE_IDLE = False
- 
- HAVE_SPELL = False
--try:
--    spell_log = logging.getLogger('gajim.speller')
--    gi.require_version('Gspell', '1')
--    from gi.repository import Gspell
--    langs = Gspell.language_get_available()
--    for lang in langs:
--        spell_log.info('%s (%s) dict available',
--                       lang.get_name(), lang.get_code())
--    if langs:
--        HAVE_SPELL = True
--    else:
--        spell_log.info('No dicts available')
--except (ImportError, ValueError):
--    pass
- 
- gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
- gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE,
diff --git a/net-im/gajim/gajim-0.16.6-r1.ebuild b/net-im/gajim/gajim-0.16.6-r1.ebuild
deleted file mode 100644
index f8bda52c4215..000000000000
--- a/net-im/gajim/gajim-0.16.6-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="
-	https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	gnome? ( gnome-keyring )
-	zeroconf? ( dbus )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	!>=dev-python/pyopenssl-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	kde? ( kde-apps/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-Add-config-option-to-activate-XEP-0146.patch" )
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16.9.ebuild b/net-im/gajim/gajim-0.16.9.ebuild
deleted file mode 100644
index 2285e709078d..000000000000
--- a/net-im/gajim/gajim-0.16.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils gnome2-utils python-r1 versionator xdg-utils
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="
-	https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="crypt dbus gnome gnome-keyring idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	gnome? ( gnome-keyring )
-	zeroconf? ( dbus )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.1[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python[${PYTHON_USEDEP}]
-		dev-python/egg-python[${PYTHON_USEDEP}]
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools
-			)
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..a59f5e9ad7f9
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r1.ebuild
@@ -0,0 +1,78 @@
+# 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 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"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo,${PYTHON_USEDEP}]
+	>=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}
+	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[cairo,${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
+	x11-libs/libXScrnSaver
+	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
+	)
+	keyring? (
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+	)
+	networkmanager? ( net-misc/networkmanager[introspection] )
+	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}] )"
+
+RESTRICT="test"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
index 5b8cac2d108f..719d5ddebbd1 100644
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ b/net-im/gajim/gajim-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}
 LICENSE="GPL-3"
 SLOT="0"
 #KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
 	+webp"
 
@@ -67,12 +67,6 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
-src_prepare() {
-	default
-
-	use spell || eapply "${FILESDIR}/${PV}-0001-disable-gspell.patch"
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 007a414c6fa1..67b5f8003508 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -18,10 +18,5 @@
     <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="zeroconf">Serverless chatting with autodetected clients in a local network</flag>
-
-    <flag name="idle">Enable idle module</flag>
-    <flag name="srv">SRV capabilities</flag>
-    <flag name="xhtml">Enable XHTML support</flag>
   </use>
 </pkgmetadata>