diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index cc68adfb..df8e6a15 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,7 +1,7 @@
 AUX chrpath-keepgoing.patch 1041 RMD160 9c454d96245d434b69db0b176a792f50eb882429 SHA1 a213403888ca21aa7730b4957b8f9f7e6c4b05b6 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a
 AUX chrpath-multilib.patch 3549 RMD160 1ebe77532319fd4877fbea019b519b4b78cb1427 SHA1 2a1189a4e7743b3707de929bacc162c73ac0549d SHA256 36241db7e559ed8cfa0d239d63d17e4c33d63d58a10981f18dfa6e7c2004aac7
 DIST chrpath-0.13.tar.gz 125129 RMD160 89b91919e3f629173388f10469dc94fadd46aa56 SHA1 11ff3e3dda2acaf1e529475f394f74f2ef7a8204 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b
-EBUILD chrpath-0.13-r1.ebuild 607 RMD160 a7bd71581196736d9f7c282f28079094be5488fb SHA1 86e8f848e66d4f360c27d15ad2211c40c8f54754 SHA256 614096880e43a79a92695295aca63ce060172d83d67540cf60e922e03ad655a1
+EBUILD chrpath-0.13-r1.ebuild 594 RMD160 103c378e306be52baa0c9e25b19d84f0bd445a3f SHA1 41577f0ba5514b5d1261d62c160937f8602ca982 SHA256 a4bb4ab7181a8e041c821b065013484b0f9e824e125e8db148efb995351ed9b9
 EBUILD chrpath-0.13.ebuild 595 RMD160 c029bf674920979c26ab311c1beea6037251a443 SHA1 a93326ef0f7fb19c7ace53d24fbac9534165a6e7 SHA256 3369fcdcde879d118f51b17f8a2e9365da7dd0d855381358134d5421d951c388
 MISC ChangeLog 1349 RMD160 351ac5d88582a9de51958b785cb8bf2e7a3f1381 SHA1 8bf103ba5b72af3549284ea97dfb496098e464c1 SHA256 86e88bc755f117ddb81779c0dbc05b632dd5d86a4ee317068cc1c2774d775853
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/app-admin/chrpath/chrpath-0.13-r1.ebuild b/app-admin/chrpath/chrpath-0.13-r1.ebuild
index d0e6b32b..b3358126 100644
--- a/app-admin/chrpath/chrpath-0.13-r1.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r1.ebuild
@@ -22,6 +22,5 @@ src_prepare() {
 }
 
 src_install() {
-	einstall
-	dodoc ChangeLog AUTHORS NEWS README
+	einstall || die "install failed"
 }
\ No newline at end of file
diff --git a/app-cdr/qlscribe/Manifest b/app-cdr/qlscribe/Manifest
index d755a686..117ac84f 100644
--- a/app-cdr/qlscribe/Manifest
+++ b/app-cdr/qlscribe/Manifest
@@ -7,7 +7,7 @@ DIST qlscribe-0.12.tar.gz 91799 RMD160 33cd940209801cc62b41085976b4e4810d2a2fe9
 DIST qlscribe-0.9.tar.gz 88106 RMD160 68fdff43e8f09654a3c3e70f4c9fdd7f0b7f5990 SHA1 7eb24180003629e02e6c783cd00013d038ecb505 SHA256 8f77ba545e95d9684530bfc4998ebc913fcfad912a66b7201eaff5279145cbeb
 EBUILD qlscribe-0.10.ebuild 1321 RMD160 a0ea5bd729110cff0c93b9aaa802f7aa74bc8449 SHA1 bdc4c7c965dd0a95204d7e3cea39c65d898791b2 SHA256 87240222a2b5f1acc6101347afc460d4d20829582e9c064aed7bef9c9d99d679
 EBUILD qlscribe-0.11.ebuild 1396 RMD160 dc9ef6a6e7a86e38b817d23c1470dc24ea024708 SHA1 a067d760d08b47d78fa2b9b23008572c484c2fd8 SHA256 8591edcb2b28ef75138451b8ca4b2b43e44f728b629a7706317fcbb329e02244
