Remove old version. Add patch to allow building with UIC from Qt 3.3.5 or later, thanks to Markus Giese for reporting in bug #146914.

(Portage version: 2.1.2_pre2-r1)

5 files changed, 40 insertions, 5 deletions

diff --git a/media-sound/bpmdj/ChangeLog b/media-sound/bpmdj/ChangeLog
index 8921b660af09..c4946864d462 100644
--- a/media-sound/bpmdj/ChangeLog
+++ b/media-sound/bpmdj/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/bpmdj
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.23 2005/12/26 14:31:02 lu_zero Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/ChangeLog,v 1.24 2006/10/02 07:07:21 flameeyes Exp $
+
+  02 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/bpmdj-2.7-qt335.patch, -bpmdj-2.5.ebuild, bpmdj-2.7.ebuild:
+  Remove old version. Add patch to allow building with UIC from Qt 3.3.5 or
+  later, thanks to Markus Giese for reporting in bug #146914.
 
   26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> bpmdj-2.6.ebuild,
   bpmdj-2.7.ebuild:
diff --git a/media-sound/bpmdj/bpmdj-2.7.ebuild b/media-sound/bpmdj/bpmdj-2.7.ebuild
index 1b48b57d6f65..a4e30cb33dcf 100644
--- a/media-sound/bpmdj/bpmdj-2.7.ebuild
+++ b/media-sound/bpmdj/bpmdj-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.4 2005/12/26 14:31:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bpmdj/bpmdj-2.7.ebuild,v 1.5 2006/10/02 07:07:21 flameeyes Exp $
 
 IUSE="mp3 vorbis"
 
@@ -26,7 +26,9 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-qt335.patch"
 }
 
 src_compile() {
diff --git a/media-sound/bpmdj/files/bpmdj-2.7-qt335.patch b/media-sound/bpmdj/files/bpmdj-2.7-qt335.patch
new file mode 100644
index 000000000000..86052e3d29c9
--- /dev/null
+++ b/media-sound/bpmdj/files/bpmdj-2.7-qt335.patch
@@ -0,0 +1,24 @@
+Index: bpmdj-2.7/cluster-dialog.ui
+===================================================================
+--- bpmdj-2.7.orig/cluster-dialog.ui
++++ bpmdj-2.7/cluster-dialog.ui
+@@ -130,7 +130,4 @@
+     </connection>
+ </connections>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>metricwidget.h</includehint>
+-</includehints>
+ </UI>
+Index: bpmdj-2.7/preferences.ui
+===================================================================
+--- bpmdj-2.7.orig/preferences.ui
++++ bpmdj-2.7/preferences.ui
+@@ -1414,7 +1414,4 @@
+     <slot>modifydColorCol()</slot>
+ </slots>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>metricwidget.h</includehint>
+-</includehints>
+ </UI>
diff --git a/media-sound/bpmdj/files/digest-bpmdj-2.6 b/media-sound/bpmdj/files/digest-bpmdj-2.6
index 2edb91a4cca2..c2d18a5c6978 100644
--- a/media-sound/bpmdj/files/digest-bpmdj-2.6
+++ b/media-sound/bpmdj/files/digest-bpmdj-2.6
@@ -1 +1,3 @@
 MD5 67a28a7db493eb6cef36a7ff0f2f2dc2 bpmdj-2.6.source.tgz 409077
+RMD160 0509a3c100b39aad86e65a0b0bb12cd62910acd5 bpmdj-2.6.source.tgz 409077
+SHA256 39811dd037cddc844d6909d7c7cb04bc9b444fdc4f6547e8772c7885c64bfd2e bpmdj-2.6.source.tgz 409077
diff --git a/media-sound/bpmdj/files/digest-bpmdj-2.7 b/media-sound/bpmdj/files/digest-bpmdj-2.7
index afdb60888c4c..1cafca4aca92 100644
--- a/media-sound/bpmdj/files/digest-bpmdj-2.7
+++ b/media-sound/bpmdj/files/digest-bpmdj-2.7
@@ -1 +1,3 @@
 MD5 9cee1c5ae8c1179ce21354ccb2826b2b bpmdj-2.7.source.tgz 448988
+RMD160 ff5a273c52b73da5e2e9a1ad219e25799198d5a4 bpmdj-2.7.source.tgz 448988
+SHA256 0a7d32c925393fc5b89ebad9eb5989ec674f41ca6b59c4f09f9cc026fac759a0 bpmdj-2.7.source.tgz 448988