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.

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 50 insertions, 20 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/Manifest b/kde-base/kdebase-kioslaves/Manifest
index 1f81add8b11a..131615ec2e33 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -17,18 +17,18 @@ EBUILD kdebase-kioslaves-3.4.3.ebuild 1301 RMD160 478aa883913578b07b116d3f2d7b38
 MD5 f72c5ad38cb757d5d9b4d50763d1c839 kdebase-kioslaves-3.4.3.ebuild 1301
 RMD160 478aa883913578b07b116d3f2d7b389e434b7d2c kdebase-kioslaves-3.4.3.ebuild 1301
 SHA256 ae60ad6a774127ba56851e8faa555057789fd43225b454a022caa2ed5aa5bc28 kdebase-kioslaves-3.4.3.ebuild 1301
-EBUILD kdebase-kioslaves-3.5.2.ebuild 972 RMD160 8718d01d69e2900cf330be147635622d63a99035 SHA1 3a08be64489ddecd3d8c0529234c37373626f060 SHA256 ff481c024df69633d96ff7ed4bafa6acebfc5270da34aa4825d6a9288f5155ad
-MD5 f7055ce2bec4d6f0d61515728b3a6f61 kdebase-kioslaves-3.5.2.ebuild 972
-RMD160 8718d01d69e2900cf330be147635622d63a99035 kdebase-kioslaves-3.5.2.ebuild 972
-SHA256 ff481c024df69633d96ff7ed4bafa6acebfc5270da34aa4825d6a9288f5155ad kdebase-kioslaves-3.5.2.ebuild 972
-EBUILD kdebase-kioslaves-3.5.3.ebuild 980 RMD160 12411738baf5ef3ddc83a6143a38f7f7e3cf4d1f SHA1 929caa9fba5d7fa42eec2380d479cd0bb21c3afa SHA256 c87766b1cb4ed69736dfc15b6e72152c7ec0ac00500c91ba35b65e48fcdb0170
-MD5 fa9eb15c038538a57d0ecef2b18d7a09 kdebase-kioslaves-3.5.3.ebuild 980
-RMD160 12411738baf5ef3ddc83a6143a38f7f7e3cf4d1f kdebase-kioslaves-3.5.3.ebuild 980
-SHA256 c87766b1cb4ed69736dfc15b6e72152c7ec0ac00500c91ba35b65e48fcdb0170 kdebase-kioslaves-3.5.3.ebuild 980
-MISC ChangeLog 8335 RMD160 a4ef07ea7a98dbb78491a527b9ff3138b33c7751 SHA1 77602087f093166fee9849026dfa57e3c0325fa3 SHA256 178fcafaba58c3c8c5cf81c91fcbc0fc76ddd838165f94c23271cd01bb8422a3
-MD5 eac2969b1da775762efae3b90d0bd533 ChangeLog 8335
-RMD160 a4ef07ea7a98dbb78491a527b9ff3138b33c7751 ChangeLog 8335
-SHA256 178fcafaba58c3c8c5cf81c91fcbc0fc76ddd838165f94c23271cd01bb8422a3 ChangeLog 8335
+EBUILD kdebase-kioslaves-3.5.2.ebuild 1346 RMD160 f3e6dd4caeebb5732ff3f99d7fa8cf57880077fc SHA1 c7498d5cbcb89c08e246301d345d1c54b4f3ca7c SHA256 b09345805451dee236c292619733f9747cd7ea6af332b2700b596b12e37fbeb1
+MD5 ffa2bcb08758de246cc8fd2258566f4c kdebase-kioslaves-3.5.2.ebuild 1346
+RMD160 f3e6dd4caeebb5732ff3f99d7fa8cf57880077fc kdebase-kioslaves-3.5.2.ebuild 1346
+SHA256 b09345805451dee236c292619733f9747cd7ea6af332b2700b596b12e37fbeb1 kdebase-kioslaves-3.5.2.ebuild 1346
+EBUILD kdebase-kioslaves-3.5.3.ebuild 1349 RMD160 08d6629fe2e50dffdce0374a7ced626efa1815a8 SHA1 1019d3c20558a12c50d48c68a96148dc4bba3928 SHA256 2134cd07cbb97ab6d00c53556b4dd3f68ebeefa452ccab29d545751cb13424e9
+MD5 3ac1611c37467f6785d665fd8b383e8b kdebase-kioslaves-3.5.3.ebuild 1349
+RMD160 08d6629fe2e50dffdce0374a7ced626efa1815a8 kdebase-kioslaves-3.5.3.ebuild 1349
+SHA256 2134cd07cbb97ab6d00c53556b4dd3f68ebeefa452ccab29d545751cb13424e9 kdebase-kioslaves-3.5.3.ebuild 1349
+MISC ChangeLog 8634 RMD160 ec7038aef8b10f2163c370ca0b26848bcf49866f SHA1 507d0773b7b8eb70c72972d6f9c6047b38061d92 SHA256 e5373b0129cbacdfaa5ad7aaf5c03ba6d6c00043eed2a31d9b11b813e884716f
+MD5 298bc14291fdf59e2d0ca94d7a823bfb ChangeLog 8634
+RMD160 ec7038aef8b10f2163c370ca0b26848bcf49866f ChangeLog 8634
+SHA256 e5373b0129cbacdfaa5ad7aaf5c03ba6d6c00043eed2a31d9b11b813e884716f ChangeLog 8634
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -45,7 +45,7 @@ SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfyUkAiZjviIA2XgRAtDzAJ4vPj3NepYvczHbjvL3FjqotTgPZQCg52EU
-bQxzjKQMszefnAbIy7ujZwY=
-=HNqk
+iD8DBQFEmpCMAiZjviIA2XgRAmnyAJ9M8gw2cPvB8Vjv3CpYQ8kZuwmCnwCg8+O0
+ydPGp9+rfYNsMkWLoCvcvZ0=
+=RWbs
 -----END PGP SIGNATURE-----
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
+}