Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/gdk-pixbuf/
Date: Sun, 28 Feb 2016 11:09:17
Message-Id: 1456657704.6f1dfe93aa16ffad817c503ea0e4746943fe1cae.pacho@gentoo
1 commit: 6f1dfe93aa16ffad817c503ea0e4746943fe1cae
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 28 10:38:13 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 28 11:08:24 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1dfe93
7
8 x11-libs/gdk-pixbuf: Drop old
9
10 Package-Manager: portage-2.2.27
11
12 x11-libs/gdk-pixbuf/Manifest | 1 -
13 x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild | 118 ---------------------------
14 2 files changed, 119 deletions(-)
15
16 diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
17 index 46d99a9..6ffad61 100644
18 --- a/x11-libs/gdk-pixbuf/Manifest
19 +++ b/x11-libs/gdk-pixbuf/Manifest
20 @@ -1,3 +1,2 @@
21 DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2
22 -DIST gdk-pixbuf-2.32.2.tar.xz 2429268 SHA256 d3ab06fc123b13effed4c27c77cebdfad2173ff20628d82c397b7660ae926145 SHA512 146cbddc1b4a68715a827fc53d98f213f5e27f4f4a8b3fe6148b96c866b4ca4ab624613ddf196d4b0a01bbddfc6f8438b96ad436d23dfced02d584ff8c2fdf3d WHIRLPOOL 1866e9892a8c47b38737ab716471a5207fbd07d2d51122b8a2405e46b78ee2ded95fa57f0b35607cb4a72205e7aceea3d3bc8e178807bfddb209b8d19e4c2f7e
23 DIST gdk-pixbuf-2.32.3.tar.xz 2430720 SHA256 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 SHA512 9eb9b87c8104cff9292bebc41c411d2ba4b7fcd9d24c1b99e6dfc8281b5a202a53045dd3095666e3614eba59d417a7c0f69789b2a9dd52ed53bb5df4a0dfd117 WHIRLPOOL 053c48d7f0890ed0f324225ccf4d16f9afd4fd70b878acc6b9ec1bfd9c0c732bc290447cce25ba37cbbdded89a183d112b6e9b4b53141c62690bf45846f675e1
24
25 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild
26 deleted file mode 100644
27 index fdec7e6..0000000
28 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.2.ebuild
29 +++ /dev/null
30 @@ -1,118 +0,0 @@
31 -# Copyright 1999-2016 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -# $Id$
34 -
35 -EAPI="5"
36 -GCONF_DEBUG="no"
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 ~x86-freebsd ~x86-interix ~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
73 -)
74 -
75 -src_prepare() {
76 - # This will avoid polluting the pkg-config file with versioned libpng,
77 - # which is causing problems with libpng14 -> libpng15 upgrade
78 - # See upstream bug #667068
79 - # First check that the pattern is present, to catch upstream changes on bumps,
80 - # because sed doesn't return failure code if it doesn't do any replacements
81 - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
82 - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
83 - [[ ${CHOST} == *-solaris* ]] && append-libs intl
84 -
85 - gnome2_src_prepare
86 -}
87 -
88 -multilib_src_configure() {
89 - # png always on to display icons
90 - ECONF_SOURCE="${S}" \
91 - gnome2_src_configure \
92 - $(usex debug --enable-debug=yes "") \
93 - $(use_with jpeg libjpeg) \
94 - $(use_with jpeg2k libjasper) \
95 - $(use_with tiff libtiff) \
96 - $(multilib_native_use_enable introspection) \
97 - $(use_with X x11) \
98 - --with-libpng
99 -
100 - # work-around gtk-doc out-of-source brokedness
101 - if multilib_is_native_abi; then
102 - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
103 - fi
104 -}
105 -
106 -multilib_src_install() {
107 - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
108 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
109 -}
110 -
111 -pkg_preinst() {
112 - gnome2_pkg_preinst
113 -
114 - multilib_pkg_preinst() {
115 - # Make sure loaders.cache belongs to gdk-pixbuf alone
116 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
117 -
118 - if [[ -e ${EROOT}${cache} ]]; then
119 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
120 - else
121 - touch "${ED}"/${cache} || die
122 - fi
123 - }
124 -
125 - multilib_foreach_abi multilib_pkg_preinst
126 -}
127 -
128 -pkg_postinst() {
129 - # causes segfault if set, see bug 375615
130 - unset __GL_NO_DSO_FINALIZER
131 -
132 - multilib_foreach_abi gnome2_pkg_postinst
133 -
134 - # Migration snippet for when this was handled by gtk+
135 - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
136 - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
137 - elog "to do that you can use qfile from portage-utils:"
138 - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
139 - fi
140 -}
141 -
142 -pkg_postrm() {
143 - gnome2_pkg_postrm
144 -
145 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
146 - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
147 - fi
148 -}