Set the qt3 directory and moc, closes bugs 112965, 103667 and 109823.

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 6b5e027523c835541cf3afb076e73bdd78c650eb..e8589f077dfc491623da7a2ed7015f490523672e 100644 (file)
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.60 2005/11/08 10:45:24 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.61 2005/11/24 21:37:30 cryos Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> dbus-0.50-r1.ebuild:
+  Set the qt3 directory and moc, closes bugs 112965, 103667 and 109823.
 
   08 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org> files/dbus:
   fixed init-script.

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 59459581459778f230a27fbe8017d3f05abb7383..a4b3a1a3a0bbb4b729448de9ed217614fb66facd 100644 (file)
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,11 +1,14 @@
-MD5 d581d037cc738857b76db1250ee80e57 ChangeLog 8750
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d3435bf96324dd800ed6aeb32e09201 ChangeLog 8893
 MD5 fab22de6cb9a5cf7e0abedfe77c9b04a dbus-0.23-r3.ebuild 3246
 MD5 fedfd2a1281d8773038a8036a2a75ef8 dbus-0.23.2-r1.ebuild 3454
 MD5 321657dd580453465e0cab3102a92e98 dbus-0.23.2.ebuild 3242
 MD5 fc8c0f943b0a6462694f8f3874a2db6c dbus-0.23.4-r1.ebuild 3448
 MD5 bb8292b02298d653808cb0d0edd271da dbus-0.23.4.ebuild 3413
 MD5 f127ffa8cdc75cbd0befadcb16d08401 dbus-0.36.2.ebuild 3620
-MD5 36c0119912a6585c12c8ef05b9687074 dbus-0.50-r1.ebuild 3749
+MD5 42466e47d6ef05428efe633c659ef76c dbus-0.50-r1.ebuild 3864
 MD5 0a1ae7c5d57aceed3246ab0627f0c356 dbus-0.50.ebuild 3767
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 MD5 2a21cd128b106bc728a0566c13e727e3 files/dbus 938
@@ -27,3 +30,10 @@ MD5 19d40bbc05e7cf89bf6d023540874468 files/digest-dbus-0.36.2 64
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50 62
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
 MD5 41b60b877b1e6ea53476ff69c5ed77d3 metadata.xml 282
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjKontT9W3vfTuoRAgMRAKCHCBaKQBwtOAvCRi6zlL9Z3S2dyACePsOT
+cHjXFKc6cPiYHATYPv0eNvQ=
+=G3jc
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/dbus/dbus-0.50-r1.ebuild b/sys-apps/dbus/dbus-0.50-r1.ebuild
index b7e63709ded59b9fdee2cb8fd85c46d88aaee111..86af15fcc4477c9aaa420c1e07c47fea7eb3314a 100644 (file)
--- a/sys-apps/dbus/dbus-0.50-r1.ebuild
+++ b/sys-apps/dbus/dbus-0.50-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r1.ebuild,v 1.1 2005/11/08 04:46:00 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50-r1.ebuild,v 1.2 2005/11/24 21:37:30 cryos Exp $
 
-inherit eutils mono python multilib autotools debug
+inherit eutils mono python multilib autotools debug qt3
 
 IUSE="X gtk qt python mono doc xml2"
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.6
        gtk? ( >=x11-libs/gtk+-2 )
        python? ( >=dev-lang/python-2.4
                >=dev-python/pyrex-0.9.3-r2 )
-       qt? ( =x11-libs/qt-3* )
+       qt? ( $(qt_min_version 3.3) )
        mono? ( >=dev-lang/mono-0.95 )"
 
 
@@ -69,11 +69,16 @@ src_compile() {
                myconf="${myconf} --disable-mono-docs"
        fi
 
+       if use qt; then
+               myconf="${myconf} --enable-qt=${QTDIR} QT_MOC=${QTDIR}/bin/moc"
+       else
+               myconf="${myconf} --disable-qt"
+       fi
+
        # NOTE: I have disabled the xml docs because they are rather pointless
        econf \
                `use_with X x` \
                `use_enable gtk` \
-               `use_enable qt` \
                `use_enable python` \
                `use_enable mono` \
                `use_enable kernel_linux dnotify` \