commit: 3e980470661aa376a316c322135d9fbe99606456 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Dec 13 08:00:54 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Dec 13 08:56:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e980470
kde-frameworks/plasma: Add blocker, relax blocker File collisions: kdeplasma-addons-5.4.3: /usr/share/plasma/desktoptheme/default/widgets/notes.svgz kapptemplate-15.08.3: /usr/share/kdevappwizard/templates/qml-plasmoid.tar.bz2 Package-Manager: portage-2.2.24 .../plasma/{plasma-5.17.0.ebuild => plasma-5.17.0-r1.ebuild} | 11 ++++++++--- kde-frameworks/plasma/plasma-9999.ebuild | 9 ++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/kde-frameworks/plasma/plasma-5.17.0.ebuild b/kde-frameworks/plasma/plasma-5.17.0-r1.ebuild similarity index 86% rename from kde-frameworks/plasma/plasma-5.17.0.ebuild rename to kde-frameworks/plasma/plasma-5.17.0-r1.ebuild index 279161f..22c4397 100644 --- a/kde-frameworks/plasma/plasma-5.17.0.ebuild +++ b/kde-frameworks/plasma/plasma-5.17.0-r1.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2+" KEYWORDS=" ~amd64 ~x86" IUSE="egl gles2 X" -RDEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kactivities) $(add_frameworks_dep karchive) $(add_frameworks_dep kconfig) @@ -46,13 +46,18 @@ RDEPEND=" x11-libs/libX11 x11-libs/libxcb ) - !<kde-apps/kapptemplate-15.12.0 + !<kde-apps/kapptemplate-15.18.3-r1:5 + !<kde-plasma/kdeplasma-addons-5.4.3-r1 " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kdoctools) dev-qt/qtquick1:5 X? ( x11-proto/xproto ) " +RDEPEND="${COMMON_DEPEND} + !<kde-apps/kapptemplate-15.18.3-r1:5 + !<kde-plasma/kdeplasma-addons-5.4.3-r1 +" RESTRICT="test" diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild index caa52c4..5180e3a 100644 --- a/kde-frameworks/plasma/plasma-9999.ebuild +++ b/kde-frameworks/plasma/plasma-9999.ebuild @@ -13,7 +13,7 @@ LICENSE="LGPL-2+" KEYWORDS="" IUSE="egl gles2 X" -RDEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kactivities) $(add_frameworks_dep karchive) $(add_frameworks_dep kconfig) @@ -46,13 +46,16 @@ RDEPEND=" x11-libs/libX11 x11-libs/libxcb ) - !<kde-apps/kapptemplate-15.12.0 " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kdoctools) dev-qt/qtquick1:5 X? ( x11-proto/xproto ) " +RDEPEND="${COMMON_DEPEND} + !<kde-apps/kapptemplate-15.18.3-r1:5 + !<kde-plasma/kdeplasma-addons-5.4.3-r1 +" RESTRICT="test"