summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2009-08-04 13:45:44 +0000
committerAlex Alexander <wired@gentoo.org>2009-08-04 13:45:44 +0000
commit8f07999796cb210fcc80d174a96c37c13b33b638 (patch)
tree90df74cbe63336445e2dc33f4c8b8e3bd667d91b /kde-base
parentVersion bump. (diff)
downloadhistorical-8f07999796cb210fcc80d174a96c37c13b33b638.tar.gz
historical-8f07999796cb210fcc80d174a96c37c13b33b638.tar.bz2
historical-8f07999796cb210fcc80d174a96c37c13b33b638.zip
block step-4.2.98 (collisions)
Package-Manager: portage-2.2_rc35/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/oxygen-icons/ChangeLog5
-rw-r--r--kde-base/oxygen-icons/Manifest4
-rw-r--r--kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild8
3 files changed, 10 insertions, 7 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/Manifest b/kde-base/oxygen-icons/Manifest
index 91ac8b6f3bab..870193f30d12 100644
--- a/kde-base/oxygen-icons/Manifest
+++ b/kde-base/oxygen-icons/Manifest
@@ -1,4 +1,4 @@
DIST oxygen-icons-4.3.0.tar.bz2 106236129 RMD160 2a9e5fa03613cc7c149ae935bbe249e66dcc731b SHA1 f18366694bb43dfd84aea57d80ebe814abeb0506 SHA256 e5d87db55efc17f1368340b8787089dc6f6915aec0c3e03e260a2394ebcd5048
-EBUILD oxygen-icons-4.3.0.ebuild 952 RMD160 00259dd1add5edf4ddc0b2b52cbb921f359718ac SHA1 90444c1530e980e78aa6f5a4fb7866c3fe6c11e0 SHA256 ea096f8975e62921526ad4a1780689d27fdaa449ce0d83549c2f074242a9d872
-MISC ChangeLog 427 RMD160 cb1c9126c0cb4a3862857316b51ab7d16f3c2404 SHA1 aaed6c0f7a6ad441562b924b7323526ec125461e SHA256 1a4f699c9782ee59cd54dcaa69fa6ad9599c9cd9830a63cf19b69c03bff4b016
+EBUILD oxygen-icons-4.3.0.ebuild 952 RMD160 3000d22cfe1d07432b87f3959d1ad9c6409b88b4 SHA1 b75cbcafa504a991a42d469578be197e9f9f0cd0 SHA256 4a45b689365af5e7df5b93d24b95a630847b98bfa80ac3f7ba2dfd87cd62cc73
+MISC ChangeLog 537 RMD160 fb8cf10655a5f3fce25076c435d2815113d4b567 SHA1 00e33cbc1ce90d773054f6d12de5c5494485d2f5 SHA256 d1651fc232e0b88ae427930374d763276aba0172d64545c1e6233083ee597248
MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
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]
)
"