Revision bump for 2.2.1 as we still have build problems on ppc. This incorporates the security fix which is in 2.3.0

Package-Manager: portage-2.1.3.9

7 files changed, 585 insertions, 5 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index cf174c8a1492..b2b8377fcebe 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.343 2007/09/20 11:44:25 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.344 2007/09/21 07:54:56 suka Exp $
+
+*openoffice-2.2.1-r1 (21 Sep 2007)
+
+  21 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.2.1/itiff.diff, +files/2.2.1/gentoo-2.2.1-r1.diff,
+  +files/2.2.1/ucb-no-CURL_NO_OLDIES.diff, +openoffice-2.2.1-r1.ebuild:
+  Revision bump for 2.2.1 as we still have build problems on ppc. This
+  incorporates the security fix which is in 2.3.0
 
   20 Sep 2007; Andreas Proschofsky <suka@gentoo.org>
   +files/2.3.0/system-check-db-4.6.patch:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6b295da9df4b..52e40ce59d40 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -6,10 +6,18 @@ AUX 2.2.1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fff
 MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.2.1/disable-regcomp-python.diff 934
 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.2.1/disable-regcomp-python.diff 934
 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.2.1/disable-regcomp-python.diff 934
+AUX 2.2.1/gentoo-2.2.1-r1.diff 820 RMD160 b5aa06edb70216185f01d8dd6987298fc2c4395e SHA1 ca17b33db8454b4847e051f97b72996ce10f0f06 SHA256 03a0a69b864a3b80a25eaad32ae3ba5ec4d5b7bb0639cba93b9da108c9e07098
+MD5 26d3b393222155f0ae612b6e7ff98fad files/2.2.1/gentoo-2.2.1-r1.diff 820
+RMD160 b5aa06edb70216185f01d8dd6987298fc2c4395e files/2.2.1/gentoo-2.2.1-r1.diff 820
+SHA256 03a0a69b864a3b80a25eaad32ae3ba5ec4d5b7bb0639cba93b9da108c9e07098 files/2.2.1/gentoo-2.2.1-r1.diff 820
 AUX 2.2.1/gentoo-2.2.1.diff 487 RMD160 00c90c8a42fb065a0bb7a56bcf19dc006d6f513e SHA1 7bc0ce08045a08f4a5ef7e7023818dbb0e9ddebf SHA256 317ee2b7d41e880d14db287dffc79d586b0f6566d438932aec67d079db932b29
 MD5 3b4f8eb92fb110265e487b9b8b5d5c59 files/2.2.1/gentoo-2.2.1.diff 487
 RMD160 00c90c8a42fb065a0bb7a56bcf19dc006d6f513e files/2.2.1/gentoo-2.2.1.diff 487
 SHA256 317ee2b7d41e880d14db287dffc79d586b0f6566d438932aec67d079db932b29 files/2.2.1/gentoo-2.2.1.diff 487
+AUX 2.2.1/itiff.diff 3139 RMD160 db279e3ab4e697890da0b637b582019ce5f7ea83 SHA1 721f82d0fa0f7842441f9ccdc4f48ebbe2c0342a SHA256 765547101cd3c97d19285618a2886e129992636ebb5915070d6859a47ccd0694
+MD5 b09ba8ea11254967799f0b2ce0318def files/2.2.1/itiff.diff 3139
+RMD160 db279e3ab4e697890da0b637b582019ce5f7ea83 files/2.2.1/itiff.diff 3139
+SHA256 765547101cd3c97d19285618a2886e129992636ebb5915070d6859a47ccd0694 files/2.2.1/itiff.diff 3139
 AUX 2.2.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 MD5 1f836c5ae6bd978035358290c001c579 files/2.2.1/ooo-env_log.diff 617
 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.2.1/ooo-env_log.diff 617
@@ -22,6 +30,10 @@ AUX 2.2.1/swregion-gcc42.diff 249 RMD160 223949d7378a47ea087407dc5c7242885e996d4
 MD5 8e94566a37c5205330ead8092b78638e files/2.2.1/swregion-gcc42.diff 249
 RMD160 223949d7378a47ea087407dc5c7242885e996d4e files/2.2.1/swregion-gcc42.diff 249
 SHA256 ab8aa2f8e9cff370e8e264f2e67a7c4d69896620a23102fe0b3acb0201754c08 files/2.2.1/swregion-gcc42.diff 249
