Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/librsvg/, gnome-base/librsvg/files/
Date: Sat, 12 Dec 2015 14:29:38
Message-Id: 1449930517.7ec9fabedafd71ec6c55dc875e0225b0124bf6c9.pacho@gentoo
1 commit: 7ec9fabedafd71ec6c55dc875e0225b0124bf6c9
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 12 13:04:14 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 12 14:28:37 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec9fabe
7
8 gnome-base/librsvg: Drop old
9
10 Package-Manager: portage-2.2.24
11
12 gnome-base/librsvg/Manifest | 2 -
13 .../files/librsvg-2.40.7-gtk-optional.patch | 58 ------------
14 gnome-base/librsvg/librsvg-2.40.10.ebuild | 101 --------------------
15 gnome-base/librsvg/librsvg-2.40.9.ebuild | 102 ---------------------
16 4 files changed, 263 deletions(-)
17
18 diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
19 index bbeeff2..5145446 100644
20 --- a/gnome-base/librsvg/Manifest
21 +++ b/gnome-base/librsvg/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST librsvg-2.40.10.tar.xz 522668 SHA256 965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479 SHA512 e6b630e8332587df414ac5e4e597a4c93ed6f805f378228b7f882f42d03cba68c952e9c1627b3c57dc105cd5ac739a0f6bbe61595c211de0f9e3bd7867904c96 WHIRLPOOL 96b37494e8fd37242371e1e7f10bcf616993f172fd75ab86b65a0743a432dad9e201975281625fcb70baad697c615c5624fc97a2783e2356c9fbd0365f5072ad
24 DIST librsvg-2.40.11.tar.xz 539428 SHA256 611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02 SHA512 89fc4f94150ab47665ab1b6c26979c8072efe40dd74ff13284598cb63de8594e7cfe4b73a151e54002a4811b5de56b93f5d52215ef0862b994d230fafe04b4fc WHIRLPOOL 7c9a0292faf42dd396a59b38c6900a1b78a254c8bd8c724b5636d506c41934d19c924fbf86c2faab7151c065dd134252b78adfd94940b09acd601ef2dc86a5cc
25 DIST librsvg-2.40.12.tar.xz 548648 SHA256 ffe40c4378bf3899f4d679a475726bab03a127a5bdccddec86404cc329ffb550 SHA512 baf9f2bbf98dfc2df1ac426ac5f665105ad8388676a3eeb0718df9e733e5113924ee0dfc1e8f98371240993dc685f097fbb81ba68dfa9b5f326ca0f7efb3521c WHIRLPOOL c33c014c16a007be816290877a721fb658c197197650c1aa1dd612631ba5e0513c6c9b73c6925fa29581d6da20633caaec534c3fb1535d0a9526e77180aabbab
26 -DIST librsvg-2.40.9.tar.xz 519172 SHA256 13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a SHA512 17b72b509b0d38b1291a2a0594739fd650622ab2a913a5e0c864e5060b15093fc49e436c9e2494d57b475572183d1059ae50b7a1d44a1d4d071ac5ef3bcbeaf6 WHIRLPOOL 59bc56631a212893566fb8ed90e45b3e954f7522c21ee1d7b56987a2cc527c6ea8c43238786b159ab0df43e661108b3b089b4b43845f7d9effb4f064cfde7d12
27
28 diff --git a/gnome-base/librsvg/files/librsvg-2.40.7-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.7-gtk-optional.patch
29 deleted file mode 100644
30 index 8857110..0000000
31 --- a/gnome-base/librsvg/files/librsvg-2.40.7-gtk-optional.patch
32 +++ /dev/null
33 @@ -1,58 +0,0 @@
34 -From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
35 -From: Ross Burton <ross.burton@×××××.com>
36 -Date: Tue, 19 Nov 2013 16:00:29 +0000
37 -Subject: [PATCH] configure: add option to enable/disable use of GTK+
38 -
39 -Distro packagers like predictability and automatically detected optional
40 -dependencies are not predicable. Add a --with-gtk3 option (default to "auto")
41 -for forcibly controlling whether GTK+ will be used or not.
42 -
43 -Signed-off-by: Ross Burton <ross.burton@×××××.com>
44 -
45 -https://bugzilla.gnome.org/show_bug.cgi?id=712693
46 ----
47 - configure.in | 17 +++++++++++------
48 - 1 file changed, 11 insertions(+), 6 deletions(-)
49 -
50 -diff --git a/configure.in b/configure.in
51 -index f7a89dc..1498f72 100644
52 ---- a/configure.ac
53 -+++ b/configure.ac
54 -@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
55 - # GTK
56 - # ===========================================================================
57 -
58 --PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
59 --
60 - GTK3_BINARY_VERSION=
61 -
62 --if test "$have_gtk_3" = "yes"; then
63 -- GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
64 -+AC_MSG_CHECKING([whether to use GTK+ 3])
65 -+AC_ARG_WITH([gtk3],
66 -+ [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
67 -+ [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
68 -+AC_MSG_RESULT([$with_gtk3])
69 -+
70 -+if test "$with_gtk3" = "yes"; then
71 -+ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
72 -+ GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
73 - fi
74 -
75 - AC_SUBST([GTK3_BINARY_VERSION])
76 -
77 --AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
78 -+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
79 -
80 - dnl ===========================================================================
81 - dnl GDK-Pixbuf SVG loader
82 -@@ -305,6 +310,6 @@ librsvg-$VERSION
83 - Build introspectable bindings: ${found_introspection}
84 - Build Vala bindings: ${enable_vala}
85 - Build GdkPixbuf loader: ${enable_pixbuf_loader}
86 -- GTK 3.0: ${have_gtk_3}
87 -+ GTK 3.0: ${with_gtk3}
88 - Build miscellaenous tools: ${build_misc_tools}
89 - "
90 ---
91 -1.7.10.4
92 \ No newline at end of file
93
94 diff --git a/gnome-base/librsvg/librsvg-2.40.10.ebuild b/gnome-base/librsvg/librsvg-2.40.10.ebuild
95 deleted file mode 100644
96 index 93454bf..0000000
97 --- a/gnome-base/librsvg/librsvg-2.40.10.ebuild
98 +++ /dev/null
99 @@ -1,101 +0,0 @@
100 -# Copyright 1999-2015 Gentoo Foundation
101 -# Distributed under the terms of the GNU General Public License v2
102 -# $Id$
103 -
104 -EAPI="5"
105 -GCONF_DEBUG="no"
106 -GNOME2_LA_PUNT="yes"
107 -VALA_USE_DEPEND="vapigen"
108 -
109 -inherit autotools gnome2 multilib-minimal vala
110 -
111 -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
112 -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
113 -
114 -LICENSE="LGPL-2"
115 -SLOT="2"
116 -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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
117 -
118 -IUSE="+introspection vala tools"
119 -REQUIRED_USE="
120 - vala? ( introspection )
121 -"
122 -
123 -RDEPEND="
124 - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
125 - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
126 - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
127 - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
128 - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
129 - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
130 - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
131 - tools? ( >=x11-libs/gtk+-3.10.0:3 )
132 -"
133 -DEPEND="${RDEPEND}
134 - dev-libs/gobject-introspection-common
135 - dev-libs/vala-common
136 - >=dev-util/gtk-doc-am-1.13
137 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
138 - vala? ( $(vala_depend) )
139 -"
140 -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
141 -
142 -src_prepare() {
143 - # https://bugzilla.gnome.org/show_bug.cgi?id=653323
144 - epatch "${FILESDIR}/${PN}-2.40.10-gtk-optional.patch"
145 -
146 - # https://bugzilla.gnome.org/show_bug.cgi?id=731826
147 - epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
148 -
149 - eautoreconf
150 -
151 - use vala && vala_src_prepare
152 - gnome2_src_prepare
153 -}
154 -
155 -multilib_src_configure() {
156 - local myconf=()
157 -
158 - # -Bsymbolic is not supported by the Darwin toolchain
159 - if [[ ${CHOST} == *-darwin* ]]; then
160 - myconf+=( --disable-Bsymbolic )
161 - fi
162 -
163 - # --disable-tools even when USE=tools; the tools/ subdirectory is useful
164 - # only for librsvg developers
165 - ECONF_SOURCE=${S} \
166 - gnome2_src_configure \
167 - --disable-static \
168 - --disable-tools \
169 - $(multilib_native_use_enable introspection) \
170 - $(multilib_native_use_with tools gtk3) \
171 - $(multilib_native_use_enable vala) \
172 - --enable-pixbuf-loader \
173 - "${myconf[@]}"
174 -
175 - if multilib_is_native_abi; then
176 - ln -s "${S}"/doc/html doc/html || die
177 - fi
178 -}
179 -
180 -multilib_src_compile() {
181 - # causes segfault if set, see bug #411765
182 - unset __GL_NO_DSO_FINALIZER
183 - gnome2_src_compile
184 -}
185 -
186 -multilib_src_install() {
187 - gnome2_src_install
188 -}
189 -
190 -pkg_postinst() {
191 - # causes segfault if set, see bug 375615
192 - unset __GL_NO_DSO_FINALIZER
193 - multilib_foreach_abi gnome2_pkg_postinst
194 -}
195 -
196 -pkg_postrm() {
197 - # causes segfault if set, see bug 375615
198 - unset __GL_NO_DSO_FINALIZER
199 - multilib_foreach_abi gnome2_pkg_postrm
200 -}
201
202 diff --git a/gnome-base/librsvg/librsvg-2.40.9.ebuild b/gnome-base/librsvg/librsvg-2.40.9.ebuild
203 deleted file mode 100644
204 index 8bf0369..0000000
205 --- a/gnome-base/librsvg/librsvg-2.40.9.ebuild
206 +++ /dev/null
207 @@ -1,102 +0,0 @@
208 -# Copyright 1999-2015 Gentoo Foundation
209 -# Distributed under the terms of the GNU General Public License v2
210 -# $Id$
211 -
212 -EAPI="5"
213 -GCONF_DEBUG="no"
214 -GNOME2_LA_PUNT="yes"
215 -VALA_MIN_API_VERSION="0.18"
216 -VALA_USE_DEPEND="vapigen"
217 -
218 -inherit autotools gnome2 multilib-minimal vala
219 -
220 -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
221 -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
222 -
223 -LICENSE="LGPL-2"
224 -SLOT="2"
225 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
226 -
227 -IUSE="+introspection vala tools"
228 -REQUIRED_USE="
229 - vala? ( introspection )
230 -"
231 -
232 -RDEPEND="
233 - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
234 - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
235 - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
236 - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
237 - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
238 - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
239 - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
240 - tools? ( >=x11-libs/gtk+-3.2.0:3 )
241 -"
242 -DEPEND="${RDEPEND}
243 - dev-libs/gobject-introspection-common
244 - dev-libs/vala-common
245 - >=dev-util/gtk-doc-am-1.13
246 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
247 - vala? ( $(vala_depend) )
248 -"
249 -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
250 -
251 -src_prepare() {
252 - # https://bugzilla.gnome.org/show_bug.cgi?id=653323
253 - epatch "${FILESDIR}/${PN}-2.40.7-gtk-optional.patch"
254 -
255 - # https://bugzilla.gnome.org/show_bug.cgi?id=731826
256 - epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
257 -
258 - eautoreconf
259 -
260 - use vala && vala_src_prepare
261 - gnome2_src_prepare
262 -}
263 -
264 -multilib_src_configure() {
265 - local myconf=()
266 -
267 - # -Bsymbolic is not supported by the Darwin toolchain
268 - if [[ ${CHOST} == *-darwin* ]]; then
269 - myconf+=( --disable-Bsymbolic )
270 - fi
271 -
272 - # --disable-tools even when USE=tools; the tools/ subdirectory is useful
273 - # only for librsvg developers
274 - ECONF_SOURCE=${S} \
275 - gnome2_src_configure \
276 - --disable-static \
277 - --disable-tools \
278 - $(multilib_native_use_enable introspection) \
279 - $(multilib_native_use_with tools gtk3) \
280 - $(multilib_native_use_enable vala) \
281 - --enable-pixbuf-loader \
282 - "${myconf[@]}"
283 -
284 - if multilib_is_native_abi; then
285 - ln -s "${S}"/doc/html doc/html || die
286 - fi
287 -}
288 -
289 -multilib_src_compile() {
290 - # causes segfault if set, see bug #411765
291 - unset __GL_NO_DSO_FINALIZER
292 - gnome2_src_compile
293 -}
294 -
295 -multilib_src_install() {
296 - gnome2_src_install
297 -}
298 -
299 -pkg_postinst() {
300 - # causes segfault if set, see bug 375615
301 - unset __GL_NO_DSO_FINALIZER
302 - multilib_foreach_abi gnome2_pkg_postinst
303 -}
304 -
305 -pkg_postrm() {
306 - # causes segfault if set, see bug 375615
307 - unset __GL_NO_DSO_FINALIZER
308 - multilib_foreach_abi gnome2_pkg_postrm
309 -}
Report Message
Find on MARC Find on Google Groups