minor updates

11 files changed, 116 insertions, 37 deletions

diff --git a/net-im/utox/utox-9999.ebuild b/net-im/utox/utox-9999.ebuild
index 0a47d57..6eeae14 100644
--- a/net-im/utox/utox-9999.ebuild
+++ b/net-im/utox/utox-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils fdo-mime git-2 gnome2-utils toolchain-funcs
+inherit eutils fdo-mime git-r3 gnome2-utils toolchain-funcs
 
 DESCRIPTION="Lightweight Tox client"
 HOMEPAGE="https://github.com/notsecure/uTox"
diff --git a/net-p2p/pybitmessage/pybitmessage-9999.ebuild b/net-p2p/pybitmessage/pybitmessage-9999.ebuild
index f664105..c666e20 100644
--- a/net-p2p/pybitmessage/pybitmessage-9999.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-9999.ebuild
@@ -10,7 +10,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils python-r1 gnome2-utils git-2
+inherit eutils python-r1 gnome2-utils git-r3
 
 DESCRIPTION="P2P communications protocol"
 HOMEPAGE="https://bitmessage.org"
diff --git a/profiles/package.mask b/profiles/package.mask
index 4228b2d..e64b26e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -27,6 +27,7 @@ x11-plugins/telegram-purple
 net-im/cutegram
 
 # unfinished
+dev-db/gstore
 www-client/hardzilla
 # =www-plugins/gnash-9999
 
diff --git a/www-client/torbrowser/torbrowser-60.2.1_p802.ebuild b/www-client/torbrowser/torbrowser-60.2.1_p802.ebuild
index 6e9be18..fdba09a 100644
--- a/www-client/torbrowser/torbrowser-60.2.1_p802.ebuild
+++ b/www-client/torbrowser/torbrowser-60.2.1_p802.ebuild
@@ -22,7 +22,7 @@ TOR_COMMIT="tor-browser-${MOZ_PV}-${TOR_PV%.*}-1-build1"
 PATCH="${MY_PN}-60.0-patches-03"
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
-                mozconfig-v6.60 pax-utils autotools
+                mozcoreconf-v6 pax-utils autotools
 
 DESCRIPTION="The Tor Browser"
 HOMEPAGE="https://www.torproject.org/projects/torbrowser.html