+AUX 2.2.1/ucb-no-CURL_NO_OLDIES.diff 568 RMD160 e0d5ba94bc4e9ed102a60c5bf65036e5e93f8980 SHA1 f53d649d444c7905baf24cb78967ddb78fa07ee8 SHA256 21f62c57cb5a13a33294e7774981ad876eb71161a8b6a983b1b1dab86624bd3d
+MD5 032326edfaa8de0aaf00c5aafe83e6f2 files/2.2.1/ucb-no-CURL_NO_OLDIES.diff 568
+RMD160 e0d5ba94bc4e9ed102a60c5bf65036e5e93f8980 files/2.2.1/ucb-no-CURL_NO_OLDIES.diff 568
+SHA256 21f62c57cb5a13a33294e7774981ad876eb71161a8b6a983b1b1dab86624bd3d files/2.2.1/ucb-no-CURL_NO_OLDIES.diff 568
 AUX 2.3.0/disable-regcomp-java.diff 965 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e SHA1 d5768499c6bf9290dd0dab867918596369dbbfab SHA256 0a3656e0a34c0069f0096251eb245efc7ebd1b3ec2870592065695a556b17b19
 MD5 c4d90c5fb8d48a5feb3ec4cd6d6e3f38 files/2.3.0/disable-regcomp-java.diff 965
 RMD160 43ddf498738802101e3a4d1df15dbd8fc569482e files/2.3.0/disable-regcomp-java.diff 965
@@ -76,6 +88,10 @@ DIST ooo-build-2.3.0.1.90.tar.gz 7849585 RMD160 f9a2a2256b413c5fe5bd40b27c465318
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
+EBUILD openoffice-2.2.1-r1.ebuild 12033 RMD160 01ce64889f86640a45d9b591a28a98c0a5e9e06e SHA1 ab2b69642ff51b70a59f9473ea871d9fbd1e8ad9 SHA256 ed90622ffd637ea0ce46f1752da7068be0ccbc4dffe2120bad5a3016dcd7159a
+MD5 1c42a93ed8a4118ca94d376d49d92e6f openoffice-2.2.1-r1.ebuild 12033
+RMD160 01ce64889f86640a45d9b591a28a98c0a5e9e06e openoffice-2.2.1-r1.ebuild 12033
+SHA256 ed90622ffd637ea0ce46f1752da7068be0ccbc4dffe2120bad5a3016dcd7159a openoffice-2.2.1-r1.ebuild 12033
 EBUILD openoffice-2.2.1.ebuild 11889 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 SHA1 b41e2787d97e336e0c62d299d1a5c7ad8a442441 SHA256 98f7525fe494ff952810acc6ae454c6fba6041462737335790e6ed39b36a625d
 MD5 dac1ed6e687aa78d5b87cce285332fb7 openoffice-2.2.1.ebuild 11889
 RMD160 d8f060050e051a083d51b6afc2738903cfe09a18 openoffice-2.2.1.ebuild 11889
@@ -84,10 +100,10 @@ EBUILD openoffice-2.3.0.ebuild 12274 RMD160 75a83e2b4dcf1df0cb292cd6a6caad6ef92d
 MD5 239fc352a95d8015f2554c6bc0be741a openoffice-2.3.0.ebuild 12274
 RMD160 75a83e2b4dcf1df0cb292cd6a6caad6ef92d5f95 openoffice-2.3.0.ebuild 12274
 SHA256 df5e8f4ecd84c8fe2c8ecf280ffe8b380fdbf0683d9384e3fd9ea81a0211976a openoffice-2.3.0.ebuild 12274
