[kde-base/oxygen-icons] fixed collision blocks

5 files changed, 16 insertions, 15 deletions

diff --git a/kde-base/oxygen-icons/Manifest b/kde-base/oxygen-icons/Manifest
index a2ad9ced30b..f0c834dd315 100644
--- a/kde-base/oxygen-icons/Manifest
+++ b/kde-base/oxygen-icons/Manifest
@@ -1,9 +1,9 @@
 DIST oxygen-icons-4.2.98.tar.bz2 105246221 RMD160 6dcb17f6f08e4271ccf482d591ab53597ee941d9 SHA1 7748113de93794cf92ea55334c333534b506be0c SHA256 88678062b728697dfc5e5435ca0cf14c4e2c229e394f1d75fd52e5c1e5764570
 DIST oxygen-icons-4.3.0.tar.bz2 106236129 RMD160 2a9e5fa03613cc7c149ae935bbe249e66dcc731b SHA1 f18366694bb43dfd84aea57d80ebe814abeb0506 SHA256 e5d87db55efc17f1368340b8787089dc6f6915aec0c3e03e260a2394ebcd5048
 DIST oxygen-icons-4.3.61.tar.lzma 77075664 RMD160 74ccfd9e9889c4f10bf5e3bb0ed900fa3677b7e1 SHA1 5c4a88770abef489f69955cb31d8785627e39bc8 SHA256 b00fd3d6457aa19650fcecfe18a85a5a669bc7b856ee088a692a236822d47fc3
-EBUILD oxygen-icons-4.2.98.ebuild 803 RMD160 2a667e0d82680aad6ecf2239df614c233c8352fa SHA1 32c9349a0cb0d864a3506013d6d3be8f52fc35bc SHA256 f35b71f0c932693e74c6c0a3a78a68721b838da4de85cd26fb613e068b8fd705
-EBUILD oxygen-icons-4.3.0.ebuild 944 RMD160 db8f60176024e469b877d39900a1e5710c8c2db1 SHA1 eae7a77fe2f6f1a45c5be32b9e6eda47f7e16f3d SHA256 ae76caa6a9c5675a108acb8bd6849f18dee7187c5bf7521bf040d3b84fb38194
+EBUILD oxygen-icons-4.2.98.ebuild 844 RMD160 07801f1b9c68e4b6d7748b0f694c24ed06bea2d0 SHA1 8dbe4fa0aa36f07919d4df20759bd8d749be43b9 SHA256 de21a80f25c64a4f79b3e975dbd25865c5bbd62d694f3aa1a4bd83f369ca4f4a
+EBUILD oxygen-icons-4.3.0.ebuild 844 RMD160 07801f1b9c68e4b6d7748b0f694c24ed06bea2d0 SHA1 8dbe4fa0aa36f07919d4df20759bd8d749be43b9 SHA256 de21a80f25c64a4f79b3e975dbd25865c5bbd62d694f3aa1a4bd83f369ca4f4a
 EBUILD oxygen-icons-4.3.61.ebuild 803 RMD160 2a667e0d82680aad6ecf2239df614c233c8352fa SHA1 32c9349a0cb0d864a3506013d6d3be8f52fc35bc SHA256 f35b71f0c932693e74c6c0a3a78a68721b838da4de85cd26fb613e068b8fd705
-EBUILD oxygen-icons-4.3.9999.ebuild 792 RMD160 b31581f2341be8dc09ca4e1ee6c5d3d80bc307be SHA1 937cc4dd7b8494f81808dd21633f6f9ec7f88619 SHA256 c9b57419de0737ec0c6e61a157214db3c454bb56439b92ca1a482f0eec97004b
-EBUILD oxygen-icons-9999.ebuild 792 RMD160 b31581f2341be8dc09ca4e1ee6c5d3d80bc307be SHA1 937cc4dd7b8494f81808dd21633f6f9ec7f88619 SHA256 c9b57419de0737ec0c6e61a157214db3c454bb56439b92ca1a482f0eec97004b
+EBUILD oxygen-icons-4.3.9999.ebuild 833 RMD160 bfabf8500a7fe421b49e670c78d845b2823b23c4 SHA1 ffffbe4eb5a8ab75634ab150221602bebeced758 SHA256 79e4dbc06d206bed0101458a6e6690ae51ad6a7f0828aedc3f4f3008a19b93ab
+EBUILD oxygen-icons-9999.ebuild 833 RMD160 bfabf8500a7fe421b49e670c78d845b2823b23c4 SHA1 ffffbe4eb5a8ab75634ab150221602bebeced758 SHA256 79e4dbc06d206bed0101458a6e6690ae51ad6a7f0828aedc3f4f3008a19b93ab
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.2.98.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.2.98.ebuild
index 7a285c74285..8cffbda7143 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.2.98.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.2.98.ebuild
@@ -23,9 +23,10 @@ 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:4.3[-kdeprefix]
-		!<=kde-base/step-4.2.95:4.3[-kdeprefix]
 	)
 	kdeprefix? (
 		!<kde-base/kdebase-data-4.2.67:${SLOT}[kdeprefix]
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 297d0a1a115..8cffbda7143 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.3.0.ebuild
@@ -23,12 +23,10 @@ IUSE=""
 # Block conflicting packages
 RDEPEND="
 	!kdeprefix? (
-		!<kde-base/kdebase-data-4.2.67:4.3[-kdeprefix]
-		!<=kde-base/kdepim-icons-4.2.89:4.3[-kdeprefix]
-		!<=kde-base/step-4.2.95:4.3[-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/kdepim-icons-4.2.89:4.2[-kdeprefix]
-		!<=kde-base/step-4.2.95:4.2[-kdeprefix]
+		!<kde-base/kdebase-data-4.2.67:4.3[-kdeprefix]
 	)
 	kdeprefix? (
 		!<kde-base/kdebase-data-4.2.67:${SLOT}[kdeprefix]
diff --git a/kde-base/oxygen-icons/oxygen-icons-4.3.9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.3.9999.ebuild
index 362f51ac086..95ae875c2e2 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.3.9999.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.3.9999.ebuild
@@ -23,9 +23,10 @@ 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:4.3[-kdeprefix]
-		!<=kde-base/step-4.2.95:4.3[-kdeprefix]
 	)
 	kdeprefix? (
 		!<kde-base/kdebase-data-4.2.67:${SLOT}[kdeprefix]
diff --git a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
index 362f51ac086..95ae875c2e2 100644
--- a/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-9999.ebuild
@@ -23,9 +23,10 @@ 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:4.3[-kdeprefix]
-		!<=kde-base/step-4.2.95:4.3[-kdeprefix]
 	)
 	kdeprefix? (
 		!<kde-base/kdebase-data-4.2.67:${SLOT}[kdeprefix]