1 |
commit: c9ccf8a482d5c90addd06e93560dcfa752386d66 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 21 21:13:55 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 21 21:13:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ccf8a4 |
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.3-r1.ebuild | 233 ------------------------------------ |
15 |
2 files changed, 235 deletions(-) |
16 |
|
17 |
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest |
18 |
index 9a989ca82ce..c49c3678cf1 100644 |
19 |
--- a/x11-libs/gtk+/Manifest |
20 |
+++ b/x11-libs/gtk+/Manifest |
21 |
@@ -1,6 +1,4 @@ |
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.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d |
25 |
-DIST gtk+-3.24.3-patchset-20190119.tar.xz 18032 BLAKE2B 2597fcac94f365fab4b02d73318ed4d65522befe1daf0e1a72578b4ead00cfc83da2215965a8afe869b4cc011eb173b0a5db0768903b6b793a1ec9848cadf325 SHA512 9fbd73936931e2e529146d74711a5243a5e67e49de2d63d9f4a64c1f0825cbdd50ae2683869e4616f5fd8a4267ac5bf68d3cd21a06589a9d3f14ce82e3573521 |
26 |
-DIST gtk+-3.24.3.tar.xz 21099144 BLAKE2B d0493a720b310ebba3b64b643ccf3880ed1611418127a6997d885638b46f1f44e3a0b01651319d0fe476906a53fbee0f84ca1ba142aaa634a01841ce9c7e7efc SHA512 72a69d71f2e16a1dd169cc74d568da47131bd5d77994bcdd3b427ec1cd37c5daf0841a6e4824b125d860bc1c4f07c9835a3b2e74d951666253d3e4edbed0e5fc |
27 |
DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1 |
28 |
|
29 |
diff --git a/x11-libs/gtk+/gtk+-3.24.3-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.3-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 917c556475c..00000000000 |
32 |
--- a/x11-libs/gtk+/gtk+-3.24.3-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,233 +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-20190119.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/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-1.2[${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 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
90 |
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] |
91 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
92 |
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] |
93 |
- x11-libs/libXcursor[${MULTILIB_USEDEP}] |
94 |
- x11-libs/libXfixes[${MULTILIB_USEDEP}] |
95 |
- x11-libs/libXcomposite[${MULTILIB_USEDEP}] |
96 |
- x11-libs/libXdamage[${MULTILIB_USEDEP}] |
97 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
98 |
- ) |
99 |
-" |
100 |
-DEPEND="${COMMON_DEPEND} |
101 |
- app-text/docbook-xsl-stylesheets |
102 |
- app-text/docbook-xml-dtd:4.1.2 |
103 |
- dev-libs/libxslt |
104 |
- dev-libs/gobject-introspection-common |
105 |
- >=dev-util/gdbus-codegen-2.48 |
106 |
- dev-util/glib-utils |
107 |
- >=dev-util/gtk-doc-am-1.20 |
108 |
- gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
109 |
- >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] |
110 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
111 |
- X? ( x11-base/xorg-proto ) |
112 |
- test? ( |
113 |
- media-fonts/font-misc-misc |
114 |
- media-fonts/font-cursor-misc ) |
115 |
-" |
116 |
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 |
117 |
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 |
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 |
-" |
123 |
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 |
124 |
-PDEPEND=" |
125 |
- gnome-base/librsvg[${MULTILIB_USEDEP}] |
126 |
- >=x11-themes/adwaita-icon-theme-3.14 |
127 |
- vim-syntax? ( app-vim/gtk-syntax ) |
128 |
-" |
129 |
- |
130 |
-MULTILIB_CHOST_TOOLS=( |
131 |
- /usr/bin/gtk-query-immodules-3.0$(get_exeext) |
132 |
-) |
133 |
- |
134 |
-strip_builddir() { |
135 |
- local rule=$1 |
136 |
- shift |
137 |
- local directory=$1 |
138 |
- shift |
139 |
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ |
140 |
- || die "Could not strip director ${directory} from build." |
141 |
-} |
142 |
- |
143 |
-src_prepare() { |
144 |
- if ! use test ; then |
145 |
- # don't waste time building tests |
146 |
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} |
147 |
- |
148 |
- # the tests dir needs to be build now because since commit |
149 |
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there |
150 |
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} |
151 |
- fi |
152 |
- |
153 |
- if ! use examples; then |
154 |
- # don't waste time building demos |
155 |
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in} |
156 |
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in} |
157 |
- fi |
158 |
- |
159 |
- # Patches from gtk-3-24 branch up to b984074e2924b7e759, mainly fixing GtkSwitch glyphs when IEC power symbol unicode-9 glyphs are missing from all installed fonts |
160 |
- eapply "${WORKDIR}"/patches |
161 |
- |
162 |
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache |
163 |
- eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch |
164 |
- |
165 |
- # Fix broken autotools logic |
166 |
- eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch |
167 |
- |
168 |
- gnome2_src_prepare |
169 |
-} |
170 |
- |
171 |
-multilib_src_configure() { |
172 |
- # need libdir here to avoid a double slash in a path that libtool doesn't |
173 |
- # grok so well during install (// between $EPREFIX and usr ...) |
174 |
- # cloudprovider is not packaged in Gentoo |
175 |
- ECONF_SOURCE=${S} \ |
176 |
- gnome2_src_configure \ |
177 |
- $(use_enable aqua quartz-backend) \ |
178 |
- $(use_enable broadway broadway-backend) \ |
179 |
- $(use_enable cloudprint) \ |
180 |
- $(use_enable colord) \ |
181 |
- $(use_enable cups cups auto) \ |
182 |
- $(multilib_native_use_enable gtk-doc) \ |
183 |
- $(multilib_native_use_enable introspection) \ |
184 |
- $(use_enable wayland wayland-backend) \ |
185 |
- $(use_enable X x11-backend) \ |
186 |
- $(use_enable X xcomposite) \ |
187 |
- $(use_enable X xdamage) \ |
188 |
- $(use_enable X xfixes) \ |
189 |
- $(use_enable X xkb) \ |
190 |
- $(use_enable X xrandr) \ |
191 |
- $(use_enable xinerama) \ |
192 |
- --disable-cloudproviders \ |
193 |
- --disable-mir-backend \ |
194 |
- --disable-papi \ |
195 |
- --enable-man \ |
196 |
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ |
197 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
198 |
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" |
199 |
- |
200 |
- # work-around gtk-doc out-of-source brokedness |
201 |
- if multilib_is_native_abi; then |
202 |
- local d |
203 |
- for d in gdk gtk libgail-util; do |
204 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
205 |
- done |
206 |
- fi |
207 |
-} |
208 |
- |
209 |
-multilib_src_test() { |
210 |
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die |
211 |
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check |
212 |
-} |
213 |
- |
214 |
-multilib_src_install() { |
215 |
- gnome2_src_install |
216 |
-} |
217 |
- |
218 |
-multilib_src_install_all() { |
219 |
- insinto /etc/gtk-3.0 |
220 |
- doins "${FILESDIR}"/settings.ini |
221 |
- # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default |
222 |
- DOCS=( AUTHORS NEWS README ) |
223 |
- einstalldocs |
224 |
-} |
225 |
- |
226 |
-pkg_preinst() { |
227 |
- gnome2_pkg_preinst |
228 |
- |
229 |
- multilib_pkg_preinst() { |
230 |
- # Make immodules.cache belongs to gtk+ alone |
231 |
- local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" |
232 |
- |
233 |
- if [[ -e ${EROOT}${cache} ]]; then |
234 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
235 |
- else |
236 |
- touch "${ED}"/${cache} || die |
237 |
- fi |
238 |
- } |
239 |
- multilib_parallel_foreach_abi multilib_pkg_preinst |
240 |
-} |
241 |
- |
242 |
-pkg_postinst() { |
243 |
- gnome2_pkg_postinst |
244 |
- |
245 |
- multilib_pkg_postinst() { |
246 |
- gnome2_query_immodules_gtk3 \ |
247 |
- || die "Update immodules cache failed (for ${ABI})" |
248 |
- } |
249 |
- multilib_parallel_foreach_abi multilib_pkg_postinst |
250 |
- |
251 |
- if ! has_version "app-text/evince"; then |
252 |
- elog "Please install app-text/evince for print preview functionality." |
253 |
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and" |
254 |
- elog "add it to your settings.ini file." |
255 |
- fi |
256 |
-} |
257 |
- |
258 |
-pkg_postrm() { |
259 |
- gnome2_pkg_postrm |
260 |
- |
261 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
262 |
- multilib_pkg_postrm() { |
263 |
- rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache |
264 |
- } |
265 |
- multilib_foreach_abi multilib_pkg_postrm |
266 |
- fi |
267 |
-} |