diff options
22 files changed, 17 insertions, 26 deletions
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 9e2337dd13e0..ae913fb418e1 100644 --- 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 e9a8cfe91ab7..670eb624c09d 100644 --- 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 index db5163f83985..000000000000 --- 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 index 857b07b295c2..000000000000 --- 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 9924b0cfa99f..abf6876d802c 100644 --- 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 2f45d7601273..41bdb50d08eb 100644 --- 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 9ee1027bca44..eb9dc605ddeb 100644 --- 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 1e8ce63bdaf4..5f8ff10e7cca 100644 --- 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 868b581c23c9..3102f5ada40c 100644 --- 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 0960332cf1a6..cce14d809d0e 100644 --- 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 74db8e0c5983..5ba520b7678f 100644 --- 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 657ea9287c0d..5bd908e80ad5 100644 --- 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 67476083c151..ddb3f0adc0b8 100644 --- 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 index e98387ff9380..e98387ff9380 100644 --- a/kde-base/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch +++ b/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 index 43019fcb74f1..43019fcb74f1 100644 --- a/kde-base/systemsettings/files/systemsettings-kcm-randr.patch +++ b/kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch diff --git a/kde-plasma/systemsettings/metadata.xml b/kde-plasma/systemsettings/metadata.xml index b028a419c873..af6e5dff2c87 100644 --- 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 index 665deb46dad5..665deb46dad5 100644 --- a/kde-base/systemsettings/systemsettings-4.11.22-r2.ebuild +++ b/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 65ecc2e9c2e3..63c77882d35d 100644 --- 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 e6043475c6da..177613b6e606 100644 --- 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 815bfe2a79cb..bac22afed173 100644 --- 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 ce5ee306822d..1f0ebfb008b4 100644 --- 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 d85f06288bcb..aa0d188f28ab 100644 --- 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 |