Version bump, drop old

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

6 files changed, 78 insertions, 126 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 8d032b08eb21..8ff1f0c619d4 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.374 2015/01/02 12:09:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.375 2015/02/18 11:27:27 pacho Exp $
+
+*librsvg-2.40.7 (18 Feb 2015)
+
+  18 Feb 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/librsvg-2.40.7-gtk-optional.patch, +librsvg-2.40.7.ebuild,
+  -librsvg-2.40.2-r1.ebuild, -librsvg-2.40.5.ebuild, metadata.xml:
+  Version bump, drop old
 
   02 Jan 2015; Agostino Sarubbo <ago@gentoo.org> librsvg-2.40.6.ebuild:
   Stable for alpha, wrt bug #529964
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 00be0c66f298..691af08dbec4 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -3,28 +3,17 @@ Hash: SHA256
 
 AUX librsvg-2.40.1-gtk-optional.patch 2184 SHA256 060ad4965c51d334da543970f959022d519bd3e714c1ee22c4cf9081e875c1e3 SHA512 7232fab1817066469d43f29e3c338312e8ead15e1aa6b236bd6e1bb6a3f4c903f41467e3790c8011e5670370ee3292520212b63b458b8ab1341f3dbb1adc16c2 WHIRLPOOL 59813105025e68854d155dc6f051ac7ce06c18aa5903f910b079b84ee5882e2d626d971b539c07b701125c6489ed1dac5e519909084fb26e637e10d48839543e
 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.5.tar.xz 509556 SHA256 d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7 SHA512 57a82d2a9c7f77e503db3127d423cd58e947b3a32be1b2b9c78cf1dc9a35acc00ee79ec115737c95958f29b60f0a4ac384e97f090f027ede70dd3cb19c025938 WHIRLPOOL 35edc70c1cf2c0b1d3d77fa6f4bb012bc613c9ea1665b73ff3f882f83b609c46450fe3ca40a4fa59607b697b304065220c4c714e505df9bea6104397e7bac51b
+AUX librsvg-2.40.7-gtk-optional.patch 2184 SHA256 672b46d20cb81ff854188619ead04844adc9a6a21e15a98467540abf1cd0cdbf SHA512 a0db8aeaf3755c7f25c352a14246b4f5cbe69051bfb1e774cf5df916d941cc4d611c8b5ecaf6b11081f1c48115840cf360feeab43a2c3d9f3c50286864bb91f0 WHIRLPOOL e44b75577de0b587e31d9cc77b5c093b8767d93d1ca31099c7a7c35d51652b6ab1967a6becffb90b45b79ea7d066d48730d4dda667476a9a541df106e0ddbb3f
 DIST librsvg-2.40.6.tar.xz 512500 SHA256 8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06 SHA512 8d901d5d6dde2721db9cb05740ce42fa2520f2f6cc8136a8cb0306b5e6e630166d25da917d169c8d4e11fcfb7834ccb1fe93188f5e9c02c4cddff989d0cf3c51 WHIRLPOOL 99a335a76f31f7474780958d30eb4fe9a950b725d9559c8825e9a268248a56ce9c5048cac2914a99cb3ea9a5787b3de63e32e4b97c09880c994e19845a7f3768
