1 |
commit: 5a95b1c22a5909369ef5a325ba207251f2d49dd2 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 8 22:07:54 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 8 22:10:28 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a95b1c2 |
7 |
|
8 |
x11-libs/gtk+: 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 |
x11-libs/gtk+/Manifest | 4 - |
14 |
.../files/gtk+-2.24.31-fix-gtkentry-beep.patch | 42 --- |
15 |
x11-libs/gtk+/gtk+-2.24.31-r1.ebuild | 304 -------------------- |
16 |
x11-libs/gtk+/gtk+-2.24.32.ebuild | 305 --------------------- |
17 |
x11-libs/gtk+/gtk+-3.22.19.ebuild | 220 --------------- |
18 |
x11-libs/gtk+/gtk+-3.22.30.ebuild | 225 --------------- |
19 |
6 files changed, 1100 deletions(-) |
20 |
|
21 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
22 |
index 8ab6016ada9..1d6b0ab0725 100644 |
23 |
--- a/x11-libs/gtk+/Manifest |
24 |
+++ b/x11-libs/gtk+/Manifest |
25 |
@@ -1,7 +1,3 @@ |
26 |
-DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 |
27 |
DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858 |
28 |
-DIST gtk+-2.24.32-patchset.tar.xz 6392 BLAKE2B cd3a7256bf0552cd483a59dfd856497f5d908edb40d73c25a336726b880872a219d03a7163226abca6155bfb34a38675817124a82780760b226265ea3fdc3246 SHA512 6c8763826b479c9c122bb991ae42b0ce0e754d460be5c6ea8d1bba28f7318c014822eccaae0b39c3b7c16804991c8c46c53cd8ded3ad6212830a2f5746567543 |
29 |
DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 |
30 |
-DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 |
31 |
-DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38 |
32 |
DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d |
33 |
|
34 |
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch |
35 |
deleted file mode 100644 |
36 |
index 1d09721b671..00000000000 |
37 |
--- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch |
38 |
+++ /dev/null |
39 |
@@ -1,42 +0,0 @@ |
40 |
-From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001 |
41 |
-From: Matthias Clasen <mclasen@××××××.com> |
42 |
-Date: Wed, 5 Oct 2016 12:20:14 -0400 |
43 |
-Subject: [PATCH] entry: Fix a corner case of overwrite mode |
44 |
- |
45 |
-We currently beep when a character is appended at the end in |
46 |
-overwrite mode. That is obviously not right. Patch based on |
47 |
-a patch by Ian MacDonald. |
48 |
- |
49 |
-https://bugzilla.gnome.org/show_bug.cgi?id=772389 |
50 |
---- |
51 |
- gtk/gtkentry.c | 7 ++++++- |
52 |
- 1 file changed, 6 insertions(+), 1 deletion(-) |
53 |
- |
54 |
-diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c |
55 |
-index b522039..bc33754 100644 |
56 |
---- a/gtk/gtkentry.c |
57 |
-+++ b/gtk/gtkentry.c |
58 |
-@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry *entry, |
59 |
- GtkEditable *editable = GTK_EDITABLE (entry); |
60 |
- gint tmp_pos; |
61 |
- gboolean old_need_im_reset; |
62 |
-+ guint text_length; |
63 |
- |
64 |
- old_need_im_reset = entry->need_im_reset; |
65 |
- entry->need_im_reset = FALSE; |
66 |
-@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry *entry, |
67 |
- else |
68 |
- { |
69 |
- if (entry->overwrite_mode) |
70 |
-- gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); |
71 |
-+ { |
72 |
-+ text_length = gtk_entry_buffer_get_length (get_buffer (entry)); |
73 |
-+ if (entry->current_pos < text_length) |
74 |
-+ gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); |
75 |
-+ } |
76 |
- } |
77 |
- |
78 |
- tmp_pos = entry->current_pos; |
79 |
--- |
80 |
-2.10.0 |
81 |
- |
82 |
|
83 |
diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild |
84 |
deleted file mode 100644 |
85 |
index 71effec2ec8..00000000000 |
86 |
--- a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,304 +0,0 @@ |
89 |
-# Copyright 1999-2018 Gentoo Foundation |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI=6 |
93 |
-GNOME2_LA_PUNT="yes" |
94 |
- |
95 |
-inherit autotools eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx |
96 |
- |
97 |
-DESCRIPTION="Gimp ToolKit +" |
98 |
-HOMEPAGE="https://www.gtk.org/" |
99 |
- |
100 |
-LICENSE="LGPL-2+" |
101 |
-SLOT="2" |
102 |
-IUSE="aqua cups examples +introspection test vim-syntax xinerama" |
103 |
-REQUIRED_USE=" |
104 |
- xinerama? ( !aqua ) |
105 |
-" |
106 |
- |
107 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
108 |
- |
109 |
-# Upstream wants us to do their job: |
110 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1 |
111 |
-RESTRICT="test" |
112 |
- |
113 |
-COMMON_DEPEND=" |
114 |
- >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}] |
115 |
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] |
116 |
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
117 |
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}] |
118 |
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] |
119 |
- >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}] |
120 |
- x11-misc/shared-mime-info |
121 |
- |
122 |
- cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] ) |
123 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
124 |
- !aqua? ( |
125 |
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}] |
126 |
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
127 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
128 |
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
129 |
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
130 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
131 |
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] |
132 |
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] |
133 |
- >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] |
134 |
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] |
135 |
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) |
136 |
- ) |
137 |
-" |
138 |
-# docbook-4.1.2 and xsl required for man pages |
139 |
-# docbook-4.3 required for gtk-doc |
140 |
-DEPEND="${COMMON_DEPEND} |
141 |
- app-text/docbook-xsl-stylesheets |
142 |
- app-text/docbook-xml-dtd:4.1.2 |
143 |
- app-text/docbook-xml-dtd:4.3 |
144 |
- dev-libs/libxslt |
145 |
- dev-libs/gobject-introspection-common |
146 |
- >=dev-util/gtk-doc-am-1.20 |
147 |
- >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] |
148 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
149 |
- !aqua? ( x11-base/xorg-proto ) |
150 |
- test? ( |
151 |
- x11-themes/hicolor-icon-theme |
152 |
- media-fonts/font-misc-misc |
153 |
- media-fonts/font-cursor-misc ) |
154 |
-" |
155 |
- |
156 |
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 |
157 |
-# Add blocker against old gtk-builder-convert to be sure we maintain both |
158 |
-# in sync. |
159 |
-RDEPEND="${COMMON_DEPEND} |
160 |
- >=dev-util/gtk-update-icon-cache-2 |
161 |
- !<gnome-base/gail-1000 |
162 |
- !<dev-util/gtk-builder-convert-${PV} |
163 |
- !<x11-libs/vte-0.28.2-r201:0 |
164 |
- >=x11-themes/adwaita-icon-theme-3.14 |
165 |
- x11-themes/gnome-themes-standard |
166 |
-" |
167 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
168 |
-PDEPEND=" |
169 |
- x11-themes/gtk-engines-adwaita |
170 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
171 |
- vim-syntax? ( app-vim/gtk-syntax ) |
172 |
-" |
173 |
- |
174 |
-DISABLE_AUTOFORMATTING="yes" |
175 |
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default, |
176 |
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following: |
177 |
-[Filechooser Settings] |
178 |
-StartupMode=cwd" |
179 |
- |
180 |
-MULTILIB_CHOST_TOOLS=( |
181 |
- /usr/bin/gtk-query-immodules-2.0$(get_exeext) |
182 |
-) |
183 |
- |
184 |
-strip_builddir() { |
185 |
- local rule=$1 |
186 |
- shift |
187 |
- local directory=$1 |
188 |
- shift |
189 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
190 |
- || die "Could not strip director ${directory} from build." |
191 |
-} |
192 |
- |
193 |
-set_gtk2_confdir() { |
194 |
- # An arch specific config directory is used on multilib systems |
195 |
- GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" |
196 |
-} |
197 |
- |
198 |
-src_prepare() { |
199 |
- # marshalers code was pre-generated with glib-2.31, upstream bug #662109 |
200 |
- rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ |
201 |
- perf/marshalers.c || die |
202 |
- |
203 |
- # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150 |
204 |
- strip_builddir SUBDIRS tutorial docs/Makefile.{am,in} |
205 |
- strip_builddir SUBDIRS faq docs/Makefile.{am,in} |
206 |
- |
207 |
- # -O3 and company cause random crashes in applications, bug #133469 |
208 |
- replace-flags -O3 -O2 |
209 |
- strip-flags |
210 |
- |
211 |
- if ! use test ; then |
212 |
- # don't waste time building tests |
213 |
- strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
214 |
- strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in} |
215 |
- else |
216 |
- # Non-working test in gentoo's env |
217 |
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
218 |
- -i gtk/tests/testing.c || die "sed 1 failed" |
219 |
- |
220 |
- # Cannot work because glib is too clever to find real user's home |
221 |
- # gentoo bug #285687, upstream bug #639832 |
222 |
- # XXX: /!\ Pay extra attention to second sed when bumping /!\ |
223 |
- sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \ |
224 |
- || die "failed to disable recentmanager test (1)" |
225 |
- sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \ |
226 |
- || die "failed to disable recentmanager test (2)" |
227 |
- sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \ |
228 |
- || die "failed to disable recentmanager test (3)" |
229 |
- |
230 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=617473 |
231 |
- sed -i -e 's:pltcheck.sh:$(NULL):g' \ |
232 |
- gtk/Makefile.am || die |
233 |
- |
234 |
- # UI tests require immodules already installed; bug #413185 |
235 |
- if ! has_version 'x11-libs/gtk+:2'; then |
236 |
- ewarn "Disabling UI tests because this is the first install of" |
237 |
- ewarn "gtk+:2 on this machine. Please re-run the tests after $P" |
238 |
- ewarn "has been installed." |
239 |
- sed '/g_test_add_func.*ui-tests/ d' \ |
240 |
- -i gtk/tests/testing.c || die "sed 2 failed" |
241 |
- fi |
242 |
- fi |
243 |
- |
244 |
- if ! use examples; then |
245 |
- # don't waste time building demos |
246 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
247 |
- fi |
248 |
- |
249 |
- # Fix tests running when building out of sources, bug #510596, upstream bug #730319 |
250 |
- eapply "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch |
251 |
- |
252 |
- # Rely on split gtk-update-icon-cache package, bug #528810 |
253 |
- eapply "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch |
254 |
- |
255 |
- # Fix beep when overwriting at the end of a gtkentry, from gtk-2-24 branch |
256 |
- eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtkentry-beep.patch |
257 |
- |
258 |
- eautoreconf |
259 |
- gnome2_src_prepare |
260 |
-} |
261 |
- |
262 |
-multilib_src_configure() { |
263 |
- [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc |
264 |
- |
265 |
- ECONF_SOURCE=${S} \ |
266 |
- gnome2_src_configure \ |
267 |
- $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ |
268 |
- $(usex aqua "" --with-xinput) \ |
269 |
- $(use_enable cups cups auto) \ |
270 |
- $(multilib_native_use_enable introspection) \ |
271 |
- $(use_enable xinerama) \ |
272 |
- --disable-papi \ |
273 |
- --enable-man \ |
274 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
275 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
276 |
- |
277 |
- # work-around gtk-doc out-of-source brokedness |
278 |
- if multilib_is_native_abi; then |
279 |
- local d |
280 |
- for d in gdk gtk libgail-util; do |
281 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
282 |
- done |
283 |
- fi |
284 |
-} |
285 |
- |
286 |
-multilib_src_test() { |
287 |
- virtx emake check |
288 |
-} |
289 |
- |
290 |
-multilib_src_install() { |
291 |
- gnome2_src_install |
292 |
-} |
293 |
- |
294 |
-multilib_src_install_all() { |
295 |
- # see bug #133241 |
296 |
- # Also set more default variables in sync with gtk3 and other distributions |
297 |
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" |
298 |
- echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc" |
299 |
- echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc" |
300 |
- echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc" |
301 |
- |
302 |
- insinto /usr/share/gtk-2.0 |
303 |
- doins "${T}"/gtkrc |
304 |
- |
305 |
- einstalldocs |
306 |
- |
307 |
- # dev-util/gtk-builder-convert split off into a separate package, #402905 |
308 |
- rm "${ED}"usr/bin/gtk-builder-convert || die |
309 |
- rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die |
310 |
- |
311 |
- readme.gentoo_create_doc |
312 |
-} |
313 |
- |
314 |
-pkg_preinst() { |
315 |
- gnome2_pkg_preinst |
316 |
- |
317 |
- multilib_pkg_preinst() { |
318 |
- # Make immodules.cache belongs to gtk+ alone |
319 |
- local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" |
320 |
- |
321 |
- if [[ -e ${EROOT}${cache} ]]; then |
322 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
323 |
- else |
324 |
- touch "${ED}"/${cache} || die |
325 |
- fi |
326 |
- } |
327 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
328 |
-} |
329 |
- |
330 |
-pkg_postinst() { |
331 |
- gnome2_pkg_postinst |
332 |
- |
333 |
- multilib_pkg_postinst() { |
334 |
- gnome2_query_immodules_gtk2 \ |
335 |
- || die "Update immodules cache failed (for ${ABI})" |
336 |
- } |
337 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
338 |
- |
339 |
- set_gtk2_confdir |
340 |
- |
341 |
- if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then |
342 |
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" |
343 |
- elog "aware location. Removing deprecated file." |
344 |
- rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules |
345 |
- fi |
346 |
- |
347 |
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then |
348 |
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to" |
349 |
- elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" |
350 |
- elog "Removing deprecated file." |
351 |
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules |
352 |
- fi |
353 |
- |
354 |
- # pixbufs are now handled by x11-libs/gdk-pixbuf |
355 |
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then |
356 |
- elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" |
357 |
- elog "Removing deprecated file." |
358 |
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders |
359 |
- fi |
360 |
- |
361 |
- # two checks needed since we dropped multilib conditional |
362 |
- if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then |
363 |
- elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" |
364 |
- elog "Removing deprecated file." |
365 |
- rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders |
366 |
- fi |
367 |
- |
368 |
- if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then |
369 |
- elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* |
370 |
- elog "to do that you can use qfile from portage-utils:" |
371 |
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" |
372 |
- fi |
373 |
- |
374 |
- if ! has_version "app-text/evince"; then |
375 |
- elog "Please install app-text/evince for print preview functionality." |
376 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
377 |
- elog "add it to your gtkrc." |
378 |
- fi |
379 |
- |
380 |
- readme.gentoo_print_elog |
381 |
-} |
382 |
- |
383 |
-pkg_postrm() { |
384 |
- gnome2_pkg_postrm |
385 |
- |
386 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
387 |
- multilib_pkg_postrm() { |
388 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache |
389 |
- } |
390 |
- multilib_foreach_abi multilib_pkg_postrm |
391 |
- fi |
392 |
-} |
393 |
|
394 |
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild |
395 |
deleted file mode 100644 |
396 |
index 02b2af8e802..00000000000 |
397 |
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild |
398 |
+++ /dev/null |
399 |
@@ -1,305 +0,0 @@ |
400 |
-# Copyright 1999-2018 Gentoo Authors |
401 |
-# Distributed under the terms of the GNU General Public License v2 |
402 |
- |
403 |
-EAPI=6 |
404 |
-GNOME2_LA_PUNT="yes" |
405 |
-GNOME2_EAUTORECONF="yes" |
406 |
- |
407 |
-inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx |
408 |
- |
409 |
-DESCRIPTION="Gimp ToolKit +" |
410 |
-HOMEPAGE="https://www.gtk.org/" |
411 |
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
412 |
- |
413 |
-LICENSE="LGPL-2+" |
414 |
-SLOT="2" |
415 |
-IUSE="aqua cups examples +introspection test vim-syntax xinerama" |
416 |
-REQUIRED_USE=" |
417 |
- xinerama? ( !aqua ) |
418 |
-" |
419 |
- |
420 |
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
421 |
- |
422 |
-# Upstream wants us to do their job: |
423 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1 |
424 |
-RESTRICT="test" |
425 |
- |
426 |
-COMMON_DEPEND=" |
427 |
- >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}] |
428 |
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] |
429 |
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
430 |
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}] |
431 |
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] |
432 |
- >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}] |
433 |
- x11-misc/shared-mime-info |
434 |
- |
435 |
- cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] ) |
436 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) |
437 |
- !aqua? ( |
438 |
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}] |
439 |
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
440 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
441 |
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] |
442 |
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
443 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
444 |
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] |
445 |
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] |
446 |
- >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] |
447 |
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] |
448 |
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) |
449 |
- ) |
450 |
-" |
451 |
-# docbook-4.1.2 and xsl required for man pages |
452 |
-# docbook-4.3 required for gtk-doc |
453 |
-DEPEND="${COMMON_DEPEND} |
454 |
- app-text/docbook-xsl-stylesheets |
455 |
- app-text/docbook-xml-dtd:4.1.2 |
456 |
- app-text/docbook-xml-dtd:4.3 |
457 |
- dev-libs/libxslt |
458 |
- dev-libs/gobject-introspection-common |
459 |
- >=dev-util/gtk-doc-am-1.20 |
460 |
- >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] |
461 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
462 |
- !aqua? ( x11-base/xorg-proto ) |
463 |
- test? ( |
464 |
- x11-themes/hicolor-icon-theme |
465 |
- media-fonts/font-misc-misc |
466 |
- media-fonts/font-cursor-misc ) |
467 |
-" |
468 |
- |
469 |
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 |
470 |
-# Add blocker against old gtk-builder-convert to be sure we maintain both |
471 |
-# in sync. |
472 |
-RDEPEND="${COMMON_DEPEND} |
473 |
- >=dev-util/gtk-update-icon-cache-2 |
474 |
- !<gnome-base/gail-1000 |
475 |
- !<dev-util/gtk-builder-convert-${PV} |
476 |
- !<x11-libs/vte-0.28.2-r201:0 |
477 |
- >=x11-themes/adwaita-icon-theme-3.14 |
478 |
- x11-themes/gnome-themes-standard |
479 |
-" |
480 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
481 |
-PDEPEND=" |
482 |
- x11-themes/gtk-engines-adwaita |
483 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
484 |
- vim-syntax? ( app-vim/gtk-syntax ) |
485 |
-" |
486 |
- |
487 |
-DISABLE_AUTOFORMATTING="yes" |
488 |
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default, |
489 |
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following: |
490 |
-[Filechooser Settings] |
491 |
-StartupMode=cwd" |
492 |
- |
493 |
-MULTILIB_CHOST_TOOLS=( |
494 |
- /usr/bin/gtk-query-immodules-2.0$(get_exeext) |
495 |
-) |
496 |
- |
497 |
-PATCHES=( |
498 |
- # Fix tests running when building out of sources, bug #510596, upstream bug #730319 |
499 |
- "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch |
500 |
- # Rely on split gtk-update-icon-cache package, bug #528810 |
501 |
- "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf |
502 |
- # Upstream gtk-2-24 branch up to 2018-05-06 state, bug #650536 safety |
503 |
- "${WORKDIR}"/patches/ # requires eautoreconf |
504 |
-) |
505 |
- |
506 |
-strip_builddir() { |
507 |
- local rule=$1 |
508 |
- shift |
509 |
- local directory=$1 |
510 |
- shift |
511 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
512 |
- || die "Could not strip director ${directory} from build." |
513 |
-} |
514 |
- |
515 |
-set_gtk2_confdir() { |
516 |
- # An arch specific config directory is used on multilib systems |
517 |
- GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" |
518 |
-} |
519 |
- |
520 |
-src_prepare() { |
521 |
- # Various glib marshaller churn could break build against a different glib version, force regeneration |
522 |
- rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \ |
523 |
- perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die |
524 |
- |
525 |
- # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150 |
526 |
- strip_builddir SUBDIRS tutorial docs/Makefile.{am,in} |
527 |
- strip_builddir SUBDIRS faq docs/Makefile.{am,in} |
528 |
- |
529 |
- # -O3 and company cause random crashes in applications, bug #133469 |
530 |
- replace-flags -O3 -O2 |
531 |
- strip-flags |
532 |
- |
533 |
- if ! use test ; then |
534 |
- # don't waste time building tests |
535 |
- strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
536 |
- strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in} |
537 |
- else |
538 |
- # Non-working test in gentoo's env |
539 |
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ |
540 |
- -i gtk/tests/testing.c || die "sed 1 failed" |
541 |
- |
542 |
- # Cannot work because glib is too clever to find real user's home |
543 |
- # gentoo bug #285687, upstream bug #639832 |
544 |
- # XXX: /!\ Pay extra attention to second sed when bumping /!\ |
545 |
- sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \ |
546 |
- || die "failed to disable recentmanager test (1)" |
547 |
- sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \ |
548 |
- || die "failed to disable recentmanager test (2)" |
549 |
- sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \ |
550 |
- || die "failed to disable recentmanager test (3)" |
551 |
- |
552 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=617473 |
553 |
- sed -i -e 's:pltcheck.sh:$(NULL):g' \ |
554 |
- gtk/Makefile.am || die |
555 |
- |
556 |
- # UI tests require immodules already installed; bug #413185 |
557 |
- if ! has_version 'x11-libs/gtk+:2'; then |
558 |
- ewarn "Disabling UI tests because this is the first install of" |
559 |
- ewarn "gtk+:2 on this machine. Please re-run the tests after $P" |
560 |
- ewarn "has been installed." |
561 |
- sed '/g_test_add_func.*ui-tests/ d' \ |
562 |
- -i gtk/tests/testing.c || die "sed 2 failed" |
563 |
- fi |
564 |
- fi |
565 |
- |
566 |
- if ! use examples; then |
567 |
- # don't waste time building demos |
568 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
569 |
- fi |
570 |
- |
571 |
- gnome2_src_prepare |
572 |
-} |
573 |
- |
574 |
-multilib_src_configure() { |
575 |
- [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc |
576 |
- |
577 |
- ECONF_SOURCE=${S} \ |
578 |
- gnome2_src_configure \ |
579 |
- $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ |
580 |
- $(usex aqua "" --with-xinput) \ |
581 |
- $(use_enable cups cups auto) \ |
582 |
- $(multilib_native_use_enable introspection) \ |
583 |
- $(use_enable xinerama) \ |
584 |
- --disable-papi \ |
585 |
- --enable-man \ |
586 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
587 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
588 |
- |
589 |
- # work-around gtk-doc out-of-source brokedness |
590 |
- if multilib_is_native_abi; then |
591 |
- local d |
592 |
- for d in gdk gtk libgail-util; do |
593 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
594 |
- done |
595 |
- fi |
596 |
-} |
597 |
- |
598 |
-multilib_src_test() { |
599 |
- virtx emake check |
600 |
-} |
601 |
- |
602 |
-multilib_src_install() { |
603 |
- gnome2_src_install |
604 |
-} |
605 |
- |
606 |
-multilib_src_install_all() { |
607 |
- # see bug #133241 |
608 |
- # Also set more default variables in sync with gtk3 and other distributions |
609 |
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" |
610 |
- echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc" |
611 |
- echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc" |
612 |
- echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc" |
613 |
- |
614 |
- insinto /usr/share/gtk-2.0 |
615 |
- doins "${T}"/gtkrc |
616 |
- |
617 |
- einstalldocs |
618 |
- |
619 |
- # dev-util/gtk-builder-convert split off into a separate package, #402905 |
620 |
- rm "${ED}"usr/bin/gtk-builder-convert || die |
621 |
- rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die |
622 |
- |
623 |
- readme.gentoo_create_doc |
624 |
-} |
625 |
- |
626 |
-pkg_preinst() { |
627 |
- gnome2_pkg_preinst |
628 |
- |
629 |
- multilib_pkg_preinst() { |
630 |
- # Make immodules.cache belongs to gtk+ alone |
631 |
- local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" |
632 |
- |
633 |
- if [[ -e ${EROOT}${cache} ]]; then |
634 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
635 |
- else |
636 |
- touch "${ED}"/${cache} || die |
637 |
- fi |
638 |
- } |
639 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
640 |
-} |
641 |
- |
642 |
-pkg_postinst() { |
643 |
- gnome2_pkg_postinst |
644 |
- |
645 |
- multilib_pkg_postinst() { |
646 |
- gnome2_query_immodules_gtk2 \ |
647 |
- || die "Update immodules cache failed (for ${ABI})" |
648 |
- } |
649 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
650 |
- |
651 |
- set_gtk2_confdir |
652 |
- |
653 |
- if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then |
654 |
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" |
655 |
- elog "aware location. Removing deprecated file." |
656 |
- rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules |
657 |
- fi |
658 |
- |
659 |
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then |
660 |
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to" |
661 |
- elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" |
662 |
- elog "Removing deprecated file." |
663 |
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules |
664 |
- fi |
665 |
- |
666 |
- # pixbufs are now handled by x11-libs/gdk-pixbuf |
667 |
- if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then |
668 |
- elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" |
669 |
- elog "Removing deprecated file." |
670 |
- rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders |
671 |
- fi |
672 |
- |
673 |
- # two checks needed since we dropped multilib conditional |
674 |
- if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then |
675 |
- elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" |
676 |
- elog "Removing deprecated file." |
677 |
- rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders |
678 |
- fi |
679 |
- |
680 |
- if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then |
681 |
- elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* |
682 |
- elog "to do that you can use qfile from portage-utils:" |
683 |
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" |
684 |
- fi |
685 |
- |
686 |
- if ! has_version "app-text/evince"; then |
687 |
- elog "Please install app-text/evince for print preview functionality." |
688 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
689 |
- elog "add it to your gtkrc." |
690 |
- fi |
691 |
- |
692 |
- readme.gentoo_print_elog |
693 |
-} |
694 |
- |
695 |
-pkg_postrm() { |
696 |
- gnome2_pkg_postrm |
697 |
- |
698 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
699 |
- multilib_pkg_postrm() { |
700 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache |
701 |
- } |
702 |
- multilib_foreach_abi multilib_pkg_postrm |
703 |
- fi |
704 |
-} |
705 |
|
706 |
diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild |
707 |
deleted file mode 100644 |
708 |
index af9e928cbf8..00000000000 |
709 |
--- a/x11-libs/gtk+/gtk+-3.22.19.ebuild |
710 |
+++ /dev/null |
711 |
@@ -1,220 +0,0 @@ |
712 |
-# Copyright 1999-2018 Gentoo Foundation |
713 |
-# Distributed under the terms of the GNU General Public License v2 |
714 |
- |
715 |
-EAPI=6 |
716 |
-GNOME2_LA_PUNT="yes" |
717 |
- |
718 |
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal |
719 |
- |
720 |
-DESCRIPTION="Gimp ToolKit +" |
721 |
-HOMEPAGE="https://www.gtk.org/" |
722 |
- |
723 |
-LICENSE="LGPL-2+" |
724 |
-SLOT="3" |
725 |
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" |
726 |
-REQUIRED_USE=" |
727 |
- || ( aqua wayland X ) |
728 |
- xinerama? ( X ) |
729 |
-" |
730 |
- |
731 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
732 |
- |
733 |
-# Upstream wants us to do their job: |
734 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
735 |
-RESTRICT="test" |
736 |
- |
737 |
-# FIXME: introspection data is built against system installation of gtk+:3, |
738 |
-# bug #???? |
739 |
-COMMON_DEPEND=" |
740 |
- >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
741 |
- >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] |
742 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
743 |
- >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] |
744 |
- >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
745 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] |
746 |
- >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
747 |
- x11-misc/shared-mime-info |
748 |
- |
749 |
- cloudprint? ( |
750 |
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
751 |
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
752 |
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
753 |
- cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
754 |
- introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
755 |
- wayland? ( |
756 |
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
757 |
- >=dev-libs/wayland-protocols-1.9 |
758 |
- media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
759 |
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
760 |
- ) |
761 |
- X? ( |
762 |
- >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
763 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
764 |
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
765 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
766 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
767 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
768 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
769 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
770 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
771 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
772 |
- ) |
773 |
-" |
774 |
-DEPEND="${COMMON_DEPEND} |
775 |
- app-text/docbook-xsl-stylesheets |
776 |
- app-text/docbook-xml-dtd:4.1.2 |
777 |
- dev-libs/libxslt |
778 |
- dev-libs/gobject-introspection-common |
779 |
- >=dev-util/gdbus-codegen-2.48 |
780 |
- >=dev-util/gtk-doc-am-1.20 |
781 |
- >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
782 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
783 |
- X? ( x11-base/xorg-proto ) |
784 |
- test? ( |
785 |
- media-fonts/font-misc-misc |
786 |
- media-fonts/font-cursor-misc ) |
787 |
-" |
788 |
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
789 |
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
790 |
-RDEPEND="${COMMON_DEPEND} |
791 |
- >=dev-util/gtk-update-icon-cache-3 |
792 |
- !<gnome-base/gail-1000 |
793 |
- !<x11-libs/vte-0.31.0:2.90 |
794 |
-" |
795 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
796 |
-PDEPEND=" |
797 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
798 |
- >=x11-themes/adwaita-icon-theme-3.14 |
799 |
- vim-syntax? ( app-vim/gtk-syntax ) |
800 |
-" |
801 |
- |
802 |
-MULTILIB_CHOST_TOOLS=( |
803 |
- /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
804 |
-) |
805 |
- |
806 |
-strip_builddir() { |
807 |
- local rule=$1 |
808 |
- shift |
809 |
- local directory=$1 |
810 |
- shift |
811 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
812 |
- || die "Could not strip director ${directory} from build." |
813 |
-} |
814 |
- |
815 |
-src_prepare() { |
816 |
- if ! use test ; then |
817 |
- # don't waste time building tests |
818 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
819 |
- |
820 |
- # the tests dir needs to be build now because since commit |
821 |
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
822 |
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
823 |
- fi |
824 |
- |
825 |
- if ! use examples; then |
826 |
- # don't waste time building demos |
827 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
828 |
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
829 |
- fi |
830 |
- |
831 |
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
832 |
- eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
833 |
- |
834 |
- eautoreconf |
835 |
- gnome2_src_prepare |
836 |
-} |
837 |
- |
838 |
-multilib_src_configure() { |
839 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
840 |
- # grok so well during install (// between $EPREFIX and usr ...) |
841 |
- ECONF_SOURCE=${S} \ |
842 |
- gnome2_src_configure \ |
843 |
- $(use_enable aqua quartz-backend) \ |
844 |
- $(use_enable broadway broadway-backend) \ |
845 |
- $(use_enable cloudprint) \ |
846 |
- $(use_enable colord) \ |
847 |
- $(use_enable cups cups auto) \ |
848 |
- $(multilib_native_use_enable introspection) \ |
849 |
- $(use_enable wayland wayland-backend) \ |
850 |
- $(use_enable X x11-backend) \ |
851 |
- $(use_enable X xcomposite) \ |
852 |
- $(use_enable X xdamage) \ |
853 |
- $(use_enable X xfixes) \ |
854 |
- $(use_enable X xkb) \ |
855 |
- $(use_enable X xrandr) \ |
856 |
- $(use_enable xinerama) \ |
857 |
- --disable-papi \ |
858 |
- --disable-mir-backend \ |
859 |
- --enable-man \ |
860 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
861 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
862 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
863 |
- |
864 |
- # work-around gtk-doc out-of-source brokedness |
865 |
- if multilib_is_native_abi; then |
866 |
- local d |
867 |
- for d in gdk gtk libgail-util; do |
868 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
869 |
- done |
870 |
- fi |
871 |
-} |
872 |
- |
873 |
-multilib_src_test() { |
874 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
875 |
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
876 |
-} |
877 |
- |
878 |
-multilib_src_install() { |
879 |
- gnome2_src_install |
880 |
-} |
881 |
- |
882 |
-multilib_src_install_all() { |
883 |
- insinto /etc/gtk-3.0 |
884 |
- doins "${FILESDIR}"/settings.ini |
885 |
- # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
886 |
- DOCS=( AUTHORS NEWS README ) |
887 |
- einstalldocs |
888 |
-} |
889 |
- |
890 |
-pkg_preinst() { |
891 |
- gnome2_pkg_preinst |
892 |
- |
893 |
- multilib_pkg_preinst() { |
894 |
- # Make immodules.cache belongs to gtk+ alone |
895 |
- local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
896 |
- |
897 |
- if [[ -e ${EROOT}${cache} ]]; then |
898 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
899 |
- else |
900 |
- touch "${ED}"/${cache} || die |
901 |
- fi |
902 |
- } |
903 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
904 |
-} |
905 |
- |
906 |
-pkg_postinst() { |
907 |
- gnome2_pkg_postinst |
908 |
- |
909 |
- multilib_pkg_postinst() { |
910 |
- gnome2_query_immodules_gtk3 \ |
911 |
- || die "Update immodules cache failed (for ${ABI})" |
912 |
- } |
913 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
914 |
- |
915 |
- if ! has_version "app-text/evince"; then |
916 |
- elog "Please install app-text/evince for print preview functionality." |
917 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
918 |
- elog "add it to your settings.ini file." |
919 |
- fi |
920 |
-} |
921 |
- |
922 |
-pkg_postrm() { |
923 |
- gnome2_pkg_postrm |
924 |
- |
925 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
926 |
- multilib_pkg_postrm() { |
927 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
928 |
- } |
929 |
- multilib_foreach_abi multilib_pkg_postrm |
930 |
- fi |
931 |
-} |
932 |
|
933 |
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild |
934 |
deleted file mode 100644 |
935 |
index d55aae19ae4..00000000000 |
936 |
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild |
937 |
+++ /dev/null |
938 |
@@ -1,225 +0,0 @@ |
939 |
-# Copyright 1999-2018 Gentoo Authors |
940 |
-# Distributed under the terms of the GNU General Public License v2 |
941 |
- |
942 |
-EAPI=6 |
943 |
-GNOME2_LA_PUNT="yes" |
944 |
- |
945 |
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal |
946 |
- |
947 |
-DESCRIPTION="Gimp ToolKit +" |
948 |
-HOMEPAGE="https://www.gtk.org/" |
949 |
- |
950 |
-LICENSE="LGPL-2+" |
951 |
-SLOT="3" |
952 |
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama" |
953 |
-REQUIRED_USE=" |
954 |
- || ( aqua wayland X ) |
955 |
- xinerama? ( X ) |
956 |
-" |
957 |
- |
958 |
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
959 |
- |
960 |
-# Upstream wants us to do their job: |
961 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
962 |
-RESTRICT="test" |
963 |
- |
964 |
-# FIXME: introspection data is built against system installation of gtk+:3, |
965 |
-# bug #???? |
966 |
-COMMON_DEPEND=" |
967 |
- >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
968 |
- >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}] |
969 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
970 |
- >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] |
971 |
- >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
972 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] |
973 |
- >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
974 |
- x11-misc/shared-mime-info |
975 |
- |
976 |
- cloudprint? ( |
977 |
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
978 |
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
979 |
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
980 |
- cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
981 |
- introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
982 |
- wayland? ( |
983 |
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
984 |
- >=dev-libs/wayland-protocols-1.12 |
985 |
- media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
986 |
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
987 |
- ) |
988 |
- X? ( |
989 |
- >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
990 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
991 |
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
992 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
993 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
994 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
995 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
996 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
997 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
998 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
999 |
- ) |
1000 |
-" |
1001 |
-DEPEND="${COMMON_DEPEND} |
1002 |
- app-text/docbook-xsl-stylesheets |
1003 |
- app-text/docbook-xml-dtd:4.1.2 |
1004 |
- dev-libs/libxslt |
1005 |
- dev-libs/gobject-introspection-common |
1006 |
- >=dev-util/gdbus-codegen-2.48 |
1007 |
- >=dev-util/gtk-doc-am-1.20 |
1008 |
- >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
1009 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
1010 |
- X? ( x11-base/xorg-proto ) |
1011 |
- test? ( |
1012 |
- media-fonts/font-misc-misc |
1013 |
- media-fonts/font-cursor-misc ) |
1014 |
-" |
1015 |
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
1016 |
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
1017 |
-RDEPEND="${COMMON_DEPEND} |
1018 |
- >=dev-util/gtk-update-icon-cache-3 |
1019 |
- !<gnome-base/gail-1000 |
1020 |
- !<x11-libs/vte-0.31.0:2.90 |
1021 |
-" |
1022 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
1023 |
-PDEPEND=" |
1024 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
1025 |
- >=x11-themes/adwaita-icon-theme-3.14 |
1026 |
- vim-syntax? ( app-vim/gtk-syntax ) |
1027 |
-" |
1028 |
- |
1029 |
-MULTILIB_CHOST_TOOLS=( |
1030 |
- /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
1031 |
-) |
1032 |
- |
1033 |
-strip_builddir() { |
1034 |
- local rule=$1 |
1035 |
- shift |
1036 |
- local directory=$1 |
1037 |
- shift |
1038 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
1039 |
- || die "Could not strip director ${directory} from build." |
1040 |
-} |
1041 |
- |
1042 |
-src_prepare() { |
1043 |
- if ! use test ; then |
1044 |
- # don't waste time building tests |
1045 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
1046 |
- |
1047 |
- # the tests dir needs to be build now because since commit |
1048 |
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
1049 |
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
1050 |
- fi |
1051 |
- |
1052 |
- if ! use examples; then |
1053 |
- # don't waste time building demos |
1054 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
1055 |
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
1056 |
- fi |
1057 |
- |
1058 |
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
1059 |
- eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
1060 |
- |
1061 |
- # Fix broken autotools logic |
1062 |
- eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |
1063 |
- |
1064 |
- eautoreconf |
1065 |
- gnome2_src_prepare |
1066 |
-} |
1067 |
- |
1068 |
-multilib_src_configure() { |
1069 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
1070 |
- # grok so well during install (// between $EPREFIX and usr ...) |
1071 |
- # cloudprovider is not packaged in Gentoo |
1072 |
- ECONF_SOURCE=${S} \ |
1073 |
- gnome2_src_configure \ |
1074 |
- $(use_enable aqua quartz-backend) \ |
1075 |
- $(use_enable broadway broadway-backend) \ |
1076 |
- $(use_enable cloudprint) \ |
1077 |
- $(use_enable colord) \ |
1078 |
- $(use_enable cups cups auto) \ |
1079 |
- $(multilib_native_use_enable introspection) \ |
1080 |
- $(use_enable wayland wayland-backend) \ |
1081 |
- $(use_enable X x11-backend) \ |
1082 |
- $(use_enable X xcomposite) \ |
1083 |
- $(use_enable X xdamage) \ |
1084 |
- $(use_enable X xfixes) \ |
1085 |
- $(use_enable X xkb) \ |
1086 |
- $(use_enable X xrandr) \ |
1087 |
- $(use_enable xinerama) \ |
1088 |
- --disable-cloudproviders \ |
1089 |
- --disable-mir-backend \ |
1090 |
- --disable-papi \ |
1091 |
- --enable-man \ |
1092 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
1093 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
1094 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
1095 |
- |
1096 |
- # work-around gtk-doc out-of-source brokedness |
1097 |
- if multilib_is_native_abi; then |
1098 |
- local d |
1099 |
- for d in gdk gtk libgail-util; do |
1100 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1101 |
- done |
1102 |
- fi |
1103 |
-} |
1104 |
- |
1105 |
-multilib_src_test() { |
1106 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
1107 |
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
1108 |
-} |
1109 |
- |
1110 |
-multilib_src_install() { |
1111 |
- gnome2_src_install |
1112 |
-} |
1113 |
- |
1114 |
-multilib_src_install_all() { |
1115 |
- insinto /etc/gtk-3.0 |
1116 |
- doins "${FILESDIR}"/settings.ini |
1117 |
- # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
1118 |
- DOCS=( AUTHORS NEWS README ) |
1119 |
- einstalldocs |
1120 |
-} |
1121 |
- |
1122 |
-pkg_preinst() { |
1123 |
- gnome2_pkg_preinst |
1124 |
- |
1125 |
- multilib_pkg_preinst() { |
1126 |
- # Make immodules.cache belongs to gtk+ alone |
1127 |
- local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
1128 |
- |
1129 |
- if [[ -e ${EROOT}${cache} ]]; then |
1130 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1131 |
- else |
1132 |
- touch "${ED}"/${cache} || die |
1133 |
- fi |
1134 |
- } |
1135 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
1136 |
-} |
1137 |
- |
1138 |
-pkg_postinst() { |
1139 |
- gnome2_pkg_postinst |
1140 |
- |
1141 |
- multilib_pkg_postinst() { |
1142 |
- gnome2_query_immodules_gtk3 \ |
1143 |
- || die "Update immodules cache failed (for ${ABI})" |
1144 |
- } |
1145 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
1146 |
- |
1147 |
- if ! has_version "app-text/evince"; then |
1148 |
- elog "Please install app-text/evince for print preview functionality." |
1149 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
1150 |
- elog "add it to your settings.ini file." |
1151 |
- fi |
1152 |
-} |
1153 |
- |
1154 |
-pkg_postrm() { |
1155 |
- gnome2_pkg_postrm |
1156 |
- |
1157 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1158 |
- multilib_pkg_postrm() { |
1159 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
1160 |
- } |
1161 |
- multilib_foreach_abi multilib_pkg_postrm |
1162 |
- fi |
1163 |
-} |