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: Thu, 29 Nov 2018 20:24:39
Message-Id: 1543522922.41524f97298a5e47af302df8ecbe31cb0f3c5805.leio@gentoo
1 commit: 41524f97298a5e47af302df8ecbe31cb0f3c5805
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 29 19:29:50 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 29 20:22:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41524f97
7
8 x11-libs/gtk+: remove old
9
10 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
11 Package-Manager: Portage-2.3.52, Repoman-2.3.11
12
13 x11-libs/gtk+/Manifest | 1 -
14 x11-libs/gtk+/gtk+-3.24.0.ebuild | 227 ---------------------------------------
15 2 files changed, 228 deletions(-)
16
17 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
18 index f1ea5f00cee..8ab6016ada9 100644
19 --- a/x11-libs/gtk+/Manifest
20 +++ b/x11-libs/gtk+/Manifest
21 @@ -4,5 +4,4 @@ DIST gtk+-2.24.32-patchset.tar.xz 6392 BLAKE2B cd3a7256bf0552cd483a59dfd856497f5
22 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
23 DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
24 DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
25 -DIST gtk+-3.24.0.tar.xz 19273044 BLAKE2B c1ecf7f0cb5e58ce4b3b4f5422b0d479a6078f124cc101e5fabd57c32dd6d8c75c5c90da3db373ff9f71ecec64527adec432775a7ad8f87a85d8d9cdfae097eb SHA512 c82228f31a422d7f180b1157de697d941f2826f9a85a44d2a583564130626c88759a62269bb01f54969e00ff7499db4e1b026dbfb060dda1b6e62f36f3267981
26 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
27
28 diff --git a/x11-libs/gtk+/gtk+-3.24.0.ebuild b/x11-libs/gtk+/gtk+-3.24.0.ebuild
29 deleted file mode 100644
30 index dfe5d458286..00000000000
31 --- a/x11-libs/gtk+/gtk+-3.24.0.ebuild
32 +++ /dev/null
33 @@ -1,227 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -GNOME2_LA_PUNT="yes"
39 -
40 -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
41 -
42 -DESCRIPTION="Gimp ToolKit +"
43 -HOMEPAGE="https://www.gtk.org/"
44 -
45 -LICENSE="LGPL-2+"
46 -SLOT="3"
47 -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
48 -REQUIRED_USE="
49 - || ( aqua wayland X )
50 - xinerama? ( X )
51 -"
52 -
53 -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"
54 -
55 -# Upstream wants us to do their job:
56 -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
57 -RESTRICT="test"
58 -
59 -# FIXME: introspection data is built against system installation of gtk+:3,
60 -# bug #????
61 -COMMON_DEPEND="
62 - >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
63 - >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
64 - media-libs/fontconfig[${MULTILIB_USEDEP}]
65 - >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
66 - >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
67 - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
68 - >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
69 - >=media-libs/harfbuzz-0.9:=
70 - x11-misc/shared-mime-info
71 -
72 - cloudprint? (
73 - >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
74 - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
75 - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
76 - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
77 - introspection? ( >=dev-libs/gobject-introspection-1.39:= )
78 - wayland? (
79 - >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
80 - >=dev-libs/wayland-protocols-1.12
81 - media-libs/mesa[wayland,${MULTILIB_USEDEP}]
82 - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
83 - )
84 - X? (
85 - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
86 - x11-libs/libX11[${MULTILIB_USEDEP}]
87 - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
88 - x11-libs/libXext[${MULTILIB_USEDEP}]
89 - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
90 - x11-libs/libXcursor[${MULTILIB_USEDEP}]
91 - x11-libs/libXfixes[${MULTILIB_USEDEP}]
92 - x11-libs/libXcomposite[${MULTILIB_USEDEP}]
93 - x11-libs/libXdamage[${MULTILIB_USEDEP}]
94 - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
95 - )
96 -"
97 -DEPEND="${COMMON_DEPEND}
98 - app-text/docbook-xsl-stylesheets
99 - app-text/docbook-xml-dtd:4.1.2
100 - dev-libs/libxslt
101 - dev-libs/gobject-introspection-common
102 - >=dev-util/gdbus-codegen-2.48
103 - dev-util/glib-utils
104 - >=dev-util/gtk-doc-am-1.20
105 - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
106 - virtual/pkgconfig[${MULTILIB_USEDEP}]
107 - X? ( x11-base/xorg-proto )
108 - test? (
109 - media-fonts/font-misc-misc
110 - media-fonts/font-cursor-misc )
111 -"
112 -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
113 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
114 -RDEPEND="${COMMON_DEPEND}
115 - >=dev-util/gtk-update-icon-cache-3
116 - !<gnome-base/gail-1000
117 - !<x11-libs/vte-0.31.0:2.90
118 -"
119 -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
120 -PDEPEND="
121 - gnome-base/librsvg[${MULTILIB_USEDEP}]
122 - >=x11-themes/adwaita-icon-theme-3.14
123 - vim-syntax? ( app-vim/gtk-syntax )
124 -"
125 -
126 -MULTILIB_CHOST_TOOLS=(
127 - /usr/bin/gtk-query-immodules-3.0$(get_exeext)
128 -)
129 -
130 -strip_builddir() {
131 - local rule=$1
132 - shift
133 - local directory=$1
134 - shift
135 - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
136 - || die "Could not strip director ${directory} from build."
137 -}
138 -
139 -src_prepare() {
140 - if ! use test ; then
141 - # don't waste time building tests
142 - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
143 -
144 - # the tests dir needs to be build now because since commit
145 - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
146 - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
147 - fi
148 -
149 - if ! use examples; then
150 - # don't waste time building demos
151 - strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
152 - strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
153 - fi
154 -
155 - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
156 - eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
157 -
158 - # Fix broken autotools logic
159 - eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
160 -
161 - eautoreconf
162 - gnome2_src_prepare
163 -}
164 -
165 -multilib_src_configure() {
166 - # need libdir here to avoid a double slash in a path that libtool doesn't
167 - # grok so well during install (// between $EPREFIX and usr ...)
168 - # cloudprovider is not packaged in Gentoo
169 - ECONF_SOURCE=${S} \
170 - gnome2_src_configure \
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 introspection) \
177 - $(use_enable wayland wayland-backend) \
178 - $(use_enable X x11-backend) \
179 - $(use_enable X xcomposite) \
180 - $(use_enable X xdamage) \
181 - $(use_enable X xfixes) \
182 - $(use_enable X xkb) \
183 - $(use_enable X xrandr) \
184 - $(use_enable xinerama) \
185 - --disable-cloudproviders \
186 - --disable-mir-backend \
187 - --disable-papi \
188 - --enable-man \
189 - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
190 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
191 - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
192 -
193 - # work-around gtk-doc out-of-source brokedness
194 - if multilib_is_native_abi; then
195 - local d
196 - for d in gdk gtk libgail-util; do
197 - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
198 - done
199 - fi
200 -}
201 -
202 -multilib_src_test() {
203 - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
204 - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
205 -}
206 -
207 -multilib_src_install() {
208 - gnome2_src_install
209 -}
210 -
211 -multilib_src_install_all() {
212 - insinto /etc/gtk-3.0
213 - doins "${FILESDIR}"/settings.ini
214 - # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
215 - DOCS=( AUTHORS NEWS README )
216 - einstalldocs
217 -}
218 -
219 -pkg_preinst() {
220 - gnome2_pkg_preinst
221 -
222 - multilib_pkg_preinst() {
223 - # Make immodules.cache belongs to gtk+ alone
224 - local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
225 -
226 - if [[ -e ${EROOT}${cache} ]]; then
227 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
228 - else
229 - touch "${ED}"/${cache} || die
230 - fi
231 - }
232 - multilib_parallel_foreach_abi multilib_pkg_preinst
233 -}
234 -
235 -pkg_postinst() {
236 - gnome2_pkg_postinst
237 -
238 - multilib_pkg_postinst() {
239 - gnome2_query_immodules_gtk3 \
240 - || die "Update immodules cache failed (for ${ABI})"
241 - }
242 - multilib_parallel_foreach_abi multilib_pkg_postinst
243 -
244 - if ! has_version "app-text/evince"; then
245 - elog "Please install app-text/evince for print preview functionality."
246 - elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
247 - elog "add it to your settings.ini file."
248 - fi
249 -}
250 -
251 -pkg_postrm() {
252 - gnome2_pkg_postrm
253 -
254 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
255 - multilib_pkg_postrm() {
256 - rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
257 - }
258 - multilib_foreach_abi multilib_pkg_postrm
259 - fi
260 -}