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

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 9 insertions, 78 deletions

diff --git a/x11-plugins/wmsound/ChangeLog b/x11-plugins/wmsound/ChangeLog
index ebd16e78db03..98871c1cd9bc 100644
--- a/x11-plugins/wmsound/ChangeLog
+++ b/x11-plugins/wmsound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmsound
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.9 2010/08/31 08:51:59 s4t4n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.10 2012/03/18 13:27:38 ssuominen Exp $
+
+  18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> wmsound-0.9.5.ebuild,
+  -files/wmsound-esd.patch:
+  Remove USE="esd" because media-sound/esound isn't in tree anymore.
 
   31 Aug 2010; Michele Noberasco <s4t4n@gentoo.org> wmsound-0.9.5.ebuild:
   Make package honour LDFLAGS. Closes bug #335029.
diff --git a/x11-plugins/wmsound/files/wmsound-esd.patch b/x11-plugins/wmsound/files/wmsound-esd.patch
deleted file mode 100644
index 247e41dfc614..000000000000
--- a/x11-plugins/wmsound/files/wmsound-esd.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/src/Imakefile~	2004-02-08 18:54:15.000000000 +0100
-+++ b/src/Imakefile	2004-02-08 18:54:48.000000000 +0100
-@@ -12,7 +12,7 @@
- #endif
- 
- XCOMM uncomment out the next line if you want to use esd comment out the line below next line
--XCOMM ESDLIB = -lesd -laudiofile
-+ESDLIB = -lesd -laudiofile
- 
- WMSOUNDLIB = -L../lib -lwmsnd -L/usr/local/lib $(ESDLIB)
- 
---- a/lib/Imakefile~	1999-05-02 12:27:29.000000000 +0200
-+++ b/lib/Imakefile	2004-02-08 19:16:56.000000000 +0100
-@@ -4,7 +4,7 @@
- HEADER_INST = /include
- 
- XCOMM Xfree86
--STD_INCLUDES = -I/usr/X11R6/include -I/usr/local/include
-+STD_INCLUDES = -I/usr/X11R6/include -I/usr/include
- 
- XCOMM Solaris
- XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include
-@@ -20,7 +20,7 @@
- EXTRA_DEFINES = -DOSS_SOUND
- 
- XCOMM uncomment out the next line if you want to use esd
--XCOMM EXTRA_DEFINES = -DESD
-+EXTRA_DEFINES = -DESD
- 
- XCOMM uncomment out the next line if you want Solaris Support
- XCOMM EXTRA_DEFINES = -DSVR4
---- a/Imakefile~	1999-05-01 16:52:46.000000000 +0200
-+++ b/Imakefile	2004-02-08 19:18:47.000000000 +0100
-@@ -1,7 +1,7 @@
- #define IHaveSubdirs
- #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
- 
--PREFIX = /usr/local
-+PREFIX = /usr/
- 
- DESTDIR = $(PREFIX)
- 
---- a/utils/Imakefile~	1999-05-01 11:46:31.000000000 +0200
-+++ b/utils/Imakefile	2004-02-08 19:22:03.000000000 +0100
-@@ -11,10 +11,10 @@
- #endif
- 
- XCOMM uncomment out the next line if you want to use esd comment out the line below next line
--XCOMM ESDLIB = -lesd -laudiofile
-+ESDLIB = -lesd -laudiofile
- 
--WMSOUNDLIB = -L../lib -lwmsnd -L/usr/local/lib $(ESDLIB)
--STD_INCLUDES = -I/usr/local/include -I/usr/X11R6/include
-+WMSOUNDLIB = -L../lib -lwmsnd -L/usr/lib $(ESDLIB)
-+STD_INCLUDES = -I/usr/include -I/usr/X11R6/include
- DEPLIBS = $(DEPXLIB) 
- 
- LOCAL_LIBRARIES += -lPropList $(XLIB) $(WMSOUNDLIB) $(EFENCELIB)
---- a/lib/Imakefile~	2004-02-08 19:25:30.000000000 +0100
-+++ b/lib/Imakefile	2004-02-08 19:26:20.000000000 +0100
-@@ -9,7 +9,7 @@
- XCOMM Solaris
- XCOMM STD_INCLUDES = -I/usr/openwin/include -I/usr/local/include
- 
--EXTRA_LIBRARIES = 
-+EXTRA_LIBRARIES = -Lesd
- 
- #ifdef USE_HPUX_SOUND_SERVER
-  EXTRA_INCLUDES += -I/opt/audio/include
---- a/utils/Imakefile~	2004-02-08 19:31:16.000000000 +0100
-+++ b/utils/Imakefile	2004-02-08 19:31:44.000000000 +0100
diff --git a/x11-plugins/wmsound/wmsound-0.9.5.ebuild b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
index 5101eed0dc5b..4778b19a8237 100644
--- a/x11-plugins/wmsound/wmsound-0.9.5.ebuild
+++ b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
@@ -1,10 +1,10 @@
-# 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/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.8 2010/08/31 08:51:59 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.9 2012/03/18 13:27:38 ssuominen Exp $
 
 inherit eutils
 
-IUSE="esd"
+IUSE=""
 
 DESCRIPTION="WindowMaker sound server"
 SRC_URI="http://largo.windowmaker.org/files/${P}.tar.gz"
@@ -12,7 +12,6 @@ HOMEPAGE="http://largo.windowmaker.org/"
 
 RDEPEND=">=x11-wm/windowmaker-0.80.2-r1
 	>=x11-libs/libPropList-0.10.1-r3
-	esd? ( >=media-sound/esound-0.2.34 )
 	>=media-sound/wmsound-data-1.0.0"
 
 DEPEND="${RDEPEND}
@@ -29,7 +28,6 @@ src_unpack()
 	cd "${S}"
 	epatch "${FILESDIR}/wmsound-config.patch"
 	epatch "${FILESDIR}/wmsound-ComplexProgramTargetNoMan.patch"
-	use esd && epatch "${FILESDIR}/wmsound-esd.patch"
 
 	#Fix compilation with --as-needed.
 	sed -i 's:-lPropList $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList:' src/Imakefile