Minor build fix for beanshell-project

Package-Manager: portage-2.0.53_rc6

5 files changed, 39 insertions, 4 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5d8819ec7f57..649fdb2f1dc8 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.144 2005/10/25 16:02:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.145 2005/10/25 17:44:24 suka Exp $
+
+  25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.0/gentoo-2.0.0.diff, +files/2.0.0/build-beanshell-fix.diff,
+  openoffice-2.0.0.ebuild:
+  Minor build fix for beanshell-project (for a problem which normally does not
+  show up)
 
   25 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 2deb6a2cceed..ffab73621104 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 74a59549d942c7bf4539241491a40c69 ChangeLog 31788
+MD5 2cb4a830a9205296d740de632ac249e9 ChangeLog 32032
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -32,10 +32,12 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
 MD5 dad70b7af2b749a7dde536de033f991b files/2.0.0/Filter.xcu 10709
+MD5 f419a0236d3a5c859af1eba4983ec986 files/2.0.0/build-beanshell-fix.diff 242
+MD5 195d60f5405f9f4ad4d7156c50f57ccb files/2.0.0/gentoo-2.0.0.diff 315
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 83a87183dc12fe34b1a1b83924fac410 openoffice-2.0.0.ebuild 7177
+MD5 4ef2eb588ad81fb03ca521448cfe82f5 openoffice-2.0.0.ebuild 7394
diff --git a/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff b/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff
new file mode 100644
index 000000000000..96209f48435d
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/build-beanshell-fix.diff
@@ -0,0 +1,8 @@
+--- beanshell/prj/build.lst 
++++ beanshell/prj/build.lst 
+@@ -1,4 +1,4 @@
+-be	beanshell	:	solenv NULL
++be	beanshell	:	solenv soltools NULL
+ be	beanshell							usr1		-	all	be_mkout				NULL
+ be	beanshell							nmake		-	all	be_beanshell		NULL
+ 
diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
new file mode 100644
index 000000000000..495ac50f5f45
--- /dev/null
+++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0.diff
@@ -0,0 +1,12 @@
+--- patches/OOO_2_0/apply 
++++ patches/OOO_2_0/apply
+@@ -496,6 +496,9 @@
+ buildfix-ucb-without-stlport4.diff
+ buildfix-svx-without-stlport4.diff
+ 
++# Fix beanshell dep
++build-beanshell-fix.diff
++
+ [ ArkOnly ]
+ system-db-4.3-use-lpthread.diff
+ # FIXME this is generally useful -- currently applied here only because
diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 4a944a1d7a41..99beca9703bb 100644
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.8 2005/10/25 16:02:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.9 2005/10/25 17:44:24 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -119,6 +119,13 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ooo-build-${PV}.tar.gz
 
+	#Some fixes for our patchset
+	cd ${PATCHDIR}
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
+
+	#Additional and new patches get here
+	cp -pPRf ${FILESDIR}/${PV}/build-beanshell-fix.diff ${PATCHDIR}/patches/src680 || die
+
 	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
 	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"