1 |
commit: b477e7a594e25485c790a03ad44f08ed9d34ea87 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 3 21:14:41 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 3 21:14:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b477e7a5 |
7 |
|
8 |
media-libs/prison -> kde-frameworks/prison |
9 |
|
10 |
kde-apps/akonadi-contacts/akonadi-contacts-16.11.90.ebuild | 2 +- |
11 |
kde-apps/akonadi-contacts/akonadi-contacts-16.12.49.9999.ebuild | 2 +- |
12 |
kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild | 2 +- |
13 |
kde-apps/kaddressbook/kaddressbook-16.11.90.ebuild | 2 +- |
14 |
kde-apps/kaddressbook/kaddressbook-16.12.49.9999.ebuild | 2 +- |
15 |
kde-apps/kaddressbook/kaddressbook-9999.ebuild | 2 +- |
16 |
kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.11.90.ebuild | 2 +- |
17 |
kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.49.9999.ebuild | 2 +- |
18 |
kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 2 +- |
19 |
{media-libs => kde-frameworks}/prison/metadata.xml | 0 |
20 |
{media-libs => kde-frameworks}/prison/prison-9999.ebuild | 0 |
21 |
kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild | 2 +- |
22 |
kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 +- |
23 |
profiles/updates/4Q-2016 | 1 + |
24 |
14 files changed, 12 insertions(+), 11 deletions(-) |
25 |
|
26 |
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-16.11.90.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-16.11.90.ebuild |
27 |
index 9f41eef..9fd6b5a 100644 |
28 |
--- a/kde-apps/akonadi-contacts/akonadi-contacts-16.11.90.ebuild |
29 |
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-16.11.90.ebuild |
30 |
@@ -39,7 +39,7 @@ DEPEND=" |
31 |
$(add_qt_dep qtwebengine 'widgets') |
32 |
$(add_qt_dep qtwidgets) |
33 |
>=dev-libs/grantlee-5.1.0:5 |
34 |
- prison? ( media-libs/prison:5 ) |
35 |
+ prison? ( $(add_frameworks_dep prison) ) |
36 |
" |
37 |
RDEPEND="${DEPEND}" |
38 |
|
39 |
|
40 |
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-16.12.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-16.12.49.9999.ebuild |
41 |
index 9af0671..f4ef1d4 100644 |
42 |
--- a/kde-apps/akonadi-contacts/akonadi-contacts-16.12.49.9999.ebuild |
43 |
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-16.12.49.9999.ebuild |
44 |
@@ -39,7 +39,7 @@ DEPEND=" |
45 |
$(add_qt_dep qtwebengine 'widgets') |
46 |
$(add_qt_dep qtwidgets) |
47 |
>=dev-libs/grantlee-5.1.0:5 |
48 |
- prison? ( media-libs/prison:5 ) |
49 |
+ prison? ( $(add_frameworks_dep prison) ) |
50 |
" |
51 |
RDEPEND="${DEPEND}" |
52 |
|
53 |
|
54 |
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild |
55 |
index 9af0671..f4ef1d4 100644 |
56 |
--- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild |
57 |
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild |
58 |
@@ -39,7 +39,7 @@ DEPEND=" |
59 |
$(add_qt_dep qtwebengine 'widgets') |
60 |
$(add_qt_dep qtwidgets) |
61 |
>=dev-libs/grantlee-5.1.0:5 |
62 |
- prison? ( media-libs/prison:5 ) |
63 |
+ prison? ( $(add_frameworks_dep prison) ) |
64 |
" |
65 |
RDEPEND="${DEPEND}" |
66 |
|
67 |
|
68 |
diff --git a/kde-apps/kaddressbook/kaddressbook-16.11.90.ebuild b/kde-apps/kaddressbook/kaddressbook-16.11.90.ebuild |
69 |
index 209e00c..8dce759 100644 |
70 |
--- a/kde-apps/kaddressbook/kaddressbook-16.11.90.ebuild |
71 |
+++ b/kde-apps/kaddressbook/kaddressbook-16.11.90.ebuild |
72 |
@@ -51,7 +51,7 @@ COMMON_DEPEND=" |
73 |
$(add_qt_dep qtwidgets) |
74 |
>=app-crypt/gpgme-1.7.1[cxx,qt5] |
75 |
dev-libs/grantlee:5 |
76 |
- prison? ( media-libs/prison:5 ) |
77 |
+ prison? ( $(add_frameworks_dep prison) ) |
78 |
" |
79 |
DEPEND="${COMMON_DEPEND} |
80 |
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) |
81 |
|
82 |
diff --git a/kde-apps/kaddressbook/kaddressbook-16.12.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-16.12.49.9999.ebuild |
83 |
index 0855e33..4cb2110 100644 |
84 |
--- a/kde-apps/kaddressbook/kaddressbook-16.12.49.9999.ebuild |
85 |
+++ b/kde-apps/kaddressbook/kaddressbook-16.12.49.9999.ebuild |
86 |
@@ -51,7 +51,7 @@ COMMON_DEPEND=" |
87 |
$(add_qt_dep qtwidgets) |
88 |
>=app-crypt/gpgme-1.7.1[cxx,qt5] |
89 |
dev-libs/grantlee:5 |
90 |
- prison? ( media-libs/prison:5 ) |
91 |
+ prison? ( $(add_frameworks_dep prison) ) |
92 |
" |
93 |
DEPEND="${COMMON_DEPEND} |
94 |
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) |
95 |
|
96 |
diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild |
97 |
index 0855e33..4cb2110 100644 |
98 |
--- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild |
99 |
+++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild |
100 |
@@ -51,7 +51,7 @@ COMMON_DEPEND=" |
101 |
$(add_qt_dep qtwidgets) |
102 |
>=app-crypt/gpgme-1.7.1[cxx,qt5] |
103 |
dev-libs/grantlee:5 |
104 |
- prison? ( media-libs/prison:5 ) |
105 |
+ prison? ( $(add_frameworks_dep prison) ) |
106 |
" |
107 |
DEPEND="${COMMON_DEPEND} |
108 |
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) |
109 |
|
110 |
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.11.90.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.11.90.ebuild |
111 |
index afc004a..ef5927c 100644 |
112 |
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.11.90.ebuild |
113 |
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.11.90.ebuild |
114 |
@@ -32,7 +32,7 @@ DEPEND=" |
115 |
$(add_qt_dep qtgui) |
116 |
$(add_qt_dep qtwidgets) |
117 |
>=dev-libs/grantlee-5.1.0:5 |
118 |
- prison? ( media-libs/prison:5 ) |
119 |
+ prison? ( $(add_frameworks_dep prison) ) |
120 |
" |
121 |
RDEPEND="${DEPEND}" |
122 |
|
123 |
|
124 |
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.49.9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.49.9999.ebuild |
125 |
index 5e79256..41ae979 100644 |
126 |
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.49.9999.ebuild |
127 |
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.12.49.9999.ebuild |
128 |
@@ -32,7 +32,7 @@ DEPEND=" |
129 |
$(add_qt_dep qtgui) |
130 |
$(add_qt_dep qtwidgets) |
131 |
>=dev-libs/grantlee-5.1.0:5 |
132 |
- prison? ( media-libs/prison:5 ) |
133 |
+ prison? ( $(add_frameworks_dep prison) ) |
134 |
" |
135 |
RDEPEND="${DEPEND}" |
136 |
|
137 |
|
138 |
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild |
139 |
index 5e79256..41ae979 100644 |
140 |
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild |
141 |
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild |
142 |
@@ -32,7 +32,7 @@ DEPEND=" |
143 |
$(add_qt_dep qtgui) |
144 |
$(add_qt_dep qtwidgets) |
145 |
>=dev-libs/grantlee-5.1.0:5 |
146 |
- prison? ( media-libs/prison:5 ) |
147 |
+ prison? ( $(add_frameworks_dep prison) ) |
148 |
" |
149 |
RDEPEND="${DEPEND}" |
150 |
|
151 |
|
152 |
diff --git a/media-libs/prison/metadata.xml b/kde-frameworks/prison/metadata.xml |
153 |
similarity index 100% |
154 |
rename from media-libs/prison/metadata.xml |
155 |
rename to kde-frameworks/prison/metadata.xml |
156 |
|
157 |
diff --git a/media-libs/prison/prison-9999.ebuild b/kde-frameworks/prison/prison-9999.ebuild |
158 |
similarity index 100% |
159 |
rename from media-libs/prison/prison-9999.ebuild |
160 |
rename to kde-frameworks/prison/prison-9999.ebuild |
161 |
|
162 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild |
163 |
index efdd23f..204e903 100644 |
164 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild |
165 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.8.49.9999.ebuild |
166 |
@@ -82,7 +82,7 @@ COMMON_DEPEND=" |
167 |
calendar? ( $(add_kdeapps_dep kholidays) ) |
168 |
geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
169 |
gps? ( sci-geosciences/gpsd ) |
170 |
- prison? ( media-libs/prison:5 ) |
171 |
+ prison? ( $(add_frameworks_dep prison) ) |
172 |
qalculate? ( sci-libs/libqalculate ) |
173 |
semantic-desktop? ( $(add_frameworks_dep baloo) ) |
174 |
" |
175 |
|
176 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
177 |
index dbb5411..39823a1 100644 |
178 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
179 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
180 |
@@ -82,7 +82,7 @@ COMMON_DEPEND=" |
181 |
calendar? ( $(add_kdeapps_dep kholidays) ) |
182 |
geolocation? ( $(add_frameworks_dep networkmanager-qt) ) |
183 |
gps? ( sci-geosciences/gpsd ) |
184 |
- prison? ( media-libs/prison:5 ) |
185 |
+ prison? ( $(add_frameworks_dep prison) ) |
186 |
qalculate? ( sci-libs/libqalculate ) |
187 |
semantic-desktop? ( $(add_frameworks_dep baloo) ) |
188 |
" |
189 |
|
190 |
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 |
191 |
index 2a56a73..3d5a960 100644 |
192 |
--- a/profiles/updates/4Q-2016 |
193 |
+++ b/profiles/updates/4Q-2016 |
194 |
@@ -6,3 +6,4 @@ move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter |
195 |
move kde-apps/kdiagram dev-libs/kdiagram |
196 |
move media-sound/kwave kde-apps/kwave |
197 |
slotmove app-office/libalkimia 5 0 |
198 |
+move media-libs/prison kde-frameworks/prison |