From c661e8e99273ad3d611cfe85b0ae0b64c8b9fbc4 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Tue, 20 Oct 2009 10:01:01 +0000
Subject: Apply upstream patch to bring back menu options. Per bug #288472.
 (Portage version: 2.2_rc46/cvs/Linux x86_64)

---
 kde-base/ktimetracker/ChangeLog                    |  9 ++++-
 kde-base/ktimetracker/files/4.3.2-fix-menu.patch   | 12 +++++++
 kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild | 40 ++++++++++++++++++++++
 kde-base/ktimetracker/ktimetracker-4.3.2.ebuild    | 36 -------------------
 4 files changed, 60 insertions(+), 37 deletions(-)
 create mode 100644 kde-base/ktimetracker/files/4.3.2-fix-menu.patch
 create mode 100644 kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild
 delete mode 100644 kde-base/ktimetracker/ktimetracker-4.3.2.ebuild

(limited to 'kde-base/ktimetracker')

diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index 33f05b674b96..70b7eb5a1274 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.27 2009/10/18 17:30:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.28 2009/10/20 10:01:01 scarabeus Exp $
+
+*ktimetracker-4.3.2-r1 (20 Oct 2009)
+
+  20 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.3.2-fix-menu.patch, -ktimetracker-4.3.2.ebuild,
+  +ktimetracker-4.3.2-r1.ebuild:
+  Apply upstream patch to bring back menu options. Per bug #288472.
 
   18 Oct 2009; Markus Meier <maekke@gentoo.org> ktimetracker-4.3.1.ebuild:
   x86 stable, bug #287697
diff --git a/kde-base/ktimetracker/files/4.3.2-fix-menu.patch b/kde-base/ktimetracker/files/4.3.2-fix-menu.patch
new file mode 100644
index 000000000000..991e46f12b13
--- /dev/null
+++ b/kde-base/ktimetracker/files/4.3.2-fix-menu.patch
@@ -0,0 +1,12 @@
+Index: branches/KDE/4.3/kdepim/ktimetracker/mainwindow.cpp
+===================================================================
+--- branches/KDE/4.3/kdepim/ktimetracker/mainwindow.cpp	(revision 1035758)
++++ branches/KDE/4.3/kdepim/ktimetracker/mainwindow.cpp	(revision 1035759)
+@@ -73,6 +73,7 @@
+       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
+       connect(configureAction, SIGNAL(triggered(bool)),
+         m_part->widget(), SLOT(showSettingsDialog()));
++      ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
+       m_part->openFile(icsfile);
+       setupGUI();
+     }
diff --git a/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild b/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..774fa122433a
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.3.2-r1.ebuild,v 1.1 2009/10/20 10:01:01 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks."
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug +handbook"
+
+RDEPEND="
+	>=kde-base/kdepim-kresources-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+	kresources/
+"
+
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-menu.patch
+)
+
+src_unpack() {
+	if use kontact; then
+		KMLOADLIBS="${KMLOADLIBS} kontactinterfaces"
+		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild b/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild
deleted file mode 100644
index d2315f3946e1..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.3.2.ebuild,v 1.1 2009/10/06 20:12:35 alexxy Exp $
-
-EAPI="2"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks."
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug +handbook"
-
-RDEPEND="
-	>=kde-base/kdepim-kresources-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="libkdepim"
-
-src_unpack() {
-	if use kontact; then
-		KMLOADLIBS="${KMLOADLIBS} kontactinterfaces"
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
-- 
cgit v1.2.3-65-gdbad