-EBUILD librsvg-2.40.2-r1.ebuild 2844 SHA256 d999c0361cdcee2acacd11c8fe23d2dbd0d2f382a1ea03a5ce74ff958243514b SHA512 403fb34aba9dfbbfe1441aced4fd722fb5d7b67ee8d8dfbd4fd5dd1b83ef605f4185394bccc8e88c0e27c8b9ecc3839909a07d5dc6cb24e03626ef261d21a8ca WHIRLPOOL 68c63442efd4a1220f89716db013217b06a133f6bec50520bafe5758c513fa91f1850eb2a3142c4650cea0c780db7e6e17b8808ba82c9471e188a7c837e3f2c2
-EBUILD librsvg-2.40.5.ebuild 2858 SHA256 de6fded7c9f4e18a419dc49e7560070f46e651ead0abcbcfcd8f25264e1f342a SHA512 80119e14d2e24e01660964176f8b2b47269264fd5219195d2c3e666f11337599b8da3feb3eabede2eda47caa64ae4b5e737f990806808a4195afe25766d06ba4 WHIRLPOOL 4158082ee03ee308b6fd25648dab92228862dc40446905fb745a4be16de978fed0d5722f35a2f34a472fd7e4f6f1d5a217e818d7c9f4723a59f70896f5f67cab
+DIST librsvg-2.40.7.tar.xz 513784 SHA256 6ecb7ae2f75408f0c046166f327e50cefc57eb874e3c7ba43cd4daa10d5a0501 SHA512 92aa56ff2a088023b1ea078d91f447908c7b05ab1e51f9df5faf4c89fcee1053e0faa5704727c9706f1f71ba1047d761bc587b443c5daea67fe600d8178dbde4 WHIRLPOOL 8c21f7e5140542af5df10c24b371050a8189ebc2f13a13cf9957157333e3d4cd9be746bcd5eedc6b7e1491ffc6ef81448065a148e24ee24fb253bbbed36cb911
 EBUILD librsvg-2.40.6.ebuild 2848 SHA256 27304bb99fd0d0555923adc901a18c13aa8e1f0a982064a6772c0286e1d90605 SHA512 35e66e314308828b782ea041c2959e92371f1f138744941f98342ab4ab955c46e8697055ee1c3a61c5422e3642b7a0109243f4c39f9bcf6b0aafb4c24b07ea64 WHIRLPOOL ca180bb7fd67374bb8fe0d62b1376d7c8fff21995243544697c203e8c2aca1fb78bc95fa00a242581d1cfd005fc71d905c3303cedf8d5ea2e222d64987237be4
