[gentoo-commits] proj/kde:master commit in: kde-base/kwin/

[Michael Palimaka]

commit:     9c762d8361aa31fcde0f04d5f62e39a558e065a2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 21 20:13:31 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 21 20:13:31 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9c762d83

Revert "[kde-base/kwin] Drop blocker on kde-base/kwin:4"

Headers and dbus interface still collides.

This reverts commit 5c115aaede523930a2f3e90ede6e907e81e5999b.

---
 kde-base/kwin/kwin-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index ae953c6..aed4c80 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -59,6 +59,7 @@ COMMON_DEPEND="
        )
 "
 RDEPEND="${COMMON_DEPEND}
+       !kde-base/kwin:4
        !kde-base/systemsettings:4
 "
 DEPEND="${COMMON_DEPEND}