-EBUILD qlscribe-0.12.ebuild 703 RMD160 0a2a6ebbd00daccf0c9aeb0aa1369a7117b3f104 SHA1 bb52f83767800587322ec5e3f09a1416bfc5e167 SHA256 84c0a8483dd6e3d0b42988b78a31406506dfe554635c31bec10ea25b2c80145c
+EBUILD qlscribe-0.12.ebuild 704 RMD160 e31fc7fb10b15588f675bd5fe11a167b6259acb7 SHA1 deede2f59b2f935e602a734c69504af7d2dd5c80 SHA256 1aa94a2e3a4f461d576ff6dad93497175fe199ee5264d6e43d2857ba16026909
 EBUILD qlscribe-0.9.ebuild 1321 RMD160 9e769bc4146f65ecb5f3ebf607a27c1face4e54a SHA1 61d7771c1eabd44037da24db07fdf0a371f77c7d SHA256 a412becb963eae3118fd15bbf9084782ac006337587fcc10cbc2982a252b3d69
 MISC ChangeLog 1254 RMD160 689371ad88fb7a13d4692fcf8f98ded3cac744d4 SHA1 9315471a3e764c5a11d5a443c332609e6414eb87 SHA256 c65130514adf02f2d03b4c9e4f5e9e8fb27e13717c2e07c4fb2fec44f7e1ea34
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-cdr/qlscribe/qlscribe-0.12.ebuild b/app-cdr/qlscribe/qlscribe-0.12.ebuild
index b9769a1c..f185ae94 100644
--- a/app-cdr/qlscribe/qlscribe-0.12.ebuild
+++ b/app-cdr/qlscribe/qlscribe-0.12.ebuild
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug multilib"
 
-DEPEND="x11-libs/qt-gui:4
+RDEPEND="x11-libs/qt-gui:4
 	app-cdr/liblightscribe
 	amd64? ( app-emulation/emul-linux-x86-baselibs )"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	dev-util/cmake[qt4]"
 
 mycmakeargs="-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
diff --git a/app-emulation/opencbm/Manifest b/app-emulation/opencbm/Manifest
index 8b3919db..9b1f976c 100644
--- a/app-emulation/opencbm/Manifest
+++ b/app-emulation/opencbm/Manifest
@@ -6,6 +6,6 @@ AUX 0.4.2a/96_no_compat.patch 376 RMD160 d14349cf91d057345b040c581af079cd9052091
 AUX 0.4.2a/97_no_demo.patch 381 RMD160 212eb87b0f8f0cdec85b83db99319e5c42b0d431 SHA1 a688868ce987be4bf67831f3a5642b628f520fd6 SHA256 c39319aa3208719a12a9ccf93cc2a134a9efc176f2122d0d4f5cefd325f416f3
 AUX Makefile 1003 RMD160 7f70ec429c51206864e72d82aee80aa5ef655d70 SHA1 c072491f3b775b00463805a6b70744d8ccf56501 SHA256 7b2d7f35f20d72a1e0a5f6bde2d9da8168891c2994b4b9828b7892f8cbb8a93c
 DIST opencbm-0.4.2a-src.zip 745788 RMD160 825bded87a51e6fd2f76d8ba4bbcf31fada54277 SHA1 4eb3653609e4bc0725c0f2a8f4447e6928616e9f SHA256 c246f2484efe4835470f82b6b91f85569550f47e433fb8b042498dae9b061485
