New release, with some fixes to work with OpenOffice.org 2.0.0

Package-Manager: portage-2.0.53_rc6

diff --git a/app-office/oooqs/ChangeLog b/app-office/oooqs/ChangeLog
index 6029ab0c8da209e51d5c5cfdb9f6706faa10b51e..4b957ae12518b7dc91139232abfed8224486d553 100644 (file)
--- a/app-office/oooqs/ChangeLog
+++ b/app-office/oooqs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/oooqs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/ChangeLog,v 1.17 2005/09/24 06:46:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/ChangeLog,v 1.18 2005/10/30 07:13:59 suka Exp $
+
+*oooqs-2.0.3-r2 (30 Oct 2005)
+
+  30 Oct 2005; Andreas Proschofsky <suka@gentoo.org> +files/oooqs-20.patch,
+  +oooqs-2.0.3-r2.ebuild:
+  New release, with some fixes to work with OpenOffice.org 2.0.0
 
   24 Sep 2005; Andreas Proschofsky <suka@gentoo.org> files/fixxooo.patch:
   Fix icons to correctly display for both openoffice and openoffice-ximian,

diff --git a/app-office/oooqs/Manifest b/app-office/oooqs/Manifest
index 9c466c328ac40ff5e8049628da4c67427fe81702..27976b8e4c6118b53fc4fc2f2b08b58c1241330b 100644 (file)
--- a/app-office/oooqs/Manifest
+++ b/app-office/oooqs/Manifest
@@ -1,9 +1,12 @@
-MD5 13a0a7ca0b9e838095dfe91d6e812834 oooqs-2.0.2.ebuild 651
-MD5 1b4a6eb83c4267e11b9089d34206029b oooqs-2.0.3.ebuild 664
-MD5 f3855b265eefcd0fa1f90489b077cf74 oooqs-2.0.3-r1.ebuild 971
-MD5 bf9aa29ca91388e3c3be35c3c65ae81c ChangeLog 1971
-MD5 d89f6d524fdd9cce162c5959fa9fed1b metadata.xml 269
+MD5 cbddf52718af38704b4f1de59bb0f358 ChangeLog 2170
 MD5 0dfa431673ed5292d63d41d5ca44bebc files/digest-oooqs-2.0.2 63
 MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3 63
 MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3-r1 63
+MD5 b96223d4f6f3f644e5a345c12982ab72 files/digest-oooqs-2.0.3-r2 63
 MD5 d5a62d4399d509af355598951028ec8f files/fixxooo.patch 3350
+MD5 700208645159ca465baafc9e22eacde7 files/oooqs-20.patch 2256
+MD5 d89f6d524fdd9cce162c5959fa9fed1b metadata.xml 269
+MD5 13a0a7ca0b9e838095dfe91d6e812834 oooqs-2.0.2.ebuild 651
+MD5 f3855b265eefcd0fa1f90489b077cf74 oooqs-2.0.3-r1.ebuild 971
+MD5 0012fdfa31d1fa9339a7466e3d069656 oooqs-2.0.3-r2.ebuild 624
+MD5 1b4a6eb83c4267e11b9089d34206029b oooqs-2.0.3.ebuild 664

diff --git a/app-office/oooqs/files/digest-oooqs-2.0.3-r2 b/app-office/oooqs/files/digest-oooqs-2.0.3-r2
new file mode 100644 (file)
index 0000000..5d78f67
--- /dev/null
+++ b/app-office/oooqs/files/digest-oooqs-2.0.3-r2
@@ -0,0 +1 @@
+MD5 5d401aa7250f80734d785d4c286f635b oooqs-2.0.3.tar.gz 584849

