From ef87de6f31ec3ba7d79f11114f2bdede6e2a163a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@protonmail.com>
Date: Sun, 13 Sep 2020 02:30:07 +0200
Subject: [PATCH] x11-misc/screenkey: bump to 1.2; drop old; update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Maciej Barć <xgqt@protonmail.com>
---
 x11-misc/screenkey/Manifest                       |  2 +-
 ...{screenkey-0.9.ebuild => screenkey-1.2.ebuild} | 15 +++++++++------
 x11-misc/screenkey/screenkey-9999.ebuild          | 15 +++++++++------
 3 files changed, 19 insertions(+), 13 deletions(-)
 rename x11-misc/screenkey/{screenkey-0.9.ebuild => screenkey-1.2.ebuild} (72%)

diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index 451cdc5..cca4d0a 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -1 +1 @@
-DIST screenkey-0.9.tar.gz 58220 BLAKE2B 1f12e01f741148356dd293907aa2ae324f7cdb3c2a31fd4b04cea598ca33d805ebc4a51f71324553ac211dd23c99727240f47069b053bc3b098afb865d28ba93 SHA512 99f069f6f64d0812b526b7550b713bcd99e39756b07591d4e546273efcd085790e44f1586b6562f71f5a8dd22e755f17076f3e6c44bf0ed9b43b05c10d7fcbfa
+DIST screenkey-1.2.tar.gz 65396 BLAKE2B 90795d3a4918a3a35faa13fccdea2060f75f2a258571c4e7e1b173881705b26bcfe6b66858ddf69f3bfc69dc556009cac456b30dd1423e7c7b58488470ffd19d SHA512 06fd59dc23c37402714a461309e6f1bbfd8a59cf6cfc27dbd0f9a0e7bea244149fb37975a612db0d85555e458b3c67eaf8387a84b72a3de1cf5bc5507d3972eb
diff --git a/x11-misc/screenkey/screenkey-0.9.ebuild b/x11-misc/screenkey/screenkey-1.2.ebuild
similarity index 72%
rename from x11-misc/screenkey/screenkey-0.9.ebuild
rename to x11-misc/screenkey/screenkey-1.2.ebuild
index e32428a..7a36a62 100644
--- a/x11-misc/screenkey/screenkey-0.9.ebuild
+++ b/x11-misc/screenkey/screenkey-1.2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
@@ -16,18 +16,17 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://www.thregr.org/~wavexx/software/${PN}/releases/${P}.tar.gz"
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 RESTRICT="mirror"
-LICENSE="GPL-3+"
+LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
 BDEPEND="
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -37,6 +36,10 @@ RDEPEND="
 
 src_prepare() {
 	xdg_environment_reset
+
+	# Change the doc install path
+	sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
 	default
 }
 
diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild
index e32428a..7a36a62 100644
--- a/x11-misc/screenkey/screenkey-9999.ebuild
+++ b/x11-misc/screenkey/screenkey-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
 
 DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
 HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
@@ -16,18 +16,17 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://www.thregr.org/~wavexx/software/${PN}/releases/${P}.tar.gz"
+	SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 RESTRICT="mirror"
-LICENSE="GPL-3+"
+LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
 BDEPEND="
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 RDEPEND="
 	dev-python/pycairo[${PYTHON_USEDEP}]
@@ -37,6 +36,10 @@ RDEPEND="
 
 src_prepare() {
 	xdg_environment_reset
+
+	# Change the doc install path
+	sed -i "s/share\/doc\/screenkey/share\/doc\/${P}/g" setup.py || die
+
 	default
 }