QA: Get rid of deprecated qt_min_version(). Fix broken split Qt 4.4 dependencies, cf. bug 217161 comment 11.

Package-Manager: portage-2.1.4.4

5 files changed, 18 insertions, 11 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 445ffe275b00..988cfd261762 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.39 2008/06/23 16:54:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.40 2008/07/27 21:14:50 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> mixxx-1.4.2.ebuild,
+  mixxx-1.6.0_beta2.ebuild, mixxx-1.6.0_beta3.ebuild:
+  QA: Get rid of deprecated qt_min_version(). Fix broken split Qt 4.4
+  dependencies, cf. bug 217161 comment 11.
 
   23 Jun 2008; nixnut <nixnut@gentoo.org> mixxx-1.6.0_beta2.ebuild:
   Added ~ppc wrt bug 223015
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index ea11602d0d2c..5e70f5bee494 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,8 +4,8 @@ AUX mixxx-1.6.0_beta3-debug.patch 334 RMD160 75ff38e43eb55fae66e245a412c4a1089c0
 DIST mixxx-1.4.2.tar.gz 3839230 RMD160 64e7233239b8dad486cbde9a05f24d069ee277b0 SHA1 0406bcdd7c04eaacc74aeb7466c8ea31da19b6e0 SHA256 2673f29c84e80cb309473ae2d2f7be76abf47eaa9b8972e4848fbe7b1dfa2a52
 DIST mixxx-1.6.0-beta2-src.tar.gz 7081765 RMD160 1464294e1f0c5c4109d44b0740c523ac64ca8a91 SHA1 ecf8910c3505a8ea44e663b157572e6032b8e4dc SHA256 82a9eef7ed75c32a025e3093619c255977177f1265cd317693765a4838c7cd8c
 DIST mixxx-1.6.0-beta3-src.tar.gz 23187396 RMD160 2800f2fb33f086a39263555c35b9854981c3dd9d SHA1 ceff3f688c23221c796d162ee3cd81632724650e SHA256 cf1a098599c6dd8407b41913d3e79abcadeb5b17f9bb27c0cffd6b28dc353e8c
-EBUILD mixxx-1.4.2.ebuild 1375 RMD160 df913a9a73b0960f61cd6bf4b4e0e7e0c3300a1d SHA1 11cd7ff66d2cd36dad7cf49a0020457bc5f7ff27 SHA256 61ea360a2cf91c3a94806861621e1ab94202c02f1ea1a60863d9705d373c05ae
-EBUILD mixxx-1.6.0_beta2.ebuild 2378 RMD160 c968b0fb060f148155f1d0ab2d4ed71f3a8fb411 SHA1 499a26fb70ee57aaaf60067a5328f4f2dfda1c9a SHA256 8aec7e3719ba0772accb58166b552ce2b95805baaab13a049a3ea822a6860ba4
-EBUILD mixxx-1.6.0_beta3.ebuild 2292 RMD160 0756ba69fffa526ff5cac8a5c6c3c08656c3e859 SHA1 e6f231e2111895a8ddda733f372ce7638c7540ea SHA256 ec158ff7653d107359a9b47eae42d05cc0299dbbc1637f7c68d5c4c4016a938f
-MISC ChangeLog 5320 RMD160 b7bf2d10e1b2ef901a49ca2723988dabb7c0b091 SHA1 b7fdc3b15b50321226fef7224dd284161b0de001 SHA256 f3d56327a95a3edc6e422cb9f4de9fb95bb04ce5a54785c863e365aabb6a2d40
+EBUILD mixxx-1.4.2.ebuild 1376 RMD160 84c1b3dbffeb7b3b06eb9d37db5d8e1ab41a694c SHA1 737eed3c783d3daa4a40aa04fc847f9de4a8a65c SHA256 62f50324b4a9a768003ab3341e9795df660e5b484abf2028b62a6736f4e0de2a
+EBUILD mixxx-1.6.0_beta2.ebuild 2377 RMD160 fc74fe8ea575885ee81c92c730037e9d5408e2a0 SHA1 84f9adc398493066539e4ea775e729f739622277 SHA256 ee6f7c6bfb81c2c366949e704d94548817135a3845b92bb64a9dc88348cd1c89
+EBUILD mixxx-1.6.0_beta3.ebuild 2291 RMD160 4352d3377276913910ba4652e005ae9c8a2109b5 SHA1 29509e1023d131b8e4f6898b722aec05650cd5d1 SHA256 ff1efc2cf2c39f10401f511e32b82d6635a811718e40a81defbb643064b4026b
+MISC ChangeLog 5556 RMD160 45ec6fbdaa5e74f55ff8ebe603262b39b9ad38f1 SHA1 beb6c034c670101585eb842b328e73a944289823 SHA256 bbd33e24abb29ed39dde63e489305b219cdd4f61aa6864f400adbf43e18810c9
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
diff --git a/media-sound/mixxx/mixxx-1.4.2.ebuild b/media-sound/mixxx/mixxx-1.4.2.ebuild
index 032020eebb89..f0c4b2bb62f7 100644
--- a/media-sound/mixxx/mixxx-1.4.2.ebuild
+++ b/media-sound/mixxx/mixxx-1.4.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.4.2.ebuild,v 1.8 2008/05/21 00:03:36 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.4.2.ebuild,v 1.9 2008/07/27 21:14:50 carlo Exp $
+
+EAPI=1
 
 inherit eutils qt3
 
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="sparc ~ppc x86"
 IUSE="alsa jack"
 
-RDEPEND="$(qt_min_version 3.1)
+RDEPEND="x11-libs/qt:3
 	media-sound/madplay
 	media-libs/libogg
 	media-libs/libvorbis
diff --git a/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild b/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
index e96464b41dce..0f394f24c234 100644
--- a/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
+++ b/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild,v 1.6 2008/06/23 16:54:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild,v 1.7 2008/07/27 21:14:50 carlo Exp $
 
 EAPI=1
 
@@ -31,7 +31,7 @@ RDEPEND="media-libs/mesa
 	|| ( ( x11-libs/qt-core
 		x11-libs/qt-gui
 		x11-libs/qt-opengl )
-		>=x11-libs/qt-4.3:4 )"
+		=x11-libs/qt-4.3*:4 )"
 DEPEND="${RDEPEND}
 	dev-util/scons
 	dev-util/pkgconfig"
diff --git a/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild b/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild
index da37ec865881..00340175d173 100644
--- a/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild
+++ b/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild,v 1.2 2008/06/23 16:54:02 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta3.ebuild,v 1.3 2008/07/27 21:14:50 carlo Exp $
 
 EAPI=1
 
@@ -31,7 +31,7 @@ RDEPEND="media-libs/mesa
 	|| ( ( x11-libs/qt-core
 		x11-libs/qt-gui
 		x11-libs/qt-opengl )
-		>=x11-libs/qt-4.3:4 )"
+		=x11-libs/qt-4.3*:4 )"
 DEPEND="${RDEPEND}
 	dev-util/scons
 	dev-util/pkgconfig"