depend on libsdl when gtk and kde frontends are disabled, bug #325445

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

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 43764e4e1ec56a1e7e06412ef7721fa856ad03db..237d2bb3ea604b2cff292dbcf9da08fda62bd2d6 100644 (file)
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.27 2010/06/21 13:12:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.28 2010/06/27 12:52:11 chithanh Exp $
+
+  27 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.7.ebuild:
+  depend on libsdl when gtk and kde frontends are disabled, bug #325445
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> gnash-0.8.7.ebuild:
   Fix building with FFmpeg >= 0.6 wrt #324357 by Diego E. Pettenò.

diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 7ed1f3eee4ca642c78a6d134cab2c911cef200d6..a3e648eb8b623c591887b87f6503cc967d760dab 100644 (file)
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -14,6 +14,6 @@ DIST gnash-0.8.6.tar.bz2 3571055 RMD160 987342b6cc46e94d5684d917bebbe6f6da6033bf
 DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
 EBUILD gnash-0.8.5.ebuild 6820 RMD160 2855295a73bfe2c067be9fe848d62babb53e70bd SHA1 8b121486471012c2ad87f239a595b6eb4bd34f1d SHA256 8724bc45eb19527ce8d1cf30d5a938ff732e1cea430a137c6ca6e5fe1b4393a1
 EBUILD gnash-0.8.6.ebuild 7707 RMD160 4dcfc972f1b33bd175b6a5f8992985f2fece3341 SHA1 2250706f45fdaa67314f87d85ba78cdfd8a48659 SHA256 780a3542eb3fdfafc1f97741c6ff6a6abc9ed89b81261306f57242ff633aca2b
-EBUILD gnash-0.8.7.ebuild 8022 RMD160 080629713def4a2142cfd1ba6b2d627c24e255d9 SHA1 dfad4e188c399324b76fcc34ddc57e258c8ede2d SHA256 7f2f39ab532dd90b91d0f2e60ae841d4a7ed1688d0658e5458c9e64beeb7bb45
-MISC ChangeLog 17316 RMD160 1a84c07a91c3dcdec554312c51d6becb9ab55b6a SHA1 ad2326d93fbac48578952f054e84d6c86fa307df SHA256 17b7484e330f9b2d70f03923f569309b17bac282a4fcb61f02264c95bba2786f
+EBUILD gnash-0.8.7.ebuild 8022 RMD160 67267b7cdd02116b119c9354ef7a6fba34b43c3d SHA1 85d4dc67cd0359bb65fc2f7f150ec7e4a8c7dc85 SHA256 c2d4f0a561e66512fc70b0ed2f5d0ca5f7eccacc68532457b616618007a3d43e
+MISC ChangeLog 17479 RMD160 d8045d8937678cf32237a64abac218660abc613e SHA1 8e1782dbd565e478d6d8a356d5a1a804abbba733 SHA256 0bb7d0f3fe3ad8cc835b9c150a2c32dbc126241315872113ca4ab756c5242bb2
 MISC metadata.xml 629 RMD160 c09d2f9e4f61ffff0d0a86807f5ae79fc3986474 SHA1 3a7a29e2e3c9d91a0cd1fd61a35eb6e069f3a0e7 SHA256 145ff961a7e0d2e841559d29dd8ab3fc8e448acce4eacb4e8b960209d2a1f41f

diff --git a/www-plugins/gnash/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild
index a4868e5fc5c6a75551c9517bee4d5ff32fed9327..d54e7858999d1ae4424a1041a4025bb0fcaee44b 100644 (file)
--- a/www-plugins/gnash/gnash-0.8.7.ebuild
+++ b/www-plugins/gnash/gnash-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.6 2010/06/21 13:12:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.7 2010/06/27 12:52:11 chithanh Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="never"
@@ -58,6 +58,7 @@ RDEPEND=">=dev-libs/boost-1.35.0
        gtk? ( x11-libs/gtkglext )
        )
        sdl? ( media-libs/libsdl[X] )
+       !kde? ( !gtk? ( media-libs/libsdl[X] ) )
        nsplugin? ( net-libs/xulrunner:1.9 )
        media-libs/speex[ogg]
        sys-libs/zlib
@@ -84,8 +85,8 @@ pkg_setup() {
 
        if ! ( use kde || use gtk || use sdl ); then
                ewarn "You are trying to build Gnash without choosing a gui frontend [gtk,kde,sdl]."
-               has_version media-libs/libsdl[X] && ewarn "sdl enabled as default" \
-                       || die "Please enable at least one of these USE flags."
+               ewarn "sdl enabled as default"
+#              die "Please enable at least one of these USE flags."
        fi
 
        if use python && use !gtk; then