Pull khelpcenter directly (USE=handbook), do not depend on dbus directly, sync jpeg deps

(Portage version: 2.2_rc80/cvs/Linux x86_64)

3 files changed, 14 insertions, 16 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 170c6ff8356e..6ce0f724a99b 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.703 2010/09/06 00:07:12 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.704 2010/09/13 21:39:31 reavertm Exp $
+
+  13 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org> kdelibs-4.4.5.ebuild,
+  kdelibs-4.5.1.ebuild:
+  Pull khelpcenter directly (USE=handbook), do not depend on dbus directly,
+  sync jpeg deps
 
 *kdelibs-4.5.1 (06 Sep 2010)
 
diff --git a/kde-base/kdelibs/kdelibs-4.4.5.ebuild b/kde-base/kdelibs/kdelibs-4.4.5.ebuild
index b9d28b5e0734..8f51e25060b3 100644
--- a/kde-base/kdelibs/kdelibs-4.4.5.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5.ebuild,v 1.9 2010/08/09 17:34:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.5.ebuild,v 1.10 2010/09/13 21:39:31 reavertm Exp $
 
 EAPI="3"
 
@@ -36,13 +36,9 @@ COMMONDEPEND="
 	>=x11-misc/shared-mime-info-0.60
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
-	aqua? (
-		>=media-sound/phonon-4.3.80
-		sys-apps/dbus
-	)
+	aqua? ( >=media-sound/phonon-4.3.80 )
 	!aqua? (
 		>=media-sound/phonon-4.3.80[xcb]
-		sys-apps/dbus[X]
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -99,6 +95,7 @@ RDEPEND="${COMMONDEPEND}
 	)
 "
 PDEPEND="
+	handbook? ( $(add_kdebase_dep khelpcenter) )
 	policykit? ( >=sys-auth/polkit-kde-0.95.1 )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 "
diff --git a/kde-base/kdelibs/kdelibs-4.5.1.ebuild b/kde-base/kdelibs/kdelibs-4.5.1.ebuild
index 5a84f4f364b8..0d763cacd45e 100644
--- a/kde-base/kdelibs/kdelibs-4.5.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.5.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.5.1.ebuild,v 1.2 2010/09/06 04:50:53 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.5.1.ebuild,v 1.3 2010/09/13 21:39:31 reavertm Exp $
 
 EAPI="3"
 
-KDE_HANDBOOK=1
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="optional"
 WEBKIT_REQUIRED="always"
@@ -15,7 +14,7 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
 lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl zeroconf"
 
 # needs the kate regression testsuite from svn
@@ -32,19 +31,15 @@ COMMONDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/giflib
-	virtual/jpeg:0
 	>=media-libs/libpng-1.4
 	sys-libs/zlib
+	virtual/jpeg
 	>=x11-misc/shared-mime-info-0.60
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
-	aqua? (
-		>=media-sound/phonon-4.3.80
-		sys-apps/dbus
-	)
+	aqua? ( >=media-sound/phonon-4.3.80 )
 	!aqua? (
 		>=media-sound/phonon-4.3.80[xcb]
-		sys-apps/dbus[X]
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libX11
@@ -103,6 +98,7 @@ RDEPEND="${COMMONDEPEND}
 	)
 "
 PDEPEND="
+	handbook? ( $(add_kdebase_dep khelpcenter) )
 	policykit? ( >=sys-auth/polkit-kde-0.95.1 )
 	semantic-desktop? ( $(add_kdebase_dep nepomuk) )
 "