kde-base/solid sync with main tree. drop patches

5 files changed, 12 insertions, 128 deletions

diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index 8c40c627135..47979de3f9e 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,5 +1,3 @@
-AUX solid-4.3.1-darwin-compile-powermanager.patch 2367 RMD160 0a6f3627c42e63c46b4000ff2cc6e500a2098d47 SHA1 40ad2b2300fa7646306b2576b0669424ed8af70c SHA256 659e624f42d30306edb87b7256986ca2129fef2620d7ce1bf32b29a6ae67c69c
-AUX solid-4.4.69-darwin-compile-powermanager.patch 2027 RMD160 3b3bba7efc3924a47962809e9a85e3599a08f359 SHA1 6f40d525220ea74ad8dafed0cdb4513329f3a782 SHA256 f69d226818153c125540b1853a5274b25d01e744e9e5a98ec7f16945ecdd49d1
-EBUILD solid-4.6.9999.ebuild 777 RMD160 f41c3dfa27e33ee44c9acfaac14147093a05303e SHA1 870e788d636d82dbcf538d72a6c91d9ec5b82da9 SHA256 90941cdea3a31e2eb272e90f2a8b7a4f582ccdf6296ec617a38a3bf6433d5ba9
-EBUILD solid-9999.ebuild 777 RMD160 f41c3dfa27e33ee44c9acfaac14147093a05303e SHA1 870e788d636d82dbcf538d72a6c91d9ec5b82da9 SHA256 90941cdea3a31e2eb272e90f2a8b7a4f582ccdf6296ec617a38a3bf6433d5ba9
+EBUILD solid-4.6.9999.ebuild 831 RMD160 3df9b777b9d288d334c2c45e53edc99cf326114b SHA1 5898f27b12d64cefa6b1c094afc4d138943d0c5d SHA256 8460062638dd06bf87eb15ffb240d0ccc7dd044da73558a40bad5766cc0af473
+EBUILD solid-9999.ebuild 831 RMD160 3df9b777b9d288d334c2c45e53edc99cf326114b SHA1 5898f27b12d64cefa6b1c094afc4d138943d0c5d SHA256 8460062638dd06bf87eb15ffb240d0ccc7dd044da73558a40bad5766cc0af473
 MISC metadata.xml 243 RMD160 04fc0be8d2565b1a1b4e4d42041a9d9ec98cf76d SHA1 7f5c2d00f44a48f3d4b96cb9c6af36a31ea401d2 SHA256 04f8169f3dc4ab49f95e390f9202644647d58a5af1af3128a72155d42765c8c3
diff --git a/kde-base/solid/files/solid-4.3.1-darwin-compile-powermanager.patch b/kde-base/solid/files/solid-4.3.1-darwin-compile-powermanager.patch
deleted file mode 100644
index ba9d4f6bb87..00000000000
--- a/kde-base/solid/files/solid-4.3.1-darwin-compile-powermanager.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- solid-4.3.1/libs/solid/control/powermanager.cpp.orig	2009-09-24 19:11:31 +0200
-+++ solid-4.3.1/libs/solid/control/powermanager.cpp	2009-09-24 19:11:46 +0200
-@@ -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)
- 
---- solid-4.3.1/libs/solid/control/powermanager.cpp.orig	2009-09-24 19:04:00 +0200
-+++ solid-4.3.1/libs/solid/control/powermanager.cpp	2009-09-24 19:04:54 +0200
-@@ -148,7 +148,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)
- {
---- solid-4.3.1/libs/solid/control/powermanager.cpp.orig	2009-09-24 18:54:40 +0200
-+++ solid-4.3.1/libs/solid/control/powermanager.cpp	2009-09-24 18:56:02 +0200
-@@ -157,7 +157,7 @@ bool Solid::Control::PowerManager::setBr
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
-         if(controls.size() == 0)
-         {
--#ifdef Q_WS_WIN
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-             return false;
- #else
-             return ( xrandr_brightlight( QX11Info::display(), brightness ) >= 0 );
-@@ -187,7 +187,7 @@ float Solid::Control::PowerManager::brig
-         Solid::Control::PowerManager::BrightnessControlsList controls = brightnessControlsAvailable();
-         if(controls.size() == 0)
-         {
--#ifdef Q_WS_WIN
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-             return false;
- #else
-             return xrandr_brightlight( QX11Info::display() );
---- solid-4.3.1/libs/solid/control/CMakeLists.txt.orig	2009-09-24 18:54:49 +0200
-+++ solid-4.3.1/libs/solid/control/CMakeLists.txt	2009-09-24 18:55:10 +0200
-@@ -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/files/solid-4.4.69-darwin-compile-powermanager.patch b/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch
deleted file mode 100644
index 44d504d5451..00000000000
--- a/kde-base/solid/files/solid-4.4.69-darwin-compile-powermanager.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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.6.9999.ebuild b/kde-base/solid/solid-4.6.9999.ebuild
index af58ba780de..4d8969263c6 100644
--- a/kde-base/solid/solid-4.6.9999.ebuild
+++ b/kde-base/solid/solid-4.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.6.0.ebuild,v 1.2 2011/02/02 11:25:09 scarabeus Exp $
 
 EAPI=3
 
@@ -9,12 +9,9 @@ CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS=""
-IUSE="debug networkmanager wicd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug bluetooth 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="
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	wicd? ( net-misc/wicd )
@@ -23,6 +20,8 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep solid-runtime)
 "
 
+PDEPEND="bluetooth? ( net-wireless/bluedevil )"
+
 KMEXTRA="
 	libs/solid/
 "
diff --git a/kde-base/solid/solid-9999.ebuild b/kde-base/solid/solid-9999.ebuild
index af58ba780de..4d8969263c6 100644
--- a/kde-base/solid/solid-9999.ebuild
+++ b/kde-base/solid/solid-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.6.0.ebuild,v 1.2 2011/02/02 11:25:09 scarabeus Exp $
 
 EAPI=3
 
@@ -9,12 +9,9 @@ CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="Solid: the KDE hardware library"
-KEYWORDS=""
-IUSE="debug networkmanager wicd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug bluetooth 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="
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	wicd? ( net-misc/wicd )
@@ -23,6 +20,8 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep solid-runtime)
 "
 
+PDEPEND="bluetooth? ( net-wireless/bluedevil )"
+
 KMEXTRA="
 	libs/solid/
 "