Modify ebuild to build only against Qt-4.1, as it fails against Qt-4.2 - even with dbus disabled

Package-Manager: portage-2.1.2_rc1-r1

3 files changed, 15 insertions, 21 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 778c34031c7c..fb73cc22993a 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.139 2006/10/31 00:35:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.140 2006/11/02 14:08:38 caleb Exp $
+
+  02 Nov 2006; Caleb Tennis <caleb@gentoo.org> dbus-0.62-r1.ebuild:
+  Modify ebuild to build only against Qt-4.1, as it fails against Qt-4.2 -
+  even with dbus disabled
 
   31 Oct 2006; Doug Goldstein <cardoe@gentoo.org> dbus-0.62-r1.ebuild:
   Fixing bug #149656
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f422854d38dc..f304694241c9 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
@@ -44,18 +41,18 @@ EBUILD dbus-0.61-r1.ebuild 4180 RMD160 33f03b58148bd8b170e3a752070b22784d2a0bb7
 MD5 bbbdd40e11619074ab45c7bab3254be6 dbus-0.61-r1.ebuild 4180
 RMD160 33f03b58148bd8b170e3a752070b22784d2a0bb7 dbus-0.61-r1.ebuild 4180
 SHA256 86c8c5f1b727a89c9dfe277743039031d2d3b63805c42b580b82af605d4806e4 dbus-0.61-r1.ebuild 4180
-EBUILD dbus-0.62-r1.ebuild 4186 RMD160 18bf57c1d5c7976ac05ed68921f033af997875f4 SHA1 474ed244d371d42962ba4244dc4aa7d0343981db SHA256 b5ccc80666363614f8b09815a369b65a59827b29afda04227b256f9000478628
-MD5 8030e00ad1d16d582161e5f1a56b38a4 dbus-0.62-r1.ebuild 4186
-RMD160 18bf57c1d5c7976ac05ed68921f033af997875f4 dbus-0.62-r1.ebuild 4186
-SHA256 b5ccc80666363614f8b09815a369b65a59827b29afda04227b256f9000478628 dbus-0.62-r1.ebuild 4186
+EBUILD dbus-0.62-r1.ebuild 4183 RMD160 bd9bc759f0a88f19555d7b287c3cfa5a7985624a SHA1 f6ed90ab735e3de1098391eddd3b5d9aaa7669da SHA256 dee54c9a244f03f0badd823d67173e744f00bb5ae162d1e6a8025ec3cd4e9c0e
+MD5 f7e83ac1d3eb2792b6ff2e0314e93fbb dbus-0.62-r1.ebuild 4183
+RMD160 bd9bc759f0a88f19555d7b287c3cfa5a7985624a dbus-0.62-r1.ebuild 4183
+SHA256 dee54c9a244f03f0badd823d67173e744f00bb5ae162d1e6a8025ec3cd4e9c0e dbus-0.62-r1.ebuild 4183
 EBUILD dbus-0.94.ebuild 2790 RMD160 efaf313511733a1c3ea499bf67a8cc9f8747db21 SHA1 28d513c8269848695d1bd9169cbe869734d0cfeb SHA256 55f0545ea8971f800cfa861ba5d88def957c69d6a7c2fb1460b9e23808785946
 MD5 fd1ed16ca1bdbe38d9bef177bc9b3362 dbus-0.94.ebuild 2790
 RMD160 efaf313511733a1c3ea499bf67a8cc9f8747db21 dbus-0.94.ebuild 2790
 SHA256 55f0545ea8971f800cfa861ba5d88def957c69d6a7c2fb1460b9e23808785946 dbus-0.94.ebuild 2790
-MISC ChangeLog 20627 RMD160 337315c9ea822238905fcb4a35247b489f084e14 SHA1 1d2f359164166307579b88d8b2bd70c078117969 SHA256 5497bbc2460299eb67e256c28967449417dd4db288d10f305992514639d16ee3
-MD5 3d638221a1bcba3ec6d0f23378a3655e ChangeLog 20627
-RMD160 337315c9ea822238905fcb4a35247b489f084e14 ChangeLog 20627
-SHA256 5497bbc2460299eb67e256c28967449417dd4db288d10f305992514639d16ee3 ChangeLog 20627
+MISC ChangeLog 20796 RMD160 f828702db0033d7ed96b3a7d2e9e2c5558bb4296 SHA1 7de9a1cb8d7aef67541785c6c97390fd9e1e7e22 SHA256 ba1ea4c889bdf737690032d7eb4fd80c43075b700662f2196852adbe06fafa05
+MD5 cbb6f1d78ac22d72d012ab3c2dab5f33 ChangeLog 20796
+RMD160 f828702db0033d7ed96b3a7d2e9e2c5558bb4296 ChangeLog 20796
+SHA256 ba1ea4c889bdf737690032d7eb4fd80c43075b700662f2196852adbe06fafa05 ChangeLog 20796
 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -69,10 +66,3 @@ SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/di
 MD5 c3d9ff9a9380935d9061368bcb520a09 files/digest-dbus-0.94 232
 RMD160 d432e31c0c98aca7c1fe44178fcc45c01642c7b6 files/digest-dbus-0.94 232
 SHA256 abb5588b3a444812e46f36cc37ab335cb2c1f86529336221777a27b8c536f626 files/digest-dbus-0.94 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRpwloeSe8B0zEfwRAoazAJ90Q7Hi6TJk0qmLX8I5Jcb9SMHCQgCfUirp
-G+AK09xNnrCpwNHZrH9T0mU=
-=hEux
------END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.62-r1.ebuild b/sys-apps/dbus/dbus-0.62-r1.ebuild
index ef89d6292e57..9f3e753793f8 100644
--- a/sys-apps/dbus/dbus-0.62-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.62-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62-r1.ebuild,v 1.3 2006/10/31 00:35:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.62-r1.ebuild,v 1.4 2006/11/02 14:08:38 caleb Exp $
 
 WANT_AUTOCONF=2.5
 inherit eutils mono python multilib debug qt3 autotools
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.6
 	mono? ( >=dev-lang/mono-0.95 )
 	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
 	qt3? ( $(qt_min_version 3.3) )
-	qt4? ( >=x11-libs/qt-4.1.3 )
+	qt4? ( =x11-libs/qt-4.1* )
 	selinux? ( sys-libs/libselinux )
 	>=dev-libs/expat-1.95.8"
 	# expat code now sucks.. libxml2 is the default