diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-07-22 13:11:50 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-07-22 13:11:50 +0000 |
| commit | e5fdff86e3cda30bab23e1320877711c917b206e (patch) | |
| tree | db9813f3ed52e51bac71f870fdabb39ee900740b /kde-base/solid | |
| parent | Remove dependency on solid (it's the other way around) (diff) | |
| download | gentoo-2-e5fdff86e3cda30bab23e1320877711c917b206e.tar.gz gentoo-2-e5fdff86e3cda30bab23e1320877711c917b206e.tar.bz2 gentoo-2-e5fdff86e3cda30bab23e1320877711c917b206e.zip | |
Enable hal by default, fix dependencies on solid-runtime
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/solid')
| -rw-r--r-- | kde-base/solid/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/solid/solid-4.4.4.ebuild | 9 | ||||
| -rw-r--r-- | kde-base/solid/solid-4.4.5.ebuild | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog index ba272afc57f1..490a3ff871f6 100644 --- a/kde-base/solid/ChangeLog +++ b/kde-base/solid/ChangeLog @@ -1,6 +1,10 @@ # 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.79 2010/07/22 08:07:01 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.80 2010/07/22 13:11:50 reavertm Exp $ + + 22 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org> solid-4.4.4.ebuild, + solid-4.4.5.ebuild: + Enable hal by default, fix dependencies on solid-runtime 22 Jul 2010; Theo Chatzimichos <tampakrap@gentoo.org> solid-4.4.5.ebuild: Add hal useflag to avoid the harddep, thanks to polynomial-c for pointing diff --git a/kde-base/solid/solid-4.4.4.ebuild b/kde-base/solid/solid-4.4.4.ebuild index a1fd9b8ab74d..fb565f0b8d9a 100644 --- a/kde-base/solid/solid-4.4.4.ebuild +++ b/kde-base/solid/solid-4.4.4.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.4.4.ebuild,v 1.4 2010/06/28 03:58:04 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.4.4.ebuild,v 1.5 2010/07/22 13:11:50 reavertm Exp $ EAPI="3" @@ -10,7 +10,7 @@ inherit kde4-meta DESCRIPTION="Solid: the KDE hardware library" KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="bluetooth debug networkmanager wicd" +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* @@ -20,7 +20,10 @@ DEPEND=" networkmanager? ( >=net-misc/networkmanager-0.7 ) wicd? ( net-misc/wicd ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + $(add_kdebase_dep solid-runtime) + hal? ( sys-apps/hal ) +" KMEXTRA=" libs/solid/ diff --git a/kde-base/solid/solid-4.4.5.ebuild b/kde-base/solid/solid-4.4.5.ebuild index bc1364250b23..3e47028cfed2 100644 --- a/kde-base/solid/solid-4.4.5.ebuild +++ b/kde-base/solid/solid-4.4.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.4.5.ebuild,v 1.4 2010/07/22 08:07:01 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.4.5.ebuild,v 1.5 2010/07/22 13:11:50 reavertm Exp $ EAPI="3" @@ -10,7 +10,7 @@ inherit kde4-meta DESCRIPTION="Solid: the KDE hardware library" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="bluetooth debug hal networkmanager wicd" +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* @@ -21,6 +21,7 @@ DEPEND=" wicd? ( net-misc/wicd ) " RDEPEND="${DEPEND} + $(add_kdebase_dep solid-runtime) hal? ( sys-apps/hal ) " |