diff --git a/www-servers/onionshare/ChangeLog b/www-servers/onionshare/ChangeLog
deleted file mode 100644
index 772894b..0000000
--- a/www-servers/onionshare/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-*onionshare-0.8.1 (08 Dec 2015)
-
-  08 Dec 2015; Poncho <poncho@spahan.ch> +onionshare-0.8.1.ebuild,
-  -onionshare-0.8.ebuild:
-  www-servers/onionshare: version bump
-
-*onionshare-0.8 (06 Dec 2015)
-
-  06 Dec 2015; Poncho <poncho@spahan.ch> +onionshare-0.8.ebuild,
-  -onionshare-9999.ebuild:
-  www-servers/onionshare: use release
-
-  22 Nov 2015; Poncho <poncho@spahan.ch> onionshare-9999.ebuild:
-  www-servers/onionshare: update ports  see https://github.com/micahflee/onionsh
-  are/commit/35c1c9cbcbee98791a5f67a906b331b2cb806aaa
-
-*onionshare-9999 (16 Nov 2015)
-
-  16 Nov 2015; Poncho <poncho@spahan.ch> +onionshare-9999.ebuild, -Manifest,
-  -onionshare-0.6.ebuild:
-  www-servers/onionshare: add live ebuild  this version supports ephemeral
-  hidden services see
-  https://github.com/micahflee/onionshare/issues/178#issuecomment-156879472
-
-*onionshare-0.6 (06 Dec 2014)
-
-  06 Dec 2014; Poncho <poncho@spahan.ch> +metadata.xml, +onionshare-0.6.ebuild:
-  www-servers/onionshare: new ebuild
diff --git a/www-servers/onionshare/Manifest b/www-servers/onionshare/Manifest
index 70a5a8f..75b445d 100644
--- a/www-servers/onionshare/Manifest
+++ b/www-servers/onionshare/Manifest
@@ -1 +1 @@
-DIST onionshare-1.1.tar.gz 450274 SHA256 ca9664aea06d512f8917f384b7d04f7efde77538a5e3670e07c37c65cc5a1adf SHA512 6c8030cf610932ec003622738754116410649fbaacdca91475030f1f92c1359922d42a8555ddaae4a10ed30fe6b1f27d5eff2c9f30a1f03cc9c25504c18bc6c3 WHIRLPOOL 39dbcb10b388dc44b7b732567f28f9fa305937252bc24ff46ce3deafc25c3a00b06270cb1316ea0bc1c6435097654103caf7e53478d5b0e1fa6f72e321c2d480
+DIST onionshare-2.2.tar.gz 3319589 BLAKE2B 8e7dcb118da11993d9e3eefed0148cd6dd1ad70e432a0f9df84ea3795fca97a0d95f5f9289318b50c7456d3d33054d10ac40547cab93528edb07d2dd35f7a032 SHA512 1c2575bc8254d6123294dc9a47e700e0a346e3ba22b71994546853a34377d7fef5abb38c78cfd08badce35d16ae55633ea52d42589323e6dd484a192a8993c38
diff --git a/www-servers/onionshare/files/2.2-org.onionshare.OnionShare.desktop-fix-StartupWMClass.patch b/www-servers/onionshare/files/2.2-org.onionshare.OnionShare.desktop-fix-StartupWMClass.patch
new file mode 100644
index 0000000..7f859c6
--- /dev/null
+++ b/www-servers/onionshare/files/2.2-org.onionshare.OnionShare.desktop-fix-StartupWMClass.patch
@@ -0,0 +1,23 @@
+From 8cfb8141b8563595acf2eb13d281d5800f148481 Mon Sep 17 00:00:00 2001
+From: Poncho <poncho@spahan.ch>
+Date: Sun, 13 Oct 2019 23:07:07 +0200
+Subject: [PATCH 2/2] install/org.onionshare.OnionShare.desktop: fix
+ StartupWMClass
+
+---
+ install/org.onionshare.OnionShare.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/install/org.onionshare.OnionShare.desktop b/install/org.onionshare.OnionShare.desktop
+index 536d73c..6facec0 100644
+--- a/install/org.onionshare.OnionShare.desktop
++++ b/install/org.onionshare.OnionShare.desktop
+@@ -13,4 +13,4 @@ Keywords=tor;anonymity;privacy;onion service;file sharing;file hosting;
+ Keywords[da]=tor;anonymitet;privatliv;onion-tjeneste;fildeling;filhosting;
+ Keywords[de]=tor;Anonymität;Privatsphäre;Onion-Service;File-Sharing;File-Hosting;
+ StartupNotify=true
+-StartupWMClass=onionshare
++StartupWMClass=onionshare-gui
+-- 
+2.21.0
+
diff --git a/www-servers/onionshare/files/2.2-scripts-onionshare-nautilus.py-use-python3.patch b/www-servers/onionshare/files/2.2-scripts-onionshare-nautilus.py-use-python3.patch
new file mode 100644
index 0000000..ef9a662
--- /dev/null
+++ b/www-servers/onionshare/files/2.2-scripts-onionshare-nautilus.py-use-python3.patch
@@ -0,0 +1,38 @@
+From 2e998ed03bff63b84fb76e855f71b06ad6d16051 Mon Sep 17 00:00:00 2001
+From: Poncho <poncho@spahan.ch>
+Date: Sun, 13 Oct 2019 23:04:21 +0200
+Subject: [PATCH 1/2] install/scripts/onionshare-nautilus.py: use python3
+
+---
+ install/scripts/onionshare-nautilus.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/install/scripts/onionshare-nautilus.py b/install/scripts/onionshare-nautilus.py
+index dad2330..44717db 100644
+--- a/install/scripts/onionshare-nautilus.py
++++ b/install/scripts/onionshare-nautilus.py
+@@ -1,9 +1,11 @@
++#!/usr/bin/env python3
++
+ import os
+ import sys
+ import json
+ import locale
+ import subprocess
+-import urllib
++import urllib.request
+ import gi
+ 
+ gi.require_version("Nautilus", "3.0")
+@@ -67,7 +69,7 @@ class OnionShareExtension(GObject.GObject, Nautilus.MenuProvider):
+     def url2path(self, url):
+         file_uri = url.get_activation_uri()
+         arg_uri = file_uri[7:]
+-        path = urllib.url2pathname(arg_uri)
++        path = urllib.request.url2pathname(arg_uri)
+         return path
+ 
+     def exec_onionshare(self, filenames):
+-- 
+2.21.0
+
diff --git a/www-servers/onionshare/metadata.xml b/www-servers/onionshare/metadata.xml
index 5b9afc8..20e50d3 100644
--- a/www-servers/onionshare/metadata.xml
+++ b/www-servers/onionshare/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-        <email>poncho@spahan.ch</email>
-        <name>Poncho</name>
-</maintainer>
+        <maintainer type="person">
+                <email>poncho@spahan.ch</email>
+                <name>Poncho</name>
+        </maintainer>
+        <use>
+                <flag name="nautilus">Add support for the nautilus menu integration</flag>
+        </use>
 </pkgmetadata>
diff --git a/www-servers/onionshare/onionshare-2.2.ebuild b/www-servers/onionshare/onionshare-2.2.ebuild
new file mode 100644
index 0000000..b2489d5
--- /dev/null
+++ b/www-servers/onionshare/onionshare-2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Securely and anonymously send and receive files over Tor"
+HOMEPAGE="https://onionshare.org/"
+SRC_URI="https://github.com/micahflee/onionshare/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nautilus test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="${PYTHON_DEPS}
+        test? ( dev-python/pycrypto[${PYTHON_USEDEP}]
+                dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+                dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+        dev-python/flask[${PYTHON_USEDEP}]
+        >=dev-python/flask-httpauth-3.2.4[${PYTHON_USEDEP}]
+        dev-python/pycrypto[${PYTHON_USEDEP}]
+        dev-python/PyQt5[${PYTHON_USEDEP}]
+        dev-python/PySocks[${PYTHON_USEDEP}]
+        >=net-libs/stem-1.6.0[${PYTHON_USEDEP}]
+        >=net-vpn/tor-0.2.7.1
+        nautilus? ( dev-python/nautilus-python )"
+
+PATCHES=(
+        "${FILESDIR}"/2.2-org.onionshare.OnionShare.desktop-fix-StartupWMClass.patch
+        "${FILESDIR}"/2.2-scripts-onionshare-nautilus.py-use-python3.patch
+)
+
+python_test() {
+        ${EPYTHON} -m pytest tests/ || die
+}
diff --git a/x11-misc/interrobang/interrobang-9999.ebuild b/x11-misc/interrobang/interrobang-9999.ebuild
index e9539ac..97cf4dd 100644
--- a/x11-misc/interrobang/interrobang-9999.ebuild
+++ b/x11-misc/interrobang/interrobang-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic git-2 toolchain-funcs
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="A tiny launcher menu packing a big bang (syntax)"
 HOMEPAGE="http://github.com/TrilbyWhite/interrobang.git"