update for openoffice 2.0

Package-Manager: portage-2.0.53_rc6

7 files changed, 112 insertions, 4 deletions

diff --git a/app-office/ooqstart-gnome/ChangeLog b/app-office/ooqstart-gnome/ChangeLog
index 39aef6c8ef93..259e1f5be335 100644
--- a/app-office/ooqstart-gnome/ChangeLog
+++ b/app-office/ooqstart-gnome/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/ooqstart-gnome
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ChangeLog,v 1.5 2005/07/22 17:12:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ChangeLog,v 1.6 2005/10/29 22:20:37 suka Exp $
+
+*ooqstart-gnome-0.8.3-r1 (29 Oct 2005)
+
+  29 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/ooqstart-gnome-0.8.3-optflags.diff,
+  +files/ooqstart-gnome-0.8.3-options-2.0.diff,
+  +files/gnome2update-2.0.patch.bz2, +ooqstart-gnome-0.8.3-r1.ebuild:
+  Update for OpenOffice.org 2.0, hopefully the last one before we get a proper
+  solution. Patches taken from openSUSE.
 
   22 Jul 2005; David Holm <dholm@gentoo.org> ooqstart-gnome-0.8.3.ebuild:
   Added to ~ppc.
diff --git a/app-office/ooqstart-gnome/Manifest b/app-office/ooqstart-gnome/Manifest
index 5a4cc5a77f48..de3955b9b996 100644
--- a/app-office/ooqstart-gnome/Manifest
+++ b/app-office/ooqstart-gnome/Manifest
@@ -1,7 +1,12 @@
-MD5 9d59dc053842156f92efc96f6bf7e522 ChangeLog 863
-MD5 6e27642eb774b668fe48a47e475f2495 metadata.xml 400
-MD5 6db62b4aff56a6bb7a2d976611e76ac2 ooqstart-gnome-0.8.3.ebuild 1114
+MD5 6829ba1df4aa50c6564e6e12373f5a43 ChangeLog 1239
 MD5 d262aad066c0dd58486d7a8a095b598d files/digest-ooqstart-gnome-0.8.3 62
+MD5 d262aad066c0dd58486d7a8a095b598d files/digest-ooqstart-gnome-0.8.3-r1 62
 MD5 b8e5e4d8a4016a754ab52481fc66a00d files/gnome-ooqstart.png 3962
+MD5 aec87f5e26fbdbbedd42473dbbdf228c files/gnome2update-2.0.patch.bz2 8007
 MD5 6e3446ddec68a391cd1f63851e4942c6 files/gnome2update.patch.bz2 8004
 MD5 d44da1879b15d8fd3f96d3cbfd54d0d1 files/ooqstart-gnome-0.8.3-gcc4.patch 350
