From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 6 Sep 2019 10:28:05 +0100
Subject: gentoo resync : 06.08.2019

---
 net-libs/accounts-qt/Manifest                |  2 +-
 net-libs/accounts-qt/accounts-qt-1.15.ebuild | 34 ++++++++++++++++++----------
 2 files changed, 23 insertions(+), 13 deletions(-)

(limited to 'net-libs/accounts-qt')

diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index 9ed27c0a92e3..57cae0b0b787 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,3 +1,3 @@
 DIST accounts-qt-1.15.tar.gz 64190 BLAKE2B a00f4677d9e99304729af4768c288bce1b19f357e50db0db1264760114b6a9cea821bda112605a49dafa192e10d4d6454155fa94a3dd3cea2a6525d63c129bb4 SHA512 36c80a237bc2d427ce3acb62ac3b2e7878ac7e02b00f17022af326b52edbc7ad3d0cf428fb4e1e2bcc1d0d410054102926f549dc18bea137a9d9ea19a2d268d3
-EBUILD accounts-qt-1.15.ebuild 1015 BLAKE2B df4364b347858a324155cfa77fc160f127cd2fbbc63b09d51ff2b090630a37b1fa44d2579cc184eff6baad659a692e6e0a4324fcf3d55704548fd15f50e2d899 SHA512 f446e59fc7136f6fa2c702627be8a642745687955ae82c47d062ee48b98680d18d635fe5a183268616164d15f80bd2d2db11ee0f8ecf89772c54fa20c51b59dc
+EBUILD accounts-qt-1.15.ebuild 1124 BLAKE2B d61d7f6691e875e94078268a7b3f4c86b1a809f0c652076a10dc35f5d77ac1ae0d7c7dafe259515e2f9847da8312a3f355f6ccca171c67af52d82ce579a21504 SHA512 bc1878077361b7168f637e8ee17a9814d53b3f326019fbe3045966af2aa546d5d0c55b2d2164e7a903b9c3fadf94f6e7185180ece8160962d636a535da0b43b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qt/accounts-qt-1.15.ebuild b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
index 042c2bffddf3..9b7e7c225ad9 100644
--- a/net-libs/accounts-qt/accounts-qt-1.15.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
@@ -1,43 +1,53 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils vcs-snapshot
+inherit qmake-utils
 
 DESCRIPTION="Qt5 bindings for libaccounts-glib"
 HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/archive.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/accounts-sso/lib${PN}/repository/VERSION_${PV}/archive.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
-# dbus problems
-RESTRICT="test"
-
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
-	>=net-libs/libaccounts-glib-1.23:=
 	dev-libs/glib:2
 	dev-qt/qtcore:5
 	dev-qt/qtxml:5
+	>=net-libs/libaccounts-glib-1.23:=
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	test? ( dev-qt/qttest:5 )
 "
 
+# dbus problems
+RESTRICT="test"
+
+S="${WORKDIR}/lib${PN}-VERSION_${PV}-5b272ae218ccdf1f67f4eed92e2cdbe21c56ceb8"
+
 src_prepare() {
 	default
 
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
-	use doc || sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die
-	use test || sed -i -e '/^SUBDIRS/s/tests//' accounts-qt.pro || die "couldn't disable tests"
+	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \
+		-i doc/doc.pri || die
+	if ! use doc; then
+		sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die
+	fi
+	if ! use test; then
+		sed -e '/^SUBDIRS/s/tests//' \
+			-i accounts-qt.pro || die "couldn't disable tests"
+	fi
 }
 
 src_configure() {
-	eqmake5 LIBDIR="${EPREFIX%/}/usr/$(get_libdir)"
+	eqmake5 LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
-- 
cgit v1.2.3