commit: 24e235d8390f85c729037fae6250d45da5cba4d4 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Wed Aug 3 18:24:16 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Aug 3 18:24:37 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=24e235d8
kde-plasma/oxygen: block kde-base/liboxygenstyle:4 due to file collisions * package kde-plasma/oxygen-5.7.3 NOT merged * * Detected file collision(s): * * /usr/lib64/liboxygenstyleconfig.so * /usr/lib64/liboxygenstyle.so * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * kde-base/liboxygenstyle-4.11.21:4::gentoo * /usr/lib64/liboxygenstyle.so * /usr/lib64/liboxygenstyleconfig.so * Package-Manager: portage-2.3.0 kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild | 1 + kde-plasma/oxygen/oxygen-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild index 6bff8cb..99505f0 100644 --- a/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild +++ b/kde-plasma/oxygen/oxygen-5.7.49.9999.ebuild @@ -40,6 +40,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) + qt4? ( !kde-base/liboxygenstyle:4 ) !kde-base/kdebase-cursors:4 !kde-base/kstyles:4 " diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild index 6bff8cb..99505f0 100644 --- a/kde-plasma/oxygen/oxygen-9999.ebuild +++ b/kde-plasma/oxygen/oxygen-9999.ebuild @@ -40,6 +40,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) + qt4? ( !kde-base/liboxygenstyle:4 ) !kde-base/kdebase-cursors:4 !kde-base/kstyles:4 "