1 |
commit: efbe91409c0c7495d2168895504e35851e5b1757 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 30 21:29:55 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 30 21:55:57 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efbe9140 |
7 |
|
8 |
dev-util/gnome-builder: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
dev-util/gnome-builder/Manifest | 3 - |
14 |
.../files/3.28.4-fix-docs-option.patch | 42 ----- |
15 |
.../files/3.28.4-fix-tests-schemadir.patch | 26 --- |
16 |
.../files/3.28.4-jedi-0.12-compat.patch | 93 ----------- |
17 |
.../gnome-builder/files/3.28.4-python37-fix.patch | 57 ------- |
18 |
dev-util/gnome-builder/files/3.28.4-valac.patch | 15 -- |
19 |
dev-util/gnome-builder/gnome-builder-3.28.4.ebuild | 186 --------------------- |
20 |
dev-util/gnome-builder/gnome-builder-3.30.2.ebuild | 186 --------------------- |
21 |
8 files changed, 608 deletions(-) |
22 |
|
23 |
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest |
24 |
index a9037663c70..3eab4f83ce2 100644 |
25 |
--- a/dev-util/gnome-builder/Manifest |
26 |
+++ b/dev-util/gnome-builder/Manifest |
27 |
@@ -1,5 +1,2 @@ |
28 |
DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf |
29 |
-DIST gnome-builder-3.28.4.tar.xz 9309060 BLAKE2B a4402452ffaf64cc767edb9cba65b74a88cb77d04ca2ffecd3b01c53382930891c2c03e2528861f4d28ca3643465b6767235e945f44cc37d2d716bcbb3ab25c8 SHA512 ef83b909f295d83478aa7d5deb8b5d8291ddf6134e147e88452cdba8ff449a2415d0381d63d3f82cf28942b1096a704de64540c8cdf5f06c21c8278c93fbbc03 |
30 |
-DIST gnome-builder-3.30.2-patchset.tar.xz 43720 BLAKE2B c444117232c6560e68cad46134327e94b361cf89c4f68f2e68940e8a46d2a42720aa5e881dcb3153a3c75057cfacd8c67287a8bb0740999d4628ab6498db7c32 SHA512 e17a0357d2a3e6c059ef27dbf591ad3acfa6f5d7d58f47ca8ebc6dc6883a1bb1bb87b15f3c564c2babc5857e9de4a7a47934398d0000880f233265d7254087d3 |
31 |
-DIST gnome-builder-3.30.2.tar.xz 9478508 BLAKE2B 546328df141582d0d15317166c27493ac1f0b813680607f05de3429301cf8e4937cfc51bff69db26cd4ef1a8ef02aadd5aaa643c857eeabf9b16606a2a3a5cda SHA512 39087e3a30a807b7374167ba4c5295a9161e3c8d8e409172dcd28c52db48e72cd9303c2d4ff8fd11d4bfc70af6c810e5dc254c4c74b646875206221cff3bad57 |
32 |
DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f |
33 |
|
34 |
diff --git a/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch b/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch |
35 |
deleted file mode 100644 |
36 |
index ca2323f314a..00000000000 |
37 |
--- a/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch |
38 |
+++ /dev/null |
39 |
@@ -1,42 +0,0 @@ |
40 |
-From 054ef6d2e47da9f41e7c24908b251d074e11a03b Mon Sep 17 00:00:00 2001 |
41 |
-From: Christian Hergert <chergert@××××××.com> |
42 |
-Date: Wed, 8 Aug 2018 13:03:50 -0700 |
43 |
-Subject: [PATCH] help: fix get_option() to check for proper value |
44 |
- |
45 |
-We want to check for help docs, not sdk docs. Also, if enabled, don't be |
46 |
-automatic about it. Fail hard so the caller knows there is an issue. |
47 |
---- |
48 |
- doc/help/meson.build | 18 ++++++++---------- |
49 |
- 1 file changed, 8 insertions(+), 10 deletions(-) |
50 |
- |
51 |
-diff --git a/doc/help/meson.build b/doc/help/meson.build |
52 |
-index 1336e6a26..e684f078c 100644 |
53 |
---- a/doc/help/meson.build |
54 |
-+++ b/doc/help/meson.build |
55 |
-@@ -1,15 +1,13 @@ |
56 |
--if get_option('with_docs') |
57 |
-+if get_option('with_help') |
58 |
- |
59 |
--sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: false) |
60 |
-+sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: true) |
61 |
- |
62 |
--if sphinx.found() |
63 |
-- custom_target('en user documentation', |
64 |
-- command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'], |
65 |
-- output: 'en', |
66 |
-- build_by_default: true) |
67 |
-+custom_target('en user documentation', |
68 |
-+ command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'], |
69 |
-+ output: 'en', |
70 |
-+ build_by_default: true |
71 |
-+) |
72 |
- |
73 |
-- |
74 |
-- install_subdir(meson.current_build_dir() + '/en', install_dir: pkgdocdir_abs) |
75 |
--endif |
76 |
-+install_subdir(meson.current_build_dir() + '/en', install_dir: pkgdocdir_abs) |
77 |
- |
78 |
- endif |
79 |
--- |
80 |
-2.17.0 |
81 |
- |
82 |
|
83 |
diff --git a/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch b/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch |
84 |
deleted file mode 100644 |
85 |
index 3c427c41584..00000000000 |
86 |
--- a/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch |
87 |
+++ /dev/null |
88 |
@@ -1,26 +0,0 @@ |
89 |
-From a66b2d99f21bff6986b0dda5b7cc9ee393be934a Mon Sep 17 00:00:00 2001 |
90 |
-From: Mart Raudsepp <leio@g.o> |
91 |
-Date: Wed, 29 Aug 2018 12:30:14 +0300 |
92 |
-Subject: [PATCH] build: Fix GSETTINGS_SCHEMA_DIR envvar handling in tests |
93 |
- |
94 |
-GSETTINGS_SCHEMA_DIR does not support multiple colon-separated paths. |
95 |
---- |
96 |
- src/tests/meson.build | 2 +- |
97 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
98 |
- |
99 |
-diff --git a/src/tests/meson.build b/src/tests/meson.build |
100 |
-index 646f6f875..42c0e6d28 100644 |
101 |
---- a/src/tests/meson.build |
102 |
-+++ b/src/tests/meson.build |
103 |
-@@ -16,7 +16,7 @@ ide_test_env = [ |
104 |
- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), |
105 |
- 'G_DEBUG=gc-friendly', |
106 |
- 'GSETTINGS_BACKEND=memory', |
107 |
-- 'GSETTINGS_SCHEMA_DIR=@0@/data/gsettings:$(GSETTINGS_SCHEMA_DIR)'.format(meson.build_root()), |
108 |
-+ 'GSETTINGS_SCHEMA_DIR=@0@/data/gsettings'.format(meson.build_root()), |
109 |
- 'PYTHONDONTWRITEBYTECODE=yes', |
110 |
- 'MALLOC_CHECK_=2', |
111 |
- # 'MALLOC_PERTURB_=$((${RANDOM:-256} % 256))', |
112 |
--- |
113 |
-2.17.0 |
114 |
- |
115 |
|
116 |
diff --git a/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch b/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch |
117 |
deleted file mode 100644 |
118 |
index 4132e2d1bfe..00000000000 |
119 |
--- a/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch |
120 |
+++ /dev/null |
121 |
@@ -1,93 +0,0 @@ |
122 |
-From 799a378b96cad5dc9b1093604e76ed362d22f4cc Mon Sep 17 00:00:00 2001 |
123 |
-From: Christian Hergert <chergert@××××××.com> |
124 |
-Date: Sun, 27 May 2018 20:19:34 -0700 |
125 |
-Subject: [PATCH] jedi: minimal attempt to get things working again |
126 |
- |
127 |
-This tries to get some of our jedi code working with recent API changes |
128 |
-in the jedi project. |
129 |
- |
130 |
-This is just a minimal fix, and I'd expect some others may be needed for |
131 |
-improved functionality. |
132 |
- |
133 |
-Fixes #403 |
134 |
---- |
135 |
- src/plugins/jedi/jedi_plugin.py | 44 ++++++++++++++++++++++----------- |
136 |
- 1 file changed, 29 insertions(+), 15 deletions(-) |
137 |
- |
138 |
-diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py |
139 |
-index fd8e15d68..052500da1 100644 |
140 |
---- a/src/plugins/jedi/jedi_plugin.py |
141 |
-+++ b/src/plugins/jedi/jedi_plugin.py |
142 |
-@@ -91,8 +91,14 @@ try: |
143 |
- import jedi |
144 |
- from jedi.evaluate.compiled import CompiledObject |
145 |
- from jedi.evaluate.compiled import get_special_object |
146 |
-- from jedi.evaluate.compiled import _create_from_name |
147 |
-- from jedi.evaluate.context import Context |
148 |
-+ try: |
149 |
-+ # 0.12 |
150 |
-+ from jedi.evaluate.compiled import create_from_name |
151 |
-+ from jedi.evaluate.base_context import Context |
152 |
-+ except ImportError: |
153 |
-+ # Pre 0.12 |
154 |
-+ from jedi.evaluate.compiled import _create_from_name as create_from_name |
155 |
-+ from jedi.evaluate.context import Context |
156 |
- from jedi.evaluate.docstrings import _evaluate_for_statement_string |
157 |
- from jedi.evaluate.imports import Importer |
158 |
- |
159 |
-@@ -175,23 +181,31 @@ try: |
160 |
- pass |
161 |
- return module_list |
162 |
- |
163 |
-- original_jedi_get_module = jedi.evaluate.compiled.fake.get_module |
164 |
-- |
165 |
-- def patched_jedi_get_module(obj): |
166 |
-- "Work around a weird bug in jedi" |
167 |
-- try: |
168 |
-- return original_jedi_get_module(obj) |
169 |
-- except ImportError as e: |
170 |
-- if e.msg == "No module named 'gi._gobject._gobject'": |
171 |
-- return original_jedi_get_module('gi._gobject') |
172 |
-+ try: |
173 |
-+ # Pre 0.12 workaround |
174 |
-+ # TODO: What needs to be fixed here for 0.12? |
175 |
-+ original_jedi_get_module = jedi.evaluate.compiled.fake.get_module |
176 |
-+ def patched_jedi_get_module(obj): |
177 |
-+ "Work around a weird bug in jedi" |
178 |
-+ try: |
179 |
-+ return original_jedi_get_module(obj) |
180 |
-+ except ImportError as e: |
181 |
-+ if e.msg == "No module named 'gi._gobject._gobject'": |
182 |
-+ return original_jedi_get_module('gi._gobject') |
183 |
-+ jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module |
184 |
-+ except: |
185 |
-+ pass |
186 |
- |
187 |
-- jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module |
188 |
- jedi.evaluate.compiled.CompiledObject = PatchedJediCompiledObject |
189 |
-- jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod |
190 |
-+ try: |
191 |
-+ jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod |
192 |
-+ except AttributeError: |
193 |
-+ jedi.evaluate.context.instance.CompiledBoundMethod = PatchedCompiledBoundMethod |
194 |
- jedi.evaluate.imports.Importer = PatchedJediImporter |
195 |
- HAS_JEDI = True |
196 |
--except ImportError: |
197 |
-+except ImportError as ex: |
198 |
- print("jedi not found, python auto-completion not possible.") |
199 |
-+ print(ex) |
200 |
- HAS_JEDI = False |
201 |
- |
202 |
- GIR_PATH_LIST = [] |
203 |
-@@ -376,7 +390,7 @@ class JediCompletionProvider(Ide.Object, GtkSource.CompletionProvider, Ide.Compl |
204 |
- return False |
205 |
- |
206 |
- def do_populate(self, context): |
207 |
-- self.current_word = Ide.CompletionProvider.context_current_word(context) |
208 |
-+ self.current_word = Ide.CompletionProvider.context_current_word(context) or '' |
209 |
- self.current_word_lower = self.current_word.lower() |
210 |
- |
211 |
- _, iter = context.get_iter() |
212 |
--- |
213 |
-2.17.0 |
214 |
- |
215 |
|
216 |
diff --git a/dev-util/gnome-builder/files/3.28.4-python37-fix.patch b/dev-util/gnome-builder/files/3.28.4-python37-fix.patch |
217 |
deleted file mode 100644 |
218 |
index 2fc6ee5be06..00000000000 |
219 |
--- a/dev-util/gnome-builder/files/3.28.4-python37-fix.patch |
220 |
+++ /dev/null |
221 |
@@ -1,57 +0,0 @@ |
222 |
-From e1d32d76231b1051a2380995f4a7822aa525375a Mon Sep 17 00:00:00 2001 |
223 |
-From: Simon McVittie <smcv@××××××.org> |
224 |
-Date: Wed, 11 Jul 2018 11:57:06 +0100 |
225 |
-Subject: [PATCH] Python: Avoid identifier 'async', which became a keyword in |
226 |
- 3.7 |
227 |
- |
228 |
-This is an incompatible change, but so is async becoming an identifier. |
229 |
- |
230 |
-Fixes: #565 |
231 |
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903558 |
232 |
-Signed-off-by: Simon McVittie <smcv@××××××.org> |
233 |
---- |
234 |
- src/libide/Ide.py | 6 +++--- |
235 |
- src/plugins/jedi/jedi_plugin.py | 2 +- |
236 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
237 |
- |
238 |
-diff --git a/src/libide/Ide.py b/src/libide/Ide.py |
239 |
-index 02bb61937..07d429c7a 100644 |
240 |
---- a/src/libide/Ide.py |
241 |
-+++ b/src/libide/Ide.py |
242 |
-@@ -41,9 +41,9 @@ class _Gio_DBusMethodInfo: |
243 |
- in_args = None |
244 |
- out_signature = None |
245 |
- |
246 |
--def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=False): |
247 |
-+def DBusMethod(dbus_interface, in_signature=None, out_signature=None, is_async=False): |
248 |
- def decorator(func): |
249 |
-- func._is_async = async |
250 |
-+ func._is_async = is_async |
251 |
- |
252 |
- func._dbus_method = _Gio_DBusMethodInfo() |
253 |
- func._dbus_method.interface = dbus_interface |
254 |
-@@ -54,7 +54,7 @@ def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=Fals |
255 |
- in_signature_list = GLib.Variant.split_signature('('+in_signature+')') |
256 |
- arg_names = inspect.getargspec(func).args |
257 |
- arg_names.pop(0) # eat "self" argument |
258 |
-- if async: arg_names.pop(0) # eat "invocation" |
259 |
-+ if is_async: arg_names.pop(0) # eat "invocation" |
260 |
- if len(in_signature) != len(arg_names): |
261 |
- raise TypeError('specified signature %s for method %s does not match length of arguments' % (str(in_signature_list), func.func_name)) |
262 |
- for pair in zip(in_signature_list, arg_names): |
263 |
-diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py |
264 |
-index 84bd11c27..a346a342e 100644 |
265 |
---- a/src/plugins/jedi/jedi_plugin.py |
266 |
-+++ b/src/plugins/jedi/jedi_plugin.py |
267 |
-@@ -688,7 +688,7 @@ class JediService(Ide.DBusService): |
268 |
- self.queue = {} |
269 |
- self.handler_id = 0 |
270 |
- |
271 |
-- @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', async=True) |
272 |
-+ @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', is_async=True) |
273 |
- def CodeComplete(self, invocation, filename, line, column, content): |
274 |
- if filename in self.queue: |
275 |
- request = self.queue.pop(filename) |
276 |
--- |
277 |
-2.17.0 |
278 |
- |
279 |
|
280 |
diff --git a/dev-util/gnome-builder/files/3.28.4-valac.patch b/dev-util/gnome-builder/files/3.28.4-valac.patch |
281 |
deleted file mode 100644 |
282 |
index acb1c54f851..00000000000 |
283 |
--- a/dev-util/gnome-builder/files/3.28.4-valac.patch |
284 |
+++ /dev/null |
285 |
@@ -1,15 +0,0 @@ |
286 |
-diff --git a/src/plugins/vala-pack/meson.build b/src/plugins/vala-pack/meson.build |
287 |
-index dd36d351d..a8c53c6e5 100644 |
288 |
---- a/src/plugins/vala-pack/meson.build |
289 |
-+++ b/src/plugins/vala-pack/meson.build |
290 |
-@@ -6,8 +6,8 @@ endif |
291 |
- |
292 |
- add_languages('vala') |
293 |
- |
294 |
--valac = find_program ('valac') |
295 |
--libvala_version = run_command(valac, '--api-version').stdout().strip() |
296 |
-+valac = meson.get_compiler('vala') |
297 |
-+libvala_version = run_command(valac.cmd_array()[0], '--api-version').stdout().strip() |
298 |
- libvala = dependency('libvala-@0@'.format(libvala_version)) |
299 |
- |
300 |
- vala_pack_sources = [ |
301 |
|
302 |
diff --git a/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild b/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild |
303 |
deleted file mode 100644 |
304 |
index c963ac48f1f..00000000000 |
305 |
--- a/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild |
306 |
+++ /dev/null |
307 |
@@ -1,186 +0,0 @@ |
308 |
-# Copyright 1999-2018 Gentoo Authors |
309 |
-# Distributed under the terms of the GNU General Public License v2 |
310 |
- |
311 |
-EAPI=6 |
312 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
313 |
-VALA_MIN_API_VERSION="0.36" |
314 |
-DISABLE_AUTOFORMATTING=1 |
315 |
-FORCE_PRINT_ELOG=1 |
316 |
- |
317 |
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg |
318 |
- |
319 |
-DESCRIPTION="An IDE for writing GNOME-based software" |
320 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder" |
321 |
- |
322 |
-# FIXME: Review licenses at some point |
323 |
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" |
324 |
-SLOT="0" |
325 |
-KEYWORDS="~amd64 ~x86" |
326 |
-IUSE="clang +devhelp doc +git gtk-doc sysprof vala webkit" |
327 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
328 |
- |
329 |
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. |
330 |
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. |
331 |
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first. |
332 |
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of |
333 |
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small |
334 |
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. |
335 |
- |
336 |
-# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ${LIBGIT_DEPS} and libsoup-2.4.pc >=2.52.0 |
337 |
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? |
338 |
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 |
339 |
- |
340 |
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet) |
341 |
-LIBGIT_DEPS=" |
342 |
- dev-libs/libgit2[ssh,threads] |
343 |
- >=dev-libs/libgit2-glib-0.25.0[ssh] |
344 |
-" |
345 |
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build |
346 |
-RDEPEND=" |
347 |
- >=dev-libs/libdazzle-3.28.0[introspection,vala?] |
348 |
- >=dev-libs/glib-2.56.0:2 |
349 |
- >=x11-libs/gtk+-3.22.26:3[introspection] |
350 |
- >=x11-libs/gtksourceview-3.24.0:3.0[introspection] |
351 |
- >=dev-libs/json-glib-1.2.0 |
352 |
- >=dev-libs/jsonrpc-glib-3.28.0[vala?] |
353 |
- >=x11-libs/pango-1.38.0 |
354 |
- >=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}] |
355 |
- >=dev-libs/template-glib-3.28.0[introspection,vala?] |
356 |
- >=x11-libs/vte-0.40.2:2.91[vala?] |
357 |
- >=dev-libs/libxml2-2.9.0 |
358 |
- git? ( ${LIBGIT_DEPS} ) |
359 |
- dev-libs/libpcre:3 |
360 |
- webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) |
361 |
- |
362 |
- >=dev-libs/gobject-introspection-1.48.0:= |
363 |
- >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}] |
364 |
- ${PYTHON_DEPS} |
365 |
- clang? ( sys-devel/clang:= ) |
366 |
- devhelp? ( >=dev-util/devhelp-3.25.1:= ) |
367 |
- sysprof? ( >=dev-util/sysprof-3.28.0[gtk] ) |
368 |
- vala? ( |
369 |
- dev-lang/vala:= |
370 |
- $(vala_depend) |
371 |
- ) |
372 |
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_ |
373 |
-# usage in vapa-pack plugin and need it rebuilt before removing an older vala it was built against |
374 |
-# TODO: runtime ctags path finding.. |
375 |
-# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2 |
376 |
-# >=app-text/gspell-1.2.0 |
377 |
-# >=app-text/enchant:2 |
378 |
- |
379 |
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional |
380 |
-# appstream-glib needed for appdata.xml gettext translation and validation of it with appstream-util with FEATURES=test |
381 |
-DEPEND="${RDEPEND} |
382 |
- doc? ( dev-python/sphinx ) |
383 |
- dev-libs/appstream-glib |
384 |
- dev-util/desktop-file-utils |
385 |
- dev-util/glib-utils |
386 |
- >=sys-devel/gettext-0.19.8 |
387 |
- virtual/pkgconfig |
388 |
-" |
389 |
- |
390 |
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide |
391 |
-extra capabilities beyond these expressed via USE flags. Some of these |
392 |
-that are currently available with packages include: |
393 |
- |
394 |
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier |
395 |
- plugin out of the box functionality. |
396 |
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for |
397 |
- C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic |
398 |
- highlighting and symbol resolving support. |
399 |
-* dev-python/jedi and dev-python/lxml for more accurate Python |
400 |
- autocompletion support. |
401 |
-* dev-util/valgrind for integration with valgrind. |
402 |
-* dev-util/meson for integration with the Meson build system. |
403 |
-* dev-util/cargo for integration with the Rust Cargo build system. |
404 |
-* dev-util/cmake for integration with the CMake build system. |
405 |
-* net-libs/nodejs[npm] for integration with the NPM package system. |
406 |
-' |
407 |
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important |
408 |
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) |
409 |
-# jhbuild support |
410 |
-# rust language server via rls; Go via go-langserver |
411 |
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template |
412 |
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE |
413 |
- |
414 |
-PATCHES=( |
415 |
- "${FILESDIR}"/${PV}-python37-fix.patch # async 3.7 keyword usage removal |
416 |
- "${FILESDIR}"/${PV}-jedi-0.12-compat.patch # preliminary jedi-0.12 compatibility from 3.29.9x/git |
417 |
- "${FILESDIR}"/${PV}-valac.patch # Make valapack honor VALAC env var - https://gitlab.gnome.org/GNOME/gnome-builder/merge_requests/109 |
418 |
- "${FILESDIR}"/${PV}-fix-docs-option.patch # Fix USE=doc to work without USE=gtk-doc |
419 |
- "${FILESDIR}"/${PV}-fix-tests-schemadir.patch # Fix tests GSETTINGS_SCHEMA_DIR handling (or tests fail on fresh install) - https://gitlab.gnome.org/GNOME/gnome-builder/merge_requests/111 |
420 |
-) |
421 |
- |
422 |
-llvm_check_deps() { |
423 |
- has_version "sys-devel/clang:${LLVM_SLOT}" |
424 |
-} |
425 |
- |
426 |
-pkg_setup() { |
427 |
- python-single-r1_pkg_setup |
428 |
- use clang && llvm_pkg_setup |
429 |
-} |
430 |
- |
431 |
-src_prepare() { |
432 |
- use vala && vala_src_prepare |
433 |
- xdg_src_prepare |
434 |
-} |
435 |
- |
436 |
-src_configure() { |
437 |
- local emesonargs=( |
438 |
- -Denable_tracing=false |
439 |
- -Denable_profiling=false # not passing -pg to CFLAGS |
440 |
- -Dwith_channel=other |
441 |
- -Dwith_editorconfig=true # needs libpcre |
442 |
- $(meson_use webkit with_webkit) |
443 |
- $(meson_use vala with_vapi) |
444 |
- $(meson_use doc with_help) |
445 |
- $(meson_use gtk-doc with_docs) |
446 |
- |
447 |
- $(meson_use clang with_clang) |
448 |
- $(meson_use devhelp with_devhelp) |
449 |
- -Dwith_deviced=false |
450 |
- -Dwith_flatpak=false |
451 |
- $(meson_use git with_git) |
452 |
- $(meson_use webkit with_html_preview) |
453 |
- -Dwith_spellcheck=false # TODO: requires enchant-2 |
454 |
- $(meson_use sysprof with_sysprof) |
455 |
- $(meson_use vala with_vala_pack) |
456 |
- ) |
457 |
- meson_src_configure |
458 |
-} |
459 |
- |
460 |
-src_install() { |
461 |
- meson_src_install |
462 |
- if use doc; then |
463 |
- rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die |
464 |
- rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die |
465 |
- rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die |
466 |
- # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 |
467 |
- mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die |
468 |
- # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. |
469 |
- rmdir "${ED}"/usr/share/doc/gnome-builder/ || die |
470 |
- fi |
471 |
- readme.gentoo_create_doc |
472 |
-} |
473 |
- |
474 |
-pkg_postinst() { |
475 |
- xdg_pkg_postinst |
476 |
- gnome2_icon_cache_update |
477 |
- gnome2_schemas_update |
478 |
- readme.gentoo_print_elog |
479 |
-} |
480 |
- |
481 |
-pkg_postrm() { |
482 |
- xdg_pkg_postrm |
483 |
- gnome2_icon_cache_update |
484 |
- gnome2_schemas_update |
485 |
-} |
486 |
- |
487 |
-src_test() { |
488 |
- # FIXME: this should be handled at meson level upstream like epiphany does |
489 |
- find "${S}" -name '*.gschema.xml' -exec cp {} "${BUILD_DIR}/data/gsettings" \; || die |
490 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${BUILD_DIR}/data/gsettings" || die |
491 |
- |
492 |
- virtx meson_src_test |
493 |
-} |
494 |
|
495 |
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild |
496 |
deleted file mode 100644 |
497 |
index 09aad7b39c4..00000000000 |
498 |
--- a/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild |
499 |
+++ /dev/null |
500 |
@@ -1,186 +0,0 @@ |
501 |
-# Copyright 1999-2018 Gentoo Authors |
502 |
-# Distributed under the terms of the GNU General Public License v2 |
503 |
- |
504 |
-EAPI=6 |
505 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
506 |
-VALA_MIN_API_VERSION="0.36" |
507 |
-DISABLE_AUTOFORMATTING=1 |
508 |
-FORCE_PRINT_ELOG=1 |
509 |
- |
510 |
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg |
511 |
- |
512 |
-DESCRIPTION="An IDE for writing GNOME-based software" |
513 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder" |
514 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
515 |
- |
516 |
-# FIXME: Review licenses at some point |
517 |
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" |
518 |
-SLOT="0" |
519 |
-KEYWORDS="~amd64 ~x86" |
520 |
-IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit" |
521 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
522 |
- |
523 |
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. |
524 |
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. |
525 |
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first. |
526 |
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of |
527 |
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small |
528 |
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. |
529 |
- |
530 |
-# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and ${LIBGIT_DEPS} |
531 |
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? |
532 |
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 |
533 |
- |
534 |
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet) |
535 |
-LIBGIT_DEPS=" |
536 |
- dev-libs/libgit2[ssh,threads] |
537 |
- >=dev-libs/libgit2-glib-0.25.0[ssh] |
538 |
-" |
539 |
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build |
540 |
-RDEPEND=" |
541 |
- >=dev-libs/libdazzle-3.30.2[introspection,vala?] |
542 |
- >=dev-libs/glib-2.58.0:2 |
543 |
- >=x11-libs/gtk+-3.24.0:3[introspection] |
544 |
- >=x11-libs/gtksourceview-4.0.0:4[introspection] |
545 |
- >=dev-libs/json-glib-1.2.0 |
546 |
- >=dev-libs/jsonrpc-glib-3.30.1[vala?] |
547 |
- >=x11-libs/pango-1.38.0 |
548 |
- >=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}] |
549 |
- >=dev-libs/template-glib-3.28.0[introspection,vala?] |
550 |
- >=x11-libs/vte-0.40.2:2.91[vala?] |
551 |
- >=dev-libs/libxml2-2.9.0 |
552 |
- git? ( ${LIBGIT_DEPS} ) |
553 |
- dev-libs/libpcre:3 |
554 |
- webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) |
555 |
- |
556 |
- >=dev-libs/gobject-introspection-1.48.0:= |
557 |
- >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}] |
558 |
- ${PYTHON_DEPS} |
559 |
- clang? ( sys-devel/clang:= ) |
560 |
- devhelp? ( >=dev-util/devhelp-3.25.1:= ) |
561 |
- sysprof? ( >=dev-util/sysprof-3.30.2[gtk] ) |
562 |
- vala? ( |
563 |
- dev-lang/vala:= |
564 |
- $(vala_depend) |
565 |
- ) |
566 |
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_ |
567 |
-# usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against |
568 |
-# TODO: runtime ctags path finding.. |
569 |
-# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2 |
570 |
-# >=app-text/gspell-1.2.0 |
571 |
-# >=app-text/enchant:2 |
572 |
- |
573 |
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional |
574 |
-# appstream-glib needed for validation with appstream-util with FEATURES=test |
575 |
-DEPEND="${RDEPEND} |
576 |
- doc? ( dev-python/sphinx ) |
577 |
- test? ( |
578 |
- dev-libs/appstream-glib |
579 |
- sys-apps/dbus ) |
580 |
- dev-util/desktop-file-utils |
581 |
- dev-util/glib-utils |
582 |
- >=dev-util/meson-0.47.1 |
583 |
- >=sys-devel/gettext-0.19.8 |
584 |
- virtual/pkgconfig |
585 |
-" |
586 |
- |
587 |
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide |
588 |
-extra capabilities beyond these expressed via USE flags. Some of these |
589 |
-that are currently available with packages include: |
590 |
- |
591 |
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier |
592 |
- plugin out of the box functionality. |
593 |
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for |
594 |
- C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic |
595 |
- highlighting and symbol resolving support. |
596 |
-* dev-python/jedi and dev-python/lxml for more accurate Python |
597 |
- autocompletion support. |
598 |
-* dev-util/valgrind for integration with valgrind. |
599 |
-* dev-util/meson for integration with the Meson build system. |
600 |
-* dev-util/cargo for integration with the Rust Cargo build system. |
601 |
-* dev-util/cmake for integration with the CMake build system. |
602 |
-* net-libs/nodejs[npm] for integration with the NPM package system. |
603 |
-' |
604 |
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important |
605 |
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) |
606 |
-# jhbuild support |
607 |
-# rust language server via rls; Go via go-langserver |
608 |
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template |
609 |
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE |
610 |
- |
611 |
-PATCHES=( |
612 |
- "${WORKDIR}/patches" # gnome-builder-3-30 branch up to 2018-12-16 (commit f9a9dc02dd0a2c) |
613 |
-) |
614 |
- |
615 |
-llvm_check_deps() { |
616 |
- has_version "sys-devel/clang:${LLVM_SLOT}" |
617 |
-} |
618 |
- |
619 |
-pkg_setup() { |
620 |
- python-single-r1_pkg_setup |
621 |
- use clang && llvm_pkg_setup |
622 |
-} |
623 |
- |
624 |
-src_prepare() { |
625 |
- use vala && vala_src_prepare |
626 |
- xdg_src_prepare |
627 |
-} |
628 |
- |
629 |
-src_configure() { |
630 |
- local emesonargs=( |
631 |
- -Denable_tracing=false |
632 |
- -Denable_profiling=false # not passing -pg to CFLAGS |
633 |
- -Dfusermount_wrapper=false # meant for flatpak builds |
634 |
- -Dwith_tcmalloc=false |
635 |
- -Dwith_channel=other |
636 |
- -Dwith_editorconfig=true # needs libpcre |
637 |
- $(meson_use webkit with_webkit) |
638 |
- $(meson_use vala with_vapi) |
639 |
- $(meson_use doc with_help) |
640 |
- $(meson_use gtk-doc with_docs) |
641 |
- |
642 |
- -Dnetwork_tests=false |
643 |
- $(meson_use clang with_clang) |
644 |
- $(meson_use devhelp with_devhelp) |
645 |
- -Dwith_deviced=false |
646 |
- -Dwith_flatpak=false |
647 |
- $(meson_use git with_git) |
648 |
- $(meson_use webkit with_html_preview) |
649 |
- -Dwith_spellcheck=false # TODO: requires enchant-2 |
650 |
- $(meson_use sysprof with_sysprof) |
651 |
- $(meson_use vala with_vala_pack) |
652 |
- ) |
653 |
- meson_src_configure |
654 |
-} |
655 |
- |
656 |
-src_install() { |
657 |
- meson_src_install |
658 |
- if use doc; then |
659 |
- rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die |
660 |
- rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die |
661 |
- rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die |
662 |
- # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 |
663 |
- mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die |
664 |
- # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. |
665 |
- rmdir "${ED}"/usr/share/doc/gnome-builder/ || die |
666 |
- fi |
667 |
- readme.gentoo_create_doc |
668 |
-} |
669 |
- |
670 |
-pkg_postinst() { |
671 |
- xdg_pkg_postinst |
672 |
- gnome2_icon_cache_update |
673 |
- gnome2_schemas_update |
674 |
- readme.gentoo_print_elog |
675 |
-} |
676 |
- |
677 |
-pkg_postrm() { |
678 |
- xdg_pkg_postrm |
679 |
- gnome2_icon_cache_update |
680 |
- gnome2_schemas_update |
681 |
-} |
682 |
- |
683 |
-src_test() { |
684 |
- # FIXME: can't run meson_src_test together with virtx or dbus-run-session |
685 |
- virtx dbus-run-session meson test -C "${BUILD_DIR}" |
686 |
-} |