Version bumped. Bug 104752.

Package-Manager: portage-2.0.51.22-r3

8 files changed, 67 insertions, 126 deletions

diff --git a/media-sound/pd/ChangeLog b/media-sound/pd/ChangeLog
index 8eeba885f71b..9e5fb0424ba9 100644
--- a/media-sound/pd/ChangeLog
+++ b/media-sound/pd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/pd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/ChangeLog,v 1.24 2005/08/07 13:32:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/ChangeLog,v 1.25 2005/11/01 21:41:54 matsuu Exp $
+
+  01 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> -files/pd-0.37.1-exp.patch,
+  -pd-0.37.1.ebuild, pd-0.38.4.ebuild:
+  Stable on x86.
+  Removed old verisons.
+
+*pd-0.39_p1 (01 Nov 2005)
+
+  01 Nov 2005; MATSUU Takuto <matsuu@gentoo.org> +pd-0.39_p1.ebuild:
+  Version bumped. Bug 104752.
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pd-0.37.4.ebuild:
   Stable on ppc.
diff --git a/media-sound/pd/Manifest b/media-sound/pd/Manifest
index 65a08ac0feca..2d723063f2ae 100644
--- a/media-sound/pd/Manifest
+++ b/media-sound/pd/Manifest
@@ -1,9 +1,8 @@
 MD5 6aa71afcbdcadc35846c7c41ddc707a6 pd-0.37.4.ebuild 1463
-MD5 f0c21452ebef7825f8a8c50276175b36 pd-0.38.4.ebuild 1664
-MD5 e56926b7d3c78634bbbc67a05cdfc403 pd-0.37.1.ebuild 1549
+MD5 78d68b0dbf9b133c77d41573af5ea04a pd-0.38.4.ebuild 1660
+MD5 2e594d681d0bca3655d39ea850f2dd8e pd-0.39_p1.ebuild 1233
+MD5 f485a0ecec4a15e42baba7642654c543 ChangeLog 4040
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 af70b8641be7013be95c678fe23cdc99 ChangeLog 3755
-MD5 8ab2508812cab6433d3dbd1e07bb21de files/pd-0.37.1-exp.patch 1652
-MD5 37dace0bf73d7401e6b5f5cf08d76b37 files/digest-pd-0.38.4 66
+MD5 5b03cc433fca0bb4719d51988a2d1fff files/digest-pd-0.39_p1 66
 MD5 326134cce004edb4ae2b38882c2480f7 files/digest-pd-0.37.4 66
