diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2006-01-02 08:45:25 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2006-01-02 08:45:25 +0000 |
| commit | 0ee77c4c3d0099bb7261fc4d4ff457a0a1a72d09 (patch) | |
| tree | 8a2a87358da2da6b59270591746f53eaef7b4fc5 | |
| parent | Remove pointless notice (diff) | |
| download | historical-0ee77c4c3d0099bb7261fc4d4ff457a0a1a72d09.tar.gz historical-0ee77c4c3d0099bb7261fc4d4ff457a0a1a72d09.tar.bz2 historical-0ee77c4c3d0099bb7261fc4d4ff457a0a1a72d09.zip | |
Tweaked some QT related stuff.
Package-Manager: portage-2.1_pre3-r1
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/dbus/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-0.23.4-r1.ebuild | 14 |
3 files changed, 19 insertions, 10 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index b695e2f16226..bb1106069a26 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.77 2006/01/02 08:34:43 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.78 2006/01/02 08:45:25 cardoe Exp $ + + 02 Jan 2006; Doug Goldstein <cardoe@gentoo.org> dbus-0.23.4-r1.ebuild: + Tweaked some QT related stuff. *dbus-0.60-r2 (02 Jan 2006) diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 4862b4995edf..ade8f8cb2ac9 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5aa194663dcd535d2dacebc1957b7aa2 ChangeLog 11492 +MD5 c4bec686f50a27140d35c482217875b4 ChangeLog 11599 MD5 017a163921b3054633e2abc22cf8edcd dbus-0.23-r3.ebuild 3241 -MD5 e65e79493b47a10c999b35c95a14a969 dbus-0.23.4-r1.ebuild 3445 +MD5 ff2ce39588a6c7a82402d4e0d292835d dbus-0.23.4-r1.ebuild 3582 MD5 eaaed2cd9d845468bff2f444d0a4f4c7 dbus-0.50-r1.ebuild 3900 MD5 7fd4127291f0f0e5365d66e5a9a10122 dbus-0.50-r2.ebuild 4335 MD5 84153b273a64bd8a72ae908462846661 dbus-0.60-r2.ebuild 4118 @@ -30,7 +30,7 @@ MD5 41b60b877b1e6ea53476ff69c5ed77d3 metadata.xml 282 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDuOY+BtvusYtCZMsRAohUAKCBbaURO6OIVo9eQ2BSv/7n4axyyQCeNM+d -gNjZrhbHIaVrcq2pLPn4/Uw= -=771J +iD8DBQFDuOkABtvusYtCZMsRAjz/AJ9/mLXt5zJsRqnyoI8kEOg/iW1cnACggN5c +JDMP9A8rwYNmoK519/VFIoI= +=wBc2 -----END PGP SIGNATURE----- diff --git a/sys-apps/dbus/dbus-0.23.4-r1.ebuild b/sys-apps/dbus/dbus-0.23.4-r1.ebuild index 8c9df8094ba3..a8c86dbcba01 100644 --- a/sys-apps/dbus/dbus-0.23.4-r1.ebuild +++ b/sys-apps/dbus/dbus-0.23.4-r1.ebuild @@ -1,9 +1,9 @@ -# 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/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.8 2005/12/31 12:24:01 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.4-r1.ebuild,v 1.9 2006/01/02 08:45:25 cardoe Exp $ # because of the experimental nature debug by default -inherit debug eutils mono python multilib +inherit debug eutils mono python multilib qt3 # FIXME : fix docs #IUSE="X gtk qt python mono doc xml2" @@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2 gtk? ( >=x11-libs/gtk+-2 ) python? ( >=dev-lang/python-2.2 >=dev-python/pyrex-0.9 ) - qt? ( =x11-libs/qt-3* ) + qt? ( $(qt_min_version 3.3) ) !ppc64? ( mono? ( >=dev-lang/mono-0.95 ) )" @@ -71,6 +71,12 @@ src_compile() { myconf="--with-xml=expat"; fi + if use qt; then + myconf="${myconf} --enable-qt=${QTDIR} QT_MOC=${QTDIR}/bin/moc" + else + myconf="${myconf} --disable-qt" + fi + econf \ --localstatedir=/var \ `use_with X x` \ |