diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:23:18 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:23:18 +0000 |
commit | f84e73f1723c7f5a9349699b898d028041fcb706 (patch) | |
tree | 86c523ab77ddf475c0983c3edea4afacf8083a65 | |
parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
download | gentoo-2-f84e73f1723c7f5a9349699b898d028041fcb706.tar.gz gentoo-2-f84e73f1723c7f5a9349699b898d028041fcb706.tar.bz2 gentoo-2-f84e73f1723c7f5a9349699b898d028041fcb706.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/kdeartwork-wallpapers/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog index fb1c4733e48f..9c6b1ae9e82d 100644 --- a/kde-base/kdeartwork-wallpapers/ChangeLog +++ b/kde-base/kdeartwork-wallpapers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeartwork-wallpapers # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.96 2009/03/08 19:16:45 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.97 2009/03/15 14:23:18 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> + kdeartwork-wallpapers-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kdeartwork-wallpapers-4.2.0.ebuild: diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild index af07781003c1..e3f3a3afba95 100644 --- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild +++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild,v 1.3 2009/03/08 14:59:22 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-4.2.1.ebuild,v 1.4 2009/03/15 14:23:18 scarabeus Exp $ EAPI="2" @@ -16,5 +16,5 @@ IUSE="" RDEPEND=" !kdeprefix? ( !<kde-base/kde-wallpapers-${PV}[-kdeprefix] ) - kdeprefix? ( !<kde-base/kde-wallpapers-$PV:${SLOT}[kdeprefix=] ) + kdeprefix? ( !<kde-base/kde-wallpapers-${PV}:${SLOT} ) " |