$DEBUG -> use debug

7 files changed, 12 insertions, 201 deletions

diff --git a/media-sound/pd/files/digest-pd-0.35.0 b/media-sound/pd/files/digest-pd-0.35.0
deleted file mode 100644
index 6a39bdcd7b73..000000000000
--- a/media-sound/pd/files/digest-pd-0.35.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 753920639d209f71a6d2b7de3d092476 pd-0.35-0.linux.tar.gz 1455220
diff --git a/media-sound/pd/files/digest-pd-0.35_pre24 b/media-sound/pd/files/digest-pd-0.35_pre24
deleted file mode 100644
index 2159f1296864..000000000000
--- a/media-sound/pd/files/digest-pd-0.35_pre24
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5e16595c97ffd7e3ccb5296031a4e4c6 pd-0.35-test24.linux.tar.gz 1331557
diff --git a/media-sound/pd/files/pd-0.35-0-gentoo.patch b/media-sound/pd/files/pd-0.35-0-gentoo.patch
deleted file mode 100644
index 894dfa12a71b..000000000000
--- a/media-sound/pd/files/pd-0.35-0-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur pd-0.35-0/src/makefile.in pd-0.35-0.gentoo/src/makefile.in
---- pd-0.35-0/src/makefile.in	Fri May 24 19:08:40 2002
-+++ pd-0.35-0.gentoo/src/makefile.in	Sat Aug 10 22:16:46 2002
-@@ -12,6 +12,8 @@
- INSTALL_PREFIX = @prefix@
- GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
- 
-+MANDIR = @mandir@
-+
- # ALSA compilation
- 
- SOUND_ALSA = @alsa@
-@@ -164,6 +166,7 @@
- 	cd ../extra/pique;make @EXTERNTARGET@
- 
- INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)
-+MANINSTDIR = $(DESTDIR)/$(MANDIR)
- install: 
- 	install -d $(INSTDIR)/lib/pd/bin
- 	install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME)
-@@ -179,12 +182,13 @@
- 	cp -r ../doc $(INSTDIR)/lib/pd/
- 	install -d $(INSTDIR)/include
- 	install -m644 m_pd.h $(INSTDIR)/include/m_pd.h
--	gzip < ../man/pd.1 >  $(INSTDIR)/man/man1/pd.1.gz
--	chmod 644 $(INSTDIR)/man/man1/pd.1.gz
--	gzip < ../man/pdsend.1 >  $(INSTDIR)/man/man1/pdsend.1.gz
--	chmod 644 $(INSTDIR)/man/man1/pdsend.1.gz
--	gzip < ../man/pdreceive.1 >  $(INSTDIR)/man/man1/pdreceive.1.gz
--	chmod 644 $(INSTDIR)/man/man1/pdreceive.1.gz
-+	install -d $(MANINSTDIR)/man1
-+	gzip < ../man/pd.1 >  $(MANINSTDIR)/man1/pd.1.gz
-+	chmod 644 $(MANINSTDIR)/man1/pd.1.gz
-+	gzip < ../man/pdsend.1 >  $(MANINSTDIR)/man1/pdsend.1.gz
-+	chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz
-+	gzip < ../man/pdreceive.1 >  $(MANINSTDIR)/man1/pdreceive.1.gz
-+	chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz
- 
- local-clean:
- 	-rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
diff --git a/media-sound/pd/files/pd-0.35-test24-gentoo.patch b/media-sound/pd/files/pd-0.35-test24-gentoo.patch
deleted file mode 100644
index d35143418a2b..000000000000
--- a/media-sound/pd/files/pd-0.35-test24-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur pd-0.35-test24.orig/src/makefile.in pd-0.35-test24/src/makefile.in
---- pd-0.35-test24.orig/src/makefile.in	Fri May 24 19:08:40 2002
-+++ pd-0.35-test24/src/makefile.in	Tue Jun  4 10:44:00 2002
-@@ -12,6 +12,8 @@
- INSTALL_PREFIX = @prefix@
- GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
- 
-+MANDIR = @mandir@
-+
- # ALSA compilation
- 
- SOUND_ALSA = @alsa@
-@@ -164,6 +166,7 @@
- 	cd ../extra/pique;make @EXTERNTARGET@
- 
- INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)
-+MANINSTDIR = $(DESTDIR)/$(MANDIR)
- install: 
- 	install -d $(INSTDIR)/lib/pd/bin
- 	install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME)
-@@ -179,12 +182,13 @@
- 	cp -r ../doc $(INSTDIR)/lib/pd/
- 	install -d $(INSTDIR)/include
- 	install -m644 m_pd.h $(INSTDIR)/include/m_pd.h
--	gzip < ../man/pd.1 >  $(INSTDIR)/man/man1/pd.1.gz
--	chmod 644 $(INSTDIR)/man/man1/pd.1.gz
--	gzip < ../man/pdsend.1 >  $(INSTDIR)/man/man1/pdsend.1.gz
--	chmod 644 $(INSTDIR)/man/man1/pdsend.1.gz
--	gzip < ../man/pdreceive.1 >  $(INSTDIR)/man/man1/pdreceive.1.gz
--	chmod 644 $(INSTDIR)/man/man1/pdreceive.1.gz
-+	install -d $(MANINSTDIR)/man1
-+	gzip < ../man/pd.1 >  $(MANINSTDIR)/man1/pd.1.gz
-+	chmod 644 $(MANINSTDIR)/man1/pd.1.gz
-+	gzip < ../man/pdsend.1 >  $(MANINSTDIR)/man1/pdsend.1.gz
-+	chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz
-+	gzip < ../man/pdreceive.1 >  $(MANINSTDIR)/man1/pdreceive.1.gz
-+	chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz
- 
- local-clean:
- 	-rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
diff --git a/media-sound/pd/pd-0.35.0-r1.ebuild b/media-sound/pd/pd-0.35.0-r1.ebuild
index 3de61f721ce7..33185ba70b1d 100644
--- a/media-sound/pd/pd-0.35.0-r1.ebuild
+++ b/media-sound/pd/pd-0.35.0-r1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.35.0-r1.ebuild,v 1.4 2003/02/13 13:17:29 vapier Exp $
-
-IUSE="X alsa"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.35.0-r1.ebuild,v 1.5 2003/08/03 02:54:04 vapier Exp $
 
 # Miller Puckette uses nonstandard versioning scheme that we have to crunch
 MY_P=`echo ${P} | sed 's/\.\([0-9]\+\)$/-\1/'`
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="real-time music and multimedia environment"
-SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.linux.tar.gz"
 HOMEPAGE="http://www-crca.ucsd.edu/~msp/software.html"
+SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.linux.tar.gz"
 
-SLOT="0"
 LICENSE="BSD | as-is"
+SLOT="0"
 KEYWORDS="x86"
+IUSE="X alsa"
 
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
@@ -22,46 +21,26 @@ DEPEND=">=dev-lang/tcl-8.3.3
 	X? ( x11-base/xfree )"
 
 src_unpack() {
-
 	unpack ${A}
 
 	cd ${S} || die
-	patch -p1 < ${FILESDIR}/0.35.0-r1.patch || die
+	epatch ${FILESDIR}/${PF}.patch
 
 	cd src || die
 	autoconf || die
-
 }
 
 src_compile() {
-
 	cd src
-
-	local myconf
-	
-	use alsa && myconf="--enable-alsa" \
-		|| myconf="--disable-alsa"
-
-	use X && myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	if [ -n "$DEBUG" ]; then
-		myconf="${myconf} --enable-debug"
-	else
-		myconf="${myconf} --disable-debug"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-
+	econf \
+		`use_enable alsa` \
+		`use_with X x` \
+		`use_enable debug` \
+		|| die "./configure failed"
 	emake || die "parallel make failed"
-
 }
 
-src_install () {
-
+src_install() {
 	cd src
-	make \
-		DESTDIR=${D} \
-		install || die "install failed"
-
+	make DESTDIR=${D} install || die "install failed"
 }
diff --git a/media-sound/pd/pd-0.35.0.ebuild b/media-sound/pd/pd-0.35.0.ebuild
deleted file mode 100644
index feb6995afefe..000000000000
--- a/media-sound/pd/pd-0.35.0.ebuild
+++ /dev/null
@@ -1,43 +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-sound/pd/pd-0.35.0.ebuild,v 1.2 2003/02/13 13:17:35 vapier Exp $
-
-# Miller Puckette uses nonstandard versioning scheme that we have to crunch
-MY_P=`echo ${P} | sed 's/\.\([0-9]\+\)$/-\1/'`
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="real-time music and multimedia environment"
-SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.linux.tar.gz"
-HOMEPAGE="http://www-crca.ucsd.edu/~msp/software.html"
-
-SLOT="0"
-LICENSE="BSD | as-is"
-KEYWORDS="x86"
-
-#
-# need to do something with alsa here:
-# pd can be configured to use alsa-0.5x or alsa-0.9x,
-# but i don't know how to determine which one is installed
-# automagicly
-#
-DEPEND=">=dev-lang/tcl-8.3.3
-	>=dev-lang/tk-8.3.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-	patch -p1 < ${FILESDIR}/${MY_P}-gentoo.patch || die
-	cd src || die
-	autoconf || die
-}
-
-src_compile() {
-
-	cd src
-	econf || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	cd src
-	make DESTDIR=${D} install || die
-}
diff --git a/media-sound/pd/pd-0.35_pre24.ebuild b/media-sound/pd/pd-0.35_pre24.ebuild
deleted file mode 100644
index 18a09650953d..000000000000
--- a/media-sound/pd/pd-0.35_pre24.ebuild
+++ /dev/null
@@ -1,43 +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-sound/pd/pd-0.35_pre24.ebuild,v 1.3 2003/02/13 13:17:39 vapier Exp $
-
-# Miller Puckette uses nonstandard versioning scheme that we have to crunch
-MY_P=${P/_pre/-test}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="real-time music and multimedia environment"
-SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.linux.tar.gz"
-HOMEPAGE="http://www-crca.ucsd.edu/~msp/software.html"
-
-SLOT="0"
-LICENSE="BSD | as-is"
-KEYWORDS="x86"
-
-#
-# need to do something with alsa here:
-# pd can be configured to use alsa-0.5x or alsa-0.9x,
-# but i don't know how to determine which one is installed
-# automagicly
-#
-DEPEND=">=dev-lang/tcl-8.3.3
-	>=dev-lang/tk-8.3.3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-	patch -p1 < ${FILESDIR}/${MY_P}-gentoo.patch || die
-	cd src || die
-	autoconf || die
-}
-
-src_compile() {
-
-	cd src
-	econf || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	cd src
-	make DESTDIR=${D} install || die
-}