diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-08 19:26:30 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-08 19:26:30 +0000 |
| commit | 8e3f5655c964e811e647fed1174f7689d386a631 (patch) | |
| tree | b91bdfd7a0c7e40c933d0f668d45bab458d8d176 /kde-base | |
| parent | Stable on alpha wrt Bug #133939. (diff) | |
| download | gentoo-2-8e3f5655c964e811e647fed1174f7689d386a631.tar.gz gentoo-2-8e3f5655c964e811e647fed1174f7689d386a631.tar.bz2 gentoo-2-8e3f5655c964e811e647fed1174f7689d386a631.zip | |
Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check for that case.
(Portage version: 2.1.1_rc1-r7)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdebase-kioslaves/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog index fcaeabba8ed3..2b45acfb71f8 100644 --- a/kde-base/kdebase-kioslaves/ChangeLog +++ b/kde-base/kdebase-kioslaves/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase-kioslaves # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.63 2006/09/03 12:24:42 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.64 2006/09/08 19:26:30 flameeyes Exp $ + + 08 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> + kdebase-kioslaves-3.5.4.ebuild: + Accept dbus-qt3-old aside from dbus proper, and don't do the useflag check + for that case. 03 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> kdebase-kioslaves-3.5.2.ebuild: diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild index 9a8ccd37b184..54c893d70a94 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild,v 1.3 2006/08/02 07:42:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.4.ebuild,v 1.4 2006/09/08 19:26:30 flameeyes Exp $ KMNAME=kdebase KMMODULE=kioslave @@ -14,7 +14,7 @@ IUSE="hal ldap samba openexr" DEPEND="ldap? ( net-nds/openldap ) samba? ( >=net-fs/samba-3.0.1 ) >=dev-libs/cyrus-sasl-2 - hal? ( >=sys-apps/dbus-0.33 + hal? ( || ( dev-libs/dbus-qt3-old >=sys-apps/dbus-0.33 ) =sys-apps/hal-0.5* sys-apps/pmount ) openexr? ( media-libs/openexr )" @@ -25,7 +25,7 @@ PATCHES="${FILESDIR}/${P}-dbuscrash.patch" pkg_setup() { kde_pkg_setup - if use hal && ! built_with_use sys-apps/dbus qt3; then + if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then eerror "To enable HAL support in this package is required to have" eerror "sys-apps/dbus compiled with Qt 3 support." eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"." |