Make gconf support optional.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 15 insertions, 6 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index f3fc06b7dc14..980b045137b4 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.75 2012/02/24 02:17:07 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.76 2012/02/24 02:53:52 chithanh Exp $
+
+  24 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.10.ebuild, metadata.xml:
+  Make gconf support optional.
 
   24 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.10.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index d9ff1fc647f4..85b051a809b0 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -26,9 +26,9 @@ AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad
 DIST gnash-0.8.10.tar.gz 6099894 RMD160 72debb3e64853450fe74b7f1d6e9b40b9ae70964 SHA1 4f8ace5af1a327718f353d5294b589f3251f41ae SHA256 61fbeec6826c89e6f3fc520336a152b17901e6d0e9db207d7c4db27eeb5ceb2b
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
-EBUILD gnash-0.8.10.ebuild 7573 RMD160 18671fa7219ef233bdbdc305e906ceb31474ba16 SHA1 51ad69456d637d269d17bae0e045272b42cbd0d4 SHA256 c3810c30d55e66af059d029d917612c88005fc21e314220de256a72533faf455
+EBUILD gnash-0.8.10.ebuild 7633 RMD160 ce444528c2b2803db26f75ab823438f92c3947e4 SHA1 2edbfa3db428d9f946cff8703e1d6d8ffed21534 SHA256 4f62ba953bdd1d34066733ffef7d26c92d7bfd0070fe09a15585ac8296f7f33b
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
 EBUILD gnash-0.8.9-r2.ebuild 9118 RMD160 1d2c163338940197f734f7dfb8adb935ead89a2c SHA1 b4159f25a03280bc60c4562cfbef30973be1bd6c SHA256 52f4250e39beeada4c56d45f8fcd3e1de143287c91249c9c82de5a2c2cb2d720
 EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
-MISC ChangeLog 26439 RMD160 2f93df266fd3291eca2b3d405da4151d10f55d1c SHA1 af8eebe5baddb04ef26d9b4f14b53f6bc34dcca9 SHA256 5c2367acd0d65ce86d5d52544c23f1ae1b50dd7e06b1c1ef8f92e0f7c9c8a1b4
-MISC metadata.xml 963 RMD160 47638585582102889f4092c0af62a269078eb21a SHA1 5693acc070729ed652c2585c585adc1cea5e27cf SHA256 5faf0785cc036e027d5c00fbf5136563b1ae615a479c8ec3fd386b0e136dc89e
+MISC ChangeLog 26577 RMD160 1e8f9187b82de9876055dbaecff2bae71dc78690 SHA1 693a07b11ee2e8367bcd3e0bcb5c5b125a1acaec SHA256 8909c25192342d383d54096f994f11ec24435739417386e5c2687b99edd2512d
+MISC metadata.xml 1027 RMD160 aa9f8e70f4b29c20af06375e49f072cd47b099b0 SHA1 26fe0b3c8699f8de6038163488e71b82449ee3bd SHA256 071f3c3f214ac2346bbec08cf2a129be0b1edea5e1e0d7401b884ece564de5ce
diff --git a/www-plugins/gnash/gnash-0.8.10.ebuild b/www-plugins/gnash/gnash-0.8.10.ebuild
index 1efcf536cb8c..12116e0b54eb 100644
--- a/www-plugins/gnash/gnash-0.8.10.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10.ebuild,v 1.2 2012/02/24 02:17:07 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10.ebuild,v 1.3 2012/02/24 02:53:52 chithanh Exp $
 
 EAPI=4
 CMAKE_REQUIRED="never"
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X +agg cairo cygnal dbus directfb doc egl fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+IUSE="X +agg cairo cygnal dbus directfb doc egl fbcon +ffmpeg gconf gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
 REQUIRED_USE="fbcon? ( agg )
 	nsplugin? ( gtk )
 	python? ( gtk )
@@ -68,6 +68,9 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	ffmpeg? (
 		virtual/ffmpeg[vaapi?]
 	)
+	gconf? (
+		gnome-base/gconf
+	)
 	gstreamer? (
 		media-plugins/gst-plugins-ffmpeg
 		media-plugins/gst-plugins-mad
@@ -225,6 +228,7 @@ src_configure() {
 		$(use_enable ssh) \
 		$(use_enable ssl) \
 		$(use_enable test testsuite) \
+		$(use_with gconf) \
 		--enable-gui=${gui} \
 		--enable-device=${device} \
 		--enable-extensions=${myext} \
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 64a6f8b48ccc..695d39ba0003 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -9,6 +9,7 @@
 	  <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
 	  <flag name='egl'>Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
 	  <flag name='cygnal'>Enable building of the cygnal server</flag>
+	  <flag name='gconf'>Enable GConf configuration backend</flag>
 	  <flag name='openvg'>Rendering based on the OpenVG graphics acceleration API</flag>
 	  <flag name='sdl-sound'>Enable SDL audio output for the standalone player</flag>
 	  <flag name='ssh'>Enable using SSH for network authentication in libnet</flag>