Dependency changed from app-cdr/cdrtools to virtual/cdrtools, as suggested in Bug #66519. cdrdao-1.1.8-r1 (tested) stable on x86, ppc and sparc. Furthermore some cleanup.

10 files changed, 16 insertions, 313 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 62f0dd0674fc..f32f63fbe319 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.51 2004/10/05 11:22:55 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.52 2004/10/31 01:18:43 pylon Exp $
+
+  31 Oct 2004; Lars Weiler <pylon@gentoo.org> -cdrdao-1.1.5-r1.ebuild,
+  -cdrdao-1.1.7-r2.ebuild, -cdrdao-1.1.7.ebuild, cdrdao-1.1.8-r1.ebuild,
+  cdrdao-1.1.9.ebuild:
+  Dependency changed from app-cdr/cdrtools to virtual/cdrtools, as suggested
+  in Bug #66519. cdrdao-1.1.8-r1 (tested) stable on x86, ppc and sparc.
+  Furthermore some cleanup.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   cdrdao-1.1.7.ebuild:
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 5b4976a792c3..74403fff2a8a 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,12 +1,9 @@
-MD5 5dcb7674b97b073fb1df59b50d19a5f9 ChangeLog 6915
-MD5 85e424cd2e0be3ab2c7f3f4e28ae13bf cdrdao-1.1.5-r1.ebuild 2542
-MD5 c01c265415420cc2728985bb2a89c31b cdrdao-1.1.7-r2.ebuild 2686
+MD5 68fe0f45cedbcce80d324390503b33c5 ChangeLog 7257
 MD5 33d8e0d08cf62010891d40f5ce56c9e7 cdrdao-1.1.7-r3.ebuild 3009
-MD5 d149e2448807ee0c52bffad60fb9c1ff cdrdao-1.1.7.ebuild 1888
-MD5 f778ebef6a09b3a09eecb3d86dc75d57 cdrdao-1.1.8-r1.ebuild 2423
 MD5 df255d82a3e8056cf504461d0ff38275 cdrdao-1.1.8.ebuild 1830
-MD5 e5833c2a2cad53d1d2dd8df52e4fc614 cdrdao-1.1.9.ebuild 2264
 MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417
+MD5 8599aaeb31bfe0b4482f233920201969 cdrdao-1.1.8-r1.ebuild 2408
+MD5 25582edee462d879d7185cb042b65699 cdrdao-1.1.9.ebuild 2245
 MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
 MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
 MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479
@@ -14,9 +11,6 @@ MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
 MD5 af6e60d9309156e8c64fafebfdd79e97 files/cdrdao-1.1.8-cast.patch 351
 MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347
-MD5 229f6c96b696fe6251ce03abde9e3bbf files/digest-cdrdao-1.1.5-r1 68
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r2 69
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
 MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8 65
 MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8-r1 65
