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: Sun, 20 Sep 2015 18:23:43
Message-Id: 1442773412.85a19a26fe9c22601baf5606c6cf9ddfc6dc28d0.pacho@gentoo
1 commit: 85a19a26fe9c22601baf5606c6cf9ddfc6dc28d0
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 20 18:17:48 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 20 18:23:32 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a19a26
7
8 x11-libs/gtk+: Drop old
9
10 Package-Manager: portage-2.2.20.1
11
12 x11-libs/gtk+/Manifest | 1 -
13 x11-libs/gtk+/gtk+-3.16.5.ebuild | 249 ---------------------------------------
14 2 files changed, 250 deletions(-)
15
16 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
17 index c46e9dd..89a9bb7 100644
18 --- a/x11-libs/gtk+/Manifest
19 +++ b/x11-libs/gtk+/Manifest
20 @@ -2,5 +2,4 @@ DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b3112
21 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
22 DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
23 DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
24 -DIST gtk+-3.16.5.tar.xz 18263356 SHA256 b87c99d127eb962fc857c246b77a65322cdffd7dcbcf46a83bce2040e0f4bc31 SHA512 f8dd318d5d72e8c59534bf49e505de3575f7519d57398030f4c47a576c3b37e4f00fec1b5a3ba2a3769e94373504dfb6ca24b1015f1e8f8f7dca6f46114b95f8 WHIRLPOOL 9c7ca6a76bde91912043ccfb26375327628fb2206b0e613116c9b6b1f1d078cccf075690b7749d76e8ddea3e3118ecae79e49be98490db29a7a2042f843d0b97
25 DIST gtk+-3.16.6.tar.xz 18273872 SHA256 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe SHA512 0b3417c57ef755c8eb498b6800cd9e1dc1df01d508425c968944aaa0d7ff50f25a00370f9a6ccf23a87cc9f7fb251447e63055149264b997ee5a681e98dc54ec WHIRLPOOL f944cce4396d2519d357ef75f1e9d420b64d77004110f0e7d2eb643ae5b3f8182db5be28e35269a57ecfe9cbc3280dc65008c30ce1c977d64d0fbb317e6f6bce
26
27 diff --git a/x11-libs/gtk+/gtk+-3.16.5.ebuild b/x11-libs/gtk+/gtk+-3.16.5.ebuild
28 deleted file mode 100644
29 index 58ee8d5..0000000
30 --- a/x11-libs/gtk+/gtk+-3.16.5.ebuild
31 +++ /dev/null
32 @@ -1,249 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI="5"
38 -GCONF_DEBUG="yes"
39 -GNOME2_LA_PUNT="yes"
40 -
41 -inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
42 -
43 -DESCRIPTION="Gimp ToolKit +"
44 -HOMEPAGE="http://www.gtk.org/"
45 -
46 -LICENSE="LGPL-2+"
47 -SLOT="3"
48 -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
49 -REQUIRED_USE="
50 - || ( aqua wayland X )
51 - xinerama? ( X )
52 -"
53 -
54 -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"
55 -
56 -# FIXME: introspection data is built against system installation of gtk+:3
57 -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
58 -COMMON_DEPEND="
59 - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
60 - >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
61 - media-libs/fontconfig[${MULTILIB_USEDEP}]
62 - >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
63 - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
64 - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
65 - >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
66 - x11-misc/shared-mime-info
67 -
68 - cloudprint? (
69 - >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
70 - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
71 - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
72 - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
73 - introspection? ( >=dev-libs/gobject-introspection-1.39:= )
74 - wayland? (
75 - >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
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.3[${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 -DEPEND="${COMMON_DEPEND}
94 - app-text/docbook-xsl-stylesheets
95 - app-text/docbook-xml-dtd:4.1.2
96 - dev-libs/libxslt
97 - dev-libs/gobject-introspection-common
98 - >=dev-util/gdbus-codegen-2.38.2
99 - >=dev-util/gtk-doc-am-1.20
100 - >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
101 - virtual/pkgconfig[${MULTILIB_USEDEP}]
102 - X? (
103 - x11-proto/xextproto[${MULTILIB_USEDEP}]
104 - x11-proto/xproto[${MULTILIB_USEDEP}]
105 - x11-proto/inputproto[${MULTILIB_USEDEP}]
106 - x11-proto/damageproto[${MULTILIB_USEDEP}]
107 - xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
108 - )
109 - test? (
110 - media-fonts/font-misc-misc
111 - media-fonts/font-cursor-misc )
112 - examples? ( media-libs/libcanberra[gtk3] )
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 - abi_x86_32? (
125 - !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
126 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
127 - )
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 - epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
170 -
171 - epatch_user
172 -
173 - eautoreconf
174 - gnome2_src_prepare
175 -}
176 -
177 -multilib_src_configure() {
178 - # need libdir here to avoid a double slash in a path that libtool doesn't
179 - # grok so well during install (// between $EPREFIX and usr ...)
180 - ECONF_SOURCE=${S} \
181 - gnome2_src_configure \
182 - $(use_enable aqua quartz-backend) \
183 - $(use_enable broadway broadway-backend) \
184 - $(use_enable cloudprint) \
185 - $(use_enable colord) \
186 - $(use_enable cups cups auto) \
187 - $(multilib_native_use_enable introspection) \
188 - $(use_enable wayland wayland-backend) \
189 - $(use_enable X x11-backend) \
190 - $(use_enable X xcomposite) \
191 - $(use_enable X xdamage) \
192 - $(use_enable X xfixes) \
193 - $(use_enable X xkb) \
194 - $(use_enable X xrandr) \
195 - $(use_enable xinerama) \
196 - --disable-papi \
197 - --disable-mir-backend \
198 - --enable-man \
199 - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
200 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
201 - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
202 -
203 - # work-around gtk-doc out-of-source brokedness
204 - if multilib_is_native_abi; then
205 - local d
206 - for d in gdk gtk libgail-util; do
207 - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
208 - done
209 - fi
210 -}
211 -
212 -multilib_src_test() {
213 - # FIXME: this should be handled at eclass level
214 - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
215 -
216 - unset DBUS_SESSION_BUS_ADDRESS
217 - unset DISPLAY #527682
218 - GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
219 -}
220 -
221 -multilib_src_install() {
222 - gnome2_src_install
223 -
224 - # add -framework Carbon to the .pc files, bug #???
225 - if use aqua ; then
226 - for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
227 - sed -e "s:Libs\: :Libs\: -framework Carbon :" \
228 - -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
229 - done
230 - fi
231 -}
232 -
233 -multilib_src_install_all() {
234 - insinto /etc/gtk-3.0
235 - doins "${FILESDIR}"/settings.ini
236 -
237 - dodoc AUTHORS ChangeLog* HACKING NEWS* README*
238 -}
239 -
240 -pkg_preinst() {
241 - gnome2_pkg_preinst
242 -
243 - multilib_pkg_preinst() {
244 - # Make immodules.cache belongs to gtk+ alone
245 - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
246 -
247 - if [[ -e ${EROOT}${cache} ]]; then
248 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
249 - else
250 - touch "${ED}"/${cache} || die
251 - fi
252 - }
253 - multilib_parallel_foreach_abi multilib_pkg_preinst
254 -}
255 -
256 -pkg_postinst() {
257 - gnome2_pkg_postinst
258 -
259 - multilib_pkg_postinst() {
260 - gnome2_query_immodules_gtk3 \
261 - || die "Update immodules cache failed (for ${ABI})"
262 - }
263 - multilib_parallel_foreach_abi multilib_pkg_postinst
264 -
265 - if ! has_version "app-text/evince"; then
266 - elog "Please install app-text/evince for print preview functionality."
267 - elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
268 - elog "add it to your settings.ini file."
269 - fi
270 -}
271 -
272 -pkg_postrm() {
273 - gnome2_pkg_postrm
274 -
275 - if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
276 - multilib_pkg_postrm() {
277 - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
278 - }
279 - multilib_foreach_abi multilib_pkg_postrm
280 - fi
281 -}