kde-base/systemsettings -> kde-plasma/systemsettings

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index 9e2337dd13e044949e0700a0b3ff6351e68c4353..ae913fb418e1582c7e96ca8fab85515b9091283c 100644 (file)
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
        $(add_kdebase_dep kstartupconfig)
        $(add_kdebase_dep kwin)
        $(add_kdebase_dep plasma-workspace)
-       $(add_kdebase_dep systemsettings)
+       kde-plasma/systemsettings:4
        x11-apps/mkfontdir
        x11-apps/xmessage
        x11-apps/xprop

diff --git a/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild b/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild
index e9a8cfe91ab7697cd314eb01ba8c240d2f3fbd15..670eb624c09d2b15500acbd5c6cb489ae632c8b2 100644 (file)
--- a/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild
+++ b/kde-base/legacy-icons/legacy-icons-4.11.22-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
        !kde-apps/libkipi:5
        !<kde-apps/libksane-15.08.3-r1:4
        !kde-apps/libksane:5
-       !<kde-base/systemsettings-4.11.22-r1:4
+       !<kde-plasma/systemsettings-4.11.22-r1:4
        !=kde-frameworks/oxygen-icons-5.19.0:5
        !=kde-frameworks/oxygen-icons-5.20.0:5
 "

diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
deleted file mode 100644 (file)
index db5163f..0000000
--- a/kde-base/systemsettings/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802

diff --git a/kde-base/systemsettings/metadata.xml b/kde-base/systemsettings/metadata.xml
deleted file mode 100644 (file)
index 857b07b..0000000
--- a/kde-base/systemsettings/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="project">
-               <email>kde@gentoo.org</email>
-               <name>Gentoo KDE Project</name>
-       </maintainer>
-       <use>
-               <flag name="kscreen">Use <pkg>kde-plasma/kscreen</pkg> for screen management</flag>
-       </use>
-</pkgmetadata>

diff --git a/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild
index 9924b0cfa99f7dc4b3ea14af9cb2ae328b0d0c6f..abf6876d802c2aa88ff81bb34d3dbc76e314557e 100644 (file)
--- a/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.7.5.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        $(add_plasma_dep kde-cli-tools)
        !kde-plasma/khotkeys:4
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        x11-libs/libxcb

diff --git a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
index 2f45d76012731e3cf7c917aec4aa044973f04a59..41bdb50d08eb89c7ed36fd1ea4b93e6c5bb6973f 100644 (file)
--- a/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.8.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
        $(add_frameworks_dep kded)
        $(add_plasma_dep kde-cli-tools)
        !kde-plasma/khotkeys:4
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        x11-libs/libxcb

diff --git a/kde-plasma/kwin/kwin-5.7.5.ebuild b/kde-plasma/kwin/kwin-5.7.5.ebuild
index 9ee1027bca44a69eebbd7eca141f6a8f0d34638f..eb9dc605ddebb98bc82d31776a5370f788d3331b 100644 (file)
--- a/kde-plasma/kwin/kwin-5.7.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.7.5.ebuild
@@ -79,7 +79,7 @@ RDEPEND="${COMMON_DEPEND}
        )
        !<kde-apps/kdeartwork-meta-15.08.3-r1:4
        !kde-base/kwin:4
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        $(add_qt_dep designer)

diff --git a/kde-plasma/kwin/kwin-5.8.3.ebuild b/kde-plasma/kwin/kwin-5.8.3.ebuild
index 1e8ce63bdaf4487dc8aa125b71c00894521e6854..5f8ff10e7cca8d92fc2a40a1e51d1cede741f260 100644 (file)
--- a/kde-plasma/kwin/kwin-5.8.3.ebuild
+++ b/kde-plasma/kwin/kwin-5.8.3.ebuild
@@ -79,7 +79,7 @@ RDEPEND="${COMMON_DEPEND}
        )
        !<kde-apps/kdeartwork-meta-15.08.3-r1:4
        !kde-base/kwin:4
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}
        $(add_qt_dep designer)

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
index 868b581c23c9dd8afc9ab0087bc4ffda61d8f247..3102f5ada40ca49465a71215b39bb3a2957a52d5 100644 (file)
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.7.5.ebuild
@@ -117,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/plasma-desktop:4
        !kde-base/plasma-workspace:4
        !kde-base/solid-actions-kcm:4
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
        !kde-misc/kcm_touchpad
        !kde-misc/kcm-touchpad
        !kde-plasma/kcm-touchpad

diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
index 0960332cf1a640d229da9cd0417ff7aae7bf68a1..cce14d809d0e612363a52109fba36d71f6292a25 100644 (file)
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.3.ebuild
@@ -117,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
        !kde-base/plasma-desktop:4
        !kde-base/plasma-workspace:4
        !kde-base/solid-actions-kcm:4
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
        !kde-misc/kcm_touchpad
        !kde-misc/kcm-touchpad
        !kde-plasma/kcm-touchpad

diff --git a/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild
index 74db8e0c598378d3b3f816a5a009eb66cbcfe4ad..5ba520b7678f26cac4521249119bd771dc7579e3 100644 (file)
--- a/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild
@@ -62,7 +62,7 @@ RDEPEND="${DEPEND}
                )
        )
        !kde-plasma/powerdevil:4
-       !kde-base/systemsettings:4[handbook]
+       !kde-plasma/systemsettings:4[handbook]
 "
 
 PATCHES=( "${FILESDIR}/${PN}-5.6.95-wireless-optional.patch" )

