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: Sat, 30 Mar 2019 21:57:06
Message-Id: 1553982979.1d27e80f9cb8b7c6ca4ebd0215dbcec66dee1c09.leio@gentoo
1 commit: 1d27e80f9cb8b7c6ca4ebd0215dbcec66dee1c09
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 30 21:43:39 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 30 21:56:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d27e80f
7
8 x11-libs/gtk+: remove old
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 x11-libs/gtk+/Manifest | 2 -
14 x11-libs/gtk+/gtk+-3.24.5.ebuild | 234 ---------------------------------------
15 2 files changed, 236 deletions(-)
16
17 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
18 index e5d6d4f56b4..52931b67b91 100644
19 --- a/x11-libs/gtk+/Manifest
20 +++ b/x11-libs/gtk+/Manifest
21 @@ -2,6 +2,4 @@ DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790
22 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
23 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
24 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
25 -DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 BLAKE2B 09d1dcd0a6312f042739c633ef5c3a3b26c81f586c4c1396bc9ed4cd5e8a891507d6a6857e91b481794c8c6ea1e9511b756e7307775acb4ec53f561283c2139c SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e
26 -DIST gtk+-3.24.5.tar.xz 21012108 BLAKE2B 25b8fc92655be190a0dc082ee303614026054d9bf17f93e8df11129f77fe1e6dc9cc97d5ceeab139eb905e3d61ea918b01d39f342e11d06fb3245c590567d24a SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1
27 DIST gtk+-3.24.7.tar.xz 19375708 BLAKE2B 28ec4106258a7ecfa78d2f3dd8d2145cdf8ecbb55167bf22002e38186721e2e1658885032630eb306785bfe36486834c40e34fd5ac20d1c30d4f5de58cba7fae SHA512 2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5
28
29 diff --git a/x11-libs/gtk+/gtk+-3.24.5.ebuild b/x11-libs/gtk+/gtk+-3.24.5.ebuild
30 deleted file mode 100644
31 index d8cc461ffc4..00000000000
32 --- a/x11-libs/gtk+/gtk+-3.24.5.ebuild
33 +++ /dev/null
34 @@ -1,234 +0,0 @@
35 -# Copyright 1999-2019 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 -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-20190206.tar.xz"
47 -
48 -LICENSE="LGPL-2+"
49 -SLOT="3"
50 -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
51 -REQUIRED_USE="
52 - || ( aqua wayland X )
53 - xinerama? ( X )
54 -"
55 -
56 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
57 -
58 -# Upstream wants us to do their job:
59 -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
60 -RESTRICT="test"
61 -
62 -# FIXME: introspection data is built against system installation of gtk+:3,
63 -# bug #????
64 -COMMON_DEPEND="
65 - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
66 - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
67 - >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
68 - media-libs/fontconfig[${MULTILIB_USEDEP}]
69 - >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
70 - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
71 - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
72 - >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
73 - >=media-libs/harfbuzz-0.9:=
74 - x11-misc/shared-mime-info
75 -
76 - cloudprint? (
77 - >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
78 - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
79 - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
80 - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
81 - introspection? ( >=dev-libs/gobject-introspection-1.39:= )
82 - wayland? (
83 - >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
84 - >=dev-libs/wayland-protocols-1.12
85 - media-libs/mesa[wayland,${MULTILIB_USEDEP}]
86 - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
87 - )
88 - X? (
89 - >=app-accessibility/at-spi2-atk-2.5.3[${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-3-24 branch at morning of 2019-02-07 - fribidi explicit linking, compiler warning fixes, small bugfixes
161 - eapply "${WORKDIR}"/patches
162 -
163 - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
164 - eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
165 -
166 - # Fix broken autotools logic
167 - eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
168 -
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 - # cloudprovider is not packaged in Gentoo
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 gtk-doc) \
184 - $(multilib_native_use_enable introspection) \
185 - $(use_enable wayland wayland-backend) \
186 - $(use_enable X x11-backend) \
187 - $(use_enable X xcomposite) \
188 - $(use_enable X xdamage) \
189 - $(use_enable X xfixes) \
190 - $(use_enable X xkb) \
191 - $(use_enable X xrandr) \
192 - $(use_enable xinerama) \
193 - --disable-cloudproviders \
194 - --disable-mir-backend \
195 - --disable-papi \
196 - --enable-man \
197 - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
198 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
199 - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
200 -
201 - # work-around gtk-doc out-of-source brokedness
202 - if multilib_is_native_abi; then
203 - local d
204 - for d in gdk gtk libgail-util; do
205 - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
206 - done
207 - fi
208 -}
209 -
210 -multilib_src_test() {
211 - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
212 - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
213 -}
214 -
215 -multilib_src_install() {
216 - gnome2_src_install
217 -}
218 -
219 -multilib_src_install_all() {
220 - insinto /etc/gtk-3.0
221 - doins "${FILESDIR}"/settings.ini
222 - # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
223 - DOCS=( AUTHORS NEWS README )
224 - einstalldocs
225 -}
226 -
227 -pkg_preinst() {
228 - gnome2_pkg_preinst
229 -
230 - multilib_pkg_preinst() {
231 - # Make immodules.cache belongs to gtk+ alone
232 - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
233 -
234 - if [[ -e ${EROOT}${cache} ]]; then
235 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
236 - else
237 - touch "${ED}"/${cache} || die
238 - fi
239 - }
240 - multilib_parallel_foreach_abi multilib_pkg_preinst
241 -}
242 -
243 -pkg_postinst() {
244 - gnome2_pkg_postinst
245 -
246 - multilib_pkg_postinst() {
247 - gnome2_query_immodules_gtk3 \
248 - || die "Update immodules cache failed (for ${ABI})"
249 - }
250 - multilib_parallel_foreach_abi multilib_pkg_postinst
251 -
252 - if ! has_version "app-text/evince"; then
253 - elog "Please install app-text/evince for print preview functionality."
254 - elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
255 - elog "add it to your settings.ini file."
256 - fi
257 -}
258 -
259 -pkg_postrm() {
260 - gnome2_pkg_postrm
261 -
262 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
263 - multilib_pkg_postrm() {
264 - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
265 - }
266 - multilib_foreach_abi multilib_pkg_postrm
267 - fi
268 -}