summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-02-13 23:53:21 +0100
committerAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-02-14 02:38:20 +0100
commit9fc0d7ab5db9a7f170a69264595484d3cd07903c (patch)
treeff447dfc854d4129acfbc26b70c80d05356a87b1
parent67e6f29cf44b13abfee0a7fed8c3fabf0862aa36 (diff)
downloadkde-9fc0d7ab5db9a7f170a69264595484d3cd07903c.tar.gz
kde-9fc0d7ab5db9a7f170a69264595484d3cd07903c.tar.bz2
kde-9fc0d7ab5db9a7f170a69264595484d3cd07903c.zip
kde-frameworks/oxygen-icons: Add blocker against conflicting kdepim:5
Package-Manager: portage-2.2.27
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild1
-rw-r--r--kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild1
2 files changed, 2 insertions, 0 deletions
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild
index 3877f33b899..7c23031e8d4 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.19.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="
test? ( $(add_qt_dep qttest) )
"
RDEPEND="
+ !<kde-apps/kdepim-15.12.1-r1:5
!kde-apps/kdepim-icons:4
!kde-frameworks/oxygen-icons:4
"
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
index e9f499729f4..c8ac5aea79b 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild
@@ -21,6 +21,7 @@ DEPEND="
test? ( $(add_qt_dep qttest) )
"
RDEPEND="
+ !<kde-apps/kdepim-15.12.1-r1:5
!kde-apps/kdepim-icons:4
!kde-frameworks/oxygen-icons:4
"