Version bump, drop old.

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

4 files changed, 32 insertions, 114 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index a6211e072438..a9f5c41bfab5 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.288 2012/10/16 05:47:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.289 2012/10/20 06:55:57 pacho Exp $
+
+*librsvg-2.36.4 (20 Oct 2012)
+
+  20 Oct 2012; Pacho Ramos <pacho@gentoo.org> +librsvg-2.36.4.ebuild,
+  -librsvg-2.34.1-r1.ebuild, -librsvg-2.36.0.ebuild:
+  Version bump, drop old.
 
   16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> librsvg-2.36.1.ebuild:
   stable ppc, bug #427544
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 825f600e56bd..fa7df31c47c3 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -6,22 +6,20 @@ AUX librsvg-2.34.2-gir-filename.patch 1344 SHA256 4039ebef93fa4af7b73c087e1dc05d
 AUX librsvg-2.36.0-rsvg-convert.1.patch 2887 SHA256 c178ded102bcec5f125fefc366ac2ab3fea9b5ae35c55318832fc720983e73f0 SHA512 b5990a2746bdc919afc7a3870af17c49c8aad585db11c306ea9208a9971bf315864b6d54e592c10065e18d3f44ea711eb05c7d1b2e9fbf0d31ed4e3707bfe53d WHIRLPOOL 21f42b9b94091e69de8553f109e7b6795b0a6524177bed80b6d7f5c3b7699860783811f79b136a2c9b0326552b1c7699a7e6c0bca3188eb5b66bdb7b73efac17
 AUX librsvg-2.36.0-rsvg-view-automagic.patch 1955 SHA256 74577e5f2d0f3de93d3e66f194310d591d66d69581ac6586f44be78ced85e185 SHA512 30e259916ac7d969001350576719de6865e48b0d482028a37a61ecc88e3e33d68eadc31e7933e455490aa226609ddd0236a22c5b8b2af37da9b04158cc5de993 WHIRLPOOL 198850d5a23958919f891269746590f9076b3d3f731c2a4ea6b1e9e0d9023cc8c63769c9ca3eaad5b2586fa4e31e4505a8a87d802102ffceb642e62b3c7bdbfc
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
-DIST librsvg-2.34.1.tar.xz 482380 SHA256 4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db SHA512 bdaa67e3b04bf6e5a7582dda7280f5b017028c7c78acc06ab94b009526fd609e3a0b89f51f252fc2e4defff0b9bb8296fe5266f198f1e6a57c3ff40c465b5336 WHIRLPOOL efde10517f02d48594be19fb4491964fd326ed5016bf9a3161834199f42128b5ccef97e936c46acf988d18e0ff7e671226d63247bc46ce89c500f6ee76e2a400
 DIST librsvg-2.34.2.tar.xz 499108 SHA256 5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464 SHA512 d056e759544a2b8c90c01d32d78131dcc4f3312508548d46038ae1a274ad213b43c11c659595bf4f3df5d6576f6e0601997b192ae1f170f9d2cd7a051e767efd WHIRLPOOL b36ca4887046ce55dab92005eaf3458f64d0b1c60de20fcf908bcc858a5aadb3f69574b554f4a0a2db0fbdc7f84b2cd9df79ec1bdef035dc36596af8ace9c7ee
-DIST librsvg-2.36.0.tar.xz 505372 SHA256 e6475e08c73e92c8bc58824e215551bd64ac5e9a492ff8c520b89c01a7ea510a SHA512 a5b9fd896ccc8637c182beee739f83ecea87679557442ad2626fbc05106109489d506aebf13f38421dfee24d6c9c50b8509058a6cc9d347a578d382c8edcf69f WHIRLPOOL c3c01e249b5ad1175db576c18155779f945820114380a90b188379819edb1545b37a0d79e5ba03673a130dbcd4a632dbdd67d3bdd0a8b2c091c80946f840b548
 DIST librsvg-2.36.1.tar.xz 506184 SHA256 786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5 SHA512 e76742705009e3e34cffc22c3fad13f76a54a4da6e3ffcc0aa9b554fcdfebf00cd3d7671e4deb5c5a7dfc455a87c2c01ee0866a2425856c1d09f2dba62c8ff15 WHIRLPOOL ab3eafa8726f0fcbfe46ae5c1c3bc74979ce89c816608992f4b291aee783e55594a216fb486ef86f117a56725dc27371172033b1e5a69075f2c45c51564cd425
 DIST librsvg-2.36.3.tar.xz 511708 SHA256 3d7d583271030e21acacc60cb6b81ee305713c9da5e98429cbd609312aea3632 SHA512 265160168fefcebeace6ecd964487277756fc01fcd70d40fff06ac35903b47c2dc65fcb90d21f48610bc79a6bfe2c946bbff5644c14a5cdcf94364adf0b9400a WHIRLPOOL e1f180ff95ee8d151aea27e5920a97f8fb9fb2f9414a1ea93f79e095af13a529d0f5adbe59385e98fcc580c70df35c4550b29726863d4b22784d127f49b087fc
