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/gdk-pixbuf/
Date: Wed, 01 Jan 2020 16:07:08
Message-Id: 1577894807.b0fa2163e6df3ad149270e7722a406021a9912f6.leio@gentoo
1 commit: b0fa2163e6df3ad149270e7722a406021a9912f6
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 16:01:36 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 16:06:47 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0fa2163
7
8 x11-libs/gdk-pixbuf: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 x11-libs/gdk-pixbuf/Manifest | 2 -
14 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild | 143 ------------------------
15 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild | 139 -----------------------
16 3 files changed, 284 deletions(-)
17
18 diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
19 index d15be355228..33fb84860fc 100644
20 --- a/x11-libs/gdk-pixbuf/Manifest
21 +++ b/x11-libs/gdk-pixbuf/Manifest
22 @@ -1,5 +1,3 @@
23 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
24 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
25 -DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
26 -DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1
27 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
28
29 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild
30 deleted file mode 100644
31 index e9a368ec312..00000000000
32 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1-r1.ebuild
33 +++ /dev/null
34 @@ -1,143 +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 -
40 -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
41 -
42 -DESCRIPTION="Image loading library for GTK+"
43 -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
44 -
45 -LICENSE="LGPL-2+"
46 -SLOT="2"
47 -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48 -IUSE="X gtk-doc +introspection jpeg tiff"
49 -
50 -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
51 -COMMON_DEPEND="
52 - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
53 - x11-misc/shared-mime-info
54 - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
55 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
56 - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
57 - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
58 - introspection? ( >=dev-libs/gobject-introspection-1.54:= )
59 -"
60 -DEPEND="${COMMON_DEPEND}
61 - app-text/docbook-xsl-stylesheets
62 - dev-libs/libxslt
63 - dev-util/glib-utils
64 - gtk-doc? ( >=dev-util/gtk-doc-1.20 )
65 - >=sys-devel/gettext-0.19.8
66 - virtual/pkgconfig
67 -"
68 -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
69 -RDEPEND="${COMMON_DEPEND}
70 - !<gnome-base/gail-1000
71 - !<gnome-base/librsvg-2.31.0
72 - !<x11-libs/gtk+-2.21.3:2
73 - !<x11-libs/gtk+-2.90.4:3
74 -"
75 -
76 -MULTILIB_CHOST_TOOLS=(
77 - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
78 -)
79 -
80 -PATCHES=(
81 - # Do not run lowmem test on uclibc
82 - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
83 - "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
84 -)
85 -
86 -src_prepare() {
87 - xdg_src_prepare
88 - # This will avoid polluting the pkg-config file with versioned libpng,
89 - # which is causing problems with libpng14 -> libpng15 upgrade
90 - # See upstream bug #667068
91 - # First check that the pattern is present, to catch upstream changes on bumps,
92 - # because sed doesn't return failure code if it doesn't do any replacements
93 - grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
94 - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
95 -}
96 -
97 -multilib_src_configure() {
98 - local emesonargs=(
99 - -Dpng=true
100 - $(meson_use tiff)
101 - $(meson_use jpeg)
102 - -Djasper=false
103 - $(meson_use X x11)
104 - -Dbuiltin_loaders=png
105 - -Drelocatable=false
106 - #native_windows_loaders
107 - -Dinstalled_tests=false
108 - -Dgio_sniffing=true
109 - )
110 - if multilib_is_native_abi; then
111 - emesonargs+=(
112 - $(meson_use gtk-doc docs)
113 - $(meson_use introspection gir)
114 - -Dman=true
115 - )
116 - else
117 - emesonargs+=(
118 - -Ddocs=false
119 - -Dgir=false
120 - -Dman=false
121 - )
122 - fi
123 - meson_src_configure
124 -}
125 -
126 -multilib_src_compile() {
127 - meson_src_compile
128 -}
129 -
130 -multilib_src_test() {
131 - meson_src_test
132 -}
133 -
134 -multilib_src_install() {
135 - meson_src_install
136 -}
137 -
138 -pkg_preinst() {
139 - xdg_pkg_preinst
140 -
141 - multilib_pkg_preinst() {
142 - # Make sure loaders.cache belongs to gdk-pixbuf alone
143 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
144 -
145 - if [[ -e ${EROOT}${cache} ]]; then
146 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
147 - else
148 - touch "${ED}"/${cache} || die
149 - fi
150 - }
151 -
152 - multilib_foreach_abi multilib_pkg_preinst
153 - gnome2_gdk_pixbuf_savelist
154 -}
155 -
156 -pkg_postinst() {
157 - # causes segfault if set, see bug 375615
158 - unset __GL_NO_DSO_FINALIZER
159 -
160 - xdg_pkg_postinst
161 - multilib_foreach_abi gnome2_gdk_pixbuf_update
162 -
163 - # Migration snippet for when this was handled by gtk+
164 - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
165 - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
166 - elog "to do that you can use qfile from portage-utils:"
167 - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
168 - fi
169 -}
170 -
171 -pkg_postrm() {
172 - xdg_pkg_postrm
173 -
174 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
175 - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
176 - fi
177 -}
178
179 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild
180 deleted file mode 100644
181 index 751e7ed0fff..00000000000
182 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2-r1.ebuild
183 +++ /dev/null
184 @@ -1,139 +0,0 @@
185 -# Copyright 1999-2019 Gentoo Authors
186 -# Distributed under the terms of the GNU General Public License v2
187 -
188 -EAPI=6
189 -# TODO: EAPI-7 needs gnome2-utils fixes - ${EROOT%/} and co usage for EAPI-7 in gdk_pixbuf_*
190 -# TODO: functions and eutils inherit for emktemp or some other solution
191 -
192 -inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
193 -
194 -DESCRIPTION="Image loading library for GTK+"
195 -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
196 -
197 -LICENSE="LGPL-2+"
198 -SLOT="2"
199 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
200 -IUSE="X gtk-doc +introspection jpeg tiff"
201 -
202 -# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
203 -DEPEND="
204 - >=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
205 - x11-misc/shared-mime-info
206 - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
207 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
208 - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
209 - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
210 - introspection? ( >=dev-libs/gobject-introspection-1.54:= )
211 -"
212 -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
213 -RDEPEND="${DEPEND}
214 - !<gnome-base/gail-1000
215 - !<gnome-base/librsvg-2.31.0
216 - !<x11-libs/gtk+-2.21.3:2
217 - !<x11-libs/gtk+-2.90.4:3
218 -"
219 -DEPEND="
220 - app-text/docbook-xsl-stylesheets
221 - dev-libs/libxslt
222 - dev-util/glib-utils
223 - gtk-doc? ( >=dev-util/gtk-doc-1.20
224 - app-text/docbook-xml-dtd:4.3 )
225 - >=sys-devel/gettext-0.19.8
226 - virtual/pkgconfig
227 -"
228 -
229 -MULTILIB_CHOST_TOOLS=(
230 - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
231 -)
232 -
233 -PATCHES=(
234 - # Do not run lowmem test on uclibc
235 - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
236 - "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
237 -)
238 -
239 -src_prepare() {
240 - xdg_src_prepare
241 - # This will avoid polluting the pkg-config file with versioned libpng,
242 - # which is causing problems with libpng14 -> libpng15 upgrade
243 - # See upstream bug #667068
244 - # First check that the pattern is present, to catch upstream changes on bumps,
245 - # because sed doesn't return failure code if it doesn't do any replacements
246 - grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
247 - sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
248 -}
249 -
250 -multilib_src_configure() {
251 - local emesonargs=(
252 - -Dpng=true
253 - $(meson_use tiff)
254 - $(meson_use jpeg)
255 - -Djasper=false
256 - $(meson_use X x11)
257 - -Dbuiltin_loaders=png
258 - -Drelocatable=false
259 - #native_windows_loaders
260 - -Dinstalled_tests=false
261 - -Dgio_sniffing=true
262 - )
263 - if multilib_is_native_abi; then
264 - emesonargs+=(
265 - $(meson_use gtk-doc docs)
266 - $(meson_use introspection gir)
267 - -Dman=true
268 - )
269 - else
270 - emesonargs+=(
271 - -Ddocs=false
272 - -Dgir=false
273 - -Dman=false
274 - )
275 - fi
276 - meson_src_configure
277 -}
278 -
279 -multilib_src_compile() {
280 - meson_src_compile
281 -}
282 -
283 -multilib_src_test() {
284 - meson_src_test
285 -}
286 -
287 -multilib_src_install() {
288 - meson_src_install
289 -}
290 -
291 -pkg_preinst() {
292 - xdg_pkg_preinst
293 -
294 - multilib_pkg_preinst() {
295 - # Make sure loaders.cache belongs to gdk-pixbuf alone
296 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
297 -
298 - if [[ -e ${EROOT%/}/${cache} ]]; then
299 - cp "${EROOT%/}"/${cache} "${ED}"/${cache} || die
300 - else
301 - touch "${ED%/}"/${cache} || die
302 - fi
303 - }
304 -
305 - multilib_foreach_abi multilib_pkg_preinst
306 - gnome2_gdk_pixbuf_savelist
307 -}
308 -
309 -pkg_postinst() {
310 - # causes segfault if set, see bug 375615
311 - unset __GL_NO_DSO_FINALIZER
312 -
313 - xdg_pkg_postinst
314 - multilib_foreach_abi gnome2_gdk_pixbuf_update
315 -}
316 -
317 -pkg_postrm() {
318 - xdg_pkg_postrm
319 -
320 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
321 - rm -f "${EROOT%/}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
322 - fi
323 -}