Fix build with libpng 1.5 #356281, also remove outdated ebuild

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

7 files changed, 24 insertions, 545 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 13347d2a5931..2e86f77d7e94 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.14 2011/02/23 13:46:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.15 2011/02/24 15:09:45 suka Exp $
+
+  24 Feb 2011; Andreas Proschofsky <suka@gentoo.org> -libreoffice-3.3.0.ebuild,
+  -files/gentoo-3.3.0.diff, libreoffice-3.3.1.ebuild,
+  +files/libreoffice-3.3-libpng-1.5.diff, -files/libreoffice-3.3-prefix.patch:
+  Fix build with libpng 1.5 #356281, also remove outdated ebuild 
 
 *libreoffice-3.3.1 (23 Feb 2011)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6f3e4f3a9157..d4d7b21f40dc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,10 +1,9 @@
 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.0.diff 1555 RMD160 7a678be646cfc4a1a121a2b3a7ee23045c227f38 SHA1 3f13c570ac8ce446bf5b8d171e4e554b9d02095d SHA256 133d57446818e49c07945636c0018d062f2f50c1912f9efcd58bcd6a3d36846b
 AUX gentoo-3.3.1.diff 2271 RMD160 ecd7bd0a6c34861ad3ef0bee8017a288286644c0 SHA1 0597c7e692873f128a898d1904445b9bbb06e6e8 SHA256 00b5b5fc5dbeafa18874575e78e6b3348d1293662b9c036ca918517a54edf1b6
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
-AUX libreoffice-3.3-prefix.patch 558 RMD160 f194487a1a49c39ce7c9f5f9b1a71a707dd81f2d SHA1 d4ae1237894bbc4ac7f5d4838dcff6f9d96b4619 SHA256 ed13b8b91d268bfd5b9ce8a7a090fc2081aa9b6539304b38ce82df66778684d0
+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 scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
@@ -37,7 +36,6 @@ DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RMD160 a46
 DIST 79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip 1449297 RMD160 70849a36291392e7f0f17f32884514eb4264371b SHA1 f4685ca1a539f9eb8cda92acd485b1430290712f SHA256 a7907d558d77b6c980542b31546b199adf2fc8fc7ee2bb0ba3cfaf94fba57902
 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 86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2 539759 RMD160 226c0e21500f5312a1c3b346a83f39659a871066 SHA1 d667654a329509c458f6e425868fa56ac12cd6b8 SHA256 dac08ed61af43ad8a0183791f013c8b1ffcdbf77b9d3f50ffb7f2367df635c57
 DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9fb0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
 DIST 8ea307d71d11140574bfb9fcc2487e33-libbase.zip 161294 RMD160 9baf290feb0ce0da668842c0c300ab20cc5009d9 SHA1 29ef207664bb89283ad176c5afab26a95b50e9b9 SHA256 9d6a8da4a4f6e201d3d7eb6293a5c01b5686d67c6df8f3cf9458df449c75846c
 DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160 f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c6801c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3
@@ -67,50 +65,28 @@ DIST f3e2febd267c8e4b13df00dac211dd6d-flute.zip 83503 RMD160 c73b7919ee73d248d11
 DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e7e2e19a085dc054d3793f7c31d5c32894c SHA1 171fc524f7f42e99b23754c8aca0600378057d40 SHA256 40549fb2995749f1c57455d1226b1e1fa1cfca635ce9d79d8de9ec625e4a82b9
 DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a942ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb6637a426404cf197ac21ed2244
 DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
-DIST libreoffice-artwork-3.3.0.4.tar.bz2 21964556 RMD160 fa9fe7d1019e0b833ace76a51e71b49520bb8865 SHA1 fd355976f2a1d2cb38cc07ccbfa395a3e25218fd SHA256 0eb9e8ca27de163191e45f56fbd620d6b8e4da6923513a7aed231728fdf69dd2
 DIST libreoffice-artwork-3.3.1.2.tar.bz2 21989190 RMD160 59d7e07d9dbc8b3b20e168a00bf015894a607f87 SHA1 b04432a94b06a9c63dee60904cc5972a352f95a4 SHA256 79bff5dc790e13a3782043fb0b0a2c22edbda924b2f1690a562650a3761712be