-MD5 3067c169bd141dd0850e7fa88fa72929 files/digest-pd-0.37.1 66
+MD5 37dace0bf73d7401e6b5f5cf08d76b37 files/digest-pd-0.38.4 66
diff --git a/media-sound/pd/files/digest-pd-0.37.1 b/media-sound/pd/files/digest-pd-0.37.1
deleted file mode 100644
index 4c572684c5c6..000000000000
--- a/media-sound/pd/files/digest-pd-0.37.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5e41996a2a42a281eb73d25792f7641a pd-0.37-1.src.tar.gz 1905714
diff --git a/media-sound/pd/files/digest-pd-0.39_p1 b/media-sound/pd/files/digest-pd-0.39_p1
new file mode 100644
index 000000000000..5e3a71d1e28e
--- /dev/null
+++ b/media-sound/pd/files/digest-pd-0.39_p1
@@ -0,0 +1 @@
+MD5 e7554a0c51056a589b936619a52c6346 pd-0.39-1.src.tar.gz 2304803
diff --git a/media-sound/pd/files/pd-0.37.1-exp.patch b/media-sound/pd/files/pd-0.37.1-exp.patch
deleted file mode 100644
index b9d1d47548dc..000000000000
--- a/media-sound/pd/files/pd-0.37.1-exp.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur pd-0.37-1.orig/extra/expr~/vexp_if.c pd-0.37-1/extra/expr~/vexp_if.c
---- pd-0.37-1.orig/extra/expr~/vexp_if.c	2003-06-16 11:39:09.000000000 -0700
-+++ pd-0.37-1/extra/expr~/vexp_if.c	2004-03-24 17:03:17.000000000 -0800
-@@ -44,7 +44,7 @@
- 
- static char *exp_version = "0.4";
- 
--extern struct ex_ex *ex_eval(struct expr *exp, struct ex_ex *eptr,
-+extern struct ex_ex *ex_eval(struct expr *exptr, struct ex_ex *eptr,
- 						struct ex_ex *optr, int n);
- 
- #ifdef PD
-@@ -888,7 +888,7 @@
-  *  the result pointer 
-  */
- int
--max_ex_tab(struct expr *exp,fts_symbol_t s,struct ex_ex *arg,struct ex_ex *optr)
-+max_ex_tab(struct expr *exptr,fts_symbol_t s,struct ex_ex *arg,struct ex_ex *optr)
- {
- #ifdef PD
- 	t_garray *garray;
-@@ -900,7 +900,7 @@
- 	{
- 		optr->ex_type = ET_FLT;
- 		optr->ex_flt = 0;
--		pd_error(exp, "no such table '%s'", s->s_name);
-+		pd_error(exptr, "no such table '%s'", s->s_name);
- 		return (1);
- 	}
- 	optr->ex_type = ET_FLT;
-@@ -915,7 +915,7 @@
- 		break;
- 
- 	default:	/* do something with strings */
--		pd_error(exp, "expr: bad argument for table '%s'\n", fts_symbol_name(s));
-+		pd_error(exptr, "expr: bad argument for table '%s'\n", fts_symbol_name(s));
- 		indx = 0;
- 	}
- 	if (indx < 0) indx = 0;
-@@ -933,13 +933,13 @@
- }
- 
- int
--max_ex_var(struct expr *exp, fts_symbol_t var, struct ex_ex *optr)
-+max_ex_var(struct expr *exptr, fts_symbol_t var, struct ex_ex *optr)
- {
- 	optr->ex_type = ET_FLT;
- 	if (value_getfloat(var, &(optr->ex_flt))) {
- 		optr->ex_type = ET_FLT;
- 		optr->ex_flt = 0;
--		pd_error(exp, "no such var '%s'", var->s_name);
-+		pd_error(exptr, "no such var '%s'", var->s_name);
- 		return (1);
- 	}
- 	return (0);
diff --git a/media-sound/pd/pd-0.37.1.ebuild b/media-sound/pd/pd-0.37.1.ebuild
deleted file mode 100644
index e8f72879a443..000000000000
--- a/media-sound/pd/pd-0.37.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 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.12 2005/04/12 22:03:09 luckyduck 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}
-	epatch ${FILESDIR}/${P}-exp.patch
-
-	# 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() {
-	# -k to bypass the errors about doc missing, etc...
-	make DESTDIR=${D} install || die "install failed"
-
-	cd ..
-	cp -pr doc extra ${D}/usr/lib/pd
-}
diff --git a/media-sound/pd/pd-0.38.4.ebuild b/media-sound/pd/pd-0.38.4.ebuild
index 5b6e8c3634ab..9600d7b0499a 100644
--- a/media-sound/pd/pd-0.38.4.ebuild
+++ b/media-sound/pd/pd-0.38.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.38.4.ebuild,v 1.1 2005/04/12 22:03:09 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.38.4.ebuild,v 1.2 2005/11/01 21:41:54 matsuu Exp $
 
 IUSE="X alsa debug jack"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www-crca.ucsd.edu/~msp/Software/${MY_P}.src.tar.gz"
 
 LICENSE="|| ( BSD as-is )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
diff --git a/media-sound/pd/pd-0.39_p1.ebuild b/media-sound/pd/pd-0.39_p1.ebuild
new file mode 100644
index 000000000000..8bef1660597e
--- /dev/null
+++ b/media-sound/pd/pd-0.39_p1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pd/pd-0.39_p1.ebuild,v 1.1 2005/11/01 21:41:54 matsuu Exp $
+
+IUSE="alsa debug jack"
+
+inherit eutils
+
+# Miller Puckette uses nonstandard versioning scheme that we have to crunch
+MY_P="${P/_p/-}"
+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="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/tcl-8.3.3
+	>=dev-lang/tk-8.3.3
+	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )"
+
+src_compile() {
+	local myconf
+
+	# --enable-alsa is bork
+	if ! use alsa; then
+		myconf="${myconf} --disable-alsa"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_enable jack) \
+		$(use_enable debug) \
+		|| die "./configure failed"
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	# tb: install private headers ... several external developers use them
+	insinto /usr/include
+	doins m_imp.h g_canvas.h
+}