Rename openssl USE flag back to ssl per ML discussion. Update maintainer metadata.

(Portage version: 2.2_rc85/cvs/Linux x86_64)

3 files changed, 15 insertions, 10 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index c2f4cb6d21c4..08bda1db77cd 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.47 2010/09/29 00:29:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.48 2010/09/29 09:22:19 chithanh Exp $
+
+  29 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.8.ebuild, metadata.xml:
+  Rename openssl USE flag back to ssl per ML discussion. Update maintainer
+  metadata.
 
   29 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.8.ebuild, +files/gnash-0.8.8-external-dejagnu.patch:
diff --git a/www-plugins/gnash/gnash-0.8.8.ebuild b/www-plugins/gnash/gnash-0.8.8.ebuild
index bebafa2e7ef3..9b9f4cadefed 100644
--- a/www-plugins/gnash/gnash-0.8.8.ebuild
+++ b/www-plugins/gnash/gnash-0.8.8.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.8.ebuild,v 1.8 2010/09/29 00:29:45 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.8.ebuild,v 1.9 2010/09/29 09:22:19 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -23,7 +23,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openssl python +sdl sdl-sound ssh test vaapi video_cards_intel xv"
+IUSE="+agg cairo cygnal dbus doc fbcon +ffmpeg gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl python +sdl sdl-sound ssh ssl test vaapi video_cards_intel xv"
 
 RDEPEND=">=dev-libs/boost-1.41.0
 	!!dev-libs/boost:0
@@ -73,7 +73,7 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	lirc? ( app-misc/lirc )
 	dbus? ( sys-apps/dbus )
 	ssh?  ( >=net-libs/libssh-0.4[server] )
-	openssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl )
 	vaapi? ( x11-libs/libva[opengl?] )
 	xv? ( x11-libs/libXv )
 	"
@@ -224,7 +224,7 @@ src_configure() {
 		$(use_enable nsplugin npapi) \
 		$(use_enable python) \
 		$(use_enable ssh) \
-		$(use_enable openssl ssl) \
+		$(use_enable ssl) \
 		$(use_enable test testsuite) \
 		$(use_enable video_cards_intel i810-lod-bias) \
 		--enable-gui=${gui} \
diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 82cbfd175a3a..19bc628e1cc4 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -3,19 +3,19 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 	<maintainer>
-	  <email>mrpouet@gentoo.org</email>
-	  <name>Romain Perier</name>
-	</maintainer>
-	<maintainer>
 	  <email>chithanh@gentoo.org</email>
 	  <name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+	<maintainer>
+	  <email>mrpouet@gentoo.org</email>
+	  <name>Romain Perier</name>
+	</maintainer>
 	<use>
 	  <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
 	  <flag name='cygnal'>Enable building of the cygnal server</flag>
-	  <flag name='openssl'>Enable directly using OpenSSL</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>
+	  <flag name='ssl'>Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
 	  <flag name='vaapi'>Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
 	</use>
 </pkgmetadata>