Update to ooo-build-3.0.1.5 patch set, some more build fixes

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 10 insertions, 50 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cf1a0081b9f1..77791dadd540 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.465 2009/05/24 08:46:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.466 2009/05/26 21:09:27 suka Exp $
+
+  26 May 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.1.0.ebuild, -files/ooo_getline.diff:
+  Update to ooo-build-3.0.1.5 build set, some more build fixes
 
   24 May 2009; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.1.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index c4a0dcd6de95..5cffc6ef883c 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -8,7 +8,6 @@ AUX gentoo-3.1.0.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1
 AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
 AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
-AUX ooo_getline.diff 1349 RMD160 2290aedd9b06eafe6acce6ac2718fb8ae6f981eb SHA1 14835c3de02cdec854cc817346606b09963883f1 SHA256 6a71026f913eaff566bb4e690814a2dacd441f97478926fb753918322fa1edbb
 AUX solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
@@ -22,7 +21,7 @@ DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST ooo-build-3.0.0.3.6.tar.gz 10574055 RMD160 9517a4a7d0ce0557f7a220510598cea493d702c0 SHA1 c00aa4eb426e3897181ecb71ef68d1f19ac6eaa9 SHA256 0ae1d2bbdd7f73f0aa1f6f50e6ea18a4dc6c2baafae9ab3a5715270e2ec8a4da
 DIST ooo-build-3.0.1.3.tar.gz 10813768 RMD160 dac17695f250bb0db25d379c6df28672483d9664 SHA1 d4aea26fd5b931ab24b2c293495b5989da7e5d30 SHA256 518e19edee0de1f8f3537aa547ce80bdfec5b44834840586bfc05f3038caebf3
-DIST ooo-build-3.1.0.4.tar.gz 13266898 RMD160 8e311e35b4a48a0d8ce27ad086397f4013db16c9 SHA1 286a36588a3097a136e9870bb326999867da447f SHA256 3174bdd2cc02a0281345883a3eeb8fd1659df516b0f23379933de5653d545d16
+DIST ooo-build-3.1.0.5.tar.gz 13192423 RMD160 c9514dffe07e13ab59acabf0c1d9c23a2e2d95a4 SHA1 7a43b751a976b096d153c28a6258443fa6129336 SHA256 40b03ccd2306c08f6f159ea9baee8f31f61df69104c41faf65c9ce1e649d735d
 DIST ooo300-m15-artwork.tar.bz2 9670828 RMD160 e9e98bb6ba83432b4a4b6c24b71d38feac6fdcd9 SHA1 d96a5502395bae32e021670fb9c22b49123d38d7 SHA256 38d58e5dc128f27d52bb4b34e80c1526bff11b9ef6513e75385f819f66592e6b
 DIST ooo300-m15-base.tar.bz2 2939331 RMD160 b22921f5dcdb0e70406b5bbcda720e5c9eec7d4e SHA1 7e195c0294a0cedcb08453cd76ae6d6522485b95 SHA256 fa02bba12b7353e9d98f9a3ed7a4e6cb3496bfd97b4a7fc969dcd108b0369b4d
 DIST ooo300-m15-bootstrap.tar.bz2 7036501 RMD160 450483472b73a379e619927823d0c465c129511e SHA1 6566c501cdfa8a2b33e66b7628237464c8de13cb SHA256 60adc9a46a69138ff0b85a99ea34f4da137339f37323d376b63fd5a7d8e6f5dd
@@ -82,6 +81,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 12712 RMD160 1f067c7899c55dad47cf2717474bb514c295bc8f SHA1 75e4bcc0ee1f7d67383abaef7cae785deda75a6e SHA256 173a0723104e6be35af7c0ffc80523961607e16fa484bf3c67a0d906c5b711f4
 EBUILD openoffice-3.0.1.ebuild 12242 RMD160 7ddb204426769993d93beb708ed536e91116659c SHA1 219dda129b89e472cdea0447a8a62dc2cf9bb051 SHA256 1a7d69c6e8aaafb64796025900044c97bd1e851a2d1e488b121dd6d515c8483e
-EBUILD openoffice-3.1.0.ebuild 12992 RMD160 e4539d51c3e5b783ba42666268ebebdb64fa5845 SHA1 b8dc623e7e4bdd586280f655d34079ad91d77090 SHA256 29540950177bef8538b180bbff809abb541a4caf3cdd1496400c67204e83fdd5
-MISC ChangeLog 97206 RMD160 6af28e85cd7ca148e8b0012584ad00c90311b8ba SHA1 d36bd08eed2672fd6ef7dd472f049cb451e23367 SHA256 141dc79e6a94d0e283ca8156cb41a69566bce31890e6d6cb202491f359692e54
+EBUILD openoffice-3.1.0.ebuild 12923 RMD160 d52467a55a98964db15feffef97340241dd19b74 SHA1 ff1b062ee74ed1f53c073084978808be56e42415 SHA256 cd52544d502197b4a20a7954d6dbe40e888637b5f6d4a8a0aef242defe055878
+MISC ChangeLog 97375 RMD160 70a48f2c4f0c4546072f094dcc253357a9e93811 SHA1 faebad1d6a837440a255a4c90bee3616ce04bc5c SHA256 321e1c4d8988dca445df07d06bbdb54053c9f388a6600836bbf4993c89dcbbfb
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/ooo_getline.diff b/app-office/openoffice/files/ooo_getline.diff
deleted file mode 100644
index 9fed114c3979..000000000000
--- a/app-office/openoffice/files/ooo_getline.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
- 
- char			*copy();
- char			*base_name();
--char			*getline();
-+char			*ooo_getline();
- char			*isdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
---- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *ooo_getline(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
---- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- 	register int	type;
- 	boolean recfailOK;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- 		case IF:
- 		doif:
-@@ -168,7 +168,7 @@
- 	register char	*line;
- 	register int	type;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- 		case IF:
- 		case IFFALSE:
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index ea251c96ccf7..adb25f754048 100644
--- a/app-office/openoffice/openoffice-3.1.0.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0.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.0.ebuild,v 1.4 2009/05/24 08:46:28 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.5 2009/05/26 21:09:27 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -9,7 +9,7 @@ inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV=3.1.0.4
+MY_PV=3.1.0.5
 PATCHLEVEL=OOO310
 SRC=OOo_${PV}_src
 MST=ooo310-m11
@@ -233,7 +233,6 @@ src_prepare() {
 	epatch "${FILESDIR}/ooo-env_log.diff"
 	cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
-	cp -f "${FILESDIR}/ooo_getline.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die
 
 	#Use flag checks