Fix build problems, bug #82385

Package-Manager: portage-2.0.51.19

5 files changed, 58 insertions, 45 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index cd0a2bbe31f0..0e81124448e7 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.113 2005/03/04 20:58:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.114 2005/03/06 10:40:36 suka Exp $
+
+  06 Mar 2005; Andreas Proschofsky <suka@gentoo.org>
+  files/1.1.4/gentoo-1.3.8.patch, +files/1.1.4/getcompver.awk.patch,
+  openoffice-ximian-1.3.8.ebuild:
+  Fix some build problem related to gcc-naming, closes bug #82385, also back
+  out evolution-data-server-support for the time being
 
   04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   openoffice-ximian-1.3.7.ebuild:
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 8f43051c8200..7fadf3716c2e 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,60 +1,51 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8c7b3d938241f8e4f3b952e4636510ba ChangeLog 28398
-MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
-MD5 7d0e5a8b623a136c7948a25e1d287247 openoffice-ximian-1.3.5-r1.ebuild 16146
 MD5 7bb244361a08b72dca07314792a1c00c openoffice-ximian-1.3.6.ebuild 16894
+MD5 4f30b05359128c7f30fc4e3c58c9b324 openoffice-ximian-1.3.8.ebuild 17826
+MD5 7d0e5a8b623a136c7948a25e1d287247 openoffice-ximian-1.3.5-r1.ebuild 16146
 MD5 cc594a4c819d5f004f0e7dc03b44b5fa openoffice-ximian-1.3.7.ebuild 17838
-MD5 eb7d71514d56970b918003945624c544 openoffice-ximian-1.3.8.ebuild 17795
-MD5 0b59100689dae352eeac675e31a4cdec files/digest-openoffice-ximian-1.3.7 502
+MD5 a13d35416f5525df9b6c3e6926d4bd81 ChangeLog 28683
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
+MD5 0b59100689dae352eeac675e31a4cdec files/digest-openoffice-ximian-1.3.7 502
 MD5 5d4e4391572b1cd6de8338b1914f6e78 files/digest-openoffice-ximian-1.3.8 500
-MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
-MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298
+MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
 MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
-MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
-MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.3/nptl.patch 785
+MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
+MD5 f9578015a434c209259917e9df3c0b27 files/1.1.3/gcc34_2.patch.bz2 33535
 MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.3/pyunolink-fix.patch 475
 MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
-MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
+MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
+MD5 61dc69767eddbb5ab3ac02822fff6c13 files/1.1.3/gentoo-1.3.7.patch 1449
 MD5 476f1f342d8321113a27e098630a6003 files/1.1.3/xooffice-wrapper-1.3 6091
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
+MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
+MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
+MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.3/nptl.patch 785
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.3/gcc34-sal-link-to-libsupc++.diff 405
-MD5 f9578015a434c209259917e9df3c0b27 files/1.1.3/gcc34_2.patch.bz2 33535
-MD5 61dc69767eddbb5ab3ac02822fff6c13 files/1.1.3/gentoo-1.3.7.patch 1449
-MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
 MD5 dd3785621235368cc28f1f85101fcac7 files/1.1.3/nojvmfwk-fix.patch 6986
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
-MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.3/pyunolink-fix.patch 475
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
-MD5 a560f9fd159502d802881206b45684f1 files/1.1.4/config-db-checkfix.patch 507
+MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
-MD5 38c7403bb1db3fe6fc1843c75b6d18fb files/1.1.4/gentoo-1.3.8.patch 865
 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.4/gentoo-splash.diff 890
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
 MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
-MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
-MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
+MD5 bb6a5b602fa199bed7d40f1507b9fb21 files/1.1.4/gtk-printer-update-on-focus-change.diff 993
+MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
+MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.8.patch 859
+MD5 a560f9fd159502d802881206b45684f1 files/1.1.4/config-db-checkfix.patch 507
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 69a22ccaf3c62d6b96bfd30c70a2c679 files/1.1.4/regcompfix.patch 712
-MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091
-MD5 bb6a5b602fa199bed7d40f1507b9fb21 files/1.1.4/gtk-printer-update-on-focus-change.diff 993
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCKMvhKRy60XGEcJIRAmiaAJ47Pj2Dmeb2iZyi5O9re3lvlJXmPwCfauV4
-Xnufs4jUlhx4Nje4Gd/czd8=
-=Pm6W
------END PGP SIGNATURE-----
+MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
index 426e37e6678d..37eed77e51b5 100644
--- a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
+++ b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
@@ -9,7 +9,7 @@
 -GentooKDE : Gentoo, KDECommon
 +GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, NoRpath
 +Gentoo : GentooBase
-+GentooGNOME : GentooBase, GnomeVFS, Evo2, NovellOnly, GentooOnly
++GentooGNOME : GentooBase, GnomeVFS, NovellOnly, GentooOnly
 +GentooKDE : GentooBase, KDECommon
  
  # somewhat odder:
diff --git a/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch
new file mode 100644
index 000000000000..0fbeb07ee3d6
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch
@@ -0,0 +1,14 @@
+--- solenv/bin/getcompver.awk.orig	2005-02-22 00:24:46.976743123 +0100
++++ solenv/bin/getcompver.awk	2005-02-22 00:34:16.624045985 +0100
+@@ -98,6 +98,11 @@
+         CCversion = $0
+     }
+ }
++/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ {
++    if ( compiler_matched == 0 ) {
++        CCversion = substr($0, 0, index($0, "-") - 1)
++    }
++}
+ END {
+     if ( num == "true" ) {
+         tokencount = split (CCversion,vertoken,".")
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild
index e013b5bccad8..af36830b78c6 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.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-ximian/openoffice-ximian-1.3.8.ebuild,v 1.8 2005/02/18 03:12:51 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.9 2005/03/06 10:40:36 suka Exp $
 
 # Notes:
 #
@@ -59,8 +59,7 @@ RDEPEND="!app-office/openoffice-ximian-bin
 	>=dev-lang/perl-5.0
 	gnome? ( >=x11-libs/gtk+-2.0
 		>=gnome-base/gnome-vfs-2.0
-		>=dev-libs/libxml2-2.0
-		>=gnome-extra/evolution-data-server-1.0 )
+		>=dev-libs/libxml2-2.0 )
 	kde? ( kde-base/kdelibs )
 	>=media-libs/libart_lgpl-2.3.13
 	>=x11-libs/startup-notification-0.5
@@ -265,6 +264,9 @@ src_unpack() {
 	#Another java problem
 	epatch ${FILESDIR}/${OO_VER}/javafix.patch
 
+	# fix for bug #82385
+	epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch
+
 	# Workaround for bug #73940, may break debug use flag on ppc
 	if use ppc; then
 		epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch