Remove USE="esd" because media-soudn/esound isn't in tree anymore.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 30 insertions, 18 deletions

diff --git a/www-plugins/libflashsupport/ChangeLog b/www-plugins/libflashsupport/ChangeLog
index 3d6d4dca7b25..b947d0ce658c 100644
--- a/www-plugins/libflashsupport/ChangeLog
+++ b/www-plugins/libflashsupport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/libflashsupport
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.5 2010/05/03 15:02:39 lack Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/ChangeLog,v 1.6 2012/03/18 13:36:54 ssuominen Exp $
+
+  18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  libflashsupport-1.2.ebuild:
+  Remove USE="esd" because media-soudn/esound isn't in tree anymore.
 
   03 May 2010; Jim Ramsay <lack@gentoo.org> libflashsupport-1.2.ebuild:
   Removing flash-player block (Bug #300294) and using ewarn instead.
diff --git a/www-plugins/libflashsupport/Manifest b/www-plugins/libflashsupport/Manifest
index 2ca230cb9492..581d68b32450 100644
--- a/www-plugins/libflashsupport/Manifest
+++ b/www-plugins/libflashsupport/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libflashsupport-1.2-asneeded.patch 580 RMD160 d01293e8235a1e9f22fa9417079430add85c2c27 SHA1 88ada2de98fe1d566092b97da990c8fa7a675735 SHA256 d639ec064feb8065ee95dbae0e0f4faff02d140c99b990e622063cb2ed0d7a63
 AUX libflashsupport-1.2-gentoo.patch 652 RMD160 8c700ac88c9efc30a83acedd54484ec0abe115ab SHA1 1ce554fcef350d8993e969c4754ec486931b1497 SHA256 583caede29bcee5c3e2b99b17f612c051b4ff4e8268135b514adc0c5a802e64d
 DIST libflashsupport-1.2.tar.bz2 13381 RMD160 0b4936a4bf80078247ccc8f0bcca4827774768c6 SHA1 1bfd7f48ac4031c9936bf3799cf2ea615a678bca SHA256 343dd2726944adb84fe175b0f638ab078fa29fcfccb5700eb1ca34f42eaf9154
-EBUILD libflashsupport-1.2.ebuild 2746 RMD160 7171b9261b6e894517cf82c072b07119830e9505 SHA1 2d27b926cc079e4197b6d1cdcc4ae3e970f2a1f4 SHA256 34f71b0f6c06bc14fab0a931580e099aa6bcc615ea1515affc14ea7725a023a9
-MISC ChangeLog 1520 RMD160 210382e637aacccda78072b832ac2a273c45b1c6 SHA1 eccd96d5a1c17b49b6d959e057dcb0551615ff98 SHA256 1810730c186e65c2e52c83b3682eca041d75924e3e4fa5341526f54550d04035
+EBUILD libflashsupport-1.2.ebuild 2660 RMD160 8a4502ada737c7d57274973b5606c561dd831485 SHA1 f0b7f744aca7e700b52f13db7c85f3f6a1e599ae SHA256 8095957ef3a83bbc7855beca0f4724e2d42ea094dff1617fc8a136195905964d
+MISC ChangeLog 1679 RMD160 019d19409e1b9a9f1a5f4b0569ea033c01da9bad SHA1 7737f6d7e250a991d7468250f694c71c0dacbcf0 SHA256 14f2893f9f95ef95edcf8317b7cf6781926b0cfa7f300ac85ff8b8e7e7910a92
 MISC metadata.xml 254 RMD160 1f5a6322e4956b30592a1e0caf7edc67613ecc43 SHA1 f0813ac26740fae9e0f0899b5dad74b5a6fd5b3c SHA256 740784d71bef88214e4d8508e351a376d8908f4c4b6175d98b6b77e107799f12
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPZeTmAAoJEEdUh39IaPFNNrwIAJYBkPbPWRCIH0H1S0kZQWEl
+pHGhhIW+dn5La+dAtdyV0EKyvvavxQPYhTnbrQoq2GK8lCdasjIr/QgwriXRh5bI
+IdVq8j5A1lO+VfAIBpVI5/yGvsBnz6BZdnHiOR0XuPzThZpd48RlZtXf0Qh1XqAj
+0mjg+FhHJDKF8CtdeIqH/eHzrQI7r6TYs8FMTKGeq/mQunursU2tyehepyLhGIdh
+YB67+Hz5rp3Fjip861kZwKgeoCovL1qxHdjrkbCuD1Ggstn4aYXULu9IA2zAwXyk
+PYUJRy8YGIME/9CERQ4+5nBm5qvzgya63YXPUaDC+XYFZUhTzGNi93g7BEI9jPw=
+=Qw7C
+-----END PGP SIGNATURE-----
diff --git a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
index 9f75182a62e6..55cbcd1b49dc 100644
--- a/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
+++ b/www-plugins/libflashsupport/libflashsupport-1.2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.5 2010/05/03 15:02:39 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/libflashsupport/libflashsupport-1.2.ebuild,v 1.6 2012/03/18 13:36:54 ssuominen Exp $
 
 EAPI="3"
 inherit eutils multilib toolchain-funcs
 
-DESCRIPTION="Adds pulseaudio/esd/oss audio output and HTTPS/RTMPS support to
-Adobe Flash 9"
+DESCRIPTION="Adds pulseaudio/oss audio output and HTTPS/RTMPS support to Adobe Flash 9"
 HOMEPAGE="http://pulseaudio.org/wiki/FlashPlayer9Solution"
 SRC_URI="https://svn.revolutionlinux.com/MILLE/XTERM/trunk/libflashsupport/Tarballs/${P}.tar.bz2"
 
@@ -16,14 +15,13 @@ KEYWORDS="~amd64 ~x86"
 
 # Note: gnutls overrides 'ssl' if both are set.  If only 'ssl' is set, openssl
 # is used.
-IUSE="pulseaudio esd oss ssl gnutls"
+IUSE="pulseaudio oss ssl gnutls"
 
 DEPEND="gnutls? ( net-libs/gnutls )
 	!gnutls? ( ssl? ( dev-libs/openssl ) )
 	pulseaudio? ( media-sound/pulseaudio )"
 
-RDEPEND="${DEPEND}
-	esd? ( media-sound/esound )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i -e 's:/var/lib/run/pulse/native:/var/run/pulse/native:' \
@@ -43,13 +41,9 @@ src_compile() {
 		export PULSE=""
 	fi
 
-	if use esd; then
-		export LIBESDPATH="-DLIBESDPATH='\"libesd.so.0\"'"
-		export ESD="-DESD"
-	else
-		export LIBESDPATH=""
-		export ESD=""
-	fi
+	# There is no media-sound/esound in tree anymore
+	export LIBESDPATH=""
+	export ESD=""
 
 	if use oss; then
 		export OSS="-DOSS"