Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/
Date: Wed, 27 Dec 2017 13:02:36
Message-Id: 1514379647.293e17c094cac84689dc4168f41460f93f1f6844.leio@gentoo
1 commit: 293e17c094cac84689dc4168f41460f93f1f6844
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 27 12:18:22 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 27 13:00:47 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293e17c0
7
8 x11-libs/gtk+: remove old
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 x11-libs/gtk+/Manifest | 1 -
13 x11-libs/gtk+/gtk+-3.22.16.ebuild | 226 --------------------------------------
14 2 files changed, 227 deletions(-)
15
16 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
17 index 90a656413d0..82cccd9dc6e 100644
18 --- a/x11-libs/gtk+/Manifest
19 +++ b/x11-libs/gtk+/Manifest
20 @@ -1,3 +1,2 @@
21 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
22 -DIST gtk+-3.22.16.tar.xz 18655144 BLAKE2B 947ef2768afbd7a242834e5eb1cef218f3978543193e18a4c216bb91be30482955f887b298a9a50786b0aa24613b924933994cc8472752587140bb796898afd0 SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612
23 DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
24
25 diff --git a/x11-libs/gtk+/gtk+-3.22.16.ebuild b/x11-libs/gtk+/gtk+-3.22.16.ebuild
26 deleted file mode 100644
27 index edf7c3562e1..00000000000
28 --- a/x11-libs/gtk+/gtk+-3.22.16.ebuild
29 +++ /dev/null
30 @@ -1,226 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -GNOME2_LA_PUNT="yes"
36 -
37 -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
38 -
39 -DESCRIPTION="Gimp ToolKit +"
40 -HOMEPAGE="https://www.gtk.org/"
41 -
42 -LICENSE="LGPL-2+"
43 -SLOT="3"
44 -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
45 -REQUIRED_USE="
46 - || ( aqua wayland X )
47 - xinerama? ( X )
48 -"
49 -
50 -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"
51 -
52 -# Upstream wants us to do their job:
53 -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
54 -RESTRICT="test"
55 -
56 -# FIXME: introspection data is built against system installation of gtk+:3,
57 -# bug #????
58 -COMMON_DEPEND="
59 - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
60 - >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
61 - media-libs/fontconfig[${MULTILIB_USEDEP}]
62 - >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
63 - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
64 - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
65 - >=x11-libs/pango-1.37.3[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.9.91[${MULTILIB_USEDEP}]
76 - >=dev-libs/wayland-protocols-1.7
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/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 -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.48
99 - >=dev-util/gtk-doc-am-1.20
100 - >=sys-devel/gettext-0.19.7[${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 -"
113 -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
114 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
115 -RDEPEND="${COMMON_DEPEND}
116 - >=dev-util/gtk-update-icon-cache-3
117 - !<gnome-base/gail-1000
118 - !<x11-libs/vte-0.31.0:2.90
119 - >=x11-themes/adwaita-icon-theme-3.14
120 -"
121 -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
122 -PDEPEND="
123 - gnome-base/librsvg[${MULTILIB_USEDEP}]
124 - vim-syntax? ( app-vim/gtk-syntax )
125 -"
126 -
127 -MULTILIB_CHOST_TOOLS=(
128 - /usr/bin/gtk-query-immodules-3.0$(get_exeext)
129 -)
130 -
131 -strip_builddir() {
132 - local rule=$1
133 - shift
134 - local directory=$1
135 - shift
136 - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
137 - || die "Could not strip director ${directory} from build."
138 -}
139 -
140 -src_prepare() {
141 - if ! use test ; then
142 - # don't waste time building tests
143 - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
144 -
145 - # the tests dir needs to be build now because since commit
146 - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
147 - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
148 - fi
149 -
150 - if ! use examples; then
151 - # don't waste time building demos
152 - strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
153 - strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
154 - fi
155 -
156 - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
157 - eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
158 -
159 - eautoreconf
160 - gnome2_src_prepare
161 -}
162 -
163 -multilib_src_configure() {
164 - # need libdir here to avoid a double slash in a path that libtool doesn't
165 - # grok so well during install (// between $EPREFIX and usr ...)
166 - ECONF_SOURCE=${S} \
167 - gnome2_src_configure \
168 - $(use_enable aqua quartz-backend) \
169 - $(use_enable broadway broadway-backend) \
170 - $(use_enable cloudprint) \
171 - $(use_enable colord) \
172 - $(use_enable cups cups auto) \
173 - $(multilib_native_use_enable introspection) \
174 - $(use_enable wayland wayland-backend) \
175 - $(use_enable X x11-backend) \
176 - $(use_enable X xcomposite) \
177 - $(use_enable X xdamage) \
178 - $(use_enable X xfixes) \
179 - $(use_enable X xkb) \
180 - $(use_enable X xrandr) \
181 - $(use_enable xinerama) \
182 - --disable-papi \
183 - --disable-mir-backend \
184 - --enable-man \
185 - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
186 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
187 - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
188 -
189 - # work-around gtk-doc out-of-source brokedness
190 - if multilib_is_native_abi; then
191 - local d
192 - for d in gdk gtk libgail-util; do
193 - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
194 - done
195 - fi
196 -}
197 -
198 -multilib_src_test() {
199 - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
200 - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
201 -}
202 -
203 -multilib_src_install() {
204 - gnome2_src_install
205 -}
206 -
207 -multilib_src_install_all() {
208 - insinto /etc/gtk-3.0
209 - doins "${FILESDIR}"/settings.ini
210 - # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
211 - DOCS=( AUTHORS NEWS README )
212 - einstalldocs
213 -}
214 -
215 -pkg_preinst() {
216 - gnome2_pkg_preinst
217 -
218 - multilib_pkg_preinst() {
219 - # Make immodules.cache belongs to gtk+ alone
220 - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
221 -
222 - if [[ -e ${EROOT}${cache} ]]; then
223 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
224 - else
225 - touch "${ED}"/${cache} || die
226 - fi
227 - }
228 - multilib_parallel_foreach_abi multilib_pkg_preinst
229 -}
230 -
231 -pkg_postinst() {
232 - gnome2_pkg_postinst
233 -
234 - multilib_pkg_postinst() {
235 - gnome2_query_immodules_gtk3 \
236 - || die "Update immodules cache failed (for ${ABI})"
237 - }
238 - multilib_parallel_foreach_abi multilib_pkg_postinst
239 -
240 - if ! has_version "app-text/evince"; then
241 - elog "Please install app-text/evince for print preview functionality."
242 - elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
243 - elog "add it to your settings.ini file."
244 - fi
245 -}
246 -
247 -pkg_postrm() {
248 - gnome2_pkg_postrm
249 -
250 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
251 - multilib_pkg_postrm() {
252 - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
253 - }
254 - multilib_foreach_abi multilib_pkg_postrm
255 - fi
256 -}