diff --git a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
deleted file mode 100644
index 308cfbbfb650..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild,v 1.32 2004/06/24 21:31:47 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="gnome perl oggvorbis"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-	<dev-cpp/gtkmm-1.3.0
-	>=dev-cpp/gnomemm-1.1.17 )
-	x86? ( perl? ( oggvorbis? ( dev-perl/libvorbis-perl ) ) )"
-DEPEND=">=dev-util/pccts-1.33.24-r1
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-c++.patch
-
-	use gnome || epatch ${FILESDIR}/${P}-gentoo.diff
-
-	cd ${S}/dao
-	wget http://cdrdao.sourceforge.net/${P}.drivers
-	if [ -f ${P}.drivers ]; then
-		rm -f cdrdao.drivers
-		mv ${P}.drivers cdrdao.drivers
-	fi
-}
-
-src_compile() {
-	filter-flags -funroll-loops
-
-	local mygnome=""
-
-	# Gtk version is broken :(
-	#	if use gnome ; then
-	#		mygnome=" --with-gnome"
-	#		CFLAGS="${CFLAGS} `/usr/bin/gtkmm-config --cflags`"
-	#		CXXFLAGS="${CXXFLAGS} `/usr/bin/gtkmm-config --cflags` -fno-exceptions"
-	#
-	#	fi
-
-	./configure "${mygnome}" \
-		--prefix=/usr \
-		--build="${CHOST}"\
-		--host="${CHOST}" \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	# cdrdao gets definitely installed
-	# binary
-	dobin dao/cdrdao
-
-	# data of cdrdao in /usr/share/cdrdao/
-	# (right now only driverlist)
-	insinto /usr/share/cdrdao
-	newins dao/cdrdao.drivers drivers
-
-	# man page
-	into /usr
-	newman dao/cdrdao.man cdrdao.1
-
-	# documentation
-	dodoc CREDITS INSTALL README* Release*
-
-	# and now the optional GNOME frontend
-	#	if use gnome
-	#	then
-	#
-	#		# binary
-	#		into /usr
-	#		dobin xdao/gcdmaster
-	#
-	#		# pixmaps for gcdmaster in /usr/share/pixmaps/gcdmaster
-	#		insinto /usr/share/pixmaps/gcdmaster
-	#		doins xdao/pixmap_copycd.png
-	#		doins xdao/pixmap_audiocd.png
-	#		doins xdao/pixmap_datacd.png
-	#		doins xdao/pixmap_open.png
-	#		doins xdao/pixmap_mixedcd.png
-	#		doins xdao/pixmap_cd.png
-	#		doins xdao/pixmap_help.png
-	#		doins xdao/pixmap_dumpcd.png
-	#		doins xdao/gcdmaster.png
-	#
-	#		# application links
-	#		# gcdmaster.desktop in /usr/share/gnome/apps/Applications
-	#		insinto /usr/share/gnome/apps/Applications
-	#		doins xdao/gcdmaster.desktop
-	#
-	#		# xcdrdao.1 renamed to gcdmaster.1 in /usr/share/man/man1/
-	#		into /usr
-	#		newman xdao/xcdrdao.man gcdmaster.1
-	#	fi
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
deleted file mode 100644
index 02926a391266..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild,v 1.14 2004/06/24 21:31:47 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc alpha hppa amd64 ia64"
-IUSE="gnome oggvorbis perl"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-	>=dev-cpp/gnomemm-1.2.2 )
-	x86? ( perl? ( oggvorbis? ( dev-perl/libvorbis-perl ) ) )
-	dev-perl/MP3-Info
-	dev-perl/Audio-Wav
-	dev-perl/Audio-Tools
-	virtual/cdrtools
-	>=sys-apps/sed-4"
-DEPEND=">=dev-util/pccts-1.33.24-r1
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PF}-mp32dao-gentoo.diff
-
-	if ! use oggvorbis ; then
-		cd ${S}/contrib/mp32dao
-		sed -i '22s/^/#/' MediaHandler.pm
-	fi
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		cd ${S}/scsilib/RULES
-		for i in parisc parisc64
-		do
-			cp i386-linux-cc.rul $i-linux-cc.rul
-			cp i386-linux-gcc.rul $i-linux-gcc.rul
-		done
-	fi
-}
-
-src_compile() {
-	local mygnome=""
-
-	if use gnome ; then
-		mygnome=" --with-gnome"
-		append-flags $( /usr/bin/gtkmm-config --cflags ) -fno-exceptions
-	fi
-	# -funroll-loops do not work
-	filter-flags "-funroll-loops"
-
-	./configure "${mygnome}" \
-		--prefix=/usr \
-		--build="${CHOST}"\
-		--host="${CHOST}" \
-		--with-scglib-inc=/usr/include/scsilib \
-		--with-scglib-lib=/usr/lib \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	# mp32dao.pl
-	dobin contrib/mp32dao/mp32dao.pl
-	insinto /usr/share/cdrdao/mp32dao
-	doins contrib/mp32dao/MediaHandler.pm contrib/mp32dao/mp3handler.pm \
-		contrib/mp32dao/BaseInfo.pm
-	use oggvorbis && doins contrib/mp32dao/ogghandler.pm
-
-	# cdrdao gets definitely installed
-	# binary
-	dobin dao/cdrdao
-
-	# data of cdrdao in /usr/share/cdrdao/
-	# (right now only driverlist)
-	insinto /usr/share/cdrdao
-	newins dao/cdrdao.drivers drivers
-
-	# man page
-	into /usr
-	newman dao/cdrdao.man cdrdao.1
-
-	# documentation
-	docinto ""
-	dodoc CREDITS INSTALL README* Release*
-
-	# and now the optional GNOME frontend
-	if use gnome ; then
-		# binary
-		into /usr
-		dobin xdao/gcdmaster
-
-		# pixmaps for gcdmaster in /usr/share/pixmaps/gcdmaster
-		insinto /usr/share/pixmaps/gcdmaster
-		doins xdao/*.png xdao/*.xpm
-
-		# application links
-		# gcdmaster.desktop in /usr/share/gnome/apps/Applications
-		insinto /usr/share/gnome/apps/Applications
-		doins xdao/gcdmaster.desktop
-
-		# xcdrdao.1 renamed to gcdmaster.1 in /usr/share/man/man1/
-		into /usr
-		newman xdao/xcdrdao.man gcdmaster.1
-	fi
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7.ebuild
deleted file mode 100644
index 8073cc7d9c55..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.1.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7.ebuild,v 1.19 2004/10/05 11:22:55 pvdabeel Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha"
-IUSE="gnome perl oggvorbis"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-	>=dev-cpp/gnomemm-1.2.2 )
-	x86? ( perl? ( oggvorbis? ( dev-perl/libvorbis-perl ) ) )"
-DEPEND=">=dev-util/pccts-1.33.24-r1
-	${RDEPEND}"
-
-src_compile() {
-	local mygnome=""
-
-	if use gnome ; then
-		mygnome=" --with-gnome"
-		append-flags `/usr/bin/gtkmm-config --cflags` -fno-exceptions
-	fi
-	# -funroll-loops do not work
-	filter-flags "-funroll-loops"
-
-	./configure "${mygnome}" \
-		--prefix=/usr \
-		--build="${CHOST}"\
-		--host="${CHOST}" \
-		|| die "configure failed"
-	emake || die
-}
-
-src_install() {
-	# cdrdao gets definitely installed
-	# binary
-	dobin dao/cdrdao
-
-	# data of cdrdao in /usr/share/cdrdao/
-	# (right now only driverlist)
-	insinto /usr/share/cdrdao
-	newins dao/cdrdao.drivers drivers
-
-	# man page
-	into /usr
-	newman dao/cdrdao.man cdrdao.1
-
-	# documentation
-	docinto ""
-	dodoc CREDITS INSTALL README* Release*
-
-	# and now the optional GNOME frontend
-	if use gnome ; then
-		# binary
-		into /usr
-		dobin xdao/gcdmaster
-
-		# pixmaps for gcdmaster in /usr/share/pixmaps/gcdmaster
-		insinto /usr/share/pixmaps/gcdmaster
-		doins xdao/*.png xdao/*.xpm
-
-		# application links
-		# gcdmaster.desktop in /usr/share/gnome/apps/Applications
-		insinto /usr/share/gnome/apps/Applications
-		doins xdao/gcdmaster.desktop
-
-		# xcdrdao.1 renamed to gcdmaster.1 in /usr/share/man/man1/
-		into /usr
-		newman xdao/xcdrdao.man gcdmaster.1
-	fi
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
index 30cfa5564027..336ca6385f1a 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.10 2004/07/14 14:01:00 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.11 2004/10/31 01:18:43 pylon Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="gnome debug"
 RESTRICT="nostrip"
 
@@ -21,7 +21,7 @@ RDEPEND=">=media-sound/lame-3.90
 	=dev-cpp/libgnomecanvasmm-2.0*
 	=dev-cpp/libgnomeuimm-2.0.0 )"
 DEPEND=">=dev-util/pccts-1.33.24-r1
-	>=app-cdr/cdrtools-2.01_alpha20
+	virtual/cdrtools
 	${RDEPEND}
 	>=sys-apps/sed-4"
 
diff --git a/app-cdr/cdrdao/cdrdao-1.1.9.ebuild b/app-cdr/cdrdao/cdrdao-1.1.9.ebuild
index 69f61b307c65..f5b2bbb0fd2e 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.9.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9.ebuild,v 1.4 2004/07/15 06:26:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9.ebuild,v 1.5 2004/10/31 01:18:43 pylon Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -21,7 +21,7 @@ RDEPEND=">=media-sound/lame-3.90
 		=dev-cpp/gconfmm-2.0*
 		=dev-cpp/libgnomeuimm-2.0.0 )"
 DEPEND=">=dev-util/pccts-1.33.24-r1
-	>=app-cdr/cdrtools-2.01_alpha20
+	virtual/cdrtools
 	${RDEPEND}"
 
 src_unpack() {
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.5-r1 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.5-r1
deleted file mode 100644
index 8e2bdf59fa63..000000000000
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 482da7ab61ae29f98072e3c3e1e012aa cdrdao-1.1.5.src.tar.gz 868001
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7
deleted file mode 100644
index 3d4e147be05c..000000000000
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 766a534137f2c6e99ab771e3178793f8 cdrdao-1.1.7.src.tar.gz 1433366
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r2 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r2
deleted file mode 100644
index 3d4e147be05c..000000000000
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 766a534137f2c6e99ab771e3178793f8 cdrdao-1.1.7.src.tar.gz 1433366