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: Fri, 30 Dec 2016 02:01:30
Message-Id: 1483063258.da3988cd930814d6fc47a81bdedbab7a2f9db253.leio@gentoo
1 commit: da3988cd930814d6fc47a81bdedbab7a2f9db253
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 30 02:00:32 2016 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 30 02:00:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3988cd
7
8 x11-libs/gdk-pixbuf: Remove old
9
10 Package-Manager: portage-2.3.3
11
12 x11-libs/gdk-pixbuf/Manifest | 2 -
13 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.0.ebuild | 120 ---------------------------
14 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.1.ebuild | 120 ---------------------------
15 3 files changed, 242 deletions(-)
16
17 diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
18 index b28ebc0..2423c52 100644
19 --- a/x11-libs/gdk-pixbuf/Manifest
20 +++ b/x11-libs/gdk-pixbuf/Manifest
21 @@ -1,6 +1,4 @@
22 DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2
23 DIST gdk-pixbuf-2.32.3.tar.xz 2430720 SHA256 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 SHA512 9eb9b87c8104cff9292bebc41c411d2ba4b7fcd9d24c1b99e6dfc8281b5a202a53045dd3095666e3614eba59d417a7c0f69789b2a9dd52ed53bb5df4a0dfd117 WHIRLPOOL 053c48d7f0890ed0f324225ccf4d16f9afd4fd70b878acc6b9ec1bfd9c0c732bc290447cce25ba37cbbdded89a183d112b6e9b4b53141c62690bf45846f675e1
24 DIST gdk-pixbuf-2.34.0.tar.xz 2709320 SHA256 d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 SHA512 874aed9af0352592674f2bebd4d9b0a945932a410c9f0b776f45766c2f18d442a39c684cca69b1aca6d14f67f18e690489f388ff58699dbd0efbd13244a1a8b5 WHIRLPOOL c2f7b1ac0d2fa13a00c1bed37a66b9b13564e1cef5262db656c640b0256f821658f8e6d0e1e5a300a2af83847b15518d7e0c72995df877970bf44ad28e5fd416
25 -DIST gdk-pixbuf-2.36.0.tar.xz 2718648 SHA256 85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c SHA512 f9f5cc9aabf08bc246c7a328c9775a89eb1a6bf21699928c0e1fd17ac86e624162097d65ee9b51e550ee64dd201bea48465bff9636c94844d91a9cf3f73da919 WHIRLPOOL 1776cf50b3c8fc78bcc90f492bb3ba5ed9f52c8d7441a0d8003f6725e26baf9542e4b022471facb81899231737deb3f134ad24b96dd8e01de8353117fc0d58a2
26 -DIST gdk-pixbuf-2.36.1.tar.xz 2711044 SHA256 9d5ba72070460c1b5b74115d395a3e33daeb7b7b67fb256cdccc9d7187c42a38 SHA512 15254dc161436150fed0e43d6c7049d984548fa8df999c18f947c967108756442baf48b83ca6e2d4e343b0e63fa37103e4c820c2cfd02fb6786daed4b77a353a WHIRLPOOL ea466a12e5f176fc7f1744144e58b5d145100f9747148f663bdc5624bf1982576b267f14f6249caddc44285fb7975fa37e33955fb1a3bd1b47adb73eb8c13478
27 DIST gdk-pixbuf-2.36.2.tar.xz 4877452 SHA256 3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d SHA512 34a569aee7a26af701edbc9bf895617dc59d1a7f98292c832885cff88733cb7f581253a5caeecf265712a07f975b7c7dfeda4050e7a81cb5c9de19b4b82d17ba WHIRLPOOL fb2871f32084a2c40cea9cd662167645d5458dd4b96faa9967356a5a95b3a173f8d54c41608dfae0344460ffd87441be0f3c465eef7dbae979e5c2d8fb92ff27
28
29 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.0.ebuild
30 deleted file mode 100644
31 index 7a2b8a4..00000000
32 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.0.ebuild
33 +++ /dev/null
34 @@ -1,120 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=6
40 -GNOME2_LA_PUNT="yes"
41 -
42 -inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
43 -
44 -DESCRIPTION="Image loading library for GTK+"
45 -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
46 -
47 -LICENSE="LGPL-2+"
48 -SLOT="2"
49 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
50 -IUSE="X debug +introspection jpeg jpeg2k tiff test"
51 -
52 -COMMON_DEPEND="
53 - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
54 - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
55 - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
56 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
57 - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
58 - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
59 - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
60 -"
61 -DEPEND="${COMMON_DEPEND}
62 - >=dev-util/gtk-doc-am-1.20
63 - >=sys-devel/gettext-0.19
64 - virtual/pkgconfig
65 -"
66 -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
67 -RDEPEND="${COMMON_DEPEND}
68 - !<gnome-base/gail-1000
69 - !<gnome-base/librsvg-2.31.0
70 - !<x11-libs/gtk+-2.21.3:2
71 - !<x11-libs/gtk+-2.90.4:3
72 -"
73 -
74 -MULTILIB_CHOST_TOOLS=(
75 - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
76 -)
77 -
78 -src_prepare() {
79 - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
80 - eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
81 -
82 - # This will avoid polluting the pkg-config file with versioned libpng,
83 - # which is causing problems with libpng14 -> libpng15 upgrade
84 - # See upstream bug #667068
85 - # First check that the pattern is present, to catch upstream changes on bumps,
86 - # because sed doesn't return failure code if it doesn't do any replacements
87 - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
88 - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
89 - [[ ${CHOST} == *-solaris* ]] && append-libs intl
90 -
91 - gnome2_src_prepare
92 -}
93 -
94 -multilib_src_configure() {
95 - # png always on to display icons
96 - ECONF_SOURCE="${S}" \
97 - gnome2_src_configure \
98 - $(usex debug --enable-debug=yes "") \
99 - $(use_with jpeg libjpeg) \
100 - $(use_with jpeg2k libjasper) \
101 - $(use_with tiff libtiff) \
102 - $(multilib_native_use_enable introspection) \
103 - $(use_with X x11) \
104 - --with-libpng
105 -
106 - # work-around gtk-doc out-of-source brokedness
107 - if multilib_is_native_abi; then
108 - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
109 - fi
110 -}
111 -
112 -multilib_src_install() {
113 - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
114 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
115 -}
116 -
117 -pkg_preinst() {
118 - gnome2_pkg_preinst
119 -
120 - multilib_pkg_preinst() {
121 - # Make sure loaders.cache belongs to gdk-pixbuf alone
122 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
123 -
124 - if [[ -e ${EROOT}${cache} ]]; then
125 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
126 - else
127 - touch "${ED}"/${cache} || die
128 - fi
129 - }
130 -
131 - multilib_foreach_abi multilib_pkg_preinst
132 -}
133 -
134 -pkg_postinst() {
135 - # causes segfault if set, see bug 375615
136 - unset __GL_NO_DSO_FINALIZER
137 -
138 - multilib_foreach_abi gnome2_pkg_postinst
139 -
140 - # Migration snippet for when this was handled by gtk+
141 - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
142 - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
143 - elog "to do that you can use qfile from portage-utils:"
144 - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
145 - fi
146 -}
147 -
148 -pkg_postrm() {
149 - gnome2_pkg_postrm
150 -
151 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
152 - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
153 - fi
154 -}
155
156 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.1.ebuild
157 deleted file mode 100644
158 index 7a2b8a4..00000000
159 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.1.ebuild
160 +++ /dev/null
161 @@ -1,120 +0,0 @@
162 -# Copyright 1999-2016 Gentoo Foundation
163 -# Distributed under the terms of the GNU General Public License v2
164 -# $Id$
165 -
166 -EAPI=6
167 -GNOME2_LA_PUNT="yes"
168 -
169 -inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
170 -
171 -DESCRIPTION="Image loading library for GTK+"
172 -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
173 -
174 -LICENSE="LGPL-2+"
175 -SLOT="2"
176 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
177 -IUSE="X debug +introspection jpeg jpeg2k tiff test"
178 -
179 -COMMON_DEPEND="
180 - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
181 - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
182 - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
183 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
184 - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
185 - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
186 - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
187 -"
188 -DEPEND="${COMMON_DEPEND}
189 - >=dev-util/gtk-doc-am-1.20
190 - >=sys-devel/gettext-0.19
191 - virtual/pkgconfig
192 -"
193 -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
194 -RDEPEND="${COMMON_DEPEND}
195 - !<gnome-base/gail-1000
196 - !<gnome-base/librsvg-2.31.0
197 - !<x11-libs/gtk+-2.21.3:2
198 - !<x11-libs/gtk+-2.90.4:3
199 -"
200 -
201 -MULTILIB_CHOST_TOOLS=(
202 - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
203 -)
204 -
205 -src_prepare() {
206 - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
207 - eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
208 -
209 - # This will avoid polluting the pkg-config file with versioned libpng,
210 - # which is causing problems with libpng14 -> libpng15 upgrade
211 - # See upstream bug #667068
212 - # First check that the pattern is present, to catch upstream changes on bumps,
213 - # because sed doesn't return failure code if it doesn't do any replacements
214 - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
215 - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
216 - [[ ${CHOST} == *-solaris* ]] && append-libs intl
217 -
218 - gnome2_src_prepare
219 -}
220 -
221 -multilib_src_configure() {
222 - # png always on to display icons
223 - ECONF_SOURCE="${S}" \
224 - gnome2_src_configure \
225 - $(usex debug --enable-debug=yes "") \
226 - $(use_with jpeg libjpeg) \
227 - $(use_with jpeg2k libjasper) \
228 - $(use_with tiff libtiff) \
229 - $(multilib_native_use_enable introspection) \
230 - $(use_with X x11) \
231 - --with-libpng
232 -
233 - # work-around gtk-doc out-of-source brokedness
234 - if multilib_is_native_abi; then
235 - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
236 - fi
237 -}
238 -
239 -multilib_src_install() {
240 - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
241 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
242 -}
243 -
244 -pkg_preinst() {
245 - gnome2_pkg_preinst
246 -
247 - multilib_pkg_preinst() {
248 - # Make sure loaders.cache belongs to gdk-pixbuf alone
249 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
250 -
251 - if [[ -e ${EROOT}${cache} ]]; then
252 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
253 - else
254 - touch "${ED}"/${cache} || die
255 - fi
256 - }
257 -
258 - multilib_foreach_abi multilib_pkg_preinst
259 -}
260 -
261 -pkg_postinst() {
262 - # causes segfault if set, see bug 375615
263 - unset __GL_NO_DSO_FINALIZER
264 -
265 - multilib_foreach_abi gnome2_pkg_postinst
266 -
267 - # Migration snippet for when this was handled by gtk+
268 - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
269 - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
270 - elog "to do that you can use qfile from portage-utils:"
271 - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
272 - fi
273 -}
274 -
275 -pkg_postrm() {
276 - gnome2_pkg_postrm
277 -
278 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
279 - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
280 - fi
281 -}