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