commit: a3f30b09e69db23946c7e0eba3f6eec4e0dfa77b
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 12:17:52 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 12:19:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f30b09
kde-base/kwin -> kde-plasma/kwin
kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
kde-base/kwin/Manifest | 1 -
kde-base/kwin/metadata.xml | 11 -----------
kde-misc/chromi/chromi-0.2.ebuild | 2 +-
kde-misc/chromi/chromi-0.2_p20141209.ebuild | 2 +-
kde-misc/nightmode/nightmode-0.3-r1.ebuild | 2 +-
kde-plasma/kwin/Manifest | 1 +
{kde-base => kde-plasma}/kwin/kwin-4.11.22.ebuild | 2 +-
kde-plasma/kwin/kwin-5.7.5.ebuild | 2 +-
kde-plasma/kwin/kwin-5.8.3.ebuild | 2 +-
kde-plasma/kwin/metadata.xml | 1 +
kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild | 2 +-
profiles/updates/4Q-2016 | 1 +
x11-themes/crystal/crystal-2.2.1.ebuild | 2 +-
x11-themes/dekorator/dekorator-0.5.1-r1.ebuild | 2 +-
x11-themes/nitrogen/nitrogen-3.3.3.ebuild | 2 +-
x11-themes/skulpture/skulpture-0.2.4-r1.ebuild | 2 +-
x11-themes/smaragd/smaragd-0.0.7.ebuild | 2 +-
18 files changed, 16 insertions(+), 25 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 ae913fb..3617656 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
@@ -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
index db5163f..00000000
--- 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
index 62b500d..00000000
--- 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>k...@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 b4723c1..4194ef1 100644
--- 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 596139e..9e7dbd6 100644
--- 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 1568cfd..038fc13 100644
--- 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 43945ca..be35dff 100644
--- 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 650c35f..d96f24b 100644
--- 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 eb9dc60..3cd72f9 100644
--- 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 5f8ff10..7110fb4 100644
--- 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 e816cb2..41b45b3 100644
--- 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 665deb4..4bdb0d4 100644
--- 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 df8e8aa..f6a9d0a 100644
--- 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 60430be..642991f 100644
--- 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 1e2d65b..1242088 100644
--- 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 27a4541..b07589a 100644
--- 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 12c7b67..2277ab8 100644
--- 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 c0b8ff0..81248da 100644
--- 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
"
