diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2011-04-06 22:22:06 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-04-06 22:22:06 +0000 |
| commit | 21b93c9b05805975ac05b99032146740a1f86f3d (patch) | |
| tree | 304f9c834b7f91af6fd3400e56332d51e115c539 /kde-base/plasma-workspace | |
| parent | Restore keywords (diff) | |
| download | historical-21b93c9b05805975ac05b99032146740a1f86f3d.tar.gz historical-21b93c9b05805975ac05b99032146740a1f86f3d.tar.bz2 historical-21b93c9b05805975ac05b99032146740a1f86f3d.zip | |
Make kdepimlibs optional again, through the rss useflag, bug 353726
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'kde-base/plasma-workspace')
| -rw-r--r-- | kde-base/plasma-workspace/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog index 1803b8ee39e3..eef58068c22b 100644 --- a/kde-base/plasma-workspace/ChangeLog +++ b/kde-base/plasma-workspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/plasma-workspace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.93 2011/04/06 14:19:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.94 2011/04/06 22:22:06 tampakrap Exp $ + + 06 Apr 2011; Theo Chatzimichos <tampakrap@gentoo.org> + plasma-workspace-4.6.2.ebuild: + Make kdepimlibs optional again, through the rss useflag, bug 353726 *plasma-workspace-4.6.2 (06 Apr 2011) diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild index 7dc2f0eb27d4..f659a8a302b5 100644 --- a/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild +++ b/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild,v 1.1 2011/04/06 14:19:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild,v 1.2 2011/04/06 22:22:06 tampakrap Exp $ EAPI=3 @@ -12,15 +12,13 @@ inherit python kde4-meta DESCRIPTION="Plasma: KDE desktop framework" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug google-gadgets gps python qalculate semantic-desktop xinerama" +IUSE="debug google-gadgets gps python qalculate rss semantic-desktop xinerama" COMMONDEPEND=" $(add_kdebase_dep kdelibs 'semantic-desktop?') - $(add_kdebase_dep kdepimlibs 'semantic-desktop?') $(add_kdebase_dep kephal) $(add_kdebase_dep ksysguard) $(add_kdebase_dep libkworkspace) - $(add_kdebase_dep libplasmaclock) $(add_kdebase_dep libplasmagenericshell) $(add_kdebase_dep libtaskmanager) $(add_kdebase_dep solid) @@ -36,6 +34,11 @@ COMMONDEPEND=" $(add_kdebase_dep pykde4) ) qalculate? ( sci-libs/libqalculate ) + rss? ( + $(add_kdebase_dep kdepimlibs 'semantic-desktop?') + $(add_kdebase_dep libplasmaclock 'holidays') + ) + !rss? ( $(add_kdebase_dep libplasmaclock '-holidays') ) xinerama? ( x11-libs/libXinerama ) " DEPEND="${COMMONDEPEND} @@ -99,6 +102,7 @@ src_configure() { $(cmake-utils_use_with python PyQt4) $(cmake-utils_use_with python PyKDE4) $(cmake-utils_use_with qalculate) + $(cmake-utils_use_with rss KdepimLibs) $(cmake-utils_use_with semantic-desktop Nepomuk) $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with xinerama X11_Xinerama) |