+MD5 22042fb74e51648408c4c53d3e7bff1b files/ooqstart-gnome-0.8.3-optflags.diff 852
+MD5 a5ea839758de85725f08a887a5fe5ea1 files/ooqstart-gnome-0.8.3-options-2.0.diff 938
+MD5 6e27642eb774b668fe48a47e475f2495 metadata.xml 400
+MD5 73f3a3d398ef7132e5fc68b318852946 ooqstart-gnome-0.8.3-r1.ebuild 1190
+MD5 6db62b4aff56a6bb7a2d976611e76ac2 ooqstart-gnome-0.8.3.ebuild 1114
diff --git a/app-office/ooqstart-gnome/files/digest-ooqstart-gnome-0.8.3-r1 b/app-office/ooqstart-gnome/files/digest-ooqstart-gnome-0.8.3-r1
new file mode 100644
index 000000000000..e67ad0f13bcd
--- /dev/null
+++ b/app-office/ooqstart-gnome/files/digest-ooqstart-gnome-0.8.3-r1
@@ -0,0 +1 @@
+MD5 f3c15a29e8bbd7780972e69f11f564a4 ooqstart-0.8.3.tgz 72272
diff --git a/app-office/ooqstart-gnome/files/gnome2update-2.0.patch.bz2 b/app-office/ooqstart-gnome/files/gnome2update-2.0.patch.bz2
new file mode 100644
index 000000000000..d44d5559ce99
--- /dev/null
+++ b/app-office/ooqstart-gnome/files/gnome2update-2.0.patch.bz2
diff --git a/app-office/ooqstart-gnome/files/ooqstart-gnome-0.8.3-optflags.diff b/app-office/ooqstart-gnome/files/ooqstart-gnome-0.8.3-optflags.diff
new file mode 100644
index 000000000000..e0b693bf6acb
--- /dev/null
+++ b/app-office/ooqstart-gnome/files/ooqstart-gnome-0.8.3-optflags.diff
@@ -0,0 +1,24 @@
+--- Makefile.xx	2005-02-06 20:51:51.407074108 +0100
++++ Makefile	2005-02-06 20:52:14.797707000 +0100
+@@ -47,16 +47,17 @@
+ #####################################################################
+ # COMPILATION RULES
+ #####################################################################
+-CFLAGS=-g -DVERSION='"$(VERSION)"' -Wall -Werror -I.
++OPTFLAGS=-O2
++CFLAGS=-g $(OPTFLAGS) -DVERSION='"$(VERSION)"' -Wall -Werror -I.
+ 
+ console.o : console/console.cxx
+-	$(CXX) $(CFLAGS) -O2 -o $@ -c $<
++	$(CXX) $(CFLAGS) -o $@ -c $<
+ 
+ gnome.o : gnome/gnome.cxx
+-	$(CXX) $(CFLAGS) `pkg-config --cflags libpanelapplet-2.0` -O2 -o $@ -c $<
++	$(CXX) $(CFLAGS) `pkg-config --cflags libpanelapplet-2.0` -o $@ -c $<
+ 
+ %.o : %.cxx
+-	$(CXX) $(CFLAGS) -O2 -o $@ -c $<
++	$(CXX) $(CFLAGS) -o $@ -c $<
+ 
+ 
+ #####################################################################
diff --git a/app-office/ooqstart-gnome/files/ooqstart-gnome-0.8.3-options-2.0.diff b/app-office/ooqstart-gnome/files/ooqstart-gnome-0.8.3-options-2.0.diff
new file mode 100644
index 000000000000..8883d52d8817
--- /dev/null
+++ b/app-office/ooqstart-gnome/files/ooqstart-gnome-0.8.3-options-2.0.diff
@@ -0,0 +1,24 @@
+Index: model.cxx
+===================================================================
+--- model.cxx.orig
++++ model.cxx
+@@ -24,8 +24,8 @@ static const char *SCALC    = "private:f
+ static const char *SDRAW    = "private:factory/sdraw";
+ static const char *SIMPRESS = "private:factory/simpress";
+ 
+-static const char *PLUGIN   = "-plugin";
+-static const char *QSTART   = "-quickstart";
++static const char *NOLOGO   = "-nologo";
++static const char *NODEFAULT = "-nodefault";
+ 
+ 
+ /*=========================================================================
+@@ -160,7 +160,7 @@ void Model::process () {
+     // accidentally terminated.
+     if (_enabled) {
+         if (!running && _soffice != 0) {
+-            _daemonPID = startProcess(BIN_SH, _soffice, PLUGIN, QSTART);
++            _daemonPID = startProcess(BIN_SH, _soffice, NOLOGO, NODEFAULT);
+             _status    = MODEL_OFFICE_STARTING;
+             _tick      = time(0);
+         }
diff --git a/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..b6528bf52f2d
--- /dev/null
+++ b/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/ooqstart-gnome/ooqstart-gnome-0.8.3-r1.ebuild,v 1.1 2005/10/29 22:20:37 suka Exp $
+
+inherit eutils
+
+DESCRIPTION="OpenOffice.org Quickstarter Applet for Gnome 2.x"
+HOMEPAGE="http://ooqstart.sourceforge.net/"
+MY_P="ooqstart-${PV}"
+SRC_URI="mirror://sourceforge/ooqstart/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=virtual/ooo-2.0.0
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-panel-2
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gnome2update-2.0.patch.bz2
+	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-options-2.0.diff
+	epatch ${FILESDIR}/${P}-optflags.diff
+}
+
+src_install() {
+	make ROOT=${D} install-gnome || die
+}
+
+pkg_postinst() {
+	einfo " If you are you using openoffice-bin-2.0.0 and don't get any icons, "
+	einfo " please re-merge openoffice-bin, there have recently been some "
+	einfo " modifications to it, which solve this. "
+}