Add check for qt3 bindings in dbus when HAL support is enabled, thanks to Rickard Närström in bug #137551. Move myconf population in src_compile rather than global scope.

(Portage version: 2.1.1_pre1-r1)

3 files changed, 35 insertions, 5 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 9d706f9c8d07..9ccd270dc277 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # 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.57 2006/06/01 17:34:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.58 2006/06/22 12:43:46 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdebase-kioslaves-3.5.2.ebuild, kdebase-kioslaves-3.5.3.ebuild:
+  Add check for qt3 bindings in dbus when HAL support is enabled, thanks to
+  Rickard Närström in bug #137551. Move myconf population in src_compile
+  rather than global scope.
 
 *kdebase-kioslaves-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.2.ebuild
index 9bafec4247b8..77f10960e6ec 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.2.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.2.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.2.ebuild,v 1.9 2006/06/01 07:35:14 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.2.ebuild,v 1.10 2006/06/22 12:43:46 flameeyes Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -21,5 +21,17 @@ DEPEND="ldap? ( net-nds/openldap )
 RDEPEND="${DEPEND}
 	$(deprange 3.5.0 $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
 
-myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
+pkg_setup() {
+	kde_pkg_setup
+	if use hal && ! 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\"."
+		die "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+	fi
+}
 
+src_compile() {
+	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.3.ebuild
index 494f1600ccc7..abb495187e35 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.3.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.3.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.3.ebuild,v 1.1 2006/06/01 17:34:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.3.ebuild,v 1.2 2006/06/22 12:43:46 flameeyes Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -21,5 +21,17 @@ DEPEND="ldap? ( net-nds/openldap )
 RDEPEND="${DEPEND}
 	$(deprange $PV $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
 
-myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
+pkg_setup() {
+	kde_pkg_setup
+	if use hal && ! 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\"."
+		die "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+	fi
+}
 
+src_compile() {
+	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
+	kde-meta_src_compile
+}