From 9cc8982400493cef40e58176d90afdd031b5dc4d Mon Sep 17 00:00:00 2001
From: Tobias Klaus <tk+gentoo@meskal.net>
Date: Tue, 22 May 2018 12:49:13 +0200
Subject: [PATCH] net-im/gajim: use adapted ebuild from bugtracker

https://bugs.gentoo.org/651616
https://651616.bugs.gentoo.org/attachment.cgi?id=527266

Package-Manager: Portage-2.3.38, Repoman-2.3.9
Manifest-Sign-Key: 01A82408BDE3C5613399B9F57B0F1A69527F615C
---
 net-im/gajim/gajim-1.0.3.ebuild | 76 +++++++++++++++++++++------------
 net-im/gajim/metadata.xml       |  5 ++-
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
index 7d76001..17fe1f7 100644
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ b/net-im/gajim/gajim-1.0.3.ebuild
@@ -1,56 +1,76 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python3_5 )
 PYTHON_REQ_USE="sqlite,xml"
 
-AUTOTOOLS_AUTORECONF=true
-
-if [[ "$PV" == "9999" ]] ; then
-	inherit distutils-r1 python-r1 versionator git-r3
-	EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim.git"
-else
-	inherit distutils-r1 python-r1 versionator
-	SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-fi
+inherit gnome2-utils distutils-r1 versionator xdg-utils
 
 DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
+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 ~x86"
-IUSE="crypt dbus networkmanager nls spell +srv test X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm ~x86-fbsd"
+IUSE="+crypt +dbus idle jingle libsecret networkmanager upnp geoclue spell webp rst"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	x11-libs/gtk+:3"
+	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/pyopenssl-0.14[${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[${PYTHON_USEDEP}]
+		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}]
 		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
+	)
+	idle? ( x11-libs/libXScrnSaver )
 	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
 		dev-libs/dbus-glib
-		)
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gspell )"
+	)
+	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
+}
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 5d3be49..4c3593f 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -8,6 +8,9 @@
     A fully featured and easy to use GTK+ Jabber client written in PyGTK.
   </longdescription>
   <use>
-    <flag name="srv">SRV capabilities</flag>
+    <flag name="idle">support idle</flag>
+    <flag name="geoclue">support geoclue</flag>
+    <flag name="rst">support rst</flag>
+    <flag name="libsecret">support libsecret</flag>
   </use>
 </pkgmetadata>