Version bump KDE SC 4.5.1

(Portage version: 2.2_rc75/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 106 insertions, 1 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 23c37d24365f..4c9f270de8ee 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.86 2010/08/10 13:36:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.87 2010/09/06 02:03:40 tampakrap Exp $
+
+*solid-4.5.1 (06 Sep 2010)
+
+  06 Sep 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  +files/solid-4.4.69-darwin-compile-powermanager.patch,
+  +solid-4.5.1.ebuild:
+  Version bump
 
   10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/solid-4.3.4-hal.patch, -files/solid-4.3.4-hal-2.patch:
diff --git a/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch b/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch
new file mode 100644
index 000000000000..44d504d54516
--- /dev/null
+++ b/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch
@@ -0,0 +1,54 @@
+--- solid-4.4.69.orig/libs/solid/control/powermanager.cpp
++++ solid-4.4.69/libs/solid/control/powermanager.cpp
+@@ -25,7 +25,9 @@
+ #include "ifaces/powermanager.h"
+ #include <kdebug.h>
+ #include <kglobal.h>
++#if !defined(Q_WS_MAC)
+ #include <QX11Info>
++#endif
+ 
+ K_GLOBAL_STATIC(Solid::Control::PowerManagerPrivate, globalPowerManager)
+ 
+@@ -129,7 +131,9 @@ Solid::Control::PowerManager::Brightness
+                       Solid::Control::PowerManager::BrightnessControlsList(), brightnessControlsAvailable());
+ }
+ 
++#if !defined(Q_WS_MAC)
+ extern float xrandr_brightlight(Display *dpy, long new_value = -1);
++#endif
+ 
+ bool Solid::Control::PowerManager::setBrightness(float brightness, const QString &device)
+ {
+@@ -138,7 +142,7 @@ bool Solid::Control::PowerManager::setBr
+         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
+         if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
+         {
+-#ifdef Q_WS_WIN
++#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+             return false;
+ #else
+             return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
+@@ -168,7 +172,7 @@ float Solid::Control::PowerManager::brig
+         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
+         if(controls.keys(Solid::Control::PowerManager::Screen).isEmpty())
+         {
+-#ifdef Q_WS_WIN
++#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+             return false;
+ #else
+             return xrandr_brightlight( QX11Info::display() );
+--- solid-4.4.69.orig/libs/solid/control/CMakeLists.txt
++++ solid-4.4.69/libs/solid/control/CMakeLists.txt
+@@ -28,9 +28,9 @@ set(solidcontrol_LIB_SRCS
+ )
+ 
+ # FIXME: this should be XRANDR_FOUND instead
+-if(NOT WIN32)
++if(NOT WIN32 AND NOT APPLE)
+ set(solidcontrol_LIB_SRCS ${solidcontrol_LIB_SRCS} powermanager_randr.cpp)
+-endif(NOT WIN32)
++endif(NOT WIN32 AND NOT APPLE)
+ 
+ qt4_add_dbus_interface(solidcontrol_LIB_SRCS org.kde.Solid.Networking.xml org_kde_solid_networking)
+ 
diff --git a/kde-base/solid/solid-4.5.1.ebuild b/kde-base/solid/solid-4.5.1.ebuild
new file mode 100644
index 000000000000..de24186ac2a7
--- /dev/null
+++ b/kde-base/solid/solid-4.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.5.1.ebuild,v 1.1 2010/09/06 02:03:41 tampakrap Exp $
+
+EAPI="3"
+
+KMNAME="kdebase-workspace"
+CPPUNIT_REQUIRED="test"
+inherit kde4-meta
+
+DESCRIPTION="Solid: the KDE hardware library"
+KEYWORDS=""
+IUSE="bluetooth debug +hal networkmanager wicd"
+
+# solid/CMakeLists.txt has an add_subdirectory statement that depends on
+# networkmanager-0.7, referring to a non-existant directory, restricted to =0.6*
+# for now.
+DEPEND="
+	bluetooth? ( net-wireless/bluez )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	wicd? ( net-misc/wicd )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep solid-runtime)
+	hal? ( sys-apps/hal )
+"
+
+KMEXTRA="
+	libs/solid/
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.69-darwin-compile-powermanager.patch
+)
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with bluetooth BlueZ)
+		$(cmake-utils_use_with networkmanager NetworkManager)
+		$(cmake-utils_use_build wicd)
+	)
+
+	kde4-meta_src_configure
+}