Remove deprecated esound support.

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

4 files changed, 23 insertions, 21 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/Manifest b/x11-misc/xlockmore/Manifest
index 3dbf877d50ca..94811f9a965d 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -5,18 +5,18 @@ AUX xlockmore-5.31-configure.in.patch 725 RMD160 0d7d56bb260dd203e764da725fa4866
 AUX xlockmore-5.31-ldflags.patch 6398 RMD160 ad393c2eb337f41fabba043252d75545cba56eb0 SHA1 f89da226977fb3faf6aada01c6262503edadf380 SHA256 22b18ad9120875ac7c3af4b81d0f863488b33aec36a50a036e2e7688699bd0cf
 DIST xlockmore-5.31.tar.bz2 1973498 RMD160 17f5e71f395aac1e9a99b438904b87943fb1cc15 SHA1 41b9fddb8fded906283c3b91c04e5586fc26af75 SHA256 4cd777a8b81840900fed4354af6d140b8555966aef31825508272802e4866b85
 DIST xlockmore-5.37.tar.bz2 1968096 RMD160 2b38f9e0ece870489a1255095aec100e29055237 SHA1 f08cf9afb695cc37f165b8ca1892bbeb3aca646e SHA256 130bfe0c2f71e2819ef3f05fc15ed83e1bad53c8c9199b4620fe75bf4ad65d86
-EBUILD xlockmore-5.31.ebuild 2254 RMD160 b4e46f0f781f50270ca4f84a934613296496bc6c SHA1 30d344ca0869a98b0ad882cab74e00a4a9536a21 SHA256 20e85a11afe2df9bc5b324f294429af8f702ef1534ee18e7877031fc1855fab1
-EBUILD xlockmore-5.37.ebuild 2341 RMD160 0b24758041999c2c687f5a7801034c9dde91e0b9 SHA1 d440990dd2210ca9911d8df7848e6e7b4f0be972 SHA256 b2cf12122ca16496a7479f4c0a72fddaca63182d2bc92a8aaa3a3530886e66d7
-MISC ChangeLog 14721 RMD160 92d4ef4b5735fb1f2073abfe9a0c046d0b522488 SHA1 804a58248592599d059102e4df2f7448aac8aecb SHA256 af06a15ef1e99f4c5cdc2ffd0715ae6bc18ae891ddff48582d24f2913bba1937
+EBUILD xlockmore-5.31.ebuild 2221 RMD160 5d664a2c02acd0a5157a4b6d50dbc66884d40494 SHA1 36c4276ef25ed935c9a6021fde8f0eea30fd5bc2 SHA256 6d1e7218493c6ccf9f22d2e94e056e62ec9b52ae54f7043d841c672c5c129058
+EBUILD xlockmore-5.37.ebuild 2302 RMD160 901d50cd94d794482d8b47d19b83e27e23285b73 SHA1 c906cdeb4d9ab5477a1dcad3bf6c027e5ca5c941 SHA256 35adfa8bd16979f98dcd0a5d3972ac281d8c638e0d4e377f608a5896dedc7153
+MISC ChangeLog 14860 RMD160 f35602679c912467fcebdf32bbf44c096c24e339 SHA1 fdd867f6d6d56e0a4baa38520a8f0f43e6f0ed2e SHA256 8963fab53654988086760c2b2878e66494d5d01959e760a3c5e28527fd3783e3
 MISC metadata.xml 255 RMD160 c753cd3fbccd65b2fe478946948a5dd6afef371a SHA1 744a7bf93879f458df34c7bf8483f34f92e76782 SHA256 23193825c01ae6c6d66fd3604398bc108f0d263706c1842600f1ce6718128a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPCacpAAoJEEdUh39IaPFNdf8H/AvMIqqtguJIC8QU+Plt1m/L
-oZHzKMvXANm/SOJS1oaeZGVaQwHI3LSkhBjj8xwGfeWEvo3BfQTyz2pD/mNR06VR
-nGHC4siU1FOBk+nZeUMApb8owDVtBtn/3qB42VKoxCzxkrjRn77nzQMoSr7fYTxZ
-a4baxDUcbTx85Hg/yPdL0CfvxZaBbfPGJ9JtM22Ie8IFQ4xkOlPwBcxBxcORxzNL
-MFeUPJD4x1Zv5xwRYW8kWSElm/y3rWhiIu4664sgYMzXBG0lJK3Euxwoox/Bf3Gy
-r0cWAxDvg8AdryN38Rq1Rm6LFni0RtZ3Y3WW27m6tMOo3AUZXSMBqvJGDRL61ZQ=
-=t6FM
+iQEcBAEBAgAGBQJPCaedAAoJEEdUh39IaPFNN/4H/3g6PsuCM4PKK9xru6IBLiU6
+zzkWS2edE2XkW1Mx/gj3d43jQcojdf9jihIaGMM3LXuRsi+ABxNiqscOfY8vvZQo
+9YMPsaROmk5bCqiyvkzZsz2kVieCTusCZirOziP4qPvZ1y52hcNxG9M/kNCmpiC0
+7cFpGtde8b5IvFoAZldAWyrZ+3eYd5mZ/6tE0IvX8117CAyV1w+TI58kVkafwa0R
+Saqs6cpPwLhTTk6q20sj2xFO3N8I3FQF34kIcOLdl6O5mp8DMtreH/jTOZcJrR6Z
+8HWf17R4zrxYjKSLRp46/D2gbYp07xNphMQA4J+FaBQbXakr5jyqZGKwUbrzbso=
+=Dfay
 -----END PGP SIGNATURE-----
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) \