Gentoo Archives: gentoo-commits

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