summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-06 00:24:29 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-06 00:24:29 +0000
commitf0e17eaeb4653d5cc290fd59657f18f6eb0cb3ea (patch)
tree422eb6451f62e0a3e8151d21accb030afe7fe864 /kde-base/solid
parentStable for HPPA (bug #255756). (diff)
downloadgentoo-2-f0e17eaeb4653d5cc290fd59657f18f6eb0cb3ea.tar.gz
gentoo-2-f0e17eaeb4653d5cc290fd59657f18f6eb0cb3ea.tar.bz2
gentoo-2-f0e17eaeb4653d5cc290fd59657f18f6eb0cb3ea.zip
add solid patch
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/solid')
-rw-r--r--kde-base/solid/ChangeLog6
-rw-r--r--kde-base/solid/solid-4.2.0.ebuild5
-rw-r--r--kde-base/solid/solid-4.2.1.ebuild7
3 files changed, 9 insertions, 9 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/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)