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: Thu, 27 Apr 2017 22:40:12
Message-Id: 1493332750.077cabd2301e7fb788555018134deb01ece3677a.leio@gentoo
1 commit: 077cabd2301e7fb788555018134deb01ece3677a
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 27 22:37:11 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 27 22:39:10 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077cabd2
7
8 x11-libs/gdk-pixbuf: remove old
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 x11-libs/gdk-pixbuf/Manifest | 1 -
13 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.2.ebuild | 119 ---------------------------
14 2 files changed, 120 deletions(-)
15
16 diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
17 index 45c63635cde..f1b48e639ef 100644
18 --- a/x11-libs/gdk-pixbuf/Manifest
19 +++ b/x11-libs/gdk-pixbuf/Manifest
20 @@ -1,5 +1,4 @@
21 DIST gdk-pixbuf-2.34.0.tar.xz 2709320 SHA256 d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 SHA512 874aed9af0352592674f2bebd4d9b0a945932a410c9f0b776f45766c2f18d442a39c684cca69b1aca6d14f67f18e690489f388ff58699dbd0efbd13244a1a8b5 WHIRLPOOL c2f7b1ac0d2fa13a00c1bed37a66b9b13564e1cef5262db656c640b0256f821658f8e6d0e1e5a300a2af83847b15518d7e0c72995df877970bf44ad28e5fd416
22 -DIST gdk-pixbuf-2.36.2.tar.xz 4877452 SHA256 3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d SHA512 34a569aee7a26af701edbc9bf895617dc59d1a7f98292c832885cff88733cb7f581253a5caeecf265712a07f975b7c7dfeda4050e7a81cb5c9de19b4b82d17ba WHIRLPOOL fb2871f32084a2c40cea9cd662167645d5458dd4b96faa9967356a5a95b3a173f8d54c41608dfae0344460ffd87441be0f3c465eef7dbae979e5c2d8fb92ff27
23 DIST gdk-pixbuf-2.36.5.tar.xz 5165640 SHA256 7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc SHA512 27c39bace7bc6cf713915dcb1f35eebfb80ae599d1c9106f48af4cd447050c41e37adee76d29d6b42fbe3d0123b054c8701f2d1b4b99060b4869aa7871523b70 WHIRLPOOL 3ffdf7b50733425750eb327409f538541e7f8758b614c9b4fd62507508eeb934e2644e9da5be44a3900034fcdda624cb20786950729f3ca199fd27b0cd8cddd4
24 DIST gdk-pixbuf-2.36.6-bug143608-comment.jpg 191869 SHA256 d6ca7c9d3b70fd312666363591bac2b3d25253e352562255e6d2d50bd69f4a57 SHA512 28ed4e203b98b6009a27477009a79f8f5bd611b4b302736e014b1ebde820daaee73f9c3c4497d184a1e1872ec0debd40f571865294473a56e1c2bdac574a14fc WHIRLPOOL e03dc6b19514a73f22cc99cd3b7716a78eb7f492b04c3f3b924de75abfa7f4cb961b4b885c35893caab40c81c91d1c55efdcb2699e720e97c3e6fa10998f86f1
25 DIST gdk-pixbuf-2.36.6.tar.xz 5166980 SHA256 455eb90c09ed1b71f95f3ebfe1c904c206727e0eeb34fc94e5aaf944663a820c SHA512 b963f01161b58463c83499079545aa946fd824ec5e7167e0898698ac46e0cc3fb3dcb0cac5afabd6b7d957391b9c9bba55f340294076433155fc91052d5403ec WHIRLPOOL b790cb631a09f7b8b72fd3ef04fa7195d759c5ab03a2c31f7f76a4eb4615cfa59d688ee0914887700d013b4f399b0454f7bf7e600e1dd8af08361ad85955d8c7
26
27 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.2.ebuild
28 deleted file mode 100644
29 index 0c3dca92942..00000000000
30 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.2.ebuild
31 +++ /dev/null
32 @@ -1,119 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -GNOME2_LA_PUNT="yes"
38 -
39 -inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
40 -
41 -DESCRIPTION="Image loading library for GTK+"
42 -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
43 -
44 -LICENSE="LGPL-2+"
45 -SLOT="2"
46 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
47 -IUSE="X debug +introspection jpeg jpeg2k tiff test"
48 -
49 -COMMON_DEPEND="
50 - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
51 - >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
52 - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
53 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
54 - jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
55 - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
56 - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
57 -"
58 -DEPEND="${COMMON_DEPEND}
59 - >=dev-util/gtk-doc-am-1.20
60 - >=sys-devel/gettext-0.19
61 - virtual/pkgconfig
62 -"
63 -# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
64 -RDEPEND="${COMMON_DEPEND}
65 - !<gnome-base/gail-1000
66 - !<gnome-base/librsvg-2.31.0
67 - !<x11-libs/gtk+-2.21.3:2
68 - !<x11-libs/gtk+-2.90.4:3
69 -"
70 -
71 -MULTILIB_CHOST_TOOLS=(
72 - /usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
73 -)
74 -
75 -src_prepare() {
76 - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
77 - eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
78 -
79 - # This will avoid polluting the pkg-config file with versioned libpng,
80 - # which is causing problems with libpng14 -> libpng15 upgrade
81 - # See upstream bug #667068
82 - # First check that the pattern is present, to catch upstream changes on bumps,
83 - # because sed doesn't return failure code if it doesn't do any replacements
84 - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
85 - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
86 - [[ ${CHOST} == *-solaris* ]] && append-libs intl
87 -
88 - gnome2_src_prepare
89 -}
90 -
91 -multilib_src_configure() {
92 - # png always on to display icons
93 - ECONF_SOURCE="${S}" \
94 - gnome2_src_configure \
95 - $(usex debug --enable-debug=yes "") \
96 - $(use_with jpeg libjpeg) \
97 - $(use_with jpeg2k libjasper) \
98 - $(use_with tiff libtiff) \
99 - $(multilib_native_use_enable introspection) \
100 - $(use_with X x11) \
101 - --with-libpng
102 -
103 - # work-around gtk-doc out-of-source brokedness
104 - if multilib_is_native_abi; then
105 - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
106 - fi
107 -}
108 -
109 -multilib_src_install() {
110 - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
111 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
112 -}
113 -
114 -pkg_preinst() {
115 - gnome2_pkg_preinst
116 -
117 - multilib_pkg_preinst() {
118 - # Make sure loaders.cache belongs to gdk-pixbuf alone
119 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
120 -
121 - if [[ -e ${EROOT}${cache} ]]; then
122 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
123 - else
124 - touch "${ED}"/${cache} || die
125 - fi
126 - }
127 -
128 - multilib_foreach_abi multilib_pkg_preinst
129 -}
130 -
131 -pkg_postinst() {
132 - # causes segfault if set, see bug 375615
133 - unset __GL_NO_DSO_FINALIZER
134 -
135 - multilib_foreach_abi gnome2_pkg_postinst
136 -
137 - # Migration snippet for when this was handled by gtk+
138 - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
139 - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
140 - elog "to do that you can use qfile from portage-utils:"
141 - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
142 - fi
143 -}
144 -
145 -pkg_postrm() {
146 - gnome2_pkg_postrm
147 -
148 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
149 - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
150 - fi
151 -}