Version bump to 2.7 + cleanup old versions. Closes bug #84810.

(Portage version: 2.0.51.22-r1)

6 files changed, 61 insertions, 50 deletions

diff --git a/media-sound/bpmdj/ChangeLog b/media-sound/bpmdj/ChangeLog
index 9b7b0ebc58eb..8d922215c589 100644
--- a/media-sound/bpmdj/ChangeLog
+++ b/media-sound/bpmdj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/bpmdj
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.19 2004/12/19 05:37:16 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.20 2005/07/17 19:24:46 fvdpol Exp $
+
+  17 Jul 2005; Frank van de Pol <fvdpol@gentoo.org> :
+  Version bump to 2.7 + cleanup old versions. Closes bug #84810.
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> bpmdj-2.6.ebuild:
   Stable x86.
diff --git a/media-sound/bpmdj/Manifest b/media-sound/bpmdj/Manifest
index be3f9545f59d..2e191ebc6823 100644
--- a/media-sound/bpmdj/Manifest
+++ b/media-sound/bpmdj/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2db567e03567ccbb0f42575b5e9679f9 ChangeLog 3196
-MD5 2ebceed102cf9606535ca1551daa0373 bpmdj-1.9.ebuild 771
 MD5 f14eac4b2cc948a5ae6ca37b64372555 bpmdj-2.5.ebuild 1102
+MD5 dba7000ee03c3c5dc99491823f02c027 bpmdj-2.7.ebuild 1676
 MD5 9c4b09469a3feba138a0021ac08f08dc bpmdj-2.6.ebuild 1598
+MD5 7f9f6e207664c6f65cf80b05205f4e12 ChangeLog 3316
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 3a9529455bb8bc91f60925011fb648bb files/bpmdj-2.6-errno.patch 375
-MD5 db7cfc7cc26eb7fe63fcb6d62f215117 files/digest-bpmdj-1.9 66
 MD5 2b34dadd03537b0845c2d9133f59def2 files/digest-bpmdj-2.5 65
 MD5 02340215aa4fd9277ca1ccdc0d252e3e files/digest-bpmdj-2.6 65
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz+zgI1lqEGTUzyQRAh0hAKDcZqakWLuT45kpOnIKYQlv9DZM3gCfe0oA
-II6Psi/bsINgdfQEUf0mw44=
-=Bw3v
------END PGP SIGNATURE-----
+MD5 fa52f73194ecd28f22727e5d107a839b files/digest-bpmdj-2.7 65
diff --git a/media-sound/bpmdj/bpmdj-1.9.ebuild b/media-sound/bpmdj/bpmdj-1.9.ebuild
deleted file mode 100644
index 54af6c53aca2..000000000000
--- a/media-sound/bpmdj/bpmdj-1.9.ebuild
+++ /dev/null
@@ -1,33 +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/bpmdj/bpmdj-1.9.ebuild,v 1.12 2005/07/09 15:26:59 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
-HOMEPAGE="http://bpmdj.sourceforge.net/"
-
-SRC_URI="ftp://progpc26.vub.ac.be/pub/bpmdj/1.9/bpmdj-1.9.source.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-IUSE=""
-
-DEPEND="x11-libs/qt
-	virtual/tetex"
-
-RDEPEND="${DEPEND}
-	 !ppc? ( media-sound/alsamixergui )
-	 virtual/mpg123"
-
-src_compile() {
-	addwrite "${QTDIR}/etc/settings"
-
-	make VARTEXFONTS=${T}/fonts || die
-}
-
-src_install () {
-	make DESTDIR=${D} deb-install || die
-	mv ${D}/usr/share/doc/{${PN},${PF}}
-}
diff --git a/media-sound/bpmdj/bpmdj-2.7.ebuild b/media-sound/bpmdj/bpmdj-2.7.ebuild
new file mode 100644
index 000000000000..e4f93b592abb
--- /dev/null
+++ b/media-sound/bpmdj/bpmdj-2.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.7.ebuild,v 1.1 2005/07/17 19:24:46 fvdpol Exp $
+
+IUSE="mp3 oggvorbis"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Bpmdj, software for measuring the BPM of music and mixing"
+HOMEPAGE="http://bpmdj.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.source.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-amd64: 2.6-2.7 - kbpm-play: common.cpp:42: void common_init(): Assertion `sizeof(signed4)==4' failed. - eradicator
+KEYWORDS="-amd64 ~x86 ~ppc"
+
+DEPEND="x11-libs/qt"
+
+RDEPEND="${DEPEND}
+	 mp3? ( dev-perl/MP3-Tag )
+	 oggvorbis? ( media-sound/vorbis-tools )
+	 media-sound/alsamixergui
+	 virtual/mpg123
+	 >=sci-libs/fftw-3"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile() {
+	addwrite "${QTDIR}/etc/settings"
+
+	cp defines.gentoo defines
+	make ${MAKEOPTS} CPP=$(tc-getCXX) CC=$(tc-getCC) VARTEXFONTS=${T}/fonts LDFLAGS="${LDFLAGS} `pkg-config --libs fftw3` `pkg-config --libs alsa` -lrt" || die "make failed"
+}
+
+src_install () {
+#	make is broken (installs into /bpmdj)
+#	make DESTDIR="${D}" install || die
+#	mv ${D}/usr/share/doc/{${PN},${PF}}
+
+	exeinto /usr/bin
+	doexe alsamixerguis bpmdj-raw bpmdj-record bpmdj-replay copydirstruct fetchdirstruct fetchfiles kbpm-batch kbpm-dj kbpm-merge kbpm-mix kbpm-play rbpm-play record_mixer xmms-play || die "doexe failed"
+	use mp3 && doexe bpmdj-import-mp3.pl
+	use oggvorbis && doexe bpmdj-import-ogg.pl
+	dodoc authors changelog copyright readme todo || die "dodoc failed"
+	mkdir -p ${D}/usr/share/bpmdj
+	cp -a sequences ${D}/usr/share/bpmdj/ || die "cp failed"
+}
diff --git a/media-sound/bpmdj/files/digest-bpmdj-1.9 b/media-sound/bpmdj/files/digest-bpmdj-1.9
deleted file mode 100644
index fe1137d8f4c2..000000000000
--- a/media-sound/bpmdj/files/digest-bpmdj-1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40fa6c838931f297c65c24a2f519a46f bpmdj-1.9.source.tgz 1352573
diff --git a/media-sound/bpmdj/files/digest-bpmdj-2.7 b/media-sound/bpmdj/files/digest-bpmdj-2.7
new file mode 100644
index 000000000000..afdb60888c4c
--- /dev/null
+++ b/media-sound/bpmdj/files/digest-bpmdj-2.7
@@ -0,0 +1 @@
+MD5 9cee1c5ae8c1179ce21354ccb2826b2b bpmdj-2.7.source.tgz 448988