diff options
author | 2009-03-08 14:22:40 +0000 | |
---|---|---|
committer | 2009-03-08 14:22:40 +0000 | |
commit | f398192a72d5e05545b307660650b2d32caee5fe (patch) | |
tree | 9e491619992ae8c786270b6a929b287fe7d169e9 /kde-base/plasma-apps | |
parent | Migrate to EAPI 2. (diff) | |
download | historical-f398192a72d5e05545b307660650b2d32caee5fe.tar.gz historical-f398192a72d5e05545b307660650b2d32caee5fe.tar.bz2 historical-f398192a72d5e05545b307660650b2d32caee5fe.zip |
Semi-automatic merge, Update deps.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'kde-base/plasma-apps')
-rw-r--r-- | kde-base/plasma-apps/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/plasma-apps/plasma-apps-4.2.1.ebuild | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog index 3a080e871817..9d9eff41fabb 100644 --- a/kde-base/plasma-apps/ChangeLog +++ b/kde-base/plasma-apps/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/plasma-apps # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.9 2009/03/04 22:51:51 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.10 2009/03/08 14:20:02 scarabeus Exp $ + + 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> + plasma-apps-4.2.1.ebuild: + Semi-automatic merge, Update deps. *plasma-apps-4.2.1 (04 Mar 2009) diff --git a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild index 3114e22d7185..3d660749332a 100644 --- a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild +++ b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild @@ -1,16 +1,20 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.1 2009/03/04 22:51:51 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.2 2009/03/08 14:20:02 scarabeus Exp $ EAPI="2" -KMNAME="kdebase" -KMMODULE="apps/plasma" +KMNAME="kdebase-apps" +KMMODULE="plasma" inherit kde4-meta DESCRIPTION="Additional Applets for Plasma" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug" -DEPEND="!kde-base/plasma:${SLOT} - kde-base/libkonq:${SLOT}" +DEPEND=" + >=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=] +" +RDEPEND="${DEPEND} + !kdeprefix? ( !kde-base/plasma ) +" |