Update, now based on oooqs2 1.0, closes bug #123777

(Portage version: 2.1_rc3-r2)

6 files changed, 122 insertions, 1 deletions

diff --git a/app-office/oooqs/ChangeLog b/app-office/oooqs/ChangeLog
index 54d3952dd2c6..dc9afddae176 100644
--- a/app-office/oooqs/ChangeLog
+++ b/app-office/oooqs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/oooqs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/ChangeLog,v 1.23 2006/01/21 22:16:33 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/ChangeLog,v 1.24 2006/05/30 19:14:49 suka Exp $
+
+*oooqs-2.1.0 (30 May 2006)
+
+  30 May 2006; Andreas Proschofsky <suka@gentoo.org> +files/icon_names.diff,
+  +files/oooqs2.patch, +oooqs-2.1.0.ebuild:
+  Update, now based on oooqs2 1.0, ebuild and patches by Eric Ding
+  <zze8zh602@sneakemail.com> in bug #123777
 
   21 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> oooqs-2.0.3-r2.ebuild:
   Stable on amd64, bug 119855.
diff --git a/app-office/oooqs/files/digest-oooqs-2.0.3-r2 b/app-office/oooqs/files/digest-oooqs-2.0.3-r2
index 5d78f6742d54..de68b0eeb5c7 100644
--- a/app-office/oooqs/files/digest-oooqs-2.0.3-r2
+++ b/app-office/oooqs/files/digest-oooqs-2.0.3-r2
@@ -1 +1,3 @@
 MD5 5d401aa7250f80734d785d4c286f635b oooqs-2.0.3.tar.gz 584849
