| 1 |
mrpouet 09/09/10 19:22:21 |
| 2 |
|
| 3 |
Modified: ChangeLog gnash-0.8.5.ebuild |
| 4 |
Log: |
| 5 |
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). |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 www-plugins/gnash/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/ChangeLog?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- ChangeLog 10 Sep 2009 17:12:23 -0000 1.10 |
| 22 |
+++ ChangeLog 10 Sep 2009 19:22:21 -0000 1.11 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for www-plugins/gnash |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.10 2009/09/10 17:12:23 mrpouet Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.11 2009/09/10 19:22:21 mrpouet Exp $ |
| 28 |
+ |
| 29 |
+ 10 Sep 2009; Romain Perier <mrpouet@g.o> |
| 30 |
+ gnash-0.8.5.ebuild: |
| 31 |
+ Fix bug #284342, sdl was added into $gui local var from src_configure() |
| 32 |
+ even with USE=-sdl gtk -kde, which also introduiced a syntax error caused |
| 33 |
+ by the sed expression (which drops the first matched comma). |
| 34 |
|
| 35 |
10 Sep 2009; Romain Perier <mrpouet@g.o> |
| 36 |
gnash-0.8.5.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.7 www-plugins/gnash/gnash-0.8.5.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.7&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?rev=1.7&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild?r1=1.6&r2=1.7 |
| 45 |
|
| 46 |
Index: gnash-0.8.5.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v |
| 49 |
retrieving revision 1.6 |
| 50 |
retrieving revision 1.7 |
| 51 |
diff -u -r1.6 -r1.7 |
| 52 |
--- gnash-0.8.5.ebuild 10 Sep 2009 17:12:23 -0000 1.6 |
| 53 |
+++ gnash-0.8.5.ebuild 10 Sep 2009 19:22:21 -0000 1.7 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2009 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.6 2009/09/10 17:12:23 mrpouet Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.7 2009/09/10 19:22:21 mrpouet Exp $ |
| 59 |
|
| 60 |
EAPI="2" |
| 61 |
KDE_REQUIRED="optional" |
| 62 |
@@ -124,7 +124,7 @@ |
| 63 |
} |
| 64 |
src_configure() { |
| 65 |
local myconf |
| 66 |
- local gui="sdl" |
| 67 |
+ local gui |
| 68 |
# Set nsplugin install directory. |
| 69 |
use nsplugin && myconf="${myconf} --with-npapi-plugindir=/opt/netscape/plugins" |
| 70 |
# Set kde and konqueror plugin directories. |
| 71 |
@@ -157,6 +157,10 @@ |
| 72 |
use gtk && gui=",gtk" |
| 73 |
use kde && gui="${gui},kde4" |
| 74 |
use sdl && gui="${gui},sdl" |
| 75 |
+ |
| 76 |
+ if [ -z "$gui" ]; then |
| 77 |
+ gui="sdl" |
| 78 |
+ fi |
| 79 |
# Strip extra comma from gui. |
| 80 |
gui=$( echo $gui|sed -e 's/,//' ) |
| 81 |
econf \ |
Archives