-DIST libreoffice-base-3.3.0.4.tar.bz2 2082211 RMD160 528ece6160fceed97281e94ecb95a2a80bdf4266 SHA1 dcd86a2ae0f9fb479c00507d02f7c28785f8d748 SHA256 d096510626e7ae9cd32d931ea09975fc0f16d4c06d5473937dedc016e4aba8ea
 DIST libreoffice-base-3.3.1.2.tar.bz2 2081385 RMD160 7d734d15b9e261a63c21c9a728b26dcd65a3599c SHA1 7fd85ff1b1e9321cf08ad5ef05bd4d61f8f8190c SHA256 bf585502b317831797b4ebb48f0b54633e8fda451985bf4111189cd29a4716b0
-DIST libreoffice-bootstrap-3.3.0.4.tar.bz2 2752144 RMD160 220da8b5dcea40e64b61717c47e1fe78496425a4 SHA1 b9124f76cbe5972d9545ffa0fc701e4c75720c05 SHA256 6a29e5fea78ab88ecd33e000f6049b27ee8651aca3778e65d279b4ff4b40eec8
 DIST libreoffice-bootstrap-3.3.1.2.tar.bz2 2752061 RMD160 6ef3bcaf464d862498c289bcbcd3567c2d7e4d50 SHA1 9fa3d0b659be4b1db51defb064af850a4c001770 SHA256 f8511b5459b9d6cd7f9d0bcdafc13b3e48649ddda91ce8fcd729525832a44a17
-DIST libreoffice-build-3.3.0.4.tar.gz 14379590 RMD160 2d55c7ce79a65fbd83dc2db304d4aa25afb52baa SHA1 fab618c8407028b48066eccc5472a45a64965314 SHA256 27c7fbb89190df9308763d5f0119fdc3a184c0344bbed8e9cf6a090b87402e09
 DIST libreoffice-build-3.3.1.2.tar.gz 14364811 RMD160 b7e0889a2207cbec388557b02a7e49593a8a8821 SHA1 85c0feaf94f6fb5fe453d289aca4c21d19e04840 SHA256 d0e41398b90edf40125597c0b743c9824b976fabcbd5d578c886ae8e69393cea
-DIST libreoffice-calc-3.3.0.4.tar.bz2 9410545 RMD160 e78a562d27bdc451a19c2533ac0a7546bdce6fa3 SHA1 86f2365219e0123a52eeba5eba7089e4006cdf36 SHA256 a20663b56c3af6af778c11fc281125193d2fc800f32d620cb6192b316f8873bc
 DIST libreoffice-calc-3.3.1.2.tar.bz2 9412067 RMD160 8b0b8b6492c4647539a9549b61af25c44ac51538 SHA1 c6d2bfbae5bb21c8c57d753fd81665d39a9fd124 SHA256 48ff8cfacbcc4d407302f04543a4ccd800de45d6d99b2ceecdfad046a1ce92cf
-DIST libreoffice-components-3.3.0.4.tar.bz2 5112039 RMD160 11a1caedec93f74dd851d80571b7215cc1a33f61 SHA1 8ef0ebfee6548a64a0130c931ec8030a5ed55862 SHA256 5dac0d1821a40ab6d23cfba8df0fcd2accdc6b2f18735d4c43d197974a26a97f
 DIST libreoffice-components-3.3.1.2.tar.bz2 5125538 RMD160 925797fe5f7423507e167f01089bb4f6c02a947f SHA1 7b74950ba96ed409520195eb8ca3ef67bd27bfc8 SHA256 04d27ef5ddbd25c0ff4eab821fa223bcab4b034ccec14704a1cfd0394ac17b6f
