Version bump. Thanks to everybody in bug #41615

8 files changed, 86 insertions, 132 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 6cc704f4b80d..26570faffff3 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.29 2004/02/07 02:44:12 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.30 2004/02/16 07:20:48 pylon Exp $
+
+*cdrdao-1.1.8 (16 Feb 2004)
+
+  16 Feb 2004; Lars Weiler <pylon@gentoo.org> cdrdao-1.1.8.ebuild,
+  files/gcdmaster.desktop:
+  Version bump.  Thanks to everybody in bug #41615
 
   07 Feb 2004; Lars Weiler <pylon@gentoo.org> cdrdao-1.1.7-r3.ebuild,
   metadata.xml:
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index f807574bd5e2..ff2bb75ce4e8 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,17 +1,17 @@
-MD5 45f0506ecb2c0c64eb88c37fda756e0d ChangeLog 4129
+MD5 6b622426d2841fc61cea800f24cc34ab ChangeLog 4304
 MD5 df57ef8725ba1a35553f00ae1f40fdda cdrdao-1.1.5-r1.ebuild 2603
-MD5 865fd394496a71b6d8dfee647c137b4e cdrdao-1.1.7-r1.ebuild 2515
 MD5 9690dcaee895d52a1b0c4fed8f60dbf6 cdrdao-1.1.7-r2.ebuild 2753
 MD5 9945c13d43819d7f1f712389dba3ac0d cdrdao-1.1.7.ebuild 1941
-MD5 65c810f0f399cbceb0cc00b4c577cf65 cdrdao-1.1.7-r3.ebuild 3033
 MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417
+MD5 65c810f0f399cbceb0cc00b4c577cf65 cdrdao-1.1.7-r3.ebuild 3033
+MD5 15bcee2de7dcca082c5d6cc8d0338583 cdrdao-1.1.8.ebuild 1492
 MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
 MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479
 MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
-MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff 779
 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
 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-r1 69
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r2 69
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
+MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
+MD5 30dbca333c85f84db7f86414d112ce68 files/digest-cdrdao-1.1.8 65
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild
deleted file mode 100644
index f5b3acc0668b..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild,v 1.15 2004/01/08 06:03:28 vapier 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"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha"
-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"
-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
-		mv MediaHandler.pm MediaHandler.pm.old
-		sed '22s/^/#/' MediaHandler.pm.old > MediaHandler.pm
-	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}" \
-		|| 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 COPYING 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.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
new file mode 100644
index 000000000000..56cf1a7bd89c
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8.ebuild,v 1.1 2004/02/16 07:20:49 pylon 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}.tar.gz"
+#RESTRICT="nomirror"
+# Why is this here?
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="gnome oggvorbis"
+
+RDEPEND="gnome? ( >=dev-cpp/gtkmm-2.0
+	              >=dev-cpp/libgnomeuimm-2.0 )
+	>=app-cdr/cdrtools-2.01_alpha20
+	>=media-sound/lame-3.90"
+
+DEPEND=">=dev-util/pccts-1.33.24-r1
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Only way to disable gcdmaster currently ...
+	use gnome || \
+		sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
+}
+
+src_compile() {
+	# -funroll-loops do not work
+	filter-flags "-funroll-loops"
+
+	./configure --build="${CHOST}"\
+		--host="${CHOST}" \
+		--prefix=/usr \
+		--with-scglib-inc=/usr/include/scsilib \
+		--with-scglib-lib=/usr/lib \
+		`use_with gnome gnome` || die "configure failed"
+
+	emake || die
+}
+
+src_install() {
+	einstall
+
+	cd ${S}
+
+	# Desktop Icon
+	if [ -n "`use gnome`" ]
+	then
+		insinto /usr/share/pixmaps
+		doins xdao/stock/gcdmaster.png
+		insinto /usr/share/gnome/apps/Applications
+		doins ${FILESDIR}/gcdmaster.desktop
+	fi
+
+	# Documentation
+	dodoc AUTHORS COPYING CREDITS ChangeLog NEWS README*
+}
+
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff b/app-cdr/cdrdao/files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff
deleted file mode 100644
index 96d58beb6aa5..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- contrib/mp32dao/MediaHandler.pm        2002-10-30 11:29:05.000000000 +0100
-+++ contrib/mp32dao/MediaHandler.pm     2002-10-30 11:45:28.000000000 +0100
-@@ -16,6 +16,7 @@
- #Copyright 2001 Giuseppe Corbelli - cowo@lugbs.linux.it
- #builds a list of handlers for all mediafiles in a directory
-
-+use lib '/usr/share/cdrdao/mp32dao';
- package MediaHandler;
- require mp3handler;
- require ogghandler;
-
---- contrib/mp32dao/mp32dao.pl     2002-10-30 11:04:26.000000000 +0100
-+++ contrib/mp32dao/mp32dao.pl 2002-10-30 11:47:07.000000000 +0100
-@@ -19,6 +19,7 @@
- #Support for cdrecord: builds .inf files
- #Giuseppe Corbelli <cowo@lugbs.linux.it>
- #Original code by Joe Steward <mp32dao@httptech.com>
-+use lib '/usr/share/cdrdao/mp32dao';
- use FindBin;
- use lib $FindBin::Bin;
- use Cwd;
-
-
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r1 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r1
deleted file mode 100644
index 3d4e147be05c..000000000000
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r1
+++ /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.8 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.8
new file mode 100644
index 000000000000..c1fd5874684d
--- /dev/null
+++ b/app-cdr/cdrdao/files/digest-cdrdao-1.1.8
@@ -0,0 +1 @@
+MD5 10cfd445fa628fb32dacf02e555fdbba cdrdao-1.1.8.tar.gz 1499243
diff --git a/app-cdr/cdrdao/files/gcdmaster.desktop b/app-cdr/cdrdao/files/gcdmaster.desktop
new file mode 100644
index 000000000000..abd48691ffb3
--- /dev/null
+++ b/app-cdr/cdrdao/files/gcdmaster.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Gnome CD Master
+Comment=Utility to Burn CDs
+Exec=gcdmaster
+Icon=gcdmaster.png
+Terminal=0
+Type=Application