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