-DIST libreoffice-extensions-3.3.0.4.tar.bz2 4202718 RMD160 c0260287c9d6966b167072f1ac7aac2cf9b3b1d8 SHA1 ff8d59d951644dfcd6098b42f07d1546ef305657 SHA256 4f099c6315e680568852c188bb67f04ba28a3954792a2b0f0edfed5e43c980d8
 DIST libreoffice-extensions-3.3.1.2.tar.bz2 4199525 RMD160 ed1f80ffd7f0784b1ce749010c38e98b73055f00 SHA1 9afe07200aa8ad708b220b04819c77962a2eaa1c SHA256 dc85149bcd44eaf6aac49eaaf67e63ddf3fc7ed8f6ae5a6889620b895004b7f6
-DIST libreoffice-extras-3.3.0.4.tar.bz2 38707645 RMD160 cd261eb92207d94443f25a79a606fb94f873ed84 SHA1 4a7eea747354fcc1b093f87723808efa252681ae SHA256 852d04bc189bf4a690c637b5e22e848f59d9a880290d1d16284e1789ce34289a
 DIST libreoffice-extras-3.3.1.2.tar.bz2 38706932 RMD160 154f68660cc8e23fc7631e27c56712208ac56927 SHA1 ff2a33eaef6e66c60c7bc4e023ec5efe89d6466c SHA256 692a0b26d5f4b6a1d0a6925c90895c6df730251e766b625d152376e9cd177852
-DIST libreoffice-filters-3.3.0.4.tar.bz2 11949114 RMD160 15969307a4743140136bd5a028ff03b69c842c93 SHA1 39bae5b7bfdd2cb2433507503df503e573b4df24 SHA256 34ceba5e126fb6fffb0ccad1ff952e2912d6bab998e3b6fdc850b99d89e86f8d
 DIST libreoffice-filters-3.3.1.2.tar.bz2 11949571 RMD160 b77ba7c572bf722ae1cbdf4af6f8d6dc2d9d9d33 SHA1 fedc34e789e98d4bced59a9dd5b1a5fa086d9599 SHA256 c65a8bcb7a44fa2db9b9b833b7dd455a9b856a7c67e38f9204f1409a8adff51d
-DIST libreoffice-help-3.3.0.4.tar.bz2 1913858 RMD160 0db94d5b4ed97dc9b245cc2cce028a75a9618752 SHA1 9928441a0feee84e09cd7242629563462431b7a8 SHA256 d73576aed3babb6db5217f1ac42898c8c73b350a1ea1e67fdf18852dc4ed4246
 DIST libreoffice-help-3.3.1.2.tar.bz2 1913332 RMD160 1c1595e6f72a6008de770cb70e2a10ef594dba95 SHA1 36965abf48b67642704d2d98ced4314a4451514d SHA256 606b6d2d739c8f6b4b413d05bd00671b753be953f2d96cb15a9b70a61eec31a7
-DIST libreoffice-impress-3.3.0.4.tar.bz2 2606075 RMD160 104c8a1ee5adf58dd34b57cfdd6566254facaf95 SHA1 d01733389c420ab3378f8c45d7012038b485ca2b SHA256 1ac487412068e6516c64254ece1ae8dc28fa52f2a6f08c18441abcba3a116e86
 DIST libreoffice-impress-3.3.1.2.tar.bz2 2605925 RMD160 95932f450abdc0bbbda9a57257fd9b0a3c4b216a SHA1 3a74b9b8948d30479cde0853c496764e25935f9f SHA256 eab9c215c6e087debb3f26cf4e327967cd85f8aeb5beccf5f332864c810467bb