-MISC ChangeLog 48692 SHA256 d6e0c460a068b60a5833f228555545ef827740f257265ae8697eb404fa60c7ff SHA512 25a585f06bc7e2e6e1b8cea89c70367b99f2f53774d9161455a8e5b8b95cda6a12144ed26fa083856a81963f4a152b78de675bec4a2c53c363b781f5c594836b WHIRLPOOL f895d38b4c3270a569212c457fcddfa17e5dbf4912498077de13f65789a76dd6f1f838d76aa4b2bf307538f2e9d7fd3a526bbf15490d3ab377a0e5df22c893f6
-MISC metadata.xml 391 SHA256 4204d8b4ba91f579bf4c6db6564541b44257cbd736ca860ddd2ba650ae1b1fba SHA512 7f80de10e7a4e4368d8566e61f14cd0423cee5d8b3bc2e2c04d1a55f3ea86007cf0a9f6cf05dfd3b98a5b58795d36d32b326564791f9a68fa7476bdad0f275ac WHIRLPOOL 707dd74d92cb0ab17509a56f315cc99daf765732c63613388fbb87e2e8812b56d429bddad17be7ed07f653837eaf5fb55888b3958ea0c2790d2697f0451e0692
+EBUILD librsvg-2.40.7.ebuild 2858 SHA256 6eace6b57be869d1ac635a02679d9042589f7f864112b6c9317acc1d8b18bc78 SHA512 a36fef927f00d0a23354ac13cc7f240c27b0e1d22116e83708de28f3100f02992465acb7983281c8fc9b9fefb82b760d3a4bc1042ed6add0c15c1c783ed4d146 WHIRLPOOL 7ef791a6fa1146e4f7014a985746b752f609d40e1a23763d0c7aa4e117dd6f62004c4670978f10292319a053b037fbc61fd1a51530128e528feb2cdbf95d7414
+MISC ChangeLog 48932 SHA256 b14e0197178e398eb9c623645528a4afb160ec75024166b70bbae209f484fe8e SHA512 4276f15e126e7c8d35070a0360d253b84cada38d0a31b42077f6b27bd6b77ddb48592f300747392ddfeaebe430f0dd792e2a1d100cbacd76f999cfd8ab0c26cf WHIRLPOOL 3b5028af2b40bfe416e9b48077ac5d042cb9963a0dcbd8489106205acde7bcc60b3e4209efaac8da3c932523644111de2c1472675c32f861cc2df7d307ec577c
+MISC metadata.xml 220 SHA256 a13d879e5a19e9faf4d20c94e7da392b17d89207abb9cd2dd3baa4062e0044d3 SHA512 4d2565d25094857fef26ac41c9565775b4dbb0cdc60975aa6e196aa5ae0a7fd3bfab0275090fcc485ef781f1bce659c51ba81621363c69c8ee5d3a74cfef9655 WHIRLPOOL 3fcd8865d147f2dd9717f85884543f7f4a276ccff9cc9a9595f8bf7946da79211b1ac438011ba13f0483a173d66037be7cf2df00d3d605cafe04762d8408527e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUpoqWAAoJELp701BxlEWfvBQP/1MDEv2wGZ8mpJwS9rGgAAxM
-qqhUFlSCDrpxXMQUAfPIGALhC/KBIH+QvbFqEL3fzAA21t3mrV3WoQUz3BMpm918
-tN2/Xz16dXQcOqxBGsqX0t5BoaIenKeaKvw/vqiwOoLygeg5fOM4g0ocFLfT2pBR
-DtMWg56/YQ6RmxwiiSEu1tfMg8/Hpy+bs11D/v57Lk/r3JjQEMCJFISiOkg8mq3m
-gtvCwivSgCD1Dmh0jzMOHuNqO8r3yEXF9Hd/yGESz1aPNVaPhgpAFpqurxur8JYQ
-X7WTC6iThFvy8ZVyKQmBV63BQSGjqTk14McAiqvVNdlQoVC9foxmG43u6dJy/KPm
-op6ZfzgGjc5MMdr5+eAihQkDnlGUuZS90GzEJAoVDXZODhIE7wRAK6S6z0E4UacN
-iFFNEhBVPlKiJElZAX1Tktw2ikoyNi2kwWbM/rNsjmOQFnKEyPn/7VV112q8O8fU
-fXHI7zUp2fervMIAhiDzkLrLm7zp/xSJUe0hJn/HRURcFUQsxgcwGjCq7n+AEwxR
-LpnEN0XNFHZsx8aRR/KZE76gSJzAxEr16gxsPqXih5AhijA1anHmuA+6DlCcWrLC
-BGMcoIVR+ob72lNK8QtzAC1ugVZAv86EV1kyEizAQZIAhAgRB4YBhO+lr8P5jLhf
-5uQDAYBTaBxBChXK3YCB
-=DEAM
+iEYEAREIAAYFAlTkdyAACgkQCaWpQKGI+9SNXQCfU9bp4PvyhqB4vY0c+I1si6Kk
+/WQAniBAdnUh1i+shYJZf35fg78X5z63
+=Ql4f
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/files/librsvg-2.40.7-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.7-gtk-optional.patch
new file mode 100644
index 000000000000..8857110c1508
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.40.7-gtk-optional.patch
@@ -0,0 +1,58 @@
+From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+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 <ross.burton@intel.com>
+
+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 3.0:                        ${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.2-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.2-r1.ebuild
deleted file mode 100644
index b7a601df612d..000000000000
--- a/gnome-base/librsvg/librsvg-2.40.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.2-r1.ebuild,v 1.13 2014/10/11 12:14:37 maekke 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}/${P}-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
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.5.ebuild b/gnome-base/librsvg/librsvg-2.40.7.ebuild
index d9ddeadb0a0d..e01191c6b388 100644
--- a/gnome-base/librsvg/librsvg-2.40.5.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.5.ebuild,v 1.1 2014/10/14 09:57:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.7.ebuild,v 1.1 2015/02/18 11:27:27 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -41,8 +41,8 @@ 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"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
+	epatch "${FILESDIR}/${PN}-2.40.7-gtk-optional.patch"
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
 	epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index 3e6ac448a4d8..259490bff2a6 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-	introspection</flag>
 	<flag name="tools">Build svg viewer tool</flag>
-	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>