ppc64 stable wrt #322861

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 8 insertions, 57 deletions

diff --git a/media-sound/abcde/ChangeLog b/media-sound/abcde/ChangeLog
index 38a5ba29da53..4da3957583ec 100644
--- a/media-sound/abcde/ChangeLog
+++ b/media-sound/abcde/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/abcde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.47 2010/06/27 11:58:33 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.48 2010/07/04 12:14:43 ssuominen Exp $
+
+  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> abcde-2.4.1.ebuild:
+  ppc64 stable wrt #322861
 
   27 Jun 2010; <nixnut@gentoo.org> abcde-2.4.1.ebuild:
   ppc stable #322861
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 81d86dce97b3..280b3442cb1b 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,8 +1,7 @@
 AUX m4a-tagging.patch 293 RMD160 16b29f1cfc0f9922e323fa1da0c26796da0c1739 SHA1 08c1492fa91ef8a757786262e4408abc41d2ccc6 SHA256 7832fb5fc4e47c716fbdbf09fcc398a1bc72e3cafd2856835a579f165c43fc77
 DIST abcde-2.3.99.7_p235.tar.bz2 171342 RMD160 bbb7116a8a06ffae6e0027e5a7524e023bfd71cf SHA1 51db5e7da9b3eda0844904ad2b9138fa97eeb254 SHA256 19aac41206c33380e9970ba2fcd290f89d1a13189bea1f331f326d5346f389da
 DIST abcde_2.4.1.orig.tar.gz 98351 RMD160 b9ec4533104c16908f285a39cf647f2fee18c6f0 SHA1 236b233148e2af1b13dba4b89b750eccb87b2830 SHA256 3aa033d30c0b4591841a83bd32af3afed7f3bcd420f771c99acd559f0352e652
-EBUILD abcde-2.3.99.7_p235-r3.ebuild 1348 RMD160 7a423b8eba06a505495e2f8843e3541ff6a10cc1 SHA1 84a79842878d5856e6cf202a89c8247a33ff7512 SHA256 e9b7246c22d8f33b36bd5c852c1addda731714676b488fa69dae732ce1b21482
 EBUILD abcde-2.3.99.7_p235.ebuild 1214 RMD160 ef6472dd825f355ca0f554657bb2aaa34032a852 SHA1 2f75b208ae8c8911b0ea77a39c2cd98b7e64beec SHA256 03c0522c655bb9be72212267f8e68959970befe320c091c381f381a8b8042335
-EBUILD abcde-2.4.1.ebuild 1265 RMD160 07b0ac2db8ee65ad0fde8deef0ec4b92aae0e6e8 SHA1 0034682d7297a2e54fefc97e69144c05d3cb7ba0 SHA256 343c094e2819397da4447970815f9ff18d785316c8ea3a4f9609a36fcd1ae940
-MISC ChangeLog 7080 RMD160 240786ebeaaa789f8a96f5433e6f0cae0f099ba6 SHA1 0d48263a0fa077efcc038a40db5763c7bd54c100 SHA256 196c88ddaa926efbde7e1001d3ff84f116fe626b84f96b7e0eff0297376b1b52
+EBUILD abcde-2.4.1.ebuild 1267 RMD160 fc9facf31b07d1fa56cd2f18848b8d54bb662af8 SHA1 e0c4292a87c7a80e60a6e8990b69e6656e62cd01 SHA256 b04022a5a7982250f7cc3932e3af984712aef7bec7a4e6c99beecb0ee8a9796b
+MISC ChangeLog 7185 RMD160 33df10a1021228dbfd5743c70c08067df09a1fbe SHA1 e4beb480659bda599c8944c2c9261879477b7916 SHA256 36048cec3c563477f46abf6fffba8b20cd41ebc75be593fa877459b9115b5a96
 MISC metadata.xml 531 RMD160 fce98b5ba11f77904a91ee345dfa6bd8af952686 SHA1 44c0819ed83255325a5a8a010d9d5b8e99558055 SHA256 2a856a922895a8690895f100a5722dff3eb6a40620259844a8682da529e9e8c9
diff --git a/media-sound/abcde/abcde-2.3.99.7_p235-r3.ebuild b/media-sound/abcde/abcde-2.3.99.7_p235-r3.ebuild
deleted file mode 100644
index 0a1e6ccaf8ae..000000000000
--- a/media-sound/abcde/abcde-2.3.99.7_p235-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.3.99.7_p235-r3.ebuild,v 1.1 2010/01/28 15:05:26 beandog Exp $
-
-inherit eutils
-
-DESCRIPTION="A Better CD Encoder"
-HOMEPAGE="http://code.google.com/p/abcde/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-MY_PV=${P/_p235/}
-S="${WORKDIR}"/${MY_PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aac cdparanoia id3 vorbis flac speex lame normalize replaygain"
-
-RDEPEND="
-	id3? (
-		>=media-sound/id3-0.12
-		media-sound/id3v2
-	)
-	media-sound/cd-discid
-	virtual/eject
-	aac? ( media-libs/faac )
-	cdparanoia? ( media-sound/cdparanoia )
-	vorbis? ( media-sound/vorbis-tools )
-	flac? ( media-libs/flac )
-	speex? ( media-libs/speex )
-	lame? ( media-sound/lame )
-	normalize? ( >=media-sound/normalize-0.7.4 )
-	replaygain? ( vorbis? ( media-sound/vorbisgain )
-		lame? ( media-sound/mp3gain ) )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# bug 292315
-	epatch "${FILESDIR}"/m4a-tagging.patch
-	sed -i 's:/etc/abcde.conf:/etc/abcde/abcde.conf:g' abcde
-	sed -i 's:/etc:/etc/abcde/:g' Makefile
-}
-
-src_install() {
-	dodir /etc/abcde
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README TODO changelog FAQ KNOWN.BUGS USEPIPES
-	docinto examples/
-	dodoc examples/*
-}
diff --git a/media-sound/abcde/abcde-2.4.1.ebuild b/media-sound/abcde/abcde-2.4.1.ebuild
index cd6c81bc6aa6..8d7a8615a82e 100644
--- a/media-sound/abcde/abcde-2.4.1.ebuild
+++ b/media-sound/abcde/abcde-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.4.1.ebuild,v 1.5 2010/06/27 11:58:33 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.4.1.ebuild,v 1.6 2010/07/04 12:14:43 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="aac cdparanoia flac id3 lame normalize replaygain speex vorbis"
 
 RDEPEND="media-sound/cd-discid