-EBUILD opencbm-0.4.2a.ebuild 1657 RMD160 f7d800a9fa68fed0bf1fb320831951c288812c07 SHA1 bdd1ed23b8783e54d2cbcc4c2aea3e2b3ea09de5 SHA256 67d57a5fd90c739f295cc54fb3b46b315ea775b1770070e8d94cbb68a106449f
+EBUILD opencbm-0.4.2a.ebuild 1635 RMD160 e848e169aa537915367713a244af0894f8564417 SHA1 48cd3e7e93ddfcdcfb9c2467ab71ad7d8a851784 SHA256 6e9d98d212a9665bd5b39efdcd5aba02e224233968d32148210badd9692e5bfa
 MISC ChangeLog 236 RMD160 59f952e739b91395e5d4087039a69f8157a591f5 SHA1 b45fb4da8dde0021b4962fa195b9d27ad884f48e SHA256 f060b1faa042693fe48dfc15e57ec3039c08f69116db629fd795c6631f1c6628
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-emulation/opencbm/opencbm-0.4.2a.ebuild b/app-emulation/opencbm/opencbm-0.4.2a.ebuild
index d9c28fe7..4c71e887 100644
--- a/app-emulation/opencbm/opencbm-0.4.2a.ebuild
+++ b/app-emulation/opencbm/opencbm-0.4.2a.ebuild
@@ -46,7 +46,7 @@ src_compile() {
 }
 
 src_install() {
-	emake -f LINUX/Makefile PREFIX="${D}/usr" install || die "install fail"
+	emake -f LINUX/Makefile PREFIX="${D}/usr" install
 	linux-mod_src_install
         generate_modulesd
 
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
new file mode 100644
index 00000000..25486a98
--- /dev/null
+++ b/app-office/openoffice/Manifest
@@ -0,0 +1,38 @@
+AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
+AUX buildfix-gcc44.diff 729 RMD160 87f7b5eead24039d1f08addca630c98f23f76156 SHA1 dac122c9dd3f40001797d81137a63294ee0133c1 SHA256 3336441534b2bf5080f0d0529882b4c82344b216eaa86df4fb16875051bc163c
+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.1.tar.gz 13163508 RMD160 0e5841f718f880904532a5c88652614cf92ee683 SHA1 ff1676098814d5a1f737c1fdb21c4b827683325c SHA256 ba4dc0307f44e46cb45b1b683965069c3f03db33bb5d884275cc482b0e3285d1
+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 12821 RMD160 65d5b17a28ead04e7ce11dbccc2d2a4d2a5ac4c3 SHA1 cf58bd6ef2b54e3f065bf25ff1a1cf76755c2a52 SHA256 a756490fef1f9a4a49cf254cb6b2faec1fa3f234e3a4c212cd4d8846397efaf5
diff --git a/app-office/openoffice/files/base64.diff b/app-office/openoffice/files/base64.diff
new file mode 100644
index 00000000..bcf81113
--- /dev/null
+++ 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 ------------------------------------------------------
diff --git a/app-office/openoffice/files/buildfix-gcc44.diff b/app-office/openoffice/files/buildfix-gcc44.diff
new file mode 100644
index 00000000..be6a233e
--- /dev/null
+++ b/app-office/openoffice/files/buildfix-gcc44.diff
@@ -0,0 +1,22 @@
+diff -aur sw/source/core/doc/docbm.cxx sw/source/core/doc/docbm.cxx
+--- sw/source/core/doc/docbm.cxx	2009-04-26 03:05:02.000000000 +0800
++++ sw/source/core/doc/docbm.cxx	2009-04-28 11:43:39.684101752 +0800
+@@ -63,6 +63,7 @@
+ // --> OD 2007-10-23 #i81002#
+ #include <ndtxt.hxx>
+ // <--
++#include <stdio.h>
+ 
+ SV_IMPL_OP_PTRARR_SORT(SwBookmarks, SwBookmarkPtr)
+ 
+diff -aur sw/source/filter/ww8/WW8TableInfo.cxx sw/source/filter/ww8/WW8TableInfo.cxx
+--- sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-26 03:04:38.000000000 +0800
++++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-28 11:46:24.967120225 +0800
+@@ -37,6 +37,7 @@
+ #include "pam.hxx"
+ #include "ndtxt.hxx"
+ #include "dbgoutsw.hxx"
++#include <stdio.h>
+ 
+ namespace ww8 
+ {
diff --git a/app-office/openoffice/files/gentoo-3.1.0.diff b/app-office/openoffice/files/gentoo-3.1.0.diff
new file mode 100644
index 00000000..4714b0ab
--- /dev/null
+++ 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
+
diff --git a/app-office/openoffice/files/ooo-env_log.diff b/app-office/openoffice/files/ooo-env_log.diff
new file mode 100644
index 00000000..908169ab
--- /dev/null
+++ 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?
diff --git a/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff b/app-office/openoffice/files/solenv.workaround-for-the-kde-mess.diff
new file mode 100644
index 00000000..714709e2
--- /dev/null
+++ 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
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
new file mode 100644
index 00000000..9fdf8d21
--- /dev/null
+++ b/app-office/openoffice/openoffice-3.1.0.ebuild
@@ -0,0 +1,397 @@
+# 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_beta7.ebuild,v 1.3 2009/05/12 20:36:22 loki_val 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 ldap mono nsplugin odk opengl pam templates"
+
+MY_PV=3.1.0.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 bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu he hi_IN hr hu it ja ka kk km ko ku lt lv mk ml_IN mn mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh sk sl sr ss st sv sw_TZ ta 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
+
+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 )
+	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
+
+	# 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}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/base64.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 !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_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
+
+}
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 9d6bef05..7b1bd1e9 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,4 @@
 EBUILD eigen-2.1_pre20090329.ebuild 479 RMD160 1fe8cf4bc3313c5b1a92539b1c64427fcf61cdd7 SHA1 260b59b1aa60db87ab488c486fa3b7dbfbe687ac SHA256 2d1261f00e3c8ea7ec0e618a8567cf561b51075fcc633bd2f042eaf7b7bf57f3
