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

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

4 files changed, 18 insertions, 13 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/Manifest b/www-plugins/gnash/Manifest
index e30924ce19e9..4a36a7cc3409 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -20,6 +20,6 @@ DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02
 EBUILD gnash-0.8.5.ebuild 6847 RMD160 a5c919db8f2000ccdd69c506a3e1e4c38575d899 SHA1 cca2bff47f3e59042b7b09b0d1c6963d54964a77 SHA256 5bc8619c682951efa4b796aabf1c365b0180bfd8599c9551468dbee2dc37b5ab
 EBUILD gnash-0.8.6.ebuild 7734 RMD160 aedd6a1a87187a6136d8cf2e22ea1c43a2210880 SHA1 a2c0420b2e04ce74abfdee2d825269464d67e9a6 SHA256 bb1c4c7d2bb2d63559cdeded66d78131d0749dbb429ae0fc7abec472ea090d01
 EBUILD gnash-0.8.7.ebuild 8000 RMD160 0dc1df45702543893bd7ce339f956372c3b24027 SHA1 7dfeaceaecfd0936a9b4d4bb592d635b07330b13 SHA256 7204ce7639200d232326215f530297c341fff5d86a0c15424ae247ce84c01b66
-EBUILD gnash-0.8.8.ebuild 8400 RMD160 9ab4417ece8b36fb9016872aaead6c3a2d4bdfd7 SHA1 a5c786157d54cb5099c36896383ead4a48aba4db SHA256 f8de5b5d680045cc7e7357e40e0b75badfdc18b7bf7a4f59ebdc88c8acc27467
-MISC ChangeLog 20945 RMD160 49f5307020f5c7f5518c465391a5fb6e2ac1efad SHA1 5aab2258747ec5559edd10a0358bad5ad3641737 SHA256 7a8371cca15d4e1a54459929918a8555aa895df9e05a57868907a9d7aaa23dea
-MISC metadata.xml 863 RMD160 62955e23fbe0b0b3e9562a143bf051fca59fbaff SHA1 85247ecf93bec762839d42f49ca663aad7d8e331 SHA256 078095b61d5b5eb1fbe87b698e8ca29fe4f64ee54a1ce4d8ae575f2e90420a13
+EBUILD gnash-0.8.8.ebuild 8384 RMD160 411009a4ecc49dd7f8e92a202fe04a828eb6a4b6 SHA1 9f0e5f88336e59978dbff967091ec0fb5df18793 SHA256 a7eb3a47994b67614dffacf4a5689e0864d5bb55df13f5538de93e875656a2d9
+MISC ChangeLog 21138 RMD160 2f05b4642c54934b63dd0775ee790ebbab1debb8 SHA1 374073175b29f773506ad708a55ab7f2a9a2461f SHA256 255455f09049cfc58d4af8246610f2589a09adec104ba38ed98aca1530c0a63f
+MISC metadata.xml 907 RMD160 ff350bb7405df94509463f0e8448a7a766aef8f0 SHA1 d4d6cd31be21a2d25b39bb03e5ab3f10676809ff SHA256 e771bc85dac450875f1978807de8e1106d0fce2097eaaab249a4718c729c386b
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>