udpate dependency, fix compilation with latest cdrtools, cleaned up old version

6 files changed, 28 insertions, 69 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index 7df3d6b4782e..58e1f31bd8cd 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for app-cdr/xcdroast
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.7 2002/06/05 02:39:55 lostlogic Exp $
+# /space/gentoo/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.7 2002/06/05 02:39:55 lostlogic Exp
 
-*xcdroast-0.98_alpha10 (23 Apr 2002)
+*xcdroast-0.98_alpha10 (16 Jun 2002)
+  
+  16 Jun 2002; Doug Goldstein (Cardoe) <dougg@ufl.edu> xcdroast-0.98_alpha10-r2.ebuild:
+  
+  Changed the depends to the new version of cdrtools because of bugs reports and because
+  the xcdroast site says there are bugs unless you use the latest version.
+
+  Fixed lintool errors too. :)
 
   4 Jun 2002; Brandon Low <lostlogic@gentoo.org>  xcdroast-0.98_alpha10-r1.ebuild:
 
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha10-r2 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha10-r2
new file mode 100644
index 000000000000..82d6570be400
--- /dev/null
+++ b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha10-r2
@@ -0,0 +1 @@
+MD5 6f9ffd30c7ba8f067c2f1bddcc83d7d8 xcdroast-0.98alpha10.tar.gz 749736
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha9-r1 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha9-r1
deleted file mode 100644
index bbd08da104df..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 543d3237e7109572f5fcb6bdc6cf3e44 xcdroast-0.98alpha9.tar.gz 649469
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha9-r2 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha9-r2
deleted file mode 100644
index bbd08da104df..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 543d3237e7109572f5fcb6bdc6cf3e44 xcdroast-0.98alpha9.tar.gz 649469
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha9-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha10-r2.ebuild
index c5197cc288c9..7d691e6fd24f 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha9-r1.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha10-r2.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 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-r1.ebuild,v 1.3 2002/05/23 06:50:08 seemant Exp $
+# Author Ben Lutgens <lamer@gentoo.org>
+# /space/gentoo/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha10-r1.ebuild,v 1.2 2002/06/12 03:23:49 lamer Exp
 
-S=${WORKDIR}/xcdroast-0.98alpha9
+S=${WORKDIR}/xcdroast-0.98alpha10
 DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
-SRC_URI="http://www.xcdroast.org/download/${PN}-0.98alpha9.tar.gz"
+SRC_URI="http://www.xcdroast.org/download/${PN}-0.98alpha10.tar.gz"
 HOMEPAGE="http://www.xcdroast.org/"
 SLOT="0"
 
+LICENSE="GPL-2"
+
 # WARNING: cdrtools and mkisofs versions hard coded, see below
 
 DEPEND="=x11-libs/gtk+-1.2* 
 	=dev-libs/glib-1.2*
-	>=media-libs/imlib-1.9.10-r1
+	>=media-libs/gdk-pixbuf-0.16.0
 	>=media-libs/giflib-3.0
-	~app-cdr/cdrtools-1.11.20"
+	~app-cdr/cdrtools-1.11.24"
 
-RDEPEND="~app-cdr/cdrtools-1.11.20"
+RDEPEND="~app-cdr/cdrtools-1.11.24"
 
 src_compile () {
 	
@@ -25,10 +27,10 @@ src_compile () {
 	# xcdroast (hardcoded versions).  The listed dependencies are part 
 	# of the cdrtools package.
 	mv xcdroast.h xcdroast.h.orig
-	sed -e 's|CDRECORD_VERSION "1.10"|CDRECORD_VERSION "1.11a19"|' \
-		-e 's|CDDA2WAV_VERSION "1.10"|CDDA2WAV_VERSION "1.11a19"|' \
+	sed -e 's|CDRECORD_VERSION "1.10"|CDRECORD_VERSION "1.11a24"|' \
+		-e 's|CDDA2WAV_VERSION "1.10"|CDDA2WAV_VERSION "1.11a24"|' \
 		-e 's|READCD_VERSION "1.10"|READCD_VERSION "1.11a19"|' \
-		-e 's|MKISOFS_VERSION "1.14"|MKISOFS_VERSION "1.15a20"|' \
+		-e 's|MKISOFS_VERSION "1.14"|MKISOFS_VERSION "1.15a23"|' \
 		xcdroast.h.orig > xcdroast.h || die
 
 	make PREFIX=/usr CC="gcc ${CFLAGS}" || die
@@ -37,8 +39,11 @@ src_compile () {
 src_install () {
 	
 	make PREFIX=/usr DESTDIR=${D} install || die
-        chown root.wheel ${D}/usr/bin/xcdrgtk
-        dodoc CHANGELOG COPYING DOCUMENTATION FAQ README* TRANSLATION.HOWTO
+	chown root.wheel ${D}/usr/bin/xcdrgtk
+	dodoc CHANGELOG COPYING DOCUMENTATION FAQ README* TRANSLATION.HOWTO
+
+	# move man pages to /usr/share/man to be LFH compliant
+	mv ${D}/usr/man ${D}/usr/share
 }
 
 pkg_postinst () {
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha9-r2.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha9-r2.ebuild
deleted file mode 100644
index 4b6d12f1f3f8..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha9-r2.ebuild
+++ /dev/null
@@ -1,52 +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_alpha9-r2.ebuild,v 1.2 2002/05/23 06:50:08 seemant Exp $
-
-S=${WORKDIR}/xcdroast-0.98alpha9
-DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
-SRC_URI="http://www.xcdroast.org/download/${PN}-0.98alpha9.tar.gz"
-HOMEPAGE="http://www.xcdroast.org/"
-SLOT="0"
-
-# WARNING: cdrtools and mkisofs versions hard coded, see below
-
-DEPEND="=x11-libs/gtk+-1.2* 
-	=dev-libs/glib-1.2*
-	>=media-libs/imlib-1.9.10-r1
-	>=media-libs/giflib-3.0
-	~app-cdr/cdrtools-1.11.21"
-
-RDEPEND="~app-cdr/cdrtools-1.11.21"
-
-src_compile () {
-	
-	# NOTE: This will need to be updated to work with future versions of
-	# xcdroast (hardcoded versions).  The listed dependencies are part 
-	# of the cdrtools package.
-	mv xcdroast.h xcdroast.h.orig
-	sed -e 's|CDRECORD_VERSION "1.10"|CDRECORD_VERSION "1.11a19"|' \
-		-e 's|CDDA2WAV_VERSION "1.10"|CDDA2WAV_VERSION "1.11a19"|' \
-		-e 's|READCD_VERSION "1.10"|READCD_VERSION "1.11a19"|' \
-		-e 's|MKISOFS_VERSION "1.14"|MKISOFS_VERSION "1.15a20"|' \
-		xcdroast.h.orig > xcdroast.h || die
-
-	make PREFIX=/usr CC="gcc ${CFLAGS}" || die
-}
-
-src_install () {
-	
-	make PREFIX=/usr DESTDIR=${D} install || die
-        chown root.wheel ${D}/usr/bin/xcdrgtk
-        dodoc CHANGELOG COPYING DOCUMENTATION FAQ README* TRANSLATION.HOWTO
-}
-
-pkg_postinst () {
-
-	einfo "Due to limitations in the xcdroast program, the version of cdrtools"
-	einfo "that it depends on must be hardcoded in the xcdroast program.  This"
-	einfo "means you must have a specific version of cdrtools installed if you"
-	einfo "plan to use xcdroast.  You may need to 'pin' the version of cdrtools"
-	einfo "in use.  (See the portage manual for details)"
-
-}