Fix build problem in relation to boost, thanks to Jory A. Pratt

<anarchy@gentoo.org> for hunting it down. Closes bug #270947
Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 23 insertions, 4 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 2659adc1e812..ca51185582d3 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.481 2009/09/04 12:23:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.482 2009/09/08 18:18:45 suka Exp $
+
+  08 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.1.1.ebuild, +files/boost-undefined-references.diff:
+  Fix build problem in relation to boost, thanks to Jory A. Pratt 
+  <anarchy@gentoo.org> for hunting it down. Closes bug #270947
 
   04 Sep 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index c9c66bc001f8..ead0381e7ed9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,5 @@
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
+AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
 AUX fixsandbox.diff 412 RMD160 2f49f40ccb3b06c2678402f25fbc65658061c35c SHA1 d7ef14c375634358351ce13de4b01fabc54e9c33 SHA256 fd6d40c11f37ed1db0b09cfd1f166cf84e96a759b58064ce58980eb63b2b8d49
 AUX gentoo-3.0.0.diff 3086 RMD160 69856c46b641e09c5ffd561cf78c7f2334649d87 SHA1 a8aa9bde2cbde25c1fb54a84a4908a6b4f468873 SHA256 5c3e931564cadf9a5d212fab7c4708cf9f131057ffd1e15276dc343c36a4e33d
@@ -84,6 +85,6 @@ DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766ee
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.0.0.ebuild 12681 RMD160 20d2e4f6ea1e979f33f033d284d97d6a8e9bd4b8 SHA1 7a79d589ade481854fa81ab0309b972883ea6390 SHA256 4d096777f0cb9a99b1dfbfc363efc641a78650032c9544b95f997383e3b6a1f3
 EBUILD openoffice-3.1.0-r1.ebuild 13569 RMD160 6e7162ea3eff111c981eb03e2dbd510110aba38c SHA1 a2b4c10d0c6877022dbfaac230ab58be9ebe8437 SHA256 ee5e3cd6a7f0d534b036b8d04b4ddaa830aff0d72bb095cea88cc145a68974f2
-EBUILD openoffice-3.1.1.ebuild 13659 RMD160 86e13271f4308275ee5fc258adc96fe604929877 SHA1 46233c17dee4a1099719fff7ff0acdff8c2c3277 SHA256 e84f305e8ce9472bc8220b83f3a91dc7f5abf0331155aec74d535f50f2394fbc
-MISC ChangeLog 100376 RMD160 56a00b3e7e01002690214d780ec5f40c68b4805c SHA1 55a6cea4c41df4f094d4e72fb7fe02af59b8d0ab SHA256 e93719435aeb1171f61b98fdae468354f75cad5ae8959ecea4eeb8c18a38623e
+EBUILD openoffice-3.1.1.ebuild 13743 RMD160 3ca9bba224e2bb70675fe4daf6ae6889d0b82b28 SHA1 740a1965c23a67b78fe8a7d11b3f801a7621becc SHA256 14ad6d41b4026b773773c08330e506c13e8017f4e28b8ffd5be79fcd1cea0a0d
+MISC ChangeLog 100627 RMD160 bb3ea41863ddb7845336029dff82d90e49c97f8b SHA1 4f6f176c37015c14c42004b31897c215559bd9d7 SHA256 40f796d2be7479a71d2c9a4259748fad8445193680ee4423ab8f31bf26317c7e
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/boost-undefined-references.diff b/app-office/openoffice/files/boost-undefined-references.diff
new file mode 100644
index 000000000000..b0700a7815f4
--- /dev/null
+++ b/app-office/openoffice/files/boost-undefined-references.diff
@@ -0,0 +1,12 @@
+--- sc/source/core/tool/makefile.mk-orig	2009-09-07 20:15:14.880679704 -0500
++++ sc/source/core/tool/makefile.mk	2009-09-07 20:14:38.941679215 -0500
+@@ -132,7 +132,8 @@
+         $(SLO)$/prnsave.obj \
+ 		$(SLO)$/reftokenhelper.obj \
+ 		$(SLO)$/stringutil.obj \
+-		$(SLO)$/token.obj
++		$(SLO)$/token.obj \
++	$(SLO)$/detfunc.obj
+ 
+ # [kh] POWERPC compiler problem
+ .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild
index 83fa22f8d6de..3b974053d38a 100644
--- a/app-office/openoffice/openoffice-3.1.1.ebuild
+++ b/app-office/openoffice/openoffice-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.4 2009/09/04 12:23:32 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.5 2009/09/08 18:18:45 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -242,6 +242,7 @@ src_prepare() {
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/xulrunner-1.9.1.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks
 	if use java ; then