public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-07-18 15:45 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-07-18 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     74e42db3a62992d683c397475a2d70b6ca5ad213
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 15:43:33 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 15:43:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=74e42db3

[app-office/libreoffice-3.4.2.1] Add new version of lo for testing.

---
 app-office/libreoffice/Manifest                    |   94 ++++
 .../files/enable-startup-notification.diff         |  108 +++++
 app-office/libreoffice/files/env_log.diff          |   25 +
 .../libreoffice/files/fix-ooo-collision.diff       |   29 ++
 app-office/libreoffice/files/gentoo-3.3.1.diff     |   68 +++
 app-office/libreoffice/files/gentoo-3.3.2.diff     |   49 ++
 .../libreoffice/files/gentoo-pythonpath.diff       |   11 +
 .../files/libreoffice-3.3-libpng-1.5.diff          |   13 +
 .../libreoffice-3.3.0_libxmlsec_fix_extern_c.diff  |   38 ++
 ...libreoffice-3.3.1-neon_remove_SSPI_support.diff |   27 +
 .../files/libreoffice-3.3.2-bison25.diff           |   23 +
 .../files/libreoffice-3.4.1-salfix.diff            |   11 +
 .../files/libreoffice-libdb5-fix-check.diff        |   25 +
 .../libreoffice/files/scrap-pixmap-links.diff      |   37 ++
 app-office/libreoffice/files/sdext-presenter.diff  |   11 +
 app-office/libreoffice/files/wrapper.in            |    3 +
 app-office/libreoffice/libreoffice-3.4.2.1.ebuild  |  507 ++++++++++++++++++++
 17 files changed, 1079 insertions(+), 0 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
new file mode 100644
index 0000000..f144abb
--- /dev/null
+++ b/app-office/libreoffice/Manifest
@@ -0,0 +1,94 @@
+AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
+AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
+AUX gentoo-3.3.1.diff 2271 RMD160 ecd7bd0a6c34861ad3ef0bee8017a288286644c0 SHA1 0597c7e692873f128a898d1904445b9bbb06e6e8 SHA256 00b5b5fc5dbeafa18874575e78e6b3348d1293662b9c036ca918517a54edf1b6
+AUX gentoo-3.3.2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
+AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
+AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8
+AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
+AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
+AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
+AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
+AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
+AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
+AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
+AUX wrapper.in 102 RMD160 e11e046dc57bed812ba28e549145fdc3605ede8d SHA1 2e8cf54755431070b2352621eb4a91179a7cc543 SHA256 0cd747062eb7d6d4ecabbf8943575c688c273c7f258b5793a5cff42254ecb432
+DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160 aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c116116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
+DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
+DIST 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 376068 RMD160 b6c1b121ea1b3b1386a188e9f425a7288b1de865 SHA1 c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 SHA256 585c15b3b9ae0f3562d0aa35e15406adfd75357087d93009d4fa4ae034c6e983
+DIST 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz 540999 RMD160 2058bab6642460fdaee13993dd05da29aa516efa SHA1 e98d7149d6a20fdbb58cc0b79cb5e3f95ae304e4 SHA256 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
+DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
+DIST 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 315122 RMD160 e99bb5017c29657c3303d8810e21bf02d737c345 SHA1 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 SHA256 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03c9d0b21244cb1d4bf030b
+DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 RMD160 40a15ad43e92335558c868d66bca521e57d8c583 SHA1 0619ed3a89644bef318df67db12045b2b590585b SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
+DIST 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 728789 RMD160 c5590829fedb1934a4854fb5d9a85d443cd0f406 SHA1 1dcd28d3fc7af42ceb63006cdc56aa55ac66d355 SHA256 5ff7825fd09d0774b4f863ac77ed0d0349e4910de6c596e92c0af2ed9ecc0306
+DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 RMD160 6056046e4043e3e6a613029fe94f5f1728bebcd5 SHA1 8f949ae74a6d66278a595bd063f13e0ad196d14a SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
+DIST 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 20335 RMD160 b74ae68c08ef3bc579407337e2f4f527c4754d9c SHA1 f07e5f2744ebf5a5d1018f77b312a50bfd06a006 SHA256 71730ed23e9f00e7b93bc78538bbf7750be501f149bf04d1289c83cb222a2708
+DIST 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
+DIST 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz 1657246 RMD160 00d43701b92a6b7befacf082bbf01a4ecfe71275 SHA1 d55390a4242ad61f034291f1c854ab037e508272 SHA256 edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40
+DIST 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 3568559 RMD160 5b7c679ca59540a19cfabb22b923f11d77da84c0 SHA1 32d2298c78132a629ed2ac6c9830b4d52770ce02 SHA256 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4
+DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 RMD160 cf09fd0e4911275fddac1779cdbcfc6a7769eb5c SHA1 3232dd31859be4f7eb443c33e8e3287f394789a0 SHA256 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
+DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 RMD160 687165fa06edad490e6173f3b868e1e1afdfc2c9 SHA1 1acea86fd399ed7817879d36370d3d1f8b109050 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
+DIST 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip 867405 RMD160 83ada665ea92bd70cd8e9c73f0921e5790d6d9f1 SHA1 b67507ea7a48f7b68075cdfb2384784e516cb8ca SHA256 f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b
+DIST 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip 4706244 RMD160 be12115ab2d4fbb13851a54b2538d615a4055aab SHA1 b4a2aba7b27e5a10f40b980a50aedadeb63228b4 SHA256 d78e33142ae37a1e085c6d1b0f0171abcd8fa626acc6d6da24212d8193df5685
+DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 RMD160 0e6a6f183b1aafa43635ed9dfb74fc76761e65b4 SHA1 b92930010622906778f713fb8f0153fa0683d018 SHA256 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
+DIST 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz 463264 RMD160 d43dd826d64cc5a100618a9c7153b525510830f1 SHA1 180143410351cc87078c56e67649131219484f16 SHA256 b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
+DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 RMD160 229deeb4c533422466c16eaf490c08103be21fc8 SHA1 e393beea80d36ff27b732882c706826988a64f5c SHA256 e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
+DIST 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt 42487 RMD160 89a3237235bbdb473f6dc8dc1e90e996aefacdde SHA1 e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda SHA256 34a9812ae426dbca696fbd069276094517da0df78b5afb95a87b1c2daef97adb
+DIST 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt 4998642 RMD160 61bbecc48c94393b9c04fa9c11282dd55d42a871 SHA1 d2b6a076b40d8d517075e52220ddd8f89f655c8f SHA256 f15b13b947d8690bf05c4dc4cb04ab89297565ccddf02cce37b831376151ba29
+DIST 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 14952999 RMD160 e807b51c007a80de843566c47f16149afeb03a5e SHA1 19bdd1cabba599e5b0ed6fb0efc446e860e021b0 SHA256 8da587c6870bb35719c64c5973cafe1ce3f834fb33f343d2293a56a58bf1ef1b
+DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 RMD160 db97e6581e875ede8cf895a63d2c689f1eae667f SHA1 60bca1db80e8cb5bd1621f79350b26a3a10360b2 SHA256 4745d5b571c79e1323044893f408d675527b4f641def3f2c2b204b5997604484
+DIST 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz 612842 RMD160 a0cfdade91eba06441faea5292c4653b128e4a67 SHA1 5149507aee5807c04c34a82b18bcd54a8cb61213 SHA256 d5547b963a890cbc0edd0e9286e3ccbf10a4cff3067891c8ce808d30402d58b8
+DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD160 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc12a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459047477000f2a619
+DIST 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt 4973419 RMD160 1f01d5f4d8be121bc3aaa5c5d69c9bbb50cfd912 SHA1 bf25bef71f72a4622089c85958bfd6c58d8516a6 SHA256 4eb76551b548c0e7fdc5048be8462ddb61dfb7bba4bbc23b46189356b4b0976c
+DIST 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt 4953938 RMD160 cf457953fd947bf7f60274377ef88124bb788108 SHA1 4fea33622d89c7ac62053e5ee3616cfe504e0f14 SHA256 2f0ac09043abf098335ca1aa4c8bdd1759a0fea6dea561d9a21cfa0d606378dc
+DIST 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 674912 RMD160 e900cb8670b8c430beaa45895fb474411cb1958d SHA1 f9940698840c8a8045677e8be68ab8580903e20a SHA256 b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00
+DIST 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz 7194574 RMD160 90c028196852e7e6a1b2dcf8647b88eeb232f0b9 SHA1 b97bfb0e3e32f4e4857847d5fb5658202b730e62 SHA256 0647e762eb3c31f871c3d056fb7c907b2917a5b183580d434f15b2d9e0047791
+DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RMD160 a46ebbc4915dd871891c8461a331dd0804b61101 SHA1 bb845c3de2bb7ad93dddb2c752247ec91475a947 SHA256 d1708a3a9a0d08b1cde1e9d95de950c2f18fffc3ca41413c06b3ed3cae34a5f5
+DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e248ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545fef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
+DIST 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 89218 RMD160 45084e33b514ad9fe4b6e6b4693891a19666764f SHA1 bddc19fc2f1879f0fbde66a13b58ae1370e4dc25 SHA256 abeaed31fe3cf0ddab892492e3cc4179181ffb50d9c18d5f16bd574a13f42c3d
+DIST 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 56041 RMD160 fbf2fc7ec950ac7282b50ee5fbe0d9c9426c1894 SHA1 72a838242dfe8089fbe08e143bbe28a19a0fa396 SHA256 deb9897f2c48a8c921bec4d72a98b506d86f3a69e35d9439e0896ca8ee1a8563
+DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9fb0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
+DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 RMD160 3235b45b4065750b0b2df4735a57ca1f815dfc69 SHA1 a637c0c3ad3be32d6814972e1c45e547c5f6359d SHA256 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
+DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160 f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c6801c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3
+DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 RMD160 61672340e92957a5b72cddddcfcbf56d9602842c SHA1 47b58e0ef2d856df26372a7061ae43fae6e08051 SHA256 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
+DIST a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html 44798 RMD160 4242fd0c126dc5d2d7edc1f66a0565bf42812a7e SHA1 e5fb08ef4f0f19018ba4b397569edb5fa1c916c7 SHA256 05e6fddefb41a3a675a719c597bf0c44d2a4116d5978d02db8a32cca5f405672
+DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859
+DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 923870cf88023713a492e0a5c5d5707ec21d8739 SHA1 2d49e11b0b711970f494294dc3698f05eb294853 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
+DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
+DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4
+DIST b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 11922684 RMD160 70435964d18c4b3c633dd50225c177ca4546269a SHA1 4ad95f5d07eae50dc4f95b04eb900c39e202fd21 SHA256 2c3ed36476e1279ba35d7c675961bfa9c40b1360153472e80508a99963c8d46c
+DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 RMD160 ecf14c46ddf095734752ef260134c97b1772be57 SHA1 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b SHA256 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
+DIST bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 13176 RMD160 df5850e54a1049328050d6a0c46a2d109a9827d0 SHA1 cef151475872853a9f0b8e3ce6c65d829403008f SHA256 9bb0f3d57c170a6833c3aec020ec52b6c7280d26bf42c9134773c54cd238ac75
+DIST c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 686207 RMD160 1d5d88a8521eab43a57f270550bb654c8c980b32 SHA1 7c36232506c5cfc911b2e2edc44a1841a74630f5 SHA256 3be3b80c0151fbc69bc93767e952cf4bfbe61874328b1c979126bbbcf1e75da5
+DIST ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz 1324547 RMD160 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546 SHA1 e36555ed4e13a8109bfdb5a8c621de6d581f5ab7 SHA256 9cdea85d1ee40160cf48fc482fbd9038b07b47d909f2091039338d39b0bb7d2f
+DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051dfd775b66c7681c212be6a SHA1 626731cb89e69d864d0f52a571f71f44d90db394 SHA256 c8e14bb686e113b126dc802d922fbafcf8fca592ea230ffc07c4672a3ab0a979
+DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 RMD160 d5b50ff1bcb09efd7c1f4167f2d0d38065ba0166 SHA1 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 SHA256 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
+DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 RMD160 aec803e586e247ddbc39557090924988035d306c SHA1 65dfba9970bb862d09c1f9e636b86b22f05d3936 SHA256 e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
+DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175 RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8c46e02fadd5a01e6272f
+DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea SHA1 43a7ff11dd15370d456b20a093e1ee81279163a0 SHA256 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
+DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
+DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
+DIST fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz 1117561 RMD160 6810d86d974524e6627076e6530a703d62039160 SHA1 55e08ee78c15de417cbfccb9e748747095994886 SHA256 066b786ac12f75940a5b8ead444c824460f53feb6f6161a110dcf16efd5c7de3
+DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
+DIST libreoffice-artwork-3.4.2.1.tar.bz2 13540850 RMD160 96d9d3c1ac5b4912b4f73e4d5286d2ea1ac26fef SHA1 002348dd49d7d653aac40a61981139a8f6adbbf8 SHA256 a2a8c608d44a42610541f3a73bd41e6bdf5048daa50a175dc20690e3b7bd68d5
+DIST libreoffice-base-3.4.2.1.tar.bz2 2070040 RMD160 bf7e5ed470d115092e07e1fac5722d74ff66b00e SHA1 7c5f989ae6ed2ca1d7eaebbab51ec73422ddf102 SHA256 146e3716f82f639589e3e556af7bb299a7e3114c19539b06357b2be2542e54c3
+DIST libreoffice-bootstrap-3.4.2.1.tar.bz2 2712277 RMD160 6673b15ba6383799575bed954177edfae736a6ee SHA1 086f0dd03734f3b16e9e00c73e6123ac83f814a1 SHA256 e90a8b41fa3669d25140846fa7168ea8e951fbde1dde15d32911915bc117422d
+DIST libreoffice-calc-3.4.2.1.tar.bz2 9516379 RMD160 86f70c81ca6d6e8237bf73f272d4c3ab5228c3a4 SHA1 869d5ffb27a9216af8afc965923f1a037966756b SHA256 7f7ed160fe16af7ba79714d677a2f40a4a753a2f3876858ed432e25ce774e7bf
+DIST libreoffice-components-3.4.2.1.tar.bz2 5094962 RMD160 12db542294ed890d365fb283016f956ff24e86f7 SHA1 6e70ecd09306271a29efe365ed5ce7c62dbd3450 SHA256 da0646303e41159b65d7b1ae8adbd8f55b49eb3b7607b022b74a09a0883421a0
+DIST libreoffice-extensions-3.4.2.1.tar.bz2 4216447 RMD160 ff7694010ab8cfbdf01d8a3767dbfd4e5e9d7860 SHA1 d9aa620fdec624e2cbc9d24e1b4f10e91dadda5a SHA256 74dbcc4ad7901746497ee7dbc3c5ff05e6b927ab934390ee416fb50f01b39291
+DIST libreoffice-extras-3.4.2.1.tar.bz2 38641799 RMD160 e8f0a7775fda7694101f8f230b87dc8773b45c79 SHA1 6dd2f2290161c5f959b08bf8a4e07bf0f243067d SHA256 09cee50cc9092bfc8dad6a422d110c74bdfe506b22b221e78224bcdaff40438b
+DIST libreoffice-filters-3.4.2.1.tar.bz2 11776964 RMD160 983821c3b534bbb4924680b0890c63227ac35425 SHA1 4b7b2f0907c276c0c51bbbe9e2ffaeb515c56518 SHA256 58243eae9e172f3a72b002c91c9065bf76121ee05f974d6c3cdec01452932e4f
+DIST libreoffice-help-3.4.2.1.tar.bz2 1845924 RMD160 85c12f0a7e2fe7f4412ae0c2b510a0f1c49b2ab1 SHA1 2cde0d347e2c4b45a96c963a8d8cba80b16dbcc7 SHA256 52c6bee93679ecae72a71514cf60b41f912b7c2346816c009cca818c1b68bfdc
+DIST libreoffice-impress-3.4.2.1.tar.bz2 2651094 RMD160 b7e42578528941d8e31b9bee86a4331c68d5a797 SHA1 1de86ff58fe7f2d7132333808838c092fa7c57a5 SHA256 f7d40c1d8ffa6c5eac691ac9a660f64c6baa6497d442a1a9146b9ca5a6d0aa90
+DIST libreoffice-libs-core-3.4.2.1.tar.bz2 15591092 RMD160 cbf78085ae87286a3a2603a1e5de63900755e6f4 SHA1 6066df73d40153b5edd273415f258a96d2ece3cc SHA256 36d71820ff0708fddfa522c5531bee598e7b8b8a995e1e689939b3300ca787f7
+DIST libreoffice-libs-extern-3.4.2.1.tar.bz2 637395 RMD160 7599ed65bf089bb0d5aeae2d318d8443f4690679 SHA1 b5c317e39798c29a78532e6b0a9d77c874a98f0b SHA256 772b734b12adf3b249e97304d638a5ccc8ff13e82e0f9787c94ca8b45c7115c6
+DIST libreoffice-libs-extern-sys-3.4.2.1.tar.bz2 40014925 RMD160 56f959cd387dc345df84033fc88d5b0f8c2e5714 SHA1 eb483c6e5387dfb2eacd90bef53b13cd928f5abe SHA256 27c7677c841f05f1a6aa94ad3752961f6790d584e0960445a3deb2f179345b2f
+DIST libreoffice-libs-gui-3.4.2.1.tar.bz2 10855476 RMD160 324094f32e2f8434877238a3d25232828df2b3c6 SHA1 e34fce477c229483b864617dcc5a1ca13917d546 SHA256 5c02302dfe45f0ef0292e2e93783c6f976f297260d3381b2d01e90dc61ea50b3
+DIST libreoffice-postprocess-3.4.2.1.tar.bz2 50763 RMD160 25057eeef614cf0f0182b93cb0ca79c76dc41f9e SHA1 5c2b9d9251e607ff28141bced3c77afae8a6a22f SHA256 087a974f71260b98b77482fdaa3c33085fed8f11892cf447b54335a32d53ab82
+DIST libreoffice-sdk-3.4.2.1.tar.bz2 1721580 RMD160 68960a750216d97725fc54fa7200890cc2c8be65 SHA1 e001dac22a608d7ce3233e975faecacd977fb158 SHA256 f23fc59c4aaf85bdd2a5b74fbcb407a9d401d3546b1e946d6417198a1895564f
+DIST libreoffice-testing-3.4.2.1.tar.bz2 50845925 RMD160 c4fff88faff26b3c68d193db484ba605abb56008 SHA1 1989b7dca5d85e0374b133fdac7d1100a08374d0 SHA256 e54f175be44afa47a3aa9225de36c6665869b64c668ac4ee80acfbc5354eabd5
+DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013eaec0e3de7f876f1d052d712 SHA1 213f44367b99aa548fa6f36a8ff134dbd9d593c5 SHA256 7efe8a080ac46907331ffcbbdbf345c12331d129cc727a23ebd516d1f8efd693
+DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
+DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
+DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+EBUILD libreoffice-3.4.2.1.ebuild 19147 RMD160 d89b0d0360a028f3a2b12ddb59453086c8f1f80b SHA1 44b8ecb3e6ca46b383d51a9c456bbe14f8243fb7 SHA256 232bc808918c8f3c204189ab7a93f56ce6b4f9360d496d96aeb5734e677d6be6

diff --git a/app-office/libreoffice/files/enable-startup-notification.diff b/app-office/libreoffice/files/enable-startup-notification.diff
new file mode 100644
index 0000000..39e1172
--- /dev/null
+++ b/app-office/libreoffice/files/enable-startup-notification.diff
@@ -0,0 +1,108 @@
+--- desktop/base.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/base.desktop.in.in	2010-03-25 14:23:29.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-base@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Database;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
+ _Name=OpenOffice.org Base
+ _GenericName=Database
+--- desktop/calc.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/calc.desktop.in.in	2010-03-25 14:23:36.000000000 +0200
+@@ -7,7 +7,7 @@
+ Type=Application
+ InitialPreference=6
+ Categories=Office;Spreadsheet;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/csv;application/excel;application/tab-separated-values;application/x-123;application/x-dos_ms_excel;application/x-excel;application/x-ms-excel;application/x-msexcel;text/comma-se
 parated-values;text/tab-separated-values;text/x-comma-separated-values;
+ _Name=OpenOffice.org Calc
+ _GenericName=Spreadsheet
+--- desktop/draw.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/draw.desktop.in.in	2010-03-25 14:23:44.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-draw@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Graphics;VectorGraphics;
+-StartupNotify=false
++StartupNotify=true
+ InitialPreference=6
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.stardivision.draw;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
+ _Name=OpenOffice.org Draw
+--- desktop/impress.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/impress.desktop.in.in	2010-03-25 14:23:52.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-impress@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Presentation;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
+ InitialPreference=5
+ _Name=OpenOffice.org Impress
+--- desktop/math.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/math.desktop.in.in	2010-03-25 14:24:02.000000000 +0200
+@@ -7,7 +7,7 @@
+ Icon=ooo-math@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;Math;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.stardivision.math;application/vnd.sun.xml.math;text/mathml;
+ _Name=OpenOffice.org Math
+ _GenericName=Formula
+--- desktop/ooo-extension-manager.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/ooo-extension-manager.desktop.in.in	2010-03-25 14:24:10.000000000 +0200
+@@ -5,7 +5,7 @@
+ Exec=unopkg@OOO_BINSUFFIX@ gui %U
+ NoDisplay=true
+ Type=Application
+-StartupNotify=false
++StartupNotify=true
+ Categories=X-SuSE-Core-Office;Office;
+ MimeType=application/vnd.openofficeorg.extension;
+ Name=OpenOffice.org Extension Manager
+--- desktop/startcenter.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/startcenter.desktop.in.in	2010-03-25 14:24:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-gulls@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;X-SuSE-Core-Office;
+-StartupNotify=false
++StartupNotify=true
+ InitialPreference=5
+ _Name=OpenOffice.org
+ _GenericName=Office
+--- desktop/template.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/template.desktop.in.in	2010-03-25 14:24:27.000000000 +0200
+ Icon=ooo-gulls@OOO_BINSUFFIX@
+ Type=Application
+ Categories=X-SuSE-Core-Office;Office;
+-StartupNotify=false
++StartupNotify=true
+ _Name=LibreOffice
+ _GenericName=Office Suite
+--- desktop/web.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/web.desktop.in.in	2010-03-25 14:24:33.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-web@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Network;WebDevelopment;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/vnd.oasis.opendocument.text-web;
+ _Name=OpenOffice.org Writer/Web
+ _GenericName=Web Page Creation
+--- desktop/writer.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
++++ desktop/writer.desktop.in.in	2010-03-25 14:24:39.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=ooo-writer@OOO_BINSUFFIX@
+ Type=Application
+ Categories=Office;WordProcessor;
+-StartupNotify=false
++StartupNotify=true
+ MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
+ InitialPreference=5
+ _Name=OpenOffice.org Writer

diff --git a/app-office/libreoffice/files/env_log.diff b/app-office/libreoffice/files/env_log.diff
new file mode 100644
index 0000000..908169a
--- /dev/null
+++ b/app-office/libreoffice/files/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/libreoffice/files/fix-ooo-collision.diff b/app-office/libreoffice/files/fix-ooo-collision.diff
new file mode 100644
index 0000000..5bdc5c2
--- /dev/null
+++ b/app-office/libreoffice/files/fix-ooo-collision.diff
@@ -0,0 +1,29 @@
+--- bin/package-ooo.orig	2010-11-29 20:16:08.700004578 +0100
++++ bin/package-ooo	2010-11-29 20:20:47.972004579 +0100
+@@ -104,12 +104,12 @@
+ ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
+ 
+ # no man-page so ...
+-if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
++if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva" -a "z$VENDORNAME" != "zGentoo"; then
+     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
+     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
+ fi
+ 
+-if test "z$VENDORNAME" = "zMandriva"; then
++if test "z$VENDORNAME" = "zMandriva" -o "z$VENDORNAME" = "zGentoo"; then
+     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
+     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
+ fi
+@@ -210,9 +210,9 @@
+ 	done
+ 	
+ 	# shared MIME info
+-	mkdir -p $PREFIX/share/mime/packages
++	mkdir -p $DATADIR/mime/packages
+ 	cd $TOOLSDIR/desktop
+-	cp openoffice.xml $PREFIX/share/mime/packages
++	cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml
+ 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
+ 	   which update-mime-database >/dev/null 2>&1 ; then
+ 	    update-mime-database /usr/share/mime || :