-EBUILD librsvg-2.34.1-r1.ebuild 2521 SHA256 509cd7d03cea076e2bc4aed148871d7afa390cd6b5c27df2225c762679c93a28 SHA512 e8af67efd06aec60ae92e0a4c7e7f3aba6bc7def777468fc681e795c575d1b01ef89f5a558dbab18217acce41e0ef511c9fc4b9aa9faea56c45c0c3c4c8de28a WHIRLPOOL 1cf12be0e2c19cacb5dedf06372d80fefc890b4f69428b8547b2daf22b8b66f17a6fbcb13838dbd3b44d58137afd29118cb9e768d44e0651f3b6c45f4970666f
+DIST librsvg-2.36.4.tar.xz 513028 SHA256 1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2 SHA512 447435b2fab0ca7147b68c02a622df8049d56844360e8e361bf5abfbec12c33d46393bad3c099c2819f68d1b7595616d1f35d2cea58ee94d873c1c34e9362d37 WHIRLPOOL 9d8f0f09279be182e061f6b2e0a43d89f62ba5e0aa253373f70266865125b246fd683ed42b134a55e86ebb808bba10207ecc661e1b47e50ce29456d2cdf40a1c
 EBUILD librsvg-2.34.2.ebuild 3044 SHA256 4cb45b2caa8311db8fabe26404d8d0bc85a787de3d15b499ca53de3e468adaea SHA512 ccd97346d5ab607fd51eb1e4d185509b05303f5982ced8681de6112a009d7df15d9decc5ec3ddada4a31a0be649549e529f3e60a192219dfcd4bd31db19f592a WHIRLPOOL 0f3a3f4df9c766a7cc987d35a5d1cc162b9f4c388080c10b4066b059fda7dd02c5a6985319f012b25626484cfc0f1721014daa0b0a29425ffcfea87d5ba6adcc
-EBUILD librsvg-2.36.0.ebuild 2779 SHA256 688b37b7582ffb783ec0884a41ed869dd5b0e399b9201e5a743103e0eecff25e SHA512 49d776f1e26f3105ad6779fb160d8e946f0a7da486e4eb68b0ad1b42b38d010bed8f119dd2f14d613b33bd3b97b175e67df2b4c3edbb01a02162b6dc80e48e3d WHIRLPOOL 77aa81e7a0d2e5d7e9e66efa8398e6bb4b6cb28d06aa6c0c9b69c8cad67108ccd9b4f3677a437c278b233179440aea2a55cf413ce3166075720cc2e4da707919
 EBUILD librsvg-2.36.1.ebuild 2812 SHA256 5f9fb53d6b97f03926c9dad075d7bac3e2f4539d4dc7732013ecb02ab62198c1 SHA512 20e0aa0834120f1943ece329af6a1b172ec0ca40450f8d5e922dc4a595a0d2519109896b639199cf7a99270ba9dee30bd2db16a0f777e01adab12060e3af9c79 WHIRLPOOL 75c70b53a38b07e3efd75c2c37730995a172b9bc959a2006a8f438bf3a081585cf7b5b35acf2ba130bb3026a66a413f764d4702e0569af5ea30b598b957cb20f
 EBUILD librsvg-2.36.3.ebuild 2970 SHA256 12c28fc1dae03c86bbcf7661b1b2bec7e7c440e1b1749706585695164dda16f2 SHA512 f94a4d97deaf65e72729185e6be7f85105b4d3c3b6cff41b672214c5883625547eefaedbcbfbeaec67af439e7ef8481f5b9fd8f9fe49872dc2f54b94e760a1ea WHIRLPOOL 76e6cead4b19900a46d977abc27cc480eea5b0d028e82e7832831adbfdf4d4df124ed0274a8dcffa5d77d396cdf7f12b92cd69ab6e748ec07203863e3f4e6fff
