Drop neon USE-flag, drop gst-plugins-gnomevfs from RDEPENDS (both are unnecessary thanks to leio), Fix typo in metadata.xml

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 15 insertions, 14 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 9f62a8ee4c32..f8a56f19ddad 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.4 2009/09/05 17:51:10 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.5 2009/09/06 14:55:35 mrpouet Exp $
+
+  06 Sep 2009; Romain Perier (mrpouet) <mrpouet@gentoo.org>
+  gnash-0.8.5.ebuild, metadata.xml:
+  Drop neon USE-flag, drop gst-plugins-gnomevfs from RDEPENDS (both are
+  unnecessary thanks to leio), Fix typo in metadata.xml.
 
 *gnash-0.8.5 (05 Sep 2009)
 
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index c4085547e43b..699ec257bba9 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -3,6 +3,6 @@ AUX gnash-0.8.5-xpidl-sdkdir.patch 1014 RMD160 21b49bccc13af7159d3b81a72b3c82f0d
 DIST gnash-0.8.4.tar.bz2 2887666 RMD160 0557eee847f6dd625714d6659058ff7e6c4cec56 SHA1 342d7776d06d11b964546b2b4ebec1864ee717d8 SHA256 6ffe4bdbc22de712e59205a27b46aa93a5372c67829c7f02d6b1c1778e9f9224
 DIST gnash-0.8.5.tar.bz2 3335797 RMD160 8ef599237c3162f9f28459855e4729d400bd4304 SHA1 26304322728d10dda1a0da2951946d981a507ca6 SHA256 16f272214eed2ab50bcd9507d6299b82ed7d20e7e8eb253ab160e594eeb210b3
 EBUILD gnash-0.8.4.ebuild 6134 RMD160 a81e3d22fcbc393e48d6dd3d87c488b7ce8d2e77 SHA1 558c58a7a05a29a4bbdd2aaa883f85ce8f1097b9 SHA256 8ed92a7606fc2bdb651e192c59e1d7f77b86d214d5e68c97ab3a779fb79096df
-EBUILD gnash-0.8.5.ebuild 6334 RMD160 af3e4080dd6dee58d9c58bae0743b356cac6aaf1 SHA1 9de92c32814f175cd97bfaf05fb5c149dcfb3e32 SHA256 1c32b004cfa99c08ec4871a2c7b4ad03ff9aec8cb7496e2698e29ade5565d768
-MISC ChangeLog 12901 RMD160 1b776dc29d44ac7b7247d2e875bba79863908245 SHA1 53c9a5a4cb2a6f5057f3e49c36374f543c954c79 SHA256 54677380543003f49da11464b3b7352472816fd683bd65408d19b0532cdeb708
-MISC metadata.xml 542 RMD160 82df00124739de0dcd820d704388c781648a4bbd SHA1 44c64b7dbc0693645cfe250b21af0d59e5ef80d9 SHA256 d5010283f87fe85d54861c1e5cfc0eb48c7325f1ce0743abd1490ae6bc8784e3
+EBUILD gnash-0.8.5.ebuild 6126 RMD160 eb701fc3deb44546e702f8a1618d759420e6b64b SHA1 2178ba4d9248c17d23c6bb47814eb5e61c8ecbda SHA256 fbc3a4d61b18bed6493103c06ce61bd5cadce55e53ee2a15be72b1006e398b8e
+MISC ChangeLog 13127 RMD160 152c35b16e51dd84b6fa07ebc0e0ce31a9d32d1a SHA1 df53e4b170fec9b32d2d705fdaeb7e2ddd892459 SHA256 782d7d63d2104f8f99205d17008743d6acd1596381c06f98698b4e4163f2aeb6
+MISC metadata.xml 433 RMD160 b9b12038d73201f5cec72a81881d3be95b7c40a2 SHA1 8f6ed8f430d3077c2ece0e360e8134fff37ae44c SHA256 f2d11f160b69884291221f4c12016396b16f5e80602407e6048c34a6305983e2
diff --git a/www-plugins/gnash/gnash-0.8.5.ebuild b/www-plugins/gnash/gnash-0.8.5.ebuild
index ca9bf3c16e0a..02da49d6c750 100644
--- a/www-plugins/gnash/gnash-0.8.5.ebuild
+++ b/www-plugins/gnash/gnash-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.1 2009/09/05 17:51:10 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.2 2009/09/06 14:55:35 mrpouet Exp $
 
 EAPI="2"
 KDE_REQUIRED="optional"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="agg cairo cygnal doc +ffmpeg gnome gstreamer gtk kde neon +nls nsplugin +opengl +sdl +speex video_cards_intel +zlib"
+IUSE="agg cairo cygnal doc +ffmpeg gnome gstreamer gtk kde +nls nsplugin +opengl +sdl +speex video_cards_intel +zlib"
 
 RDEPEND=">=dev-libs/boost-1.35.0
 	dev-libs/expat
@@ -43,8 +43,6 @@ RDEPEND=">=dev-libs/boost-1.35.0
 	media-plugins/gst-plugins-ffmpeg
 	media-plugins/gst-plugins-mad
 	media-plugins/gst-plugins-meta
-	gnome? ( media-plugins/gst-plugins-gnomevfs )
-	neon? ( >=media-plugins/gst-plugins-neon-0.10.7 )
 	)
 	gtk? (
 	x11-libs/gtk+:2
@@ -61,7 +59,8 @@ RDEPEND=">=dev-libs/boost-1.35.0
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	gnome? ( app-text/rarian )"
 
 # For the inherit of kde4-base
 CMAKE_IN_TREE_BUILD=1
@@ -187,14 +186,12 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 }
 pkg_postinst() {
-	if use !ffmpeg && use !gstreamer || use gstreamer && ( use !gnome && use !neon ); then
+	if use !ffmpeg && use !gstreamer || use gstreamer && ( ! use gnome ); then
 		ewarn ""
 		ewarn "Gnash was built without a media handler and or http handler !"
 		ewarn ""
 		ewarn "If you want Gnash to support video then you will need to"
 		ewarn "rebuild Gnash with either the ffmpeg or gstreamer use flags set."
-		ewarn "If you use gstreamer you will also need to set one of"
-		ewarn "the two http handler use flags: gnome or neon."
 		ewarn ""
 	fi
 	ewarn "${PN} is still in heavy development"
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 1c52be974b60..739fc7321f18 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -8,7 +8,6 @@
 	</maintainer>
 	<use>
 	  <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
-	  <flag name='neon'>Add support for <pkg>media-plugins/gst-plugins-neon</pkg> if gstreamer is enabled</flag>
-	  <flag name='cygnal'>nable building of the cygnal server</flag>
+	  <flag name='cygnal'>Enable building of the cygnal server</flag>
 	</use>
 </pkgmetadata>