Minor updates, see changelog.

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 0d407e16784efccfe3fff255327d01b6aff6aae0..b040e32133cdd9984c527eddd4f17e686b12d3c2 100644 (file)
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.9 2002/10/19 16:34:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.10 2002/10/25 11:31:08 aliz Exp $
 
 *cdrdao-1.1.7 (12 Oct 2002)
 
@@ -9,6 +9,9 @@
 
 *cdrdao-1.1.5-r1 (1 Feb 2002)
 
+  25 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> cdrdao-1.1.5-r1.ebuild :
+  Added downloading of the latest drivers file. Also filter flag.
+
   19 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> cdrdao-1.1.5-r1.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
 

diff --git a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
index 1e4d2bf573d29b1fa82afb1a87223bb0fb0e10cf..8fb7a7817d3672131dae300dd125b19e632365ab 100644 (file)
--- a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999 - 2002 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.5-r1.ebuild,v 1.17 2002/10/19 16:34:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild,v 1.18 2002/10/25 11:31:08 aliz Exp $
 
 IUSE="gnome"
 
+inherit flag-o-matic
+
+strip-flags -funroll-loops
+
 S=${WORKDIR}/${P}
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,7 +24,6 @@ DEPEND=">=dev-util/pccts-1.33.24-r1
 KEYWORDS="x86 ppc sparc sparc64"
 
 src_unpack() {
-
        unpack ${A}
        
        patch -p0 <${FILESDIR}/${P}-c++.patch || die
@@ -28,21 +31,26 @@ src_unpack() {
        if [ ! "`use gnome`" ] ; then
                patch -p0 <${FILESDIR}/${P}-gentoo.diff || die
        fi
+
+       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() {
-
        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
+       
+       # 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
 
-       # -funroll-loops do not work
-       CFLAGS="${CFLAGS/-funroll-loops}"
        ./configure "${mygnome}" \
                --prefix=/usr \
                --build="${CHOST}"\
@@ -52,7 +60,6 @@ src_compile() {
 }
 
 src_install() {
-
        # cdrdao gets definitely installed
        # binary
        dobin dao/cdrdao
@@ -67,37 +74,35 @@ src_install() {
        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/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
+       #       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
 }