added dep for kdelibs[plasma] to plasma-workspace

nasty things can happen otherwise =]

6 files changed, 178 insertions, 2 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 2d1fa46dfa3..13ddec292a2 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
+  +files/4.2.1-panelview-crash-fix.patch, +files/4.2-fix-quicklaunch.patch,
+  +plasma-workspace-4.2.1-r1.ebuild, plasma-workspace-4.2.2.ebuild:
+  added dep for kdelibs[plasma] - nasty things can happen otherwise
+
   27 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
   -files/4.2.1-panelview-crash-fix.patch, -files/4.2-fix-quicklaunch.patch,
   plasma-workspace-4.2.2.ebuild:
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index a764b1a031b..516fd7aafc1 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,8 +1,12 @@
+AUX 4.2-fix-quicklaunch.patch 1547 RMD160 97321b2543e4399ec7cdb59337d91163c4c5eb7f SHA1 49807510ad4a5731220d390c2476b57fef6c3a0e SHA256 2943f14c696f853a57f134f9dd20d603e15ff5db1f8a36c724bca1c6276f7ef7
+AUX 4.2.1-panelview-crash-fix.patch 948 RMD160 d067f0fa21a18623718e79fbdac4addf7895c352 SHA1 118dbf669243290c06464d957e98a356f093f9eb SHA256 2a7f11c47c6b9b5da6760ff6ef0de5cd8625c0c2e61cd685a2cb9cd472609a5e
 AUX plasma-workspace-4.1.72-fix.patch 958 RMD160 2922b5ac13b9cbd79a747181b3ff846691508872 SHA1 d3d889ebc5cb7c9f7bd7d00a0729b8350c09b481 SHA256 b2bb0ab8133cd07ca134b41394b0244d07286831a4a4b063b55d8bee157918b3
+DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f6709905d0cf416b39c4 SHA1 412b8a6778d5c71a366c054b0136edae309bbef0 SHA256 fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
 DIST kdebase-workspace-4.2.2.tar.bz2 50800751 RMD160 a7cc0bedde529ff7e27ed9e0b6362ef6c20c4082 SHA1 9397220827f378cedf38e800e06e9ca8b1a1235d SHA256 1620cf0467eb08046aeee6bce46ca17948a703e98c0e3d0de3064ab39f196c2f
 DIST kdebase-workspace-4.2.67.tar.lzma 49804605 RMD160 5f2219f660e8682e76de2f93a99d0ccd68cacf16 SHA1 6c2de41a9824abe22e20ddf6209f7a604b6bd9b6 SHA256 c5273cc92db066a4d98469be2fb983f818911f247767e77287c10efc46b0b4ee
-EBUILD plasma-workspace-4.2.2.ebuild 2511 RMD160 b387fb8516ca00a9147932a26d5501b1c9b443f1 SHA1 b60f9850d565127f926ea9d5accd9f4f449c5155 SHA256 f15cbfce54249b78f68fb97ebea3bcae1af5659661b8bb7420e44657d8dba3df
+EBUILD plasma-workspace-4.2.1-r1.ebuild 2665 RMD160 dfbab86ea5e4caa20d7718c8dd0db1377c16e550 SHA1 256f4b8cfa4232091a610182962e94bcd140566a SHA256 32a47a696371bb1e01564054bcc0cd0411ab715e174aa97a51d6fed121cb23db
+EBUILD plasma-workspace-4.2.2.ebuild 2564 RMD160 e25aa42ff066bb0581d20e2ebb566ae2841fa087 SHA1 be1ac696848b648a5ee60e01ba29e0c57e863add SHA256 6485a5e319717048829c3904394b2a90b771cbf3ee3afa1ffd6f32d542eb3131
 EBUILD plasma-workspace-4.2.67.ebuild 2286 RMD160 db75fb01f22cd613c8b1a815bd885205be28fb42 SHA1 4fe3cd715498f1157fccb281292a71883c1f9236 SHA256 2d2306799e0e8d6ce339653bd0dd5386a3d13efbca37e609d7bc90ae03b35dfb
 EBUILD plasma-workspace-9999.ebuild 2275 RMD160 672cbef75563b75e7145dcee4727ded9fc5aa888 SHA1 351fafe4a49fc83a3eea3f617a6bdbb98825540d SHA256 62471ef186f048eabb7c2d8f69659cbd9ee9beea3719d38d99001c6f46206c11