-MISC ChangeLog 71349 RMD160 6946e2c859cc1d3521909b4a1b981165338a4643 SHA1 9853732e7568345df765aa2f630d9d86973e9506 SHA256 dc7c5b002cf2a0815880ac6090a30ba7fe84e67f23f15b004d480d4b1db859d8
-MD5 4bdf4517e9534840e39e479aef49043f ChangeLog 71349
-RMD160 6946e2c859cc1d3521909b4a1b981165338a4643 ChangeLog 71349
-SHA256 dc7c5b002cf2a0815880ac6090a30ba7fe84e67f23f15b004d480d4b1db859d8 ChangeLog 71349
+MISC ChangeLog 71694 RMD160 424152add6411159193cbc6bd2205eb5cea28bb6 SHA1 e6d6b8fb8c207ea3588c77732fa9f1951c9fbf8a SHA256 82215c142818daaf052b28f258bb2ebbfd2acb2c7bb871a220a0dcac3315deda
+MD5 9c3822169734a8e28a96dbf649b42b71 ChangeLog 71694
+RMD160 424152add6411159193cbc6bd2205eb5cea28bb6 ChangeLog 71694
+SHA256 82215c142818daaf052b28f258bb2ebbfd2acb2c7bb871a220a0dcac3315deda ChangeLog 71694
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -95,6 +111,9 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 f5f90d28e2fa42bdf0564c622b475978 files/digest-openoffice-2.2.1 3265
 RMD160 99b0f8c9c991ccc2ab6e4850bf52d73578f07aef files/digest-openoffice-2.2.1 3265
 SHA256 6ad627f46984c26bf39734c60fc5227e5b1bd1398fab95f261b2e18b016e87de files/digest-openoffice-2.2.1 3265
+MD5 f5f90d28e2fa42bdf0564c622b475978 files/digest-openoffice-2.2.1-r1 3265
+RMD160 99b0f8c9c991ccc2ab6e4850bf52d73578f07aef files/digest-openoffice-2.2.1-r1 3265
+SHA256 6ad627f46984c26bf39734c60fc5227e5b1bd1398fab95f261b2e18b016e87de files/digest-openoffice-2.2.1-r1 3265
 MD5 8d862dac5829329b7e4cbefda8354cb8 files/digest-openoffice-2.3.0 3244
 RMD160 763427c8042ae07f62a585b302adf79f149a3c9c files/digest-openoffice-2.3.0 3244
 SHA256 1c9e6129a9530072074945083a9035713eff1253aeb386c3c754ad66758d8c87 files/digest-openoffice-2.3.0 3244
