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