summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-02-12 21:12:40 +0100
committerMichael Palimaka <kensington@gentoo.org>2016-02-14 02:59:02 +1100
commit14b9915d6169ac24ae5ae0326b6c91c078c6a076 (patch)
tree2ed02827b69ffd8e1770c1a62b2d0ac49f53ece0
parent646c3b5eba841a86cd9aa79e5b9782fa1a4db248 (diff)
downloadkde-14b9915d6169ac24ae5ae0326b6c91c078c6a076.tar.gz
kde-14b9915d6169ac24ae5ae0326b6c91c078c6a076.tar.bz2
kde-14b9915d6169ac24ae5ae0326b6c91c078c6a076.zip
kde-plasma/kwin: Add blocker against <kde-apps/kdeartwork-meta-15.08.3-r1
It improves upgrade path from KDE SC 4. Since the Plasma-5 upgrade guide removes all Plasma-4 depending packages from world, but kdeartwork-meta is not necessarily part of depgraph on the subsequent rebuild, people currently face a block if they still have kdeartwork-meta-4.14.3 and kdeartwork-styles installed. Package-Manager: portage-2.2.27
-rw-r--r--kde-plasma/kwin/kwin-5.5.49.9999.ebuild5
-rw-r--r--kde-plasma/kwin/kwin-9999.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
index 0481f195272..1d26ef9d606 100644
--- a/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.5.49.9999.ebuild
@@ -41,14 +41,14 @@ COMMON_DEPEND="
$(add_plasma_dep kdecoration)
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwayland)
- >=dev-libs/libinput-0.10
- >=dev-libs/wayland-1.2
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui 'gles2=,opengl(+)')
$(add_qt_dep qtscript)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
+ >=dev-libs/libinput-0.10
+ >=dev-libs/wayland-1.2
media-libs/fontconfig
media-libs/freetype
media-libs/libepoxy
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtmultimedia 'gstreamer010,qml')
)
)
+ !<kde-apps/kdeartwork-meta-15.08.3-r1:4
!kde-base/kwin:4
!kde-base/systemsettings:4
"
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 0481f195272..1d26ef9d606 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -41,14 +41,14 @@ COMMON_DEPEND="
$(add_plasma_dep kdecoration)
$(add_plasma_dep kscreenlocker)
$(add_plasma_dep kwayland)
- >=dev-libs/libinput-0.10
- >=dev-libs/wayland-1.2
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui 'gles2=,opengl(+)')
$(add_qt_dep qtscript)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
+ >=dev-libs/libinput-0.10
+ >=dev-libs/wayland-1.2
media-libs/fontconfig
media-libs/freetype
media-libs/libepoxy
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtmultimedia 'gstreamer010,qml')
)
)
+ !<kde-apps/kdeartwork-meta-15.08.3-r1:4
!kde-base/kwin:4
!kde-base/systemsettings:4
"