From: Doug Goldstein <cardoe@gentoo.org>
Date: Wed, 15 Mar 2006 01:36:52 +0000 (+0000)
Subject: disable QT4 support
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7640d920a691cff414a35caa46b461e78b8804cf;p=gentoo.git

disable QT4 support
Package-Manager: portage-2.1_pre6-r2
---

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index a6de9a1cb572..39b5b2052a75 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # 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.106 2006/03/14 09:53:00 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.107 2006/03/15 01:36:52 cardoe Exp $
+
+  15 Mar 2006; Doug Goldstein <cardoe@gentoo.org> dbus-0.61.ebuild:
+  disable QT4 support
 
   14 Mar 2006; Joe McCann <joem@gentoo.org>
   +files/dbus-0.60-decls-ansi-c.patch:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index e63433b16ab4..4cba28f7ae3d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,6 +1,9 @@
-MD5 a6d0240ca91d3dc658970f67da600ead ChangeLog 15213
-RMD160 cd13c8b6db4540b8bfd01abc576caba9db75aaa8 ChangeLog 15213
-SHA256 45b63c5c754ff34a4a1cf175ab64bcd69f837011686c621872b6bc25a896776d ChangeLog 15213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a7ab8c1a2ab856d93e01d7f849d29ae3 ChangeLog 15306
+RMD160 4cc99c3fdff46b3e5f6d31a76c0b784cbaaa54af ChangeLog 15306
+SHA256 70f3509f9a914b42e227bd6c38f25a28269ed7a031eab9c1c5b8bbf4214d0c57 ChangeLog 15306
 MD5 80bd8d05a4478ae3d83d952d19e928ac dbus-0.23.4-r1.ebuild 3647
 RMD160 ca03ac02fddf891a097814dac744774d2aaa3267 dbus-0.23.4-r1.ebuild 3647
 SHA256 d08b90313aab10d5a71e7e0858e3548983cb2dfc4bd7317dfb99a57c2a0faad0 dbus-0.23.4-r1.ebuild 3647
@@ -16,9 +19,9 @@ SHA256 7cb5970a6e0cd9f63b737fa544618e48a451d0664b4d1d6568e8a4f84f9e4925 dbus-0.6
 MD5 c002c05d2aaf3510f3f13c68b500ea26 dbus-0.60-r4.ebuild 4625
 RMD160 3add3d3700d3f42b90d89053181451f38b80d1a1 dbus-0.60-r4.ebuild 4625
 SHA256 4b9ab333b66e1cfdcb15dc20f6df9e72528942d7b83c1551a40cf23003ac2d4e dbus-0.60-r4.ebuild 4625
-MD5 153849bf9ff7ab9448d51718745c5707 dbus-0.61.ebuild 3705
-RMD160 a98d4b6ef0b8fe6d7beb34e51c964fe7621e1817 dbus-0.61.ebuild 3705
-SHA256 539e0dac29f78c359986e809fdbbf696043be7cbd2fecf959487e3cd35ffc56f dbus-0.61.ebuild 3705
+MD5 9590cd2be7a9bc7fa7259765e651ae3f dbus-0.61.ebuild 3718
+RMD160 737fceccf05a3498ca344b07a91251998a04cd8e dbus-0.61.ebuild 3718
+SHA256 4be21ba6247d55227b64aa0a384a19814a65af00f2d9151a45b49124bd5f4bb6 dbus-0.61.ebuild 3718
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d files/30-dbus 243
@@ -100,3 +103,10 @@ SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/di
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
 SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf metadata.xml 222
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEF2/YBtvusYtCZMsRApynAJ9ks64OSxVre8WaEMgnXjiIqH7TswCdHP5F
+CXfO07yoQyYzRBapcFMuM6E=
+=BBU+
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.61.ebuild b/sys-apps/dbus/dbus-0.61.ebuild
index a63ba9fe9222..522e073e3ddb 100644
--- a/sys-apps/dbus/dbus-0.61.ebuild
+++ b/sys-apps/dbus/dbus-0.61.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.61.ebuild,v 1.2 2006/03/14 07:02:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.61.ebuild,v 1.3 2006/03/15 01:36:52 cardoe Exp $
 
 inherit eutils mono python multilib debug qt3 autotools
 
@@ -56,7 +56,7 @@ src_compile() {
 	use mono && myconf="${myconf} $(use_enable doc mono-docs)"
 
 	if use qt; then
-		myconf="${myconf} --enable-qt3=${QTDIR} QT_MOC=/usr/bin/moc --with-qt3-moc=${QTDIR}/bin/moc"
+		myconf="${myconf} --enable-qt3=${QTDIR} QT_MOC=/usr/bin/moc --with-qt3-moc=${QTDIR}/bin/moc --disable-qt"
 	else
 		myconf="${myconf} --disable-qt --disable-qt3"
 	fi