diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:42:42 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:42:42 +0000 |
| commit | 2141738dadfd26fe49e465efeef6b6858276c491 (patch) | |
| tree | 3a36838ff46283c6fdabc0dee12b5df48e7aebcb | |
| parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
| download | gentoo-2-2141738dadfd26fe49e465efeef6b6858276c491.tar.gz gentoo-2-2141738dadfd26fe49e465efeef6b6858276c491.tar.bz2 gentoo-2-2141738dadfd26fe49e465efeef6b6858276c491.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/plasma-apps/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/plasma-apps/plasma-apps-4.2.1.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/kde-base/plasma-apps/ChangeLog b/kde-base/plasma-apps/ChangeLog index 5ad4f0051ad7..27cd5eba7547 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.12 2009/03/08 22:54:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/ChangeLog,v 1.13 2009/03/15 14:42:42 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> + plasma-apps-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> plasma-apps-4.2.1.ebuild: 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 5a46220d2b6d..11db1cfe9f3e 100644 --- a/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild +++ b/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild @@ -1,11 +1,11 @@ # 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.3 2009/03/08 22:54:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-apps/plasma-apps-4.2.1.ebuild,v 1.4 2009/03/15 14:42:42 scarabeus Exp $ EAPI="2" -KMNAME="kdebase" -KMMODULE="apps/plasma" +KMNAME="kdebase-apps" +KMMODULE="plasma" inherit kde4-meta DESCRIPTION="Additional Applets for Plasma" @@ -16,5 +16,5 @@ DEPEND=" >=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=] " RDEPEND="${DEPEND} - !kdeprefix? ( !kde-base/plasma ) + !kdeprefix? ( !kde-base/plasma[-kdeprefix] ) " |