Version bump

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 113 insertions, 15 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 4577459bdb2c..07347b09d2b0 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.361 2014/09/15 08:20:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.362 2014/10/02 11:57:00 pacho Exp $
+
+*librsvg-2.40.4 (02 Oct 2014)
+
+  02 Oct 2014; Pacho Ramos <pacho@gentoo.org> +librsvg-2.40.4.ebuild:
+  Version bump
 
   15 Sep 2014; Agostino Sarubbo <ago@gentoo.org> librsvg-2.40.2-r1.ebuild:
   Stable for sparc, wrt bug #512012
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index e566c773509f..8db2777e53e4 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -5,25 +5,17 @@ AUX librsvg-2.40.1-gtk-optional.patch 2184 SHA256 060ad4965c51d334da543970f95902
 AUX librsvg-2.40.2-vala-out-of-source.patch 1066 SHA256 0b32e55884d4263335976f241f32b78ceb52f78c94478f252e408881d4d942e2 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f WHIRLPOOL f76ab2f925fe9387b087b40cc477a85fa7869f25830645609ae08b585868040129598f769e60f65a9d4f7ba0dcbddfcb4e8184e8e8f7f8fecc1351b0d80340aa
 DIST librsvg-2.40.2.tar.xz 506048 SHA256 48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c SHA512 ecb144f8f02240f44edc4baf372477d6a8436abfcabad0e9fdce9cd629ace819f14d0c8174d9522b4cc63429031a1ecb611bbdabbdb432ec3f211cf331208f84 WHIRLPOOL 8063369ec5b5764c8dcdda47ba184efbcb13aa7b0683028f1c5bf795c02237c48a1403a6503beedaf2fdc76b2ff05eb37a0e5031496ee4ab206b9020a70e8e93
 DIST librsvg-2.40.3.tar.xz 509244 SHA256 eb2755fe8bf0aa5b439bcf94edc880f08396b4c79fd54c73147df0607c63c98f SHA512 91095a6129ace1ae6e14555f8e79bd96a2bf232670c49a3160400dad83e5c286269775f218c5114e6d6809e765fe77cf7643c0db6d9a03de3d96eb75bc918e30 WHIRLPOOL 24cbed45d62659a7c8b130b821dbb2cf81aaf16400963a49495a6b0c8c2d6c8db02277e51b23c79d5d457fd2a097e7dc686cabf0993278d1c925791a8862ae79
+DIST librsvg-2.40.4.tar.xz 509324 SHA256 db76d5494e867613bbb0664e969f7d03296296495ec117f276ccf8f505cd9573 SHA512 effb6de6042cc89d9ce01a80058f09b2f4bee43055d07e4b4fb35120f5283e93073221c9453ec03fbb42c71b30202b3febeb5607c9b62c46d2a00ac233a55ed1 WHIRLPOOL 4b1ca9b0738fc58d34bf77ec09a2f3c91f6338f9797eedc09486efe9b3c04f2af1858802babc0a51d3d08fd60374155ef5b4df5da54365f79dffba929b00fcac
 EBUILD librsvg-2.40.2-r1.ebuild 2842 SHA256 19c82aa5fb1e774ae5cc4a21dcfcfec03a80f4c2f5b2183e9b3dbe84f671acdf SHA512 5096c6463e3fa4492764839128666530608a120a28dfd2c5b96537f77cec64e81b6a41da94e6edd2c83eaf25a0653a28a85bfbe752d9f185435534ab846dad79 WHIRLPOOL 422ee0c0f99fe28d7979611fc5859e3263cdffc675d289fd41b9a3e824d62cfb744b6c373ccb40713e8f00632c4f7ec822d2c1e4ee1bee6ec0a894fbe1cd629d
 EBUILD librsvg-2.40.2.ebuild 2298 SHA256 55601339fbc348ed6a8db58c2945a68d5d729c88485fee314f1cb10e3c9729d9 SHA512 c5a4c03a7db673d1a3dc57384bffe07ad0bbd4683686e9197cb3538d4c055a3dae3114a3f23cec6c968e686afc4befba3cc60c1be7e6b0cd0f283f60a1814d23 WHIRLPOOL 7845e39cb9b21dafff850f811d7264e45b9cdf5f0997314d9ae165748685e24847e96680f2dab206fdaa9d2658d2c77090aea54c74398631af68e4b2ad107df8
 EBUILD librsvg-2.40.3.ebuild 2858 SHA256 1a64268be039043a13f6a6a67b9494c494038b72180ee041907ed661f4f1c774 SHA512 f139428db64a99b373509d7fe4732485dddd2a2ca342a2169b80dd764a20cae957f0230c55f9806a87af0bb10d9b47321429c88f21ec706c5064614da4662f99 WHIRLPOOL f4c229feabfcfcb991d6c9439e0244167b8709af8b1493a322a4fb7856b5bb42df34447139076448f220817a94cd86943193c2ae2f2dc70f083bb19a629c0600