-DIST libreoffice-l10n-3.3.0.4.tar.bz2 80139222 RMD160 1a3fdbaa70f3398f56ef8366103794bf54fe2673 SHA1 79d749de627761855998b2065a441f06ebc658ff SHA256 f783c82a77f0a8437e4ef72b82ac78b5b31f3ec9aa746c27c940559adad6f8b5
 DIST libreoffice-l10n-3.3.1.2.tar.bz2 80244657 RMD160 85c57a0a951bfb0f266b01c227694d506c351ab8 SHA1 9cfc3021de302ebca343f0e7dcc6278af8bf318d SHA256 fd8279d71d20d9cae08ca661ea92aba0ae5234f7db023e77b7a07c98ff16f562
-DIST libreoffice-libs-core-3.3.0.4.tar.bz2 17298999 RMD160 158ef5bc6b4934b01bcdf6128a0b5fa9a7cbc008 SHA1 8a7f6e69a018490c33d1c8b57fb4d8a6b52f97d2 SHA256 b977c47214da82e443152231de15f366f0bffbd531c4b72959a99744ff645060
 DIST libreoffice-libs-core-3.3.1.2.tar.bz2 16695271 RMD160 f07f3d6b8605a263ef1f32420a21eaf79b32bed2 SHA1 bdb308e1132cac9396547cd7542db991e8f66cf0 SHA256 7a2e8b763230cb7b95938cc4655759b3ebd7237c7fbf5ea2cc25a4af5dabec9e
-DIST libreoffice-libs-extern-3.3.0.4.tar.bz2 633478 RMD160 80bd3b52208631bbea17f7562a0ea6360e02aaa2 SHA1 012ab41749b7a2581ab03550338b42a401825ae7 SHA256 c8bed44ab6e69d4f101eca1674b4e105db00c5418b669ba9cd332ebc91b3518b
 DIST libreoffice-libs-extern-3.3.1.2.tar.bz2 629139 RMD160 b069645dc9a9721cf9612e9bd8eccf8ddfc095a2 SHA1 87d9d09f970ca697f3067679d577a6f564a786d8 SHA256 87009a8522071ff72e8080f43e5e98917268f9cafad1f8808626c4f2cff3a676
-DIST libreoffice-libs-extern-sys-3.3.0.4.tar.bz2 35706005 RMD160 8581759e97cac0821ba313141627504a27ea3618 SHA1 ce603d2a096c7ef0dbd224ce3dd6d4f22b522a0c SHA256 16fc27f7e6af1456969cbd8d5dd8c2decb68d9b0b159bce31a77efada7b61e92
 DIST libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 37033208 RMD160 54b68f944df2f943640d77fd18a3f1c605d2b5b8 SHA1 4ab54b1cc3062b64722386df38cd77de2f7bab61 SHA256 98d91dcb09eb2111eb95a970d20c286266d077e050b22d13647254d77f52a5c7
-DIST libreoffice-libs-gui-3.3.0.4.tar.bz2 10830805 RMD160 db1750421d83400a042062ca59f43461ce26bfc0 SHA1 5454f5414885cfdb67ddf8b9d1d7cd2fb5dad337 SHA256 44f91f6f0ef373f206202e0146e0e7fa78af6f89e33f790578c9780d4f856d8e
 DIST libreoffice-libs-gui-3.3.1.2.tar.bz2 10833093 RMD160 3fe18f63b095cf1feb5a43783fdaa4fbd97be01a SHA1 ba056c492bbfc6caa425423a2e47ae301470e89e SHA256 5566da268018efa3a9b0ff0ca624faabd04350c8e44b753722c2d55d625cb734
-DIST libreoffice-postprocess-3.3.0.4.tar.bz2 42881 RMD160 efa07dc20c8051f059c37964b54820dec9686b28 SHA1 cd69ef9c157eba35aebaf6fc5cb8eb2ca6e54334 SHA256 eb22c68f6d56da6fb4c293246641b3d00a8f646e46152a35ad4d406208b56ae8
 DIST libreoffice-postprocess-3.3.1.2.tar.bz2 43094 RMD160 3f55ccd8f81d1e00249d8876f2c010283fc9342a SHA1 4b08a7416cb9c05ece9fb816a10e21b242c3149d SHA256 e30a59adbbbb6acb732bcd76bfee471f4e59a27593219dbbb01ae6365e7d5dd9
