From ee0bb1524f6d9594f5302d458ab56b46a2784d72 Mon Sep 17 00:00:00 2001
From: Parona <5734703-Parona@users.noreply.gitlab.com>
Date: Mon, 1 Jun 2020 15:21:37 +0300
Subject: [PATCH] dev-libs/libQuotient: fixed issues

---
 dev-libs/libQuotient/Manifest                 |  2 --
 .../libQuotient/libQuotient-0.6_beta1.ebuild  | 25 ++++++++++---------
 dev-libs/libQuotient/libQuotient-9999.ebuild  | 21 +++++++++-------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/dev-libs/libQuotient/Manifest b/dev-libs/libQuotient/Manifest
index 1a9afc8..3216aab 100644
--- a/dev-libs/libQuotient/Manifest
+++ b/dev-libs/libQuotient/Manifest
@@ -1,3 +1 @@
 DIST libQuotient-0.6_beta1.tar.gz 549192 BLAKE2B e91e08bb2cfe8b369d79ae9d4514c15097042d74510d8d7428c25c12b635974fb637a126e4d87f34f9913f7d65ea14c5b83a5ebc2ed57039dc9fb884112e03bc SHA512 255560ee9a827ce140291859c9a7d11c718094b38a06e4555539aeda055daacd6a354e6685d67991fbbf2b407ab92b12986b854c27b81cfddb7b9b26c0e80e04
-EBUILD libQuotient-0.6_beta1.ebuild 840 BLAKE2B 2c57c4d8d6fe552e06f6885d608a1bf1ef793fd7ee36a3e06cf9379a2dba2ac1fc88eddc5f309b53d14012ee6727aeb401446c0ef4f27fea24968f45aebd8138 SHA512 51cd109d36b1cdb4c7759eb88b2d1fcea58c5d6de95767f848a2c767ed6a280d8b57565301c4024977ccfd0038c3b733d92fe3aa7ad165930af358837326ec4e
-EBUILD libQuotient-9999.ebuild 741 BLAKE2B dffbd0703ea438013e2be79d7a934e39ea463cb63b59f7db5c89f40b8dded85fd047b4aa685a21396756715285d6527eead8e50e9405042f7bd3a000a08d39c2 SHA512 c2a1fc3c33f8aac3c20d8495348b86ce58bffb65a8ce8c8ef9b985a141955ff0f624dd6a4b3c6de0a1d1c6a5ecef439c782bfb91f05c9aa05704fc13544eca61
diff --git a/dev-libs/libQuotient/libQuotient-0.6_beta1.ebuild b/dev-libs/libQuotient/libQuotient-0.6_beta1.ebuild
index 044d8b4..b7ee68e 100644
--- a/dev-libs/libQuotient/libQuotient-0.6_beta1.ebuild
+++ b/dev-libs/libQuotient/libQuotient-0.6_beta1.ebuild
@@ -1,22 +1,21 @@
- 
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
 HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake-utils
 
-#https://github.com/quotient-im/libQuotient/archive/0.6-beta1.tar.gz
-if [[ ${PV} == "9999" ]];
-then
-	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+MY_PV="$(ver_rs 2 '-')"
+
+if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
 else
-     SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
@@ -24,12 +23,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
 	dev-qt/qtmultimedia
-	!!dev-libs/libqmatrixclient"
+	!!dev-libs/libqmatrixclient
+"
 
-S="${WORKDIR}"/${PN}-${PV/_/\-}	
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libQuotient/libQuotient-9999.ebuild b/dev-libs/libQuotient/libQuotient-9999.ebuild
index 3f82e11..b7ee68e 100644
--- a/dev-libs/libQuotient/libQuotient-9999.ebuild
+++ b/dev-libs/libQuotient/libQuotient-9999.ebuild
@@ -1,22 +1,21 @@
- 
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
 HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake-utils
 
+MY_PV="$(ver_rs 2 '-')"
+
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
 else
-	SRC_URI="https://github.com/quotient-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
@@ -24,10 +23,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/qtcore
 	dev-qt/qtmultimedia
-	!!dev-libs/libqmatrixclient"
+	!!dev-libs/libqmatrixclient
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_configure() {
 	local mycmakeargs=(