diff --git a/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff b/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff
new file mode 100644
index 000000000000..ec8a0a25e101
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff
@@ -0,0 +1,36 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -57,6 +57,7 @@
+ #!/bin/sh
+ export OOO_EXTRA_ARG='$2'
++unset PYTHONPATH
+ $OOINSTBASE/program/ooqstart $3 "\$@"
+ EOT
+     chmod 755 $1
+ }
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -904,6 +904,13 @@
+ 
+ # JavaUNOHelperServices.class must be built before juh.jar is created
+ javaunohelper-deps.diff, i#77465, pmladek
++
++# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
++# Debian #442338, Debian #442368
++ucb-no-CURL_NO_OLDIES.diff
++
++# security fix
++itiff.diff
+ 
+ [ MandrivaOnly ]
+ SectionOwner => gghibo
+@@ -1185,6 +1185,8 @@
+ system-db-check.diff, i#65979, hmth
+ # User ~/.ooo-2.0 as user dir
+ scp2-user-config-ooo-2.0.diff, pmladek
++# Fix visbility issue with gcc-4.2
++swregion-gcc42.diff, i#78417, aprosky
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
+
diff --git a/app-office/openoffice/files/2.2.1/itiff.diff b/app-office/openoffice/files/2.2.1/itiff.diff
new file mode 100644
index 000000000000..ab1f3a3e764f
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/itiff.diff
@@ -0,0 +1,88 @@
+--- goodies/source/filter.vcl/itiff/itiff.cxx-old	2007-06-21 14:17:54.000000000 +0100
++++ goodies/source/filter.vcl/itiff/itiff.cxx	2007-06-21 14:18:01.000000000 +0100
+@@ -154,7 +154,7 @@
+ 	double	ReadDoubleData();
+ 
+ 	void	ReadHeader();
+-	void	ReadTagData( USHORT nTagType, ULONG nDataLen );
++	void	ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
+ 
+ 	BOOL	ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
+ 		// Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
+@@ -310,7 +310,7 @@
+ 
+ // ---------------------------------------------------------------------------------
+ 
+-void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
++void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
+ {
+ 	if ( bStatus == FALSE )
+ 		return;
+@@ -373,16 +373,25 @@
+ 		case 0x0111: { // Strip Offset(s)
+ 			ULONG nOldNumSO, i, * pOldSO;
+ 			pOldSO = pStripOffsets;
+-			if ( pOldSO == NULL ) nNumStripOffsets = 0;	// Sicherheitshalber
++			if ( pOldSO == NULL )
++				nNumStripOffsets = 0;
+ 			nOldNumSO = nNumStripOffsets;
+-			nNumStripOffsets += nDataLen;
+-			pStripOffsets = new ULONG[ nNumStripOffsets ];
+-			for ( i = 0; i < nOldNumSO; i++ )
+-				pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
+-			for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
+-				pStripOffsets[ i ] = ReadIntData() + nOrigPos;
+-			if ( pOldSO != NULL )
++			nDataLen += nOldNumSO;
++			if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
++			{
++				nNumStripOffsets = nDataLen;
++				pStripOffsets = new ULONG[ nNumStripOffsets ];
++				if ( !pStripOffsets )
++					nNumStripOffsets = 0;
++				else
++				{
++					for ( i = 0; i < nOldNumSO; i++ )
++						pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
++					for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
++						pStripOffsets[ i ] = ReadIntData() + nOrigPos;
++				}
+ 				delete[] pOldSO;
++			}
+ 			OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
+ 			break;
+ 		}
+@@ -404,16 +413,25 @@
+ 		case 0x0117: { // Strip Byte Counts
+ 			ULONG nOldNumSBC, i, * pOldSBC;
+ 			pOldSBC = pStripByteCounts;
+-			if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
++			if ( pOldSBC == NULL )
++				nNumStripByteCounts = 0; // Sicherheitshalber
+ 			nOldNumSBC = nNumStripByteCounts;
+-			nNumStripByteCounts += nDataLen;
+-			pStripByteCounts = new ULONG[ nNumStripByteCounts ];
+-			for ( i = 0; i < nOldNumSBC; i++ )
+-				pStripByteCounts[ i ] = pOldSBC[ i ];
+-			for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
+-				pStripByteCounts[ i ] = ReadIntData();
+-			if ( pOldSBC != NULL )
++			nDataLen += nOldNumSBC;
++			if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
++			{		
++				nNumStripByteCounts = nDataLen;
++				pStripByteCounts = new ULONG[ nNumStripByteCounts ];
++				if ( !nNumStripByteCounts )
++					nNumStripByteCounts = 0;
++				else
++				{
++					for ( i = 0; i < nOldNumSBC; i++ )
++						pStripByteCounts[ i ] = pOldSBC[ i ];
++					for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
++						pStripByteCounts[ i ] = ReadIntData();
++				}
+ 				delete[] pOldSBC;
++			}
+ 			OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
+ 			break;
+ 		}
diff --git a/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff b/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff
new file mode 100644
index 000000000000..4ec2d7a0e514
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff
@@ -0,0 +1,19 @@
+Index: source/ucp/ftp/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
+retrieving revision 1.13
+retrieving revision 1.12
+diff -u -u -r1.13 -r1.12
+--- ucb/source/ucp/ftp/makefile.mk	20 Sep 2004 14:32:42 -0000	1.13
++++ ucb/source/ucp/ftp/makefile.mk	2 Feb 2004 18:36:22 -0000	1.12
+@@ -75,9 +75,7 @@
+ 
+ .INCLUDE: settings.mk
+ 
+-.IF "$(SYSTEM_CURL)" == "YES"
+-CFLAGS+=-DCURL_NO_OLDIES
+-.ENDIF
++#CFLAGS +=-fno-inline
+ 
+ # --- General -----------------------------------------------------
+ 
diff --git a/app-office/openoffice/files/digest-openoffice-2.2.1-r1 b/app-office/openoffice/files/digest-openoffice-2.2.1-r1
new file mode 100644
index 000000000000..de6a736ea34a
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-2.2.1-r1
@@ -0,0 +1,39 @@
+MD5 d26766597ec92e7e397d7d7b6f644f7f OOo_2.2.1_src_binfilter.tar.bz2 7756778
+RMD160 a6194849bb8e2130709a7ff769a8e751a43f86c6 OOo_2.2.1_src_binfilter.tar.bz2 7756778
+SHA256 13f2f6dad82a085a60724fa6dbc58c564a8c496cc27189af3cd7286a6e6adeb8 OOo_2.2.1_src_binfilter.tar.bz2 7756778
+MD5 35d4037ce3a4d19bf52ba72c68ef6756 OOo_2.2.1_src_core.tar.bz2 123479583
+RMD160 fa6775f397bf093ad5be19c28c18d179bb1057b8 OOo_2.2.1_src_core.tar.bz2 123479583
+SHA256 adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6 OOo_2.2.1_src_core.tar.bz2 123479583
+MD5 23267d74b4a2a20d3c5ea098953c7ae4 OOo_2.2.1_src_l10n.tar.bz2 76560727
+RMD160 58f56faab079f179348f4c64cdbe176e296345f7 OOo_2.2.1_src_l10n.tar.bz2 76560727
+SHA256 d23cc1d5dc97533b03b04336e2a136ee4a359b2bd8239a008bd3e4508eae2b25 OOo_2.2.1_src_l10n.tar.bz2 76560727
+MD5 ece5727515916119aade371236bbfed6 OOo_2.2.1_src_sdk.tar.bz2 29291551
+RMD160 4811c952713526efe7e98090fee58b75e1aca7a3 OOo_2.2.1_src_sdk.tar.bz2 29291551
+SHA256 7d9e28ce43c52b08864e917709b5a6567543c2538b069fe7e3dfb1dd71796415 OOo_2.2.1_src_sdk.tar.bz2 29291551
+MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
+RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
+SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
+MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
+MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
+RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
+SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
+MD5 cfdc5e1fe2a559d458cf2a3fd3a52d8f libwpg-0.1.0~cvs20070608.tar.gz 396554
+RMD160 4ba3f5286ccc0fdea3962912a8f27dbd20f0feda libwpg-0.1.0~cvs20070608.tar.gz 396554
+SHA256 9d7c85a2c494260fe12fb0ec4e64c2670c5bb0e4abe167f032b72ea586f52903 libwpg-0.1.0~cvs20070608.tar.gz 396554
+MD5 2e442485100f7e00685737513f853546 libwps-0.1.0~svn20070129.tar.gz 426668
+RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 libwps-0.1.0~svn20070129.tar.gz 426668
+SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0.1.0~svn20070129.tar.gz 426668
+MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
+RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
+SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
+MD5 06c4210179b51035ce6a38690a26d909 ooo-build-2.2.1.tar.gz 4845814
+RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 ooo-build-2.2.1.tar.gz 4845814
+SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d ooo-build-2.2.1.tar.gz 4845814
+MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
+RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
+SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
+MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
+RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
+SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/openoffice-2.2.1-r1.ebuild b/app-office/openoffice/openoffice-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..52112026307e
--- /dev/null
+++ b/app-office/openoffice/openoffice-2.2.1-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1-r1.ebuild,v 1.1 2007/09/21 07:54:56 suka Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
+
+IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono sound odk pam seamonkey webdav"
+
+MY_PV="2.2.1"
+PATCHLEVEL="OOF680"
+SRC="OOo_${PV}_src"
+S="${WORKDIR}/ooo"
+S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
+CONFFILE="${S}/distro-configs/Gentoo.conf.in"
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
+	binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
+	http://go-oo.org/packages/OOF680/ooo-build-${MY_PV}.tar.gz
+	odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
+		java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	http://go-oo.org/packages/SRC680/extras-2.tar.bz2
+	http://go-oo.org/packages/SRC680/biblio.tar.bz2
+	http://go-oo.org/packages/SRC680/hunspell_UNO_1.1.tar.gz
+	http://go-oo.org/packages/xt/xt-20051206-src-only.zip
+	http://go-oo.org/packages/SRC680/lp_solve_5.5.tar.gz
+	http://go-oo.org/packages/SRC680/libwps-0.1.0~svn20070129.tar.gz
+	http://go-oo.org/packages/SRC680/libwpg-0.1.0~cvs20070608.tar.gz"
+
+LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh_YU sk sl sr_CS ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
+LANGS="${LANGS1} en en_US"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+for Y in ${LANGS1} ; do
+	SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
+done
+
+HOMEPAGE="http://go-oo.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+
+COMMON_DEPEND="!app-office/openoffice-bin
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	>=dev-lang/perl-5.0
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome? ( >=x11-libs/gtk+-2.10
+		>=gnome-base/gnome-vfs-2.6
+		>=gnome-base/gconf-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.10 )
+	cairo? ( >=x11-libs/cairo-1.0.2
+		>=x11-libs/gtk+-2.10 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gstreamer? ( >=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+	kde? ( >=kde-base/kdelibs-3.2 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		>=dev-java/xalan-2.7
+		>=dev-java/xerces-2.7
+		=dev-java/xml-commons-external-1.3* )
+	mono? ( >=dev-lang/mono-1.2.3.1 )
+	firefox? ( >=www-client/mozilla-firefox-1.5-r9
+		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nss-3.11-r1 )
+	!firefox? ( seamonkey? ( www-client/seamonkey
+		>=dev-libs/nspr-4.6.2
+		>=dev-libs/nss-3.11-r1 ) )
+	sound? ( >=media-libs/portaudio-18.1-r5
+			>=media-libs/libsndfile-1.0.9 )
+	webdav? ( >=net-misc/neon-0.24.7 )
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	cups? ( net-print/cups )
+	media-libs/jpeg
+	media-libs/libpng
+	sys-devel/flex
+	sys-devel/bison
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	>=app-admin/eselect-oodict-20060706
+	dev-libs/expat
+	>=dev-libs/icu-3.4
+	>=sys-libs/db-4.3
+	>=dev-libs/STLport-5.1.2
+	>=dev-libs/glib-2.12
+	>=app-text/libwpd-0.8.8
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXrender
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	dev-perl/Archive-Zip
+	dev-perl/Compress-Zlib
+	>=dev-perl/Compress-Raw-Zlib-2.002
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=dev-libs/boost-1.33.1
+	>=net-misc/curl-7.9.8
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam )
+	!dev-util/dmake
+	>=dev-lang/python-2.3.4
+	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
+		dev-java/ant-core )
+	dev-libs/libxslt
+	ldap? ( net-nds/openldap )
+	>=dev-libs/libxml2-2.0"
+
+PROVIDE="virtual/ooo"
+
+if use amd64; then
+	# All available Java 1.5 JDKs are broken, in one way or another, on amd64.
+	# Thus we force the use of a Java 1.4 JDK on amd64 (and amd64 only).
+	export JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
+fi
+
+pkg_setup() {
+
+	ewarn
+	ewarn " It is important to note that OpenOffice.org is a very fragile  "
+	ewarn " build when it comes to CFLAGS.  A number of flags have already "
+	ewarn " been filtered out.  If you experience difficulty merging this  "
+	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
+	ewarn " merge again. Also note that building OOo takes a lot of time and "
+	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
+	ewarn " the minimum requirements. If you have less, use openoffice-bin "
+	ewarn " instead. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="256"
+	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
+	check_reqs
+
+	strip-linguas ${LANGS}
+
+	if [[ -z "${LINGUAS}" ]]; then
+		export LINGUAS_OOO="en-US"
+		ewarn
+		ewarn " To get a localized build, set the according LINGUAS variable(s). "
+		ewarn
+	else
+		export LINGUAS_OOO=`echo ${LINGUAS} | \
+			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
+	fi
+
+	if use !java; then
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your USE-flags. "
+		ewarn
+	fi
+
+	if is-flagq -ffast-math ; then
+		eerror " You are using -ffast-math, which is known to cause problems. "
+		eerror " Please remove it from your CFLAGS, using this globally causes "
+		eerror " all sorts of problems. "
+		eerror " After that you will also have to - at least - rebuild python otherwise "
+		eerror " the openoffice build will break. "
+		die
+	fi
+
+	java-pkg-opt-2_pkg_setup
+
+	# sys-libs/db version used
+	local db_ver="$(db_findver '>=sys-libs/db-4.3')"
+
+}
+
+src_unpack() {
+
+	unpack ooo-build-${MY_PV}.tar.gz
+
+	# Hackish workaround for overlong path problem, see bug #130837
+	mv ${S_OLD} ${S} || die
+
+	#Some fixes for our patchset
+	cd ${S}
+	cp -f ${FILESDIR}/${PV}/swregion-gcc42.diff ${S}/patches/src680 || die
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}-r1.diff
+	epatch ${FILESDIR}/${PV}/ooo-env_log.diff
+	cp -f ${FILESDIR}/${PV}/ucb-no-CURL_NO_OLDIES.diff ${S}/patches/src680 || die
+	cp -f ${FILESDIR}/${PV}/itiff.diff ${S}/patches/src680 || die
+
+	if use ppc ; then
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-java.diff ${S}/patches/src680 || die
+		cp -f ${FILESDIR}/${PV}/disable-regcomp-python.diff ${S}/patches/src680 || die
+		epatch ${FILESDIR}/${PV}/regcompapply.diff
+	fi
+
+	#Use flag checks
+	if use java ; then
+		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
+		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
+		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
+		echo "--with-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-xalan" >> ${CONFFILE}
+		echo "--with-system-xerces" >> ${CONFFILE}
+		echo "--with-system-xml-apis" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-serializer-jar=$(java-pkg_getjar xalan serializer.jar)" >> ${CONFFILE}
+		echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE}
+		echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE}
+		echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE}
+	fi
+
+	use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE}
+
+	echo "`use_enable binfilter`" >> ${CONFFILE}
+
+	if use firefox || use seamonkey ; then
+		echo "--enable-mozilla" >> ${CONFFILE}
+		echo "--with-system-mozilla" >> ${CONFFILE}
+		echo "`use_with firefox`" >> ${CONFFILE}
+		echo "`use_with seamonkey`" >> ${CONFFILE}
+	else
+		echo "--disable-mozilla" >> ${CONFFILE}
+		echo "--without-system-mozilla" >> ${CONFFILE}
+	fi
+
+	echo "`use_enable cups`" >> ${CONFFILE}
+	echo "`use_enable ldap`" >> ${CONFFILE}
+	echo "`use_with ldap openldap`" >> ${CONFFILE}
+	echo "`use_enable eds evolution2`" >> ${CONFFILE}
+	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
+	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
+	echo "`use_enable gnome atkbridge`" >> ${CONFFILE}
+	echo "`use_enable gstreamer`" >> ${CONFFILE}
+	echo "`use_enable dbus`" >> ${CONFFILE}
+	echo "`use_enable webdav neon`" >> ${CONFFILE}
+	echo "`use_with webdav system-neon`" >> ${CONFFILE}
+
+	echo "`use_enable sound pasf`" >> ${CONFFILE}
+	echo "`use_with sound system-portaudio`" >> ${CONFFILE}
+	echo "`use_with sound system-sndfile`" >> ${CONFFILE}
+
+	echo "`use_enable debug crashdump`" >> ${CONFFILE}
+
+	eautoreconf
+
+}
+
+src_compile() {
+
+	unset LIBC
+	addpredict "/bin"
+	addpredict "/root/.gconfd"
+	addpredict "/root/.gnome"
+
+	# Should the build use multiprocessing? Not enabled by default, as it tends to break
+	export JOBS="1"
+	if [[ "${WANT_MP}" == "true" ]]; then
+		export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+	fi
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+	filter-flags "-ftracer"
+	filter-flags "-fforce-addr"
+	replace-flags "-O?" "-O2"
+
+	use ppc && append-flags "-D_STLP_STRICT_ANSI"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
+
+	cd ${S}
+	./configure ${MYCONF} \
+		--with-distro="Gentoo" \
+		--with-arch="${ARCH}" \
+		--with-srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-num-cpus="${JOBS}" \
+		--without-binsuffix \
+		--with-installed-ooo-dirname="openoffice" \
+		--with-tag="OOF680_m18" \
+		"${GTKFLAG}" \
+		`use_enable kde` \
+		`use_enable cairo` \
+		`use_with cairo system-cairo` \
+		`use_enable gnome quickstart` \
+		`use_enable mono` \
+		`use_enable pam` \
+		`use_enable !debug strip` \
+		`use_enable odk` \
+		`use_with java` \
+		--disable-access \
+		--disable-post-install-scripts \
+		--enable-hunspell \
+		--with-system-hunspell \
+		--with-system-libwpd \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+	einfo "Building OpenOffice.org..."
+	use kde && set-kdedir 3
+	make || die "Build failed"
+
+}
+
+src_install() {
+
+	export PYTHONPATH=""
+
+	einfo "Preparing Installation"
+	make DESTDIR=${D} install || die "Installation failed!"
+
+	# Fix the permissions for security reasons
+	chown -R root:root ${D}
+
+	# record java libraries
+	use java && java-pkg_regjar ${D}/usr/$(get_libdir)/openoffice/program/classes/*.jar
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	eselect oodict update --libdir $(get_libdir)
+
+	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
+
+	# Add available & useful jars to openoffice classpath
+	use java && /usr/$(get_libdir)/openoffice/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	elog " To start OpenOffice.org, run:"
+	elog
+	elog " $ ooffice"
+	elog
+	elog " Also, for individual components, you can use any of:"
+	elog
+	elog " oobase, oocalc, oodraw, oofromtemplate, ooimpress, oomath,"
+	elog " ooweb or oowriter"
+	elog
+	elog " Spell checking is now provided through our own myspell-ebuilds, "
+	elog " if you want to use it, please install the correct myspell package "
+	elog " according to your language needs. "
+
+}