From 81aa0b62d41d48c084cceb5cec416a2a97757da2 Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Tue, 8 Jan 2019 11:00:48 +0100
Subject: [PATCH] net-im/gajim-omemo: adjust to gajim >=1.1

---
 ...2.5.6.ebuild => gajim-omemo-2.5.10.ebuild} | 19 ++++++++++----
 net-im/gajim-omemo/gajim-omemo-9999.ebuild    | 26 +++++++++++++------
 2 files changed, 32 insertions(+), 13 deletions(-)
 rename net-im/gajim-omemo/{gajim-omemo-2.5.6.ebuild => gajim-omemo-2.5.10.ebuild} (66%)

diff --git a/net-im/gajim-omemo/gajim-omemo-2.5.6.ebuild b/net-im/gajim-omemo/gajim-omemo-2.5.10.ebuild
similarity index 66%
rename from net-im/gajim-omemo/gajim-omemo-2.5.6.ebuild
rename to net-im/gajim-omemo/gajim-omemo-2.5.10.ebuild
index be0b72d..36346ea 100644
--- a/net-im/gajim-omemo/gajim-omemo-2.5.6.ebuild
+++ b/net-im/gajim-omemo/gajim-omemo-2.5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,9 @@ EAPI=6
 DESCRIPTION="Gajim plugin for OMEMO XMPP end-to-end encryption"
 HOMEPAGE="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
 
-inherit git-r3
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit git-r3 python-r1 python-utils-r1
 
 EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim-plugins.git"
 
@@ -23,14 +25,21 @@ IUSE=""
 
 DEPEND="dev-python/python-axolotl
 		dev-python/qrcode
-		dev-python/cryptography"
+		dev-python/cryptography
+		>=net-im/gajim-1.1"
 
 RDEPEND="${DEPEND}"
 
-src_install() {
-	local PLUGIN_DIR="/usr/share/gajim/plugins"
+install_omemo() {
+	python_export PYTHON_SITEDIR
+	local GAJIM_SITEPACKAGE="$PYTHON_SITEDIR/gajim/)"
+	local PLUGIN_DIR="${GAJIM_SITEPACKAGE}/data/plugins"
 	local OMEMO_PLUGIN_DIR="${PLUGIN_DIR}/omemo"
 	dodir "${PLUGIN_DIR}"
 	dodir "${OMEMO_PLUGIN_DIR}"
 	cp -pPR "${S}"/omemo/* "${D}/${OMEMO_PLUGIN_DIR}" || die "Installing files failed"
 }
+
+src_install() {
+	python_foreach_impl install_omemo
+}
diff --git a/net-im/gajim-omemo/gajim-omemo-9999.ebuild b/net-im/gajim-omemo/gajim-omemo-9999.ebuild
index 5e6d25d..36346ea 100644
--- a/net-im/gajim-omemo/gajim-omemo-9999.ebuild
+++ b/net-im/gajim-omemo/gajim-omemo-9999.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-DESCRIPTION="Gajim plugin for XEP proposal: OMEMO Encryption"
+DESCRIPTION="Gajim plugin for OMEMO XMPP end-to-end encryption"
 HOMEPAGE="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
 
-inherit git-r3
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit git-r3 python-r1 python-utils-r1
+
 EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim-plugins.git"
 
 if [[ "${PV}" = "9999" ]] ; then
 	KEYWORDS=""
 else
-	EGIT_COMMIT="5a6d4d2679da188cae0323579c6ac9fa9b5a8dc9"
+	EGIT_COMMIT="omemo_${PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -22,14 +25,21 @@ IUSE=""
 
 DEPEND="dev-python/python-axolotl
 		dev-python/qrcode
-		dev-python/cryptography"
+		dev-python/cryptography
+		>=net-im/gajim-1.1"
 
 RDEPEND="${DEPEND}"
 
-src_install() {
-	local PLUGIN_DIR="/usr/share/gajim/plugins"
+install_omemo() {
+	python_export PYTHON_SITEDIR
+	local GAJIM_SITEPACKAGE="$PYTHON_SITEDIR/gajim/)"
+	local PLUGIN_DIR="${GAJIM_SITEPACKAGE}/data/plugins"
 	local OMEMO_PLUGIN_DIR="${PLUGIN_DIR}/omemo"
 	dodir "${PLUGIN_DIR}"
 	dodir "${OMEMO_PLUGIN_DIR}"
 	cp -pPR "${S}"/omemo/* "${D}/${OMEMO_PLUGIN_DIR}" || die "Installing files failed"
 }
+
+src_install() {
+	python_foreach_impl install_omemo
+}