Bump to RC4, hopefully the last one

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

4 files changed, 33 insertions, 50 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 750a667af577..39276698fb60 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.420 2008/10/03 11:57:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.421 2008/10/07 12:19:08 suka Exp $
+
+*openoffice-3.0.0_rc4 (07 Oct 2008)
+
+  07 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/gentoo-3.0.0_rc3.diff, +files/gentoo-3.0.0_rc4.diff,
+  -openoffice-3.0.0_rc3.ebuild, +openoffice-3.0.0_rc4.ebuild:
+  Bump to RC4, hopefully the last one
 
 *openoffice-3.0.0_rc3 (03 Oct 2008)
 
diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc3.diff b/app-office/openoffice/files/gentoo-3.0.0_rc3.diff
deleted file mode 100644
index 6d371cadb979..000000000000
--- a/app-office/openoffice/files/gentoo-3.0.0_rc3.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- distro-configs/Gentoo.conf.in 
-+++ distro-configs/Gentoo.conf.in 
-@@ -1,10 +1,7 @@
- --disable-fontooo
- --disable-qadevooo
----enable-libsn
- --enable-neon
----enable-ogltrans
----enable-xsltproc
----with-dynamic-xinerama
-+--enable-xrender-link
- --with-external-dict-dir=/usr/share/myspell
- --with-external-hyph-dir=/usr/share/myspell
- --with-external-thes-dir=/usr/share/myspell
-@@ -19,9 +16,7 @@
- --with-system-neon
- --with-system-openssl
- --with-system-vigra
----with-system-xmlsec
- --with-system-xrender-headers
----without-nas
- --without-myspell-dicts
- --without-stlport
- --with-vendor=\"Gentoo Foundation\"
---- patches/dev300/apply 
-+++ patches/dev300/apply 
-@@ -1425,7 +1425,7 @@
- SectionOwner => aprosky
- 
- # system lucene classpath
--gentoo-system-lucene.diff
-+#gentoo-system-lucene.diff
- # Allow build to proceed with PaX enabled
- gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
-
diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc4.diff b/app-office/openoffice/files/gentoo-3.0.0_rc4.diff
new file mode 100644
index 000000000000..7703f110c086
--- /dev/null
+++ b/app-office/openoffice/files/gentoo-3.0.0_rc4.diff
@@ -0,0 +1,22 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -33,6 +33,7 @@
+ {
+     cat <<EOT >$1
+ #!/bin/sh
++unset PYTHONPATH
+ $OOINSTBASE/program/soffice $2 "\$@"
+ EOT
+     chmod 755 $1
+--- patches/dev300/apply 
++++ patches/dev300/apply 
+@@ -1425,7 +1425,7 @@
+ SectionOwner => aprosky
+ 
+ # system lucene classpath
+-gentoo-system-lucene.diff
++#gentoo-system-lucene.diff
+ # Allow build to proceed with PaX enabled
+ gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs
+
diff --git a/app-office/openoffice/openoffice-3.0.0_rc3.ebuild b/app-office/openoffice/openoffice-3.0.0_rc4.ebuild
index 2d70766ead52..a89f214eff71 100644
--- a/app-office/openoffice/openoffice-3.0.0_rc3.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc3.ebuild,v 1.1 2008/10/03 11:57:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc4.ebuild,v 1.1 2008/10/07 12:19:08 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -10,10 +10,10 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam"
 
-MY_PV="3.0.0.3.3"
+MY_PV="3.0.0.3.4"
 PATCHLEVEL="OOO300"
 SRC="OOo_${PV}_src"
-MST="ooo300-m8"
+MST="ooo300-m9"
 DEVPATH="http://download.go-oo.org/${PATCHLEVEL}/${MST}"
 S="${WORKDIR}/ooo"
 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"