+EBUILD eigen-2.1_pre20090428.ebuild 479 RMD160 1fe8cf4bc3313c5b1a92539b1c64427fcf61cdd7 SHA1 260b59b1aa60db87ab488c486fa3b7dbfbe687ac SHA256 2d1261f00e3c8ea7ec0e618a8567cf561b51075fcc633bd2f042eaf7b7bf57f3
 MISC ChangeLog 988 RMD160 7443c0fe5bd370b130a17f7653af4b179d399c47 SHA1 dab351ef4a91fd9b7d73a031e9f79b0aeee299b8 SHA256 31e123930357dbe2084feb380a6263252c5d5d843ab843d3f97f3f5b8dfafa7b
 MISC metadata.xml 620 RMD160 5e24e438e3a9501381b1cab57dcaf29f8cff8374 SHA1 419bbd39ba071fb7ed3588903419ceadf9833a36 SHA256 35dc30130eccec1771de4dd1392b86fc2d6451bcac10babb0ccf5a5e71aad593
diff --git a/kde-misc/kdelirc/Manifest b/kde-misc/kdelirc/Manifest
index 27d95c61..f30f352a 100644
--- a/kde-misc/kdelirc/Manifest
+++ b/kde-misc/kdelirc/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdelirc-4.0_pre20090502.ebuild 470 RMD160 3bd9698932012a8c0814ae6ed28f28ff1efcd718 SHA1 feb1fd976540a5a0278f5bfafa7027cc041b7455 SHA256 67a44dd3c0e7191560be4ec803216e1b8588b5ad259f4aa35b8c470fcb333126
+EBUILD kdelirc-4.0_pre20090502.ebuild 456 RMD160 c78c2bf98bf95bdbd4523cb01f50883054fdb23c SHA1 32ee859cc5eaebad7c12a1977d9df75785724c34 SHA256 9ea4aba1fcbfaf3e73e3f9459e15061f1bab60ccf1f97c04d0591d04f24690db
 MISC ChangeLog 649 RMD160 72379b97a4b89ad530e617baeca3214b519543dc SHA1 c8bbfd4ac5bdad7e7236aa9aa75d63a28d8c4d74 SHA256 332c502460371e318cd91b945d30f277001d62e8d13d7ec95fdd66559173b748
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/kdelirc/kdelirc-4.0_pre20090502.ebuild b/kde-misc/kdelirc/kdelirc-4.0_pre20090502.ebuild
index 92b440e6..216d8ba3 100644
--- a/kde-misc/kdelirc/kdelirc-4.0_pre20090502.ebuild
+++ b/kde-misc/kdelirc/kdelirc-4.0_pre20090502.ebuild
@@ -4,9 +4,9 @@
 
 EAPI="2"
 
-KMNAME="playground/utils"
+KMNAME="kdereview"
 inherit kde4-base subversion
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/playground/utils/${PN}/@{${PV/4.0_pre/}}"
+ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/kdereview/${PN}/@{${PV/4.0_pre/}}"
 
 DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
 HOMEPAGE="http://kde.org/"
diff --git a/sys-kernel/geos_one-sources/Manifest b/sys-kernel/geos_one-sources/Manifest
index dcbc4eb4..01226628 100644
--- a/sys-kernel/geos_one-sources/Manifest
+++ b/sys-kernel/geos_one-sources/Manifest
@@ -49,6 +49,8 @@ DIST genpatches-2.6.29-2.base.tar.bz2 17861 RMD160 1b9bcf6e025e3cdd06002875dca37
 DIST genpatches-2.6.29-2.extras.tar.bz2 24597 RMD160 f43cad26f1744a1c629f2a4e29dfa98f9c99f65c SHA1 d2fef4c503d586a4fff3b5900f18036478381258 SHA256 f93a7cb4a2040b800750b32bf33a96825fb5bab2771e23e94e1fca4399fe1325
 DIST genpatches-2.6.29-4.base.tar.bz2 53647 RMD160 ae02fa5b5b5a4120f39ffce08aa422213176eec7 SHA1 8a096a13b25c96a21514f78508caddc0a9447391 SHA256 245e4fcad1549926b70167bf4d7faa4192c58473dd6a17d54214dd062ae6ea5b
 DIST genpatches-2.6.29-4.extras.tar.bz2 24601 RMD160 a35ada8d0c92112fb66d61effb852a33ca458519 SHA1 b2e007de4abe1ab8737cf7e68c7289335d8045bf SHA256 66955510d44be29a298c2b47b81e4a60a1ea772ca01ebec9c3524297ab31b309