-MISC ChangeLog 37559 SHA256 00fbd83c73f0e971258492c21a19f89e27d091fc815f90eb4dfdca6d926d05f4 SHA512 1743148defa54a00210a7111111820476c713368913098b8538e116339a68399c4942770d99833e7ea05efae7e23d009b5613f45a5cb1264eb718bfe997adab5 WHIRLPOOL 70a45ad9e2b7acaa55c74dc4fb7092ac9f8cd08d7978f6fbbeee5c8ba32f50fdc16b76c79e40e518efec70fd14cf7ffc9fde961a0b0653944e9119c4aa09115f
+EBUILD librsvg-2.36.4.ebuild 2913 SHA256 03e08c9748602d8fc49210ef95cd8e20fb0ae8df39ce6557ac3bea4af22c4892 SHA512 d0e19ce11cc5500862e3bce0355e13e8827219578acbd979b42c11dc84ac03a32141e053f451ada74f1d181e9c681db418a351f59be473a305b032b50c018be8 WHIRLPOOL afc00bd39301d47ddebf1cb6b142385963b8057a5a48a1440806634d674bdaa8679c03aff316054e73b937489bc03492e416e5216d0fc60dcb68f27502f7e5a5
+MISC ChangeLog 37737 SHA256 0945dfda3d1ac3db9ae9ef9d1115ea2671c442da6fee2391b54ecaf61b9c72b8 SHA512 e76aa6bd2f084ec7832871baa2eaa7974d9dcd358e0c92bc30f3678ea35c9ff17c88603e7a899d69f759711e75ddc6a814a505f9cda2b166bc1cedcf63c81b2d WHIRLPOOL aefa5a786c8f9a48ff78fa62f5f581204e0e768f76125eedc76f6aff2f08253eced573d833f36b63875db58219d35cfcd1088c50e0950a26a0284a7c4c57726d
 MISC metadata.xml 447 SHA256 ff3436ece57e6eed34bad2974122d6e1ffc4819b87db79898f70cc3de5ee73d9 SHA512 aee3a4f0eb08afd1824dd6db66ff71f6acdfbc45c6d6ea09e8ef3856954b91c54693d240b18f812a70d8498261f31e84eee1ff3d3f4b62452d8dfa4d3b0b454e WHIRLPOOL 243ba27d148faf672a858d0530e1dd201c3ce3f8d747c0731308bda48b1629c7c7acaccb9c8357fb363a4120f0da4b9d1bfd88a19c9607bc6de01385867cfe3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB89MgACgkQl5yvQNBFVTU15wCdHsnbwlpEd1TnkgUQQe6Dps5q
-6BsAoKSlQReIzy2l30lo4D5+UDnEAbk3
-=cdHD
+iEYEAREIAAYFAlCCSv4ACgkQCaWpQKGI+9R9AQCaAlh1+dAnBYrafrUgK6kw/1ts
+f1kAnRgI4Ea7vQLg5UMQNc6P6F1hMw3w
+=I4nK
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild
deleted file mode 100644
index edea0ceec67c..000000000000
--- a/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild,v 1.11 2012/05/05 05:38:09 jdhore Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib eutils autotools
-
-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 gtk3 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 )
-	gtk3? ( >=x11-libs/gtk+-2.90.0:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	>=dev-util/gtk-doc-am-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"
-	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
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp -t tmp.XXXXXXXXXXlibrsvg_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 -t tmp.XXXXXXXXXXlibrsvg_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.36.0.ebuild b/gnome-base/librsvg/librsvg-2.36.4.ebuild
index b59971073765..b1d80ceb8595 100644
--- a/gnome-base/librsvg/librsvg-2.36.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.36.4.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.0.ebuild,v 1.4 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.4.ebuild,v 1.1 2012/10/20 06:55:57 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2 multilib
+inherit autotools eutils gnome2 multilib vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="http://librsvg.sourceforge.net/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+HOMEPAGE="https://live.gnome.org/LibRsvg"
 
 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk +introspection tools"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+gtk +introspection tools vala"
+REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=x11-libs/cairo-1.2
@@ -29,35 +31,34 @@ RDEPEND=">=dev-libs/glib-2.24:2
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-
 	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.13"
-# >=gtk-doc-am-1.13 and gobject-introspection-common needed by eautoreconf
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.13
+	vala? ( $(vala_depend) )"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable tools)
 		$(use_enable gtk gtk-theme)
 		$(use_enable introspection)
+		$(use_enable vala)
 		--enable-pixbuf-loader"
 	if use gtk && use tools; then
 		G2CONF="${G2CONF} --enable-rsvg-view"
 	else
 		G2CONF="${G2CONF} --disable-rsvg-view"
 	fi
+	# -Bsymbolic is not supported by the Darwin toolchain
+	[[ ${CHOST} == *-darwin* ]] && G2CONF="${G2CONF} --disable-Bsymbolic"
 
 	DOCS="AUTHORS ChangeLog README NEWS TODO"
-}
-
-src_prepare() {
-	# Fix man page
-	mv rsvg.1 rsvg-convert.1 || die "mv failed"
-	epatch "${FILESDIR}/${P}-rsvg-convert.1.patch"
 
 	# Make rsvg-view non-automagic
-	epatch "${FILESDIR}/${P}-rsvg-view-automagic.patch"
+	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
+
+	use vala && vala_src_prepare
 
 	eautoreconf
 	gnome2_src_prepare