10 files changed, 22 insertions, 18 deletions
diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index 01309c3b..b9e554c7 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -380,7 +380,7 @@
 =kde-base/ksame-3.5.10
 =kde-base/ksayit-3.5.10
 =kde-base/kscd-3.5.10
-=kde-base/kscreensaver-3.5.10
+=kde-plasma/kscreensaver-3.5.10
 =kde-base/kshisen-3.5.10
 =kde-base/ksig-3.5.10
 =kde-base/ksim-3.5.10
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 7f13bf43..c7df4269 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.175 2009/11/01 20:26:34 abcd Exp $
 
 # @ECLASS: kde-functions.eclass
 # @MAINTAINER:
@@ -85,7 +84,7 @@ kde-base/kdebase kde-apps/konsole
 kde-base/kdebase kde-base/kpager
 kde-base/kdebase kde-base/kpersonalizer
 kde-base/kdebase kde-apps/kreadconfig
-kde-base/kdebase kde-base/kscreensaver
+kde-base/kdebase kde-plasma/kscreensaver
 kde-base/kdebase kde-base/ksmserver
 kde-base/kdebase kde-base/ksplashml
 kde-base/kdebase kde-apps/kstart
diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
index fb1139de..3502b817 100644
--- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.10.ebuild,v 1.7 2009/07/12 11:45:53 armin76 Exp $
 
 EAPI="1"
+
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
 inherit kde-meta
@@ -10,7 +10,10 @@ inherit kde-meta
 DESCRIPTION="Extra screensavers for kde"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="opengl xscreensaver"
-DEPEND="|| ( >=kde-base/kscreensaver-${PV}:${SLOT} >=kde-base/kdebase-${PV}:${SLOT} )
+DEPEND="|| (
+		>=kde-plasma/kscreensaver-${PV}:${SLOT}
+		>=kde-base/kdebase-${PV}:${SLOT}
+	)
 	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
index 92cf33f5..df07c9c0 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.10.ebuild
@@ -40,7 +40,7 @@ RDEPEND=">=kde-base/kdebase-startkde-${PV}:${SLOT}
 >=kde-base/kpager-${PV}:${SLOT}
 >=kde-base/kpersonalizer-${PV}:${SLOT}
 >=kde-apps/kreadconfig-${PV}:${SLOT}
->=kde-base/kscreensaver-${PV}:${SLOT}
+>=kde-plasma/kscreensaver-${PV}:${SLOT}
 >=kde-base/ksmserver-${PV}:${SLOT}
 >=kde-base/ksplashml-${PV}:${SLOT}
 >=kde-apps/kstart-${PV}:${SLOT}
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
deleted file mode 100644
index c092bb21..00000000
--- a/kde-base/kscreensaver/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdebase-3.5.10.tar.bz2 24339704 SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
diff --git a/kde-base/kscreensaver/metadata.xml b/kde-base/kscreensaver/metadata.xml
deleted file mode 100644
index 6f49eba8..00000000
--- a/kde-base/kscreensaver/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-plasma/kscreensaver/ChangeLog
index 34c2f0dd..34c2f0dd 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-plasma/kscreensaver/ChangeLog
diff --git a/kde-plasma/kscreensaver/Manifest b/kde-plasma/kscreensaver/Manifest
index 74770098..1e2b88fe 100644
--- a/kde-plasma/kscreensaver/Manifest
+++ b/kde-plasma/kscreensaver/Manifest
@@ -1 +1,2 @@
 DIST kde-workspace-4.11.22.tar.xz 13553668 BLAKE2B 119f48758bd4d7eb32ebe5dd031de9afe31382f7c001edadf985486a860caa3adb4f170aaf763a9bbba10af21622a31740db12bedaa9caf201e0f00ae1bdff12 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95
+DIST kdebase-3.5.10.tar.bz2 24339704 BLAKE2B 5eb00fe6d1f2a83252bad6619df91091c455e319e81ce6f9f2ca04994ffd5cc1cc3c678ece7db76ff3538579c2a38eb0eb2aa2b7707a40e9c962da21565b4def SHA512 f83ea197cedfce3b2be3038c25a88131f210183a8330d8bfb503e84ea8df2dd019b2f245de1ed75d8102f95f69fbde3d26c29e2ae228cbbd270ad2aadacb8db6
diff --git a/kde-base/kscreensaver/kscreensaver-3.5.10.ebuild b/kde-plasma/kscreensaver/kscreensaver-3.5.10.ebuild
index ba49dca1..f8e01d76 100644
--- a/kde-base/kscreensaver/kscreensaver-3.5.10.ebuild
+++ b/kde-plasma/kscreensaver/kscreensaver-3.5.10.ebuild
@@ -1,14 +1,20 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.5.10.ebuild,v 1.8 2009/07/12 09:44:59 armin76 Exp $
 
 EAPI="1"
+
+KDE_MINIMAL="${PV}"
+KDEBASE=true
 KMNAME=kdebase
 inherit kde-meta eutils
 
-DESCRIPTION="KDE screensaver framework"
+DESCRIPTION="KDE Plasma screensaver framework"
+SRC_URI="mirror://kde/Attic/stable/${PV}/src/${KMNAME}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3.5"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE="kdehiddenvisibility opengl"
+IUSE="debug kdehiddenvisibility opengl"
 
 DEPEND="x11-libs/libXt
 	opengl? ( virtual/opengl )"
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
index 40ea1820..7ea4f1eb 100644
--- a/profiles/updates/3Q-2020
+++ b/profiles/updates/3Q-2020
@@ -12,3 +12,4 @@ move kde-apps/okteta app-editors/okteta
 move kde-apps/kstars sci-astronomy/kstars
 move kde-apps/drkonqi kde-plasma/drkonqi
 move kde-apps/kjots app-text/kjots
+move kde-base/kscreensaver kde-plasma/kscreensaver