kde-base/kwin -> kde-plasma/kwin

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 ae913fb418e1582c7e96ca8fab85515b9091283c..3617656ab4133204dd190ea5a1867030800702b1 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
@@ -58,8 +58,8 @@ RDEPEND="
        $(add_kdebase_dep ksmserver)
        $(add_kdebase_dep ksplash)
        $(add_kdebase_dep kstartupconfig)
-       $(add_kdebase_dep kwin)
        $(add_kdebase_dep plasma-workspace)
+       kde-plasma/kwin:4
        kde-plasma/systemsettings:4
        x11-apps/mkfontdir
        x11-apps/xmessage

diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
deleted file mode 100644 (file)
index db5163f..0000000
--- a/kde-base/kwin/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/kwin/metadata.xml b/kde-base/kwin/metadata.xml
deleted file mode 100644 (file)
index 62b500d..0000000
--- a/kde-base/kwin/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="gles">Enable support for GLES.</flag>
-  </use>
-</pkgmetadata>

diff --git a/kde-misc/chromi/chromi-0.2.ebuild b/kde-misc/chromi/chromi-0.2.ebuild
index b4723c16da94f4242dcf19cd3ccf68a70a6ff0a5..4194ef121f6d923b67f9dda66b42e0d4612625a4 100644 (file)
--- a/kde-misc/chromi/chromi-0.2.ebuild
+++ b/kde-misc/chromi/chromi-0.2.ebuild
@@ -19,6 +19,6 @@ S="${WORKDIR}/kwin-deco-${P}"
 PATCHES=( "${FILESDIR}/${PN}-0.2-add-kwin-decoration-api-version.patch" )
 
 DEPEND="
-       $(add_kdebase_dep kwin)
+       kde-plasma/kwin:4
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-misc/chromi/chromi-0.2_p20141209.ebuild b/kde-misc/chromi/chromi-0.2_p20141209.ebuild
index 596139ebe733e89e4fece380f67b580ca3015d5d..9e7dbd60cb088c8eaae66f4eff427385b6fb5e08 100644 (file)
--- a/kde-misc/chromi/chromi-0.2_p20141209.ebuild
+++ b/kde-misc/chromi/chromi-0.2_p20141209.ebuild
@@ -19,6 +19,6 @@ IUSE=""
 S="${WORKDIR}/${MY_P}"
 
 DEPEND="
-       $(add_kdebase_dep kwin)
+       kde-plasma/kwin:4
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-misc/nightmode/nightmode-0.3-r1.ebuild b/kde-misc/nightmode/nightmode-0.3-r1.ebuild
index 1568cfde7f4002b7cba8031e252a9a9906f1d0b2..038fc13ae388fdc92ddd00b26efdaaa4ebfbbd28 100644 (file)
--- a/kde-misc/nightmode/nightmode-0.3-r1.ebuild
+++ b/kde-misc/nightmode/nightmode-0.3-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="4"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep kwin)"
+DEPEND="kde-plasma/kwin:4"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 43945cabea99c463cf0f73331016936fd1fcf39e..be35dff21b480fd85fa6cee3dc3251682f9f1bfc 100644 (file)
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST kwin-5.7.5.tar.xz 3936628 SHA256 ab1e98d3ff19699c89343a51861202dd93c913eb9d9215118c3fab86e99126d6 SHA512 6a7dbf9cf66006516179c5868e47038e0f967f3b2bbe6b431a707cd8ce03cc8dcea800f1dfd6a9482c30321e3b3b84593162bb050f045be4cffdadbc0090f9d7 WHIRLPOOL 75537ec4717e6a41280f97fb137ff28459d03789e79897a81da558c7fcae0ac08c64e9f034d6d9ef42e290d894173c96a1a3ab9dbaa9c6193b3d1272fedbaaf6
 DIST kwin-5.8.3.tar.xz 3976096 SHA256 3ce0be9e6908b8658df2bcde203b71f4c1132e0bd273a2d7d5dea81adc097f28 SHA512 a4f8b45411bef9a4cef9a0899a5cc9b2133af9783fd40e5b4cd0b11f8e426eb57bfd40cc97c055d6a9766b3e938fcba166efca9ce206ed6746f938234bbf724c WHIRLPOOL 13258fb4c3dcba82c5a5db70fd54f7ee9d3a4e45703cebed925ea1968f8d8bc0a8b2344639b8496efc64c06bd870fb6acbb3a4233bded264126a01745521c153

diff --git a/kde-base/kwin/kwin-4.11.22.ebuild b/kde-plasma/kwin/kwin-4.11.22.ebuild
similarity index 97%
rename from kde-base/kwin/kwin-4.11.22.ebuild
rename to kde-plasma/kwin/kwin-4.11.22.ebuild
index 650c35f52d3f88ca6179eb8a88592f88a2a8f523..d96f24bd4271e902abbe887e2ea4286eee6be253 100644 (file)
--- a/kde-base/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

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

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

diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index e816cb21af76708a55b294e531f44c3b5ce118e3..41b45b3539d73f4c42a08a435e97cefa50f55403 100644 (file)
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -6,6 +6,7 @@
                <name>Gentoo KDE Project</name>
        </maintainer>
        <use>
+               <flag name="gles">Enable support for GLES</flag>
                <flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
                <flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
        </use>

diff --git a/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
index 665deb46dad55b0daf2a614d71e9ad2bb2a79f9c..4bdb0d4a3e917c342a45522658819708e1698442 100644 (file)
--- a/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
        dev-libs/glib:2
-       $(add_kdebase_dep kwin)
+       kde-plasma/kwin:4
        $(add_kdebase_dep libkworkspace)
        media-libs/fontconfig
        >=media-libs/freetype-2

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index df8e8aa4271982a41805fbd35eb0a48b58a5e1e1..f6a9d0a69e70f1ecc5a30e8ab290e094e18cdb52 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -22,3 +22,4 @@ slotmove media-sound/cantata 4 0
 move kde-base/systemsettings kde-plasma/systemsettings
 move kde-base/kfilemetadata kde-frameworks/kfilemetadata
 move kde-base/baloo kde-frameworks/baloo
+move kde-base/kwin kde-plasma/kwin

diff --git a/x11-themes/crystal/crystal-2.2.1.ebuild b/x11-themes/crystal/crystal-2.2.1.ebuild
index 60430bed150ba6a1c29c112323ef16a5a9c00910..642991f54a564a106904bdd7852a7fa34e677272 100644 (file)
--- a/x11-themes/crystal/crystal-2.2.1.ebuild
+++ b/x11-themes/crystal/crystal-2.2.1.ebuild
@@ -16,7 +16,7 @@ SLOT="4"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep kwin)"
+DEPEND="kde-plasma/kwin:4"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README.md )

diff --git a/x11-themes/dekorator/dekorator-0.5.1-r1.ebuild b/x11-themes/dekorator/dekorator-0.5.1-r1.ebuild
index 1e2d65b4657ecbdb87622bd5cf3063ddcde2c763..1242088ba8f6cf16e753d33d449847cba8904e54 100644 (file)
--- a/x11-themes/dekorator/dekorator-0.5.1-r1.ebuild
+++ b/x11-themes/dekorator/dekorator-0.5.1-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
-       $(add_kdebase_dep kwin)
+       kde-plasma/kwin:4
        media-libs/qimageblitz
 "
 RDEPEND="${DEPEND}"

diff --git a/x11-themes/nitrogen/nitrogen-3.3.3.ebuild b/x11-themes/nitrogen/nitrogen-3.3.3.ebuild
index 27a4541f379ab0c0d90ff4b982c65bb4d086e67b..b07589a97683d1e50fd9f49d20a49ac2a193e2ca 100644 (file)
--- a/x11-themes/nitrogen/nitrogen-3.3.3.ebuild
+++ b/x11-themes/nitrogen/nitrogen-3.3.3.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-       $(add_kdebase_dep kwin)
+       kde-plasma/kwin:4
 "
 
 S=${WORKDIR}/${MY_P}

diff --git a/x11-themes/skulpture/skulpture-0.2.4-r1.ebuild b/x11-themes/skulpture/skulpture-0.2.4-r1.ebuild
index 12c7b6744fe8e4b21ef8329b2bd4ac0eae9ae714..2277ab887a9f27fb191b96010e29e29d67b30910 100644 (file)
--- a/x11-themes/skulpture/skulpture-0.2.4-r1.ebuild
+++ b/x11-themes/skulpture/skulpture-0.2.4-r1.ebuild
@@ -15,5 +15,5 @@ SLOT="4"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="$(add_kdebase_dep kwin)"
+DEPEND="kde-plasma/kwin:4"
 RDEPEND="${DEPEND}"

diff --git a/x11-themes/smaragd/smaragd-0.0.7.ebuild b/x11-themes/smaragd/smaragd-0.0.7.ebuild
index c0b8ff0b6c9a5df26ed84171fdb4142f6569d524..81248dad99e50e725cec544c3b3e35db2010950c 100644 (file)
--- a/x11-themes/smaragd/smaragd-0.0.7.ebuild
+++ b/x11-themes/smaragd/smaragd-0.0.7.ebuild
@@ -22,5 +22,5 @@ DEPEND="
 "
 RDEPEND="
        ${DEPEND}
-       $(add_kdebase_dep kwin)
+       kde-plasma/kwin:4
 "