Revision bump to drop -hal.patch and -hal-2.patch for stabilization.

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

3 files changed, 51 insertions, 4 deletions

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index e3f4cfb53afc..d0bee3d5def9 100644
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,12 @@
 # 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.61 2010/02/09 00:22:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.62 2010/02/17 21:35:11 ssuominen Exp $
+
+*solid-4.3.5-r1 (17 Feb 2010)
+
+  17 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> solid-4.3.5.ebuild,
+  +solid-4.3.5-r1.ebuild:
+  Revision bump to drop -hal.patch and -hal-2.patch for stabilization.
 
 *solid-4.4.0 (09 Feb 2010)
 
diff --git a/kde-base/solid/solid-4.3.5-r1.ebuild b/kde-base/solid/solid-4.3.5-r1.ebuild
new file mode 100644
index 000000000000..8398262988a9
--- /dev/null
+++ b/kde-base/solid/solid-4.3.5-r1.ebuild
@@ -0,0 +1,43 @@
+# 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.3.5-r1.ebuild,v 1.1 2010/02/17 21:35:11 ssuominen Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+CPPUNIT_REQUIRED="test"
+inherit kde4-meta
+
+DESCRIPTION="Solid: the KDE hardware library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bluetooth debug 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}"
+
+KMEXTRA="
+	libs/solid/
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-darwin-compile-powermanager.patch
+	"${FILESDIR}/${PN}-4.3.4-hal.patch"
+	"${FILESDIR}/${PN}-4.3.4-hal-2.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
+}
diff --git a/kde-base/solid/solid-4.3.5.ebuild b/kde-base/solid/solid-4.3.5.ebuild
index 95a23bdd0261..68601b6de83b 100644
--- a/kde-base/solid/solid-4.3.5.ebuild
+++ b/kde-base/solid/solid-4.3.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/solid/solid-4.3.5.ebuild,v 1.1 2010/01/25 17:38:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.3.5.ebuild,v 1.2 2010/02/17 21:35:11 ssuominen Exp $
 
 EAPI="2"
 
@@ -28,8 +28,6 @@ KMEXTRA="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.1-darwin-compile-powermanager.patch
-	"${FILESDIR}/${PN}-4.3.4-hal.patch"
-	"${FILESDIR}/${PN}-4.3.4-hal-2.patch"
 )
 
 src_configure() {