add solid patch

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 12 insertions, 22 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index dc71ab04f246..45c787fc0ade 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.21 2009/03/04 22:55:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.22 2009/03/06 00:24:29 scarabeus Exp $
+
+  05 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> solid-4.2.0.ebuild,
+  solid-4.2.1.ebuild:
+  Update comment, and apply fix for bluetooth even on solid 4.2.1.
 
 *solid-4.2.1 (04 Mar 2009)
 
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index c519b656ac1d..fcea2400ab10 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
 DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f6709905d0cf416b39c4 SHA1 412b8a6778d5c71a366c054b0136edae309bbef0 SHA256 fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
 DIST solid-4.2.0-backport-solid-bluetooth.patch.tar.bz2 6456 RMD160 34d2606be25950c96755fd7019c97f57fe3fa87c SHA1 90cc2b19c34bfa49406e6d71bd4915492f79ea83 SHA256 84008e1367fbf149fd1b32005caab936260e933acefa11498996e9527421df69
-EBUILD solid-4.2.0.ebuild 1291 RMD160 f568467f1942029c165943ca434a79e0615ecddc SHA1 bd3eeebaf6eea065306631df5c43b276956858bf SHA256 03ed061c37bf85b62faeae69a1b6284660042c88706da6daa519d24799bc7419
-EBUILD solid-4.2.1.ebuild 1209 RMD160 2f509fa1e20f33c8db0035aea73182f195695dae SHA1 6c4be229ad6968b255abfcf84ce40e7e0964bb22 SHA256 166230db930214cf06437e0cea51f3fac48f7e9cd6a30d31497be666baf17831
-MISC ChangeLog 3050 RMD160 ccf4327b4b8e164b24db4c89eda1ce12c55387b7 SHA1 dd98d06d4668e11e9c70b4958d7894fd3c5475f2 SHA256 8919ec4646dd842aee453989d8d49c48327ddf8bfc81a5e9dbeec0d593c47847
+EBUILD solid-4.2.0.ebuild 1124 RMD160 945d989c5c4f68087312ac9a9e5ebbe5969ea478 SHA1 042c08fcbd5a10dbc1bcd6a7d073dd2ab062d242 SHA256 24a20d5f0f95dabc48b5e27f78c142b077536e1c77daa5c18334b4c24ff4fda8
+EBUILD solid-4.2.1.ebuild 1124 RMD160 45dbb3746940e320ba753b50eafec74dde86bb2c SHA1 6d0b6bf78807e8a71d8bb11410a66709329a1174 SHA256 a30629688abe33367999623cad0d09297caef6f4fb58e357ece7c3ffdd0c13a4
+MISC ChangeLog 3215 RMD160 f22d21c0ef14d7b7462f79fad941285be6c510d2 SHA1 b78233a817f89ee6303aa9b6a293d1701a8e037b SHA256 ccfbd556c47f5db4427632bea42bd02ccbd473884c499a866abcbb3e2745e3b3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmvBwEACgkQ5BmOA85PVLh+dACdEwtEfSSWdNRftsV9jKkAfZrS
-QGMAn236M7cnui8rNMJ9GaFtTp92SQIs
-=a8gc
------END PGP SIGNATURE-----
diff --git a/kde-base/solid/solid-4.2.0.ebuild b/kde-base/solid/solid-4.2.0.ebuild
index e05f4f30961c..979c89c3cb90 100644
--- a/kde-base/solid/solid-4.2.0.ebuild
+++ b/kde-base/solid/solid-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.0.ebuild,v 1.3 2009/02/01 08:36:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.0.ebuild,v 1.4 2009/03/06 00:24:29 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,9 +14,6 @@ DESCRIPTION="Solid: the KDE hardware library"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bluetooth debug networkmanager"
 
-# 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="
 	>=sys-apps/hal-0.5.9
 	bluetooth? (
diff --git a/kde-base/solid/solid-4.2.1.ebuild b/kde-base/solid/solid-4.2.1.ebuild
index 340a87ad3ec6..09ffd1984f58 100644
--- a/kde-base/solid/solid-4.2.1.ebuild
+++ b/kde-base/solid/solid-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.1.ebuild,v 1.1 2009/03/04 22:55:49 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.2.1.ebuild,v 1.2 2009/03/06 00:24:29 scarabeus Exp $
 
 EAPI="2"
 
@@ -14,9 +14,6 @@ DESCRIPTION="Solid: the KDE hardware library"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bluetooth debug networkmanager"
 
-# 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="
 	>=sys-apps/hal-0.5.9
 	bluetooth? (
@@ -33,6 +30,8 @@ KMEXTRA="
 	libs/solid/
 "
 
+PATCHES=( "${DISTDIR}/${PN}-4.2.0-backport-solid-bluetooth.patch.tar.bz2" )
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with bluetooth BlueZ)