+DIST genpatches-2.6.29-5.base.tar.bz2 54302 RMD160 8f400428e7cf45e01b5d55c372a761675f747566 SHA1 1a333f65458b5782846a9dbf3de8d667f0cb2663 SHA256 ee94fe1dcf4376e92f9ba3b2ee0094181797423fde9c92916fb8b9ee84216b4f
+DIST genpatches-2.6.29-5.extras.tar.bz2 24668 RMD160 c76d657aefd4df783991d70d5ffc60c9e61d4e91 SHA1 fe482457234c728381f387af4eb3789c3a1db2f5 SHA256 e6c0f62e63f7e924827a38672fc631e58950bf37c4c8f34028ab50a95a0f4133
 DIST geos_one-patches-2.6.29-1-p1.tar.bz2 637622 RMD160 b5247372c35226f0c2c83f53db0aafea7947fb24 SHA1 d7a72224da930e5073e1a2381fe4e1c8a1f7a0ba SHA256 e9e79cf1d49f87cee56f627d8570f2fd025b07a98139dae25470197ad2927b6b
 DIST geos_one-patches-2.6.29-4-p1.tar.bz2 1064932 RMD160 220e3b83b0b6d0b7397b1323415bf29badd453b6 SHA1 83d5eb4285980c90305fa386c7f7393c29718958 SHA256 e44690a745c6e4b24a1cde7832b45e9cc805ff06d9f546fcd99ec1d362626a28
 DIST hda_realtek_xa3530.diff.bz2 3246 RMD160 4e65261a1d90971ed9fc57662cb2f4e9868a59e6 SHA1 9b363b2e5511d06d9d3552475d5df0baa1e05db1 SHA256 801cf43fddf060beedf0dfe6b8944be0ee5e508b68246a5251d0a432dd314967
@@ -75,6 +77,7 @@ EBUILD geos_one-sources-2.6.28-r4.ebuild 4181 RMD160 f20fed4f3879cf05165fe597fde
 EBUILD geos_one-sources-2.6.28.ebuild 2724 RMD160 59ef67d038f90f54f7ad0224263fe3b8309db45d SHA1 f1e32cf7640706c4843679339d1774bbf89bed45 SHA256 dcb53c7bdbe81d51d74cc5f82e6efbade931fd33e962fd37cf71e7800d5d257c
 EBUILD geos_one-sources-2.6.29-r1.ebuild 1354 RMD160 2122591fcdf0472434fe2c5bbe7079f907844a11 SHA1 8f7e56dc5239f684383cd52dbf343119a348671f SHA256 9eb841861909b740cab2faac7d8e6612223a064a8fa9bc473083a40a19eb71a4
 EBUILD geos_one-sources-2.6.29-r2.ebuild 1354 RMD160 0d9b7c38040c63b3206d1063f4dfbee7714b56c7 SHA1 bce49ba40b6f3ae246480ccf5f987ec5a0b3dd97 SHA256 9e635f57bd28a8c2c6443f22c4e3038ba6eafb61fa5ff96f6a4f794bfd2da2b0
+EBUILD geos_one-sources-2.6.29-r3.ebuild 1354 RMD160 6be57aefa90a17268f068cd193f756742af57682 SHA1 6c10e9de8b95cf09c0b527648f9c4a982b5aecf7 SHA256 267f63d6814d799112687c6c806b4e0adb3c6a52b902e6f6dea21183809ca901
 EBUILD geos_one-sources-2.6.29.ebuild 1354 RMD160 368e1724b54059367036b1754e116c52f02cf176 SHA1 0cf8d0a347e65db24de14991894ce7c04e6e2a14 SHA256 097dc9f80d436ead181cd8453899de004ad5f3c3de447c53bfd04a134f2e02e6
 MISC ChangeLog 5718 RMD160 8b56fd669d96c5e9abd3f20f92977ffa08f8ede0 SHA1 03fe14a4b3ce77d533fe380bd8ec4dfee08a2a87 SHA256 4f132de30860a007beb9df13dd2da4d6860359e285e60dcc04622c39ab54dcac
 MISC metadata.xml 413 RMD160 7e4e48d47e48804072f4ce93e1948fda82433a90 SHA1 cd61cf36ba79f6635ab7b7957f31609ecf52cc90 SHA256 74fe6520890eaf800a1759f3e4f772fd0e433e5de9cf775a50c7af95b199518b