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: Sat, 11 Jan 2020 20:11:53
Message-Id: 1578773108.049d1b8c2f290346433f9063bd4753aa8e72ef01.leio@gentoo
1 commit: 049d1b8c2f290346433f9063bd4753aa8e72ef01
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 11 20:05:08 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 11 20:05:08 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049d1b8c
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.36.12.ebuild | 131 --------------------------
15 2 files changed, 133 deletions(-)
16
17 diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
18 index 33fb84860fc..a0bb80434d6 100644
19 --- a/x11-libs/gdk-pixbuf/Manifest
20 +++ b/x11-libs/gdk-pixbuf/Manifest
21 @@ -1,3 +1 @@
22 -DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
23 -DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
24 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
25
26 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
27 deleted file mode 100644
28 index f3e6666b170..00000000000
29 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
30 +++ /dev/null
31 @@ -1,131 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -GNOME2_LA_PUNT="yes"
37 -
38 -inherit flag-o-matic gnome2 multilib multilib-minimal
39 -
40 -DESCRIPTION="Image loading library for GTK+"
41 -HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
42 -
43 -LICENSE="LGPL-2+"
44 -SLOT="2"
45 -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"
46 -IUSE="X debug +introspection jpeg tiff test"
47 -RESTRICT="!test? ( test )"
48 -
49 -# Remove SRC_URI when gnome bug #795069 is fixed
50 -SRC_URI="${SRC_URI} test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> ${PN}-2.36.12-bug753605-atsize.jpg )"
51 -
52 -COMMON_DEPEND="
53 - >=dev-libs/glib-2.48.0: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 - tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
58 - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
59 -"
60 -DEPEND="${COMMON_DEPEND}
61 - dev-util/glib-utils
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 -PATCHES=(
79 - # Do not run lowmem test on uclibc
80 - # See https://bugzilla.gnome.org/show_bug.cgi?id=756590
81 - "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
82 -)
83 -
84 -src_prepare() {
85 - # https://bugzilla.gnome.org/show_bug.cgi?id=795069
86 - if use test ; then
87 - cp -v "${DISTDIR}"/${P}-bug753605-atsize.jpg "${S}"/tests/bug753605-atsize.jpg || die
88 - fi
89 -
90 - # This will avoid polluting the pkg-config file with versioned libpng,
91 - # which is causing problems with libpng14 -> libpng15 upgrade
92 - # See upstream bug #667068
93 - # First check that the pattern is present, to catch upstream changes on bumps,
94 - # because sed doesn't return failure code if it doesn't do any replacements
95 - grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
96 - sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
97 - [[ ${CHOST} == *-solaris* ]] && append-libs intl
98 -
99 - gnome2_src_prepare
100 -}
101 -
102 -multilib_src_configure() {
103 - # png always on to display icons
104 - ECONF_SOURCE="${S}" \
105 - gnome2_src_configure \
106 - $(usex debug --enable-debug=yes "") \
107 - $(use_with jpeg libjpeg) \
108 - --without-libjasper \
109 - $(use_with tiff libtiff) \
110 - $(multilib_native_use_enable introspection) \
111 - $(use_with X x11) \
112 - --with-libpng
113 -
114 - # work-around gtk-doc out-of-source brokedness
115 - if multilib_is_native_abi; then
116 - ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
117 - fi
118 -}
119 -
120 -multilib_src_install() {
121 - # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
122 - MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
123 -}
124 -
125 -pkg_preinst() {
126 - gnome2_pkg_preinst
127 -
128 - multilib_pkg_preinst() {
129 - # Make sure loaders.cache belongs to gdk-pixbuf alone
130 - local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
131 -
132 - if [[ -e ${EROOT}${cache} ]]; then
133 - cp "${EROOT}"${cache} "${ED}"/${cache} || die
134 - else
135 - touch "${ED}"/${cache} || die
136 - fi
137 - }
138 -
139 - multilib_foreach_abi multilib_pkg_preinst
140 -}
141 -
142 -pkg_postinst() {
143 - # causes segfault if set, see bug 375615
144 - unset __GL_NO_DSO_FINALIZER
145 -
146 - multilib_foreach_abi gnome2_pkg_postinst
147 -
148 - # Migration snippet for when this was handled by gtk+
149 - if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
150 - elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
151 - elog "to do that you can use qfile from portage-utils:"
152 - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
153 - fi
154 -}
155 -
156 -pkg_postrm() {
157 - gnome2_pkg_postrm
158 -
159 - if [[ -z ${REPLACED_BY_VERSION} ]]; then
160 - rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
161 - fi
162 -}