commit: 3a8123f9e813cdc722aed971c6a8fdfea313e13c Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Mon Jan 9 11:50:21 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Mon Jan 9 11:50:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8123f9
gnome-base/librsvg: Remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 gnome-base/librsvg/Manifest | 1 - .../files/librsvg-2.40.10-gtk-optional.patch | 58 ------------ gnome-base/librsvg/librsvg-2.40.11.ebuild | 101 --------------------- 3 files changed, 160 deletions(-) diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index fc0c44f..dcdac81 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -1,3 +1,2 @@ -DIST librsvg-2.40.11.tar.xz 539428 SHA256 611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02 SHA512 89fc4f94150ab47665ab1b6c26979c8072efe40dd74ff13284598cb63de8594e7cfe4b73a151e54002a4811b5de56b93f5d52215ef0862b994d230fafe04b4fc WHIRLPOOL 7c9a0292faf42dd396a59b38c6900a1b78a254c8bd8c724b5636d506c41934d19c924fbf86c2faab7151c065dd134252b78adfd94940b09acd601ef2dc86a5cc DIST librsvg-2.40.15.tar.xz 554608 SHA256 d9cac4a123eec6e553a26e120979bab7425def9ae7ce7c079eba5e4a45db05f4 SHA512 1169c02247dbf3d71d3d4bfb1aa2580a4b1e243e1c2c6d1c86aaa09c54c66857b959df4358a1ca6a34ec5fbb34b9529963b993fc978ec1fe401dbc56ac460101 WHIRLPOOL 687e9afc6c1c46079fa9005c94ed329ff6f681a9fb784df999efca36ba1fac05a05f3d6413105993ff4af60a62a36b647e2f1335ab1245c621de2ff76ccef479 DIST librsvg-2.40.16.tar.xz 560800 SHA256 d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e SHA512 975a0f900c5a9598ef91bbf936d99319c6efe493f35525a23c5c7f2ed37c5839ec8e5d29f297219b3049f10e2594ebdf41c987b49c004ef3c846963f055c468a WHIRLPOOL 7e1feac4ce98a95f15ea721782919295a8123c33c828ff686d3ab86f8a4d2ab06b88f17dbd9ad749fd5df0829b717a5fd73a0d21ebe308bf8905e9174e50717c diff --git a/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch deleted file mode 100644 index 852a830..00000000 --- a/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 19 Nov 2013 16:00:29 +0000 -Subject: [PATCH] configure: add option to enable/disable use of GTK+ - -Distro packagers like predictability and automatically detected optional -dependencies are not predicable. Add a --with-gtk3 option (default to "auto") -for forcibly controlling whether GTK+ will be used or not. - -Signed-off-by: Ross Burton <[email protected]> - -https://bugzilla.gnome.org/show_bug.cgi?id=712693 ---- - configure.in | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/configure.in b/configure.in -index f7a89dc..1498f72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r) - # GTK - # =========================================================================== - --PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]) -- - GTK3_BINARY_VERSION= - --if test "$have_gtk_3" = "yes"; then -- GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" -+AC_MSG_CHECKING([whether to use GTK+ 3]) -+AC_ARG_WITH([gtk3], -+ [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])], -+ [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])]) -+AC_MSG_RESULT([$with_gtk3]) -+ -+if test "$with_gtk3" = "yes"; then -+ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) -+ GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`" - fi - - AC_SUBST([GTK3_BINARY_VERSION]) - --AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"]) -+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"]) - - dnl =========================================================================== - dnl GDK-Pixbuf SVG loader -@@ -305,6 +310,6 @@ librsvg-$VERSION - Build introspectable bindings: ${found_introspection} - Build Vala bindings: ${enable_vala} - Build GdkPixbuf loader: ${enable_pixbuf_loader} -- GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} -+ GTK 3.0: ${with_gtk3} - Build miscellaenous tools: ${build_misc_tools} - " --- -1.7.10.4 \ No newline at end of file diff --git a/gnome-base/librsvg/librsvg-2.40.11.ebuild b/gnome-base/librsvg/librsvg-2.40.11.ebuild deleted file mode 100644 index 234cb1d..00000000 --- a/gnome-base/librsvg/librsvg-2.40.11.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools gnome2 multilib-minimal vala - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"; - -LICENSE="LGPL-2" -SLOT="2" -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" - -IUSE="+introspection vala tools" -REQUIRED_USE=" - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) - tools? ( >=x11-libs/gtk+-3.10.0:3 ) -" -DEPEND="${RDEPEND} - dev-libs/gobject-introspection-common - dev-libs/vala-common - >=dev-util/gtk-doc-am-1.13 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) -" -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=653323 - epatch "${FILESDIR}/${PN}-2.40.10-gtk-optional.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=731826 - epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" - - eautoreconf - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # -Bsymbolic is not supported by the Darwin toolchain - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --disable-Bsymbolic ) - fi - - # --disable-tools even when USE=tools; the tools/ subdirectory is useful - # only for librsvg developers - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tools \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_with tools gtk3) \ - $(multilib_native_use_enable vala) \ - --enable-pixbuf-loader \ - "${myconf[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_compile() { - # causes segfault if set, see bug #411765 - unset __GL_NO_DSO_FINALIZER - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postinst -} - -pkg_postrm() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postrm -}
