1 |
commit: 59bb25a448968e4dbf17ca698346ee2936460f91 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 6 20:15:55 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 6 20:22:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59bb25a4 |
7 |
|
8 |
x11-terms/mate-terminal: add explicit build dep on glib-utils |
9 |
|
10 |
Closes: https://bugs.gentoo.org/667406 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
13 |
|
14 |
x11-terms/mate-terminal/Manifest | 3 -- |
15 |
.../mate-terminal/mate-terminal-1.12.1-r1.ebuild | 46 --------------------- |
16 |
.../mate-terminal/mate-terminal-1.12.1.ebuild | 46 --------------------- |
17 |
.../mate-terminal/mate-terminal-1.14.1-r1.ebuild | 48 ---------------------- |
18 |
.../mate-terminal/mate-terminal-1.16.3.ebuild | 38 ----------------- |
19 |
.../mate-terminal/mate-terminal-1.18.2.ebuild | 3 +- |
20 |
x11-terms/mate-terminal/metadata.xml | 3 -- |
21 |
7 files changed, 2 insertions(+), 185 deletions(-) |
22 |
|
23 |
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest |
24 |
index a0499bd4415..4043c19c311 100644 |
25 |
--- a/x11-terms/mate-terminal/Manifest |
26 |
+++ b/x11-terms/mate-terminal/Manifest |
27 |
@@ -1,4 +1 @@ |
28 |
-DIST mate-terminal-1.12.1.tar.xz 1143628 BLAKE2B 241edfc9cf36518638e7817e4f11ab89dfcbbc1dd11d7e10ee17bc81ceb8224fd582a1cab4b4e2aa3a24f2997298689f7bc98f07b698243885cad1c85a81eea6 SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42 |
29 |
-DIST mate-terminal-1.14.1.tar.xz 1313612 BLAKE2B d8710d336964d7bc46e2e309de214bd5968697ae4b9ee750b30ff5af93480ba2bf74661698b14e4a81287c3689be4e45afb1031864183c9864773ea2097b2b2c SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209 |
30 |
-DIST mate-terminal-1.16.3.tar.xz 1279764 BLAKE2B 2908a9d003f1fd0e9faae3a69b55fe2a21c8ce7f54e91497964090f24f1abe553c0c4e9a28d31ac8351e9745acd496b843e1282c74fe37e41590d1b30faa5688 SHA512 b5045b57e6ad8931230edbd83cbad4e99422ccf8dbeb760327d091993012981c0ad6bfc7ae39aaeffdf8beb27a18d74c831b4e51bcef7709d7dc63bf77bcf7ad |
31 |
DIST mate-terminal-1.18.2.tar.xz 1302216 BLAKE2B 9b2e0171f62e75e967389aa3b06bcf908a9884055d220bca895ac01f8f21a4102f21a759f2b5e2f06bf2d8c18af3688f000ed9414525df203a79d2b6e66d7443 SHA512 ac35890dc955743ccf7d8176e710820179cc5dd8a89a8322eb99c29796c27586a6abb1503288896faf1eeba6047fad12cf506e67674ee6221313679061acf8c8 |
32 |
|
33 |
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild |
34 |
deleted file mode 100644 |
35 |
index 9823dc8c3f0..00000000000 |
36 |
--- a/x11-terms/mate-terminal/mate-terminal-1.12.1-r1.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,46 +0,0 @@ |
39 |
-# Copyright 1999-2017 Gentoo Foundation |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=6 |
43 |
- |
44 |
-inherit mate |
45 |
- |
46 |
-if [[ ${PV} != 9999 ]]; then |
47 |
- KEYWORDS="~amd64 ~arm ~x86" |
48 |
-fi |
49 |
- |
50 |
-DESCRIPTION="The MATE Terminal" |
51 |
-LICENSE="GPL-3" |
52 |
-SLOT="0" |
53 |
- |
54 |
-IUSE="gtk3" |
55 |
- |
56 |
-RDEPEND="app-text/rarian:0 |
57 |
- dev-libs/atk:0 |
58 |
- >=dev-libs/glib-2.36:2 |
59 |
- >=mate-base/mate-desktop-1.6[gtk3(-)=] |
60 |
- x11-libs/gdk-pixbuf:2 |
61 |
- x11-libs/libICE:0 |
62 |
- x11-libs/libSM:0 |
63 |
- x11-libs/libX11:0 |
64 |
- x11-libs/pango:0 |
65 |
- !gtk3? ( |
66 |
- >=x11-libs/gtk+-2.24.0:2 |
67 |
- >=x11-libs/vte-0.28:0 |
68 |
- ) |
69 |
- gtk3? ( |
70 |
- >=x11-libs/gtk+-3.0:3[X] |
71 |
- >=x11-libs/vte-0.38:2.91 |
72 |
- )" |
73 |
- |
74 |
-DEPEND="${RDEPEND} |
75 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
76 |
- app-text/yelp-tools:0 |
77 |
- >=dev-util/intltool-0.50.1:* |
78 |
- sys-devel/gettext:* |
79 |
- virtual/pkgconfig:*" |
80 |
- |
81 |
-src_configure() { |
82 |
- mate_src_configure \ |
83 |
- --with-gtk=$(usex gtk3 3.0 2.0) |
84 |
-} |
85 |
|
86 |
diff --git a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild |
87 |
deleted file mode 100644 |
88 |
index 9eb68011adb..00000000000 |
89 |
--- a/x11-terms/mate-terminal/mate-terminal-1.12.1.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,46 +0,0 @@ |
92 |
-# Copyright 1999-2016 Gentoo Foundation |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-EAPI=6 |
96 |
- |
97 |
-inherit mate |
98 |
- |
99 |
-if [[ ${PV} != 9999 ]]; then |
100 |
- KEYWORDS="amd64 ~arm x86" |
101 |
-fi |
102 |
- |
103 |
-DESCRIPTION="The MATE Terminal" |
104 |
-LICENSE="GPL-3" |
105 |
-SLOT="0" |
106 |
- |
107 |
-IUSE="gtk3" |
108 |
- |
109 |
-RDEPEND="app-text/rarian:0 |
110 |
- dev-libs/atk:0 |
111 |
- >=dev-libs/glib-2.36:2 |
112 |
- >=mate-base/mate-desktop-1.6[gtk3(-)=] |
113 |
- x11-libs/gdk-pixbuf:2 |
114 |
- x11-libs/libICE:0 |
115 |
- x11-libs/libSM:0 |
116 |
- x11-libs/libX11:0 |
117 |
- x11-libs/pango:0 |
118 |
- !gtk3? ( |
119 |
- >=x11-libs/gtk+-2.24.0:2 |
120 |
- >=x11-libs/vte-0.28:0 |
121 |
- ) |
122 |
- gtk3? ( |
123 |
- >=x11-libs/gtk+-3.0:3 |
124 |
- >=x11-libs/vte-0.38:2.91 |
125 |
- )" |
126 |
- |
127 |
-DEPEND="${RDEPEND} |
128 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
129 |
- app-text/yelp-tools:0 |
130 |
- >=dev-util/intltool-0.50.1:* |
131 |
- sys-devel/gettext:* |
132 |
- virtual/pkgconfig:*" |
133 |
- |
134 |
-src_configure() { |
135 |
- mate_src_configure \ |
136 |
- --with-gtk=$(usex gtk3 3.0 2.0) |
137 |
-} |
138 |
|
139 |
diff --git a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild |
140 |
deleted file mode 100644 |
141 |
index 8c3f9cc7b3b..00000000000 |
142 |
--- a/x11-terms/mate-terminal/mate-terminal-1.14.1-r1.ebuild |
143 |
+++ /dev/null |
144 |
@@ -1,48 +0,0 @@ |
145 |
-# Copyright 1999-2017 Gentoo Foundation |
146 |
-# Distributed under the terms of the GNU General Public License v2 |
147 |
- |
148 |
-EAPI=6 |
149 |
- |
150 |
-inherit mate |
151 |
- |
152 |
-if [[ ${PV} != 9999 ]]; then |
153 |
- KEYWORDS="~amd64 ~arm ~x86" |
154 |
-fi |
155 |
- |
156 |
-DESCRIPTION="The MATE Terminal" |
157 |
-LICENSE="GPL-3" |
158 |
-SLOT="0" |
159 |
- |
160 |
-IUSE="gtk3" |
161 |
- |
162 |
-COMMON_DEPEND="dev-libs/atk:0 |
163 |
- >=dev-libs/glib-2.36:2 |
164 |
- >=mate-base/mate-desktop-1.6[gtk3(-)=] |
165 |
- x11-libs/gdk-pixbuf:2 |
166 |
- x11-libs/libICE:0 |
167 |
- x11-libs/libSM:0 |
168 |
- x11-libs/libX11:0 |
169 |
- x11-libs/pango:0 |
170 |
- !gtk3? ( |
171 |
- >=x11-libs/gtk+-2.24.0:2 |
172 |
- >=x11-libs/vte-0.28:0 |
173 |
- ) |
174 |
- gtk3? ( |
175 |
- >=x11-libs/gtk+-3.0:3[X] |
176 |
- >=x11-libs/vte-0.38:2.91 |
177 |
- )" |
178 |
- |
179 |
-RDEPEND="${COMMON_DEPEND}" |
180 |
- |
181 |
-DEPEND="${COMMON_DEPEND} |
182 |
- app-text/rarian:0 |
183 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
184 |
- app-text/yelp-tools:0 |
185 |
- >=dev-util/intltool-0.50.1:* |
186 |
- sys-devel/gettext:* |
187 |
- virtual/pkgconfig:*" |
188 |
- |
189 |
-src_configure() { |
190 |
- mate_src_configure \ |
191 |
- --with-gtk=$(usex gtk3 3.0 2.0) |
192 |
-} |
193 |
|
194 |
diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild |
195 |
deleted file mode 100644 |
196 |
index 33f211aa820..00000000000 |
197 |
--- a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild |
198 |
+++ /dev/null |
199 |
@@ -1,38 +0,0 @@ |
200 |
-# Copyright 1999-2018 Gentoo Foundation |
201 |
-# Distributed under the terms of the GNU General Public License v2 |
202 |
- |
203 |
-EAPI=6 |
204 |
- |
205 |
-inherit mate |
206 |
- |
207 |
-if [[ ${PV} != 9999 ]]; then |
208 |
- KEYWORDS="~amd64 ~arm ~x86" |
209 |
-fi |
210 |
- |
211 |
-DESCRIPTION="The MATE Terminal" |
212 |
-LICENSE="GPL-3" |
213 |
-SLOT="0" |
214 |
- |
215 |
-IUSE="" |
216 |
- |
217 |
-COMMON_DEPEND="dev-libs/atk:0 |
218 |
- >=dev-libs/glib-2.36:2 |
219 |
- >=gnome-base/dconf-0.13.4:0 |
220 |
- x11-libs/gdk-pixbuf:2 |
221 |
- x11-libs/libICE:0 |
222 |
- x11-libs/libSM:0 |
223 |
- x11-libs/libX11:0 |
224 |
- x11-libs/pango:0 |
225 |
- >=x11-libs/gtk+-3.14:3[X] |
226 |
- >=x11-libs/vte-0.38:2.91" |
227 |
- |
228 |
-RDEPEND="${COMMON_DEPEND} |
229 |
- >=mate-base/mate-desktop-1.6" |
230 |
- |
231 |
-DEPEND="${COMMON_DEPEND} |
232 |
- app-text/rarian:0 |
233 |
- >=app-text/scrollkeeper-dtd-1:1.0 |
234 |
- app-text/yelp-tools:0 |
235 |
- >=dev-util/intltool-0.50.1:* |
236 |
- sys-devel/gettext:* |
237 |
- virtual/pkgconfig:*" |
238 |
|
239 |
diff --git a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild |
240 |
index 49f9068abe5..fbcc14a7775 100644 |
241 |
--- a/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild |
242 |
+++ b/x11-terms/mate-terminal/mate-terminal-1.18.2.ebuild |
243 |
@@ -1,4 +1,4 @@ |
244 |
-# Copyright 1999-2018 Gentoo Foundation |
245 |
+# Copyright 1999-2018 Gentoo Authors |
246 |
# Distributed under the terms of the GNU General Public License v2 |
247 |
|
248 |
EAPI=6 |
249 |
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND} |
250 |
app-text/rarian:0 |
251 |
>=app-text/scrollkeeper-dtd-1:1.0 |
252 |
app-text/yelp-tools:0 |
253 |
+ dev-util/glib-utils |
254 |
>=dev-util/intltool-0.50.1:* |
255 |
sys-devel/gettext:* |
256 |
virtual/pkgconfig:*" |
257 |
|
258 |
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml |
259 |
index 2f0acb5747d..85e126f0649 100644 |
260 |
--- a/x11-terms/mate-terminal/metadata.xml |
261 |
+++ b/x11-terms/mate-terminal/metadata.xml |
262 |
@@ -5,9 +5,6 @@ |
263 |
<email>mate@g.o</email> |
264 |
<name>Gentoo MATE Desktop</name> |
265 |
</maintainer> |
266 |
- <use> |
267 |
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag> |
268 |
- </use> |
269 |
<upstream> |
270 |
<remote-id type="github">mate-desktop/mate-terminal</remote-id> |
271 |
</upstream> |