4 files changed, 43 insertions, 77 deletions
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.113.0-r10.ebuild
index e142c169..efcd6f97 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.113.0-r10.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild,v 1.6 2015/05/16 10:14:07 jer Exp $
 
 EAPI=5
 
@@ -12,16 +11,10 @@ SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="debug examples +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+KEYWORDS="amd64"
+IUSE="+qt5"
 
 RDEPEND="
-	qt4? ( ~sys-auth/polkit-qt4-${PV} )
 	qt5? ( ~sys-auth/polkit-qt5-${PV} )
 "
 DEPEND=""
-
-# bug #529686
-RESTRICT="test"
diff --git a/sys-auth/polkit-qt5/Manifest b/sys-auth/polkit-qt5/Manifest
index 56e07781..8b9fe5d7 100644
--- a/sys-auth/polkit-qt5/Manifest
+++ b/sys-auth/polkit-qt5/Manifest
@@ -1 +1 @@
-DIST polkit-qt-1-0.112.0.tar.bz2 67725 BLAKE2B 3779fb7a95919b29358592076c6a23b66d73f0b91405e010f13f9512a130434c621a0a551f0da1d5e02eeccb559f774f8366234b24d8130a12982178ec7de143 SHA512 4cb17389b54a09c53052f6d72aa5cbfe09ccb19f7fd4edf8b43ccd4751f5e88609c5f89777f4af92167d32eb2ce1e78537cea7bcfb60a90072d1fe02d6a59b50
+DIST polkit-qt-1-0.113.0.tar.xz 64652 BLAKE2B 52d8c5c8009e2595c70db5b6a6349e4524d6d9cbec12c5a535f25d737da1d16e77fadf3572eebbede7a5ed583c818e878119b416d69a076e03bb37d2f7da7b41 SHA512 deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38
diff --git a/sys-auth/polkit-qt5/polkit-qt5-0.112.0-r1.ebuild b/sys-auth/polkit-qt5/polkit-qt5-0.112.0-r1.ebuild
deleted file mode 100644
index c1b48e4d..00000000
--- a/sys-auth/polkit-qt5/polkit-qt5-0.112.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-qt/polkit-qt-0.112.0-r1.ebuild,v 1.6 2015/05/16 10:14:07 jer Exp $
-
-EAPI=5
-
-MY_P="${P/qt5/qt-1}"
-
-inherit cmake-utils multibuild
-
-DESCRIPTION="PolicyKit Qt5 API wrapper library"
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/apps/KDE4.x/admin/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+qt5 examples"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=sys-auth/polkit-0.103
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README README.porting TODO )
-
-S=${WORKDIR}/${MY_P}
-
-# bug #529686
-RESTRICT="test"
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=()
-	use qt5 && MULTIBUILD_VARIANTS+=( qt5 )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-			$(cmake-utils_use_build examples)
-		)
-
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then
-			mycmakeargs+=( -DUSE_QT5=ON )
-		fi
-
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/sys-auth/polkit-qt5/polkit-qt5-0.113.0-r10.ebuild b/sys-auth/polkit-qt5/polkit-qt5-0.113.0-r10.ebuild
new file mode 100644
index 00000000..7e85ce61
--- /dev/null
+++ b/sys-auth/polkit-qt5/polkit-qt5-0.113.0-r10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="polkit-qt-1"
+inherit cmake kde.org
+
+DESCRIPTION="Qt wrapper around polkit-1 client libraries"
+HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+	S="${WORKDIR}/${KDE_ORG_NAME}-${PV}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=sys-auth/polkit-0.103
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README README.porting TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+	)
+
+	cmake_src_configure
+}