cdrecord is now part of cdrtools, so i updated cdrtools to the latest

version, and adjusted the depends of the cdr apps to match cdrtools
instead of cdrecord... Deleted the out-of-date cdrecord.

12 files changed, 19 insertions, 51 deletions

diff --git a/app-cdr/cdbakeoven/cdbakeoven-1.6.1.ebuild b/app-cdr/cdbakeoven/cdbakeoven-1.6.1.ebuild
index 89b64c7cec24..a1bbe758b31e 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-1.6.1.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-1.6.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.6.1.ebuild,v 1.2 2001/11/04 23:59:41 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.6.1.ebuild,v 1.3 2001/11/07 23:38:14 verwilst Exp $
 
 S=${WORKDIR}/${P}
 
@@ -12,7 +12,8 @@ HOMEPAGE="http://cdbakeoven.sourceforge.net"
 
 DEPEND=">=x11-libs/qt-x11-2.2
 	>=kde-base/kdelibs-2.2
-	>=kde-base/kdebase-2.2"
+	>=kde-base/kdebase-2.2
+	>=app-cdr/cdrtools-1.11"
 
 RDEPEND=$DEPEND
 
diff --git a/app-cdr/cdrtools/cdrtools-1.10.ebuild b/app-cdr/cdrtools/cdrtools-1.11.ebuild
index b5e23bb038e3..eb13212c6032 100644
--- a/app-cdr/cdrtools/cdrtools-1.10.ebuild
+++ b/app-cdr/cdrtools/cdrtools-1.11.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.10.ebuild,v 1.2 2001/10/19 01:41:49 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.ebuild,v 1.1 2001/11/07 23:38:14 verwilst Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="cdrtools - A set of tools for CDR drives, including cdrecord"
-SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/${A}"
+SRC_URI="ftp://ftp.fokus.gmd.de:21/pub/unix/cdrecord/alpha/cdrtools-1.11a09.tar.gz"
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
 
 DEPEND="virtual/glibc"
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-1.10 b/app-cdr/cdrtools/files/digest-cdrtools-1.10
deleted file mode 100644
index a6f22b7cedcb..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a7c452738eb9f58c738908d8146601d cdrtools-1.10.tar.gz 1335296
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-1.11 b/app-cdr/cdrtools/files/digest-cdrtools-1.11
new file mode 100644
index 000000000000..30745784d931
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-1.11
@@ -0,0 +1 @@
+MD5 0f16fb48171b682898084ccedd17378c cdrtools-1.11a09.tar.gz 1314816
diff --git a/app-cdr/cdrx/cdrx-0.2.1.1.ebuild b/app-cdr/cdrx/cdrx-0.2.1.1.ebuild
index 60a03a864b3a..f87321a18c7d 100644
--- a/app-cdr/cdrx/cdrx-0.2.1.1.ebuild
+++ b/app-cdr/cdrx/cdrx-0.2.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrx/cdrx-0.2.1.1.ebuild,v 1.1 2001/08/28 18:15:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrx/cdrx-0.2.1.1.ebuild,v 1.2 2001/11/07 23:38:14 verwilst Exp $
 
 P=cdrx-0.2.1p1
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
 SRC_URI="http://cdrx.sourceforge.net/${A}"
 HOMEPAGE="http://cdrx.sourceforge.net/"
 
