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: Sun, 09 Feb 2020 14:43:02
Message-Id: 1581259302.7d4b25ede75b04b6520e86ffcf5e6555d7afff80.leio@gentoo
1 commit: 7d4b25ede75b04b6520e86ffcf5e6555d7afff80
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 14:41:25 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 14:41:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4b25ed
7
8 x11-libs/gtk+: remove old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 x11-libs/gtk+/Manifest | 1 -
14 x11-libs/gtk+/gtk+-3.24.10.ebuild | 245 --------------------------------------
15 2 files changed, 246 deletions(-)
16
17 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
18 index 90e7dc4c0f0..00d86c0111d 100644
19 --- a/x11-libs/gtk+/Manifest
20 +++ b/x11-libs/gtk+/Manifest
21 @@ -1,6 +1,5 @@
22 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
23 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
24 -DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff3735fb5f375c1bc21ca2591874b583d4879021d868d78fe1714bc037d80d44fb3384efd1167962b8c6e9588c5a SHA512 1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498
25 DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
26 DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
27 DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
28
29 diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
30 deleted file mode 100644
31 index 4b776459dd5..00000000000
32 --- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
33 +++ /dev/null
34 @@ -1,245 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -GNOME2_LA_PUNT="yes"
40 -GNOME2_EAUTORECONF="yes"
41 -
42 -inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
43 -
44 -DESCRIPTION="Gimp ToolKit +"
45 -HOMEPAGE="https://www.gtk.org/"
46 -
47 -LICENSE="LGPL-2+"
48 -SLOT="3"
49 -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
50 -REQUIRED_USE="
51 - || ( aqua wayland X )
52 - xinerama? ( X )
53 -"
54 -
55 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
56 -
57 -# Upstream wants us to do their job:
58 -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
59 -RESTRICT="test"
60 -
61 -# FIXME: introspection data is built against system installation of gtk+:3,
62 -# bug #????
63 -COMMON_DEPEND="
64 - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
65 - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
66 - >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
67 - media-libs/fontconfig[${MULTILIB_USEDEP}]
68 - >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
69 - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
70 - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
71 - >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
72 - >=media-libs/harfbuzz-0.9:=
73 - x11-misc/shared-mime-info
74 -
75 - cloudprint? (
76 - >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
77 - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
78 - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
79 - cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
80 - introspection? ( >=dev-libs/gobject-introspection-1.39:= )
81 - wayland? (
82 - >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
83 - >=dev-libs/wayland-protocols-1.12
84 - media-libs/mesa[wayland,${MULTILIB_USEDEP}]
85 - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
86 - )
87 - X? (
88 - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
89 - media-libs/mesa[X(+),${MULTILIB_USEDEP}]
90 - x11-libs/libX11[${MULTILIB_USEDEP}]
91 - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
92 - x11-libs/libXext[${MULTILIB_USEDEP}]
93 - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
94 - x11-libs/libXcursor[${MULTILIB_USEDEP}]
95 - x11-libs/libXfixes[${MULTILIB_USEDEP}]
96 - x11-libs/libXcomposite[${MULTILIB_USEDEP}]
97 - x11-libs/libXdamage[${MULTILIB_USEDEP}]
98 - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
99 - )
100 -"
101 -DEPEND="${COMMON_DEPEND}
102 - app-text/docbook-xsl-stylesheets
103 - app-text/docbook-xml-dtd:4.1.2
104 - dev-libs/libxslt
105 - dev-libs/gobject-introspection-common
106 - >=dev-util/gdbus-codegen-2.48
107 - dev-util/glib-utils
108 - >=dev-util/gtk-doc-am-1.20
109 - gtk-doc? ( >=dev-util/gtk-doc-1.20 )
110 - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
111 - virtual/pkgconfig[${MULTILIB_USEDEP}]
112 - X? ( x11-base/xorg-proto )
113 - test? (
114 - media-fonts/font-misc-misc
115 - media-fonts/font-cursor-misc )
116 -"
117 -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
118 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
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 -"
124 -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
125 -PDEPEND="
126 - gnome-base/librsvg[${MULTILIB_USEDEP}]
127 - >=x11-themes/adwaita-icon-theme-3.14
128 - vim-syntax? ( app-vim/gtk-syntax )
129 -"
130 -
131 -MULTILIB_CHOST_TOOLS=(
132 - /usr/bin/gtk-query-immodules-3.0$(get_exeext)
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 - if ! use test ; then
146 - # don't waste time building tests
147 - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
148 -
149 - # the tests dir needs to be build now because since commit
150 - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
151 - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
152 - fi
153 -
154 - if ! use examples; then
155 - # don't waste time building demos
156 - strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
157 - strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
158 - fi
159 -
160 - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
161 - eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
162 -
163 - # Fix broken autotools logic
164 - eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
165 -
166 - gnome2_src_prepare
167 -}
168 -
169 -multilib_src_configure() {
170 - local myconf=(
171 - $(use_enable aqua quartz-backend)
172 - $(use_enable broadway broadway-backend)
173 - $(use_enable cloudprint)
174 - $(use_enable colord)
175 - $(use_enable cups cups auto)
176 - $(multilib_native_use_enable gtk-doc)
177 - $(multilib_native_use_enable introspection)
178 - $(use_enable wayland wayland-backend)
179 - $(use_enable X x11-backend)
180 - $(use_enable X xcomposite)
181 - $(use_enable X xdamage)
182 - $(use_enable X xfixes)
183 - $(use_enable X xkb)
184 - $(use_enable X xrandr)
185 - $(use_enable xinerama)
186 - # cloudprovider is not packaged in Gentoo yet
187 - --disable-cloudproviders
188 - --disable-mir-backend
189 - --disable-papi
190 - # sysprof integration needs >=sysprof-3.33.2
191 - --disable-profiler
192 - --enable-man
193 - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
194 - # need libdir here to avoid a double slash in a path that libtool doesn't
195 - # grok so well during install (// between $EPREFIX and usr ...)
196 - # TODO: Is this still the case?
197 - --libdir="${EPREFIX}"/usr/$(get_libdir)
198 - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
199 - )
200 -
201 - if use wayland; then
202 - myconf+=(
203 - # Include wayland immodule into gtk itself, to avoid problems like
204 - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
205 - # user overridden GTK_IM_MODULE envvar
206 - --with-included-immodules=wayland
207 - )
208 - fi;
209 -
210 - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
211 -
212 - # work-around gtk-doc out-of-source brokedness
213 - if multilib_is_native_abi; then
214 - local d
215 - for d in gdk gtk libgail-util; do
216 - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
217 - done
218 - fi
219 -}
220 -
221 -multilib_src_test() {
222 - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
223 - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
224 -}
225 -
226 -multilib_src_install() {
227 - gnome2_src_install
228 -}
229 -
230 -multilib_src_install_all() {
231 - insinto /etc/gtk-3.0
232 - doins "${FILESDIR}"/settings.ini
233 - # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
234 - DOCS=( AUTHORS NEWS README )
235 - einstalldocs
236 -}
237 -
238 -pkg_preinst() {
239 - gnome2_pkg_preinst
240 -
241 - multilib_pkg_preinst() {
242 - # Make immodules.cache belongs to gtk+ alone
243 - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
244 -
245 - if [[ -e ${EROOT}${cache} ]]; then
246 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
247 - else
248 - touch "${ED}"/${cache} || die
249 - fi
250 - }
251 - multilib_parallel_foreach_abi multilib_pkg_preinst
252 -}
253 -
254 -pkg_postinst() {
255 - gnome2_pkg_postinst
256 -
257 - multilib_pkg_postinst() {
258 - gnome2_query_immodules_gtk3 \
259 - || die "Update immodules cache failed (for ${ABI})"
260 - }
261 - multilib_parallel_foreach_abi multilib_pkg_postinst
262 -
263 - if ! has_version "app-text/evince"; then
264 - elog "Please install app-text/evince for print preview functionality."
265 - elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
266 - elog "add it to your settings.ini file."
267 - fi
268 -}
269 -
270 -pkg_postrm() {
271 - gnome2_pkg_postrm
272 -
273 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
274 - multilib_pkg_postrm() {
275 - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
276 - }
277 - multilib_foreach_abi multilib_pkg_postrm
278 - fi
279 -}