summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-06-22 12:45:10 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-06-22 12:45:10 +0000
commitb210fdea25cf4d8d8fe06c753288ec8e6582cc15 (patch)
treebf176265f7d46d5ee2b0f96be700eca17c57cd60 /kde-base
parentAdd check for qt3 bindings in dbus when HAL support is enabled, thanks to Ric... (diff)
downloadhistorical-b210fdea25cf4d8d8fe06c753288ec8e6582cc15.tar.gz
historical-b210fdea25cf4d8d8fe06c753288ec8e6582cc15.tar.bz2
historical-b210fdea25cf4d8d8fe06c753288ec8e6582cc15.zip
Add check for qt3 bindings in dbus when HAL support is enabled, thanks to Rickard Närström in bug #137551.
Package-Manager: portage-2.1.1_pre1-r1
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdebase/ChangeLog7
-rw-r--r--kde-base/kdebase/kdebase-3.5.2-r2.ebuild12
-rw-r--r--kde-base/kdebase/kdebase-3.5.3-r2.ebuild12
3 files changed, 28 insertions, 3 deletions
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 3e9a04ba337d..6077f31a66dd 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kdebase
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.294 2006/06/18 18:14:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.295 2006/06/22 12:45:10 flameeyes Exp $
+
+ 22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+ kdebase-3.5.2-r2.ebuild, kdebase-3.5.3-r2.ebuild:
+ Add check for qt3 bindings in dbus when HAL support is enabled, thanks to
+ Rickard Närström in bug #137551.
18 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+files/kdm-3.5.3-strict-aliasing.patch,
diff --git a/kde-base/kdebase/kdebase-3.5.2-r2.ebuild b/kde-base/kdebase/kdebase-3.5.2-r2.ebuild
index 20622f3864c3..11299af93b9a 100644
--- a/kde-base/kdebase/kdebase-3.5.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.2-r2.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/kdebase-3.5.2-r2.ebuild,v 1.5 2006/06/17 12:01:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r2.ebuild,v 1.6 2006/06/22 12:45:10 flameeyes Exp $
inherit kde-dist eutils flag-o-matic
@@ -78,6 +78,16 @@ DEPEND="${DEPEND}
PATCHES="${WORKDIR}/kdebase-3.5.2-patchset.diff"
+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_unpack() {
kde_src_unpack
diff --git a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild b/kde-base/kdebase/kdebase-3.5.3-r2.ebuild
index ec83563d73d2..d4e343e8ff55 100644
--- a/kde-base/kdebase/kdebase-3.5.3-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.3-r2.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/kdebase-3.5.3-r2.ebuild,v 1.1 2006/06/18 01:05:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r2.ebuild,v 1.2 2006/06/22 12:45:10 flameeyes Exp $
inherit kde-dist eutils flag-o-matic
@@ -77,6 +77,16 @@ DEPEND="${DEPEND}
PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch"
+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_unpack() {
kde_src_unpack