Remove deprecated media-sound/esound support

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

3 files changed, 33 insertions, 42 deletions

diff --git a/media-sound/madplay/ChangeLog b/media-sound/madplay/ChangeLog
index bc57c8c41769..a078cef8460f 100644
--- a/media-sound/madplay/ChangeLog
+++ b/media-sound/madplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/madplay
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/ChangeLog,v 1.51 2011/08/31 20:36:44 mattst88 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/ChangeLog,v 1.52 2012/01/11 10:21:22 ssuominen Exp $
+
+  11 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  madplay-0.15.2b-r1.ebuild:
+  Remove deprecated media-sound/esound support
 
   31 Aug 2011; Matt Turner <mattst88@gentoo.org> madplay-0.15.2b-r1.ebuild:
   Changed -mips to ~mips. Works fine here.
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 23f1bf2d6d8c..83e1172ef092 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -3,13 +3,17 @@ Hash: SHA1
 
 AUX madplay-macos.patch 593 RMD160 b92f39e01f0378a7681778a4476f12216c79d0e0 SHA1 0824f7154a1c5848d826c0080567c136dc2d53c4 SHA256 36e97e96b53f17d0174e4a297333f16b7b79d4c3879fe484606de05dae07538a
 DIST madplay-0.15.2b.tar.gz 590929 RMD160 0d3dc164891be5e4f37ce83364f6a40e8049dd3e SHA1 29105eb27c1416aa33c8d1ab3404a8e5f0aecd3f SHA256 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0
-EBUILD madplay-0.15.2b-r1.ebuild 1611 RMD160 cc98f48a9a5d6fdaf18ef9ee73302a99b437afee SHA1 45ba1d595aa4a42a925d2d868b9e4c74df423f74 SHA256 5e7ae9865b780d3c10b8cc5e7af47ae36f3fa47ace25f577a8a475b5baf3c84f
-MISC ChangeLog 5956 RMD160 5e3d6664cf21c095540836816a5c10a9521eca51 SHA1 957823b55303152b758e07d63fdc2be66ed01f11 SHA256 baf3c059929e2a9b103758026433ae99ae7804f3d5df473b44ba26cf9e2015b7
+EBUILD madplay-0.15.2b-r1.ebuild 995 RMD160 45fbc9eb7237c91d41a50a916caa53fda9b5f5cc SHA1 6644db9d0628c750c58cbbc0b2d199ea10fa6b52 SHA256 e7e30f6e48bd321afd103824a25db9c5caa062be7e8e5e774da88938aa63ff1b
+MISC ChangeLog 6088 RMD160 655e387ab3b2759f627acf92dde25fa0a221c4e4 SHA1 4c0551713bdc367a1919e8c94ba3a1b37cba1143 SHA256 3ed70d23dfbe4669eac65ea282ec3a9c2c0de36be411e24fc1d287cc2889199b
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5em14ACgkQTVUdg23rv50CTACbBKzU99SoyKSfhIVv/ZG9IwL8
-W+AAn0aZj3JTIsjpVa60JNKphxzIF9RT
-=y5KA
+iQEcBAEBAgAGBQJPDWJFAAoJEEdUh39IaPFNFTIH/3g3cXJhWHMWeyQzuRq5nzUq
+cMqF4ZbZIsgysFAW4yhdUE32KPewLPuWecXcLK++Q7tZRptmu3dmymAr5HPzDHSU
+gH19q13VdGLwB/wJkdIH7spVafklO0xTs5V6u/UZ5d/eoFFW0qmnMYkh626VfjjD
+wb8IakL8InwWvzXioexLZjfrLZ7ydXWqLxS1nPNGlfUMG/wKmhmBZpzG4jmj7h7i
+M7VBxnGcOIrRo6dbeSCINi7er7OzteccTso6ikZTCSKqJUWsPyQiUJ91q6FyATc1
+hM2K10ezrXbo30I0MLRJd05nQBuv91Fc/LeKjgz2MFDbCfsaXy7w/sBE9wfEcQY=
+=RcgM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index 43b2c2c7b413..ffe3360b41da 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -1,8 +1,9 @@
-# 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/media-sound/madplay/madplay-0.15.2b-r1.ebuild,v 1.13 2011/08/31 20:36:44 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madplay/madplay-0.15.2b-r1.ebuild,v 1.14 2012/01/11 10:21:22 ssuominen Exp $
 
-inherit eutils autotools
+EAPI=4
+inherit autotools eutils
 
 DESCRIPTION="The MAD audio player"
 HOMEPAGE="http://www.underbit.com/products/mad/"
@@ -11,44 +12,26 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug nls esd alsa"
+IUSE="alsa debug nls"
 
-#	~media-libs/libmad-${PV}
-#	~media-libs/libid3tag-${PV}
-# This version uses the previous libs... the only change is in handling lame encoded mp3s...
-# See http://sourceforge.net/project/shownotes.php?group_id=12349&release_id=219475
-
-RDEPEND="esd? ( media-sound/esound )
-	~media-libs/libmad-0.15.1b
-	alsa? ( media-libs/alsa-lib )
-	~media-libs/libid3tag-0.15.1b"
+RDEPEND=">=media-libs/libid3tag-0.15.1b
+	>=media-libs/libmad-0.15.1b
+	alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.11.2 )"
+	nls? ( sys-devel/gettext )"
+
+DOCS="CHANGES CREDITS README TODO"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf # need new libtool for interix
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-macos.patch
+	eautoreconf #need new libtool for interix
 	epunt_cxx #74499
-	epatch "${FILESDIR}/${PN}-macos.patch"
 }
 
-src_compile() {
-	# configure will bail out if both esd and alsa are enabled
-	local myconf
-	use alsa && myconf="--with-alsa --without-esd"
-	use esd && myconf="--without-alsa --with-esd"
-	use alsa || use esd || myconf="--without-alsa --without-esd"
-
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		$(use_enable debug debugging) \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc CHANGES CREDITS README TODO VERSION
+		$(use_with alsa) \
+		--without-esd
 }