diff --git a/app-office/libreoffice/files/gentoo-3.3.1.diff b/app-office/libreoffice/files/gentoo-3.3.1.diff
new file mode 100644
index 0000000..8f0bcc1
--- /dev/null
+++ b/app-office/libreoffice/files/gentoo-3.3.1.diff
@@ -0,0 +1,68 @@
+--- distro-configs/Gentoo.conf.in
++++ distro-configs/Gentoo.conf.in
+@@ -1,5 +1,3 @@
+---disable-fontooo
+---disable-qadevooo
+ --enable-neon
+ --enable-xrender-link
+ --with-external-dict-dir=/usr/share/myspell
+--- patches/dev300/apply 
++++ patches/dev300/apply
+@@ -1687,16 +1687,8 @@
+ [ GentooOnly ]
+ SectionOwner => aprosky
+ 
+-# Allow build to proceed with PaX enabled
+-gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs
+ 64bit-jdk-server-paths.diff, i#65974, hmth
+-# use IBM j9vm over IBM classic JVM
+-ibm-j9vm.diff, hmth
+-# system db check
+-system-db-check.diff, i#65979, hmth
+-# User ~/.ooo3 as user dir
+-scp2-user-config-ooo3.diff, pmladek
+ # default inc/lib
+ config_office-XINC-XLIB-defaults.diff, i#65976
+ # Sandbox problem with wrong path
+--- configure.in 
++++ configure.in 
+@@ -1326,12 +1326,18 @@
+ 	done
+     fi
+     SUNTEMPLATES_LANG=
+-    # check whether the langs are requested at all
+-    for lang in $wanted_sun_templates ; do
+-        if test -n "`echo $with_lang | grep "$lang"`" ; then
+-                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+-        fi
+-    done
++
++    # --with-lang="" now used for en-US
++    if test "z$with_lang" = "z" ; then
++        SUNTEMPLATES_LANG="en-US"
++    else
++        # check whether the langs are requested at all
++        for lang in $wanted_sun_templates ; do
++	    if test -n "`echo $with_lang | grep "$lang"`" ; then
++		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++	    fi
++        done
++    fi
+     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+ fi
+ AC_SUBST(SUNTEMPLATES_LANG)
+--- bin/package-ooo
++++ bin/package-ooo
+@@ -126,8 +126,8 @@
+ fi
+ 
+ # create bash completion
+-mkdir -p $OODESTDIR/etc/bash_completion.d
+-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
++mkdir -p $SYSCONFDIR/bash_completion.d
++$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
+ if test "$COMPAT_OOWRAPPERS" = "YES" ; then
+     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+ fi
+

diff --git a/app-office/libreoffice/files/gentoo-3.3.2.diff b/app-office/libreoffice/files/gentoo-3.3.2.diff
new file mode 100644
index 0000000..2a4b293
--- /dev/null
+++ b/app-office/libreoffice/files/gentoo-3.3.2.diff
@@ -0,0 +1,49 @@
+--- distro-configs/Gentoo.conf.in
++++ distro-configs/Gentoo.conf.in
+@@ -1,5 +1,3 @@
+---disable-fontooo
+---disable-qadevooo
+ --enable-neon
+ --enable-xrender-link
+ --with-external-dict-dir=/usr/share/myspell
+--- configure.in 
++++ configure.in 
+@@ -1326,12 +1326,18 @@
+ 	done
+     fi
+     SUNTEMPLATES_LANG=
+-    # check whether the langs are requested at all
+-    for lang in $wanted_sun_templates ; do
+-        if test -n "`echo $with_lang | grep "$lang"`" ; then
+-                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+-        fi
+-    done
++
++    # --with-lang="" now used for en-US
++    if test "z$with_lang" = "z" ; then
++        SUNTEMPLATES_LANG="en-US"
++    else
++        # check whether the langs are requested at all
++        for lang in $wanted_sun_templates ; do
++	    if test -n "`echo $with_lang | grep "$lang"`" ; then
++		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++	    fi
++        done
++    fi
+     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
+ fi
+ AC_SUBST(SUNTEMPLATES_LANG)
+--- bin/package-ooo
++++ bin/package-ooo
+@@ -126,8 +126,8 @@
+ fi
+ 
+ # create bash completion
+-mkdir -p $OODESTDIR/etc/bash_completion.d
+-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
++mkdir -p $SYSCONFDIR/bash_completion.d
++$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
+ if test "$COMPAT_OOWRAPPERS" = "YES" ; then
+     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+ fi
+