-MISC ChangeLog 8771 RMD160 48d1a0a8036f618de9b85b76dbecee9aaa3e6494 SHA1 39a944ed4f6ec4bcc79de8897c4266f71bfd76fb SHA256 4663a58289a974d0ad74c09008f3beaa80db19168f8f5f73fc3b00ae717b0a34
+MISC ChangeLog 9049 RMD160 ff6e822178576c33f1f17995741ec29a11ea98d9 SHA1 73b7292aff17d2094ee64f9cda797cfbd54edd48 SHA256 703fbf4a7e730cf82aec074e0aa06b051a49cf130e8f8c79629f53adad816d33
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
diff --git a/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
new file mode 100644
index 00000000000..ad6ba1c4654
--- /dev/null
+++ b/kde-base/plasma-workspace/files/4.2-fix-quicklaunch.patch
@@ -0,0 +1,42 @@
+--- kdebase-workspace-4.2.1-orig/plasma/applets/quicklaunch/quicklaunchApplet.cpp	2009-02-26 15:17:02.000000000 +0100
++++ kdebase-workspace-4.2.1/plasma/applets/quicklaunch/quicklaunchApplet.cpp	2009-03-08 13:53:49.000000000 +0100
+@@ -44,6 +44,8 @@
+ 
+ QuicklaunchApplet::QuicklaunchApplet(QObject *parent, const QVariantList &args)
+   : Plasma::Applet(parent, args),
++    m_layout(0),
++    m_innerLayout(0),
+     m_visibleIcons(6),
+     m_rowCount(2),
+     m_dialogRowCount(2),
+@@ -53,9 +55,7 @@
+     m_addDialog(0),
+     m_rightClickedIcon(0),
+     m_addAction(0),
+-    m_removeAction(0),
+-    m_layout(0),
+-    m_innerLayout(0)
++    m_removeAction(0)
+ {
+     setHasConfigurationInterface(true);
+     setAcceptDrops(true);
+@@ -141,16 +141,11 @@
+         if (!m_innerLayout) {
+             return sizeHint;
+         }
++        qreal newWidth = m_innerLayout->columnCount() * sizeHint.height() / qMax(1, m_innerLayout->rowCount());
+         if (m_icons.size() > m_visibleIcons) {
+-            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount() + size().height();
+-            if (factor) {
+-                sizeHint.setWidth(sizeHint.height() / factor);
+-            }
++            sizeHint.setWidth(newWidth + sizeHint.height());
+         } else {
+-            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount();
+-            if (factor) {
+-                sizeHint.setWidth(sizeHint.height() / factor);
+-            }
++            sizeHint.setWidth(newWidth);
+         }
+         return sizeHint;
+     }
diff --git a/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
new file mode 100644
index 00000000000..d14715684de
--- /dev/null
+++ b/kde-base/plasma-workspace/files/4.2.1-panelview-crash-fix.patch
@@ -0,0 +1,25 @@
+--- a/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/02/24 04:51:03	930724
++++ b/kdebase/workspace/plasma/shells/desktop/panelview.cpp	2009/03/03 23:39:55	934863
+@@ -203,6 +203,11 @@
+       m_triggerEntered(false)
+ {
+     Q_ASSERT(qobject_cast<Plasma::Corona*>(panel->scene()));
++
++    m_strutsTimer = new QTimer(this);
++    m_strutsTimer->setSingleShot(true);
++    connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
++
+     if (panel) {
+         connect(panel, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
+         connect(panel, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
+@@ -248,10 +253,6 @@
+     KWindowSystem::setOnAllDesktops(winId(), true);
+ 
+     QTimer::singleShot(0, this, SLOT(init()));
+-
+-    m_strutsTimer = new QTimer(this);
+-    m_strutsTimer->setSingleShot(true);
+-    connect(m_strutsTimer,SIGNAL(timeout()),this,SLOT(updateStruts()));
+ }
+ 
+ PanelView::~PanelView()
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild
new file mode 100644
index 00000000000..afcb2871e25
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.2.1-r1.ebuild,v 1.1 2009/03/15 14:43:13 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+KMMODULE="plasma"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug google-gadgets python rss xcomposite xinerama"
+
+COMMONDEPEND="
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,plasma]
+	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libplasmaclock-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libtaskmanager-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/soliduiserver-${PV}:${SLOT}[kdeprefix=]
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	google-gadgets? ( >=x11-misc/google-gadgets-0.10.5[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.0
+		>=dev-python/sip-4.7.1
+		>=kde-base/pykde4-${PV}:${SLOT}[kdeprefix=]
+	)
+	rss? ( >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] )
+	xcomposite? ( x11-libs/libXcomposite )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	xcomposite? ( x11-proto/compositeproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	!kdeprefix? ( !kde-base/plasma[-kdeprefix] )
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kde-menu-icons-${PV}:${SLOT}[kdeprefix=]
+"
+
+KMEXTRA="
+	libs/nepomukquery/
+	libs/nepomukqueryclient/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kworkspace/
+	libs/taskmanager/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libtaskmanager"
+
+PATCHES=(
+	"${FILESDIR}/4.2.1-panelview-crash-fix.patch"
+	"${FILESDIR}/4.2-fix-quicklaunch.patch"
+)
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with rss KdepimLibs)
+		-DWITH_Xmms=OFF"
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	python_version
+	rm -f "${D}/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4/*.py[co]
+	rm -f "${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	python_mod_optimize \
+		"/usr/$(get_libdir)/python${PYVER}"/site-packages/PyKDE4 \
+		"${PREFIX}"/share/apps/plasma_scriptengine_python
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	python_mod_cleanup
+}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
index 55c4892021c..aa3b96165e5 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug google-gadgets python rss xcomposite xinerama"
 
 COMMONDEPEND="
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,plasma]
 	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]