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

Package-Manager: portage-2.1_rc3-r2

7 files changed, 156 insertions, 4 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/Manifest b/app-office/oooqs/Manifest
index aac2acc957c1..bebd8cd8562c 100644
--- a/app-office/oooqs/Manifest
+++ b/app-office/oooqs/Manifest
@@ -1,5 +1,36 @@
-MD5 bd69f128f988df53476e02b81bf6d05d ChangeLog 2731
-MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3-r2 63
+AUX icon_names.diff 2634 RMD160 c0e4e93be2e042ab61061d0963f02fa716f00865 SHA1 f19f1f152817297a68ee9170e780bc59fc835621 SHA256 d547cb8d15c1cc70191a5f4604e56affb56ea26e8065c5608cdfff89bfbbfd81
+MD5 6530914e88166f06f6f4735dced4b597 files/icon_names.diff 2634
+RMD160 c0e4e93be2e042ab61061d0963f02fa716f00865 files/icon_names.diff 2634
+SHA256 d547cb8d15c1cc70191a5f4604e56affb56ea26e8065c5608cdfff89bfbbfd81 files/icon_names.diff 2634
+AUX oooqs-20.patch 2256 RMD160 baa75ef4a5bee6c26095c00622bacbe76c44c6d8 SHA1 31c03aec5fddded73ac5b689e9b7ac01db5514bb SHA256 9231c3f7af22a58b04cba6cfecf5479598122a4f7081c1466338cd03f9dde1b2
 MD5 700208645159ca465baafc9e22eacde7 files/oooqs-20.patch 2256
-MD5 d89f6d524fdd9cce162c5959fa9fed1b metadata.xml 269
+RMD160 baa75ef4a5bee6c26095c00622bacbe76c44c6d8 files/oooqs-20.patch 2256
+SHA256 9231c3f7af22a58b04cba6cfecf5479598122a4f7081c1466338cd03f9dde1b2 files/oooqs-20.patch 2256
+AUX oooqs2.patch 364 RMD160 c3b06851cc7159c521defa03bdfdb4eafc24aed9 SHA1 a58b6c6f38d7e35ec59cf8bd53745d90c58f0ca8 SHA256 09485edd2f6f013ecc07c098bcfbc76cebfb1dfc6622fa34c4d820148b23d69b
+MD5 228c8895c675eb0a56e573862b32fa17 files/oooqs2.patch 364
+RMD160 c3b06851cc7159c521defa03bdfdb4eafc24aed9 files/oooqs2.patch 364
+SHA256 09485edd2f6f013ecc07c098bcfbc76cebfb1dfc6622fa34c4d820148b23d69b files/oooqs2.patch 364
+DIST oooqs-2.0.3.tar.gz 584849 RMD160 8c6ad3c82038e620bbd9f9577bb26343cd2f3826 SHA1 9650ce6dbacdefed4d8eca8e44058e366d97e96c SHA256 d3585c669f9a081a5bc84dd1df8af1e7c53deaad0ee765b747e3d23874943e9a
+DIST oooqs2-1.0.tar.gz 584935 RMD160 cade4f58572abd2b5eba2897c020e84e4ee6b8de SHA1 4f938e2051ea398c92c4dc75570cd5972d3834e9 SHA256 482098ccd1d1eeb503ec1a16e9e7d291ad5c0a26b9d4f26199a57a9371e4ca0e
+EBUILD oooqs-2.0.3-r2.ebuild 617 RMD160 d760954828c83e351f623696bf7b9a8753726bce SHA1 44f14353ef6af50c85bf1146489a7140c6d75f38 SHA256 bf7b4ef327b33b4affa2c10a9a0a1e83ef9cd136e4efc1c0489e1a63fa8a8f88
 MD5 edd1684dc68e05dbef139e3d4033a749 oooqs-2.0.3-r2.ebuild 617
+RMD160 d760954828c83e351f623696bf7b9a8753726bce oooqs-2.0.3-r2.ebuild 617
+SHA256 bf7b4ef327b33b4affa2c10a9a0a1e83ef9cd136e4efc1c0489e1a63fa8a8f88 oooqs-2.0.3-r2.ebuild 617
+EBUILD oooqs-2.1.0.ebuild 864 RMD160 d1a36294a0316fffb04e599bf436475553c6166a SHA1 615106003b4d87f206f6209cd5e48a013fe1c52a SHA256 abd445973589cf060604022d56b4150db17f02b2fe4734a1052c03951e1dc91f
+MD5 938bf2ba7afc55ab59c884de9e841730 oooqs-2.1.0.ebuild 864
+RMD160 d1a36294a0316fffb04e599bf436475553c6166a oooqs-2.1.0.ebuild 864
+SHA256 abd445973589cf060604022d56b4150db17f02b2fe4734a1052c03951e1dc91f oooqs-2.1.0.ebuild 864
+MISC ChangeLog 2991 RMD160 54ce40f617264577eb5f99a71bd756e2628b191b SHA1 37dc1914aaccf52a7d4dfb576285d64cc4ecc839 SHA256 cccb7bead49ae10fe3849478738c7903e01998434e5167e8e9e01edce3c0f01a
+MD5 ae6005cee50995d9415265bdc277a36f ChangeLog 2991
+RMD160 54ce40f617264577eb5f99a71bd756e2628b191b ChangeLog 2991
+SHA256 cccb7bead49ae10fe3849478738c7903e01998434e5167e8e9e01edce3c0f01a ChangeLog 2991
+MISC metadata.xml 269 RMD160 f1fa3d5d86abac63c26a156048c01ba6307f8c3c SHA1 05cceefb21f5fcb637062dd2c5747c180e85ac07 SHA256 655a688ac5c1289ebe6d9206117e32f98461a3f852f898e158090f9154c59d68
+MD5 d89f6d524fdd9cce162c5959fa9fed1b metadata.xml 269
+RMD160 f1fa3d5d86abac63c26a156048c01ba6307f8c3c metadata.xml 269
+SHA256 655a688ac5c1289ebe6d9206117e32f98461a3f852f898e158090f9154c59d68 metadata.xml 269
+MD5 d9310d11e6288ddbf41e260fa3663f09 files/digest-oooqs-2.0.3-r2 235
+RMD160 a29fa555eb46c49acaf3a2de29a7120965039c08 files/digest-oooqs-2.0.3-r2 235
+SHA256 e5857f75fa8c7d588ffe51878491302423afa7240bb3e9dc29899a6e60eac90c files/digest-oooqs-2.0.3-r2 235
+MD5 74908fc4ee54363bb9c89bb8915b5d77 files/digest-oooqs-2.1.0 232
+RMD160 a248475a81d97a127bccf230e8d6c08b800845d8 files/digest-oooqs-2.1.0 232
+SHA256 4d73707813fba5070bb1ced26cbe7b9c8c71495310edaaf968402754699d0964 files/digest-oooqs-2.1.0 232
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
+}