Make rsvg-view-3 tool and gtk+ dependency optional (bug #501434, thanks to Patrick Lauer). Update USE flag description.

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

5 files changed, 169 insertions, 7 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 3b6dd6f8b89b..8b8bfc0f908b 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.325 2014/02/15 11:01:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.326 2014/02/16 05:43:31 tetromino Exp $
+
+*librsvg-2.40.1-r1 (16 Feb 2014)
+
+  16 Feb 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +librsvg-2.40.1-r1.ebuild, +files/librsvg-2.40.1-gtk-optional.patch,
+  metadata.xml:
+  Make rsvg-view-3 tool and gtk+ dependency optional (bug #501434, thanks to
+  Patrick Lauer). Update USE flag description.
 
 *librsvg-2.40.1 (15 Feb 2014)
 
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index e3bed850afd2..6eaa50c87b55 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -6,18 +6,24 @@ AUX librsvg-2.36.4-resource-uri-1.patch 3668 SHA256 1feffc8fc503971b87157d8d05fb
 AUX librsvg-2.36.4-resource-uri-2.patch 2423 SHA256 00ab1759bdaef45083c30f4b1744555487819774edda4a7aec1165e6a010765a SHA512 8f81b68f92a0dd071021c231c75dc2b8397edc27c77868bce9742ad7dec2ee9f9048656b816932466a271ce499551376573fabefd6e76c42bf44c2f8ededab51 WHIRLPOOL 802477a1c112a6f7fc22dfb658369754c2799bb2730aafa8aa1af960b4f79942c9d1b3059fc7fa4bb50c582f5dd1f292c889bd8ba0575ea44c26d45ee96d6000
 AUX librsvg-2.36.4-resource-uri-3.patch 4543 SHA256 512ff5ace57cc2b40e42128cbe8c9653562c0501593c09b84ec105d56da5ca4d SHA512 60307bbdbcf8e597027b2f7cf7606afafc52855ed09d7fcff42de09cd8522d3bbe468d85a85cd915f81fdb82895565931706a7f8572fe65f31111883e7e68a60 WHIRLPOOL 4ecf3dac3b808eee0cacba6618f3fe75ba2ead09c51b961da68f4d1a4ebc915557220285466b0f31b4ad052a769215b8b1359496a79d6861ed06bed931dd9a30
 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
 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 2377 SHA256 c186e837ea7b148dd6efdf57d44a124e296900e2b7d0f368a08f15a31f670dd0 SHA512 9d2ccc891418f239a9ca97d9747ed30eea7bab4ed8c509061c7de1378edef11638da15a9120f0c4506dcef4250b4876dd4eb61647974311775ae769012a43d7b WHIRLPOOL 2f0c9ec1cc54e0e9ae6ed5b99639cac6914e087e5ae185a0022147c35b2d00a2591d07e2a70ea1a73b6006e1e925402d4e5da385e97aa052afb687963ca5afc0
 EBUILD librsvg-2.40.1.ebuild 2028 SHA256 99b57764d9f1ac54859c9ce5fc00082bf662848457b21bfa67b793867ac40646 SHA512 40dc8d21894c6c96f1ce541a9fbb185f3aea5b78d22d998aaf9c78300db5e2eb49a63bd04643ec7bc4d2e8946e50a224dacab33521d08b937fb421e861cb316c WHIRLPOOL 45a7f37e7702706b8be0540a0ec29b19f948bbfbbeefb2adee2c80e9ef7155efb9438fb3556138dd6e08480db14861de47c58d95b6f3c4ef98ff96861e389618
-MISC ChangeLog 42590 SHA256 2b73f0f2a508fc297390de1b4f519959f0af8c447c274f9d45fc530d7559c1b0 SHA512 a76d33afb66282cd5c6a752a41aae80ca0ada0e9673cc0aa6ade640ad674ddd40d22a07248e9a777e3af18eb15620a58b58810e7ebcf619556b1f46bf1e26547 WHIRLPOOL a248d6a7b5c23bbc81738c74152caaf9a408fc95b28d821a2e4150a20362a0bf2d264fd54ce2f3d718d649521c3b809b0867b51df19badc7acb7205042adb26e
-MISC metadata.xml 395 SHA256 7f63e0973cef8b5da30264661e4bf924bdd228b26d0301760a70474d6a9a6945 SHA512 9dba6907b92f041a26e18cad46d3080120e19231c09eca5f76d80321a59806b049e56b9fce0ea729603d590609aa92b68de98a47937780ef8e67213cf89f119e WHIRLPOOL a735011b1461245244b67939ab7415401847c4d034ac14b2784538e5143eeacd4649f3a735901e7761bd200531ccf87dcf2578a014473ec79c9b1ac258666669
+MISC ChangeLog 42899 SHA256 59078d1db76400a3d178c5b4931b8170ea823c3ef9f9568b681fcbbb2813d38c SHA512 1a176d936d15fb2ad514afde2756d6667040b7c76af7ff4416100a50c7dcc8b91002c813274357f31144aabcdc8b8767399188d7548747f9658fd9ea9aa3b64b WHIRLPOOL 02b26023bb53c04456fb5ce0d0b985a95ccdade8d417edd0b7be69a59041cfb4851be8497e8deb6ee0c4ff7437c6bd0bbab4bd407e7d6399425b3de7cbad6599
+MISC metadata.xml 391 SHA256 4204d8b4ba91f579bf4c6db6564541b44257cbd736ca860ddd2ba650ae1b1fba SHA512 7f80de10e7a4e4368d8566e61f14cd0423cee5d8b3bc2e2c04d1a55f3ea86007cf0a9f6cf05dfd3b98a5b58795d36d32b326564791f9a68fa7476bdad0f275ac WHIRLPOOL 707dd74d92cb0ab17509a56f315cc99daf765732c63613388fbb87e2e8812b56d429bddad17be7ed07f653837eaf5fb55888b3958ea0c2790d2697f0451e0692
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL/SSAACgkQCaWpQKGI+9RMUQCfctf/qI74ED2V4No8VwyrWJjq
-QEYAniuEiQ47ZpHtgyFgd+zKH2+FZICd
-=CVWd
+iQEcBAEBCAAGBQJTAE/QAAoJEJ0WA1zPCt1hzQYH/A0OI8mUzqYFmYH7+kqBkoX+
+dMcwOOmygd34OhTcWA8fsUvN/a9KBOyIaKgoEyFeBiaJQRZUEIi49EZE9K3sXx26
+Y9V/iaEFJxR9Z/6VX/K8aWB7p5owTgmjgvoclaCmCHVPNNpvgVoFmBQHCkbfS3Si
+3ocrhp8fDEfPCi/F83P4Th5r3NF2HPfoXbU3enDuAVuNYsWxa8pyHW28foD/tsqk
+IXaRca4Jl+flO/LgmCxyXSSV5afs+tng/7IsDTYVgjUBoVEhjeRmc/iYzL75kJkq
+1b4Mt43HrXsrgrAjnbwZkgq+5IgM4fNJq8AX8QiLBu5Mh98d2RAvBt1E5gLtz1M=
+=nvrw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
new file mode 100644
index 000000000000..86b8feca50f5
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.40.1-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.in
++++ b/configure.in
+@@ -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.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.1-r1.ebuild
new file mode 100644
index 000000000000..dfc4b082a356
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.1-r1.ebuild
@@ -0,0 +1,90 @@
+# 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-r1.ebuild,v 1.1 2014/02/16 05:43:31 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools gnome2 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.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.20:2[introspection?]
+	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
+	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"
+	# old "missing" file causes eautoreconf warnings
+	rm missing
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		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}
+}
+
+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/metadata.xml b/gnome-base/librsvg/metadata.xml
index 1bfb1b1f8fa4..3e6ac448a4d8 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -5,7 +5,7 @@
 <use>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 	introspection</flag>
-	<flag name="tools">Build miscellaneous tools</flag>
+	<flag name="tools">Build svg viewer tool</flag>
 	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>