sys-auth/polkit-kde-agent: pkgmove to kde-plasma/polkit-kde-agent

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

6 files changed, 13 insertions, 17 deletions

diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
index 56538df9..dff50efc 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.37.ebuild
@@ -115,10 +115,7 @@ PDEPEND="
 	>=x11-libs/libXtst-1.1.0
 	x11-misc/xdg-utils
 	handbook? ( kde-apps/khelpcenter:* )
-	policykit? ( || (
-		>=sys-auth/polkit-kde-agent-0.99
-		kde-plasma/polkit-kde-agent
-	) )
+	policykit? ( kde-plasma/polkit-kde-agent:* )
 "
 
 DOCS=( AUTHORS README{,-WIN32.TXT} TODO )
diff --git a/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild b/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
index 9af17e74..17dbd151 100644
--- a/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
+++ b/kde-misc/kcm-ufw/kcm-ufw-0.4.3-r1.ebuild
@@ -16,19 +16,18 @@ HOMEPAGE="http://kde-apps.org/content/show.php?content=137789"
 SRC_URI="http://craigd.wikispaces.com/file/view/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
 SLOT="4"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
-	${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	>=net-firewall/ufw-0.31
-	sys-auth/polkit-kde-agent
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kcmshell)
+	kde-plasma/polkit-kde-agent:*
 "
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-auth/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 2a4c02f9..2a4c02f9 100644
--- a/sys-auth/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
diff --git a/sys-auth/polkit-kde-agent/metadata.xml b/kde-plasma/polkit-kde-agent/metadata.xml
index 282ea1c4..282ea1c4 100644
--- a/sys-auth/polkit-kde-agent/metadata.xml
+++ b/kde-plasma/polkit-kde-agent/metadata.xml
diff --git a/sys-auth/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild
index 869d85ef..4dc41b4b 100644
--- a/sys-auth/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-0.99.1-r1.ebuild
@@ -10,24 +10,23 @@ inherit kde4-base
 
 DESCRIPTION="PolKit agent module for KDE"
 HOMEPAGE="https://www.kde.org"
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN/-agent/}_${PV}.orig.tar.xz"
-	S=${WORKDIR}/${MY_P}
-fi
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN/-agent/}_${PV}.orig.tar.xz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
 SLOT="4"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug minimal"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=sys-auth/polkit-qt-0.103.0[qt4(-)]
-	!sys-auth/polkit-kde
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
-
+RDEPEND="${COMMON_DEPEND}
+	!sys-auth/polkit-kde
+"
 src_prepare() {
 	kde4-base_src_prepare
 
diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020
new file mode 100644
index 00000000..2358f6fa
--- /dev/null
+++ b/profiles/updates/4Q-2020
@@ -0,0 +1 @@
+move sys-auth/polkit-kde-agent kde-plasma/polkit-kde-agent