diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-08-01 00:23:14 +0200 |
|---|---|---|
| committer |   Manuel Rüger <mrueg@gentoo.org> | 2015-08-01 00:43:21 +0200 |
| commit | 6d2542b78229140b21c3c3342600afd92679719c (patch) | |
| tree | 91c1d2705e5cdaacb8accb60bce3e7f26e342e80 | |
| parent | Revert "[kde-apps/gwenview] Fix deps" (diff) | |
| download | kde-6d2542b7.tar.gz kde-6d2542b7.tar.bz2 kde-6d2542b7.zip | |
Workaround for kde4-base vs kde5 conflict
Package-Manager: portage-2.2.20
Signed-off-by: Manuel Rüger <mrueg@gentoo.org>
| -rw-r--r-- | kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-apps/kdebase-data/kdebase-data-9999.ebuild | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild index 9d2261bb74..44f4c8a465 100644 --- a/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild +++ b/kde-apps/kdebase-data/kdebase-data-15.08.49.9999.ebuild @@ -13,7 +13,7 @@ IUSE="+wallpapers" KEYWORDS="" RDEPEND=" - wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) ) x11-themes/hicolor-icon-theme " diff --git a/kde-apps/kdebase-data/kdebase-data-9999.ebuild b/kde-apps/kdebase-data/kdebase-data-9999.ebuild index 9d2261bb74..44f4c8a465 100644 --- a/kde-apps/kdebase-data/kdebase-data-9999.ebuild +++ b/kde-apps/kdebase-data/kdebase-data-9999.ebuild @@ -13,7 +13,7 @@ IUSE="+wallpapers" KEYWORDS="" RDEPEND=" - wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) + wallpapers? ( || ( $(add_kdeapps_dep kde-wallpapers) >=kde-apps/kde-wallpapers-${PV}:5 ) ) x11-themes/hicolor-icon-theme " |