1 |
commit: 4086e98f8384562502ad73bfce2802556eb62e0e |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 7 20:27:01 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 7 21:19:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4086e98f |
7 |
|
8 |
x11-libs/gtk+: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
x11-libs/gtk+/Manifest | 1 - |
13 |
.../gtk+-3.16.2-remove_update-icon-cache.patch | 24 --- |
14 |
x11-libs/gtk+/gtk+-3.20.9.ebuild | 233 --------------------- |
15 |
3 files changed, 258 deletions(-) |
16 |
|
17 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
18 |
index 7a5756a1dd7..6aa3aa59220 100644 |
19 |
--- a/x11-libs/gtk+/Manifest |
20 |
+++ b/x11-libs/gtk+/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST gtk+-2.24.31.tar.xz 12805344 SHA256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1 WHIRLPOOL 6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e |
23 |
-DIST gtk+-3.20.9.tar.xz 17174872 SHA256 83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 SHA512 5848403959f76633511009231c80a814cfe24a7ba07c9429704f432191e51b54d3e6621ce5b578f79999f21993920af3a45c8d03dad6ba03af5f9a342b32626e WHIRLPOOL 7964b82dabf72b5d45a34565874ba02e0dda09b0f358f640ca0c602c3c7aa4618432829d047794f5f202424c34c837bbdc31ccb3c5457768e252f048afd30107 |
24 |
DIST gtk+-3.22.15.tar.xz 18662944 SHA256 c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758 WHIRLPOOL f0eae97db9ef7e1a3ecedc0d98fb35c4a671774f473c1b6f5a17424e2f6ca3d25e98efd74312bb481addfacbc44b6d2d6a549658d202ed6a7215743678de1d00 |
25 |
DIST gtk+-3.22.16.tar.xz 18655144 SHA256 3e0c3ad01f3c8c5c9b1cc1ae00852bd55164c8e5a9c1f90ba5e07f14f175fe2c SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612 WHIRLPOOL 364cec780093ba60832a85769b4b6994adce43efbb408bc291fc059a6c804c50da169af4f0bbe152ed3072d02b02417bf0d700f52b50d9e41bea9bdf67784f71 |
26 |
|
27 |
diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch |
28 |
deleted file mode 100644 |
29 |
index b121dd57281..00000000000 |
30 |
--- a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch |
31 |
+++ /dev/null |
32 |
@@ -1,24 +0,0 @@ |
33 |
-From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001 |
34 |
-From: Ole Reifschneider <tranquility@g.o> |
35 |
-Date: Thu, 16 Apr 2015 23:51:51 +0200 |
36 |
-Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS |
37 |
- |
38 |
---- |
39 |
- gtk/Makefile.am | 1 - |
40 |
- 1 file changed, 1 deletion(-) |
41 |
- |
42 |
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
43 |
-index 83dfe31..a5afc03 100644 |
44 |
---- a/gtk/Makefile.am |
45 |
-+++ b/gtk/Makefile.am |
46 |
-@@ -1380,7 +1380,6 @@ endif |
47 |
- # |
48 |
- bin_PROGRAMS = \ |
49 |
- gtk-query-immodules-3.0 \ |
50 |
-- gtk-update-icon-cache \ |
51 |
- gtk-encode-symbolic-svg \ |
52 |
- gtk-launch |
53 |
- |
54 |
--- |
55 |
-2.0.5 |
56 |
- |
57 |
|
58 |
diff --git a/x11-libs/gtk+/gtk+-3.20.9.ebuild b/x11-libs/gtk+/gtk+-3.20.9.ebuild |
59 |
deleted file mode 100644 |
60 |
index 4c60225b850..00000000000 |
61 |
--- a/x11-libs/gtk+/gtk+-3.20.9.ebuild |
62 |
+++ /dev/null |
63 |
@@ -1,233 +0,0 @@ |
64 |
-# Copyright 1999-2017 Gentoo Foundation |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
- |
67 |
-EAPI=6 |
68 |
-GNOME2_LA_PUNT="yes" |
69 |
- |
70 |
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal |
71 |
- |
72 |
-DESCRIPTION="Gimp ToolKit +" |
73 |
-HOMEPAGE="http://www.gtk.org/" |
74 |
- |
75 |
-LICENSE="LGPL-2+" |
76 |
-SLOT="3" |
77 |
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" |
78 |
-REQUIRED_USE=" |
79 |
- || ( aqua wayland X ) |
80 |
- xinerama? ( X ) |
81 |
-" |
82 |
- |
83 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
84 |
- |
85 |
-# Upstream wants us to do their job: |
86 |
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 |
87 |
-RESTRICT="test" |
88 |
- |
89 |
-# FIXME: introspection data is built against system installation of gtk+:3, |
90 |
-# bug #???? |
91 |
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) |
92 |
-COMMON_DEPEND=" |
93 |
- >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] |
94 |
- >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}] |
95 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
96 |
- >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}] |
97 |
- >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] |
98 |
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] |
99 |
- >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}] |
100 |
- x11-misc/shared-mime-info |
101 |
- |
102 |
- cloudprint? ( |
103 |
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}] |
104 |
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) |
105 |
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) |
106 |
- cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) |
107 |
- introspection? ( >=dev-libs/gobject-introspection-1.39:= ) |
108 |
- wayland? ( |
109 |
- >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] |
110 |
- >=dev-libs/wayland-protocols-1.0 |
111 |
- media-libs/mesa[wayland,${MULTILIB_USEDEP}] |
112 |
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] |
113 |
- ) |
114 |
- X? ( |
115 |
- >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] |
116 |
- x11-libs/libXrender[${MULTILIB_USEDEP}] |
117 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
118 |
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
119 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
120 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
121 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
122 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
123 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
124 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
125 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
126 |
- ) |
127 |
-" |
128 |
-DEPEND="${COMMON_DEPEND} |
129 |
- app-text/docbook-xsl-stylesheets |
130 |
- app-text/docbook-xml-dtd:4.1.2 |
131 |
- dev-libs/libxslt |
132 |
- dev-libs/gobject-introspection-common |
133 |
- >=dev-util/gdbus-codegen-2.38.2 |
134 |
- >=dev-util/gtk-doc-am-1.20 |
135 |
- >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] |
136 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
137 |
- X? ( |
138 |
- x11-proto/xextproto[${MULTILIB_USEDEP}] |
139 |
- x11-proto/xproto[${MULTILIB_USEDEP}] |
140 |
- x11-proto/inputproto[${MULTILIB_USEDEP}] |
141 |
- x11-proto/damageproto[${MULTILIB_USEDEP}] |
142 |
- xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) |
143 |
- ) |
144 |
- test? ( |
145 |
- media-fonts/font-misc-misc |
146 |
- media-fonts/font-cursor-misc ) |
147 |
-" |
148 |
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
149 |
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
150 |
-# >=xorg-server-1.11.4 needed for |
151 |
-# https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html |
152 |
-RDEPEND="${COMMON_DEPEND} |
153 |
- >=dev-util/gtk-update-icon-cache-3 |
154 |
- !<gnome-base/gail-1000 |
155 |
- !<x11-libs/vte-0.31.0:2.90 |
156 |
- >=x11-themes/adwaita-icon-theme-3.14 |
157 |
- X? ( !<x11-base/xorg-server-1.11.4 ) |
158 |
-" |
159 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
160 |
-PDEPEND=" |
161 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
162 |
- vim-syntax? ( app-vim/gtk-syntax ) |
163 |
-" |
164 |
- |
165 |
-MULTILIB_CHOST_TOOLS=( |
166 |
- /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
167 |
-) |
168 |
- |
169 |
-strip_builddir() { |
170 |
- local rule=$1 |
171 |
- shift |
172 |
- local directory=$1 |
173 |
- shift |
174 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
175 |
- || die "Could not strip director ${directory} from build." |
176 |
-} |
177 |
- |
178 |
-src_prepare() { |
179 |
- # -O3 and company cause random crashes in applications. Bug #133469 |
180 |
- replace-flags -O3 -O2 |
181 |
- strip-flags |
182 |
- |
183 |
- if ! use test ; then |
184 |
- # don't waste time building tests |
185 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
186 |
- |
187 |
- # the tests dir needs to be build now because since commit |
188 |
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
189 |
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
190 |
- fi |
191 |
- |
192 |
- if ! use examples; then |
193 |
- # don't waste time building demos |
194 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
195 |
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
196 |
- fi |
197 |
- |
198 |
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
199 |
- eapply "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch |
200 |
- |
201 |
- gnome2_src_prepare |
202 |
- eautoreconf |
203 |
-} |
204 |
- |
205 |
-multilib_src_configure() { |
206 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
207 |
- # grok so well during install (// between $EPREFIX and usr ...) |
208 |
- ECONF_SOURCE=${S} \ |
209 |
- gnome2_src_configure \ |
210 |
- $(use_enable aqua quartz-backend) \ |
211 |
- $(use_enable broadway broadway-backend) \ |
212 |
- $(use_enable cloudprint) \ |
213 |
- $(use_enable colord) \ |
214 |
- $(use_enable cups cups auto) \ |
215 |
- $(multilib_native_use_enable introspection) \ |
216 |
- $(use_enable wayland wayland-backend) \ |
217 |
- $(use_enable X x11-backend) \ |
218 |
- $(use_enable X xcomposite) \ |
219 |
- $(use_enable X xdamage) \ |
220 |
- $(use_enable X xfixes) \ |
221 |
- $(use_enable X xkb) \ |
222 |
- $(use_enable X xrandr) \ |
223 |
- $(use_enable xinerama) \ |
224 |
- --disable-papi \ |
225 |
- --disable-mir-backend \ |
226 |
- --enable-man \ |
227 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
228 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
229 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
230 |
- |
231 |
- # work-around gtk-doc out-of-source brokedness |
232 |
- if multilib_is_native_abi; then |
233 |
- local d |
234 |
- for d in gdk gtk libgail-util; do |
235 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
236 |
- done |
237 |
- fi |
238 |
-} |
239 |
- |
240 |
-multilib_src_test() { |
241 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
242 |
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
243 |
-} |
244 |
- |
245 |
-multilib_src_install() { |
246 |
- gnome2_src_install |
247 |
-} |
248 |
- |
249 |
-multilib_src_install_all() { |
250 |
- insinto /etc/gtk-3.0 |
251 |
- doins "${FILESDIR}"/settings.ini |
252 |
- einstalldocs |
253 |
-} |
254 |
- |
255 |
-pkg_preinst() { |
256 |
- gnome2_pkg_preinst |
257 |
- |
258 |
- multilib_pkg_preinst() { |
259 |
- # Make immodules.cache belongs to gtk+ alone |
260 |
- local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
261 |
- |
262 |
- if [[ -e ${EROOT}${cache} ]]; then |
263 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
264 |
- else |
265 |
- touch "${ED}"/${cache} || die |
266 |
- fi |
267 |
- } |
268 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
269 |
-} |
270 |
- |
271 |
-pkg_postinst() { |
272 |
- gnome2_pkg_postinst |
273 |
- |
274 |
- multilib_pkg_postinst() { |
275 |
- gnome2_query_immodules_gtk3 \ |
276 |
- || die "Update immodules cache failed (for ${ABI})" |
277 |
- } |
278 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
279 |
- |
280 |
- if ! has_version "app-text/evince"; then |
281 |
- elog "Please install app-text/evince for print preview functionality." |
282 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
283 |
- elog "add it to your settings.ini file." |
284 |
- fi |
285 |
-} |
286 |
- |
287 |
-pkg_postrm() { |
288 |
- gnome2_pkg_postrm |
289 |
- |
290 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
291 |
- multilib_pkg_postrm() { |
292 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
293 |
- } |
294 |
- multilib_foreach_abi multilib_pkg_postrm |
295 |
- fi |
296 |
-} |