-DIST libreoffice-sdk-3.3.0.4.tar.bz2 1710392 RMD160 c9c202402f772ec8e1a411c2b61ecbe99bd839f3 SHA1 b46f731165a225207ddf5c6078e561e378577909 SHA256 3778b86a2d4f1d69bce47807e0003fd6d131be370f8c859cef2fee468dbc83ef
 DIST libreoffice-sdk-3.3.1.2.tar.bz2 1711153 RMD160 d1fdfc93b9056ed7c91d1eb98ad827308cef44ac SHA1 a8b488a273daf6ecefa8141a821cb12613c48652 SHA256 ad0a73593dda2512acb91aeaeccc41cf7e7b1587f577124bc74bb79aa2f5535c
-DIST libreoffice-testing-3.3.0.4.tar.bz2 50947353 RMD160 1ea2c0dc0a3bf4a0ddc9e5b95f9122bc5d037ef1 SHA1 a3cfda8c9763c5e44823fd98e3fec57739f6c509 SHA256 52587e199eb90ec088ea0e9c911441307876aa4dea2e02492f5fe07b044ac0c8
 DIST libreoffice-testing-3.3.1.2.tar.bz2 50946803 RMD160 dcd8394eab32ed119c4d01ede8e4d4a84071ddcb SHA1 cbc4d9a556fee66b90966bb5b1369f6b8babc637 SHA256 94b07675759dba9c6a6e8f7b5c384dd30b8e13babb5c0f79afbdca1484cf82ba
-DIST libreoffice-ure-3.3.0.4.tar.bz2 6163547 RMD160 f52347c5224afd29869030b466e05e722f0bdd64 SHA1 723af233415c9ed7611973e9b89df6a8cfeac911 SHA256 301a3d57f9c46f991298529af606dcb79999717b4e1c5ac6907d1e315dcc1bca
 DIST libreoffice-ure-3.3.1.2.tar.bz2 6166982 RMD160 eb65ed62e6f0d3ed0c341edc4956674990140b0d SHA1 417cd74abaf10aaf0050553ecfa11714e21f25e1 SHA256 99978e7977449a578925620ecd2cfff744668ebae05fd0ff5370cad031c9bbdd
-DIST libreoffice-writer-3.3.0.4.tar.bz2 6775537 RMD160 aa4d0d35ed376bbf7903aa444c396973defbd709 SHA1 353cd9adad81428702bb7b8f22c0c9209799f036 SHA256 11e8656ca7e9761a8e2ea3d4526622be1fb1cdc4b2c7a72721e65e8444919bec
 DIST libreoffice-writer-3.3.1.2.tar.bz2 6776894 RMD160 7667f4fbbe8d6eea2dd8b8fef84bc7152d2a4738 SHA1 17fc2d585da2eb948c5ce7951d112d238a9b124c SHA256 2a1d8836eaa738a4378bbab27accb2d6af1218a6d601354558adb12f2342509b
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.0.ebuild 18217 RMD160 10f5339dfdecccde7a66f57198de80beb3d807fd SHA1 dd4067fac45a2c285788cd976bbbb295057334d0 SHA256 565a52fa840093e9f2576950cf3e7592e069efc3a9a82bb5b15bbddf911409c2
-EBUILD libreoffice-3.3.1.ebuild 18166 RMD160 d32a725c6e05014e71f3d1d77531df7a22b2576a SHA1 b66aa9ffdcf3f3cb1c8e9824b078b52d17407872 SHA256 9d297221bd665ab5675b247d63111784242866b31b172f9de739b3e7d833602c
-MISC ChangeLog 3152 RMD160 7deebd0e13b4d493b7524d84c434ff0112705be3 SHA1 c4999e3200ec4afc59785bbd36f689fc825b3412 SHA256 da425a581d0344680256be4a2e148169ca18dda09cf2884e6812f0db0212bf03
+EBUILD libreoffice-3.3.1.ebuild 18243 RMD160 7d935212f907fad26135fca346225758782d4abc SHA1 16b9877b6b76eb1a79b3d70eaa9fdcea2e70e829 SHA256 ac26b4c8e5ede72555fe55e93abe30b14c27cc18ffd293c54fdcf4d2135de1aa
+MISC ChangeLog 3432 RMD160 34fd0a81583653952c3c756561b5afc77ade62f2 SHA1 ec44bf75758353d488b568b3ffb7abd83e7a533e SHA256 2e883e400393407e917c00db862ccc8879799287abfe20864b9997335a166d0d
 MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4
