need eutils for epatch

4 files changed, 191 insertions, 224 deletions

diff --git a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
index d703bc080c1c..958ab3ad0600 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild
@@ -1,36 +1,31 @@
 # 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.5-r1.ebuild,v 1.22 2003/07/12 21:39:27 aliz Exp $
-
-IUSE="gnome"
-
-inherit flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.5-r1.ebuild,v 1.23 2003/08/05 15:04:16 vapier Exp $
 
+inherit flag-o-matic eutils
 strip-flags -funroll-loops
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc "
+IUSE="gnome"
+
 RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 
 	<dev-cpp/gtkmm-1.3.0
 	>=dev-cpp/gnomemm-1.1.17 )"
-
 DEPEND=">=dev-util/pccts-1.33.24-r1
 	${RDEPEND}"
 
-KEYWORDS="x86 ppc sparc "
-
 src_unpack() {
 	unpack ${A}
 	
-	patch -p0 <${FILESDIR}/${P}-c++.patch || die
+	epatch ${FILESDIR}/${P}-c++.patch
 
-	if [ ! "`use gnome`" ] ; then
-		patch -p0 <${FILESDIR}/${P}-gentoo.diff || die
-	fi
+	[ ! "`use gnome`" ] && epatch ${FILESDIR}/${P}-gentoo.diff
 
 	cd ${S}/dao
 	wget http://cdrdao.sourceforge.net/${P}.drivers
@@ -54,8 +49,8 @@ src_compile() {
 	./configure "${mygnome}" \
 		--prefix=/usr \
 		--build="${CHOST}"\
-		--host="${CHOST}"
-		
+		--host="${CHOST}" \
+		|| die "configure failed"
 	emake || die
 }
 
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild
index 0f97d52201ce..2cf31c3d1e61 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild
@@ -1,110 +1,99 @@
 # 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.9 2003/06/21 00:11:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r1.ebuild,v 1.10 2003/08/05 15:04:16 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
-IUSE="gnome oggvorbis"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
 LICENSE="GPL-2"
-RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-        	>=dev-cpp/gnomemm-1.2.2 )
-        dev-perl/MP3-Info
-        dev-perl/Audio-Wav
-        dev-perl/Audio-Tools"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha"
+IUSE="gnome oggvorbis"
 
+RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
+	>=dev-cpp/gnomemm-1.2.2 )
+	dev-perl/MP3-Info
+	dev-perl/Audio-Wav
+	dev-perl/Audio-Tools"
 DEPEND=">=dev-util/pccts-1.33.24-r1
-        ${RDEPEND}"
-
-KEYWORDS="x86 ppc ~sparc alpha"
+	${RDEPEND}"
 
 src_unpack() {
-        unpack ${A}
-        cd ${S}
+	unpack ${A}
+	cd ${S}
 
-        patch -p0 < ${FILESDIR}/${PF}-mp32dao-gentoo.diff || die
+	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
+	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"
-                CFLAGS="${CFLAGS} `/usr/bin/gtkmm-config --cflags`"
-                CXXFLAGS="${CXXFLAGS} `/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}"
-
-        emake || die
+	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
+	# 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.7-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
index d3b77cf555fb..3c7b6e184f67 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
@@ -1,118 +1,112 @@
 # 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-r2.ebuild,v 1.2 2003/07/11 20:41:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild,v 1.3 2003/08/05 15:04:16 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
-IUSE="gnome oggvorbis"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc alpha hppa"
+IUSE="gnome oggvorbis"
+
 RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-        	>=dev-cpp/gnomemm-1.2.2 )
-        dev-perl/MP3-Info
-        dev-perl/Audio-Wav
-        dev-perl/Audio-Tools
+	>=dev-cpp/gnomemm-1.2.2 )
+	dev-perl/MP3-Info
+	dev-perl/Audio-Wav
+	dev-perl/Audio-Tools
 	>=app-cdr/cdrtools-2.01_alpha16
 	>=sys-apps/sed-4"
-
 DEPEND=">=dev-util/pccts-1.33.24-r1
-        ${RDEPEND}"
-
-KEYWORDS="~x86 ~ppc ~sparc alpha hppa"
+	${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
+	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=""
+	local mygnome=""
 
-        if [ "`use gnome`" ] ; then
-                mygnome=" --with-gnome"
+	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}" \
+	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
-
-        emake || die
+		--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 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
+	# 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.7.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7.ebuild
index 6b7a85fe28f5..0a2f816ed205 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.7.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.7.ebuild
@@ -1,50 +1,42 @@
 # 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.ebuild,v 1.9 2003/06/21 00:11:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7.ebuild,v 1.10 2003/08/05 15:04:16 vapier Exp $
 
 inherit flag-o-matic
 
-IUSE="gnome"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 HOMEPAGE="http://cdrdao.sourceforge.net/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc alpha"
+IUSE="gnome"
+
 RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 
 	>=dev-cpp/gnomemm-1.2.2 )"
-
 DEPEND=">=dev-util/pccts-1.33.24-r1
 	${RDEPEND}"
 
-KEYWORDS="x86 ~ppc ~sparc alpha"
-
 src_compile() {
-	
 	local mygnome=""
 
 	if [ "`use gnome`" ] ; then
 		mygnome=" --with-gnome"
-		CFLAGS="${CFLAGS} `/usr/bin/gtkmm-config --cflags`"
-		CXXFLAGS="${CXXFLAGS} `/usr/bin/gtkmm-config --cflags` -fno-exceptions"
-		
+		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}"
-	
+		--host="${CHOST}" \
+		|| die "configure failed"
 	emake || die
 }
 
 src_install() {
-
 	# cdrdao gets definitely installed
 	# binary
 	dobin dao/cdrdao
@@ -62,11 +54,8 @@ src_install() {
 	docinto ""
 	dodoc COPYING CREDITS INSTALL README* Release*
 	
- 
 	# and now the optional GNOME frontend
-	if [ "`use gnome`" ]
-	then
-
+	if [ "`use gnome`" ] ; then
 		# binary
 		into /usr
 		dobin xdao/gcdmaster