diff --git a/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
index 657ea9287c0de64d6e1d4383c349b7d9e5aac457..5bd908e80ad5731e46ea71560e42c6d90e80702c 100644 (file)
--- a/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}
                )
        )
        !kde-plasma/powerdevil:4
-       !kde-base/systemsettings:4[handbook]
+       !kde-plasma/systemsettings:4[handbook]
 "
 
 src_configure() {

diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 67476083c151fa356bd497f076c7f550f3c46d64..ddb3f0adc0b833241e52b773324572c88699c1ce 100644 (file)
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST systemsettings-5.7.5.tar.xz 158296 SHA256 960938de95c04dae98df3e6189529c1d0d8eb99dbfd7ebcf0b33bc24bf54209b SHA512 c3bbbe243c97905cd4c0cdfa06576a94efcd0274522d4f17f6f3eabf725b271375de53071b4102bf01488c4c77056c6779dfdd97f94ed72ae6bea50a711eaad4 WHIRLPOOL 411226593cfdb954d3ef4979565e9a0a97b244d8e57198b215cdacee9f15eeb6b0f8894ab566dc6796d8bbd8459ec42c7aea998200952e8cb109ba49c078141d
 DIST systemsettings-5.8.3.tar.xz 157968 SHA256 b50ec8fb4402d332d9fb6c1aa00cd7431ac3299da3003cc54522c1544c610a6a SHA512 d1a81880057bf648527a42cf2a93f51bca8a10bceb4bd04ed3ec47fb57195840b6d4369425b3605ca791ebd5f612071e8dc0a154720088541a00093b0ddb03f3 WHIRLPOOL 595a298541cb39da14752431fb034d02bb3380246337e450b51bc8c962782b614aa4ce1416a7d1f51e5aa85e72e15be75724da40f1cda9ddfb84a2a26850306d

diff --git a/kde-base/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch b/kde-plasma/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch
similarity index 100%
rename from kde-base/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch
rename to kde-plasma/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch

diff --git a/kde-base/systemsettings/files/systemsettings-kcm-randr.patch b/kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch
similarity index 100%
rename from kde-base/systemsettings/files/systemsettings-kcm-randr.patch
rename to kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch

diff --git a/kde-plasma/systemsettings/metadata.xml b/kde-plasma/systemsettings/metadata.xml
index b028a419c8734eb707491555b8631934d2082c24..af6e5dff2c87fddc7814da8b0a8d90cb7eaec58e 100644 (file)
--- a/kde-plasma/systemsettings/metadata.xml
+++ b/kde-plasma/systemsettings/metadata.xml
@@ -7,5 +7,6 @@
        </maintainer>
        <use>
                <flag name="classic">Enable classic mode plugin, requires <pkg>kde-frameworks/khtml</pkg></flag>
+               <flag name="kscreen">Use <pkg>kde-plasma/kscreen</pkg> for screen management</flag>
        </use>
 </pkgmetadata>

diff --git a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
similarity index 100%
rename from kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild
rename to kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild

diff --git a/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild
index 65ecc2e9c2e33fb3c9cd7a6c75a2934a2c09426b..63c77882d35d8e1704f66e7660ccb9ec935d8051 100644 (file)
--- a/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.7.5.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        gtk? ( $(add_plasma_dep kde-gtk-config) )
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
 "
 
 src_configure() {

diff --git a/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild
index e6043475c6da1b8603abd498a94571f169456e3b..177613b6e606060c6ed21f742a83d7aa68d4668c 100644 (file)
--- a/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.8.3.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        gtk? ( $(add_plasma_dep kde-gtk-config) )
-       !kde-base/systemsettings:4
+       !kde-plasma/systemsettings:4
 "
 
 src_configure() {

diff --git a/net-misc/knemo/knemo-0.7.7.ebuild b/net-misc/knemo/knemo-0.7.7.ebuild
index 815bfe2a79cb957c74acce79016c063b581b0608..bac22afed17309c9c7090c79c98c5ce5b5861711 100644 (file)
--- a/net-misc/knemo/knemo-0.7.7.ebuild
+++ b/net-misc/knemo/knemo-0.7.7.ebuild
@@ -18,10 +18,10 @@ KEYWORDS="amd64 x86"
 IUSE="debug wifi"
 
 DEPEND="
-       $(add_kdebase_dep systemsettings)
        dev-libs/libnl:3
        dev-qt/qtsql:4[sqlite]
        kde-plasma/ksysguard:4
+       kde-plasma/systemsettings:4
        sys-apps/net-tools
        wifi? ( net-wireless/wireless-tools )
 "

diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index ce5ee306822ded1686a526ee18076ea43a8bc5bf..1f0ebfb008b4cd6338354103546bbc46984c198d 100644 (file)
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -60,4 +60,4 @@ net-libs/aqbanking ofx
 
 # Michael Palimaka <kensington@gentoo.org> (11 Dec 2014)
 # Dependencies not yet stable
-kde-base/systemsettings kscreen
+kde-plasma/systemsettings kscreen

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index d85f06288bcb52524b79aef7af0e140da5ebe512..aa0d188f28ab40e9049b1d415a8bc5e0baef4ed3 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -19,3 +19,4 @@ move dev-perl/google-api-adwords-perl dev-perl/Google-Ads-AdWords-Client
 move kde-misc/kscreen kde-plasma/kscreen
 move x11-libs/libkscreen kde-plasma/libkscreen
 slotmove media-sound/cantata 4 0
+move kde-base/systemsettings kde-plasma/systemsettings