diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-06-10 14:09:52 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-06-10 14:09:52 +0200 |
| commit | 23fff161928e360387824ea1ea79b05817c25a18 (patch) | |
| tree | 29d51bc4468f4f1d450885d23b4f0911b02358d0 | |
| parent | cd1756991a63d1707f35ab6aa87e684797b8f0bf (diff) | |
| download | kde-23fff161928e360387824ea1ea79b05817c25a18.tar.gz kde-23fff161928e360387824ea1ea79b05817c25a18.tar.bz2 kde-23fff161928e360387824ea1ea79b05817c25a18.zip | |
[kde-base/plasma-runtime] Fix collision with older plasma-workspace.
| -rw-r--r-- | kde-base/plasma-runtime/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/plasma-runtime/plasma-runtime-4.2.90.ebuild | 6 | ||||
| -rw-r--r-- | kde-base/plasma-runtime/plasma-runtime-9999.ebuild | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/kde-base/plasma-runtime/Manifest b/kde-base/plasma-runtime/Manifest index b78cef0ef70..5f93956b961 100644 --- a/kde-base/plasma-runtime/Manifest +++ b/kde-base/plasma-runtime/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.2.90.tar.bz2 6704496 RMD160 ae5e9aa5cfb1f429fca1c9f36b6dd57c3f57a2c8 SHA1 ef93e47788d3b93d90b323b9eb05f1f48ed98b55 SHA256 595f164253013068615642fe9bff50526fddfac11efc03f480c239af97d1666c -EBUILD plasma-runtime-4.2.90.ebuild 285 RMD160 65aff74f4f72a7d6d9dae36bd4b1bed77d0d2c67 SHA1 13f9cf4fbe5b612ec9a851bebb65f903cf8e0dc3 SHA256 c57b43bf276d42f34d9ada57c69f38979f3fbb3cd64a8ea240ac13fe0e2481d6 -EBUILD plasma-runtime-9999.ebuild 274 RMD160 c6aa66bd051323046955696baece37ce28941d84 SHA1 6a3added6489b65ee0896364028e2d5d0b560b63 SHA256 088736b81a1d0f43e8a29f91647eb492d100f80270a179807bc25aeca87f51df +EBUILD plasma-runtime-4.2.90.ebuild 486 RMD160 06d7e85b38116f6615f755a18336c546fcad32ef SHA1 bac9e653a1f82fc346bf363faf44bba9b03b60a9 SHA256 531edd10b2f861493ec0f087709120c1ff5ff798fe2343eec329ec9b7cac1e63 +EBUILD plasma-runtime-9999.ebuild 475 RMD160 9c5e1ef5a9329d6e9853b3084120855b28d38cf0 SHA1 ee575a21dac3630777469a47974e611814e0f47d SHA256 c04634cc4340b80b5b14cb2f8f63239c22744cb7095e43361112fb81c9a8e495 MISC ChangeLog 929 RMD160 8ba0d9467e2640a401ef4884ea015b027eaeee7d SHA1 8eacf943791402d145eb7022ca697412e657c857 SHA256 85265e69e12420c0f63b2c74d799c2fafa3dcab26ea66c1284f762576040ef29 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/plasma-runtime/plasma-runtime-4.2.90.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.2.90.ebuild index f52025e67a5..8c2ecf327d3 100644 --- a/kde-base/plasma-runtime/plasma-runtime-4.2.90.ebuild +++ b/kde-base/plasma-runtime/plasma-runtime-4.2.90.ebuild @@ -11,3 +11,9 @@ inherit kde4-meta DESCRIPTION="Script engine and package tool for plasma" KEYWORDS="~amd64 ~x86" IUSE="debug" + +# cloned from workspace thus introduce collisions. +RDEPEND=" + !kdeprefix? ( !<=kde-base/plasma-workspace-4.2.90[-kdeprefix] ) + kdeprefix? ( !<=kde-base/plasma-workspace-4.2.90:${SLOT}[kdeprefix] ) +" diff --git a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild index 1738ba9c182..f2db857206f 100644 --- a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild +++ b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild @@ -11,3 +11,9 @@ inherit kde4-meta DESCRIPTION="Script engine and package tool for plasma" KEYWORDS="" IUSE="debug" + +# cloned from workspace thus introduce collisions. +RDEPEND=" + !kdeprefix? ( !<=kde-base/plasma-workspace-4.2.90[-kdeprefix] ) + kdeprefix? ( !<=kde-base/plasma-workspace-4.2.90:${SLOT}[kdeprefix] ) +" |