bug 20801

9 files changed, 120 insertions, 15 deletions

diff --git a/media-sound/bpmdj/Manifest b/media-sound/bpmdj/Manifest
index 7ba30a82219e..dd10d6e01a26 100644
--- a/media-sound/bpmdj/Manifest
+++ b/media-sound/bpmdj/Manifest
@@ -1,12 +1,12 @@
-MD5 2fa537f14c8276d4762cf9325790adf5 bpmdj-1.5.ebuild 664
-MD5 5ce67771b8b4edd5de499d1fbd8e4b4e ChangeLog 822
-MD5 46a50681ee9a82209fa47b9a04c98801 bpmdj-1.7.ebuild 688
-MD5 c432e878910d30051d17caac73f6bea3 bpmdj-1.6.ebuild 632
-MD5 3c111410bf0750aadf4e5993ecb336e8 bpmdj-1.8.ebuild 639
+MD5 c715b65fce426ce9892d6f1fb32d383d ChangeLog 921
+MD5 847619c2dd902167fc813fe0802fc2c6 bpmdj-1.5.ebuild 665
+MD5 39c4c29e27042920fd02fed7dbe45596 bpmdj-1.6.ebuild 632
+MD5 e9d4f384578a02deb87e22031b08f4da bpmdj-1.7.ebuild 699
+MD5 b8894961ee2856bdff66b65e48418fd3 bpmdj-1.8.ebuild 666
 MD5 946e0049ea85710b4cc9fea4b9986ccf files/digest-bpmdj-1.7 66
 MD5 de7ee79975ed2158d870f352f9961778 files/digest-bpmdj-1.5 65
 MD5 6c2b6421f6c4ade4a1bb8040a5a78247 files/digest-bpmdj-1.6 65
 MD5 1ab89fc05943dbae022e30c2ef830df8 files/makefile 7686
 MD5 0916592b27a911e4693cc4ad8f56a650 files/digest-bpmdj-1.8 65
-MD5 c3f7f5856a9885777b5c5efa15a01167 files/fabsl-1.7.patch 567
-MD5 0f0414309bf6735f11b1b9878db6cb00 files/fabsl-1.8.patch 993
+MD5 4f7cb7fcaf48f820d690675d5d76fcd6 files/fabsl-1.7.patch 896
+MD5 a8b35f9eec4a969f1c2dddc22c58f185 files/fabsl-1.8.patch 971
diff --git a/media-sound/bpmdj/bpmdj-1.5.ebuild b/media-sound/bpmdj/bpmdj-1.5.ebuild
index 0cb824eefb8a..b2f91f195bc7 100644
--- a/media-sound/bpmdj/bpmdj-1.5.ebuild
+++ b/media-sound/bpmdj/bpmdj-1.5.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.5.ebuild,v 1.2 2003/02/13 13:08:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.5.ebuild,v 1.3 2003/07/14 18:18:26 pvdabeel Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
 HOMEPAGE="http://bpmdj.strokemusic.org"
 
