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

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

4 files changed, 25 insertions, 81 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/Manifest b/x11-plugins/wmsound/Manifest
index 11093f587568..914e521f9d36 100644
--- a/x11-plugins/wmsound/Manifest
+++ b/x11-plugins/wmsound/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wmsound-ComplexProgramTargetNoMan.patch 304 RMD160 896ad6e7f9b664aed2bfaad0cbf8b8365f285668 SHA1 9a5cc41c4ca29e1bd8ebb9b78fca4aad6c0fed8c SHA256 c55a5b1c413140bb9e5660dcfcc3277dae2b6a3be6bdd1671bacd297ffb12a82
 AUX wmsound-config.patch 2466 RMD160 7cae6793b7f01426d326ce4510aacf0e661dff64 SHA1 90e41547114ca630a0c9ffcf85298090510f5912 SHA256 778cd878ea6146480737bea355d0f47463a1875c172c09b8bb0232645d32e02e
-AUX wmsound-esd.patch 2302 RMD160 069495ff8b44793a999225a1a29697139599f6fb SHA1 86bace6388d06d322f3ee5a76162bf1c4271741b SHA256 57928d34c75f4cfa2242ceaadd20414d1ad60c3e92f04ccd43f28d445efd173a
 DIST wmsound-0.9.5.tar.gz 23098 RMD160 70be0e11d17c8ca989c73073cf8bb2f8ff2a38f7 SHA1 435d60c99ade4539a94a15f58a6e5f122d746720 SHA256 9f479d7a00030e410f21ce9b489de5c7bf4daac64ff710924440ac1d112da1c2
-EBUILD wmsound-0.9.5.ebuild 1408 RMD160 02293e96bc90cd586caba5727e1503a911091843 SHA1 970cb3c85c313d54e832c78b2e9263aba6b0be2f SHA256 06dbbb8fc8fbae8bc91a665a11df8d6c18b4470a5ad4d76c3bb2a99036b1c78f
-MISC ChangeLog 1300 RMD160 bebbbd674edd3b0aab2252926997a2576e6f0913 SHA1 792973c6aff960a4b8b74a11f8ceaa38ea5f64e2 SHA256 05767403172e53d096179fde6fde864afa473062bcaf096b8921c086a3598fba
+EBUILD wmsound-0.9.5.ebuild 1320 RMD160 65e05e7955dacc4deac0f2717d6054db3be595e6 SHA1 72292187ce57f35917ddae3572921ca8db37c561 SHA256 f7b18a962774e9df30253c6f30169c1a21a9dbfb5354a14fb9739fe5fcda5846
+MISC ChangeLog 1479 RMD160 ef798da515fcb1d1b32d96f1e26136b4c208ce6d SHA1 d5cdf3b1215f435fc0093bd07baaeb6017bbc502 SHA256 829fd1642afe5d8beb1d4cd03d0c2a00390527d3b33b6fcd4f77d377dbda921a
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPZeK7AAoJEEdUh39IaPFN9yMH/3FQcBUizWMhg89NqCmYu0JR
+gFHBTR5xwdWDrxUK6YmQwftAlD0Lncall9osbtoEYWvM3rffpS4dWDZRqRqZqZl4
+9jy1ApFHiVEfBK78f0wyQqp2XIA1Wj0/eySrWALp7d96dfqxhenm2NuhkTUyuQIz
+VbtPoDB825RBJJKZnFUEfc+emllsuEB8dJFbNnX1mgSG4V5uZVR8Sy5e+mA4gRKc
+355fK5fmUbHP6aeUmK5oWFk34wX94c1vkCRV+M0ejpmIklR6rbkgUokpwdPKuxEZ
+MH/YyHBFEtHEFg7C1VvezxzKqnbx+4Zo1PVxMmDwosMdhnYxAKl/oSBHh/A7XHw=
+=pcP3
+-----END PGP SIGNATURE-----
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