-DEPEND=">=app-cdr/cdrecord-1.9 sys-devel/perl"
+DEPEND=">=app-cdr/cdrtools-1.11 sys-devel/perl"
 
 src_unpack() {
 
diff --git a/app-cdr/cdrx/cdrx-0.2.ebuild b/app-cdr/cdrx/cdrx-0.2.ebuild
index 9ace8503054f..814f7185cc8b 100644
--- a/app-cdr/cdrx/cdrx-0.2.ebuild
+++ b/app-cdr/cdrx/cdrx-0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrx/cdrx-0.2.ebuild,v 1.3 2001/08/28 18:15:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrx/cdrx-0.2.ebuild,v 1.4 2001/11/07 23:38:14 verwilst Exp $
 
 #P=
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
 SRC_URI="http://cdrx.sourceforge.net/${A}"
 HOMEPAGE="http://cdrx.sourceforge.net/"
 
-DEPEND=">=app-cdr/cdrecord-1.9 sys-devel/perl"
+DEPEND=">=app-cdr/cdrtools-1.11 sys-devel/perl"
 
 src_unpack() {
 
diff --git a/app-cdr/gtoaster/gtoaster-1.0_beta3.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta3.ebuild
index 9a9c0d1f3f1b..a237214f6842 100644
--- a/app-cdr/gtoaster/gtoaster-1.0_beta3.ebuild
+++ b/app-cdr/gtoaster/gtoaster-1.0_beta3.ebuild
@@ -15,7 +15,7 @@ DEPEND=">=x11-libs/gtk+-1.2
 	gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
 	esd? ( >=media-sound/esound-0.2.22 )"
 
-RDEPEND=">=app-cdr/cdrecord-1.9
+RDEPEND=">=app-cdr/cdrtools-1.11
 	 >=media-sound/sox-12
 	 >=media-sound/mpg123-0.59
 	 >=media-sound/mp3info-0.8.4
diff --git a/app-cdr/koncd/koncd-1.0_rc1.ebuild b/app-cdr/koncd/koncd-1.0_rc1.ebuild
index 3a11bf62ab72..a250bcbaa763 100644
--- a/app-cdr/koncd/koncd-1.0_rc1.ebuild
+++ b/app-cdr/koncd/koncd-1.0_rc1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.1 2001/10/06 18:26:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.2 2001/11/07 23:38:14 verwilst Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-base || die
 
@@ -10,7 +10,7 @@ DESCRIPTION="A KDE frontend to cdr apps; very powerful"
 SRC_URI="http://www.koncd.org/download/koncd-1.0rc1.tar.gz"
 HOMEPAGE="http://www.koncd.org/"
 
-DEPEND="$DEPEND >=kde-base/kdelibs-2.2"
+DEPEND="$DEPEND >=kde-base/kdelibs-2.2 >=app-cdr/cdrtools-1.11"
 RDEPEND="$RDEPEND >=kde-base/kdelibs-2.2"
 
 src_unpack() {
diff --git a/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild b/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild
index 962dc172bc51..dce7da9a7a5d 100644
--- a/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild
+++ b/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-0.92-r1.ebuild,v 1.2 2001/11/07 23:38:14 verwilst Exp $
 
 S=${WORKDIR}/${PN}
 SRC_URI="http://ogre.rocky-road.net/files/${P}.tar.gz"
@@ -10,12 +10,12 @@ HOMEPAGE="http://ogre.rocky-road.net/cdr.shtml"
 DESCRIPTION="CD ripping/mastering"
 
 #todo: add blade encoder
-DEPEND="sys-devel/gcc media-sound/mad app-cdr/cdrecord app-cdr/cdrdao 
+DEPEND="sys-devel/gcc media-sound/mad app-cdr/cdrtools app-cdr/cdrdao 
 		media-sound/cdparanoia media-sound/lame media-libs/libogg
 		media-sound/mpg123 virtual/x11 >=x11-libs/gtk+-1.2.10-r4 \
 		dev-libs/glib media-libs/libvorbis
 		media-libs/libao"
-RDEPEND="media-sound/mad app-cdr/cdrecord app-cdr/cdrdao 
+RDEPEND="media-sound/mad app-cdr/cdrtools app-cdr/cdrdao 
 		media-sound/cdparanoia media-sound/lame media-libs/libogg
 		media-sound/mpg123 virtual/x11 >=x11-libs/gtk+-1.2.10-r4 \
 		dev-libs/glib media-libs/libvorbis
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8-r1 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8-r1
deleted file mode 100644
index 6cf82e747b61..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b26664d09a530f798e062cfb9f8aac8f xcdroast-0.98alpha8.tar.gz 561152
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild
deleted file mode 100644
index 776b272e6c4a..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha8-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
-
-
-A=xcdroast-0.98alpha8.tar.gz
-S=${WORKDIR}/xcdroast-0.98alpha8
-DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
-SRC_URI="http://www.xcdroast.org/download/${A}"
-HOMEPAGE="http://www.xcdroast.org/"
-
-DEPEND=">=dev-libs/glib-1.2.10
-	>=x11-libs/gtk+-1.2.10-r4
-	>=media-libs/imlib-1.9.10-r1
-	>=media-libs/giflib-3.0"
-
-RDEPEND=">=app-cdr/cdrecord-1.9"
-
-src_compile () {
-	try env "CC='gcc ${CFLAGS}'"
-	try make ${MAKEOPTS}
-
-}
-
-src_install () {
-
-	try make DESTDIR=${D} install
-        chown root.wheel ${D}/usr/bin/xcdrgtk
-        dodoc CHANGELOG COPYING DOCUMENTATION FAQ README* TRANSLATION.HOWTO
-}
-
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha9.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha9.ebuild
index dab3ef4d1cf4..974793131d0d 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha9.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <blutgens@sistina.com> 
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha9.ebuild,v 1.1 2001/10/18 01:18:34 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha9.ebuild,v 1.2 2001/11/07 23:38:14 verwilst Exp $
 
 
 A=xcdroast-0.98alpha9.tar.gz
@@ -15,7 +15,7 @@ DEPEND=">=dev-libs/glib-1.2.10
 	>=media-libs/imlib-1.9.10-r1
 	>=media-libs/giflib-3.0"
 
-RDEPEND=">=app-cdr/cdrtools-1.10"
+RDEPEND=">=app-cdr/cdrtools-1.11"
 
 src_compile () {
 	make PREFIX=/usr CC="gcc ${CFLAGS}" || die