-SRC_URI="ftp://bpmdj.strokemusic.org/bpmdj/1.5/bpmdj-1.5.source.tgz"
+SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.5/bpmdj-1.5.source.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="x11-libs/qt*"
-
 RDEPEND="mpg123"
 
 src_compile() {
diff --git a/media-sound/bpmdj/bpmdj-1.6.ebuild b/media-sound/bpmdj/bpmdj-1.6.ebuild
index 2e61f6b02aa8..ad2b096520ab 100644
--- a/media-sound/bpmdj/bpmdj-1.6.ebuild
+++ b/media-sound/bpmdj/bpmdj-1.6.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.6.ebuild,v 1.1 2003/02/28 11:24:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.6.ebuild,v 1.2 2003/07/14 18:18:26 pvdabeel Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
 HOMEPAGE="http://bpmdj.strokemusic.org"
 
-SRC_URI="ftp://bpmdj.strokemusic.org/bpmdj/1.6/bpmdj-1.6.source.tgz"
+SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.6/bpmdj-1.6.source.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 
 DEPEND="x11-libs/qt*"
 
@@ -18,7 +18,6 @@ RDEPEND="mpg123"
 
 src_compile() {
 	cp defines.gentoo defines
-	cp ${FILESDIR}/makefile makefile
 	make || die
 }
 
diff --git a/media-sound/bpmdj/bpmdj-1.7.ebuild b/media-sound/bpmdj/bpmdj-1.7.ebuild
new file mode 100644
index 000000000000..69ded3a8a804
--- /dev/null
+++ b/media-sound/bpmdj/bpmdj-1.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.7.ebuild,v 1.1 2003/07/14 18:18:26 pvdabeel Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
+HOMEPAGE="http://bpmdj.strokemusic.org"
+
+SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.7/bpmdj-1.7.source.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+DEPEND="x11-libs/qt*"
+RDEPEND="mpg123"
+
+inherit eutils
+
+src_compile() {
+	epatch ${FILESDIR}/fabsl-1.7.patch || die
+	cp defines.gentoo defines || die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} deb-install || die
+}
diff --git a/media-sound/bpmdj/bpmdj-1.8.ebuild b/media-sound/bpmdj/bpmdj-1.8.ebuild
new file mode 100644
index 000000000000..13c429d567bb
--- /dev/null
+++ b/media-sound/bpmdj/bpmdj-1.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-1.8.ebuild,v 1.1 2003/07/14 18:18:26 pvdabeel Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
+HOMEPAGE="http://bpmdj.strokemusic.org"
+
+SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.8/bpmdj-1.8.source.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+DEPEND="x11-libs/qt*"
+RDEPEND="mpg123"
+
+inherit eutils
+
+src_compile() { 
+	epatch ${FILESDIR}/fabsl-1.8.patch || die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} deb-install || die
+}
diff --git a/media-sound/bpmdj/files/digest-bpmdj-1.7 b/media-sound/bpmdj/files/digest-bpmdj-1.7
new file mode 100644
index 000000000000..ef2f057a8c5a
--- /dev/null
+++ b/media-sound/bpmdj/files/digest-bpmdj-1.7
@@ -0,0 +1 @@
+MD5 b1802aa463ab03298da9967af31da145 bpmdj-1.7.source.tgz 1705756
diff --git a/media-sound/bpmdj/files/digest-bpmdj-1.8 b/media-sound/bpmdj/files/digest-bpmdj-1.8
new file mode 100644
index 000000000000..8b8a8a83b7cd
--- /dev/null
+++ b/media-sound/bpmdj/files/digest-bpmdj-1.8
@@ -0,0 +1 @@
+MD5 4f4d09723c42b37f005df2f9135f1de9 bpmdj-1.8.source.tgz 697466
diff --git a/media-sound/bpmdj/files/fabsl-1.7.patch b/media-sound/bpmdj/files/fabsl-1.7.patch
new file mode 100644
index 000000000000..fa0eea0cf9fe
--- /dev/null
+++ b/media-sound/bpmdj/files/fabsl-1.7.patch
@@ -0,0 +1,22 @@
+--- kbpm-counter.cpp	2003-04-26 19:31:56.000000000 +0200
++++ /root/kbpm-counter.cpp	2003-07-14 19:55:32.000000000 +0200
+@@ -617,8 +617,8 @@
+   // normalize the result
+   double max = 0;
+   for(pos=0;pos<blocksize/2;pos++)
+-    // fftfreq[pos]=fabsl(fftfreq[pos]*(double)pos/((double)blocksize*10.0));
+-    fftfreq[pos]=fabsl(fftfreq[pos]);
++    // fftfreq[pos]=fabs(fftfreq[pos]*(double)pos/((double)blocksize*10.0));
++    fftfreq[pos]=fabs(fftfreq[pos]);
+   for(pos=0;pos<blocksize/2;pos++)
+     if (fftfreq[pos]>max) 
+       max=fftfreq[pos];
+@@ -637,7 +637,7 @@
+ 	  {
+ 	    double length = barkbounds[bark+1]-barkbounds[bark];
+ 	    double barkcentre = barkbounds[bark]+length/2.0;
+-	    double dist = fabsl(freq-barkcentre)*2.0/length;
++	    double dist = fabs(freq-barkcentre)*2.0/length;
+ 	    double scale = 1.0 - dist;
+ 	    assert(scale>=0.0);
+ 	    barkscale[bark]+=fftfreq[pos]*scale;
diff --git a/media-sound/bpmdj/files/fabsl-1.8.patch b/media-sound/bpmdj/files/fabsl-1.8.patch
new file mode 100644
index 000000000000..3cc69221f7ff
--- /dev/null
+++ b/media-sound/bpmdj/files/fabsl-1.8.patch
@@ -0,0 +1,28 @@
+--- spectrumanalyzer.logic.cpp	2003-06-12 23:12:20.000000000 +0200
++++ /root/spectrumanalyzer.logic.cpp	2003-07-14 19:29:52.000000000 +0200
+@@ -47,6 +47,7 @@
+ #include <time.h>
+ #include <sys/times.h>
+ #include <math.h>
++#include <cmath>
+ #include <assert.h>
+ #include <math.h>
+ #include <pthread.h>
+@@ -192,7 +193,7 @@
+   double max = 0;
+   for(pos=0;pos<blocksize/2;pos++)
+     // fftfreq[pos]=fabsl(fftfreq[pos]*(double)pos/((double)blocksize*10.0));
+-    fftfreq[pos]=fabsl(fftfreq[pos]);
++    fftfreq[pos]=fabs(fftfreq[pos]);
+   for(pos=0;pos<blocksize/2;pos++)
+     if (fftfreq[pos]>max) 
+       max=fftfreq[pos];
+@@ -211,7 +212,7 @@
+ 	  {
+ 	    double length = barkbounds[bark+1]-barkbounds[bark];
+ 	    double barkcentre = barkbounds[bark]+length/2.0;
+-	    double dist = fabsl(freq-barkcentre)*2.0/length;
++	    double dist = fabs(freq-barkcentre)*2.0/length;
+ 	    double scale = 1.0 - dist;
+ 	    assert(scale>=0.0);
+ 	    barkscale[bark]+=fftfreq[pos]*scale;