diff --git a/app-office/libreoffice/files/gentoo-pythonpath.diff b/app-office/libreoffice/files/gentoo-pythonpath.diff
new file mode 100644
index 0000000..4714b0a
--- /dev/null
+++ b/app-office/libreoffice/files/gentoo-pythonpath.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/libreoffice/files/libreoffice-3.3-libpng-1.5.diff b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
new file mode 100644
index 0000000..d0ca2ed
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
@@ -0,0 +1,13 @@
+--- desktop/unx/source/splashx.c.ark	2011-01-16 20:25:10.846685172 +0100
++++ desktop/unx/source/splashx.c	2011-01-16 20:27:12.673351839 +0100
+@@ -137,8 +137,8 @@ int splash_load_bmp( const char *filenam
+                   PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL);
+ 
+     bitmap_rows = png_get_rows( png_ptr, info_ptr );
+-    width = info_ptr->width;
+-    height = info_ptr->height;
++    width = png_get_image_width( png_ptr, info_ptr );
++    height = png_get_image_height( png_ptr, info_ptr );
+ 
+ #if 0
+     {

diff --git a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
new file mode 100644
index 0000000..168d272
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
@@ -0,0 +1,38 @@
+--- libxmlsec/makefile.mk.ORIGINAL	2010-11-11 09:35:21.000000000 -0600
++++ libxmlsec/makefile.mk	2011-02-13 03:13:41.496866392 -0600
+@@ -67,7 +67,8 @@
+    xmlsec1-noverify.patch \
+    xmlsec1-mingw32.patch \
+    xmlsec1-mingw-keymgr-mscrypto.patch \
+-   xmlsec1-vc10.patch
++   xmlsec1-vc10.patch \
++   xmlsec1-1.2.14_fix_extern_c.patch
+ 
+ ADDITIONAL_FILES= \
+     include$/xmlsec$/mscrypto$/akmngr.h \
+--- libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.ORIGINAL	1969-12-31 18:00:00.000000000 -0600
++++ libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch	2011-02-13 03:11:34.740594681 -0600
+@@ -0,0 +1,23 @@
++--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL	2009-12-05 15:19:18.000000000 -0600
+++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h	2011-02-13 03:09:42.917240245 -0600
++@@ -11,16 +11,16 @@
++ #ifndef __XMLSEC_H__
++ #define __XMLSEC_H__    
++ 
++-#ifdef __cplusplus
++-extern "C" {
++-#endif /* __cplusplus */ 
++-
++ #include <libxml/tree.h>
++ 
++ #include <xmlsec/version.h>
++ #include <xmlsec/exports.h>
++ #include <xmlsec/strings.h>
++ 
+++#ifdef __cplusplus
+++extern "C" {
+++#endif /* __cplusplus */ 
+++
++ /***********************************************************************
++  *
++  * Basic types to make ports to exotic platforms easier

diff --git a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff
new file mode 100644
index 0000000..4230374
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff
@@ -0,0 +1,27 @@
+--- ucb/source/ucp/webdav/NeonSession.cxx
++++ ucb/source/ucp/webdav/NeonSession.cxx
+@@ -253,9 +253,6 @@
+ 
+ // -------------------------------------------------------------------
+ extern "C" int NeonSession_NeonAuth( void *       inUserData,
+-#ifdef NE_FEATURE_SSPI
+-                                     const char * inAuthProtocol,
+-#endif
+                                      const char * inRealm,
+                                      int          attempt,
+                                      char *       inoutUserName,
+@@ -322,14 +319,6 @@
+ 
+     bool bCanUseSystemCreds = false;
+ 
+-#ifdef NE_FEATURE_SSPI
+-    bCanUseSystemCreds
+-        = (attempt == 0) && // avoid endless loops
+-          ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
+-          ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
+-            ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
+-#endif
+-
+     int theRetVal = pListener->authenticate(
+                             rtl::OUString::createFromAscii( inRealm ),
+                             theSession->getHostName(),

diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
new file mode 100644
index 0000000..869b6c8
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
@@ -0,0 +1,23 @@
+--- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
++++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
+@@ -4338,7 +4338,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------
+-void OSQLParser::error(sal_Char *fmt)
++void OSQLParser::error(const sal_Char *fmt)
+ {
+ 	if(!m_sErrorMessage.getLength())
+ 	{
+--- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
++++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
+@@ -233,7 +233,7 @@
+         // returns the type for a parameter in a given function name
+         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
+ 
+-        void error(sal_Char *fmt);
++        void error(const sal_Char *fmt);
+         int SQLlex();
+ #ifdef YYBISON
+         void setParseTree(OSQLParseNode * pNewParseTree);
+

diff --git a/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff b/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff
new file mode 100644
index 0000000..90df8db
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff
@@ -0,0 +1,11 @@
+--- sal/qa/osl/security/osl_Security.cxx.orig	2011-02-24 19:36:38.704013640 +0100
++++ sal/qa/osl/security/osl_Security.cxx	2011-02-24 19:38:50.580013586 +0100
+@@ -342,8 +342,6 @@
+ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser);
+ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent);
+ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserName);
+-CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHomeDir);
+-CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getConfigDir);
+ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::isAdministrator);
+ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle);
+ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile);

diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
new file mode 100644
index 0000000..0c59f02
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
@@ -0,0 +1,25 @@
+--- configure.in.orig	2011-01-13 21:12:40.420005851 +0100
++++ configure.in	2011-01-13 21:15:23.680008513 +0100
+@@ -4456,16 +4456,17 @@
+        else return 1;
+ }
+     ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
+-    DB_LIB=
+-    for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
+-        AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
+-            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
++    save_LIBS="$LIBS"
++    for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
++        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] ,
++            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ]
+             )
+         )
+     done
+     if test -z "$DB_LIB" ; then 
+-        AC_MSG_ERROR([db not installed or functional])
++        AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+     fi
++    LIBS="$save_LIBS"
+     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ else
+     AC_MSG_RESULT([internal])

diff --git a/app-office/libreoffice/files/scrap-pixmap-links.diff b/app-office/libreoffice/files/scrap-pixmap-links.diff
new file mode 100644
index 0000000..69cfbbe
--- /dev/null
+++ b/app-office/libreoffice/files/scrap-pixmap-links.diff
@@ -0,0 +1,37 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -212,14 +212,6 @@
+ 	    done
+ 	done
+ 
+-	# create symlinks below share/pixmaps to keep the backward compatibility
+-	pixmapsdir=$PREFIX/share/pixmaps
+-	mkdir -p $pixmapsdir
+-	cd $OODESTDIR$icondir/48x48/apps
+-	for icon in ooo-*.png ; do
+-	    ln -sf $icondir/48x48/apps/$icon $pixmapsdir
+-	done
+-	
+ 	# shared MIME info
+ 	mkdir -p $DATADIR/mime/packages
+ 	cd $TOOLSDIR/desktop
+--- bin/piece/desktop-support-app 
++++ bin/piese/desktop-support-app 
+@@ -75,17 +75,6 @@
+ 	test -n "$list_icon_dirs" && echo "%dir $icon_dir/$size/$category" >>files-$piece.txt
+     done
+ 
+-    # create symlink below share/pixmaps to keep the backward compatibility
+-    if test "$category" = "apps" ; then
+-	file=$DESTDIR/$icon_dir/48x48/apps/$icon_name.png
+-	if test -f $file ; then
+-	    filename=`basename $file`
+-	    pixmaps_dir=/usr/share/pixmaps
+-	    mkdir -p $DESTDIR$pixmaps_dir
+-	    ln -sf $icon_dir/48x48/apps/$filename $DESTDIR$pixmaps_dir
+-	    test -n "$DESTDIR" && echo "$pixmaps_dir/$filename" >>files-$piece.txt
+-	fi
+-    fi
+ }
+ 
+ case "$app" in

diff --git a/app-office/libreoffice/files/sdext-presenter.diff b/app-office/libreoffice/files/sdext-presenter.diff
new file mode 100644
index 0000000..b1eac7d
--- /dev/null
+++ b/app-office/libreoffice/files/sdext-presenter.diff
@@ -0,0 +1,11 @@
+--- sdext/source/presenter/makefile.mk	2011-01-24 20:03:50.376007211 +0100
++++ sdext/source/presenter/makefile.mk	2011-01-24 20:04:45.184007227 +0100
+@@ -295,7 +295,7 @@
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
++$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
+     @echo creating $@
+     @-$(MKDIRHIER) $(@:d)
+     $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@

diff --git a/app-office/libreoffice/files/wrapper.in b/app-office/libreoffice/files/wrapper.in
new file mode 100644
index 0000000..712ea60
--- /dev/null
+++ b/app-office/libreoffice/files/wrapper.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+unset PYTHONPATH
+exec @GENTOO_PORTAGE_EPREFIX@/usr/LIBDIR/libreoffice/program/soffice  "$@"

diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
new file mode 100644
index 0000000..b4c1b1c
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -0,0 +1,507 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.1.ebuild,v 1.7 2011/07/18 14:22:33 scarabeus Exp $
+
+EAPI=3
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+inherit base autotools check-reqs db-use eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 kde4-base multilib pax-utils prefix python toolchain-funcs
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+DEV_URI="http://download.documentfoundation.org/libreoffice/src"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+SRC_URI="odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )"
+
+# Shiny split sources with so many packages...
+MODULES="artwork base calc components extensions extras filters help
+impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
+ure writer translations"
+# split out as bootstrap is required to be done first
+SRC_URI+=" ${DEV_URI}/${PN}-bootstrap-${PV}.tar.bz2"
+for mod in ${MODULES}; do
+	SRC_URI+=" ${DEV_URI}/${PN}-${mod}-${PV}.tar.bz2"
+done
+unset mod MODULES2
+
+# addons
+ADDONS_SRC+=" ${ADDONS_URI}/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
+ADDONS_SRC+=" ${ADDONS_URI}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
+ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
+ADDONS_SRC+=" ${ADDONS_URI}/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"
+ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"
+ADDONS_SRC+=" ${ADDONS_URI}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
+ADDONS_SRC+=" ${ADDONS_URI}/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"
+ADDONS_SRC+=" ${ADDONS_URI}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
+ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
+ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
+ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
+ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
+SRC_URI+=" ${ADDONS_SRC}"
+
+# translations
+LANGUAGES="af ar as ast be_BY bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
+en en_GB en_ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk km
+kn kok ko ks ku ky lo lt lv mai mk ml mn mni mr ms my nb ne nl nn nr ns oc om or
+pa pap pl ps pt pt_BR ro ru rw sat sd sh si sk sl sq sr ss st sv sw_TZ ta te tg
+th ti tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
+for X in ${LANGUAGES} ; do
+	IUSE+=" linguas_${X}"
+done
+unset X
+
+# intersection of available linguas and app-dicts/myspell-* dictionaries
+SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb
+nl nn pl pt ru sk sl sv tn zu"
+for X in ${SPELL_DIRS} ; do
+	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+unset X
+
+TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
+TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
+TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
+TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
+TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
+TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
+TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
+TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
+SRC_URI+=" templates? ( ${TDEPEND} )"
+
+unset ADDONS_URI
+unset EXT_URI
+unset TDEPEND
+unset ADDONS_SRC
+
+IUSE+=" binfilter cups custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk offlinehelp opengl templates"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	app-text/libwpd:0.9[tools]
+	>=app-text/libwps-0.2.2
+	>=app-text/poppler-0.12.3-r3[xpdf-headers]
+	dev-libs/expat
+	>=dev-libs/glib-2.18
+	>=dev-libs/icu-4.0
+	>=dev-lang/perl-5.0
+	>=net-libs/neon-0.24.7
+	>=dev-libs/openssl-0.9.8g
+	dev-libs/redland[ssl]
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	>=media-libs/vigra-1.4
+	media-libs/libpng
+	media-libs/libwpg:0.2
+	>=sys-libs/db-4.3
+	virtual/jpeg
+	>=x11-libs/cairo-1.0.2
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	cups? ( net-print/cups )
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gnome? (
+		>=x11-libs/gtk+-2.10:2
+		gnome-base/gconf:2
+	)
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10
+	)
+	java? (
+		>=dev-java/bsh-2.0_beta4
+		dev-java/lucene:2.3
+		dev-java/lucene-analyzers:2.3
+	)
+	ldap? ( net-nds/openldap )
+	nsplugin? (
+		net-libs/xulrunner:1.9
+		>=dev-libs/nspr-4.6.6
+		>=dev-libs/nss-3.11-r1
+	)
+	opengl? ( virtual/opengl )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	java? ( >=virtual/jre-1.5 )
+	${SPELL_DIRS_DEPEND}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	>=dev-libs/libxml2-2.0
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	dev-util/pkgconfig
+	>=net-misc/curl-7.12
+	>=sys-apps/findutils-4.1.20-r1
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-libs/zlib
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
+	"${FILESDIR}/${PN}-libdb5-fix-check.diff"
+	"${FILESDIR}/${PN}-3.4.1-salfix.diff"
+)
+
+# Uncoment me when updating to eapi4
+# REQUIRED_USE="gnome? ( gtk )"
+
+S="${WORKDIR}/${PN}-bootstrap-${PV}"
+CONFFILE=${S}/distro-configs/Gentoo.conf
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+
+	# sys-libs/db version used
+	local db_ver=$(db_findver '>=sys-libs/db-4.3')
+
+	kde4-base_pkg_setup
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	if use custom-cflags; then
+		ewarn " You are using custom CFLAGS, which is NOT supported and can cause "
+		ewarn " all sorts of build and runtime errors. "
+		ewarn
+		ewarn " Before reporting a bug, please make sure you rebuild and try with "
+		ewarn " basic CFLAGS, otherwise the bug will not be accepted. "
+		ewarn
+	fi
+
+	if ! use java; then
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the LibreOffice 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 LibreOffice systray quickstarter to work "
+		ewarn " activate either the 'gtk' or 'gnome' use flags. "
+		ewarn
+	fi
+}
+
+src_unpack() {
+	local mod dest tmplfile tmplname
+
+	#first the bootstrap files
+	unpack "${PN}-bootstrap-${PV}.tar.bz2"
+
+	# and then all the separate modules
+	for mod in ${MODULES}; do
+		unpack "${PN}-${mod}-${PV}.tar.bz2"
+		mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+	done
+
+	# don't forget the wrapper...
+	cp "${FILESDIR}"/wrapper.in "${T}"
+	eprefixify "${T}"/wrapper.in
+
+	# copy extension templates; o what fun ...
+	if use templates; then
+		dest="${S}/extras/source/extensions"
+		mkdir -p "${dest}"
+
+		for template in ${TDEPEND}; do
+			if [[ ${template: -3:3} == oxt ]]; then
+				tmplfile="${DISTDIR}/$(basename ${template})"
+				tmplname="$(echo "${template}" | \
+					cut -f 2- -s -d - | cut -f 1 -d _)"
+				if [[ -f ${tmplname} && ! -f "${dest}/${tmplname}.oxt" ]]; then
+					cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	ewarn
+	ewarn " 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="12288" || CHECKREQS_DISK_BUILD="7144"
+	check_reqs
+
+	strip-linguas ${LANGUAGES}
+
+	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
+	export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g;s/_GB/en_GB/g;s/_ZA/en_ZA/g')
+
+	if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
+		export LINGUAS_OOO=""
+	else
+		# always build en-US as a fallback (needed for broken code / translations)
+		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
+	fi
+
+	# Some fixes for our patchset
+	use java && epatch "${FILESDIR}/sdext-presenter.diff"
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	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-lucene" >> ${CONFFILE}
+		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
+		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
+		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
+	fi
+
+	echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
+	echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE}
+
+	echo $(use_enable binfilter) >> ${CONFFILE}
+	echo $(use_enable cups) >> ${CONFFILE}
+	echo $(use_enable dbus) >> ${CONFFILE}
+	echo "--enable-cairo" >> ${CONFFILE}
+	echo "--with-system-cairo" >> ${CONFFILE}
+	echo $(use_enable eds evolution2) >> ${CONFFILE}
+	echo $(use_enable gnome gconf) >> ${CONFFILE}
+	echo $(use_enable gnome gio) >> ${CONFFILE}
+	echo "--disable-gnome-vfs" >> ${CONFFILE}
+	echo $(use_enable gnome lockdown) >> ${CONFFILE}
+	echo $(use_enable gstreamer) >> ${CONFFILE}
+	echo $(use_enable gtk systray) >> ${CONFFILE}
+	echo "--disable-kde" >> ${CONFFILE}
+	echo $(use_enable kde kde4) >> ${CONFFILE}
+	echo $(use_enable ldap) >> ${CONFFILE}
+	echo $(use_enable opengl) >> ${CONFFILE}
+	echo $(use_with opengl system-mesa-headers) >> ${CONFFILE}
+	echo $(use_with ldap openldap) >> ${CONFFILE}
+	echo $(use_with offlinehelp helppack-integration) >> ${CONFFILE}
+	echo $(use_with java) >> ${CONFFILE}
+	echo $(use_with templates sun-templates) >> ${CONFFILE}
+	echo $(use_enable debug crashdump) >> ${CONFFILE}
+	echo $(use_enable !debug strip-solver) >> ${CONFFILE}
+	echo $(use_enable odk) >> ${CONFFILE}
+
+	echo "--with-extension-integration" >> ${CONFFILE}
+	echo "--enable-ext-pdfimport" >> ${CONFFILE}
+	echo "--enable-ext-presenter-console" >> ${CONFFILE}
+	echo "--enable-ext-presenter-minimizer" >> ${CONFFILE}
+
+	# Misc stuff
+	echo "--prefix="${EPREFIX}"/usr" >> ${CONFFILE}
+	echo "--sysconfdir="${EPREFIX}"/etc" >> ${CONFFILE}
+	echo "--libdir="${EPREFIX}"/usr/$(get_libdir)" >> ${CONFFILE}
+	echo "--mandir="${EPREFIX}"/usr/share/man" >> ${CONFFILE}
+	echo "--docdir=${EPREFIX}/usr/share/doc/${PF}" >> ${CONFFILE}
+	echo "--with-lang=${LINGUAS_OOO}" >> ${CONFFILE}
+	echo "--with-external-dict-dir=/usr/share/myspell" >> ${CONFFILE}
+	echo "--with-external-hyph-dir=/usr/share/myspell" >> ${CONFFILE}
+	echo "--with-external-thes-dir=/usr/share/myspell" >> ${CONFFILE}
+	echo "--disable-crashdump" >> ${CONFFILE}
+	echo "--disable-epm" >> ${CONFFILE}
+	echo "--disable-dependency-tracking" >> ${CONFFILE}
+	echo "--disable-fetch-external" >> ${CONFFILE}
+	echo "--disable-graphite" >> ${CONFFILE}
+	echo "--disable-zenity" >> ${CONFFILE}
+	echo "--enable-xrender-link" >> ${CONFFILE}
+	echo "--with-external-tar=${DISTDIR}" >> ${CONFFILE}
+	echo "--with-system-boost" >> ${CONFFILE}
+	echo "--with-system-curl" >> ${CONFFILE}
+	echo "--with-system-cppunit" >> ${CONFFILE}
+	echo "--with-system-db" >> ${CONFFILE}
+	echo "--with-system-dicts" >> ${CONFFILE}
+	echo "--with-system-expat" >> ${CONFFILE}
+	echo "--with-system-hunspell" >> ${CONFFILE}
+	echo "--with-system-icu" >> ${CONFFILE}
+	echo "--with-system-libwpd" >> ${CONFFILE}
+	echo "--with-system-libwpg" >> ${CONFFILE}
+	echo "--with-system-libwps" >> ${CONFFILE}
+	echo "--with-system-libxslt" >> ${CONFFILE}
+	echo "--with-system-neon" >> ${CONFFILE}
+	echo "--with-system-openssl" >> ${CONFFILE}
+	echo "--with-system-redland" >> ${CONFFILE}
+	echo "--with-system-vigra" >> ${CONFFILE}
+	echo "--with-system-xrender-headers" >> ${CONFFILE}
+	echo "--with-system-zlib" >> ${CONFFILE}
+	echo "--with-unix-wrapper=libreoffice" >> ${CONFFILE}
+	echo "--with-vendor=Gentoo Foundation" >> ${CONFFILE}
+	echo "--without-afms" >> ${CONFFILE}
+	echo "--without-fonts" >> ${CONFFILE}
+	echo "--without-junit" >> ${CONFFILE}
+	echo "--without-myspell-dicts" >> ${CONFFILE}
+	echo "--without-ppds" >> ${CONFFILE}
+	echo "--without-stlport" >> ${CONFFILE}
+
+	use kde && export KDE4DIR="${KDEDIR}"
+	use kde && export QT4LIB="/usr/$(get_libdir)/qt4"
+
+	# Use multiprocessing by default now, it gets tested by upstream
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+	echo "--with-num-cpus=${JOBS}" >> ${CONFFILE}
+
+	# compiler flags
+	use custom-cflags || strip-flags
+	use debug || filter-flags "-g*"
+	# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
+	filter-flags "-O*"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		filter-flags "-fstack-protector"
+		filter-flags "-fstack-protector-all"
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
+	# 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"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk"
+
+	econf $(cat ${CONFFILE} |tr '\n' ' ') ${GTKFLAG}
+}
+
+src_compile() {
+	# Workaround for upstream download bug
+	touch src.downloaded
+	emake || die
+}
+
+src_install() {
+	local SIZE desk app
+
+	export PYTHONPATH=""
+
+	einfo "Preparing Installation"
+	emake DESTDIR="${D}" install || die
+
+	# Fix the permissions for security reasons
+	chown -RP root:0 "${ED}"
+
+	# Desktop files
+	cd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/
+	for desk in base calc draw impress javafilter math qstart startcenter writer; do
+		if [ "${desk}" = "javafilter" ] ; then
+			use java || { rm javafilter.desktop; continue; }
+		fi
+		mv ${desk}.desktop ${PN}-${desk}.desktop
+		sed -i -e s/libreoffice3.4/${PN}/g ${PN}-${desk}.desktop || die
+		sed -i -e s/libreoffice34/${PN}/g ${PN}-${desk}.desktop || die
+		domenu ${PN}-${desk}.desktop
+	done
+
+	# install icons
+	insinto /usr/share/icons/
+	doins -r "${S}"/sysui/desktop/icons/hicolor
+
+	# app icon names are too generic, have to make them unique
+	for SIZE in 16 32 48 128 ; do
+		cd "${ED}"/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+		for app in base calc draw impress main math startcenter writer ; do
+			mv ${app}.png ${PN}-${app}.png || die
+		done
+	done
+
+	# Install wrapper script
+	newbin "${T}/wrapper.in" ${PN} || die
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/${PN}" || die
+
+	# Cleanup after playing
+	rm "${ED}"/gid_Module_*
+
+}
+
+pkg_preinst() {
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-07-19 12:22 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-07-19 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4815cda9917a2e597bca6de6b87891855886cd4f
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 12:21:13 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 12:21:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=4815cda9

[app-office/libreoffice] Pass the configure phase. Use system libs where possible.

---
 app-office/libreoffice/Manifest                    |    3 +-
 .../libreoffice/files/libreoffice_options.txt      |  123 +++++++
 app-office/libreoffice/libreoffice-3.4.2.1.ebuild  |  376 +++++++++++--------
 3 files changed, 343 insertions(+), 159 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f6e09fe..2d64994 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,6 +10,7 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
+AUX libreoffice_options.txt 6251 RMD160 570a49fd590875388ac19b6b21c4d839e4266644 SHA1 b44a85a4676c2c01dc102c8b5893e3462f10c688 SHA256 d194118debf1c098a88b3396eca12dd7ea1a2eda76b3afd63599f2bdb1c39638
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
 AUX wrapper.in 102 RMD160 e11e046dc57bed812ba28e549145fdc3605ede8d SHA1 2e8cf54755431070b2352621eb4a91179a7cc543 SHA256 0cd747062eb7d6d4ecabbf8943575c688c273c7f258b5793a5cff42254ecb432
@@ -91,4 +92,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
 DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
 DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19096 RMD160 d5842ce8728df020a4e746ab5869278b1b54377c SHA1 8de5ee0c068c685b4662c877c511e3f0dff320f8 SHA256 41f5efa4be7e97399ac6ea06ebcf00ddc4fdd6bbfd1345f54f0465fa7884d020
+EBUILD libreoffice-3.4.2.1.ebuild 19585 RMD160 8c7ffc77e666bd574c424d775d15954ba76c3d6a SHA1 ecdeb6b0eda693ac6f29918b09e459c03ddd4d2c SHA256 651ff0c196cfa7f2bcc46b93726b37f5ab475c06064662020550d66bae8641a9

diff --git a/app-office/libreoffice/files/libreoffice_options.txt b/app-office/libreoffice/files/libreoffice_options.txt
new file mode 100644
index 0000000..2731e11
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice_options.txt
@@ -0,0 +1,123 @@
+  --enable-ext-barcode    Enables the Barcode extension.
+  --enable-ext-diagram    Enables the Diagram extension.
+  --enable-ext-google-docs
+                          Download and enables the Google Documents extension.
+  --enable-ext-hunart     Enables the Hungarian Cross-reference Toolbar
+                          extension.
+  --enable-ext-lightproof Enables the Lightproof extension.
+  --enable-ext-nlpsolver  Download and enables the NLPSolver extension.
+  --enable-ext-ct2n       Enables the ConvertTextToNumber extension.
+  --enable-ext-numbertext Enables the Numbertext extension.
+  --enable-ext-oooblogger Download and enables the OOo Blogger extension.
+  --enable-ext-report-builder
+                          Enables the build of the Report Builder extension.
+  --enable-ext-scripting-javascript
+                          Enables support for scripts in JavaScript.
+  --enable-ext-typo       Enables the Typography Toolbar extension.
+  --enable-ext-validator  Enables the Validator extension.
+  --enable-ext-watch-window
+                          Enables the Watch Window extension to Calc.
+  --enable-ext-wiki-publisher
+                          Enables the Wiki Publisher extension.
+  --disable-vba           Disables the vba compatibility feature.
+  --disable-activex-component
+                          Remove support for ActiveX embedding of LibO.
+  --disable-mathmldtd     Disable mathmldtd (useful for distributions that
+                          want to avoid packaging it).
+  --enable-layout         Enable the compilation and use of layout dialogs.
+  --disable-build-mozilla Use this option if you do not want to build the
+                          mozilla components from the mozilla source code but
+                          take precompiled zips.
+  --disable-nss-module    Whether to use provided NSS module.
+  --enable-lomenubar      Enable global menu support.
+
+Optional Packages:
+  --with-external-tar=<TARFILE PATH>
+                          Specify path to tarfiles manually.
+  --with-mozilla-version  Choose which version of mozilla to use while
+                          building mozilla. (default=1.7.5) Note that not all
+                          versions are supported.
+  --with-mozilla-toolkit  Choose which GUI toolkit to use while building
+                          mozilla components. (default=gtk2)
+  --with-lucene-core-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-lucene-analyzers-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-hsqldb-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-beanshell-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-codec-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-lang-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-httpclient-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-logging-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-servlet-api-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-system-jfreereport
+                          Use JFreeReport already on system.
+  --with-sac-jar=JARFILE  Specify path to jarfile manually.
+  --with-libxml-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-flute-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-jfreereport-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-liblayout-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libloader-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libformula-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-librepository-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libfonts-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libserializer-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libbase-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-saxon-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-external-libtextcat-data
+                          Use libtextcat data already on system.
+  --with-jdk-home         If you have installed JDK 1.3 or later on your
+                          system please supply the path here. Note that this
+                          is not the location of the Java binary but the
+                          location of the entire distribution.
+
+                          Usage:     --with-jdk-home=<absolute path to JDK home>
+
+  --with-gxx-include-path If you want to override the autodetected g++ include
+                          path.
+
+                          Usage:     --with-gxx-include-path=<absolute path to
+                                                                g++ include dir>
+
+  --with-java-target-version
+                          Generate class files that will work on JVMs with the
+                          specified version. For example, use
+                          --with-java-target-version=1.4 to make sure that the
+                          application will work with JVM 1.4 even when
+                          compiled with JDK 1.5.
+
+                          This option is ignored when you compile with gcj/gij.
+
+                          Usage:     --with-java-target-version=<jvm version>
+
+  --with-jvm-path         Use a specific JVM search path at runtime.
+
+                          Usage: --with-jvm-path=<absolute path to parent of jvm home>
+
+                          e. g.: --with-jvm-path=/usr/lib/
+                                 to find JRE/JDK in /usr/lib/jvm/
+
+  --with-ant-home         If you have installed Jakarta Ant on your system,
+                          please supply the path here. Note that this is not
+                          the location of the Ant binary but the location of
+                          the entire distribution.
+
+                          Usage:     --with-ant-home=<absolute path to Ant home>

diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
index fa2d273..c4cf965 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+=" ${DEV_URI}/${PN}-bootstrap-${PV}.tar.bz2"
 for mod in ${MODULES}; do
 	SRC_URI+=" ${DEV_URI}/${PN}-${mod}-${PV}.tar.bz2"
 done
-unset mod MODULES2
+unset mod
 
 # addons
 ADDONS_SRC+=" ${ADDONS_URI}/48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz"
@@ -118,7 +118,8 @@ unset EXT_URI
 unset TDEPEND
 unset ADDONS_SRC
 
-IUSE+=" binfilter cups custom-cflags dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk offlinehelp opengl templates"
+IUSE+=" binfilter cups custom-cflags dbus debug eds gnome graphite gstreamer
+gtk kde ldap mysql nsplugin odk offlinehelp opengl pch python templates webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -127,27 +128,29 @@ COMMON_DEPEND="
 	app-arch/zip
 	app-arch/unzip
 	>=app-text/hunspell-1.1.4-r1
+	app-text/mythes
 	app-text/libwpd:0.9[tools]
 	>=app-text/libwps-0.2.2
 	>=app-text/poppler-0.12.3-r3[xpdf-headers]
+	dev-db/unixODBC
 	dev-libs/expat
 	>=dev-libs/glib-2.18
 	>=dev-libs/icu-4.0
 	>=dev-lang/perl-5.0
-	>=net-libs/neon-0.24.7
 	>=dev-libs/openssl-0.9.8g
 	dev-libs/redland[ssl]
-	>=media-libs/freetype-2.1.10-r2
+	media-libs/freetype:2
 	>=media-libs/fontconfig-2.3.0
 	>=media-libs/vigra-1.4
 	media-libs/libpng
 	media-libs/libwpg:0.2
-	>=sys-libs/db-4.3
+	>=sys-libs/db-4.8
 	virtual/jpeg
 	>=x11-libs/cairo-1.0.2
 	x11-libs/libXaw
 	x11-libs/libXinerama
 	x11-libs/libXrandr
+	x11-libs/libXrender
 	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
@@ -161,17 +164,21 @@ COMMON_DEPEND="
 		>=media-libs/gst-plugins-base-0.10
 	)
 	java? (
+		dev-db/hsqldb
 		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.3
+		dev-java/lucene:3.0
 		dev-java/lucene-analyzers:2.3
+		dev-java/saxon
 	)
 	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c++ )
 	nsplugin? (
 		net-libs/xulrunner:1.9
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1
 	)
 	opengl? ( virtual/opengl )
+	webdav? ( net-libs/neon )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -188,24 +195,27 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	dev-util/cppunit
+	dev-util/dmake
 	>=dev-util/gperf-3
 	dev-util/intltool
 	dev-util/pkgconfig
+	media-gfx/sane-backends
 	>=net-misc/curl-7.12
 	>=sys-apps/findutils-4.1.20-r1
 	sys-devel/bison
 	sys-apps/coreutils
 	sys-devel/flex
 	sys-libs/zlib
-	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-proto/printproto
+	x11-proto/randrproto
 	x11-proto/xextproto
 	x11-proto/xineramaproto
 	x11-proto/xproto
 	java? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		=virtual/jdk-1.6*
 		>=dev-java/ant-core-1.7
+		dev-java/junit:4
 	)
 "
 
@@ -217,44 +227,51 @@ PATCHES=(
 )
 
 # Uncoment me when updating to eapi4
-# REQUIRED_USE="gnome? ( gtk )"
+# REQUIRED_USE="
+#	|| ( gtk gnome kde )
+#	gnome? ( gtk )
+#"
 
 S="${WORKDIR}/${PN}-bootstrap-${PV}"
-CONFFILE=${S}/distro-configs/Gentoo.conf
 
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver=$(db_findver '>=sys-libs/db-4.3')
-
 	kde4-base_pkg_setup
 
 	python_set_active_version 2
 	python_pkg_setup
 
 	if use custom-cflags; then
-		ewarn " You are using custom CFLAGS, which is NOT supported and can cause "
-		ewarn " all sorts of build and runtime errors. "
+		ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
+		ewarn "all sorts of build and runtime errors."
 		ewarn
-		ewarn " Before reporting a bug, please make sure you rebuild and try with "
-		ewarn " basic CFLAGS, otherwise the bug will not be accepted. "
+		ewarn "Before reporting a bug, please make sure you rebuild and try with"
+		ewarn "basic CFLAGS, otherwise the bug will not be accepted."
 		ewarn
 	fi
 
 	if ! use java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the LibreOffice functionality being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. "
+		ewarn "You are building with java-support disabled, this results in some"
+		ewarn "of the LibreOffice functionality being disabled."
+		ewarn "If something you need does not work for you, rebuild with"
+		ewarn "java in your USE-flags."
+		ewarn
+		ewarn "Some system java libraries will be provided by libreoffice"
+		ewarn "during the build. You should really reconsider enabling java"
+		ewarn "useflag"
 		ewarn
 	fi
 
-	if ! use gtk && ! use gnome; then
-		ewarn " If you want the LibreOffice systray quickstarter to work "
-		ewarn " activate either the 'gtk' or 'gnome' use flags. "
+	if ! use gtk; then
+		ewarn "If you want the LibreOffice systray quickstarter to work"
+		ewarn "activate the 'gtk' use flag."
 		ewarn
 	fi
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="512"
+	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
+	check_reqs
 }
 
 src_unpack() {
@@ -267,6 +284,8 @@ src_unpack() {
 	for mod in ${MODULES}; do
 		unpack "${PN}-${mod}-${PV}.tar.bz2"
 		mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+		# punt the empty dirs; it is annoying during debuging :)
+		rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
 	done
 
 	# don't forget the wrapper...
@@ -279,11 +298,11 @@ src_unpack() {
 		mkdir -p "${dest}"
 
 		for template in ${TDEPEND}; do
-			if [[ ${template: -3:3} == oxt ]]; then
+			if [[ ${template} == *oxt ]]; then
 				tmplfile="${DISTDIR}/$(basename ${template})"
 				tmplname="$(echo "${template}" | \
 					cut -f 2- -s -d - | cut -f 1 -d _)"
-				if [[ -f ${tmplname} && ! -f "${dest}/${tmplname}.oxt" ]]; then
+				if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
 					cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
 				fi
 			fi
@@ -292,16 +311,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	ewarn
-	ewarn " 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="12288" || CHECKREQS_DISK_BUILD="7144"
-	check_reqs
-
 	strip-linguas ${LANGUAGES}
 
 	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
@@ -314,107 +323,9 @@ src_prepare() {
 		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
 	fi
 
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	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-lucene" >> ${CONFFILE}
-		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
-		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
-		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
-	fi
-
-	echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
-	echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE}
-
-	echo $(use_enable binfilter) >> ${CONFFILE}
-	echo $(use_enable cups) >> ${CONFFILE}
-	echo $(use_enable dbus) >> ${CONFFILE}
-	echo "--enable-cairo" >> ${CONFFILE}
-	echo "--with-system-cairo" >> ${CONFFILE}
-	echo $(use_enable eds evolution2) >> ${CONFFILE}
-	echo $(use_enable gnome gconf) >> ${CONFFILE}
-	echo $(use_enable gnome gio) >> ${CONFFILE}
-	echo "--disable-gnome-vfs" >> ${CONFFILE}
-	echo $(use_enable gnome lockdown) >> ${CONFFILE}
-	echo $(use_enable gstreamer) >> ${CONFFILE}
-	echo $(use_enable gtk systray) >> ${CONFFILE}
-	echo "--disable-kde" >> ${CONFFILE}
-	echo $(use_enable kde kde4) >> ${CONFFILE}
-	echo $(use_enable ldap) >> ${CONFFILE}
-	echo $(use_enable opengl) >> ${CONFFILE}
-	echo $(use_with opengl system-mesa-headers) >> ${CONFFILE}
-	echo $(use_with ldap openldap) >> ${CONFFILE}
-	echo $(use_with offlinehelp helppack-integration) >> ${CONFFILE}
-	echo $(use_with java) >> ${CONFFILE}
-	echo $(use_with templates sun-templates) >> ${CONFFILE}
-	echo $(use_enable debug crashdump) >> ${CONFFILE}
-	echo $(use_enable !debug strip-solver) >> ${CONFFILE}
-	echo $(use_enable odk) >> ${CONFFILE}
-
-	echo "--with-extension-integration" >> ${CONFFILE}
-	echo "--enable-ext-pdfimport" >> ${CONFFILE}
-	echo "--enable-ext-presenter-console" >> ${CONFFILE}
-	echo "--enable-ext-presenter-minimizer" >> ${CONFFILE}
-
-	# Misc stuff
-	echo "--prefix="${EPREFIX}"/usr" >> ${CONFFILE}
-	echo "--sysconfdir="${EPREFIX}"/etc" >> ${CONFFILE}
-	echo "--libdir="${EPREFIX}"/usr/$(get_libdir)" >> ${CONFFILE}
-	echo "--mandir="${EPREFIX}"/usr/share/man" >> ${CONFFILE}
-	echo "--docdir=${EPREFIX}/usr/share/doc/${PF}" >> ${CONFFILE}
-	echo "--with-lang=${LINGUAS_OOO}" >> ${CONFFILE}
-	echo "--with-external-dict-dir=/usr/share/myspell" >> ${CONFFILE}
-	echo "--with-external-hyph-dir=/usr/share/myspell" >> ${CONFFILE}
-	echo "--with-external-thes-dir=/usr/share/myspell" >> ${CONFFILE}
-	echo "--disable-crashdump" >> ${CONFFILE}
-	echo "--disable-epm" >> ${CONFFILE}
-	echo "--disable-dependency-tracking" >> ${CONFFILE}
-	echo "--disable-fetch-external" >> ${CONFFILE}
-	echo "--disable-graphite" >> ${CONFFILE}
-	echo "--disable-zenity" >> ${CONFFILE}
-	echo "--enable-xrender-link" >> ${CONFFILE}
-	echo "--with-external-tar=${DISTDIR}" >> ${CONFFILE}
-	echo "--with-system-boost" >> ${CONFFILE}
-	echo "--with-system-curl" >> ${CONFFILE}
-	echo "--with-system-cppunit" >> ${CONFFILE}
-	echo "--with-system-db" >> ${CONFFILE}
-	echo "--with-system-dicts" >> ${CONFFILE}
-	echo "--with-system-expat" >> ${CONFFILE}
-	echo "--with-system-hunspell" >> ${CONFFILE}
-	echo "--with-system-icu" >> ${CONFFILE}
-	echo "--with-system-libwpd" >> ${CONFFILE}
-	echo "--with-system-libwpg" >> ${CONFFILE}
-	echo "--with-system-libwps" >> ${CONFFILE}
-	echo "--with-system-libxslt" >> ${CONFFILE}
-	echo "--with-system-neon" >> ${CONFFILE}
-	echo "--with-system-openssl" >> ${CONFFILE}
-	echo "--with-system-redland" >> ${CONFFILE}
-	echo "--with-system-vigra" >> ${CONFFILE}
-	echo "--with-system-xrender-headers" >> ${CONFFILE}
-	echo "--with-system-zlib" >> ${CONFFILE}
-	echo "--with-unix-wrapper=libreoffice" >> ${CONFFILE}
-	echo "--with-vendor=Gentoo Foundation" >> ${CONFFILE}
-	echo "--without-afms" >> ${CONFFILE}
-	echo "--without-fonts" >> ${CONFFILE}
-	echo "--without-junit" >> ${CONFFILE}
-	echo "--without-myspell-dicts" >> ${CONFFILE}
-	echo "--without-ppds" >> ${CONFFILE}
-	echo "--without-stlport" >> ${CONFFILE}
-
-	use kde && export KDE4DIR="${KDEDIR}"
-	use kde && export QT4LIB="/usr/$(get_libdir)/qt4"
-
-	# Use multiprocessing by default now, it gets tested by upstream
-	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
-	echo "--with-num-cpus=${JOBS}" >> ${CONFFILE}
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 
 	# compiler flags
 	use custom-cflags || strip-flags
@@ -428,15 +339,159 @@ src_configure() {
 		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
 	fi
 
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+	base_src_prepare
+	eautoreconf
+}
 
-	# Make sure gnome-users get gtk-support
-	local GTKFLAG="--disable-gtk"
-	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk"
+src_configure() {
+	local java_opts
+	local internal_libs
+	local extensions
+	local themes="default"
+	local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# ensure that qt4 and kdedir are properly located
+	if use kde; then
+		export KDE4DIR="${KDEDIR}"
+		export QT4LIB="${EPREFIX}/usr/$(get_libdir)/qt4"
+	fi
+
+	# expand themes we are going to build based on DE useflags
+	use gnome && themes+=" tango"
+	use kde && themes+=" oxygen"
+
+	# list the extensions we are going to build by default
+	extensions="
+		--enable-ext-pdfimport
+		--enable-ext-presenter-console
+		--enable-ext-presenter-minimizer
+	"
+
+	# Things that do not have gentoo packages
+	internal_libs+="
+		--without-system-altlinuxhyph
+		--without-system-lpsolve
+		--without-system-mdds
+	"
+
+	# When building without java some things needs to be done
+	# as internal libraries.
+	if ! use java; then
+		internal_libs+="
+			--without-system-lucene
+			--without-system-hsqldb
+			--without-system-beanshell
+		"
+	else
+		java_opts="
+			--with-ant-home=${ANT_HOME}
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-java-target-version=$(java-pkg_get-target)
+			--with-jvm-path=${EPREFIX}/usr/$(get_libdir)/
+			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+			--with-lucene-core-jar=$(java-pkg_getjar lucene lucene-core.jar)
+			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers lucene-analyzers.jar)
+		"
+	fi
 
-	econf $(cat ${CONFFILE} |tr '\n' ' ') ${GTKFLAG}
+	# TODO: create gentoo branding on the about/intro screens
+	# --with-about-bitmap="${FILESDIR}/gentoo-about.png"
+	# --with-intro-bitmap="${FILESDIR}/gentoo-intro.png"
+
+	# system headers/libs/...: enforce using system packages
+	#   only expections are mozilla and odbc/sane/xrender-header(s).
+	#   for jars the exception is db.jar controlled by --with-system-db
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+	# --disable-broffice: do not use brazillian brand just be uniform
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: use pretty font renderer (faster and nicer)
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-rpath: relative runtime path is not desired
+	# --disable-static-gtk: ensure that gtk is linked dynamically
+	# --disable-zenity: disable build icon
+	# --with-extension-integration: enable any extension integration support
+	# --with-{max-jobs,num-cpus}: ensuring parallel building
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --without-stlport: disable deprecated extensions framework
+	econf \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-db \
+		--with-system-dicts \
+		--enable-cairo \
+		--enable-fontconfig \
+		--enable-largefile \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-unix-qstart-libpng \
+		--enable-Xaw \
+		--enable-xrender-link \
+		--disable-broffice \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-online-update \
+		--disable-rpath \
+		--disable-static-gtk \
+		--disable-zenity \
+		--with-alloc=system \
+		--with-build-version="Gentoo official package" \
+		--with-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-max-jobs=${jobs} \
+		--with-num-cpus=${jobs} \
+		--with-theme="${themes}" \
+		--with-unix-wrapper=libreoffice \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-ppds \
+		--without-stlport \
+		$(use_enable binfilter) \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable eds evolution2) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable graphite) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk systray) \
+		$(use_enable java ext-scripting-beanshell) \
+		$(use_enable kde kde4) \
+		$(use_enable ldap) \
+		$(use_enable mysql ext-mysql-connector) \
+		$(use_enable nsplugin mozilla) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable pch) \
+		$(use_enable python) \
+		$(use_enable python ext-scripting-python) \
+		$(use_enable webdav neon) \
+		$(use_with java) \
+		$(use_with java junit) \
+		$(use_with ldap openldap) \
+		$(use_with mysql system-mysql-cppconn) \
+		$(use_with nsplugin system-mozilla libxul) \
+		$(use_with offlinehelp helppack-integration) \
+		$(use_with templates sun-templates) \
+		${internal_libs} \
+		${java_opts}
 }
 
 src_compile() {
@@ -450,23 +505,23 @@ src_install() {
 
 	export PYTHONPATH=""
 
-	einfo "Preparing Installation"
 	emake DESTDIR="${D}" install || die
 
 	# Fix the permissions for security reasons
-	chown -RP root:0 "${ED}"
+	use prefix || chown -RP root:0 "${ED}"
 
 	# Desktop files
-	cd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/
-	for desk in base calc draw impress javafilter math qstart startcenter writer; do
-		if [ "${desk}" = "javafilter" ] ; then
-			use java || { rm javafilter.desktop; continue; }
-		fi
-		mv ${desk}.desktop ${PN}-${desk}.desktop
-		sed -i -e s/libreoffice3.4/${PN}/g ${PN}-${desk}.desktop || die
-		sed -i -e s/libreoffice34/${PN}/g ${PN}-${desk}.desktop || die
-		domenu ${PN}-${desk}.desktop
+	for i in *; do
+		mv ${i}.desktop ${PN}-${i}.desktop
 	done
+	sed -i \
+		-e s/libreoffice3.4/${PN}/g \
+		-e s/libreoffice34/${PN}/g \
+		"${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop || die111
+	use java || rm "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/javafilter.desktop
+	pushd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/ > /dev/null
+	popd > /dev/null
+	domenu "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop
 
 	# install icons
 	insinto /usr/share/icons/
@@ -480,9 +535,14 @@ src_install() {
 		done
 	done
 
+	# install mime package
+	dodir /usr/share/mime/packages
+	cp sysui/*.pro/misc/${PN}/openoffice.org.xml \
+		"${ED}"/usr/share/mime/packages/${PN}.xml
+
 	# Install wrapper script
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${T}/wrapper.in" || die
 	newbin "${T}/wrapper.in" ${PN} || die
-	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/${PN}" || die
 
 	# Cleanup after playing
 	rm "${ED}"/gid_Module_*
@@ -490,11 +550,11 @@ src_install() {
 }
 
 pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
 	kde4-base_pkg_preinst
 }
 
 pkg_postinst() {
-	# Cache updates - all handled by kde eclass for all environments
 	kde4-base_pkg_postinst
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-07-21 12:29 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-07-21 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     404b7660a9c95c857fd6abdf91e20ed671db794b
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 12:28:50 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 12:28:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=404b7660

[app-office/libreoffice] Use linguas properly, use system dmake, fix typo.

---
 .../files/libreoffice-3.4.2-allopts.txt            |  767 ++++++++++++++++++++
 app-office/libreoffice/libreoffice-3.4.2.2.ebuild  |    8 +-
 2 files changed, 771 insertions(+), 4 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-3.4.2-allopts.txt b/app-office/libreoffice/files/libreoffice-3.4.2-allopts.txt
new file mode 100644
index 0000000..d00e0db
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.4.2-allopts.txt
@@ -0,0 +1,767 @@
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-ext-barcode    Enables the Barcode extension.
+  --enable-ext-diagram    Enables the Diagram extension.
+  --enable-ext-google-docs
+                          Download and enables the Google Documents extension.
+  --enable-ext-hunart     Enables the Hungarian Cross-reference Toolbar
+                          extension.
+  --enable-ext-lightproof Enables the Lightproof extension.
+  --enable-ext-mysql-connector
+                          Enables the build of the MySQL Connector/LibO
+                          extension. This requires access to the MySQL
+                          Connector/C (aka libmysql) to be given, too, with
+                          either the --with-system-mysql or
+                          --with-libmysql-path option.
+  --enable-ext-nlpsolver  Download and enables the NLPSolver extension.
+  --enable-ext-ct2n       Enables the ConvertTextToNumber extension.
+  --enable-ext-numbertext Enables the Numbertext extension.
+  --enable-ext-oooblogger Download and enables the OOo Blogger extension.
+  --enable-ext-pdfimport  Enables the PDF Import extension and xpdf.
+  --enable-ext-presenter-console
+                          Enables the Presenter Console extension.
+  --enable-ext-presenter-minimizer
+                          Enables the Presentation Minimizer extension.
+  --enable-ext-report-builder
+                          Enables the build of the Report Builder extension.
+  --enable-ext-scripting-beanshell
+                          Enables support for scripts in BeanShell.
+  --enable-ext-scripting-javascript
+                          Enables support for scripts in JavaScript.
+  --enable-ext-scripting-python
+                          Enables support for scripts in Python.
+  --enable-ext-typo       Enables the Typography Toolbar extension.
+  --enable-ext-validator  Enables the Validator extension.
+  --enable-ext-watch-window
+                          Enables the Watch Window extension to Calc.
+  --enable-ext-wiki-publisher
+                          Enables the Wiki Publisher extension.
+  --enable-graphite       Enables the compilation of Graphite smart font
+                          rendering.
+  --disable-ldap          Disables the use of LDAP backend via
+                          Netscape/Mozilla or OpenLDAP LDAP SDK
+  --disable-fetch-external
+                          Disables fetching external tarballs from web
+                          sources.
+  --disable-lockdown      Disables the gconf integration work in LibO.
+  --disable-vba           Disables the vba compatibility feature.
+  --enable-pch            EXPERIMENTAL: Enables precompiled header support for
+                          C++.
+  --disable-mozilla       LibO usually includes a strangely hacked up mozilla
+                          binary for your platform, to build without this
+                          version, use this option.
+  --enable-epm            LibO includes self-packaging code, that requires
+                          epm, however epm is useless for large scale package
+                          building.
+  --disable-activex-component
+                          Remove support for ActiveX embedding of LibO.
+  --disable-odk           LibO includes an ODK, office development kit which
+                          some packagers may with to build without.
+  --disable-mathmldtd     Disable mathmldtd (useful for distributions that
+                          want to avoid packaging it).
+  --enable-evolution2     Allows the built-in evolution 2 addressbook
+                          connectivity build to be enabled.
+  --disable-cups          Disable cups support in the psprint project.
+  --disable-fontconfig    Disable support for the fontconfig library.
+  --disable-directx       Remove DirectX implementation for the new XCanvas
+                          interface. The DirectX support requires more stuff
+                          installed on Windows to compile. (DirectX SDK, GDI+
+                          libs)
+  --disable-activex       Disable the use of ActiveX for windows build.
+
+                          This switch is mandatory when using VC++ 2008 Express.
+
+  --disable-atl           Disable the use of ATL for windows build.
+
+                          This switch is mandatory when using VC++ 2008 Express.
+
+  --enable-symbols        Include debugging symbols in output. WARNING - a
+                          complete build needs 8 Gb of space and takes much
+                          longer (enables -g compiler flag).
+
+                          Enabling symbols disables the stripping of the solver
+                          (--disable-strip-solver).
+
+  --disable-strip-solver  Disable the stripping of the solver. By default the
+                          solver is stripped unless a build with debugging
+                          symbols (--enable-symbols) is requested.
+
+                          This switch allows to override this setting.
+
+  --enable-werror         Turn warnings to errors. (Has no effect in modules
+                          where the treating of warnings as errors is disabled
+                          explicitly.)
+  --enable-debug          Include debugging symbols from --enable-symbols plus
+                          extra debugging code. Extra large build! (enables -g
+                          compiler flag and dmake debug=true) If you need even
+                          more verbose output, build a module with "build --
+                          debug=true dbglevel=2".
+  --enable-dbgutil        Include additional debugging utilities, such as
+                          assertions, object counting, etc. Larger build.
+                          Independent from --enable-debug
+  --enable-crashdump      Enable the crashdump feature.
+  --disable-python        Disable build of Python 2.x UNO API.
+  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
+                          where Gtk+ is available.
+  --disable-systray       Determines whether to build the systray
+                          quickstarter.
+  --disable-broffice      When disabled, broffice specific branding artwork
+                          for use in the pt_BR locale is removed, giving
+                          uniform branding.
+  --enable-split-app-modules
+                          Split file lists for app modules, e.g. base, calc.
+                          Has effect only with make distro-pack-install
+  --enable-split-opt-features
+                          Split file lists for some optional features, .e.g.
+                          pyuno, testtool. Has effect only with make
+                          distro-pack-install
+  --disable-cairo         Determines whether to use Cairo library on platforms
+                          where Cairo is available.
+  --disable-opengl        Determines whether to build the OpenGL 3D slide
+                          transitions component.
+  --enable-dbus           Determines whether to enable presentation mode
+                          screensaver control under GNOME via DBUS.
+  --disable-gconf         Determines whether to use the GConf support.
+  --disable-gnome-vfs     Determines whether to use the Gnome Virtual Filing
+                          System on platforms where that VFS is available.
+  --enable-gio            Determines whether to use the GIO support.
+  --enable-static-gtk     Modules that are linked against gtk libraries use
+                          the static libraries instead of the dynamic ones.
+                          (Enables -Bstatic linker flag for gtk libraries.)
+  --enable-layout         Enable the compilation and use of layout dialogs.
+  --disable-build-mozilla Use this option if you do not want to build the
+                          mozilla components from the mozilla source code but
+                          take precompiled zips.
+  --disable-nss-module    Whether to use provided NSS module.
+  --enable-kde            Determines whether to use Qt3/KDE3 vclplug on
+                          platforms where Qt3 and KDE3 are available.
+  --disable-kdeab         Disable the KDE3 address book support.
+  --enable-kde4           Determines whether to use Qt4/KDE4 vclplug on
+                          platforms where Qt4 and KDE4 are available. May be
+                          used with --enable-kde if you want to support both
+                          KDE3 and KDE4.
+  --disable-unix-qstart-libpng
+                          On UNIX systems, we have a faster splash app, that
+                          can use libpng to render its splash, if we can
+                          safely link to the system libpng then enabling this
+                          is a good idea (ie. for Linux Distro packaging).
+  --enable-binfilter      Enable legacy binary file formats filters build.
+  --disable-rpath         Disable the use of relative paths in shared
+                          libraries.
+  --enable-xrender-link   Link with libXrender instead of dynamically open it.
+  --disable-randr         Disable RandR support in the vcl project.
+  --disable-randr-link    Disable linking with libXrandr, instead dynamically
+                          open it at runtime.
+  --disable-gstreamer     Disable building the gstreamer avmedia backend.
+  --disable-neon          Disable neon and the compilation of webdav binding.
+  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
+                          plugin.
+  --enable-check-only     Use this option option if you just want to check
+                          your environment. This option stops the generation
+                          of an ????env.set.
+
+                          Usage:     --enable-check-only=yes
+
+  --enable-build-unowinreg
+                          Do not use the prebuilt unowinreg.dll. Build it
+                          instead. The MinGW C++ compiler is needed on Linux.
+
+                          Usage:     --enable-build-unowinreg
+
+  --enable-verbose        Increase build verbosity.
+  --disable-verbose       Decrease build verbosity.
+  --enable-dependency-tracking
+                          Do not reject slow dependency extractors.
+  --disable-dependency-tracking
+                          Disables generation of dependency information.
+                          Speed up one-time builds.
+  --enable-icecream       Use the 'icecream' distributed compiling tool to
+                          speedup the compilation. It defaults to
+                          /opt/icecream for the location of the icecream
+                          gcc/g++ wrappers, you can override that using
+                          --with-gcc-home=/the/path switch.
+  --disable-zenity        Do not display a build icon in the notification area
+                          (on unix) during build.
+  --enable-cl-x64         Use the Microsoft C/C++ x64 compiler instead of the
+                          default x86 one.
+  --enable-extra-gallery  Add extra gallery content.
+  --enable-extra-template Add extra temaplte content.
+  --enable-extra-sample   Add extra sample content.
+  --enable-extra-font     Add extra font content.
+  --enable-lomenubar      Enable global menu support.
+  --enable-online-update  Enable the online update service that will check for
+                          new versions of LibreOffice. By default, it is on on
+                          Windows and Mac, and off on Linux.
+  --disable-largefile     omit support for large files
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD.
+  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD.
+  --with-system-graphite  Use graphite library already installed on system.
+  --with-external-tar=<TARFILE PATH>
+                          Specify path to tarfiles manually.
+  --with-linked-git=<OTHER_CLONE_DIR>
+                          Specify another checkout's clonedir to re-use. This
+                          makes use of git-new-workdir, and saves a lot of
+                          diskspace when having multiple trees side-by-side.
+  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead of
+                          the Netscape/Mozilla one.
+  --with-vba-package-format
+                          Specify package format for vba compatibility api.
+                          Specifying "builtin" means the api component and
+                          associated type library are part of the installation
+                          set. Specifying "extn" creates an uno extension that
+                          is part of the installation set (located in the
+                          program directory) that MUST be optionly registered
+                          using either the unopkg executeable or the extension
+                          manager gui.
+
+                          Note: "builtin" is the default, "extn" can cause
+                          problems.
+
+                          Usage:     --with-vba-package-format="builtin" or
+                                     --with-vba-package-format="extn"
+
+  --with-theme="theme1 theme2..."
+                          Choose which themes to include. By default those
+                          themes with an '*' are included. Possible choices:
+                          *default, *crystal, *hicontrast, *oxygen, *tango,
+                          classic, industrial.
+  --with-extension-integration
+                          It will integrate the builded extensions to the
+                          installer of the product. Please use this switch to
+                          include any extension.
+
+  --without-helppack-integration      It will not integrate the helppacks to the installer
+                          of the product.
+                          Please use this switch to use the online help or separate help packages.
+  --without-fonts         LibO includes some third-party fonts to provide a
+                          reliable basis for help content, templates, samples,
+                          etc. When these fonts are already known to be
+                          available on the system then you should use this
+                          option.
+  --without-ppds          Removes Postscript Printer definition files from
+                          LibreOffice installation set, for people building
+                          for specific distributions where PPDs are known to
+                          be already available (every recent distro with CUPS
+                          backend).
+  --without-afms          Removes bitmap font files from LibreOffice
+                          installation set, for people building for specific
+                          distributions where AFM files or TrueType Fonts are
+                          known to be available.
+  --with-agfa-monotype-fonts
+                          Do not include the proprietary Agfa Monotype fonts
+                          (even if present) in the LibreOffice installation
+                          set.
+
+  --with-epm              Decides which epm to use. Default is to use the one
+                          from the system if one is built. When either this is
+                          not there or you say =internal epm will be built.
+  --with-package-format   Specify package format(s) for LibO installsets.
+                          Default is the "normal" one of the OS/Distribution.
+                          Possible values: aix, bsd, deb, inst, tardist, osx,
+                          pkg, rpm, setld, native, portable, archive, dmg,
+                          installed, msi. Example: --with-package-format="deb
+                          dmg"
+  --with-system-stdlibs   Use libstdc++/libgcc_s already on system.
+  --with-system-cairo     Use Cairo libraries already on system.
+  --with-mozilla-version  Choose which version of mozilla to use while
+                          building mozilla. (default=1.7.5) Note that not all
+                          versions are supported.
+  --with-mozilla-toolkit  Choose which GUI toolkit to use while building
+                          mozilla components. (default=gtk2)
+  --without-myspell-dicts Removes myspell dictionaries from LibreOffice
+                          installation set, for people building for specific
+                          distributions where the myspell dictionaries are
+                          installed from other sources.
+  --with-system-dicts     Use dictionaries from system paths- Specify them via
+                          --with-{dict,hyph,thes}-path=/path if you want to
+                          override the default ones.
+  --with-external-dict-dir
+                          Specify external dictionary dir.
+  --with-external-hyph-dir
+                          Specify external hyphenation pattern dir.
+  --with-external-thes-dir
+                          Specify external thesaurus dir.
+  --with-system-libs      Use libs already on system -- enables all
+                          --with-system-* flags except mozilla and
+                          odbc/sane/xrender-header(s).
+  --with-system-headers   Use headers already on system -- enables all
+                          --with-system-* flags for external packages whose
+                          headers are the only entities used i.e.
+                          boost/vigra/odbc/sane/xrender-header(s).
+  --without-system-jars   When building with --with-system-libs, also the
+                          needed jars are expected on the system. Use this to
+                          disable that (except for the db case where
+                          --with-system-db *has to* imply using the db.jar
+                          from there, too).
+  --with-system-zlib      Use zlib already on system.
+  --with-system-openssl   Use OpenSSL already on system.
+  --with-system-jpeg      Use jpeg already on system.
+  --with-system-expat     Use expat already on system.
+  --with-system-libwpd    Use libwpd already on system.
+  --with-system-libwps    Use libwps already on system.
+  --with-system-libwpg    Use libwpg already on system.
+  --with-system-libxml    Use libxml already on system.
+  --with-system-python    Use python already on system.
+  --with-system-translate-toolkit
+                          Use translate-toolkit already on system.
+  --with-system-icu       Use icu already on system.
+  --with-system-poppler   Use system poppler. (only needed for pdfimport
+                          extension)
+  --with-system-db        Use berkeley db already on system.
+  --with-system-lucene    Use lucene already on system.
+  --with-system-apache-commons
+                          Use apache commons libraries already on system.
+  --with-lucene-core-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-lucene-analyzers-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-system-mysql     Use MySQL libraries already on system, for building
+                          the MySQL Connector/LibO extension. Requires
+                          MYSQLCONFIG to point to the mysql_config executable.
+  --with-libmysql-path    Use Connector/C (libmysql) installation for building
+                          the MySQL Connector/LibO extension.
+
+                          Usage:     --with-libmysql-path=<absolute path to
+                                                  your Connector/C installation>
+
+  --with-system-mysql-cppconn
+                          Use MySQL C++ Connector libraries already on system.
+  --with-system-hsqldb    Use hsqldb already on system.
+  --with-hsqldb-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-system-beanshell Use beanshell already on system.
+  --with-beanshell-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-codec-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-lang-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-httpclient-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-commons-logging-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-servlet-api-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-system-jfreereport
+                          Use JFreeReport already on system.
+  --with-sac-jar=JARFILE  Specify path to jarfile manually.
+  --with-libxml-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-flute-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-jfreereport-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-liblayout-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libloader-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libformula-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-librepository-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libfonts-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libserializer-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-libbase-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-system-saxon     Use saxon already on system.
+  --with-saxon-jar=JARFILE
+                          Specify path to jarfile manually.
+  --with-system-libxslt   Use libxslt already on system.
+  --with-system-odbc      Use the odbc headers already on system.
+  --with-system-sane-header
+                          Use sane.h already on system.
+  --with-system-xrender-headers
+                          Use XRender headers already on system.
+  --with-system-mesa-headers
+                          Use Mesa headers already on system.
+  --with-system-curl      Use curl already on system.
+  --with-system-boost     Use boost already on system.
+  --with-system-mdds      Use mdds already on system.
+  --with-system-vigra     Use vigra already on system.
+  --with-system-neon      Use neon already on system.
+  --with-system-hunspell  Use libhunspell already on system.
+  --with-system-mythes    Use mythes already on system.
+  --with-system-altlinuxhyph
+                          Use ALTLinuxhyph already on system.
+  --with-system-lpsolve   Use lpsolve already on system.
+  --with-system-libtextcat
+                          Use libtextcat already on system.
+  --with-external-libtextcat-data
+                          Use libtextcat data already on system.
+  --with-system-cppunit   Use cppunit already on system.
+  --with-system-redland   Use redland library already on system.
+  --with-system-mozilla   Use mozilla already on system. Note that some
+                          components cannot be built against a contemporary
+                          mozilla. The flavour used can be specified by
+                          --with-system-mozilla=<flavour>. Supported are:
+                          libxul (default), xulrunner, firefox, seamonkey,
+                          mozilla.
+  --with-linker-hash-style
+                          Use linker with --hash-style=<style> when linking
+                          shared objects. Possible values: "sysv", "gnu",
+                          "both". The default value is "gnu" if supported on
+                          the build system, and "sysv" otherwise.
+  --with-stlport          Build the STLPort library for compatibility with old
+                          extensions for architectures where STLPort used to
+                          be used.
+  --with-jdk-home         If you have installed JDK 1.3 or later on your
+                          system please supply the path here. Note that this
+                          is not the location of the Java binary but the
+                          location of the entire distribution.
+
+                          Usage:     --with-jdk-home=<absolute path to JDK home>
+
+  --with-gxx-include-path If you want to override the autodetected g++ include
+                          path.
+
+                          Usage:     --with-gxx-include-path=<absolute path to
+                                                                g++ include dir>
+
+  --with-java             Build with(out) Java support. If you use
+                          --without-java/--with-java=no then the build will
+                          have no support for Java components, applets,
+                          accessibility or XML filters.
+  --with-java-target-version
+                          Generate class files that will work on JVMs with the
+                          specified version. For example, use
+                          --with-java-target-version=1.4 to make sure that the
+                          application will work with JVM 1.4 even when
+                          compiled with JDK 1.5.
+
+                          This option is ignored when you compile with gcj/gij.
+
+                          Usage:     --with-java-target-version=<jvm version>
+
+  --with-jvm-path         Use a specific JVM search path at runtime.
+
+                          Usage: --with-jvm-path=<absolute path to parent of jvm home>
+
+                          e. g.: --with-jvm-path=/usr/lib/
+                                 to find JRE/JDK in /usr/lib/jvm/
+
+  --with-ant-home         If you have installed Jakarta Ant on your system,
+                          please supply the path here. Note that this is not
+                          the location of the Ant binary but the location of
+                          the entire distribution.
+
+                          Usage:     --with-ant-home=<absolute path to Ant home>
+
+  --with-junit            Specifies the JUnit 4 jar file to use for
+                          JUnit-based tests. --without-junit disables those
+                          tests. Not relevant in the --without-java case.
+
+                          Usage:     --with-junit=<absolute path to JUnit 4 jar>
+
+  --with-perl-home        If you have installed the Perl 5 Distribution, on
+                          your system, please supply the path here. Note that
+                          this is not the location of the Perl binary but the
+                          location of the entire distribution.
+
+                          Usage:     --with-perl-home=<abs. path to Perl 5 home>
+
+  --with-cl-home          For Windows NT users, please supply the path for the
+                          Microsoft C/C++ compiler. Note that this is not the
+                          location of the compiler binary but the location of
+                          the entire distribution.
+
+                          Usage:     --with-cl-home=<absolute path to Microsoft
+                                                            C/C++ compiler home>
+
+  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply
+                          the path pointing to the mspdb80.dll (if using
+                          Visual Studio 2008) or mspdb100.dl (if using Visual
+                          Studio 2010).
+
+                          Usage:     --with-mspdb-path=<path to
+                                                       mspdb80.dll/mspdb100.dll>
+
+  --with-midl-path        For Microsoft compiler users, please supply the path
+                          pointing to the midl.exe.
+
+                          Usage:     --with-midl-path=<abs. path to midl.exe>
+
+  --with-csc-path         For Windows builds, please supply the path pointing
+                          to the csc.exe. Usually found automatically.
+
+                          Usage:     --with-csc-path=<abs. path to csc.exe>
+
+  --with-nsis-path        For Windows users, please supply the path to the
+                          "Nullsoft Scriptable Install System" (NSIS). If NSIS
+                          is found in the path or this option is supplied a
+                          self contained executable installer for LibreOffice
+                          will be created.
+
+                          Usage:     --with-nsis-path=<abs. path to nsis.exe>
+
+  --with-frame-home       For Microsoft compiler users, please supply the path
+                          pointing to lib/mscoree.lib, usually something like:
+                          "/cygdrive/c/Program Files/Windows
+                          SDKs/Windows/v7.0"
+
+                          Note that in most cases it will be automatically
+                          found, though.
+
+                          Usage:     --with-frame-home=<absolute path to .NET
+                                                                      Framework>
+
+  --with-psdk-home        For Windows users, please supply the path to the
+                          Windnows SDK. Usually found automatically.
+
+                          Usage:     --with-psdk-home=<abs. path to Windows SDK>
+
+  --with-directx-home     For Windows users, please supply the path to the
+                          Microsoft DirectX SDK.
+
+                          Usage:     --with-directx-home=<absolute path to
+                                                          Microsoft DirectX SDK>
+
+  --with-mozilla-build    For Windows users, please supply the path to the
+                          mozilla build tools.
+
+                          Usage:     --with-mozilla-build=<absolute path to
+                                                            mozilla build tools>
+
+                          At the moment of this writing, an installer for the
+                          mozilla build tools can be obtained from http://ftp.
+                          mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+
+  --with-local-solenv     If you have solenv in a location other than
+                          ./solenv, please supply the path here.
+
+                          Usage:     --with-local-solenv=<abs. path to solenv>
+
+  --with-local-solver     If you have solver in a location other than
+                          ./solver, please supply the path here.
+
+                          Usage:     --with-local-solver=<abs. path to solver>
+
+  --with-lang             Use this option to build LibreOffice with additional
+                          language support. English (US) is always included by
+                          default. Separate multiple languages with space. For
+                          all languages, use --with-lang=ALL.
+
+                          Usage:     --with-lang="es sw tu cs sk"
+
+  --with-intro-bitmap    Prefer the specified intro bitmap over the
+                          the default one.
+
+                          Usage: --with-intro-bitmap=/path/my_ooo_intro.png
+
+  --with-about-bitmap    Similarly to --with-intro-bitmap, this allows
+                          specification of bitmap for the About box.
+
+                          Usage: --with-about-bitmap=/path/my_ooo_about.png
+
+  --with-vendor           Set vendor of the build.
+
+                          Usage:     --with-vendor="John the Builder"
+
+  --with-install-dirname  Specify the directory name of the core LibO install
+                          dir. The final installation path is defined by
+                          <libdir>/<install-dirname>. The default value is
+                          "libreoffice" and the default installation path is
+                          /usr/lib/libreoffice. FIXME: It affects only the
+                          installation by "make install" and not the generated
+                          installation sets.
+
+                          Usage:     --with-install-dirname=lo-3.4.2
+
+  --with-unix-wrapper     Redefines the name of the UNIX wrapper that will be
+                          used in the desktop files and in the
+                          desktop-integration RPMs.
+
+                          Usage:     --with-unix-wrapper=ooffice
+
+  --with-compat-oowrappers
+                          Install oo* wrappers in parallel with lo* ones to
+                          keep backward compatibility. Has effect only with
+                          make distro-pack-install
+  --with-asm-home         For Windows, please supply the path for the ml.exe
+                          or ml64.exe assembler.
+
+                          Usage:     --with-asm-home=<path to assembler directory>
+
+  --with-os-version       For FreeBSD users, use this option option to
+                          override the detected OSVERSION.
+
+                          Usage:     --with-os-version=<OSVERSION>
+
+  --with-zip-home         If you use a non standard zip, for example windows
+                          please supply the path for zip.
+
+                          Usage:     --with-zip-home=<path to zip executable>
+
+  --with-mingw            For Windows users, use the MinGW compiler within a
+                          Cygwin environment.
+
+                          Usage:     --with-mingw=yes
+
+                          For non-Windows use, use the MinGW C++ compiler to
+                          (re-)build unowinreg.dll. Specify the MinGW C++
+                          Compilers name.
+
+                          Usage:     --with-mingw=i586-mingw32msvc-g++
+
+  --with-build-version    Allows the builder to add a custom version tag that
+                          will appear in the Help/About box for QA purposes.
+
+                          Usage:     --with-build-version="Built by Jim"
+
+  --with-alloc            Define which allocator to build with (choices are
+                          oo, system, tcmalloc, jemalloc). Note that on
+                          FreeBSD/NetBSD system==jemalloc
+  --with-sun-templates    Integrate Sun template packages.
+  --with-num-cpus         Number of build processes/cpus to use (number of
+                          projects that will build at the same time).
+                          Multi-process/multi-cpu builds can save a lot of
+                          time on multi-cpu machines. Defaults to the number
+                          of CPUs on the machine.
+  --with-max-jobs         Maximum number of jobs per one CPU that will be
+                          issued at the same time my dmake. The real number of
+                          the jobs is affected by the --with-num-cpus too, it
+                          can get up to CPUS*max_jobs. Defaults to 1, unless
+                          you configure --enable-icecream - then to 10.
+  --with-x                use the X Window System
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  FONTCONFIG_CFLAGS
+              C compiler flags for FONTCONFIG, overriding pkg-config
+  FONTCONFIG_LIBS
+              linker flags for FONTCONFIG, overriding pkg-config
+  CXX         C++ compiler command
+  CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
+  LIBWPD_CFLAGS
+              C compiler flags for LIBWPD, overriding pkg-config
+  LIBWPD_LIBS linker flags for LIBWPD, overriding pkg-config
+  CPPUNIT_CFLAGS
+              C compiler flags for CPPUNIT, overriding pkg-config
+  CPPUNIT_LIBS
+              linker flags for CPPUNIT, overriding pkg-config
+  FREETYPE_CFLAGS
+              C compiler flags for FREETYPE, overriding pkg-config
+  FREETYPE_LIBS
+              linker flags for FREETYPE, overriding pkg-config
+  LIBWPS_CFLAGS
+              C compiler flags for LIBWPS, overriding pkg-config
+  LIBWPS_LIBS linker flags for LIBWPS, overriding pkg-config
+  LIBWPG_CFLAGS
+              C compiler flags for LIBWPG, overriding pkg-config
+  LIBWPG_LIBS linker flags for LIBWPG, overriding pkg-config
+  LIBXSLT_CFLAGS
+              C compiler flags for LIBXSLT, overriding pkg-config
+  LIBXSLT_LIBS
+              linker flags for LIBXSLT, overriding pkg-config
+  LIBXML_CFLAGS
+              C compiler flags for LIBXML, overriding pkg-config
+  LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
+  MOZ_NSS_CFLAGS
+              C compiler flags for MOZ_NSS, overriding pkg-config
+  MOZ_NSS_LIBS
+              linker flags for MOZ_NSS, overriding pkg-config
+  MOZ_NSPR_CFLAGS
+              C compiler flags for MOZ_NSPR, overriding pkg-config
+  MOZ_NSPR_LIBS
+              linker flags for MOZ_NSPR, overriding pkg-config
+  MOZILLAXPCOM_CFLAGS
+              C compiler flags for MOZILLAXPCOM, overriding pkg-config
+  MOZILLAXPCOM_LIBS
+              linker flags for MOZILLAXPCOM, overriding pkg-config
+  MOZGTK2_CFLAGS
+              C compiler flags for MOZGTK2, overriding pkg-config
+  MOZGTK2_LIBS
+              linker flags for MOZGTK2, overriding pkg-config
+  MOZLIBREQ_CFLAGS
+              C compiler flags for MOZLIBREQ, overriding pkg-config
+  MOZLIBREQ_LIBS
+              linker flags for MOZLIBREQ, overriding pkg-config
+  GRAPHITE_CFLAGS
+              C compiler flags for GRAPHITE, overriding pkg-config
+  GRAPHITE_LIBS
+              linker flags for GRAPHITE, overriding pkg-config
+  XMKMF       Path to xmkmf, Makefile generator for X Window System
+  XRANDR_CFLAGS
+              C compiler flags for XRANDR, overriding pkg-config
+  XRANDR_LIBS linker flags for XRANDR, overriding pkg-config
+  NEON_CFLAGS C compiler flags for NEON, overriding pkg-config
+  NEON_LIBS   linker flags for NEON, overriding pkg-config
+  OPENSSL_CFLAGS
+              C compiler flags for OPENSSL, overriding pkg-config
+  OPENSSL_LIBS
+              linker flags for OPENSSL, overriding pkg-config
+  REDLAND_CFLAGS
+              C compiler flags for REDLAND, overriding pkg-config
+  REDLAND_LIBS
+              linker flags for REDLAND, overriding pkg-config
+  HUNSPELL_CFLAGS
+              C compiler flags for HUNSPELL, overriding pkg-config
+  HUNSPELL_LIBS
+              linker flags for HUNSPELL, overriding pkg-config
+  MYTHES_CFLAGS
+              C compiler flags for MYTHES, overriding pkg-config
+  MYTHES_LIBS linker flags for MYTHES, overriding pkg-config
+  GCONF_CFLAGS
+              C compiler flags for GCONF, overriding pkg-config
+  GCONF_LIBS  linker flags for GCONF, overriding pkg-config
+  GNOMEVFS_CFLAGS
+              C compiler flags for GNOMEVFS, overriding pkg-config
+  GNOMEVFS_LIBS
+              linker flags for GNOMEVFS, overriding pkg-config
+  GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
+  GTK_LIBS    linker flags for GTK, overriding pkg-config
+  GTK210_CFLAGS
+              C compiler flags for GTK210, overriding pkg-config
+  GTK210_LIBS linker flags for GTK210, overriding pkg-config
+  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+  GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
+  GIO_LIBS    linker flags for GIO, overriding pkg-config
+  LIBPNG_CFLAGS
+              C compiler flags for LIBPNG, overriding pkg-config
+  LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
+  CAIRO_CFLAGS
+              C compiler flags for CAIRO, overriding pkg-config
+  CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
+  GSTREAMER_CFLAGS
+              C compiler flags for GSTREAMER, overriding pkg-config
+  GSTREAMER_LIBS
+              linker flags for GSTREAMER, overriding pkg-config
+  POPPLER_CFLAGS
+              C compiler flags for POPPLER, overriding pkg-config
+  POPPLER_LIBS
+              linker flags for POPPLER, overriding pkg-config
+  KDE_GLIB_CFLAGS
+              C compiler flags for KDE_GLIB, overriding pkg-config
+  KDE_GLIB_LIBS
+              linker flags for KDE_GLIB, overriding pkg-config
+  GOBJECT_CFLAGS
+              C compiler flags for GOBJECT, overriding pkg-config
+  GOBJECT_LIBS
+              linker flags for GOBJECT, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+LibreOffice home page: <http://documentfoundation.org/>.

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 80534a7..dac95d1 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -192,6 +192,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	dev-perl/Archive-Zip
 	dev-util/cppunit
+	>=dev-util/dmake-4.12
 	>=dev-util/gperf-3
 	dev-util/intltool
 	dev-util/pkgconfig
@@ -310,6 +311,7 @@ src_prepare() {
 	eprefixify "${T}"/wrapper.in
 
 	strip-linguas ${LANGUAGES}
+	LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
 
 	# Now for our optimization flags ...
 	export ARCH_FLAGS="${CXXFLAGS}"
@@ -330,7 +332,7 @@ src_prepare() {
 	base_src_prepare
 	eautoreconf
 
-	# prevent any dowloading by the package
+	# prevent any dowloading by the buildsystem
 	touch src.downloaded
 }
 
@@ -359,7 +361,6 @@ src_configure() {
 	"
 
 	# Things that do not have gentoo packages
-	# system dmake fails to compile anything in loo
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
 	internal_libs+="
 		--without-system-altlinuxhyph
@@ -374,7 +375,6 @@ src_configure() {
 		internal_libs+="
 			--without-system-beanshell
 			--without-system-lucene
-
 			--without-system-saxon
 		"
 	else
@@ -447,7 +447,7 @@ src_configure() {
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-tar="${DISTDIR}" \
-		--with-lang="${LINGUAS}" \
+		--with-lang="${LINGUAS_OOO}" \
 		--with-max-jobs=1 \
 		--with-num-cpus=${jobs} \
 		--with-theme="${themes}" \



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
@ 2011-07-24 12:22 Tomas Chvatal
  0 siblings, 0 replies; 4+ messages in thread
From: Tomas Chvatal @ 2011-07-24 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     07646a1df6d2f6ecce028f2baaa6f35a09e2fe5c
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 12:21:34 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 12:21:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/scarabeus.git;a=commit;h=07646a1d

[app-office/libreoffice] Moved to main tree.

---
 app-office/libreoffice/Manifest                    |   92 ---
 .../files/enable-startup-notification.diff         |  108 ---
 app-office/libreoffice/files/env_log.diff          |   25 -
 .../libreoffice/files/fix-ooo-collision.diff       |   29 -
 app-office/libreoffice/files/gentoo-3.3.1.diff     |   68 --
 app-office/libreoffice/files/gentoo-3.3.2.diff     |   49 --
 .../libreoffice/files/gentoo-pythonpath.diff       |   11 -
 .../files/libreoffice-3.3-libpng-1.5.diff          |   13 -
 .../libreoffice-3.3.0_libxmlsec_fix_extern_c.diff  |   38 -
 ...libreoffice-3.3.1-neon_remove_SSPI_support.diff |   27 -
 .../files/libreoffice-3.3.2-bison25.diff           |   23 -
 .../files/libreoffice-3.4.1-salfix.diff            |   11 -
 .../files/libreoffice-3.4.2-allopts.txt            |  767 --------------------
 .../files/libreoffice-libdb5-fix-check.diff        |   25 -
 .../libreoffice/files/libreoffice_options.txt      |  123 ----
 .../libreoffice/files/scrap-pixmap-links.diff      |   37 -
 app-office/libreoffice/files/sdext-presenter.diff  |   11 -
 app-office/libreoffice/files/wrapper.in            |    3 -
 app-office/libreoffice/libreoffice-3.4.2.2.ebuild  |  549 --------------
 19 files changed, 0 insertions(+), 2009 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
deleted file mode 100644
index 176d5d6..0000000
--- a/app-office/libreoffice/Manifest
+++ /dev/null
@@ -1,92 +0,0 @@
-AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
-AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
-AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
-AUX gentoo-3.3.1.diff 2271 RMD160 ecd7bd0a6c34861ad3ef0bee8017a288286644c0 SHA1 0597c7e692873f128a898d1904445b9bbb06e6e8 SHA256 00b5b5fc5dbeafa18874575e78e6b3348d1293662b9c036ca918517a54edf1b6
-AUX gentoo-3.3.2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
-AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
-AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8
-AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
-AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
-AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
-AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
-AUX libreoffice-3.4.2-allopts.txt 40633 RMD160 24d91b414bcbb2dc92230901e452664318b2ce83 SHA1 fd914f7562c20d427a53fb7d2b95f4b0c3bc6b05 SHA256 54c7f92331ab064c713af6fb268e980dfcdf95e289efb05e63970b6a3b345a10
-AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
-AUX libreoffice_options.txt 6251 RMD160 570a49fd590875388ac19b6b21c4d839e4266644 SHA1 b44a85a4676c2c01dc102c8b5893e3462f10c688 SHA256 d194118debf1c098a88b3396eca12dd7ea1a2eda76b3afd63599f2bdb1c39638
-AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
-AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
-AUX wrapper.in 102 RMD160 e11e046dc57bed812ba28e549145fdc3605ede8d SHA1 2e8cf54755431070b2352621eb4a91179a7cc543 SHA256 0cd747062eb7d6d4ecabbf8943575c688c273c7f258b5793a5cff42254ecb432
-DIST 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz 3484993 RMD160 78f48eeb84adb64e78d3fdd6724ba6095e4454d0 SHA1 820f58f1fd26b955e9853370d2d61484b24939f3 SHA256 986c8cec94f7e409497d826d0ec6809c261a3c0f3f2a891213cb9128a93ae195
-DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160 aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c116116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
-DIST 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz 456304 RMD160 fe72e3958fb2ed39aa5cb04ff55b643f06646300 SHA1 595487766c3814afeaaf18e1021b312dd546dfec SHA256 2b16516ef147bb604e1cf50c883143a052a7ff92d2930b70e571da0603b7d9ce
-DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
-DIST 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 376068 RMD160 b6c1b121ea1b3b1386a188e9f425a7288b1de865 SHA1 c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 SHA256 585c15b3b9ae0f3562d0aa35e15406adfd75357087d93009d4fa4ae034c6e983
-DIST 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz 540999 RMD160 2058bab6642460fdaee13993dd05da29aa516efa SHA1 e98d7149d6a20fdbb58cc0b79cb5e3f95ae304e4 SHA256 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
-DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
-DIST 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 315122 RMD160 e99bb5017c29657c3303d8810e21bf02d737c345 SHA1 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 SHA256 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03c9d0b21244cb1d4bf030b
-DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 RMD160 40a15ad43e92335558c868d66bca521e57d8c583 SHA1 0619ed3a89644bef318df67db12045b2b590585b SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-DIST 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 728789 RMD160 c5590829fedb1934a4854fb5d9a85d443cd0f406 SHA1 1dcd28d3fc7af42ceb63006cdc56aa55ac66d355 SHA256 5ff7825fd09d0774b4f863ac77ed0d0349e4910de6c596e92c0af2ed9ecc0306
-DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 RMD160 6056046e4043e3e6a613029fe94f5f1728bebcd5 SHA1 8f949ae74a6d66278a595bd063f13e0ad196d14a SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
-DIST 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 20335 RMD160 b74ae68c08ef3bc579407337e2f4f527c4754d9c SHA1 f07e5f2744ebf5a5d1018f77b312a50bfd06a006 SHA256 71730ed23e9f00e7b93bc78538bbf7750be501f149bf04d1289c83cb222a2708
-DIST 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz 1657246 RMD160 00d43701b92a6b7befacf082bbf01a4ecfe71275 SHA1 d55390a4242ad61f034291f1c854ab037e508272 SHA256 edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf7357f244d82a40
-DIST 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 3568559 RMD160 5b7c679ca59540a19cfabb22b923f11d77da84c0 SHA1 32d2298c78132a629ed2ac6c9830b4d52770ce02 SHA256 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4
-DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 RMD160 cf09fd0e4911275fddac1779cdbcfc6a7769eb5c SHA1 3232dd31859be4f7eb443c33e8e3287f394789a0 SHA256 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
-DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 RMD160 687165fa06edad490e6173f3b868e1e1afdfc2c9 SHA1 1acea86fd399ed7817879d36370d3d1f8b109050 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
-DIST 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip 867405 RMD160 83ada665ea92bd70cd8e9c73f0921e5790d6d9f1 SHA1 b67507ea7a48f7b68075cdfb2384784e516cb8ca SHA256 f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b
-DIST 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip 4706244 RMD160 be12115ab2d4fbb13851a54b2538d615a4055aab SHA1 b4a2aba7b27e5a10f40b980a50aedadeb63228b4 SHA256 d78e33142ae37a1e085c6d1b0f0171abcd8fa626acc6d6da24212d8193df5685
-DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 RMD160 0e6a6f183b1aafa43635ed9dfb74fc76761e65b4 SHA1 b92930010622906778f713fb8f0153fa0683d018 SHA256 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
-DIST 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz 463264 RMD160 d43dd826d64cc5a100618a9c7153b525510830f1 SHA1 180143410351cc87078c56e67649131219484f16 SHA256 b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
-DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 RMD160 229deeb4c533422466c16eaf490c08103be21fc8 SHA1 e393beea80d36ff27b732882c706826988a64f5c SHA256 e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
-DIST 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt 42487 RMD160 89a3237235bbdb473f6dc8dc1e90e996aefacdde SHA1 e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda SHA256 34a9812ae426dbca696fbd069276094517da0df78b5afb95a87b1c2daef97adb
-DIST 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt 4998642 RMD160 61bbecc48c94393b9c04fa9c11282dd55d42a871 SHA1 d2b6a076b40d8d517075e52220ddd8f89f655c8f SHA256 f15b13b947d8690bf05c4dc4cb04ab89297565ccddf02cce37b831376151ba29
-DIST 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 14952999 RMD160 e807b51c007a80de843566c47f16149afeb03a5e SHA1 19bdd1cabba599e5b0ed6fb0efc446e860e021b0 SHA256 8da587c6870bb35719c64c5973cafe1ce3f834fb33f343d2293a56a58bf1ef1b
-DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 RMD160 db97e6581e875ede8cf895a63d2c689f1eae667f SHA1 60bca1db80e8cb5bd1621f79350b26a3a10360b2 SHA256 4745d5b571c79e1323044893f408d675527b4f641def3f2c2b204b5997604484
-DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD160 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc12a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459047477000f2a619
-DIST 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt 4973419 RMD160 1f01d5f4d8be121bc3aaa5c5d69c9bbb50cfd912 SHA1 bf25bef71f72a4622089c85958bfd6c58d8516a6 SHA256 4eb76551b548c0e7fdc5048be8462ddb61dfb7bba4bbc23b46189356b4b0976c
-DIST 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt 4953938 RMD160 cf457953fd947bf7f60274377ef88124bb788108 SHA1 4fea33622d89c7ac62053e5ee3616cfe504e0f14 SHA256 2f0ac09043abf098335ca1aa4c8bdd1759a0fea6dea561d9a21cfa0d606378dc
-DIST 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 674912 RMD160 e900cb8670b8c430beaa45895fb474411cb1958d SHA1 f9940698840c8a8045677e8be68ab8580903e20a SHA256 b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d51ac11f00
-DIST 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz 7194574 RMD160 90c028196852e7e6a1b2dcf8647b88eeb232f0b9 SHA1 b97bfb0e3e32f4e4857847d5fb5658202b730e62 SHA256 0647e762eb3c31f871c3d056fb7c907b2917a5b183580d434f15b2d9e0047791
-DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RMD160 a46ebbc4915dd871891c8461a331dd0804b61101 SHA1 bb845c3de2bb7ad93dddb2c752247ec91475a947 SHA256 d1708a3a9a0d08b1cde1e9d95de950c2f18fffc3ca41413c06b3ed3cae34a5f5
-DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e248ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545fef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
-DIST 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 56041 RMD160 fbf2fc7ec950ac7282b50ee5fbe0d9c9426c1894 SHA1 72a838242dfe8089fbe08e143bbe28a19a0fa396 SHA256 deb9897f2c48a8c921bec4d72a98b506d86f3a69e35d9439e0896ca8ee1a8563
-DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9fb0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
-DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 RMD160 3235b45b4065750b0b2df4735a57ca1f815dfc69 SHA1 a637c0c3ad3be32d6814972e1c45e547c5f6359d SHA256 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
-DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160 f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c6801c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3
-DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 RMD160 61672340e92957a5b72cddddcfcbf56d9602842c SHA1 47b58e0ef2d856df26372a7061ae43fae6e08051 SHA256 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
-DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859
-DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 923870cf88023713a492e0a5c5d5707ec21d8739 SHA1 2d49e11b0b711970f494294dc3698f05eb294853 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
-DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
-DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4
-DIST b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 11922684 RMD160 70435964d18c4b3c633dd50225c177ca4546269a SHA1 4ad95f5d07eae50dc4f95b04eb900c39e202fd21 SHA256 2c3ed36476e1279ba35d7c675961bfa9c40b1360153472e80508a99963c8d46c
-DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 RMD160 ecf14c46ddf095734752ef260134c97b1772be57 SHA1 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b SHA256 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
-DIST c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 686207 RMD160 1d5d88a8521eab43a57f270550bb654c8c980b32 SHA1 7c36232506c5cfc911b2e2edc44a1841a74630f5 SHA256 3be3b80c0151fbc69bc93767e952cf4bfbe61874328b1c979126bbbcf1e75da5
-DIST ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz 1324547 RMD160 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546 SHA1 e36555ed4e13a8109bfdb5a8c621de6d581f5ab7 SHA256 9cdea85d1ee40160cf48fc482fbd9038b07b47d909f2091039338d39b0bb7d2f
-DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051dfd775b66c7681c212be6a SHA1 626731cb89e69d864d0f52a571f71f44d90db394 SHA256 c8e14bb686e113b126dc802d922fbafcf8fca592ea230ffc07c4672a3ab0a979
-DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 RMD160 d5b50ff1bcb09efd7c1f4167f2d0d38065ba0166 SHA1 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 SHA256 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
-DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 RMD160 aec803e586e247ddbc39557090924988035d306c SHA1 65dfba9970bb862d09c1f9e636b86b22f05d3936 SHA256 e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
-DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175 RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8c46e02fadd5a01e6272f
-DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea SHA1 43a7ff11dd15370d456b20a093e1ee81279163a0 SHA256 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
-DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
-DIST fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz 1117561 RMD160 6810d86d974524e6627076e6530a703d62039160 SHA1 55e08ee78c15de417cbfccb9e748747095994886 SHA256 066b786ac12f75940a5b8ead444c824460f53feb6f6161a110dcf16efd5c7de3
-DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
-DIST libreoffice-artwork-3.4.2.2.tar.bz2 13540475 RMD160 8844467ad68632f7b31a6e757003c6296afedd81 SHA1 3608393750e0ffd19c157cdfc440f9f4b92e28cb SHA256 a79cbc74cd8c2cf70bfd45c6db0a7560bf2de02d6604c787cdd09d4e078abbf5
-DIST libreoffice-base-3.4.2.2.tar.bz2 2068542 RMD160 337fe71100b954a09fb583c9a6792e90a8a1faa6 SHA1 735446bbd9ad378e4640f4e0c96964d0fd4d4065 SHA256 3a1fbd48e33ad7f0850e7339ef1f81c37f184e59eb49af996a78d4396af06367
-DIST libreoffice-bootstrap-3.4.2.2.tar.bz2 2712979 RMD160 4012b440095321bb6fe12addb4b624bb9226ca26 SHA1 543f1ec7cbf49cbfa4df46cf2fe62e6e626117d4 SHA256 1cab94a57f3688e778323a536f446ab31d33e7fa411bc7106bc067f8a853b612
-DIST libreoffice-calc-3.4.2.2.tar.bz2 9514579 RMD160 2b1bfa1d33a663ebbaa48f0748ecb9c1f7828f9e SHA1 4bb6a717726771785d28e044b540f001efc32503 SHA256 2273b6655199a6514084754a5c5b2f6c08d2b730ec919b17bed8421b613a7ad6
-DIST libreoffice-components-3.4.2.2.tar.bz2 5095907 RMD160 b5ba4debc7592988bd0d03ac79379e2d0bcdb208 SHA1 419353008725b5d4305cd8967bfc527236c967f2 SHA256 dcb721151db426cb22ae7d3b3a81e5539c509755f774f946a9980c6a44b9ee95
-DIST libreoffice-extensions-3.4.2.2.tar.bz2 4216511 RMD160 e80cd939c2644894ed15fb91a0954060b2dd75d5 SHA1 50a8a70d442c8ec8ca10eafca14a69a58889a26b SHA256 58579f8f0dc47b4401441940c82f484edf6ebbd3268a9f763dabc26c54d12dc8
-DIST libreoffice-extras-3.4.2.2.tar.bz2 38643479 RMD160 7436b38d049e4fba21bbffb840dc6c91dc6d95e8 SHA1 00b2bc8b3b6766339d83d63664abae1a6e97f06e SHA256 7196f75c8f2c61c6f7fd26ec947b323c0f7dad9310b87bc565d91ecf55d85cd1
-DIST libreoffice-filters-3.4.2.2.tar.bz2 11776660 RMD160 eb90b2922ca47bd567eb4e8bf9a2e3d24f132c08 SHA1 94456f839d25defdab2fb69b05c054f3cdaf66ed SHA256 722cf4dbe944a32d1c243d065992e46230d8ce1c35c5cb3a9f5e19d29fde6faf
-DIST libreoffice-help-3.4.2.2.tar.bz2 1846264 RMD160 8702930cda18488343688cf96858155e3465f33d SHA1 51c7da939bdda3381a48cd37195dab23b1175ff6 SHA256 10cae992204dca2065dd941c0a378b90642f8fe7584dcd918a7cd2c4a530127f
-DIST libreoffice-impress-3.4.2.2.tar.bz2 2651675 RMD160 10916782b5befb80e2dafcba0103d724f3ecb4f6 SHA1 1089fa229eacbd18aa7e8d298aa76e6c94b6681d SHA256 609fee64e79dffbd8d6f32e03d2f4d529006d656ba131e9fef8d7599bc92bc6f
-DIST libreoffice-libs-core-3.4.2.2.tar.bz2 15590627 RMD160 c1c56eb03756cb7f502490d2f712cf6b5776a612 SHA1 1ca7cbe9fbd487a917249a3f9ce73088a86ab256 SHA256 db68b04ebae59438db3e1526d943b9bc5fd94699492e394716289bc63096347a
-DIST libreoffice-libs-extern-3.4.2.2.tar.bz2 637668 RMD160 4a62ad88beb4a8b608d0ccb27b5d711aac55df46 SHA1 e8a09caeed653ae88ae11a414450bcedb404f0ba SHA256 410b17518da537b517004b83017cade0e8bfcc926332228809eee483b2cdf589
-DIST libreoffice-libs-extern-sys-3.4.2.2.tar.bz2 40011708 RMD160 7f953de119948e2eb801f14468d1f6e1c2628faf SHA1 665de8628a0bb52cdac43be9c652aec5491ca221 SHA256 2b0504d737ce7ed7f447a8a1e9a9bc47d7711215c5ef7acaf3c96ff979296de9
-DIST libreoffice-libs-gui-3.4.2.2.tar.bz2 10858440 RMD160 c78af2be2d5ad580f100903206599826fb4331c4 SHA1 a986ce290c0ea082a002a684007883d60a6812b8 SHA256 0cbfbcfa6506924b66107f6b8a4dd06180ed2a75a05bb87f00e513ce3a9eebd5
-DIST libreoffice-postprocess-3.4.2.2.tar.bz2 50856 RMD160 7b3dd61798e09462cebfb295bf8b278b9b45cbe1 SHA1 605c924da97398f4c3766630a09d684582cc57e0 SHA256 d48e29668e0b8efdb49120b503054805f058c4d57d6d3120c6bb8bec0d8bda5c
-DIST libreoffice-sdk-3.4.2.2.tar.bz2 1721557 RMD160 3c1065c17a23cec3414888632639480def14af89 SHA1 89c21eeea24eb61d639c920faa181ebe4f935d13 SHA256 88c14e864bd0c7c95da39e36c72d98f0d0b1159a3de6a202978b0a9f9bc54c1c
-DIST libreoffice-testing-3.4.2.2.tar.bz2 50846263 RMD160 cb785e1aec0ecfeeaebea45637b98539fb5d79ee SHA1 e5ffa90f226149b75e8e4912e9f724d0d00127f9 SHA256 e94076c063f7dd55203f25a9412485bb84577a72c96340dda40cd5aa969f5fa1
-DIST libreoffice-translations-3.4.2.2.tar.bz2 137567227 RMD160 5e0bf18dbd6d91aa3da83c997af58eb91705cb52 SHA1 b3ac0dd25fc24f46fa8dbb88abd2113a1789317d SHA256 b14755e5677df0bff096a4b6f1813026df7b8910bd7f277c9fd2df0ca4d94212
-DIST libreoffice-ure-3.4.2.2.tar.bz2 6214251 RMD160 13697a990e4f4b0ce8d389f660ec320832464317 SHA1 928ea08192feabc258f95df7c38c78ab61a6ec82 SHA256 32ffefd327828caee0e7eab3f6b1584acd4588992c36dbfe5e607bd87bd8b10f
-DIST libreoffice-writer-3.4.2.2.tar.bz2 7294336 RMD160 87f787eac22358846cb7b8dd386f4840aefe6e86 SHA1 a51a67e32052104cc1964d9dc93d163d8ed1e1d8 SHA256 ebc4513e0fb9bd26945802c089991f886534403aa4c58bede6b9ff0d5d5563f4
-DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.2.ebuild 18871 RMD160 60eb69d88819fcc2bec13f9f5f4916ef4509fea4 SHA1 6dbe746adb37c092c02e26b7f1f7730ffb0fc1e6 SHA256 3c340564ff12109a092bc906843ef107a0a5e74ba37e727f52f1e12466cc20f6

diff --git a/app-office/libreoffice/files/enable-startup-notification.diff b/app-office/libreoffice/files/enable-startup-notification.diff
deleted file mode 100644
index 39e1172..0000000
--- a/app-office/libreoffice/files/enable-startup-notification.diff
+++ /dev/null
@@ -1,108 +0,0 @@
---- desktop/base.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/base.desktop.in.in	2010-03-25 14:23:29.000000000 +0200
-@@ -6,7 +6,7 @@
- Icon=ooo-base@OOO_BINSUFFIX@
- Type=Application
- Categories=Office;Database;
--StartupNotify=false
-+StartupNotify=true
- MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
- _Name=OpenOffice.org Base
- _GenericName=Database
---- desktop/calc.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/calc.desktop.in.in	2010-03-25 14:23:36.000000000 +0200
-@@ -7,7 +7,7 @@
- Type=Application
- InitialPreference=6
- Categories=Office;Spreadsheet;
--StartupNotify=false
-+StartupNotify=true
- MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/csv;application/excel;application/tab-separated-values;application/x-123;application/x-dos_ms_excel;application/x-excel;application/x-ms-excel;application/x-msexcel;text/comma-se
 parated-values;text/tab-separated-values;text/x-comma-separated-values;
- _Name=OpenOffice.org Calc
- _GenericName=Spreadsheet
---- desktop/draw.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/draw.desktop.in.in	2010-03-25 14:23:44.000000000 +0200
-@@ -6,7 +6,7 @@
- Icon=ooo-draw@OOO_BINSUFFIX@
- Type=Application
- Categories=Graphics;VectorGraphics;
--StartupNotify=false
-+StartupNotify=true
- InitialPreference=6
- MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.stardivision.draw;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
- _Name=OpenOffice.org Draw
---- desktop/impress.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/impress.desktop.in.in	2010-03-25 14:23:52.000000000 +0200
-@@ -6,7 +6,7 @@
- Icon=ooo-impress@OOO_BINSUFFIX@
- Type=Application
- Categories=Office;Presentation;
--StartupNotify=false
-+StartupNotify=true
- MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
- InitialPreference=5
- _Name=OpenOffice.org Impress
---- desktop/math.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/math.desktop.in.in	2010-03-25 14:24:02.000000000 +0200
-@@ -7,7 +7,7 @@
- Icon=ooo-math@OOO_BINSUFFIX@
- Type=Application
- Categories=Office;Math;
--StartupNotify=false
-+StartupNotify=true
- MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.stardivision.math;application/vnd.sun.xml.math;text/mathml;
- _Name=OpenOffice.org Math
- _GenericName=Formula
---- desktop/ooo-extension-manager.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/ooo-extension-manager.desktop.in.in	2010-03-25 14:24:10.000000000 +0200
-@@ -5,7 +5,7 @@
- Exec=unopkg@OOO_BINSUFFIX@ gui %U
- NoDisplay=true
- Type=Application
--StartupNotify=false
-+StartupNotify=true
- Categories=X-SuSE-Core-Office;Office;
- MimeType=application/vnd.openofficeorg.extension;
- Name=OpenOffice.org Extension Manager
---- desktop/startcenter.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/startcenter.desktop.in.in	2010-03-25 14:24:20.000000000 +0200
-@@ -6,7 +6,7 @@
- Icon=ooo-gulls@OOO_BINSUFFIX@
- Type=Application
- Categories=Office;X-SuSE-Core-Office;
--StartupNotify=false
-+StartupNotify=true
- InitialPreference=5
- _Name=OpenOffice.org
- _GenericName=Office
---- desktop/template.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/template.desktop.in.in	2010-03-25 14:24:27.000000000 +0200
- Icon=ooo-gulls@OOO_BINSUFFIX@
- Type=Application
- Categories=X-SuSE-Core-Office;Office;
--StartupNotify=false
-+StartupNotify=true
- _Name=LibreOffice
- _GenericName=Office Suite
---- desktop/web.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/web.desktop.in.in	2010-03-25 14:24:33.000000000 +0200
-@@ -6,7 +6,7 @@
- Icon=ooo-web@OOO_BINSUFFIX@
- Type=Application
- Categories=Network;WebDevelopment;
--StartupNotify=false
-+StartupNotify=true
- MimeType=application/vnd.oasis.opendocument.text-web;
- _Name=OpenOffice.org Writer/Web
- _GenericName=Web Page Creation
---- desktop/writer.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
-+++ desktop/writer.desktop.in.in	2010-03-25 14:24:39.000000000 +0200
-@@ -6,7 +6,7 @@
- Icon=ooo-writer@OOO_BINSUFFIX@
- Type=Application
- Categories=Office;WordProcessor;
--StartupNotify=false
-+StartupNotify=true
- MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
- InitialPreference=5
- _Name=OpenOffice.org Writer

diff --git a/app-office/libreoffice/files/env_log.diff b/app-office/libreoffice/files/env_log.diff
deleted file mode 100644
index 908169a..0000000
--- a/app-office/libreoffice/files/env_log.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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/libreoffice/files/fix-ooo-collision.diff b/app-office/libreoffice/files/fix-ooo-collision.diff
deleted file mode 100644
index 5bdc5c2..0000000
--- a/app-office/libreoffice/files/fix-ooo-collision.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- bin/package-ooo.orig	2010-11-29 20:16:08.700004578 +0100
-+++ bin/package-ooo	2010-11-29 20:20:47.972004579 +0100
-@@ -104,12 +104,12 @@
- ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
- 
- # no man-page so ...
--if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
-+if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva" -a "z$VENDORNAME" != "zGentoo"; then
-     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
-     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
- fi
- 
--if test "z$VENDORNAME" = "zMandriva"; then
-+if test "z$VENDORNAME" = "zMandriva" -o "z$VENDORNAME" = "zGentoo"; then
-     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
-     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
- fi
-@@ -210,9 +210,9 @@
- 	done
- 	
- 	# shared MIME info
--	mkdir -p $PREFIX/share/mime/packages
-+	mkdir -p $DATADIR/mime/packages
- 	cd $TOOLSDIR/desktop
--	cp openoffice.xml $PREFIX/share/mime/packages
-+	cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml
- 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
- 	   which update-mime-database >/dev/null 2>&1 ; then
- 	    update-mime-database /usr/share/mime || :

diff --git a/app-office/libreoffice/files/gentoo-3.3.1.diff b/app-office/libreoffice/files/gentoo-3.3.1.diff
deleted file mode 100644
index 8f0bcc1..0000000
--- a/app-office/libreoffice/files/gentoo-3.3.1.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- distro-configs/Gentoo.conf.in
-+++ distro-configs/Gentoo.conf.in
-@@ -1,5 +1,3 @@
----disable-fontooo
----disable-qadevooo
- --enable-neon
- --enable-xrender-link
- --with-external-dict-dir=/usr/share/myspell
---- patches/dev300/apply 
-+++ patches/dev300/apply
-@@ -1687,16 +1687,8 @@
- [ GentooOnly ]
- SectionOwner => aprosky
- 
--# Allow build to proceed with PaX enabled
--gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
- 64bit-jdk-server-paths.diff, i#65974, hmth
--# use IBM j9vm over IBM classic JVM
--ibm-j9vm.diff, hmth
--# system db check
--system-db-check.diff, i#65979, hmth
--# User ~/.ooo3 as user dir
--scp2-user-config-ooo3.diff, pmladek
- # default inc/lib
- config_office-XINC-XLIB-defaults.diff, i#65976
- # Sandbox problem with wrong path
---- configure.in 
-+++ configure.in 
-@@ -1326,12 +1326,18 @@
- 	done
-     fi
-     SUNTEMPLATES_LANG=
--    # check whether the langs are requested at all
--    for lang in $wanted_sun_templates ; do
--        if test -n "`echo $with_lang | grep "$lang"`" ; then
--                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
--        fi
--    done
-+
-+    # --with-lang="" now used for en-US
-+    if test "z$with_lang" = "z" ; then
-+        SUNTEMPLATES_LANG="en-US"
-+    else
-+        # check whether the langs are requested at all
-+        for lang in $wanted_sun_templates ; do
-+	    if test -n "`echo $with_lang | grep "$lang"`" ; then
-+		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-+	    fi
-+        done
-+    fi
-     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
- fi
- AC_SUBST(SUNTEMPLATES_LANG)
---- bin/package-ooo
-+++ bin/package-ooo
-@@ -126,8 +126,8 @@
- fi
- 
- # create bash completion
--mkdir -p $OODESTDIR/etc/bash_completion.d
--$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
-+mkdir -p $SYSCONFDIR/bash_completion.d
-+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
- if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
- fi
-

diff --git a/app-office/libreoffice/files/gentoo-3.3.2.diff b/app-office/libreoffice/files/gentoo-3.3.2.diff
deleted file mode 100644
index 2a4b293..0000000
--- a/app-office/libreoffice/files/gentoo-3.3.2.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- distro-configs/Gentoo.conf.in
-+++ distro-configs/Gentoo.conf.in
-@@ -1,5 +1,3 @@
----disable-fontooo
----disable-qadevooo
- --enable-neon
- --enable-xrender-link
- --with-external-dict-dir=/usr/share/myspell
---- configure.in 
-+++ configure.in 
-@@ -1326,12 +1326,18 @@
- 	done
-     fi
-     SUNTEMPLATES_LANG=
--    # check whether the langs are requested at all
--    for lang in $wanted_sun_templates ; do
--        if test -n "`echo $with_lang | grep "$lang"`" ; then
--                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
--        fi
--    done
-+
-+    # --with-lang="" now used for en-US
-+    if test "z$with_lang" = "z" ; then
-+        SUNTEMPLATES_LANG="en-US"
-+    else
-+        # check whether the langs are requested at all
-+        for lang in $wanted_sun_templates ; do
-+	    if test -n "`echo $with_lang | grep "$lang"`" ; then
-+		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-+	    fi
-+        done
-+    fi
-     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
- fi
- AC_SUBST(SUNTEMPLATES_LANG)
---- bin/package-ooo
-+++ bin/package-ooo
-@@ -126,8 +126,8 @@
- fi
- 
- # create bash completion
--mkdir -p $OODESTDIR/etc/bash_completion.d
--$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
-+mkdir -p $SYSCONFDIR/bash_completion.d
-+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
- if test "$COMPAT_OOWRAPPERS" = "YES" ; then
-     $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX"  $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
- fi
-

diff --git a/app-office/libreoffice/files/gentoo-pythonpath.diff b/app-office/libreoffice/files/gentoo-pythonpath.diff
deleted file mode 100644
index 4714b0a..0000000
--- a/app-office/libreoffice/files/gentoo-pythonpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/libreoffice/files/libreoffice-3.3-libpng-1.5.diff b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
deleted file mode 100644
index d0ca2ed..0000000
--- a/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- desktop/unx/source/splashx.c.ark	2011-01-16 20:25:10.846685172 +0100
-+++ desktop/unx/source/splashx.c	2011-01-16 20:27:12.673351839 +0100
-@@ -137,8 +137,8 @@ int splash_load_bmp( const char *filenam
-                   PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL);
- 
-     bitmap_rows = png_get_rows( png_ptr, info_ptr );
--    width = info_ptr->width;
--    height = info_ptr->height;
-+    width = png_get_image_width( png_ptr, info_ptr );
-+    height = png_get_image_height( png_ptr, info_ptr );
- 
- #if 0
-     {

diff --git a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
deleted file mode 100644
index 168d272..0000000
--- a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- libxmlsec/makefile.mk.ORIGINAL	2010-11-11 09:35:21.000000000 -0600
-+++ libxmlsec/makefile.mk	2011-02-13 03:13:41.496866392 -0600
-@@ -67,7 +67,8 @@
-    xmlsec1-noverify.patch \
-    xmlsec1-mingw32.patch \
-    xmlsec1-mingw-keymgr-mscrypto.patch \
--   xmlsec1-vc10.patch
-+   xmlsec1-vc10.patch \
-+   xmlsec1-1.2.14_fix_extern_c.patch
- 
- ADDITIONAL_FILES= \
-     include$/xmlsec$/mscrypto$/akmngr.h \
---- libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.ORIGINAL	1969-12-31 18:00:00.000000000 -0600
-+++ libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch	2011-02-13 03:11:34.740594681 -0600
-@@ -0,0 +1,23 @@
-+--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL	2009-12-05 15:19:18.000000000 -0600
-++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h	2011-02-13 03:09:42.917240245 -0600
-+@@ -11,16 +11,16 @@
-+ #ifndef __XMLSEC_H__
-+ #define __XMLSEC_H__    
-+ 
-+-#ifdef __cplusplus
-+-extern "C" {
-+-#endif /* __cplusplus */ 
-+-
-+ #include <libxml/tree.h>
-+ 
-+ #include <xmlsec/version.h>
-+ #include <xmlsec/exports.h>
-+ #include <xmlsec/strings.h>
-+ 
-++#ifdef __cplusplus
-++extern "C" {
-++#endif /* __cplusplus */ 
-++
-+ /***********************************************************************
-+  *
-+  * Basic types to make ports to exotic platforms easier

diff --git a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff
deleted file mode 100644
index 4230374..0000000
--- a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- ucb/source/ucp/webdav/NeonSession.cxx
-+++ ucb/source/ucp/webdav/NeonSession.cxx
-@@ -253,9 +253,6 @@
- 
- // -------------------------------------------------------------------
- extern "C" int NeonSession_NeonAuth( void *       inUserData,
--#ifdef NE_FEATURE_SSPI
--                                     const char * inAuthProtocol,
--#endif
-                                      const char * inRealm,
-                                      int          attempt,
-                                      char *       inoutUserName,
-@@ -322,14 +319,6 @@
- 
-     bool bCanUseSystemCreds = false;
- 
--#ifdef NE_FEATURE_SSPI
--    bCanUseSystemCreds
--        = (attempt == 0) && // avoid endless loops
--          ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
--          ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
--            ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
--#endif
--
-     int theRetVal = pListener->authenticate(
-                             rtl::OUString::createFromAscii( inRealm ),
-                             theSession->getHostName(),

diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff b/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
deleted file mode 100644
index 869b6c8..0000000
--- a/app-office/libreoffice/files/libreoffice-3.3.2-bison25.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
-+++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
-@@ -4338,7 +4338,7 @@
- }
- 
- // -------------------------------------------------------------------------
--void OSQLParser::error(sal_Char *fmt)
-+void OSQLParser::error(const sal_Char *fmt)
- {
- 	if(!m_sErrorMessage.getLength())
- 	{
---- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
-+++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
-@@ -233,7 +233,7 @@
-         // returns the type for a parameter in a given function name
-         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
- 
--        void error(sal_Char *fmt);
-+        void error(const sal_Char *fmt);
-         int SQLlex();
- #ifdef YYBISON
-         void setParseTree(OSQLParseNode * pNewParseTree);
-

diff --git a/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff b/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff
deleted file mode 100644
index 90df8db..0000000
--- a/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sal/qa/osl/security/osl_Security.cxx.orig	2011-02-24 19:36:38.704013640 +0100
-+++ sal/qa/osl/security/osl_Security.cxx	2011-02-24 19:38:50.580013586 +0100
-@@ -342,8 +342,6 @@
- CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser);
- CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent);
- CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserName);
--CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHomeDir);
--CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getConfigDir);
- CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::isAdministrator);
- CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle);
- CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile);

diff --git a/app-office/libreoffice/files/libreoffice-3.4.2-allopts.txt b/app-office/libreoffice/files/libreoffice-3.4.2-allopts.txt
deleted file mode 100644
index d00e0db..0000000
--- a/app-office/libreoffice/files/libreoffice-3.4.2-allopts.txt
+++ /dev/null
@@ -1,767 +0,0 @@
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-ext-barcode    Enables the Barcode extension.
-  --enable-ext-diagram    Enables the Diagram extension.
-  --enable-ext-google-docs
-                          Download and enables the Google Documents extension.
-  --enable-ext-hunart     Enables the Hungarian Cross-reference Toolbar
-                          extension.
-  --enable-ext-lightproof Enables the Lightproof extension.
-  --enable-ext-mysql-connector
-                          Enables the build of the MySQL Connector/LibO
-                          extension. This requires access to the MySQL
-                          Connector/C (aka libmysql) to be given, too, with
-                          either the --with-system-mysql or
-                          --with-libmysql-path option.
-  --enable-ext-nlpsolver  Download and enables the NLPSolver extension.
-  --enable-ext-ct2n       Enables the ConvertTextToNumber extension.
-  --enable-ext-numbertext Enables the Numbertext extension.
-  --enable-ext-oooblogger Download and enables the OOo Blogger extension.
-  --enable-ext-pdfimport  Enables the PDF Import extension and xpdf.
-  --enable-ext-presenter-console
-                          Enables the Presenter Console extension.
-  --enable-ext-presenter-minimizer
-                          Enables the Presentation Minimizer extension.
-  --enable-ext-report-builder
-                          Enables the build of the Report Builder extension.
-  --enable-ext-scripting-beanshell
-                          Enables support for scripts in BeanShell.
-  --enable-ext-scripting-javascript
-                          Enables support for scripts in JavaScript.
-  --enable-ext-scripting-python
-                          Enables support for scripts in Python.
-  --enable-ext-typo       Enables the Typography Toolbar extension.
-  --enable-ext-validator  Enables the Validator extension.
-  --enable-ext-watch-window
-                          Enables the Watch Window extension to Calc.
-  --enable-ext-wiki-publisher
-                          Enables the Wiki Publisher extension.
-  --enable-graphite       Enables the compilation of Graphite smart font
-                          rendering.
-  --disable-ldap          Disables the use of LDAP backend via
-                          Netscape/Mozilla or OpenLDAP LDAP SDK
-  --disable-fetch-external
-                          Disables fetching external tarballs from web
-                          sources.
-  --disable-lockdown      Disables the gconf integration work in LibO.
-  --disable-vba           Disables the vba compatibility feature.
-  --enable-pch            EXPERIMENTAL: Enables precompiled header support for
-                          C++.
-  --disable-mozilla       LibO usually includes a strangely hacked up mozilla
-                          binary for your platform, to build without this
-                          version, use this option.
-  --enable-epm            LibO includes self-packaging code, that requires
-                          epm, however epm is useless for large scale package
-                          building.
-  --disable-activex-component
-                          Remove support for ActiveX embedding of LibO.
-  --disable-odk           LibO includes an ODK, office development kit which
-                          some packagers may with to build without.
-  --disable-mathmldtd     Disable mathmldtd (useful for distributions that
-                          want to avoid packaging it).
-  --enable-evolution2     Allows the built-in evolution 2 addressbook
-                          connectivity build to be enabled.
-  --disable-cups          Disable cups support in the psprint project.
-  --disable-fontconfig    Disable support for the fontconfig library.
-  --disable-directx       Remove DirectX implementation for the new XCanvas
-                          interface. The DirectX support requires more stuff
-                          installed on Windows to compile. (DirectX SDK, GDI+
-                          libs)
-  --disable-activex       Disable the use of ActiveX for windows build.
-
-                          This switch is mandatory when using VC++ 2008 Express.
-
-  --disable-atl           Disable the use of ATL for windows build.
-
-                          This switch is mandatory when using VC++ 2008 Express.
-
-  --enable-symbols        Include debugging symbols in output. WARNING - a
-                          complete build needs 8 Gb of space and takes much
-                          longer (enables -g compiler flag).
-
-                          Enabling symbols disables the stripping of the solver
-                          (--disable-strip-solver).
-
-  --disable-strip-solver  Disable the stripping of the solver. By default the
-                          solver is stripped unless a build with debugging
-                          symbols (--enable-symbols) is requested.
-
-                          This switch allows to override this setting.
-
-  --enable-werror         Turn warnings to errors. (Has no effect in modules
-                          where the treating of warnings as errors is disabled
-                          explicitly.)
-  --enable-debug          Include debugging symbols from --enable-symbols plus
-                          extra debugging code. Extra large build! (enables -g
-                          compiler flag and dmake debug=true) If you need even
-                          more verbose output, build a module with "build --
-                          debug=true dbglevel=2".
-  --enable-dbgutil        Include additional debugging utilities, such as
-                          assertions, object counting, etc. Larger build.
-                          Independent from --enable-debug
-  --enable-crashdump      Enable the crashdump feature.
-  --disable-python        Disable build of Python 2.x UNO API.
-  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
-                          where Gtk+ is available.
-  --disable-systray       Determines whether to build the systray
-                          quickstarter.
-  --disable-broffice      When disabled, broffice specific branding artwork
-                          for use in the pt_BR locale is removed, giving
-                          uniform branding.
-  --enable-split-app-modules
-                          Split file lists for app modules, e.g. base, calc.
-                          Has effect only with make distro-pack-install
-  --enable-split-opt-features
-                          Split file lists for some optional features, .e.g.
-                          pyuno, testtool. Has effect only with make
-                          distro-pack-install
-  --disable-cairo         Determines whether to use Cairo library on platforms
-                          where Cairo is available.
-  --disable-opengl        Determines whether to build the OpenGL 3D slide
-                          transitions component.
-  --enable-dbus           Determines whether to enable presentation mode
-                          screensaver control under GNOME via DBUS.
-  --disable-gconf         Determines whether to use the GConf support.
-  --disable-gnome-vfs     Determines whether to use the Gnome Virtual Filing
-                          System on platforms where that VFS is available.
-  --enable-gio            Determines whether to use the GIO support.
-  --enable-static-gtk     Modules that are linked against gtk libraries use
-                          the static libraries instead of the dynamic ones.
-                          (Enables -Bstatic linker flag for gtk libraries.)
-  --enable-layout         Enable the compilation and use of layout dialogs.
-  --disable-build-mozilla Use this option if you do not want to build the
-                          mozilla components from the mozilla source code but
-                          take precompiled zips.
-  --disable-nss-module    Whether to use provided NSS module.
-  --enable-kde            Determines whether to use Qt3/KDE3 vclplug on
-                          platforms where Qt3 and KDE3 are available.
-  --disable-kdeab         Disable the KDE3 address book support.
-  --enable-kde4           Determines whether to use Qt4/KDE4 vclplug on
-                          platforms where Qt4 and KDE4 are available. May be
-                          used with --enable-kde if you want to support both
-                          KDE3 and KDE4.
-  --disable-unix-qstart-libpng
-                          On UNIX systems, we have a faster splash app, that
-                          can use libpng to render its splash, if we can
-                          safely link to the system libpng then enabling this
-                          is a good idea (ie. for Linux Distro packaging).
-  --enable-binfilter      Enable legacy binary file formats filters build.
-  --disable-rpath         Disable the use of relative paths in shared
-                          libraries.
-  --enable-xrender-link   Link with libXrender instead of dynamically open it.
-  --disable-randr         Disable RandR support in the vcl project.
-  --disable-randr-link    Disable linking with libXrandr, instead dynamically
-                          open it at runtime.
-  --disable-gstreamer     Disable building the gstreamer avmedia backend.
-  --disable-neon          Disable neon and the compilation of webdav binding.
-  --disable-Xaw           Disables the use of Xaw for the Netscape/Mozilla
-                          plugin.
-  --enable-check-only     Use this option option if you just want to check
-                          your environment. This option stops the generation
-                          of an ????env.set.
-
-                          Usage:     --enable-check-only=yes
-
-  --enable-build-unowinreg
-                          Do not use the prebuilt unowinreg.dll. Build it
-                          instead. The MinGW C++ compiler is needed on Linux.
-
-                          Usage:     --enable-build-unowinreg
-
-  --enable-verbose        Increase build verbosity.
-  --disable-verbose       Decrease build verbosity.
-  --enable-dependency-tracking
-                          Do not reject slow dependency extractors.
-  --disable-dependency-tracking
-                          Disables generation of dependency information.
-                          Speed up one-time builds.
-  --enable-icecream       Use the 'icecream' distributed compiling tool to
-                          speedup the compilation. It defaults to
-                          /opt/icecream for the location of the icecream
-                          gcc/g++ wrappers, you can override that using
-                          --with-gcc-home=/the/path switch.
-  --disable-zenity        Do not display a build icon in the notification area
-                          (on unix) during build.
-  --enable-cl-x64         Use the Microsoft C/C++ x64 compiler instead of the
-                          default x86 one.
-  --enable-extra-gallery  Add extra gallery content.
-  --enable-extra-template Add extra temaplte content.
-  --enable-extra-sample   Add extra sample content.
-  --enable-extra-font     Add extra font content.
-  --enable-lomenubar      Enable global menu support.
-  --enable-online-update  Enable the online update service that will check for
-                          new versions of LibreOffice. By default, it is on on
-                          Windows and Mac, and off on Linux.
-  --disable-largefile     omit support for large files
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD.
-  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD.
-  --with-system-graphite  Use graphite library already installed on system.
-  --with-external-tar=<TARFILE PATH>
-                          Specify path to tarfiles manually.
-  --with-linked-git=<OTHER_CLONE_DIR>
-                          Specify another checkout's clonedir to re-use. This
-                          makes use of git-new-workdir, and saves a lot of
-                          diskspace when having multiple trees side-by-side.
-  --with-openldap         Enables the use of the OpenLDAP LDAP SDK instead of
-                          the Netscape/Mozilla one.
-  --with-vba-package-format
-                          Specify package format for vba compatibility api.
-                          Specifying "builtin" means the api component and
-                          associated type library are part of the installation
-                          set. Specifying "extn" creates an uno extension that
-                          is part of the installation set (located in the
-                          program directory) that MUST be optionly registered
-                          using either the unopkg executeable or the extension
-                          manager gui.
-
-                          Note: "builtin" is the default, "extn" can cause
-                          problems.
-
-                          Usage:     --with-vba-package-format="builtin" or
-                                     --with-vba-package-format="extn"
-
-  --with-theme="theme1 theme2..."
-                          Choose which themes to include. By default those
-                          themes with an '*' are included. Possible choices:
-                          *default, *crystal, *hicontrast, *oxygen, *tango,
-                          classic, industrial.
-  --with-extension-integration
-                          It will integrate the builded extensions to the
-                          installer of the product. Please use this switch to
-                          include any extension.
-
-  --without-helppack-integration      It will not integrate the helppacks to the installer
-                          of the product.
-                          Please use this switch to use the online help or separate help packages.
-  --without-fonts         LibO includes some third-party fonts to provide a
-                          reliable basis for help content, templates, samples,
-                          etc. When these fonts are already known to be
-                          available on the system then you should use this
-                          option.
-  --without-ppds          Removes Postscript Printer definition files from
-                          LibreOffice installation set, for people building
-                          for specific distributions where PPDs are known to
-                          be already available (every recent distro with CUPS
-                          backend).
-  --without-afms          Removes bitmap font files from LibreOffice
-                          installation set, for people building for specific
-                          distributions where AFM files or TrueType Fonts are
-                          known to be available.
-  --with-agfa-monotype-fonts
-                          Do not include the proprietary Agfa Monotype fonts
-                          (even if present) in the LibreOffice installation
-                          set.
-
-  --with-epm              Decides which epm to use. Default is to use the one
-                          from the system if one is built. When either this is
-                          not there or you say =internal epm will be built.
-  --with-package-format   Specify package format(s) for LibO installsets.
-                          Default is the "normal" one of the OS/Distribution.
-                          Possible values: aix, bsd, deb, inst, tardist, osx,
-                          pkg, rpm, setld, native, portable, archive, dmg,
-                          installed, msi. Example: --with-package-format="deb
-                          dmg"
-  --with-system-stdlibs   Use libstdc++/libgcc_s already on system.
-  --with-system-cairo     Use Cairo libraries already on system.
-  --with-mozilla-version  Choose which version of mozilla to use while
-                          building mozilla. (default=1.7.5) Note that not all
-                          versions are supported.
-  --with-mozilla-toolkit  Choose which GUI toolkit to use while building
-                          mozilla components. (default=gtk2)
-  --without-myspell-dicts Removes myspell dictionaries from LibreOffice
-                          installation set, for people building for specific
-                          distributions where the myspell dictionaries are
-                          installed from other sources.
-  --with-system-dicts     Use dictionaries from system paths- Specify them via
-                          --with-{dict,hyph,thes}-path=/path if you want to
-                          override the default ones.
-  --with-external-dict-dir
-                          Specify external dictionary dir.
-  --with-external-hyph-dir
-                          Specify external hyphenation pattern dir.
-  --with-external-thes-dir
-                          Specify external thesaurus dir.
-  --with-system-libs      Use libs already on system -- enables all
-                          --with-system-* flags except mozilla and
-                          odbc/sane/xrender-header(s).
-  --with-system-headers   Use headers already on system -- enables all
-                          --with-system-* flags for external packages whose
-                          headers are the only entities used i.e.
-                          boost/vigra/odbc/sane/xrender-header(s).
-  --without-system-jars   When building with --with-system-libs, also the
-                          needed jars are expected on the system. Use this to
-                          disable that (except for the db case where
-                          --with-system-db *has to* imply using the db.jar
-                          from there, too).
-  --with-system-zlib      Use zlib already on system.
-  --with-system-openssl   Use OpenSSL already on system.
-  --with-system-jpeg      Use jpeg already on system.
-  --with-system-expat     Use expat already on system.
-  --with-system-libwpd    Use libwpd already on system.
-  --with-system-libwps    Use libwps already on system.
-  --with-system-libwpg    Use libwpg already on system.
-  --with-system-libxml    Use libxml already on system.
-  --with-system-python    Use python already on system.
-  --with-system-translate-toolkit
-                          Use translate-toolkit already on system.
-  --with-system-icu       Use icu already on system.
-  --with-system-poppler   Use system poppler. (only needed for pdfimport
-                          extension)
-  --with-system-db        Use berkeley db already on system.
-  --with-system-lucene    Use lucene already on system.
-  --with-system-apache-commons
-                          Use apache commons libraries already on system.
-  --with-lucene-core-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-lucene-analyzers-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-system-mysql     Use MySQL libraries already on system, for building
-                          the MySQL Connector/LibO extension. Requires
-                          MYSQLCONFIG to point to the mysql_config executable.
-  --with-libmysql-path    Use Connector/C (libmysql) installation for building
-                          the MySQL Connector/LibO extension.
-
-                          Usage:     --with-libmysql-path=<absolute path to
-                                                  your Connector/C installation>
-
-  --with-system-mysql-cppconn
-                          Use MySQL C++ Connector libraries already on system.
-  --with-system-hsqldb    Use hsqldb already on system.
-  --with-hsqldb-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-system-beanshell Use beanshell already on system.
-  --with-beanshell-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-codec-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-lang-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-httpclient-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-logging-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-servlet-api-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-system-jfreereport
-                          Use JFreeReport already on system.
-  --with-sac-jar=JARFILE  Specify path to jarfile manually.
-  --with-libxml-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-flute-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-jfreereport-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-liblayout-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libloader-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libformula-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-librepository-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libfonts-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libserializer-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libbase-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-system-saxon     Use saxon already on system.
-  --with-saxon-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-system-libxslt   Use libxslt already on system.
-  --with-system-odbc      Use the odbc headers already on system.
-  --with-system-sane-header
-                          Use sane.h already on system.
-  --with-system-xrender-headers
-                          Use XRender headers already on system.
-  --with-system-mesa-headers
-                          Use Mesa headers already on system.
-  --with-system-curl      Use curl already on system.
-  --with-system-boost     Use boost already on system.
-  --with-system-mdds      Use mdds already on system.
-  --with-system-vigra     Use vigra already on system.
-  --with-system-neon      Use neon already on system.
-  --with-system-hunspell  Use libhunspell already on system.
-  --with-system-mythes    Use mythes already on system.
-  --with-system-altlinuxhyph
-                          Use ALTLinuxhyph already on system.
-  --with-system-lpsolve   Use lpsolve already on system.
-  --with-system-libtextcat
-                          Use libtextcat already on system.
-  --with-external-libtextcat-data
-                          Use libtextcat data already on system.
-  --with-system-cppunit   Use cppunit already on system.
-  --with-system-redland   Use redland library already on system.
-  --with-system-mozilla   Use mozilla already on system. Note that some
-                          components cannot be built against a contemporary
-                          mozilla. The flavour used can be specified by
-                          --with-system-mozilla=<flavour>. Supported are:
-                          libxul (default), xulrunner, firefox, seamonkey,
-                          mozilla.
-  --with-linker-hash-style
-                          Use linker with --hash-style=<style> when linking
-                          shared objects. Possible values: "sysv", "gnu",
-                          "both". The default value is "gnu" if supported on
-                          the build system, and "sysv" otherwise.
-  --with-stlport          Build the STLPort library for compatibility with old
-                          extensions for architectures where STLPort used to
-                          be used.
-  --with-jdk-home         If you have installed JDK 1.3 or later on your
-                          system please supply the path here. Note that this
-                          is not the location of the Java binary but the
-                          location of the entire distribution.
-
-                          Usage:     --with-jdk-home=<absolute path to JDK home>
-
-  --with-gxx-include-path If you want to override the autodetected g++ include
-                          path.
-
-                          Usage:     --with-gxx-include-path=<absolute path to
-                                                                g++ include dir>
-
-  --with-java             Build with(out) Java support. If you use
-                          --without-java/--with-java=no then the build will
-                          have no support for Java components, applets,
-                          accessibility or XML filters.
-  --with-java-target-version
-                          Generate class files that will work on JVMs with the
-                          specified version. For example, use
-                          --with-java-target-version=1.4 to make sure that the
-                          application will work with JVM 1.4 even when
-                          compiled with JDK 1.5.
-
-                          This option is ignored when you compile with gcj/gij.
-
-                          Usage:     --with-java-target-version=<jvm version>
-
-  --with-jvm-path         Use a specific JVM search path at runtime.
-
-                          Usage: --with-jvm-path=<absolute path to parent of jvm home>
-
-                          e. g.: --with-jvm-path=/usr/lib/
-                                 to find JRE/JDK in /usr/lib/jvm/
-
-  --with-ant-home         If you have installed Jakarta Ant on your system,
-                          please supply the path here. Note that this is not
-                          the location of the Ant binary but the location of
-                          the entire distribution.
-
-                          Usage:     --with-ant-home=<absolute path to Ant home>
-
-  --with-junit            Specifies the JUnit 4 jar file to use for
-                          JUnit-based tests. --without-junit disables those
-                          tests. Not relevant in the --without-java case.
-
-                          Usage:     --with-junit=<absolute path to JUnit 4 jar>
-
-  --with-perl-home        If you have installed the Perl 5 Distribution, on
-                          your system, please supply the path here. Note that
-                          this is not the location of the Perl binary but the
-                          location of the entire distribution.
-
-                          Usage:     --with-perl-home=<abs. path to Perl 5 home>
-
-  --with-cl-home          For Windows NT users, please supply the path for the
-                          Microsoft C/C++ compiler. Note that this is not the
-                          location of the compiler binary but the location of
-                          the entire distribution.
-
-                          Usage:     --with-cl-home=<absolute path to Microsoft
-                                                            C/C++ compiler home>
-
-  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply
-                          the path pointing to the mspdb80.dll (if using
-                          Visual Studio 2008) or mspdb100.dl (if using Visual
-                          Studio 2010).
-
-                          Usage:     --with-mspdb-path=<path to
-                                                       mspdb80.dll/mspdb100.dll>
-
-  --with-midl-path        For Microsoft compiler users, please supply the path
-                          pointing to the midl.exe.
-
-                          Usage:     --with-midl-path=<abs. path to midl.exe>
-
-  --with-csc-path         For Windows builds, please supply the path pointing
-                          to the csc.exe. Usually found automatically.
-
-                          Usage:     --with-csc-path=<abs. path to csc.exe>
-
-  --with-nsis-path        For Windows users, please supply the path to the
-                          "Nullsoft Scriptable Install System" (NSIS). If NSIS
-                          is found in the path or this option is supplied a
-                          self contained executable installer for LibreOffice
-                          will be created.
-
-                          Usage:     --with-nsis-path=<abs. path to nsis.exe>
-
-  --with-frame-home       For Microsoft compiler users, please supply the path
-                          pointing to lib/mscoree.lib, usually something like:
-                          "/cygdrive/c/Program Files/Windows
-                          SDKs/Windows/v7.0"
-
-                          Note that in most cases it will be automatically
-                          found, though.
-
-                          Usage:     --with-frame-home=<absolute path to .NET
-                                                                      Framework>
-
-  --with-psdk-home        For Windows users, please supply the path to the
-                          Windnows SDK. Usually found automatically.
-
-                          Usage:     --with-psdk-home=<abs. path to Windows SDK>
-
-  --with-directx-home     For Windows users, please supply the path to the
-                          Microsoft DirectX SDK.
-
-                          Usage:     --with-directx-home=<absolute path to
-                                                          Microsoft DirectX SDK>
-
-  --with-mozilla-build    For Windows users, please supply the path to the
-                          mozilla build tools.
-
-                          Usage:     --with-mozilla-build=<absolute path to
-                                                            mozilla build tools>
-
-                          At the moment of this writing, an installer for the
-                          mozilla build tools can be obtained from http://ftp.
-                          mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
-
-  --with-local-solenv     If you have solenv in a location other than
-                          ./solenv, please supply the path here.
-
-                          Usage:     --with-local-solenv=<abs. path to solenv>
-
-  --with-local-solver     If you have solver in a location other than
-                          ./solver, please supply the path here.
-
-                          Usage:     --with-local-solver=<abs. path to solver>
-
-  --with-lang             Use this option to build LibreOffice with additional
-                          language support. English (US) is always included by
-                          default. Separate multiple languages with space. For
-                          all languages, use --with-lang=ALL.
-
-                          Usage:     --with-lang="es sw tu cs sk"
-
-  --with-intro-bitmap    Prefer the specified intro bitmap over the
-                          the default one.
-
-                          Usage: --with-intro-bitmap=/path/my_ooo_intro.png
-
-  --with-about-bitmap    Similarly to --with-intro-bitmap, this allows
-                          specification of bitmap for the About box.
-
-                          Usage: --with-about-bitmap=/path/my_ooo_about.png
-
-  --with-vendor           Set vendor of the build.
-
-                          Usage:     --with-vendor="John the Builder"
-
-  --with-install-dirname  Specify the directory name of the core LibO install
-                          dir. The final installation path is defined by
-                          <libdir>/<install-dirname>. The default value is
-                          "libreoffice" and the default installation path is
-                          /usr/lib/libreoffice. FIXME: It affects only the
-                          installation by "make install" and not the generated
-                          installation sets.
-
-                          Usage:     --with-install-dirname=lo-3.4.2
-
-  --with-unix-wrapper     Redefines the name of the UNIX wrapper that will be
-                          used in the desktop files and in the
-                          desktop-integration RPMs.
-
-                          Usage:     --with-unix-wrapper=ooffice
-
-  --with-compat-oowrappers
-                          Install oo* wrappers in parallel with lo* ones to
-                          keep backward compatibility. Has effect only with
-                          make distro-pack-install
-  --with-asm-home         For Windows, please supply the path for the ml.exe
-                          or ml64.exe assembler.
-
-                          Usage:     --with-asm-home=<path to assembler directory>
-
-  --with-os-version       For FreeBSD users, use this option option to
-                          override the detected OSVERSION.
-
-                          Usage:     --with-os-version=<OSVERSION>
-
-  --with-zip-home         If you use a non standard zip, for example windows
-                          please supply the path for zip.
-
-                          Usage:     --with-zip-home=<path to zip executable>
-
-  --with-mingw            For Windows users, use the MinGW compiler within a
-                          Cygwin environment.
-
-                          Usage:     --with-mingw=yes
-
-                          For non-Windows use, use the MinGW C++ compiler to
-                          (re-)build unowinreg.dll. Specify the MinGW C++
-                          Compilers name.
-
-                          Usage:     --with-mingw=i586-mingw32msvc-g++
-
-  --with-build-version    Allows the builder to add a custom version tag that
-                          will appear in the Help/About box for QA purposes.
-
-                          Usage:     --with-build-version="Built by Jim"
-
-  --with-alloc            Define which allocator to build with (choices are
-                          oo, system, tcmalloc, jemalloc). Note that on
-                          FreeBSD/NetBSD system==jemalloc
-  --with-sun-templates    Integrate Sun template packages.
-  --with-num-cpus         Number of build processes/cpus to use (number of
-                          projects that will build at the same time).
-                          Multi-process/multi-cpu builds can save a lot of
-                          time on multi-cpu machines. Defaults to the number
-                          of CPUs on the machine.
-  --with-max-jobs         Maximum number of jobs per one CPU that will be
-                          issued at the same time my dmake. The real number of
-                          the jobs is affected by the --with-num-cpus too, it
-                          can get up to CPUS*max_jobs. Defaults to 1, unless
-                          you configure --enable-icecream - then to 10.
-  --with-x                use the X Window System
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  FONTCONFIG_CFLAGS
-              C compiler flags for FONTCONFIG, overriding pkg-config
-  FONTCONFIG_LIBS
-              linker flags for FONTCONFIG, overriding pkg-config
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  LIBWPD_CFLAGS
-              C compiler flags for LIBWPD, overriding pkg-config
-  LIBWPD_LIBS linker flags for LIBWPD, overriding pkg-config
-  CPPUNIT_CFLAGS
-              C compiler flags for CPPUNIT, overriding pkg-config
-  CPPUNIT_LIBS
-              linker flags for CPPUNIT, overriding pkg-config
-  FREETYPE_CFLAGS
-              C compiler flags for FREETYPE, overriding pkg-config
-  FREETYPE_LIBS
-              linker flags for FREETYPE, overriding pkg-config
-  LIBWPS_CFLAGS
-              C compiler flags for LIBWPS, overriding pkg-config
-  LIBWPS_LIBS linker flags for LIBWPS, overriding pkg-config
-  LIBWPG_CFLAGS
-              C compiler flags for LIBWPG, overriding pkg-config
-  LIBWPG_LIBS linker flags for LIBWPG, overriding pkg-config
-  LIBXSLT_CFLAGS
-              C compiler flags for LIBXSLT, overriding pkg-config
-  LIBXSLT_LIBS
-              linker flags for LIBXSLT, overriding pkg-config
-  LIBXML_CFLAGS
-              C compiler flags for LIBXML, overriding pkg-config
-  LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
-  MOZ_NSS_CFLAGS
-              C compiler flags for MOZ_NSS, overriding pkg-config
-  MOZ_NSS_LIBS
-              linker flags for MOZ_NSS, overriding pkg-config
-  MOZ_NSPR_CFLAGS
-              C compiler flags for MOZ_NSPR, overriding pkg-config
-  MOZ_NSPR_LIBS
-              linker flags for MOZ_NSPR, overriding pkg-config
-  MOZILLAXPCOM_CFLAGS
-              C compiler flags for MOZILLAXPCOM, overriding pkg-config
-  MOZILLAXPCOM_LIBS
-              linker flags for MOZILLAXPCOM, overriding pkg-config
-  MOZGTK2_CFLAGS
-              C compiler flags for MOZGTK2, overriding pkg-config
-  MOZGTK2_LIBS
-              linker flags for MOZGTK2, overriding pkg-config
-  MOZLIBREQ_CFLAGS
-              C compiler flags for MOZLIBREQ, overriding pkg-config
-  MOZLIBREQ_LIBS
-              linker flags for MOZLIBREQ, overriding pkg-config
-  GRAPHITE_CFLAGS
-              C compiler flags for GRAPHITE, overriding pkg-config
-  GRAPHITE_LIBS
-              linker flags for GRAPHITE, overriding pkg-config
-  XMKMF       Path to xmkmf, Makefile generator for X Window System
-  XRANDR_CFLAGS
-              C compiler flags for XRANDR, overriding pkg-config
-  XRANDR_LIBS linker flags for XRANDR, overriding pkg-config
-  NEON_CFLAGS C compiler flags for NEON, overriding pkg-config
-  NEON_LIBS   linker flags for NEON, overriding pkg-config
-  OPENSSL_CFLAGS
-              C compiler flags for OPENSSL, overriding pkg-config
-  OPENSSL_LIBS
-              linker flags for OPENSSL, overriding pkg-config
-  REDLAND_CFLAGS
-              C compiler flags for REDLAND, overriding pkg-config
-  REDLAND_LIBS
-              linker flags for REDLAND, overriding pkg-config
-  HUNSPELL_CFLAGS
-              C compiler flags for HUNSPELL, overriding pkg-config
-  HUNSPELL_LIBS
-              linker flags for HUNSPELL, overriding pkg-config
-  MYTHES_CFLAGS
-              C compiler flags for MYTHES, overriding pkg-config
-  MYTHES_LIBS linker flags for MYTHES, overriding pkg-config
-  GCONF_CFLAGS
-              C compiler flags for GCONF, overriding pkg-config
-  GCONF_LIBS  linker flags for GCONF, overriding pkg-config
-  GNOMEVFS_CFLAGS
-              C compiler flags for GNOMEVFS, overriding pkg-config
-  GNOMEVFS_LIBS
-              linker flags for GNOMEVFS, overriding pkg-config
-  GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
-  GTK_LIBS    linker flags for GTK, overriding pkg-config
-  GTK210_CFLAGS
-              C compiler flags for GTK210, overriding pkg-config
-  GTK210_LIBS linker flags for GTK210, overriding pkg-config
-  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
-  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
-  GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
-  GIO_LIBS    linker flags for GIO, overriding pkg-config
-  LIBPNG_CFLAGS
-              C compiler flags for LIBPNG, overriding pkg-config
-  LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
-  CAIRO_CFLAGS
-              C compiler flags for CAIRO, overriding pkg-config
-  CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
-  GSTREAMER_CFLAGS
-              C compiler flags for GSTREAMER, overriding pkg-config
-  GSTREAMER_LIBS
-              linker flags for GSTREAMER, overriding pkg-config
-  POPPLER_CFLAGS
-              C compiler flags for POPPLER, overriding pkg-config
-  POPPLER_LIBS
-              linker flags for POPPLER, overriding pkg-config
-  KDE_GLIB_CFLAGS
-              C compiler flags for KDE_GLIB, overriding pkg-config
-  KDE_GLIB_LIBS
-              linker flags for KDE_GLIB, overriding pkg-config
-  GOBJECT_CFLAGS
-              C compiler flags for GOBJECT, overriding pkg-config
-  GOBJECT_LIBS
-              linker flags for GOBJECT, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-LibreOffice home page: <http://documentfoundation.org/>.

diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
deleted file mode 100644
index 0c59f02..0000000
--- a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.in.orig	2011-01-13 21:12:40.420005851 +0100
-+++ configure.in	2011-01-13 21:15:23.680008513 +0100
-@@ -4456,16 +4456,17 @@
-        else return 1;
- }
-     ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
--    DB_LIB=
--    for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
--        AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
--            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
-+    save_LIBS="$LIBS"
-+    for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
-+        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] ,
-+            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ]
-             )
-         )
-     done
-     if test -z "$DB_LIB" ; then 
--        AC_MSG_ERROR([db not installed or functional])
-+        AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ])
-     fi
-+    LIBS="$save_LIBS"
-     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- else
-     AC_MSG_RESULT([internal])

diff --git a/app-office/libreoffice/files/libreoffice_options.txt b/app-office/libreoffice/files/libreoffice_options.txt
deleted file mode 100644
index 2731e11..0000000
--- a/app-office/libreoffice/files/libreoffice_options.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-  --enable-ext-barcode    Enables the Barcode extension.
-  --enable-ext-diagram    Enables the Diagram extension.
-  --enable-ext-google-docs
-                          Download and enables the Google Documents extension.
-  --enable-ext-hunart     Enables the Hungarian Cross-reference Toolbar
-                          extension.
-  --enable-ext-lightproof Enables the Lightproof extension.
-  --enable-ext-nlpsolver  Download and enables the NLPSolver extension.
-  --enable-ext-ct2n       Enables the ConvertTextToNumber extension.
-  --enable-ext-numbertext Enables the Numbertext extension.
-  --enable-ext-oooblogger Download and enables the OOo Blogger extension.
-  --enable-ext-report-builder
-                          Enables the build of the Report Builder extension.
-  --enable-ext-scripting-javascript
-                          Enables support for scripts in JavaScript.
-  --enable-ext-typo       Enables the Typography Toolbar extension.
-  --enable-ext-validator  Enables the Validator extension.
-  --enable-ext-watch-window
-                          Enables the Watch Window extension to Calc.
-  --enable-ext-wiki-publisher
-                          Enables the Wiki Publisher extension.
-  --disable-vba           Disables the vba compatibility feature.
-  --disable-activex-component
-                          Remove support for ActiveX embedding of LibO.
-  --disable-mathmldtd     Disable mathmldtd (useful for distributions that
-                          want to avoid packaging it).
-  --enable-layout         Enable the compilation and use of layout dialogs.
-  --disable-build-mozilla Use this option if you do not want to build the
-                          mozilla components from the mozilla source code but
-                          take precompiled zips.
-  --disable-nss-module    Whether to use provided NSS module.
-  --enable-lomenubar      Enable global menu support.
-
-Optional Packages:
-  --with-external-tar=<TARFILE PATH>
-                          Specify path to tarfiles manually.
-  --with-mozilla-version  Choose which version of mozilla to use while
-                          building mozilla. (default=1.7.5) Note that not all
-                          versions are supported.
-  --with-mozilla-toolkit  Choose which GUI toolkit to use while building
-                          mozilla components. (default=gtk2)
-  --with-lucene-core-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-lucene-analyzers-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-hsqldb-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-beanshell-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-codec-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-lang-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-httpclient-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-commons-logging-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-servlet-api-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-system-jfreereport
-                          Use JFreeReport already on system.
-  --with-sac-jar=JARFILE  Specify path to jarfile manually.
-  --with-libxml-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-flute-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-jfreereport-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-liblayout-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libloader-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libformula-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-librepository-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libfonts-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libserializer-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-libbase-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-saxon-jar=JARFILE
-                          Specify path to jarfile manually.
-  --with-external-libtextcat-data
-                          Use libtextcat data already on system.
-  --with-jdk-home         If you have installed JDK 1.3 or later on your
-                          system please supply the path here. Note that this
-                          is not the location of the Java binary but the
-                          location of the entire distribution.
-
-                          Usage:     --with-jdk-home=<absolute path to JDK home>
-
-  --with-gxx-include-path If you want to override the autodetected g++ include
-                          path.
-
-                          Usage:     --with-gxx-include-path=<absolute path to
-                                                                g++ include dir>
-
-  --with-java-target-version
-                          Generate class files that will work on JVMs with the
-                          specified version. For example, use
-                          --with-java-target-version=1.4 to make sure that the
-                          application will work with JVM 1.4 even when
-                          compiled with JDK 1.5.
-
-                          This option is ignored when you compile with gcj/gij.
-
-                          Usage:     --with-java-target-version=<jvm version>
-
-  --with-jvm-path         Use a specific JVM search path at runtime.
-
-                          Usage: --with-jvm-path=<absolute path to parent of jvm home>
-
-                          e. g.: --with-jvm-path=/usr/lib/
-                                 to find JRE/JDK in /usr/lib/jvm/
-
-  --with-ant-home         If you have installed Jakarta Ant on your system,
-                          please supply the path here. Note that this is not
-                          the location of the Ant binary but the location of
-                          the entire distribution.
-
-                          Usage:     --with-ant-home=<absolute path to Ant home>

diff --git a/app-office/libreoffice/files/scrap-pixmap-links.diff b/app-office/libreoffice/files/scrap-pixmap-links.diff
deleted file mode 100644
index 69cfbbe..0000000
--- a/app-office/libreoffice/files/scrap-pixmap-links.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -212,14 +212,6 @@
- 	    done
- 	done
- 
--	# create symlinks below share/pixmaps to keep the backward compatibility
--	pixmapsdir=$PREFIX/share/pixmaps
--	mkdir -p $pixmapsdir
--	cd $OODESTDIR$icondir/48x48/apps
--	for icon in ooo-*.png ; do
--	    ln -sf $icondir/48x48/apps/$icon $pixmapsdir
--	done
--	
- 	# shared MIME info
- 	mkdir -p $DATADIR/mime/packages
- 	cd $TOOLSDIR/desktop
---- bin/piece/desktop-support-app 
-+++ bin/piese/desktop-support-app 
-@@ -75,17 +75,6 @@
- 	test -n "$list_icon_dirs" && echo "%dir $icon_dir/$size/$category" >>files-$piece.txt
-     done
- 
--    # create symlink below share/pixmaps to keep the backward compatibility
--    if test "$category" = "apps" ; then
--	file=$DESTDIR/$icon_dir/48x48/apps/$icon_name.png
--	if test -f $file ; then
--	    filename=`basename $file`
--	    pixmaps_dir=/usr/share/pixmaps
--	    mkdir -p $DESTDIR$pixmaps_dir
--	    ln -sf $icon_dir/48x48/apps/$filename $DESTDIR$pixmaps_dir
--	    test -n "$DESTDIR" && echo "$pixmaps_dir/$filename" >>files-$piece.txt
--	fi
--    fi
- }
- 
- case "$app" in

diff --git a/app-office/libreoffice/files/sdext-presenter.diff b/app-office/libreoffice/files/sdext-presenter.diff
deleted file mode 100644
index b1eac7d..0000000
--- a/app-office/libreoffice/files/sdext-presenter.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sdext/source/presenter/makefile.mk	2011-01-24 20:03:50.376007211 +0100
-+++ sdext/source/presenter/makefile.mk	2011-01-24 20:04:45.184007227 +0100
-@@ -295,7 +295,7 @@
-     @@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
--$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
-+$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
-     @echo creating $@
-     @-$(MKDIRHIER) $(@:d)
-     $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@

diff --git a/app-office/libreoffice/files/wrapper.in b/app-office/libreoffice/files/wrapper.in
deleted file mode 100644
index 712ea60..0000000
--- a/app-office/libreoffice/files/wrapper.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-unset PYTHONPATH
-exec @GENTOO_PORTAGE_EPREFIX@/usr/LIBDIR/libreoffice/program/soffice  "$@"

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
deleted file mode 100644
index e785c33..0000000
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ /dev/null
@@ -1,549 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.1.ebuild,v 1.7 2011/07/18 14:22:33 scarabeus Exp $
-
-EAPI=3
-
-KDE_REQUIRED="optional"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads,xml"
-
-inherit base autotools check-reqs db-use eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 kde4-base multilib pax-utils prefix python toolchain-funcs
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org"
-DEV_URI="http://download.documentfoundation.org/libreoffice/src"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-SRC_URI="odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )"
-
-# Shiny split sources with so many packages...
-MODULES="artwork base calc components extensions extras filters help
-impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
-ure writer translations"
-# split out as bootstrap is required to be done first
-SRC_URI+=" ${DEV_URI}/${PN}-bootstrap-${PV}.tar.bz2"
-for mod in ${MODULES}; do
-	SRC_URI+=" ${DEV_URI}/${PN}-${mod}-${PV}.tar.bz2"
-done
-unset mod
-
-# addons
-ADDONS_SRC+=" ${ADDONS_URI}/09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
-ADDONS_SRC+=" ${ADDONS_URI}/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
-ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
-ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
-ADDONS_SRC+=" ${ADDONS_URI}/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
-ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
-ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
-ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
-ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz"
-ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
-ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
-ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
-SRC_URI+=" ${ADDONS_SRC}"
-
-# translations
-LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
-en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
-kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
-pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
-th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
-for X in ${LANGUAGES} ; do
-	IUSE+=" linguas_${X}"
-done
-unset X
-
-# intersection of available linguas and app-dicts/myspell-* dictionaries
-SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb
-nl nn pl pt ru sk sl sv tn zu"
-for X in ${SPELL_DIRS} ; do
-	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
-done
-unset X
-
-TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
-TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
-TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
-TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
-TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
-TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
-TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
-TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
-SRC_URI+=" templates? ( ${TDEPEND} )"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE+=" binfilter cups custom-cflags dbus debug eds gnome gstreamer
-gtk kde ldap mysql nsplugin odk offlinehelp opengl pch python templates webdav"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	app-text/mythes
-	app-text/libwpd:0.9[tools]
-	>=app-text/libwps-0.2.2
-	>=app-text/poppler-0.12.3-r3[xpdf-headers]
-	dev-db/unixODBC
-	dev-libs/expat
-	>=dev-libs/glib-2.18
-	>=dev-libs/hyphen-2.7.1
-	>=dev-libs/icu-4.0
-	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-0.9.8g
-	dev-libs/redland[ssl]
-	media-libs/freetype:2
-	>=media-libs/fontconfig-2.3.0
-	>=media-libs/vigra-1.4
-	media-libs/libpng
-	media-libs/libwpg:0.2
-	sci-mathematics/lpsolve
-	>=sys-libs/db-4.8
-	virtual/jpeg
-	>=x11-libs/cairo-1.0.2
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	cups? ( net-print/cups )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gnome? (
-		>=x11-libs/gtk+-2.10:2
-		gnome-base/gconf:2
-	)
-	gtk? ( >=x11-libs/gtk+-2.10:2 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
-	)
-	java? (
-		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.9
-		dev-java/lucene-analyzers:2.3
-		dev-java/saxon:0
-	)
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c++ )
-	nsplugin? (
-		net-libs/xulrunner:1.9
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1
-	)
-	opengl? ( virtual/opengl )
-	webdav? ( net-libs/neon )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/openoffice-bin
-	!app-office/openoffice
-	java? ( >=virtual/jre-1.5 )
-	${SPELL_DIRS_DEPEND}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-libs/libxml2-2.0
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	dev-util/cppunit
-	>=dev-util/gperf-3
-	dev-util/intltool
-	dev-util/mdds
-	dev-util/pkgconfig
-	media-gfx/sane-backends
-	>=net-misc/curl-7.12
-	>=sys-apps/findutils-4.1.20-r1
-	sys-devel/bison
-	sys-apps/coreutils
-	sys-devel/flex
-	sys-libs/zlib
-	x11-libs/libXtst
-	x11-proto/printproto
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		=virtual/jdk-1.6*
-		>=dev-java/ant-core-1.7
-		dev-java/junit:4
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
-	"${FILESDIR}/${PN}-libdb5-fix-check.diff"
-	"${FILESDIR}/${PN}-3.4.1-salfix.diff"
-	"${FILESDIR}/sdext-presenter.diff"
-)
-
-# Uncoment me when updating to eapi4
-# REQUIRED_USE="
-#	|| ( gtk gnome kde )
-#	gnome? ( gtk )
-#"
-
-S="${WORKDIR}/${PN}-bootstrap-${PV}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
-
-	if use custom-cflags; then
-		ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
-		ewarn "all sorts of build and runtime errors."
-		ewarn
-		ewarn "Before reporting a bug, please make sure you rebuild and try with"
-		ewarn "basic CFLAGS, otherwise the bug will not be accepted."
-		ewarn
-	fi
-
-	if ! use java; then
-		ewarn "You are building with java-support disabled, this results in some"
-		ewarn "of the LibreOffice functionality being disabled."
-		ewarn "If something you need does not work for you, rebuild with"
-		ewarn "java in your USE-flags."
-		ewarn
-		ewarn "Some java libraries will be provided internally by libreoffice"
-		ewarn "during the build. You should really reconsider enabling java"
-		ewarn "use flag."
-		ewarn
-	fi
-
-	if ! use gtk; then
-		ewarn "If you want the LibreOffice systray quickstarter to work"
-		ewarn "activate the 'gtk' use flag."
-		ewarn
-	fi
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
-	check_reqs
-}
-
-src_unpack() {
-	local mod dest tmplfile tmplname
-
-	#first the bootstrap files
-	unpack "${PN}-bootstrap-${PV}.tar.bz2"
-
-	# and then all the separate modules
-	for mod in ${MODULES}; do
-		unpack "${PN}-${mod}-${PV}.tar.bz2"
-		mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
-		# punt the empty dirs; it is annoying during debuging :)
-		rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-	done
-
-	# don't forget the wrapper...
-	cp "${FILESDIR}"/wrapper.in "${T}"
-
-	# copy extension templates; o what fun ...
-	if use templates; then
-		dest="${S}/extras/source/extensions"
-		mkdir -p "${dest}"
-
-		for template in ${TDEPEND}; do
-			if [[ ${template} == *.oxt ]]; then
-				tmplfile="${DISTDIR}/$(basename ${template})"
-				tmplname="$(echo "${template}" | \
-					cut -f 2- -s -d - | cut -f 1 -d _)"
-				echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
-				if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
-					cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
-				fi
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	eprefixify "${T}"/wrapper.in
-
-	strip-linguas ${LANGUAGES}
-	LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# compiler flags
-	use custom-cflags || strip-flags
-	use debug || filter-flags "-g*"
-	# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
-	filter-flags "-O*"
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		filter-flags "-fstack-protector"
-		filter-flags "-fstack-protector-all"
-		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-	fi
-
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local java_opts
-	local internal_libs
-	local extensions
-	local themes="default"
-	local jobs=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
-
-	# expand themes we are going to build based on DE useflags
-	use gnome && themes+=" tango"
-	use kde && themes+=" oxygen"
-
-	# list the extensions we are going to build by default
-	extensions="
-		--enable-ext-pdfimport
-		--enable-ext-presenter-console
-		--enable-ext-presenter-minimizer
-	"
-
-	# Things that do not have gentoo packages
-	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
-	# we should use in-system dmake: so far fails
-	internal_libs+="
-		--without-system-hsqldb
-	"
-
-	# When building without java some things needs to be done
-	# as internal libraries.
-	if ! use java; then
-		internal_libs+="
-			--without-system-beanshell
-			--without-system-lucene
-			--without-system-saxon
-		"
-	else
-		java_opts="
-			--with-ant-home=${ANT_HOME}
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
-			--with-jvm-path=${EPREFIX}/usr/$(get_libdir)/
-			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
-			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
-			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
-			--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
-			--with-junit=$(java-pkg_getjar junit-4 junit.jar)
-		"
-	fi
-
-	# TODO: create gentoo branding on the about/intro screens
-	# --with-about-bitmap="${FILESDIR}/gentoo-about.png"
-	# --with-intro-bitmap="${FILESDIR}/gentoo-intro.png"
-
-	# system headers/libs/...: enforce using system packages
-	#   only expections are mozilla and odbc/sane/xrender-header(s).
-	#   for jars the exception is db.jar controlled by --with-system-db
-	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
-	# --disable-broffice: do not use brazillian brand just be uniform
-	# --enable-cairo: ensure that cairo is always required
-	# --disable-graphite: no package in gentoo
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --disable-gnome-vfs: old gnome virtual fs support
-	# --disable-kdeab: kde3 adressbook
-	# --disable-kde: kde3 support
-	# --disable-rpath: relative runtime path is not desired
-	# --disable-static-gtk: ensure that gtk is linked dynamically
-	# --disable-zenity: disable build icon
-	# --with-extension-integration: enable any extension integration support
-	# --with-{max-jobs,num-cpus}: ensuring parallel building
-	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --without-stlport: disable deprecated extensions framework
-	econf \
-		--with-system-headers \
-		--with-system-libs \
-		--with-system-jars \
-		--with-system-db \
-		--with-system-dicts \
-		--enable-cairo \
-		--enable-fontconfig \
-		--enable-largefile \
-		--enable-randr \
-		--enable-randr-link \
-		--enable-unix-qstart-libpng \
-		--enable-Xaw \
-		--enable-xrender-link \
-		--disable-broffice \
-		--disable-crashdump \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gnome-vfs \
-		--disable-graphite \
-		--disable-kdeab \
-		--disable-kde \
-		--disable-online-update \
-		--disable-rpath \
-		--disable-static-gtk \
-		--disable-zenity \
-		--with-alloc=system \
-		--with-build-version="Gentoo official package" \
-		--with-extension-integration \
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-		--with-external-tar="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-max-jobs=${jobs} \
-		--with-num-cpus=${jobs} \
-		--with-theme="${themes}" \
-		--with-unix-wrapper=libreoffice \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-afms \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-ppds \
-		--without-stlport \
-		$(use_enable binfilter) \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable gnome gconf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome lockdown) \
-		$(use_enable gstreamer) \
-		$(use_enable gtk) \
-		$(use_enable gtk systray) \
-		$(use_enable java ext-scripting-beanshell) \
-		$(use_enable kde kde4) \
-		$(use_enable ldap) \
-		$(use_enable mysql ext-mysql-connector) \
-		$(use_enable nsplugin mozilla) \
-		$(use_enable odk) \
-		$(use_enable opengl) \
-		$(use_enable pch) \
-		$(use_enable python) \
-		$(use_enable python ext-scripting-python) \
-		$(use_enable webdav neon) \
-		$(use_with java) \
-		$(use_with java junit) \
-		$(use_with ldap openldap) \
-		$(use_with mysql system-mysql-cppconn) \
-		$(use_with nsplugin system-mozilla libxul) \
-		$(use_with offlinehelp helppack-integration) \
-		$(use_with templates sun-templates) \
-		${internal_libs} \
-		${java_opts}
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	local SIZE desk app
-
-	export PYTHONPATH=""
-
-	emake DESTDIR="${D}" install || die
-
-	# Fix the permissions for security reasons
-	use prefix || chown -RP root:0 "${ED}"
-
-	# Desktop files
-	for i in *; do
-		mv ${i}.desktop ${PN}-${i}.desktop
-	done
-	sed -i \
-		-e s/libreoffice3.4/${PN}/g \
-		-e s/libreoffice34/${PN}/g \
-		"${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop || die111
-	use java || rm "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/javafilter.desktop
-	pushd "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/ > /dev/null
-	popd > /dev/null
-	domenu "${ED}"/usr/$(get_libdir)/${PN}/share/xdg/*.desktop
-
-	# install icons
-	insinto /usr/share/icons/
-	doins -r "${S}"/sysui/desktop/icons/hicolor
-
-	# app icon names are too generic, have to make them unique
-	for SIZE in 16 32 48 128 ; do
-		cd "${ED}"/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-		for app in base calc draw impress main math startcenter writer ; do
-			mv ${app}.png ${PN}-${app}.png || die
-		done
-	done
-
-	# install mime package
-	dodir /usr/share/mime/packages
-	cp sysui/*.pro/misc/${PN}/openoffice.org.xml \
-		"${ED}"/usr/share/mime/packages/${PN}.xml
-
-	# Install wrapper script
-	sed -i -e s/LIBDIR/$(get_libdir)/g "${T}/wrapper.in" || die
-	newbin "${T}/wrapper.in" ${PN} || die
-
-	# Cleanup after playing
-	rm "${ED}"/gid_Module_*
-
-}
-
-pkg_preinst() {
-	# Cache updates - all handled by kde eclass for all environments
-	kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-}
-
-pkg_postrm() {
-	kde4-base_pkg_postrm
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-07-24 12:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-24 12:22 [gentoo-commits] dev/scarabeus:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ Tomas Chvatal
  -- strict thread matches above, loose matches on Subject: below --
2011-07-21 12:29 Tomas Chvatal
2011-07-19 12:22 Tomas Chvatal
2011-07-18 15:45 Tomas Chvatal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox