Removing sed from global context. Version bump.

7 files changed, 75 insertions, 133 deletions

diff --git a/media-sound/pd/ChangeLog b/media-sound/pd/ChangeLog
index 0b357bb9acb3..6f6012840a18 100644
--- a/media-sound/pd/ChangeLog
+++ b/media-sound/pd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/ChangeLog,v 1.19 2004/06/25 00:16:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/ChangeLog,v 1.20 2004/11/11 08:53:07 eradicator Exp $
+
+*pd-0.37.4 (11 Nov 2004)
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pd-0.35.0-r2.patch, -files/pd-0.37.0-jack-fix.patch,
+  pd-0.37.1.ebuild, +pd-0.37.4.ebuild:
+  Removing sed from global context.  Version bump.
 
   10 May 2004; Jeremy Huddleston <eradicator@gentoo.org> pd-0.37.1.ebuild:
   Fix ebuild to workaround --enable-alsa borkage. Thanks to Jan Jungmann
diff --git a/media-sound/pd/Manifest b/media-sound/pd/Manifest
index c29baf557985..f202f85c0e59 100644
--- a/media-sound/pd/Manifest
+++ b/media-sound/pd/Manifest
@@ -1,6 +1,8 @@
 MD5 bcab32c0e4318f7cb61b80f1f7248130 ChangeLog 3077
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 6b5c42053255c506accda674be0175b2 pd-0.37.1.ebuild 1521
+MD5 9d0702a71daf2b5f84aabd9a2793bf63 pd-0.37.1.ebuild 1549
+MD5 99998995480a1f6ab72ab8e568a82809 pd-0.37.4.ebuild 1557
+MD5 326134cce004edb4ae2b38882c2480f7 files/digest-pd-0.37.4 66
 MD5 3067c169bd141dd0850e7fa88fa72929 files/digest-pd-0.37.1 66
 MD5 ad45c004132cff28b26df08ed85a8dbb files/pd-0.35.0-r2.patch 3689
 MD5 76bf00a8a6cb89d34a3786f5bfe766cd files/pd-0.37.0-jack-fix.patch 721
diff --git a/media-sound/pd/files/digest-pd-0.37.4 b/media-sound/pd/files/digest-pd-0.37.4
new file mode 100644
index 000000000000..0c77b2bcda4b
--- /dev/null
+++ b/media-sound/pd/files/digest-pd-0.37.4
@@ -0,0 +1 @@
+MD5 dab3d21edd3bbdc4d4053fde6fa9a0d7 pd-0.37-4.src.tar.gz 1950741
diff --git a/media-sound/pd/files/pd-0.35.0-r2.patch b/media-sound/pd/files/pd-0.35.0-r2.patch
deleted file mode 100644
index 4a54706dc243..000000000000
--- a/media-sound/pd/files/pd-0.35.0-r2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -urN pd-0.35-0/extra/fiddle~/fiddle~.c pd-0.35-0-modified/extra/fiddle~/fiddle~.c
---- pd-0.35-0/extra/fiddle~/fiddle~.c	Mon Jun 10 21:10:24 2002
-+++ pd-0.35-0-modified/extra/fiddle~/fiddle~.c	Wed Sep 25 13:33:42 2002
-@@ -693,11 +693,11 @@
- 
-     for (npitch = 0; npitch < x->x_npitch; npitch++)
-     {
--	int index;
-+	int index_gentoo;
- 	float best;
- 	if (npitch)
- 	{
--	    for (best = 0, index = -1, j=1; j < maxbin-1; j++)
-+	    for (best = 0, index_gentoo = -1, j=1; j < maxbin-1; j++)
- 	    {
- 		if (histogram[j] > best && histogram[j] > histogram[j-1] &&
- 		    histogram[j] > histogram[j+1])
-@@ -717,7 +717,7 @@
- 			if (histogram[j + sigfiddle_intpartialonset[k]]
- 			    > histogram[j]) goto peaknogood;
- 		    }
--		    index = j;
-+		    index_gentoo = j;
- 		    best = histogram[j];
- 		}
- 	    peaknogood: ;
-@@ -725,13 +725,13 @@
- 	}
- 	else
- 	{
--	    for (best = 0, index = -1, j=0; j < maxbin; j++)
-+	    for (best = 0, index_gentoo = -1, j=0; j < maxbin; j++)
- 		if (histogram[j] > best)
--		    index = j,  best = histogram[j];
-+		    index_gentoo = j,  best = histogram[j];
- 	}
--	if (index < 0) break;
-+	if (index_gentoo < 0) break;
- 	histvec[npitch].h_value = best;
--	histvec[npitch].h_index = index;
-+	histvec[npitch].h_index = index_gentoo;
-     }
- #if 1
-     if (x->x_nprint)
-@@ -1632,8 +1632,7 @@
- {
-      if (sp[0]->s_n > x->x_hop) {
-     	x->x_downsample = sp[0]->s_n / x->x_hop;
--    	post("* warning: fiddle~: will downsample input by
--%ld",x->x_downsample);
-+    	post("* warning: fiddle~: will downsample input by %ld",x->x_downsample);
-     	x->x_sr = sp[0]->s_sr / x->x_downsample;
-     } else {
-     	x->x_downsample = 1;
-diff -urN pd-0.35-0/src/makefile.in pd-0.35-0-modified/src/makefile.in
---- pd-0.35-0/src/makefile.in	Fri May 24 12:08:40 2002
-+++ pd-0.35-0-modified/src/makefile.in	Wed Sep 25 14:03:37 2002
-@@ -12,6 +12,8 @@
- INSTALL_PREFIX = @prefix@
- GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
- 
-+MANDIR = @mandir@
-+
- # ALSA compilation
- 
- SOUND_ALSA = @alsa@
-@@ -164,13 +166,14 @@
- 	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)
- 	install $(BIN_DIR)/pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog
--	install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk
-+	install -m 644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk
- 	install -d $(INSTDIR)/bin
--	install -m755 $(PDEXEC) $(INSTDIR)/bin/pd
-+	install -m 755 $(PDEXEC) $(INSTDIR)/bin/pd
- 	install -m 755 $(BIN_DIR)/pdsend $(INSTDIR)/bin/pdsend
- 	install -m 755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive 
- 	install -d $(INSTDIR)/lib/pd/extra
-@@ -178,13 +181,14 @@
- 	install -m 644 $(EXTERNS) $(INSTDIR)/lib/pd/extra
- 	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 -m 644 m_pd.h $(INSTDIR)/include/m_pd.h
-+	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.37.0-jack-fix.patch b/media-sound/pd/files/pd-0.37.0-jack-fix.patch
deleted file mode 100644
index 18cd2385bbf8..000000000000
--- a/media-sound/pd/files/pd-0.37.0-jack-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN pd-0.37-0/src/s_audio_jack.c pd-0.37-0-fixed/src/s_audio_jack.c
---- pd-0.37-0/src/s_audio_jack.c	2003-08-19 14:13:03.000000000 -0500
-+++ pd-0.37-0-fixed/src/s_audio_jack.c	2004-02-03 08:14:56.000000000 -0600
-@@ -67,9 +67,8 @@
- }
- 
- static int
--srate (jack_nframes_t srate, void *arg)
-+jack_srate (jack_nframes_t srate, void *arg)
- {
--        printf ("jack: sample rate %ld/sec\n", srate);
- 	sys_dacsr = srate;
-         return 0;
- }
-@@ -248,7 +247,7 @@
-            the sample rate of the system changes.
-         */
-  
--        jack_set_sample_rate_callback (jack_client, srate, 0);
-+        jack_set_sample_rate_callback (jack_client, jack_srate, 0);
- 	
- 
- 	/* tell the JACK server to call `jack_shutdown()' if
diff --git a/media-sound/pd/pd-0.37.1.ebuild b/media-sound/pd/pd-0.37.1.ebuild
index c742af71fa00..3a5104c58055 100644
--- a/media-sound/pd/pd-0.37.1.ebuild
+++ b/media-sound/pd/pd-0.37.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.37.1.ebuild,v 1.10 2004/11/09 22:24:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.37.1.ebuild,v 1.11 2004/11/11 08:53:07 eradicator Exp $
 
-inherit eutils
+inherit eutils versionator
 
 # Miller Puckette uses nonstandard versioning scheme that we have to crunch
-MY_P=`echo ${P} | sed 's/\.\([0-9]\+\)$/-\1/'`
+MY_PV=$(replace_version_separator 2 '-')
+MY_P="${PN}-${MY_PV}"
 S=${WORKDIR}/${MY_P}/src
 
 DESCRIPTION="real-time music and multimedia environment"
diff --git a/media-sound/pd/pd-0.37.4.ebuild b/media-sound/pd/pd-0.37.4.ebuild
new file mode 100644
index 000000000000..34c6f3bf3b78
--- /dev/null
+++ b/media-sound/pd/pd-0.37.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.37.4.ebuild,v 1.1 2004/11/11 08:53:07 eradicator Exp $
+
+inherit eutils versionator
+
+# Miller Puckette uses nonstandard versioning scheme that we have to crunch
+MY_PV=$(replace_version_separator 2 '-')
+MY_P="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}/src
+
+DESCRIPTION="real-time music and multimedia environment"
+HOMEPAGE="http://www-crca.ucsd.edu/~msp/software.html"
+SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.src.tar.gz"
+
+LICENSE="|| ( BSD as-is )"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="X alsa debug"
+
+RDEPEND=">=dev-lang/tcl-8.3.3
+	>=dev-lang/tk-8.3.3
+	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+	X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix install borkage... this errors in sandbox, but it still performs the copy,
+	# so we remove it from the makefile and just do it ourselves ignoring the error
+	sed -i 's:\(cp -pr ../doc ../extra $(INSTDIR)/lib/pd/\):# \1:' ${S}/makefile.in
+}
+
+src_compile() {
+	local myconf
+
+	# --enable-alsa is bork
+	if ! use alsa; then
+		myconf="${myconf} --disable-alsa"
+	fi
+
+	econf \
+		${myconf} \
+		`use_with X x` \
+		`use_enable debug` \
+		|| die "./configure failed"
+
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+
+	cd ..
+	cp -pr doc extra ${D}/usr/lib/pd
+}