+RMD160 8c6ad3c82038e620bbd9f9577bb26343cd2f3826 oooqs-2.0.3.tar.gz 584849
+SHA256 d3585c669f9a081a5bc84dd1df8af1e7c53deaad0ee765b747e3d23874943e9a oooqs-2.0.3.tar.gz 584849
diff --git a/app-office/oooqs/files/digest-oooqs-2.1.0 b/app-office/oooqs/files/digest-oooqs-2.1.0
new file mode 100644
index 000000000000..060ccd35ba6e
--- /dev/null
+++ b/app-office/oooqs/files/digest-oooqs-2.1.0
@@ -0,0 +1,3 @@
+MD5 e7bac61aced37e3801335d4370b39aaf oooqs2-1.0.tar.gz 584935
+RMD160 cade4f58572abd2b5eba2897c020e84e4ee6b8de oooqs2-1.0.tar.gz 584935
+SHA256 482098ccd1d1eeb503ec1a16e9e7d291ad5c0a26b9d4f26199a57a9371e4ca0e oooqs2-1.0.tar.gz 584935
diff --git a/app-office/oooqs/files/icon_names.diff b/app-office/oooqs/files/icon_names.diff
new file mode 100644
index 000000000000..adf5f36bea94
--- /dev/null
+++ b/app-office/oooqs/files/icon_names.diff
@@ -0,0 +1,67 @@
+*** src/oooqs2.cpp.orig	Tue Feb  7 17:04:18 2006
+--- src/oooqs2.cpp	Wed Feb 22 16:53:47 2006
+***************
+*** 50,80 ****
+     );
+  
+     p_actionBase = new KAction( i18n( "OpenOffice.org Base" ),
+!       "ooo-base", 0, this, SLOT( startBase() ),
+        actionCollection(), "start_1"
+     );
+     p_actionCalc = new KAction( i18n( "OpenOffice.org Calc" ),
+!       "ooo-calc", 0, this, SLOT( startCalc() ),
+        actionCollection(), "start_2"
+     );
+     p_actionDraw = new KAction( i18n( "OpenOffice.org Draw" ),
+!       "ooo-draw", 0, this, SLOT( startDraw() ),
+        actionCollection(), "start_3"
+     );
+     p_actionImpress = new KAction( i18n( "OpenOffice.org Impress" ),
+!       "ooo-impress", 0, this, SLOT( startImpress() ),
+        actionCollection(), "start_4"
+     );
+     p_actionMath = new KAction( i18n( "OpenOffice.org Math" ),
+!       "ooo-math", 0, this, SLOT( startMath() ),
+        actionCollection(), "start_5"
+     );
+     p_actionTemplate = new KAction( i18n( "Start with template" ),
+!       "ooo-template", 0, this, SLOT( startTemplate() ),
+        actionCollection(), "start_0"
+     );
+     p_actionWriter = new KAction( i18n( "OpenOffice.org Writer" ),
+!       "ooo-writer", 0, this, SLOT( startWriter() ),
+        actionCollection(), "start_6"
+     );
+     p_actionPreferences = KStdAction::preferences( this, SLOT( preferences() ),
+--- 50,80 ----
+     );
+  
+     p_actionBase = new KAction( i18n( "OpenOffice.org Base" ),
+!       "ooo-base2", 0, this, SLOT( startBase() ),
+        actionCollection(), "start_1"
+     );
+     p_actionCalc = new KAction( i18n( "OpenOffice.org Calc" ),
+!       "ooo-calc2", 0, this, SLOT( startCalc() ),
+        actionCollection(), "start_2"
+     );
+     p_actionDraw = new KAction( i18n( "OpenOffice.org Draw" ),
+!       "ooo-draw2", 0, this, SLOT( startDraw() ),
+        actionCollection(), "start_3"
+     );
+     p_actionImpress = new KAction( i18n( "OpenOffice.org Impress" ),
+!       "ooo-impress2", 0, this, SLOT( startImpress() ),
+        actionCollection(), "start_4"
+     );
+     p_actionMath = new KAction( i18n( "OpenOffice.org Math" ),
+!       "ooo-math2", 0, this, SLOT( startMath() ),
+        actionCollection(), "start_5"
+     );
+     p_actionTemplate = new KAction( i18n( "Start with template" ),
+!       "ooo-template2", 0, this, SLOT( startTemplate() ),
+        actionCollection(), "start_0"
+     );
+     p_actionWriter = new KAction( i18n( "OpenOffice.org Writer" ),
+!       "ooo-writer2", 0, this, SLOT( startWriter() ),
+        actionCollection(), "start_6"
+     );
+     p_actionPreferences = KStdAction::preferences( this, SLOT( preferences() ),
diff --git a/app-office/oooqs/files/oooqs2.patch b/app-office/oooqs/files/oooqs2.patch
new file mode 100644
index 000000000000..0463a628bcfd
--- /dev/null
+++ b/app-office/oooqs/files/oooqs2.patch
@@ -0,0 +1,11 @@
+--- src/oooqs2detector.cpp
++++ src/oooqs2detector.cpp
+@@ -69,7 +69,7 @@
+    );
+ 
+    binaryNames << "ooffice" << "soffice" << "ooo-wrapper" << "ooo-wrapper2"
+-      << "ooffice2.0" << "ooo-wrapper2.0";
++      << "ooffice2.0" << "ooo-wrapper2.0" << "ooffice2";
+ 
+    for( QStringList::ConstIterator cIt = listPathes.begin();
+       cIt != listPathes.end(); ++cIt )
diff --git a/app-office/oooqs/oooqs-2.1.0.ebuild b/app-office/oooqs/oooqs-2.1.0.ebuild
new file mode 100644
index 000000000000..1c1a7bcdb781
--- /dev/null
+++ b/app-office/oooqs/oooqs-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/oooqs-2.1.0.ebuild,v 1.1 2006/05/30 19:14:49 suka Exp $
+
+inherit kde eutils
+
+need-kde 3
+
+MY_P="${PN}2-1.0"
+DESCRIPTION="OpenOffice.org Quickstarter, runs in the KDE SystemTray"
+HOMEPAGE="http://segfaultskde.berlios.de/index.php"
+SRC_URI="http://download.berlios.de/segfaultskde/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=virtual/ooo-2.0.0
+	kde-base/ksysguard"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# OO.o on Gentoo (either binary or source package) use slightly
+	# different icon names
+	epatch ${FILESDIR}/icon_names.diff
+	# oooqs2 is looking for a wrapper script that has other name on gentoo
+	epatch ${FILESDIR}/oooqs2.patch
+}