Remove deprecated esound support.

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

3 files changed, 13 insertions, 11 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index 2116a9d675f3..821392569d07 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.98 2012/01/08 14:26:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.99 2012/01/08 14:27:55 ssuominen Exp $
+
+  08 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xlockmore-5.31.ebuild,
+  xlockmore-5.37.ebuild:
+  Remove deprecated esound support.
 
   08 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -xlockmore-5.35.ebuild,
   -xlockmore-5.36.ebuild:
diff --git a/x11-misc/xlockmore/xlockmore-5.31.ebuild b/x11-misc/xlockmore/xlockmore-5.31.ebuild
index 5befc079b106..1fa0041f0c19 100644
--- a/x11-misc/xlockmore/xlockmore-5.31.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.31.ebuild,v 1.10 2011/05/27 11:36:01 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.31.ebuild,v 1.11 2012/01/08 14:27:55 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic pam
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
-IUSE="crypt debug esd gtk motif nas opengl pam truetype xinerama xlockrc"
+IUSE="crypt debug gtk motif nas opengl pam truetype xinerama xlockrc"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -24,7 +24,6 @@ RDEPEND="x11-libs/libX11
 	truetype? ( media-libs/freetype:2 )
 	pam? ( virtual/pam )
 	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )
 	motif? ( >=x11-libs/openmotif-2.3:0 )
 	gtk? ( x11-libs/gtk+:2 )
 	xinerama? ( x11-libs/libXinerama )"
@@ -64,7 +63,7 @@ src_configure() {
 		$(use_with opengl) \
 		$(use_with opengl mesa) \
 		$(use_with xinerama) \
-		$(use_with esd esound) \
+		--without-esound \
 		$(use_with nas) \
 		$(use_with crypt) \
 		$(use_with gtk gtk2) \
diff --git a/x11-misc/xlockmore/xlockmore-5.37.ebuild b/x11-misc/xlockmore/xlockmore-5.37.ebuild
index 788f42cfea92..c52981ab7fb2 100644
--- a/x11-misc/xlockmore/xlockmore-5.37.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.37.ebuild,v 1.1 2011/12/23 02:42:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.37.ebuild,v 1.2 2012/01/08 14:27:56 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic pam
@@ -12,14 +12,13 @@ SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug esd gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt
-	esd? ( media-sound/esound )
 	gtk? ( x11-libs/gtk+:2 )
 	imagemagick? ( media-gfx/imagemagick )
 	motif? ( >=x11-libs/openmotif-2.3:0 )
@@ -70,7 +69,7 @@ src_configure() {
 		$(use_with opengl) \
 		$(use_with opengl mesa) \
 		$(use_with xinerama) \
-		$(use_with esd esound) \
+		--without-esound \
 		$(use_with nas) \
 		$(use_with crypt) \
 		$(use_with gtk gtk2) \