-MISC ChangeLog 47208 SHA256 6e9f3a4d01011994d16ecb2feb581de8d168574ad72406b518532ab66254f761 SHA512 dabef9da654007e6c30ef4e1f36ca3a1c760e2ce380ca9e5856da11fd99683b6f598d5cd619079aa167f1ca58d0ecbfa4ace21aa692cb7634e458843420e69f0 WHIRLPOOL 68e37640e9eecdcc352a31ec0c53c07610f548ffac44354b438aff52d703886a9874b95d5e5419a0a2c3935dc91edce49bae69983d539191004ca7ae0f4d86d1
+EBUILD librsvg-2.40.4.ebuild 2858 SHA256 6b5510cc889d42c4add22513c57b64ff1d58e493cec3a1f2cc6843e170c29bf4 SHA512 2a85490936741a947417cee947d959b5c0a32934c7329cb39395f59357ee830f64c85e2a3d4cd0a6a1aa8ac6c7824d6cabe981aa7ea07df9b8bda2cb70419ab3 WHIRLPOOL be13c25e7236c115fa29c5b32a773e3e31ecee432139bef0e27a9a414eca1e1b59e5044f843a69f992bb74e81c42df0a28863625df169690e73e785869aefc73
+MISC ChangeLog 47327 SHA256 40a6b753eab895f4b43b9189bfcec8956a0ac3fd3ef5005d52d6c26b3ff37162 SHA512 22c065790f25fe2349344f055a06e90b7ca35d72f290b4532cb20319638256da64d035d22fca5da8d07365a0439d1a6b46ba38d1f18a15f3090818a13103398b WHIRLPOOL 31c957c8f76d4ca54e69539cebcbdbc8343fbbd32bcbad72725dbf1671847f2788e7c5f37fdc50553b84b3d724a35b1e07a829c95dcda17bec097b8cfa152126
 MISC metadata.xml 391 SHA256 4204d8b4ba91f579bf4c6db6564541b44257cbd736ca860ddd2ba650ae1b1fba SHA512 7f80de10e7a4e4368d8566e61f14cd0423cee5d8b3bc2e2c04d1a55f3ea86007cf0a9f6cf05dfd3b98a5b58795d36d32b326564791f9a68fa7476bdad0f275ac WHIRLPOOL 707dd74d92cb0ab17509a56f315cc99daf765732c63613388fbb87e2e8812b56d429bddad17be7ed07f653837eaf5fb55888b3958ea0c2790d2697f0451e0692
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUFqFTAAoJELp701BxlEWfOPsP/3nz15fhbII6Mo9hje+3s8le
-/5Hz6PuTVmSWHNZWRCzzbVPmmQMNlbhncrjZhviIYdoPw3XK1+0wrHh9x8htTg5s
-SFdQXC0qDxWAfzLDuxW253d3Q7vxfPJlv7yGtddQQmQyHBimd2vASxl0x8sV8Ko8
-H6Ri15kVYRjA3KMirJWeDRuh2D3qJ/7C519JTKrXrdPGlGO/qhaJwKMg+GZa3T5s
-ZLcryTicdARTc2ZXdp5kp+tPy3rQePGMl+x5fXFaW+C7Kx7OhZH7ovdlYlkcO+2b
-J9fQoNYwjrfJTMGcTWQAp+VgF9VA29fYVeuoCK0Tr5y+1se0GsOn6Teueo7j8Djo
-FyR6DOStHk2c0k4UcRFYg1lUa9B+7UJzoYwboltXHXqvlE8heVAMJR4iBKVkm+rP
-XvbFQKPW8isHbdZWJV/UTcg4WQTzWIia72rHnR4toVuepYTjyx+Plwkcxe/HIUeg
-1K8HrjufEtcIDQTc+/Q4IYrlpe1kFWUrTu7GMZoPgJl3aPg7EHE0aWSHcC7VHzAB
-JGw+KlwB19lovV+yPfIvhfohX+MsFiTcWlQB1V+Htb/5RnQPeub8F9nQYpwx8avq
-rOPeXvbOESbruYVH9B5DxKz8kbflyLt8R2O92//XBogXq9TlvVxwuQ6T3gIDLOpR
-LDPC2rZ3oAdgRfkFNUWR
-=kCUk
+iEYEAREIAAYFAlQtPY0ACgkQCaWpQKGI+9QzaACdH3i0DKQMP6LJtC8qyKKPR3sB
+4N0AnipIw0uMu4iOPLDyVGLJFKfthLTk
+=SS0/
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.40.4.ebuild b/gnome-base/librsvg/librsvg-2.40.4.ebuild
new file mode 100644
index 000000000000..f6643ab2579c
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.4.ebuild,v 1.1 2014/10/02 11:57:00 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+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 ~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.2.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=712693
+	epatch "${FILESDIR}/${PN}-2.40.1-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
+}