now blocking media-sound/cdtool, see #76896. also did some cleanup

(Portage version: 2.0.51.19)

6 files changed, 14 insertions, 34 deletions

diff --git a/media-sound/cdplay/ChangeLog b/media-sound/cdplay/ChangeLog
index ffd21a716173..56b03534f332 100644
--- a/media-sound/cdplay/ChangeLog
+++ b/media-sound/cdplay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/cdplay
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/ChangeLog,v 1.11 2005/03/30 16:32:35 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/ChangeLog,v 1.12 2005/04/20 19:00:52 luckyduck Exp $
+
+*cdplay-0.9-r1 (20 Apr 2005)
+
+  20 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -cdplay-0.8.ebuild,
+  +cdplay-0.9-r1.ebuild, -cdplay-0.9.ebuild:
+  now blocking media-sound/cdtool, see #76896. also did some cleanup
 
   30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> cdplay-0.9.ebuild:
   Stable on ppc.
diff --git a/media-sound/cdplay/Manifest b/media-sound/cdplay/Manifest
index c00518844a13..b9b6313b0b32 100644
--- a/media-sound/cdplay/Manifest
+++ b/media-sound/cdplay/Manifest
@@ -1,6 +1,4 @@
+MD5 203026e94488c938c0a646ebfcda15be cdplay-0.9-r1.ebuild 577
+MD5 b541914b29c648f0e6d67989e451d05c ChangeLog 1715
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 ac5de2fb9c47daf8564a7234e02ec35d ChangeLog 1498
-MD5 cf699603648a6125e45c71895dfc899a cdplay-0.8.ebuild 527
-MD5 7bff6725403e92d1070e73b1a5599ca9 cdplay-0.9.ebuild 542
-MD5 3e3dde53ad1c4a5636e01d91fb71de37 files/digest-cdplay-0.9 61
-MD5 ba85a6558e2cc80055df4c00c4d9fefb files/digest-cdplay-0.8 61
+MD5 3e3dde53ad1c4a5636e01d91fb71de37 files/digest-cdplay-0.9-r1 61
diff --git a/media-sound/cdplay/cdplay-0.8.ebuild b/media-sound/cdplay/cdplay-0.8.ebuild
deleted file mode 100644
index 56999fa92784..000000000000
--- a/media-sound/cdplay/cdplay-0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/cdplay-0.8.ebuild,v 1.12 2005/03/30 16:32:35 hansmi Exp $
-
-DESCRIPTION="Console CD Player"
-SRC_URI="http://www.x-paste.de/files/${P}.tar.gz"
-HOMEPAGE="http://www.x-paste.de/projects/index.php"
-
-DEPEND="virtual/libc"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-KEYWORDS="x86 ppc ~alpha"
-
-src_compile () {
-	make || die
-}
-
-src_install () {
-	dobin cdplay
-
-	dodoc CREDITS README
-}
diff --git a/media-sound/cdplay/cdplay-0.9.ebuild b/media-sound/cdplay/cdplay-0.9-r1.ebuild
index 6550d33bef23..df036ac1f96f 100644
--- a/media-sound/cdplay/cdplay-0.9.ebuild
+++ b/media-sound/cdplay/cdplay-0.9-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/cdplay-0.9.ebuild,v 1.10 2005/03/30 16:32:35 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdplay/cdplay-0.9-r1.ebuild,v 1.1 2005/04/20 19:00:52 luckyduck Exp $
 
 DESCRIPTION="Console CD Player"
 HOMEPAGE="http://www.x-paste.de/projects/index.php"
 SRC_URI="http://www.x-paste.de/files/${P}.tar.gz"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	!media-sound/cdtool"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
@@ -14,7 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~alpha sparc amd64 ppc64"
 
 src_compile() {
-	make || die
+	make || die "make failed"
 }
 
 src_install() {
diff --git a/media-sound/cdplay/files/digest-cdplay-0.8 b/media-sound/cdplay/files/digest-cdplay-0.8
deleted file mode 100644
index 7bc1753b6ac4..000000000000
--- a/media-sound/cdplay/files/digest-cdplay-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 328ee4f7df1bfe9257a6db180a4ddd6e cdplay-0.8.tar.gz 12283
diff --git a/media-sound/cdplay/files/digest-cdplay-0.9 b/media-sound/cdplay/files/digest-cdplay-0.9-r1
index f48f990a832b..f48f990a832b 100644
--- a/media-sound/cdplay/files/digest-cdplay-0.9
+++ b/media-sound/cdplay/files/digest-cdplay-0.9-r1