Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, profiles/updates/, kde-base/kdebase-startkde/, ...
Date: Mon, 28 Nov 2016 12:01:50
Message-Id: 1480334495.144d2a658bab0f35c4a0ef2816a41926059215ce.johu@gentoo
1 commit: 144d2a658bab0f35c4a0ef2816a41926059215ce
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 28 12:00:33 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 28 12:01:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144d2a65
7
8 kde-base/ksplash -> kde-plasma/ksplash
9
10 kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
11 {kde-base => kde-plasma}/ksplash/Manifest | 0
12 {kde-base => kde-plasma}/ksplash/ksplash-4.11.22.ebuild | 4 ++--
13 {kde-base => kde-plasma}/ksplash/metadata.xml | 8 ++++----
14 kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild | 2 +-
15 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild | 2 +-
16 kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild | 2 +-
17 kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild | 2 +-
18 kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild | 2 +-
19 profiles/updates/4Q-2016 | 1 +
20 10 files changed, 13 insertions(+), 12 deletions(-)
21
22 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
23 index ef911b5..8e58260 100644
24 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
25 +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
26 @@ -55,9 +55,9 @@ RDEPEND="
27 $(add_kdeapps_dep solid-runtime)
28 $(add_kdebase_dep krunner)
29 $(add_kdebase_dep ksmserver)
30 - $(add_kdebase_dep ksplash)
31 $(add_kdebase_dep plasma-workspace)
32 kde-plasma/kcminit:4
33 + kde-plasma/ksplash:4
34 kde-plasma/kstartupconfig:4
35 kde-plasma/kwin:4
36 kde-plasma/systemsettings:4
37
38 diff --git a/kde-base/ksplash/Manifest b/kde-plasma/ksplash/Manifest
39 similarity index 100%
40 rename from kde-base/ksplash/Manifest
41 rename to kde-plasma/ksplash/Manifest
42
43 diff --git a/kde-base/ksplash/ksplash-4.11.22.ebuild b/kde-plasma/ksplash/ksplash-4.11.22.ebuild
44 similarity index 86%
45 rename from kde-base/ksplash/ksplash-4.11.22.ebuild
46 rename to kde-plasma/ksplash/ksplash-4.11.22.ebuild
47 index 2871504..d488502 100644
48 --- a/kde-base/ksplash/ksplash-4.11.22.ebuild
49 +++ b/kde-plasma/ksplash/ksplash-4.11.22.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2015 Gentoo Foundation
52 +# Copyright 1999-2016 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Id$
55
56 @@ -8,7 +8,7 @@ DECLARATIVE_REQUIRED="always"
57 KMNAME="kde-workspace"
58 inherit kde4-meta
59
60 -DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
61 +DESCRIPTION="KDE Plasma splashscreen framework"
62 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
63 IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
64 cpu_flags_x86_sse2 xinerama"
65
66 diff --git a/kde-base/ksplash/metadata.xml b/kde-plasma/ksplash/metadata.xml
67 similarity index 55%
68 rename from kde-base/ksplash/metadata.xml
69 rename to kde-plasma/ksplash/metadata.xml
70 index 0cf5922..2fdbf33 100644
71 --- a/kde-base/ksplash/metadata.xml
72 +++ b/kde-plasma/ksplash/metadata.xml
73 @@ -1,8 +1,8 @@
74 <?xml version="1.0" encoding="UTF-8"?>
75 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
76 <pkgmetadata>
77 -<maintainer type="project">
78 - <email>kde@g.o</email>
79 - <name>Gentoo KDE Project</name>
80 -</maintainer>
81 + <maintainer type="project">
82 + <email>kde@g.o</email>
83 + <name>Gentoo KDE Project</name>
84 + </maintainer>
85 </pkgmetadata>
86
87 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
88 index a93dc09..8fa3b4e 100644
89 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
90 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.5.ebuild
91 @@ -113,7 +113,7 @@ RDEPEND="${COMMON_DEPEND}
92 !kde-base/klipper:4
93 !kde-base/krunner:4
94 !kde-base/ksmserver:4
95 - !kde-base/ksplash:4
96 + !kde-plasma/ksplash:4
97 !kde-base/plasma-workspace:4
98 "
99 DEPEND="${COMMON_DEPEND}
100
101 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild
102 index 033053f..072ed63 100644
103 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild
104 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r1.ebuild
105 @@ -112,7 +112,7 @@ RDEPEND="${COMMON_DEPEND}
106 !kde-base/klipper:4
107 !kde-base/krunner:4
108 !kde-base/ksmserver:4
109 - !kde-base/ksplash:4
110 + !kde-plasma/ksplash:4
111 !kde-base/plasma-workspace:4
112 "
113 DEPEND="${COMMON_DEPEND}
114
115 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
116 index 551020c..4c8d829 100644
117 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
118 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild
119 @@ -113,7 +113,7 @@ RDEPEND="${COMMON_DEPEND}
120 !kde-base/klipper:4
121 !kde-base/krunner:4
122 !kde-base/ksmserver:4
123 - !kde-base/ksplash:4
124 + !kde-plasma/ksplash:4
125 !kde-base/plasma-workspace:4
126 "
127 DEPEND="${COMMON_DEPEND}
128
129 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild
130 index 2f12dfa..e57c234 100644
131 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild
132 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3.ebuild
133 @@ -113,7 +113,7 @@ RDEPEND="${COMMON_DEPEND}
134 !kde-base/klipper:4
135 !kde-base/krunner:4
136 !kde-base/ksmserver:4
137 - !kde-base/ksplash:4
138 + !kde-plasma/ksplash:4
139 !kde-base/plasma-workspace:4
140 "
141 DEPEND="${COMMON_DEPEND}
142
143 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
144 index 3114e7b..f67827b 100644
145 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
146 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.4.ebuild
147 @@ -112,7 +112,7 @@ RDEPEND="${COMMON_DEPEND}
148 !kde-base/klipper:4
149 !kde-base/krunner:4
150 !kde-base/ksmserver:4
151 - !kde-base/ksplash:4
152 + !kde-plasma/ksplash:4
153 !kde-base/plasma-workspace:4
154 "
155 DEPEND="${COMMON_DEPEND}
156
157 diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
158 index fbd60a3..39f8b2c 100644
159 --- a/profiles/updates/4Q-2016
160 +++ b/profiles/updates/4Q-2016
161 @@ -39,3 +39,4 @@ move kde-base/kstyles kde-plasma/kstyles
162 move kde-base/ksystraycmd kde-plasma/ksystraycmd
163 move kde-base/kstartupconfig kde-plasma/kstartupconfig
164 move kde-base/qguiplatformplugin_kde kde-plasma/qguiplatformplugin_kde
165 +move kde-base/ksplash kde-plasma/ksplash