diff --git a/app-office/libreoffice/files/gentoo-3.3.0.diff b/app-office/libreoffice/files/gentoo-3.3.0.diff
deleted file mode 100644
index 2382b3aa4605..000000000000
--- a/app-office/libreoffice/files/gentoo-3.3.0.diff
+++ /dev/null
@@ -1,55 +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)
-
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 000000000000..d0ca2eda56e7
--- /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-prefix.patch b/app-office/libreoffice/files/libreoffice-3.3-prefix.patch
deleted file mode 100644
index c20c2294452e..000000000000
--- a/app-office/libreoffice/files/libreoffice-3.3-prefix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 "z$VENDORNAME" != "zRedHat"; then
- 	mkdir -p $MANDIR/man1
-
diff --git a/app-office/libreoffice/libreoffice-3.3.0.ebuild b/app-office/libreoffice/libreoffice-3.3.0.ebuild
deleted file mode 100644
index 7727154a0cd2..000000000000
--- a/app-office/libreoffice/libreoffice-3.3.0.ebuild
+++ /dev/null
@@ -1,447 +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.3.0.ebuild,v 1.9 2011/02/17 10:23:31 suka Exp $
-
-EAPI="3"
-
-WANT_AUTOMAKE="1.9"
-
-KDE_REQUIRED="optional"
-CMAKE_REQUIRED="never"
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="threads"
-
-inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
-
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
-
-MY_PV=3.3.0.4
-MY_P="${PN}-build-${MY_PV}"
-PATCHLEVEL=OOO320
-SRC=OOo_${PV}_src
-DEVPATH="http://download.documentfoundation.org/libreoffice/src"
-S="${WORKDIR}/${MY_P}"
-CONFFILE=${S}/distro-configs/Gentoo.conf.in
-BASIS=basis3.3
-DESCRIPTION="LibreOffice, a full office productivity suite."
-
-SRC_URI="${DEVPATH}/${PN}-build-${MY_PV}.tar.gz
-	templates? (
-		http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
-		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
-		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
-		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
-		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt
-		ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt
-		)
-	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	http://download.go-oo.org/SRC680/extras-3.1.tar.bz2
-	http://download.go-oo.org/SRC680/biblio.tar.bz2"
-
-# Shiny split sources with so many packages...
-MODULES="artwork base bootstrap calc components extensions extras filters help
-impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
-ure writer l10n"
-
-for mod in ${MODULES}; do
-	SRC_URI+=" ${DEVPATH}/${PN}-${mod}-${MY_PV}.tar.bz2"
-done
-
-# addons
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/8ea307d71d11140574bfb9fcc2487e33-libbase.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/a06a496d7a43cbdc35e69dbe678efadb-libloader.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/d1a3205871c3c52e8a50c9f18510ae12-libformula.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/f3e2febd267c8e4b13df00dac211dd6d-flute.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/f7925ba8491fe570e5164d2c72791358-libfonts.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
-ADDONS_SRC+=" http://hg.services.openoffice.org/binaries/cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2"
-ADDONS_SRC+=" http://download.go-oo.org/src/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
-ADDONS_SRC+=" http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
-ADDONS_SRC+=" http://download.go-oo.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
-ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
-ADDONS_SRC+=" http://download.go-oo.org/src/86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2"
-ADDONS_SRC+=" http://download.go-oo.org/src/5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2"
-ADDONS_SRC+=" http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2"
-ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
-SRC_URI+=" ${ADDONS_SRC}"
-
-LANGS1="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 ko kok ks ku ky lo lt lv mai mk ml mn mni mr ms my nb ne nl nn nr ns oc om or pa_IN pap pl ps pt pt_BR ro ru rw sa_IN 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"
-LANGS="${LANGS1} en en_US"
-
-for X in ${LANGS} ; do
-	IUSE+=" linguas_${X}"
-done
-
-# 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"
-SPELL_DIRS_DEPEND=""
-for X in ${SPELL_DIRS} ; do
-	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
-done
-
-HOMEPAGE="http://www.documentfoundation.org"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="!app-office/libreoffice-bin
-	!app-office/openoffice-bin
-	!app-office/openoffice
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	>=dev-lang/perl-5.0
-	>=dev-libs/glib-2.18
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10
-		>=gnome-base/gconf-2.0
-		>=x11-libs/cairo-1.0.2 )
-	gtk? ( >=x11-libs/gtk+-2.10
-		>=x11-libs/cairo-1.0.2 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gstreamer? ( >=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-	java? ( >=dev-java/bsh-2.0_beta4
-		dev-java/lucene:2.3
-		dev-java/lucene-analyzers:2.3 )
-	nsplugin? ( net-libs/xulrunner:1.9
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	opengl? ( virtual/opengl )
-	>=net-libs/neon-0.24.7
-	>=dev-libs/openssl-0.9.8g
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	  dev-libs/redland[ssl]
-	virtual/jpeg
-	media-libs/libpng
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	dev-libs/expat
-	>=dev-libs/icu-4.0
-	>=sys-libs/db-4.3
-	>=media-libs/vigra-1.4
-	>=app-text/poppler-0.12.3-r3[xpdf-headers]"
-
-RDEPEND="java? ( >=virtual/jre-1.5 )
-	${SPELL_DIRS_DEPEND}
-	${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.36
-	sys-devel/flex
-	sys-devel/bison
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.0
-	>=dev-util/gperf-3
-	>=net-misc/curl-7.12
-	sys-libs/zlib
-	sys-apps/coreutils
-	dev-util/cppunit
-	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
-		>=dev-java/ant-core-1.7 )
-	ldap? ( net-nds/openldap )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	ewarn
-	ewarn " It is important to note that LibreOffice is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use aggressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again. "
-	ewarn
-	ewarn " Also if you experience a build break, please make sure to retry "
-	ewarn " with MAKEOPTS="-j1" before filing a bug. "
-	ewarn
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
-	check_reqs
-
-	strip-linguas ${LANGS}
-
-	# 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
-
-	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
-
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the LibreOffice build will break. "
-		die
-	fi
-
-	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver=$(db_findver '>=sys-libs/db-4.3')
-
-	kde4-base_pkg_setup
-
-	python_set_active_version 2
-	python_pkg_setup
-
-}
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.gz
-
-}
-
-src_prepare() {
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/gentoo-${PV}.diff"
-	epatch "${FILESDIR}/gentoo-pythonpath.diff"
-	epatch "${FILESDIR}/env_log.diff"
-	epatch "${FILESDIR}/fix-ooo-collision.diff"
-	epatch "${FILESDIR}/scrap-pixmap-links.diff"
-	epatch "${FILESDIR}/enable-startup-notification.diff"
-	epatch "${FILESDIR}/libreoffice-3.3-prefix.patch"
-	use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes"
-
-	#Use flag checks
-	if use java ; then
-		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
-		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
-		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
-		echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
-		echo "--with-system-beanshell" >> ${CONFFILE}
-		echo "--with-system-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 $(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 $(use_enable ldap) >> ${CONFFILE}
-	echo $(use_enable opengl) >> ${CONFFILE}
-	echo $(use_with ldap openldap) >> ${CONFFILE}
-	echo $(use_enable debug crashdump) >> ${CONFFILE}
-	echo $(use_enable debug strip-solver) >> ${CONFFILE}
-
-	# Extension stuff, disabled when building without java for bug #352812
-	if use java; then
-		echo "--with-extension-integration" >> ${CONFFILE}
-		echo "--enable-pdfimport" >> ${CONFFILE}
-		echo "--enable-minimizer" >> ${CONFFILE}
-		echo "--enable-presenter-console" >> ${CONFFILE}
-		echo "--enable-presenter-extra-ui" >> ${CONFFILE}
-		#still necessary
-		echo "--enable-presenter-screen" >> ${CONFFILE}
-	fi
-
-	# Misc stuff
-	echo "--disable-graphite" >> ${CONFFILE}
-	echo "--with-system-cppunit" >> ${CONFFILE}
-	echo "--with-system-openssl" >> ${CONFFILE}
-	echo "--with-system-redland" >> ${CONFFILE}
-	echo "--without-junit" >> ${CONFFILE}
-
-	#fix desktop files bug #352955
-	sed -i 's/Exec=oo/Exec=lo/g' "${S}"/desktop/*.desktop.in.in || die "Could not fix desktop files"
-
-	# needed for sun-templates patch
-	eautoreconf
-
-}
-
-src_configure() {
-
-	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/")
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-
-	filter-flags "-O[s2-9]"
-
-	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
-
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# Make sure gnome-users get gtk-support
-	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
-	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
-
-	cd "${S}"
-	./configure --with-distro="Gentoo" \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--with-arch="${ARCH}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="libreoffice" \
-		--with-drink="True Blood" \
-		--without-git \
-		--with-split \
-		${GTKFLAG} \
-		--disable-mono \
-		--disable-kde \
-		$(use_enable kde kde4) \
-		$(use_enable !debug strip) \
-		$(use_enable odk) \
-		$(use_with java) \
-		$(use_with templates sun-templates) \
-		--disable-access \
-		--disable-post-install-scripts \
-		$(use_enable java extensions) \
-		--without-system-libwpd \
-		--without-system-libwpg \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		|| die "Configuration failed!"
-
-}
-
-src_compile() {
-
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	export PYTHONPATH=""
-
-	einfo "Preparing Installation"
-	make DESTDIR="${D}" install || die "Installation failed!"
-
-	# Fix the permissions for security reasons
-	chown -RP root:0 "${ED}"
-
-	# record java libraries
-	if use java; then
-			java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar
-			java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar
-	fi
-
-	# Upstream places the bash-completion module in /etc. Gentoo places them in
-	# /usr/share/bash-completion. bug 226061
-	dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh libreoffice
-	rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed"
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-
-	# Add available & useful jars to LibreOffice classpath
-	use java && "${EPREFIX}"/usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
-	kde4-base_pkg_postinst
-
-}
diff --git a/app-office/libreoffice/libreoffice-3.3.1.ebuild b/app-office/libreoffice/libreoffice-3.3.1.ebuild
index 78b4e2dc14a9..fb3f1ec401a2 100644
--- a/app-office/libreoffice/libreoffice-3.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.1 2011/02/23 13:46:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.1.ebuild,v 1.2 2011/02/24 15:09:45 suka Exp $
 
 EAPI="3"
 
@@ -276,6 +276,7 @@ src_prepare() {
 	epatch "${FILESDIR}/enable-startup-notification.diff"
 	use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes"
 	cp -f "${FILESDIR}/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/libreoffice-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
 
 	#Use flag checks
 	if use java ; then