diff options
| author |   Romain Perier <mrpouet@gentoo.org> | 2009-09-10 19:22:21 +0000 |
|---|---|---|
| committer | Romain Perier <mrpouet@gentoo.org> | 2009-09-10 19:22:21 +0000 |
| commit | eb00b0c23f605d0ca386f944520af4fee6d6046d (patch) | |
| tree | 5156528f00c1c6b731d75043abfeeea47c55791e | |
| parent | Remove 0.9.15-r51: the -r51 is for OpenRC, while -r2 is a stable target. If y... (diff) | |
| download | historical-eb00b0c23f605d0ca386f944520af4fee6d6046d.tar.gz historical-eb00b0c23f605d0ca386f944520af4fee6d6046d.tar.bz2 historical-eb00b0c23f605d0ca386f944520af4fee6d6046d.zip | |
Fix bug #284342, sdl was added into $gui local var from src_configure() even with USE=-sdl gtk -kde, which also introduiced a syntax error caused by the sed expression (which drops the first matched comma).
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
| -rw-r--r-- | www-plugins/gnash/ChangeLog | 8 | ||||
| -rw-r--r-- | www-plugins/gnash/Manifest | 4 | ||||
| -rw-r--r-- | www-plugins/gnash/gnash-0.8.5.ebuild | 8 |
3 files changed, 15 insertions, 5 deletions
diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog index 8b416b8e08e4..3a30c824fb40 100644 --- a/www-plugins/gnash/ChangeLog +++ b/www-plugins/gnash/ChangeLog @@ -1,6 +1,12 @@ # 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.10 2009/09/10 17:12:23 mrpouet Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.11 2009/09/10 19:22:21 mrpouet Exp $ + + 10 Sep 2009; Romain Perier <mrpouet@gentoo.org> + gnash-0.8.5.ebuild: + Fix bug #284342, sdl was added into $gui local var from src_configure() + even with USE=-sdl gtk -kde, which also introduiced a syntax error caused + by the sed expression (which drops the first matched comma). 10 Sep 2009; Romain Perier <mrpouet@gentoo.org> gnash-0.8.5.ebuild: diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest index a8264f16605a..5192b65baba9 100644 --- a/www-plugins/gnash/Manifest +++ b/www-plugins/gnash/Manifest @@ -6,6 +6,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 6777 RMD160 d2a1f4e20fb67caeca811002c378b4e0783e792f SHA1 200e199278c1d593f0185daa23ef51a6a6b53e62 SHA256 77c995c676061ae5038cf59f6765f246bc25190362cb437b61dbbe2b9aacbbc4 -MISC ChangeLog 14319 RMD160 dfaaeede445abaa5d36d3fffdee2187e46551f79 SHA1 cc9ca291c09e49d781b9d262a6788c232bc32d2d SHA256 cdef28ff2cbcdea20748d63688ac336ce6bc9ccb39848cfb452574521dd62043 +EBUILD gnash-0.8.5.ebuild 6812 RMD160 d11f8966e96103c3bb28eda9e51fbb54f3529048 SHA1 f277eb665376fedb3d0a67bf6921bce387575490 SHA256 bcc5419ac61ea3692c9923c5a25fcb7bd5e209351f5c7980db71f3e846141453 +MISC ChangeLog 14605 RMD160 963a55819b39ef372e80e1ebacad7226c82bbcbc SHA1 9591b43d6808ff486f345db0a76ea1fd75b07d75 SHA256 8be68552c36aa3383622c8b274c16e9096182a4b03f1f8d861355e0ef72993f7 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 b76e03c7bd22..ea330b3bd02d 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.6 2009/09/10 17:12:23 mrpouet Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.7 2009/09/10 19:22:21 mrpouet Exp $ EAPI="2" KDE_REQUIRED="optional" @@ -124,7 +124,7 @@ src_prepare() { } src_configure() { local myconf - local gui="sdl" + local gui # Set nsplugin install directory. use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins" # Set kde and konqueror plugin directories. @@ -157,6 +157,10 @@ src_configure() { use gtk && gui=",gtk" use kde && gui="${gui},kde4" use sdl && gui="${gui},sdl" + + if [ -z "$gui" ]; then + gui="sdl" + fi # Strip extra comma from gui. gui=$( echo $gui|sed -e 's/,//' ) econf \ |