From 91e2c868fa1a6cdd420b412b352be72ef6b82c1f Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 20 Nov 2011 16:06:18 +0000 Subject: [PATCH] Version bump, remove old. Package-Manager: portage-2.1.10.36/cvs/Linux x86_64 --- gnome-base/librsvg/ChangeLog | 8 +- gnome-base/librsvg/Manifest | 16 ++-- gnome-base/librsvg/librsvg-2.32.1.ebuild | 80 ------------------- ...vg-2.34.0.ebuild => librsvg-2.34.2.ebuild} | 23 +++--- gnome-base/librsvg/metadata.xml | 2 + 5 files changed, 30 insertions(+), 99 deletions(-) delete mode 100644 gnome-base/librsvg/librsvg-2.32.1.ebuild rename gnome-base/librsvg/{librsvg-2.34.0.ebuild => librsvg-2.34.2.ebuild} (75%) diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index bd5d190c7d2b..475f5e78a1c8 100644 --- a/gnome-base/librsvg/ChangeLog +++ b/gnome-base/librsvg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/librsvg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.256 2011/10/30 16:16:55 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.257 2011/11/20 16:06:18 pacho Exp $ + +*librsvg-2.34.2 (20 Nov 2011) + + 20 Nov 2011; Pacho Ramos +librsvg-2.34.2.ebuild, + -librsvg-2.32.1.ebuild, -librsvg-2.34.0.ebuild, metadata.xml: + Version bump, remove old. 30 Oct 2011; Raúl Porcel librsvg-2.34.1-r1.ebuild: alpha/ia64/sh/sparc stable wrt #385699 diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index fb2161ffee54..cd407af6f3f3 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -2,19 +2,17 @@ Hash: SHA1 AUX librsvg-2.34.0-automagic-gtk.patch 1420 RMD160 8b1740121a13ef1edaef44f6c6293f140432ab71 SHA1 91fd1a8713fe1296b30e2e3281cd72087c96ae4b SHA256 56e63ee0f4bd9baea7244fddc18622e88902bf0ccbfa18700c111157b05e4ef7 -DIST librsvg-2.32.1.tar.bz2 517170 RMD160 ac039d36667854292f2326aaadec9de6ea2873b6 SHA1 2762cfa3a4e9c9ee845c7f23a824dbd13583ebf0 SHA256 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334 -DIST librsvg-2.34.0.tar.bz2 516994 RMD160 02638bcf084156e4e209a325a20e99d2e88e9fd8 SHA1 59e01568a6b201fc45828a76b942f790859cddeb SHA256 9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd DIST librsvg-2.34.1.tar.xz 482380 RMD160 612dacdae9665445b982bf70b2c589c801b83f03 SHA1 2fdc23e7e06c153adc001efa6b1cb5c0aa28a6aa SHA256 4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db -EBUILD librsvg-2.32.1.ebuild 2299 RMD160 011e71c9f6ae311913d1de0c58b047cd36f2427c SHA1 5fda130e34c1a90cbdcb788a47ea91c463414513 SHA256 0f3c6be79f230cdb0eaf939eb814d1012912b714ba72ff0a06ead0fd2c823a67 -EBUILD librsvg-2.34.0.ebuild 2345 RMD160 ce618b505db49c66b7a0a64b06ae1c2e3f74d399 SHA1 d37f9409138e84c12971617c299fc16cffc13f7c SHA256 3304bdd0de1f8805bc5c3714f065ee85e3562597e9b31091c62f7c1c72fec703 +DIST librsvg-2.34.2.tar.xz 499108 RMD160 491432c990584da926c0844f68a92e4a3556a05e SHA1 9542af41b30f09f31753262f382c0118fb42891d SHA256 5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464 EBUILD librsvg-2.34.1-r1.ebuild 2520 RMD160 4254d5e5e5cc9093493ce0a4e747c56f7efe417c SHA1 eac07b0a4cb469e70a962e5c8f45c4f29c5c55ec SHA256 686f59a313a99185a684bbfd40a6e75ff6373b17ba85d77a1784d121e39809e6 EBUILD librsvg-2.34.1.ebuild 2315 RMD160 9e44445dc087dca91e886c2c4b892f4c5f2fc7b6 SHA1 5e3daf5954b4ac83030c99d3d5850c30646ff1be SHA256 61fe0f672394317f1908fe1ff6ab2120fbc909721719c1e42b936b094d35f3a2 -MISC ChangeLog 32700 RMD160 4594d48b54c17147e7e1fa26ed339769e9195c6c SHA1 9bd70f6ba340cfd36316e180141092b0749c809d SHA256 5ab9ae9b85767f594b3692107f48028aceb0af5e1bca379fa7f721c067840c17 -MISC metadata.xml 276 RMD160 52ef94c7407f4f59a15e5c785947fe01d685215a SHA1 852d1ba1e66651444d421f371b17267705a9e894 SHA256 7fe041dc0de35f5a0dbc687d6fc073b651d920b2ec25b45b4a91a8cb0d9e763d +EBUILD librsvg-2.34.2.ebuild 2629 RMD160 2c4cbd19e120ef240245f59f869ff0382942b3e9 SHA1 fec1e785b91cc849080fc9c6ed1a8d4a8879a3da SHA256 737b880481d1cc4d6907ee22cbf7c2c73fdfc5e9db2789fc9a2b2085a03c1e0c +MISC ChangeLog 32892 RMD160 8ac7d078ab5930c2ddaf0d994048db0183f235e5 SHA1 bf99d66ab6fa381be1231ec0536c1e9e901508ba SHA256 74617ef0928a0a0ced68d86270ea4702850eba330ca2c336ca42a38aa6fc4cd7 +MISC metadata.xml 376 RMD160 4ad36c6946d4873955386ad238d995eb6179a441 SHA1 8877f419fd68f51725372ac1f811635d21068f4e SHA256 7c75a35d70b6bbca589e1fb1c23d01f6475a62569751351b5bb1eaf6741f804a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6teH0ACgkQuQc30/atMkADaQCff7Qx47TYtMkzTRClL7w3RNwf -sb0AoJMoh0a9Ksn+Y3XqhjtU9aE469G8 -=VGdN +iEYEARECAAYFAk7JJX8ACgkQCaWpQKGI+9Q6VQCfajUCmDdz6Oghsv6IhWriyleU +2o4Anit5ze9INLO3e3hVE9GwXH9/4vy3 +=9Wxf -----END PGP SIGNATURE----- diff --git a/gnome-base/librsvg/librsvg-2.32.1.ebuild b/gnome-base/librsvg/librsvg-2.32.1.ebuild deleted file mode 100644 index 651f95a3cc62..000000000000 --- a/gnome-base/librsvg/librsvg-2.32.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.32.1.ebuild,v 1.11 2011/10/09 09:43:47 lxnay Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit gnome2 multilib - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="http://librsvg.sourceforge.net/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc +gtk tools" - -RDEPEND=">=media-libs/fontconfig-1.0.1 - >=media-libs/freetype-2 - >=dev-libs/glib-2.24:2 - >=x11-libs/cairo-1.2 - >=x11-libs/pango-1.10 - >=dev-libs/libxml2-2.4.7:2 - >=dev-libs/libcroco-0.6.1 - || ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 ) - gtk? ( >=x11-libs/gtk+-2.16:2 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12 - doc? ( >=dev-util/gtk-doc-1.13 )" -# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf - -pkg_setup() { - # croco is forced on to respect SVG specification - G2CONF="${G2CONF} - --disable-static - $(use_enable tools) - $(use_enable gtk gtk-theme) - --with-croco - --enable-pixbuf-loader" - DOCS="AUTHORS ChangeLog README NEWS TODO" -} - -src_install() { - gnome2_src_install - - # Remove .la files, these libraries are dlopen()-ed. - rm -vf "${ED}"/usr/lib*/gtk-2.0/*/engines/libsvg.la - rm -vf "${ED}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.la -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild) - # be atomic! - gdk-pixbuf-query-loaders > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" - else - ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run" - fi - rm "${tmp_file}" -} - -pkg_postrm() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - - tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild) - # be atomic! - gdk-pixbuf-query-loaders > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" - else - ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run" - fi - rm "${tmp_file}" -} diff --git a/gnome-base/librsvg/librsvg-2.34.0.ebuild b/gnome-base/librsvg/librsvg-2.34.2.ebuild similarity index 75% rename from gnome-base/librsvg/librsvg-2.34.0.ebuild rename to gnome-base/librsvg/librsvg-2.34.2.ebuild index e356a54fb04b..d7c844e0c61f 100644 --- a/gnome-base/librsvg/librsvg-2.34.0.ebuild +++ b/gnome-base/librsvg/librsvg-2.34.2.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.0.ebuild,v 1.11 2011/10/09 09:43:47 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.1 2011/11/20 16:06:18 pacho Exp $ EAPI="4" GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" GCONF_DEBUG="no" inherit gnome2 multilib eutils autotools @@ -14,8 +13,8 @@ HOMEPAGE="http://librsvg.sourceforge.net/" LICENSE="LGPL-2" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc +gtk tools" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc +gtk gtk3 +introspection tools" RDEPEND=">=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 @@ -26,7 +25,9 @@ RDEPEND=">=media-libs/fontconfig-1.0.1 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) - gtk? ( >=x11-libs/gtk+-2.16:2 )" + gtk? ( >=x11-libs/gtk+-2.16:2 ) + gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.8 )" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) @@ -39,18 +40,22 @@ pkg_setup() { --disable-static $(use_enable tools) $(use_enable gtk gtk-theme) + $(use_enable introspection) --with-croco - --enable-pixbuf-loader - --with-gtk=2.0" + --enable-pixbuf-loader" + use gtk && ! use gtk3 && G2CONF+=" --with-gtk=2.0" + use gtk && use gtk3 && G2CONF+=" --with-gtk=both" + ! use gtk && use gtk3 && G2CONF+=" --with-gtk=3.0 --enable-gtk-theme" + DOCS="AUTHORS ChangeLog README NEWS TODO" } src_prepare() { - gnome2_src_prepare - # Fix automagic gtk+ dependency, bug #371290 epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch" eautoreconf + + gnome2_src_prepare } pkg_postinst() { diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml index 03a9d4f3fc9b..9d83ffc773ce 100644 --- a/gnome-base/librsvg/metadata.xml +++ b/gnome-base/librsvg/metadata.xml @@ -4,6 +4,8 @@ gnome Build with gtk+-3 support + Use dev-libs/gobject-introspection for + introspection Build miscellaneous tools -- 2.26.2