1 |
commit: 5fbb5fe7a9f80a67ec2b6c028306c4dd3de9a17b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 5 22:50:11 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 6 10:15:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fbb5fe7 |
7 |
|
8 |
dev-libs/purpose: pkgmove to kde-frameworks/purpose |
9 |
|
10 |
dev-util/kdevelop/kdevelop-5.2.1.ebuild | 2 +- |
11 |
kde-apps/okular/okular-17.12.1.ebuild | 2 +- |
12 |
kde-apps/spectacle/spectacle-17.08.3.ebuild | 2 +- |
13 |
kde-apps/spectacle/spectacle-17.12.1.ebuild | 2 +- |
14 |
{dev-libs => kde-frameworks}/purpose/Manifest | 0 |
15 |
{dev-libs => kde-frameworks}/purpose/metadata.xml | 0 |
16 |
.../purpose/purpose-1.2.1.ebuild | 21 +++++++++++++++------ |
17 |
.../kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild | 2 +- |
18 |
media-video/kamoso/kamoso-3.2.4.ebuild | 2 +- |
19 |
profiles/updates/1Q-2018 | 1 + |
20 |
10 files changed, 22 insertions(+), 12 deletions(-) |
21 |
|
22 |
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild |
23 |
index a453ea55d40..d0dab918f87 100644 |
24 |
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild |
25 |
+++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild |
26 |
@@ -66,7 +66,7 @@ COMMON_DEPEND=" |
27 |
$(add_frameworks_dep plasma) |
28 |
) |
29 |
qmake? ( dev-util/kdevelop-pg-qt:5 ) |
30 |
- reviewboard? ( dev-libs/purpose ) |
31 |
+ reviewboard? ( kde-frameworks/purpose ) |
32 |
subversion? ( |
33 |
dev-libs/apr:1 |
34 |
dev-libs/apr-util:1 |
35 |
|
36 |
diff --git a/kde-apps/okular/okular-17.12.1.ebuild b/kde-apps/okular/okular-17.12.1.ebuild |
37 |
index e4166ea80ff..20ecfc164b1 100644 |
38 |
--- a/kde-apps/okular/okular-17.12.1.ebuild |
39 |
+++ b/kde-apps/okular/okular-17.12.1.ebuild |
40 |
@@ -51,7 +51,7 @@ DEPEND=" |
41 |
pdf? ( app-text/poppler[qt5,-exceptions(-)] ) |
42 |
plucker? ( virtual/jpeg:0 ) |
43 |
postscript? ( app-text/libspectre ) |
44 |
- share? ( dev-libs/purpose:5 ) |
45 |
+ share? ( kde-frameworks/purpose:5 ) |
46 |
speech? ( $(add_qt_dep qtspeech) ) |
47 |
tiff? ( media-libs/tiff:0 ) |
48 |
" |
49 |
|
50 |
diff --git a/kde-apps/spectacle/spectacle-17.08.3.ebuild b/kde-apps/spectacle/spectacle-17.08.3.ebuild |
51 |
index 0f060a3d671..5e724edf70f 100644 |
52 |
--- a/kde-apps/spectacle/spectacle-17.08.3.ebuild |
53 |
+++ b/kde-apps/spectacle/spectacle-17.08.3.ebuild |
54 |
@@ -36,7 +36,7 @@ DEPEND=" |
55 |
x11-libs/xcb-util-cursor |
56 |
x11-libs/xcb-util-image |
57 |
kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') ) |
58 |
- share? ( dev-libs/purpose:5 ) |
59 |
+ share? ( kde-frameworks/purpose:5 ) |
60 |
" |
61 |
RDEPEND="${DEPEND} |
62 |
kipi? ( media-plugins/kipi-plugins:5 ) |
63 |
|
64 |
diff --git a/kde-apps/spectacle/spectacle-17.12.1.ebuild b/kde-apps/spectacle/spectacle-17.12.1.ebuild |
65 |
index 169a0c09482..10e7f8bc107 100644 |
66 |
--- a/kde-apps/spectacle/spectacle-17.12.1.ebuild |
67 |
+++ b/kde-apps/spectacle/spectacle-17.12.1.ebuild |
68 |
@@ -36,7 +36,7 @@ DEPEND=" |
69 |
x11-libs/xcb-util-cursor |
70 |
x11-libs/xcb-util-image |
71 |
kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') ) |
72 |
- share? ( dev-libs/purpose:5 ) |
73 |
+ share? ( kde-frameworks/purpose:5 ) |
74 |
" |
75 |
RDEPEND="${DEPEND} |
76 |
kipi? ( media-plugins/kipi-plugins:5 ) |
77 |
|
78 |
diff --git a/dev-libs/purpose/Manifest b/kde-frameworks/purpose/Manifest |
79 |
similarity index 100% |
80 |
rename from dev-libs/purpose/Manifest |
81 |
rename to kde-frameworks/purpose/Manifest |
82 |
|
83 |
diff --git a/dev-libs/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml |
84 |
similarity index 100% |
85 |
rename from dev-libs/purpose/metadata.xml |
86 |
rename to kde-frameworks/purpose/metadata.xml |
87 |
|
88 |
diff --git a/dev-libs/purpose/purpose-1.2.1.ebuild b/kde-frameworks/purpose/purpose-1.2.1.ebuild |
89 |
similarity index 65% |
90 |
rename from dev-libs/purpose/purpose-1.2.1.ebuild |
91 |
rename to kde-frameworks/purpose/purpose-1.2.1.ebuild |
92 |
index 78b845bdcdf..06e55ebd995 100644 |
93 |
--- a/dev-libs/purpose/purpose-1.2.1.ebuild |
94 |
+++ b/kde-frameworks/purpose/purpose-1.2.1.ebuild |
95 |
@@ -1,8 +1,10 @@ |
96 |
-# Copyright 1999-2017 Gentoo Foundation |
97 |
+# Copyright 1999-2018 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
EAPI=6 |
101 |
|
102 |
+KDE_AUTODEPS="false" |
103 |
+KDE_QTHELP="false" |
104 |
KDE_TEST="forceoptional" |
105 |
inherit kde5 |
106 |
|
107 |
@@ -13,10 +15,11 @@ LICENSE="LGPL-2.1+" |
108 |
KEYWORDS="amd64 ~arm x86" |
109 |
IUSE="+kaccounts" |
110 |
|
111 |
-DEPEND=" |
112 |
- $(add_frameworks_dep kcoreaddons) |
113 |
- $(add_frameworks_dep ki18n) |
114 |
- $(add_frameworks_dep kio) |
115 |
+COMMON_DEPEND=" |
116 |
+ $(add_frameworks_dep kcoreaddons '' 5.40.0) |
117 |
+ $(add_frameworks_dep ki18n '' 5.40.0) |
118 |
+ $(add_frameworks_dep kio '' 5.40.0) |
119 |
+ $(add_qt_dep qtcore) |
120 |
$(add_qt_dep qtdeclarative) |
121 |
$(add_qt_dep qtgui) |
122 |
$(add_qt_dep qtnetwork) |
123 |
@@ -26,7 +29,13 @@ DEPEND=" |
124 |
net-libs/accounts-qt |
125 |
) |
126 |
" |
127 |
-RDEPEND="${DEPEND}" |
128 |
+DEPEND="${COMMON_DEPEND} |
129 |
+ $(add_frameworks_dep extra-cmake-modules '' 5.40.0) |
130 |
+" |
131 |
+RDEPEND="${COMMON_DEPEND} |
132 |
+ >=kde-frameworks/kf-env-4 |
133 |
+ || ( $(add_frameworks_dep breeze-icons '' 5.40.0) kde-frameworks/oxygen-icons:* ) |
134 |
+" |
135 |
|
136 |
# requires running environment |
137 |
RESTRICT+=" test" |
138 |
|
139 |
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild |
140 |
index 9dd8884adff..1263c95fea2 100644 |
141 |
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild |
142 |
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild |
143 |
@@ -40,7 +40,7 @@ DEPEND=" |
144 |
$(add_qt_dep qtgui) |
145 |
$(add_qt_dep qtwidgets) |
146 |
$(add_qt_dep qtx11extras) |
147 |
- share? ( dev-libs/purpose:5 ) |
148 |
+ share? ( kde-frameworks/purpose:5 ) |
149 |
" |
150 |
RDEPEND="${DEPEND} |
151 |
$(add_plasma_dep plasma-workspace) |
152 |
|
153 |
diff --git a/media-video/kamoso/kamoso-3.2.4.ebuild b/media-video/kamoso/kamoso-3.2.4.ebuild |
154 |
index a6e202fdda5..061fb9aa08c 100644 |
155 |
--- a/media-video/kamoso/kamoso-3.2.4.ebuild |
156 |
+++ b/media-video/kamoso/kamoso-3.2.4.ebuild |
157 |
@@ -23,7 +23,7 @@ DEPEND=" |
158 |
$(add_qt_dep qtdeclarative) |
159 |
$(add_qt_dep qtgui) |
160 |
$(add_qt_dep qtwidgets) |
161 |
- dev-libs/purpose:5 |
162 |
+ kde-frameworks/purpose:5 |
163 |
media-libs/qt-gstreamer[qt5(+)] |
164 |
virtual/libudev:= |
165 |
" |
166 |
|
167 |
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018 |
168 |
index 9e33dc9c0c9..17164482073 100644 |
169 |
--- a/profiles/updates/1Q-2018 |
170 |
+++ b/profiles/updates/1Q-2018 |
171 |
@@ -3,3 +3,4 @@ slotmove app-portage/kuroo 4 0 |
172 |
move dev-cpp/gsl dev-cpp/ms-gsl |
173 |
slotmove =dev-util/cucumber-3.1.0 3.0 3.1 |
174 |
move app-admin/restart_services app-admin/restart-services |
175 |
+move dev-libs/purpose kde-frameworks/purpose |