diff --git a/app-office/oooqs/files/oooqs-20.patch b/app-office/oooqs/files/oooqs-20.patch
new file mode 100644 (file)
index 0000000..7f62486
--- /dev/null
+++ b/app-office/oooqs/files/oooqs-20.patch
@@ -0,0 +1,86 @@
+--- src/oooqs.cpp 
++++ src/oooqs.cpp 
+@@ -18,17 +18,12 @@
+ #include <ksimpleconfig.h>
+ 
+ #include "oooqs.h"
+-#include "oooqsselectordialog.h"
+ 
+ OOoQs::OOoQs()
+               : KSystemTray( 0, "OOoQs" ),
+ _quickProcess( 0 ), _okToRun( true ) {
+ 
+       QMap<QString, QString> versions;
+-
+-      KConfig* oooConfig = 0;
+-
+-      OOoQsSelectorDialog* selector = 0;
+ 
+       /**
+       Get the global config-object.
+@@ -86,51 +81,11 @@
+       Read the configuration.
+       */
+       _autostart->setChecked( _config->readBoolEntry( "Autostart", true ) );
+-      _exec = _config->readEntry( "Exec" );
+-
+-      /**
+-      Try to autodetect settings if they aren't found in our own config.
+-      */
+-      if ( _exec.length() < 2 ) {
+-              oooConfig = new KSimpleConfig(
+-                              QDir::homeDirPath() + QDir::separator()
+-                              + ".sversionrc", true );
+-              oooConfig->setGroup( "Versions" );
+-              versions = oooConfig->entryMap( "Versions" );
+-              /**
+-              If there are more than one possible configurations,
+-              ask the user which one to use.
+-              */
+-              if ( versions.count() > 1 ) {
+-                      selector = new OOoQsSelectorDialog( versions, this );
+-                      if ( selector->exec() == QDialog::Accepted ) {
+-                              _exec = versions[ selector->selected() ];
+-                              _exec = _exec.section( ':', 1 );
+-                              _exec += QDir::separator();
+-                              _exec += "soffice";
+-                              _exec = QDir::cleanDirPath( _exec );
+-                              _config->writeEntry( "Exec", _exec );
+-                      } else {
+-                              /**
+-                              Kill the app here if the user hadn't chosen a configuration.
+-                              */
+-                              _okToRun = false;
+-                              return ;
+-                      }
+-              /**
+-              Added by Sergio Visinoni <piffio@piffio.org>
+-              
+-              I (Christian) simply forgot it (shame on me!)
+-              */
+-              } else {
+-                      _exec = versions.begin().data();
+-                      _exec = _exec.section( ':', 1 );
+-                      _exec += QDir::separator();
+-                      _exec += "soffice";
+-                      _exec = QDir::cleanDirPath( _exec );
+-                      _config->writeEntry( "Exec", _exec );
+-              }
+-      }
++
++      /**
++      Fixed place for the exec now
++      */
++      _exec += "/usr/bin/ooffice2";
+ 
+       /**
+       Make sure that OpenOffice.org is killed
+@@ -182,7 +137,7 @@
+       */
+       process->setExecutable( _exec );
+       ( *process ) << "-plugin";
+-      ( *process ) << "-quickstart";
++      ( *process ) << "-nologo" << "-nodefault";
+       connect ( process, SIGNAL( processExited( KProcess* ) ),
+                 this, SLOT( restartQuickInstance( KProcess* ) ) );
+       /**

diff --git a/app-office/oooqs/oooqs-2.0.3-r2.ebuild b/app-office/oooqs/oooqs-2.0.3-r2.ebuild
new file mode 100644 (file)
index 0000000..a8d98b1
--- /dev/null
+++ b/app-office/oooqs/oooqs-2.0.3-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/oooqs/oooqs-2.0.3-r2.ebuild,v 1.1 2005/10/30 07:13:59 suka Exp $
+
+inherit kde eutils
+
+need-kde 3
+
+DESCRIPTION="OpenOffice.org Quickstarter, runs in the KDE SystemTray"
+HOMEPAGE="http://segfaultskde.berlios.de/index.php"
+SRC_URI="http://download.berlios.de/segfaultskde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=virtual/ooo-2.0.0"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/oooqs-20.patch
+}