$DEBUG -> use debug

4 files changed, 28 insertions, 86 deletions

diff --git a/media-libs/nurbs++/files/digest-nurbs++-3.0.10 b/media-libs/nurbs++/files/digest-nurbs++-3.0.10
deleted file mode 100644
index 5391f34da7b3..000000000000
--- a/media-libs/nurbs++/files/digest-nurbs++-3.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2898e7c5de4fffaf4310f17a6a7adac4 nurbs++-3.0.10.tar.bz2 324528
diff --git a/media-libs/nurbs++/nurbs++-3.0.10.ebuild b/media-libs/nurbs++/nurbs++-3.0.10.ebuild
deleted file mode 100644
index 47c9a90a9f53..000000000000
--- a/media-libs/nurbs++/nurbs++-3.0.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nurbs++/nurbs++-3.0.10.ebuild,v 1.9 2003/03/11 21:11:46 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="NURBS surfaces manipulation library"
-SRC_URI="http://yukon.genie.uottawa.ca/~lavoie/software/nurbs/${P}.tar.bz2"
-HOMEPAGE="http://yukon.genie.uottawa.ca/~lavoie/software/nurbs/"
-
-
-SLOT="3"
-LICENSE="LGPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/x11
-	dev-lang/perl"
-	#media-gfx/imagemagick # doesn't work yet either
-	# opengl? ( virtual/opengl ) # doesn't work yet
-
-src_compile() {
-
-	#use opengl \
-	#	&& myconf="$myconf --with-opengl=/usr" \
-	#	|| myconf="$myconf --without-opengl"
-	[ -n "$DEBUG" ] \
-		&& myconf="${myconf} \
-			--enable-debug \
-			--enable-exception \
-			--enable-verbose-exception" \
-		||  myconf="${myconf} \
-			--disable-debug \
-			--disable-exception \
-			--disable-verbose-exception"
-
-	./configure --with-x --prefix=/usr ${myconf} || die # --with-magick
-		
-	make || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-		
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-
-}
diff --git a/media-libs/nurbs++/nurbs++-3.0.11.ebuild b/media-libs/nurbs++/nurbs++-3.0.11.ebuild
index 92d3b05388e0..a40b451422ab 100644
--- a/media-libs/nurbs++/nurbs++-3.0.11.ebuild
+++ b/media-libs/nurbs++/nurbs++-3.0.11.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nurbs++/nurbs++-3.0.11.ebuild,v 1.6 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nurbs++/nurbs++-3.0.11.ebuild,v 1.7 2003/08/03 02:47:01 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="NURBS surfaces manipulation library"
-SRC_URI="mirror://sourceforge/libnurbs/${P}.tar.bz2"
 HOMEPAGE="http://libnurbs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libnurbs/${P}.tar.bz2"
 
-
-SLOT="3"
 LICENSE="LGPL-2"
-KEYWORDS="x86 sparc "
+SLOT="3"
+KEYWORDS="x86 sparc"
+IUSE="debug" #opengl
 
 DEPEND="virtual/x11
 	dev-lang/perl"
@@ -18,30 +17,23 @@ DEPEND="virtual/x11
 	# opengl? ( virtual/opengl ) # doesn't work yet
 
 src_compile() {
-
+	local myconf=""
 	#use opengl \
-	#	&& myconf="$myconf --with-opengl=/usr" \
-	#	|| myconf="$myconf --without-opengl"
-	[ -n "$DEBUG" ] \
-		&& myconf="${myconf} \
-			--enable-debug \
-			--enable-exception \
-			--enable-verbose-exception" \
-		||  myconf="${myconf} \
-			--disable-debug \
-			--disable-exception \
-			--disable-verbose-exception"
-
-	./configure --with-x --prefix=/usr ${myconf} || die # --with-magick
-		
+	#	&& myconf="${myconf} --with-opengl=/usr" \
+	#	|| myconf="${myconf} --without-opengl"
+
+	./configure \
+		--with-x \
+		--prefix=/usr \
+		`use_enable debug` \
+		`use_enable debug exception` \
+		`use_enable debug verbose-exception` \
+		${myconf} \
+		|| die # --with-magick
 	make || die
-
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
-		
 	dodoc AUTHORS COPYING ChangeLog NEWS README
-
 }
diff --git a/media-sound/gogo/gogo-3.10-r1.ebuild b/media-sound/gogo/gogo-3.10-r1.ebuild
index 2a3434407a79..51b85c2b7309 100644
--- a/media-sound/gogo/gogo-3.10-r1.ebuild
+++ b/media-sound/gogo/gogo-3.10-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.6 2003/02/13 13:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.7 2003/08/03 02:48:40 vapier Exp $
 
-S=${WORKDIR}/petit310pl3
+MY_PV=310pl3
 DESCRIPTION="GoGo is an assembly optimized version of LAME 3.91"
-SRC_URI="http://member.nifty.ne.jp/~pen/free/gogo3/down/petit310pl3.tgz"
 HOMEPAGE="http://member.nifty.ne.jp/~pen/free/gogo3/mct_gogo.htm"
+SRC_URI="http://member.nifty.ne.jp/~pen/free/gogo3/down/petit${MY_PV}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc "
+SLOT="0"
+KEYWORDS="x86 -ppc -sparc"
 
 DEPEND="dev-lang/nasm"
 #	>=sys-libs/ncurses-5.H2
@@ -21,8 +21,9 @@ DEPEND="dev-lang/nasm"
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
 #	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
 
-src_compile() {
+S=${WORKDIR}/petit${MY_PV}
 
+src_compile() {
 	local myconf=""
 #	if [ "`use oggvorbis`" ] ; then
 #		myconf="--with-vorbis"
@@ -33,11 +34,9 @@ src_compile() {
 #	if [ "`use gtk`" ] ; then
 #		myconf="$myconf --enable-mp3x"
 #	fi
-	if [ "$DEBUG" ] ; then
-		myconf="$myconf --enable-debug=yes"
-	else
-		myconf="$myconf --enable-debug=no"
-	fi
+	[ `use debug` ] \
+		&& myconf="$myconf --enable-debug=yes" \
+		|| myconf="$myconf --enable-debug=no"
 	
 	econf \
 		--enable-shared \
@@ -49,8 +48,7 @@ src_compile() {
 }
 
 src_install () {
-
-	patch -p0 < ${FILESDIR}/make-work-3.10pl3.patch || die
+	epatch ${FILESDIR}/make-work-3.10pl3.patch
 
 	dodir /usr/bin
 	dodir /usr/share/man