Version bump, drop old

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

4 files changed, 24 insertions, 105 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 53fc27efc98e..2db4cb5937ad 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.331 2014/03/28 02:25:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.332 2014/03/29 19:57:11 pacho Exp $
+
+*librsvg-2.40.2 (29 Mar 2014)
+
+  29 Mar 2014; Pacho Ramos <pacho@gentoo.org> +librsvg-2.40.2.ebuild,
+  -librsvg-2.39.0.ebuild, -librsvg-2.40.1.ebuild:
+  Version bump, drop old
 
   28 Mar 2014; Jeroen Roovers <jer@gentoo.org> librsvg-2.40.1-r1.ebuild:
   Stable for HPPA (bug #499954).
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index d3bf9aba16da..5fb25da1a409 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -8,18 +8,17 @@ AUX librsvg-2.36.4-resource-uri-3.patch 4543 SHA256 512ff5ace57cc2b40e42128cbe8c
 AUX librsvg-2.39.0-canonicalize-realpath.patch 1222 SHA256 2fb7b9cea505ec6ec8d42372263682d2c458a257ca78f1bd9d5dbd31e43bbf4d SHA512 bc7c747d36ad7d839afeedfb9303fd97387f14d547d4581b55691e371449e9caeff738abcecd302a3a7cc9cc1b56b6bfd1bef6e017b5aa8b2de76b232168f1de WHIRLPOOL 78546a6436deb0d0cdf137cee7f0105546fe9507e20cad7cdafdd35b572a940cbcd16a154aeda3d8aa17cdadcb9b5d0a2dc78918ea6bcabebf8bc7344aa23a91
 AUX librsvg-2.40.1-gtk-optional.patch 2184 SHA256 060ad4965c51d334da543970f959022d519bd3e714c1ee22c4cf9081e875c1e3 SHA512 7232fab1817066469d43f29e3c338312e8ead15e1aa6b236bd6e1bb6a3f4c903f41467e3790c8011e5670370ee3292520212b63b458b8ab1341f3dbb1adc16c2 WHIRLPOOL 59813105025e68854d155dc6f051ac7ce06c18aa5903f910b079b84ee5882e2d626d971b539c07b701125c6489ed1dac5e519909084fb26e637e10d48839543e
 DIST librsvg-2.36.4.tar.xz 513028 SHA256 1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2 SHA512 447435b2fab0ca7147b68c02a622df8049d56844360e8e361bf5abfbec12c33d46393bad3c099c2819f68d1b7595616d1f35d2cea58ee94d873c1c34e9362d37 WHIRLPOOL 9d8f0f09279be182e061f6b2e0a43d89f62ba5e0aa253373f70266865125b246fd683ed42b134a55e86ebb808bba10207ecc661e1b47e50ce29456d2cdf40a1c
-DIST librsvg-2.39.0.tar.xz 519088 SHA256 aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f SHA512 14e3224c2fad8c92beabce9b486d8cc94e288db5d7d0bda9016fa953ad31456f3934ad847dc7288185fcba840731c25c2eca75288cb2518d2d501abea9ecd98d WHIRLPOOL 3348a50701b3661cb96de039f868c21a319752e2f014329b2ab77bcf6d66ebba1b553f7d10334146a4c3f96d4c0e26defbd02424b8f1deae0483d59e5a3ede50
 DIST librsvg-2.40.1.tar.xz 505664 SHA256 8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7 SHA512 fe84430a7be4bb70c47745acb40628a806f066e4d4322c0fb90a77aa2bb7a41d8235e4055ab09cb166deb44a07781166146aa5c1a8508de9ad6f8e2686a32a49 WHIRLPOOL 1f50c68950b62bd3d76425f8fd70a57a5f810d9c63a0229deef040e1a602a61ec25755b956aec82f20782732e6ee4a63ccb9b36d0f2cd250e8911bce222f4ff7
+DIST librsvg-2.40.2.tar.xz 506048 SHA256 48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c SHA512 ecb144f8f02240f44edc4baf372477d6a8436abfcabad0e9fdce9cd629ace819f14d0c8174d9522b4cc63429031a1ecb611bbdabbdb432ec3f211cf331208f84 WHIRLPOOL 8063369ec5b5764c8dcdda47ba184efbcb13aa7b0683028f1c5bf795c02237c48a1403a6503beedaf2fdc76b2ff05eb37a0e5031496ee4ab206b9020a70e8e93
 EBUILD librsvg-2.36.4-r1.ebuild 2492 SHA256 a050b800f666779ed1a4dd548914c7b0c70907cffd6c75aff551600f444e3587 SHA512 a847084406fb24c12a0a310fa046a91a223fc11b9e1ff4d56cffcdea422259ec9dea91aa8e0fc2799c7acb2065cce95b7575af03ecd358e2505f8b7f2c6e9472 WHIRLPOOL 30a38cb7c6c4e415ec0c6bb6b550f84604543a41b862c883c7646ff6bc0ee5387fc9b9f05ea7d0e0fc4f7fac9310028a84792236c5c915ca7da037ad4478474f
-EBUILD librsvg-2.39.0.ebuild 2405 SHA256 63bd8fa9f2948b2b2aa4f78e8e6a7de6b07992d1cac6e91775bf6c241cfdeba0 SHA512 9b36685b16ca7c8dd3e7510d7b843b856fd5fcd94984f281a7cd2e0a2304dc004da0f3109a080578ed5a2457d0eea0ee96e4c74072e5a57a9ace92383d876d1b WHIRLPOOL 6f216e396e35d31ee57bd812d0ac6129d0e466ae147af1bae20197e770375d5ac50e64a6394c04fc8f60c8f6487cbb7456a4b35a2e1ca58ecc83ccfa747512ee
 EBUILD librsvg-2.40.1-r1.ebuild 2368 SHA256 00c86eb892fbbcbc1ac9c3ad1ce68c6cec3c5908cd9c2e52696e42e227acc32b SHA512 d83c8c005a4087a14b7fb03a55d25a4ba0a2e43fcccb69b117a6553fbfd01c5e4802f4c771f4da0f20da87b652b38ebdf204e23bd145f09626cdda6d5e39c045 WHIRLPOOL aefe2906f1d63581917dfc8c054ba9ad92e8a729217800802b448b57398501458712363334500989b316756f2f2dfa34883bd801dfeb439efd848eeea431b1d9
-EBUILD librsvg-2.40.1.ebuild 2028 SHA256 99b57764d9f1ac54859c9ce5fc00082bf662848457b21bfa67b793867ac40646 SHA512 40dc8d21894c6c96f1ce541a9fbb185f3aea5b78d22d998aaf9c78300db5e2eb49a63bd04643ec7bc4d2e8946e50a224dacab33521d08b937fb421e861cb316c WHIRLPOOL 45a7f37e7702706b8be0540a0ec29b19f948bbfbbeefb2adee2c80e9ef7155efb9438fb3556138dd6e08480db14861de47c58d95b6f3c4ef98ff96861e389618
-MISC ChangeLog 43398 SHA256 560f1507f1419e9bf0b932be40fca925f112232ed21cccc8c8032fab9d98b999 SHA512 b25667739b1f7c2105c70e48e31880e746e15cce48f08c0a7e792d0c108fb3d965a8a64d451784d12c2658256acda629d2043bf3d2804b3472dc10cbc6e2e491 WHIRLPOOL 13736a8b92079e182c43ee022cc0a11ca682698ba305d8710ba03c63b921753ac4c103e98f0d2f6464fb779f2af0499a5ff2764991776f5274fd6406c102e94a
+EBUILD librsvg-2.40.2.ebuild 2308 SHA256 b91f4853ec86ec107a0468470b8404df4a063c62ca160725cfd4df0ea5085cbc SHA512 5ef4a96d51cf14b7ae484a84f1ae360701ad383ac50a76888181cdb09be9f855f24d996b845d92c115645c27d0ea34a9c61551b420dc50b93aeaa53b9a09160d WHIRLPOOL ab447ce61f373adbd60777df958eb46fb4c77bb660cb6866948790dc410a55f5ddd7d3d9224b273eaa69bafbb33f4a415efa47c447301dbd2e86c6a8a7082735
+MISC ChangeLog 43577 SHA256 7236a2e434e8225dbfdd68fef7e61c7df9f90e29e3fcf0b5056d5e0c41981682 SHA512 8d9997b78a7093ca8011db5f85d5e1d3dfc53857c6149d3e73089c76cf738f8ade87491a49966242309fba12c353813decafca1a514a8fee79a12b4f68b66ff8 WHIRLPOOL 327019b2c437ca794a9a637266bb23ed1376ab33db867f6263f6d28d60ef5b6fe1f96a157e6ecc9d33d8a8d638d25f9e63fbc54340280070bca62581fc0c0a6d
 MISC metadata.xml 391 SHA256 4204d8b4ba91f579bf4c6db6564541b44257cbd736ca860ddd2ba650ae1b1fba SHA512 7f80de10e7a4e4368d8566e61f14cd0423cee5d8b3bc2e2c04d1a55f3ea86007cf0a9f6cf05dfd3b98a5b58795d36d32b326564791f9a68fa7476bdad0f275ac WHIRLPOOL 707dd74d92cb0ab17509a56f315cc99daf765732c63613388fbb87e2e8812b56d429bddad17be7ed07f653837eaf5fb55888b3958ea0c2790d2697f0451e0692
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM03ZUACgkQVWmRsqeSphMvOwCbBXQNFcaqXsVVKMFgcaVap3Se
-RQYAn2C8YSOTvKEkscZm2e6ekfowSMG8
-=x8ga
+iEYEAREIAAYFAlM3JZgACgkQCaWpQKGI+9QYpwCfR5y1cvxmRUpDeyDn36jW0rl2
+sOoAniwdFc12WiH3kCy3zWhWCyaXDdT+
+=uvTl
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.39.0.ebuild b/gnome-base/librsvg/librsvg-2.39.0.ebuild
deleted file mode 100644
index df77ee883a7a..000000000000
--- a/gnome-base/librsvg/librsvg-2.39.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.39.0.ebuild,v 1.5 2013/12/22 16:04:55 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 multilib vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://live.gnome.org/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="+gtk +introspection tools vala"
-REQUIRED_USE="
-	vala? ( introspection )
-	tools? ( gtk )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.24:2
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.32.6
-	>=dev-libs/libxml2-2.7:2
-	>=dev-libs/libcroco-0.6.1
-	x11-libs/gdk-pixbuf:2[introspection?]
-	gtk? (
-		>=x11-libs/gtk+-2.16:2
-		tools? ( >=x11-libs/gtk+-3:3 ) )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-	>=dev-util/gtk-doc-am-1.13
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
-	# Make rsvg-view non-automagic, upstream bug #653323
-	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
-	# Fix compilation on non-GNU libcs, from upstream
-	epatch "${FILESDIR}"/${P}-canonicalize-realpath.patch
-
-	use vala && vala_src_prepare
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-
-	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-	fi
-
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(use_enable tools rsvg-view) \
-		$(use_enable gtk gtk-theme) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		--enable-pixbuf-loader \
-		${myconf}
-}
-
-src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.1.ebuild b/gnome-base/librsvg/librsvg-2.40.2.ebuild
index e2a8812cde5f..d67a7335b829 100644
--- a/gnome-base/librsvg/librsvg-2.40.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2014/02/15 11:01:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.2.ebuild,v 1.1 2014/03/29 19:57:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 vala
+inherit autotools gnome2 vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
@@ -16,7 +16,7 @@ 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"
+IUSE="+introspection vala tools"
 REQUIRED_USE="
 	vala? ( introspection )
 "
@@ -28,8 +28,8 @@ RDEPEND="
 	>=dev-libs/libxml2-2.7:2
 	>=dev-libs/libcroco-0.6.1
 	>=x11-libs/gdk-pixbuf-2.20:2[introspection?]
-	>=x11-libs/gtk+-3.2.0:3
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
+	tools? ( >=x11-libs/gtk+-3.2.0:3 )
 "
 DEPEND="${RDEPEND}
 	dev-libs/gobject-introspection-common
@@ -41,6 +41,10 @@ DEPEND="${RDEPEND}
 # >=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"
+	eautoreconf
+
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
@@ -53,10 +57,13 @@ src_configure() {
 		myconf="${myconf} --disable-Bsymbolic"
 	fi
 
+	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
+	# only for librsvg developers
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tools \
 		$(use_enable introspection) \
+		$(use_with tools gtk3) \
 		$(use_enable vala) \
 		--enable-pixbuf-loader \
 		${myconf}