diff options
| author |   Alex Alexander <wired@gentoo.org> | 2009-08-04 13:45:44 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2009-08-04 13:45:44 +0000 |
| commit | 2286c4a8d39df1c4bcfe80b1952809e95f9881bc (patch) | |
| tree | 7e1d4a905b79fcb543de0db93813f426be6b73fa /kde-base/oxygen-icons | |
| parent | Version bump. (diff) | |
| download | gentoo-2-2286c4a8d39df1c4bcfe80b1952809e95f9881bc.tar.gz gentoo-2-2286c4a8d39df1c4bcfe80b1952809e95f9881bc.tar.bz2 gentoo-2-2286c4a8d39df1c4bcfe80b1952809e95f9881bc.zip | |
block step-4.2.98 (collisions)
(Portage version: 2.2_rc35/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base/oxygen-icons')
| -rw-r--r-- | kde-base/oxygen-icons/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/kde-base/oxygen-icons/ChangeLog b/kde-base/oxygen-icons/ChangeLog index 190126e72870..7b43a5c5e19c 100644 --- a/kde-base/oxygen-icons/ChangeLog +++ b/kde-base/oxygen-icons/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/oxygen-icons # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.2 2009/08/04 10:46:00 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/ChangeLog,v 1.3 2009/08/04 13:45:44 wired Exp $ + + 04 Aug 2009; Alex Alexander <wired@gentoo.org> oxygen-icons-4.3.0.ebuild: + block step-4.2.98 (collisions) 04 Aug 2009; Alex Alexander <wired@gentoo.org> +metadata.xml: added metadata... diff --git a/kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild index 3d696ce99284..58fa5790a0b4 100644 --- a/kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild +++ b/kde-base/oxygen-icons/oxygen-icons-4.3.0.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/oxygen-icons/oxygen-icons-4.3.0.ebuild,v 1.1 2009/08/04 01:29:29 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild,v 1.2 2009/08/04 13:45:44 wired Exp $ EAPI="2" @@ -23,14 +23,14 @@ IUSE="" # Block conflicting packages RDEPEND=" !kdeprefix? ( - !<=kde-base/step-4.2.95[-kdeprefix] - !<=kde-base/kdepim-icons-4.2.89[-kdeprefix] !<kde-base/kdebase-data-4.2.67:4.2[-kdeprefix] !<kde-base/kdebase-data-4.2.67:4.3[-kdeprefix] + !<=kde-base/kdepim-icons-4.2.89[-kdeprefix] + !<=kde-base/step-4.2.98[-kdeprefix] ) kdeprefix? ( !<kde-base/kdebase-data-4.2.67:${SLOT}[kdeprefix] !<=kde-base/kdepim-icons-4.2.89:${SLOT}[kdeprefix] - !<=kde-base/step-4.2.95:${SLOT}[kdeprefix] + !<=kde-base/step-4.2.98:${SLOT}[kdeprefix] ) " |