add openoffice with kde4 patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1300 6952d904-891a-0410-993b-d76249ca496b
2009-06-16 06:21:44 +00:00
parent ead6c77486
commit e7a5827657
19 changed files with 3691 additions and 2 deletions
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -0,0 +1,51 @@
+AUX apply.diff 590 RMD160 54e84a6d8818c6a5acd8e60f53b5ff4fc2f30b6e SHA1 f9fb2baa59875273da11ab2b0e94dcbd4d8616c4 SHA256 427d4d0cf7aaf89c8eb7e92a549c3eea554a0c08067168a638cb95903f4abecd
+AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
+AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
+AUX configure.diff 777 RMD160 619e3318a6707b059244ab8d3a0628d53d11969a SHA1 6bd527815e81cb337fd78ae7045d4db8fb772484 SHA256 2c832d54116b0ff340a2931cafcb98eabb92ccae37ef3854db01ad96c0832504
+AUX dev300/kde4-configure.diff 4955 RMD160 e2b9c2baf3fa973ac808a8edfe8de0a22735b212 SHA1 a0f27de44eb153a1ce4dea191fe85da0bbfa199c SHA256 9c6a6347dd81f550cbbaa19b82c38bcb532d85f7f8eb0ba45b583286c77e7daf
+AUX dev300/kde4-fpicker-prj.diff 2094 RMD160 163db8bc4b29252ff5c910743b6f9b8c99e8a642 SHA1 b601a0244949b4e32b4c10b4d8c6f75d2a29db6f SHA256 bec50f000a21d994c467029d210d9fc9baf57716d6c75e4203304323318239f7
+AUX dev300/kde4-fpicker-source.diff 42508 RMD160 5216f24dae872d7249c5fb8fffff36ac1882648e SHA1 6f7898bce252c448ddf0643997e3672856af6228 SHA256 1a40cf7f54d743dcf46b6397acac4328f8647bb7eb780698b090a1071d03db16
+AUX dev300/kde4-plugin-detection.diff 3296 RMD160 048a043403fe2f17f1a652db3017b965689d42d9 SHA1 798c7c29688f3bf3af3beb089970fe962a4051c2 SHA256 c6363fc093cc3f848a27da8a7ef3f2ce8cdf5f5ab2ed9b8836525ac94620d54f
+AUX dev300/kde4-scp.diff 2460 RMD160 3aa1d0a205ca9babd4ace776e3de8ceec4fa7204 SHA1 dd24029c54516ec0c5a8d9b44732b21cb24d245f SHA256 dc96efcc20b6ae688a4213028600e8c0ada5f77c3c7eecad23dba34c589e032f
+AUX dev300/kde4-shell-prj.diff 1015 RMD160 b69430b4d65de8ba55395e11a9b53a610191a38a SHA1 3a314e11d16474569f600dba42ece4b87cd7331e SHA256 3a9259eecd8a4262812856293eec6beb47d7022163f0a00025e447ba2d34de12
+AUX dev300/kde4-shell-source.diff 58917 RMD160 bdd6960264af183fac32751ee00df192393a9419 SHA1 1003b0f00e18601b97fc6669b195c92ccf6703da SHA256 d264ddf88348c1196ea4eaef14a0907fb2231f3504c8ab8b4c0a680f59b3a99b
+AUX dev300/kde4-vcl-prj.diff 2532 RMD160 616053188ff6ef16427d2353f0c4d834455c224e SHA1 e742273dd422dfabe16d82eeeebadbc6c92d9bde SHA256 e3baed686b264d6a1b6931be37039c5644eac21efe728f9f98a1e3a8f08a5866
+AUX dev300/kde4-vcl.diff 60348 RMD160 c9bc1fd4a207431c996ee60712df4828efb56768 SHA1 98e808b499957e2d765defcdc3383e7de468326c SHA256 18c1fb230141e36ec0263eacd32137990b8073383099b9203b6c82f1416827a5
+AUX gentoo-3.1.0.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
+AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+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
+DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
+DIST Sun_ODF_Template_Pack_fr.oxt 4970438 RMD160 44de71cb028dde89836bfd1167b084dea54922e5 SHA1 3908eee06c17154c2cff6c9f175a7a8dad258e47 SHA256 4c8b739255122c989f00b3b706d99b93fa1c4cf428d61fd550994093aaca8fb5
+DIST Sun_ODF_Template_Pack_it.oxt 4960369 RMD160 9d8881f645f409599b7a5e14cb4b6842e5883383 SHA1 85c7670e182d5ed5aeb2d9bfe20d161c4ac824c8 SHA256 6e87462d76954698ffcbcf4145fd13ab9c41520026160363fd6e97f7cad3ae05
+DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
+DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA1 fb7d85a9827cd1280766db2641fb1896bd5d1c7b SHA256 6cf85181c21dadda4fa4d8fbc227012d63a2558642195a46b0ae2ab144facce8
+DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5 SHA1 6d350eb0ad57b97499ef8335506f172b0c21375a SHA256 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
+DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
+DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
+DIST ooo-build-3.1.0.98.1.tar.gz 13738048 RMD160 7c8484926f7ef06c9c56685fa3090b929d4b42d3 SHA1 57f8ffe9909036b44ac98d086cb9c00fc5d259cf SHA256 910cf708ea1364459ad6d19ab0a270c898647e03b93e36dd0c80f588392f1cdb
+DIST ooo310-m11-artwork.tar.bz2 9699172 RMD160 879132806579fdec881e7ed4e32191414c52cc0e SHA1 2dd68a74d1ce40f0bf6270c0e414876396958350 SHA256 c3af24301c85235afe0e3e86ceee56c36fae9318fdaa366f55cbe256dbc7737e
+DIST ooo310-m11-base.tar.bz2 3310363 RMD160 66e79afe97dcc7d82c76f682ea799e495bd10942 SHA1 e7c5fb4ced44f329769181d943d4284f8212b2a3 SHA256 2443026c719a55715788bcf67192cf39410b112a830998709e70fe6f2b5946d0
+DIST ooo310-m11-bootstrap.tar.bz2 7245734 RMD160 800f4828f33b4617cbe266fdb19cf93e80f32de3 SHA1 786975ce10b4ab38a6f9a0bb3cba005b83713242 SHA256 c97ee7594b769c765ec8b94205d3d76289d3d4b1a5b808e259f7d00588ab6961
+DIST ooo310-m11-calc.tar.bz2 9663046 RMD160 481c389dffb6e4a04cc190b468f7d613a0953fe7 SHA1 4efb32be8f66118b929bf9136378f72590747314 SHA256 c1b9c2a11f2ebad5901d89306311fdc7cb12c262b4637c5a5aff9d2c93404a69
+DIST ooo310-m11-components.tar.bz2 5990791 RMD160 a1e112509abda28638670dc31772d96e63eae795 SHA1 e54a788a70a5cd8f05d47a3d9bc8991d11ff544c SHA256 00cf6945073ec8385e027915b1374e206ec56a59eea5edbacc84fae5133083ee
+DIST ooo310-m11-extensions.tar.bz2 14789775 RMD160 afed9c3526fb09a156820369628c337e61f304e3 SHA1 cdad9be5b11434540c4c4135ea9fda2662f6825c SHA256 53b01101669381dbf61f5f49aced011a42a03ce50425fa4ddf6e84fe197024fc
+DIST ooo310-m11-extras.tar.bz2 46074505 RMD160 055dc9111e92fff3da418f1574ed5466b1414f4a SHA1 27b9a608fc1e64a0207152b9e64e6232160103a9 SHA256 d5d6bfcc5b434a5fa6765283420cde0dc74413ff48a5c85d884ca9e065a874b0
+DIST ooo310-m11-filters.tar.bz2 10795436 RMD160 a2a0d9e95b9e44237eb886cbb20ff2c5cf372dc3 SHA1 facd5f84b43e970ecb58337954e83ef76fd6f536 SHA256 99897ae4cfbc5b058b65ee57a97d7acd38a40fdc7032a67ef24739b0ce7f1f1c
+DIST ooo310-m11-help.tar.bz2 44865466 RMD160 845e83d4ceabc237350aaddd70140396e6d000a8 SHA1 7d0be276609566784384d561f9157e52950a88c3 SHA256 cf5b7f7d4e13142b6627f657326716486928178b8df1e3fb23406816498520f8
+DIST ooo310-m11-impress.tar.bz2 3548810 RMD160 64704d0abdcf532ea591dde8f162a18c0544bbde SHA1 9679e1822170524d26ccee95db3cb504c26c501e SHA256 a4b594abbef1c076f3a43fd88b6d87e0dcd0aeb20b43a618b66a96d497dadf9b
+DIST ooo310-m11-libs-core.tar.bz2 27371624 RMD160 a230690df75a7d0caf6583680e7ab538afb9efcb SHA1 aaba2f9e3310c73c05cbbaeb470ed9fe9b9fcd2f SHA256 ae4d67bb7f2e045958bd1c0dd8b2403a7b8322187393daaf3d2482ea262aa76c
+DIST ooo310-m11-libs-extern-sys.tar.bz2 105280413 RMD160 ef4549b1814087dfb571a3748cf031014f4f9c29 SHA1 d0ff64470f7a31855e745e2f92439f2ca84939b2 SHA256 b66b34fb191d8535315a0e47528c63b8731856c3311bf18782e6b77c8e1cb24e
+DIST ooo310-m11-libs-extern.tar.bz2 39916079 RMD160 2f40e139262e015af458ce97bef880e7825ec054 SHA1 db8fba930d97406e305ad9b3705898173a72424d SHA256 2a7a56f0046a05b285c66aacaf658257652a7faa3bc7e2c18feca72542282494
+DIST ooo310-m11-libs-gui.tar.bz2 11446021 RMD160 5ed350c573a4754fc8de1b8a755d3433f3dbf2ac SHA1 d97d90602fa3ea1d57cb5c9e9bd74ab656034442 SHA256 03fd40f491c034bd64a912ad39aa9fb9e0530f20d32dd5b2640a0431cd5635ba
+DIST ooo310-m11-postprocess.tar.bz2 19533 RMD160 01b019d0444b749f1d5833a8c1b82c5d0b5105d6 SHA1 9010bf249265c69c4d15355fed9a5f88b9fcb5cd SHA256 060c1d2632852a55b524d3a9f8ccd86fc573566dc7332a68a7f8058219284b9c
+DIST ooo310-m11-sdk.tar.bz2 1554459 RMD160 df4a743275155c4de0936ccbaa33532dd0d9c0ed SHA1 f60810d6163949364d43f2a40f4fd5f42e7b214a SHA256 770baee93184e2075c24c94070a7058df7b3fccb6c9840347fd167dd3bb2f493
+DIST ooo310-m11-testing.tar.bz2 51287333 RMD160 d729a23c1ee76feeb8d01898bed7630ff3b71da2 SHA1 c6ddcf7121ab5c2dbad88131bf926366ab57c2e8 SHA256 50342959f2eef3d6f3869816312ae2b966cf6fc02478d60ec80f473d1792e725
+DIST ooo310-m11-ure.tar.bz2 5160732 RMD160 fd419b3a6a77dac2d95bc55afba5591bed093093 SHA1 2412c683d0274c16a2b8b5263d60059a7080ce65 SHA256 c329eaf2cc7a46912fbd1fe685e91d941842c74f082419a03d88e75fae051db5
+DIST ooo310-m11-writer.tar.bz2 8955758 RMD160 876e1ecbd0bf8e6dbf9eaa95155868e44c33823f SHA1 fc37627f0a8aab578a64818f713ac87a838c4709 SHA256 093f42b6f102f3f9c7f934bdc071680fa50487628b8107aa335f623f8a770694
+DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
+DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+EBUILD openoffice-3.1.0.ebuild 13060 RMD160 109c44326dabf6bf0839c7e32ae2a67b36ede0a0 SHA1 b6fbb4d501aedea8f3fe5fb2f6540c704feabed3 SHA256 1b4af115a4aca8c63627f10c971ce48786e24757d2bceaec4f49fa081ec42f47
+MISC ChangeLog 97520 RMD160 f4b53a2d42876da6e3bdec63d001448571222d5a SHA1 bbb3aeeb3e8bef9bbc09f14a90e7b97d88a49195 SHA256 fe5455c8fcf8a00162cd7542139609d5e7d3712d97dcebc1709981f886b9f69e
+MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
--- a/app-office/openoffice/files/base64.diff
+++ b/app-office/openoffice/files/base64.diff
@@ -0,0 +1,16 @@
+--- filter/source/xsltfilter/makefile.mk	2009-03-27 10:14:39.000000000 +0300
+++ filter/source/xsltfilter/makefile.mk	2009-03-27 18:14:56.000000000 +0300
+@@ -72,11 +72,11 @@
+ CUSTOMMANIFESTFILE = Manifest
+ 
+ JARCOMPRESS		= TRUE
+-JARCLASSDIRS	= XSLTransformer*.class XSLTFilterOLEExtracter*.class
+JARCLASSDIRS	= XSLTransformer*.class XSLTFilterOLEExtracter*.class Base64*.class
+ JARTARGET		= $(TARGET).jar
+ 
+ # --- Files --------------------------------------------------------
+-JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class  $(CLASSDIR)$/XSLTFilterOLEExtracter.class
+JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class  $(CLASSDIR)$/XSLTFilterOLEExtracter.class $(CLASSDIR)$/Base64.class
+ .ENDIF
+ 
+ # --- Targets ------------------------------------------------------
--- a/app-office/openoffice/files/buildfix-gcc44.diff
+++ b/app-office/openoffice/files/buildfix-gcc44.diff
@@ -0,0 +1,20 @@
+--- sw/source/core/doc/docbm.cxx	2009-05-17 16:41:34.765483089 -0500
+++ sw/source/core/doc/docbm.cxx	2009-05-17 16:41:39.141355157 -0500
+@@ -33,6 +33,7 @@
+ #include "precompiled_sw.hxx"
+ 
+ 
+#include <cstdio>
+ #include <tools/pstm.hxx>
+ #include <svx/linkmgr.hxx>
+ #include <fmtanchr.hxx>
+--- sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:33.556313757 -0500
+++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:46.964547351 -0500
+@@ -32,6 +32,7 @@
+ #include "precompiled_sw.hxx"
+ 
+ #include <iostream> 
+#include <cstdio>
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
+ #include "pam.hxx"
--- a/app-office/openoffice/files/gentoo-3.1.0.diff
+++ b/app-office/openoffice/files/gentoo-3.1.0.diff
@@ -0,0 +1,11 @@
+--- bin/package-ooo 
+++ bin/package-ooo 
+@@ -33,6 +33,7 @@
+ {
+     cat <<EOT >$1
+ #!/bin/sh
+unset PYTHONPATH
+ $OOINSTBASE/program/soffice $2 "\$@"
+ EOT
+     chmod 755 $1
+
--- a/app-office/openoffice/files/ooo-env_log.diff
+++ b/app-office/openoffice/files/ooo-env_log.diff
@@ -0,0 +1,25 @@
+--- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
+@@ -21,9 +21,8 @@
+ echo "configuring ...";
+ autoconf || exit 1;
+ 
+-echo "Env for configure:"
+-set
+-echo "Env for configure ends"
+echo "Log Env for configure to `pwd`/env.log"
+set > env.log
+ 
+ eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
+ 
+@@ -88,8 +88,8 @@
+ # similar that gives child nmake's pain.
+ unset MAKEFLAGS
+ 
+-echo "Env:"
+-set
+echo "Log Env to `pwd`/env.log"
+set > env.log
+ 
+ # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
+ # already merged?
--- a/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff
+++ b/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff
@@ -0,0 +1,262 @@
+unchanged:
+--- solenv/inc/_tg_shl.mk
+++ solenv/inc/_tg_shl.mk
+@@ -441,10 +441,10 @@ $(SHL1TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
+-	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+ 	$(SHL1VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
+	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -981,10 +981,10 @@ $(SHL2TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
+-	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+ 	$(SHL2VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -1521,10 +1521,10 @@ $(SHL3TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
+-	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+ 	$(SHL3VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -2061,10 +2061,10 @@ $(SHL4TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
+-	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+ 	$(SHL4VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -2601,10 +2601,10 @@ $(SHL5TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
+-	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+ 	$(SHL5VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -3141,10 +3141,10 @@ $(SHL6TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
+-	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+ 	$(SHL6VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -3681,10 +3681,10 @@ $(SHL7TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
+-	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+ 	$(SHL7VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -4221,10 +4221,10 @@ $(SHL8TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
+-	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+ 	$(SHL8VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -4761,10 +4761,10 @@ $(SHL9TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
+-	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+ 	$(SHL9VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -5301,10 +5301,10 @@ $(SHL10TARGETN) : \
+ .ENDIF
+ .ELSE			# "$(OS)"=="MACOSX"
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
+-	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+ 	$(SHL10VERSIONOBJ) -o $@ \
+ 	`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+-	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ 	@cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ .IF "$(UPDATER)"=="YES"
+diff -u solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
+--- solenv/inc/_tg_app.mk	(working copy)
+++ solenv/inc/_tg_app.mk
+@@ -116,10 +116,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
+-	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ 	@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+-	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ 	@ls -l $@
+@@ -400,10 +400,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
+-	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+-	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ 	@ls -l $@
+@@ -684,10 +684,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
+-	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+-	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ 	@ls -l $@
+@@ -968,10 +968,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
+-	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+-	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ 	@ls -l $@
+@@ -1252,10 +1252,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
+-	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+-	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ 	@ls -l $@
+@@ -1536,10 +1536,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
+-	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+-	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ 	@ls -l $@
+@@ -1820,10 +1820,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
+-	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+-	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ 	@ls -l $@
+@@ -2104,10 +2104,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
+-	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+-	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ 	@ls -l $@
+@@ -2388,10 +2388,10 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
+-	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+-	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ 	@ls -l $@
+@@ -2672,7 +2672,7 @@
+ .ELSE		# "$(OS)"=="MACOSX"
+ 	@echo unx
+ 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
+-	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
+	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ 	$(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ 	@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ 	@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
--- a/app-office/openoffice/metadata.xml
+++ b/app-office/openoffice/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>openoffice</herd>
+<longdescription>Openoffice is the opensource version of staroffice. 
+This ebuild allows you to compile it yourself. Unfortunately this 
+compilation can take up to a day depending on the speed of your 
+computer. It will however make a snappier openoffice than the binary 
+version</longdescription>
+<use>
+  <flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
+    file formats</flag>
+  <flag name='odk'>Build the Office Development Kit</flag>
+  <flag name='templates'>Enable installation of Sun templates</flag>
+</use>
+</pkgmetadata>
--- a/app-office/openoffice/openoffice-3.1.0.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0.ebuild
@@ -0,0 +1,403 @@
+# 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.6 2009/05/31 15:35:26 suka Exp $
+
+WANT_AUTOMAKE="1.9"
+EAPI="2"
+
+inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde kde4 ldap mono nsplugin odk opengl pam templates"
+
+MY_PV=3.1.0.98.1
+PATCHLEVEL=OOO310
+SRC=OOo_${PV}_src
+MST=ooo310-m11
+DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
+S=${WORKDIR}/ooo
+S_OLD=${WORKDIR}/ooo-build-${MY_PV}
+CONFFILE=${S}/distro-configs/Gentoo.conf.in
+BASIS=basis3.1
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+
+SRC_URI="${DEVPATH}-artwork.tar.bz2
+	${DEVPATH}-base.tar.bz2
+	${DEVPATH}-bootstrap.tar.bz2
+	${DEVPATH}-calc.tar.bz2
+	${DEVPATH}-components.tar.bz2
+	${DEVPATH}-extensions.tar.bz2
+	${DEVPATH}-extras.tar.bz2
+	${DEVPATH}-filters.tar.bz2
+	${DEVPATH}-help.tar.bz2
+	${DEVPATH}-impress.tar.bz2
+	${DEVPATH}-libs-core.tar.bz2
+	${DEVPATH}-libs-extern.tar.bz2
+	${DEVPATH}-libs-extern-sys.tar.bz2
+	${DEVPATH}-libs-gui.tar.bz2
+	${DEVPATH}-postprocess.tar.bz2
+	${DEVPATH}-sdk.tar.bz2
+	${DEVPATH}-testing.tar.bz2
+	${DEVPATH}-ure.tar.bz2
+	${DEVPATH}-writer.tar.bz2
+	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
+		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
+		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
+		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
+		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt )
+	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
+	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	http://download.go-oo.org/SRC680/extras-3.tar.bz2
+	http://download.go-oo.org/SRC680/biblio.tar.bz2
+	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
+	http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
+	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
+	http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz"
+
+LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu"
+LANGS="${LANGS1} en en_US"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+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
+	x11-libs/libXrandr
+	>=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
+		>=x11-libs/cairo-1.0.2 )
+	gtk? ( >=x11-libs/gtk+-2.10
+		>=x11-libs/cairo-1.0.2 )
+	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.5 )
+	kde4? ( >=kde-base/kdelibs-4.0.1 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		>=dev-db/hsqldb-1.8.0.9 )
+	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
+	nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1 )
+	opengl? ( virtual/opengl
+		virtual/glu )
+	>=net-misc/neon-0.24.7
+	>=dev-libs/openssl-0.9.8g
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	cups? ( net-print/cups )
+	media-libs/jpeg
+	media-libs/libpng
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	dev-libs/expat
+	>=dev-libs/icu-4.0
+	>=sys-libs/db-4.3
+	>=app-text/libwpd-0.8.8
+	>=media-libs/vigra-1.4
+	>=virtual/poppler-0.8.0"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	dev-perl/Archive-Zip
+	virtual/perl-Compress-Zlib
+	>=virtual/perl-Compress-Raw-Zlib-2.002
+	virtual/perl-IO-Compress-Base
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=dev-libs/boost-1.33.1
+	sys-devel/flex
+	sys-devel/bison
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.0
+	>=dev-util/gperf-3
+	>=net-misc/curl-7.12
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam
+		sys-apps/shadow[pam] )
+	>=dev-lang/python-2.3.4[threads]
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7 )
+	ldap? ( net-nds/openldap )"
+
+PROVIDE="virtual/ooo"
+
+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
+	ewarn " Also if you experience a build break, please make sure to retry "
+	ewarn " with MAKEOPTS="-j1" before filing a bug. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="512"
+	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="6144"
+	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;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 being disabled. "
+		ewarn " If something you need does not work for you, rebuild with "
+		ewarn " java in your USE-flags. "
+		ewarn
+	fi
+
+	if use !gtk && use !gnome; then
+		ewarn " If you want the OpenOffice.org systray quickstarter to work "
+		ewarn " activate either the 'gtk' or 'gnome' 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
+
+	if use nsplugin; then
+		if pkg-config --exists libxul; then
+			BRWS="libxul"
+		elif pkg-config --exists xulrunner-xpcom; then
+			BRWS="xulrunner"
+		elif pkg-config --exists seamonkey-xpcom; then
+			BRWS="seamonkey"
+		else
+			die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
+		fi
+	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
+
+}
+
+src_prepare() {
+
+	# Hackish workaround for overlong path problem, see bug #130837
+	mv "${S_OLD}" "${S}" || die
+
+	#Some fixes for our patchset
+	cd "${S}"
+	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	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}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die
+
+	#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-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
+		echo "--with-system-beanshell" >> ${CONFFILE}
+		echo "--with-system-hsqldb" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
+	fi
+
+	if use nsplugin ; then
+		echo "--enable-mozilla" >> ${CONFFILE}
+		echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
+	else
+		echo "--disable-mozilla" >> ${CONFFILE}
+		echo "--without-system-mozilla" >> ${CONFFILE}
+	fi
+
+	echo $(use_enable binfilter) >> ${CONFFILE}
+	echo $(use_enable cups) >> ${CONFFILE}
+	echo $(use_enable dbus) >> ${CONFFILE}
+	echo $(use_enable eds evolution2) >> ${CONFFILE}
+	echo $(use_enable gnome gconf) >> ${CONFFILE}
+	echo $(use_enable gnome gnome-vfs) >> ${CONFFILE}
+	echo $(use_enable gnome lockdown) >> ${CONFFILE}
+	echo $(use_enable gstreamer) >> ${CONFFILE}
+	echo $(use_enable gtk systray) >> ${CONFFILE}
+	echo $(use_enable ldap) >> ${CONFFILE}
+	echo $(use_enable opengl) >> ${CONFFILE}
+	echo $(use_with ldap openldap) >> ${CONFFILE}
+	echo $(use_enable debug crashdump) >> ${CONFFILE}
+	echo $(use_enable debug strip-solver) >> ${CONFFILE}
+
+	# Extension stuff
+	echo "--with-extension-integration" >> ${CONFFILE}
+	echo "--enable-minimizer" >> ${CONFFILE}
+	echo "--enable-pdfimport" >> ${CONFFILE}
+	echo "--enable-presenter-console" >> ${CONFFILE}
+
+	echo "--without-writer2latex" >> ${CONFFILE}
+
+	# Use splash screen without Sun logo
+	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
+
+}
+
+src_configure() {
+
+	# Use multiprocessing by default now, it gets tested by upstream
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# 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"
+
+	filter-flags "-O[s2-9]"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
+	# Build with NVidia cards breaks otherwise
+	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
+
+	cd "${S}"
+	./configure --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="${MST}" \
+		${GTKFLAG} \
+		$(use_enable mono) \
+		$(use_enable kde) \
+		$(use_enable kde4) \
+		$(use_enable !debug strip) \
+		$(use_enable odk) \
+		$(use_enable pam) \
+		$(use_with java) \
+		$(use_with templates sun-templates) \
+		--disable-access \
+		--disable-post-install-scripts \
+		--enable-extensions \
+		--with-system-libwpd \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		|| die "Configuration failed!"
+
+}
+
+src_compile() {
+
+	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 -RP root:0 "${D}"
+
+	# record java libraries
+	if use java; then
+			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
+			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
+	fi
+
+	# Upstream places the bash-completion module in /etc. Gentoo places them in
+	# /usr/share/bash-completion. bug 226061
+	dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
+	rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst
+
+	[[ -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/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	elog
+	elog " Spell checking is 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. "
+	elog
+
+	elog " Some aditional functionality can be installed via Extension Manager: "
+	elog " *) PDF Import "
+	elog " *) Presentation Console "
+	elog " *) Presentation Minimizer "
+	elog
+	elog " Please use the packages provided in "
+	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	elog " instead of those from the SUN extension site. "
+	elog
+
+}