diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2008-10-03 11:57:29 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2008-10-03 11:57:29 +0000 |
commit | 002588faf44adc6ecce0be0d8a680bda636316b7 (patch) | |
tree | 1e0060c806114c71ccd82aa3eb78c6eaa90ed752 /app-office/openoffice | |
parent | Version bump, fixes a startup crash and the 'get info' screen. Remove previou... (diff) | |
download | historical-002588faf44adc6ecce0be0d8a680bda636316b7.tar.gz historical-002588faf44adc6ecce0be0d8a680bda636316b7.tar.bz2 historical-002588faf44adc6ecce0be0d8a680bda636316b7.zip |
Bump to OOo 3.0 RC3, lots of bugfixes, now migrates user-settings from OOo 2.x
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686
Diffstat (limited to 'app-office/openoffice')
-rw-r--r-- | app-office/openoffice/ChangeLog | 11 | ||||
-rw-r--r-- | app-office/openoffice/Manifest | 47 | ||||
-rw-r--r-- | app-office/openoffice/files/gentoo-3.0.0_rc2.diff | 22 | ||||
-rw-r--r-- | app-office/openoffice/files/gentoo-3.0.0_rc3.diff | 46 | ||||
-rw-r--r-- | app-office/openoffice/files/stax-saxon-no-java.diff | 32 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-3.0.0_rc3.ebuild (renamed from app-office/openoffice/openoffice-3.0.0_rc2.ebuild) | 20 |
6 files changed, 84 insertions, 94 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index be942d27cbfe..750a667af577 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.419 2008/09/26 11:27:03 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.420 2008/10/03 11:57:28 suka Exp $ + +*openoffice-3.0.0_rc3 (03 Oct 2008) + + 03 Oct 2008; Andreas Proschofsky <suka@gentoo.org> + -files/gentoo-3.0.0_rc2.diff, +files/gentoo-3.0.0_rc3.diff, + -files/stax-saxon-no-java.diff, -openoffice-3.0.0_rc2.ebuild, + +openoffice-3.0.0_rc3.ebuild: + Bump to OOo 3.0 RC3, lots of bugfixes, now migrates user-settings from OOo + 2.x 26 Sep 2008; Andreas Proschofsky <suka@gentoo.org> files/gentoo-3.0.0_rc2.diff, +files/stax-saxon-no-java.diff, diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 397190b8da6c..9bc8761f86d6 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,7 +1,6 @@ AUX gentoo-2.4.1.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7 -AUX gentoo-3.0.0_rc2.diff 421 RMD160 8167f4c228ad6cf82ac30dff8c62e49eecffdd66 SHA1 2edb0a6b58cb1e0aa3a032391089c8037b520de3 SHA256 35a08a6addd52e047675b10075fde8ad4fb3ec42a7ab17fe0a87216f7629fb3c +AUX gentoo-3.0.0_rc3.diff 1084 RMD160 a6e381e303fa5a6135c06956751a71e6014f62db SHA1 04d1f2438c92a9c2c3c735ede381fa8059d631b2 SHA256 ae7aac282f2b8d63798ff075deaab5ea5f04fbe929fbd74ef308ebe60c9fb47b AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 -AUX stax-saxon-no-java.diff 863 RMD160 3eac01bd432cbe3476c1301341c1fc5ec12df58a SHA1 ead2cff19c31bd95f1a3e2fb7ae3234260127011 SHA256 e61daacc0a80dddf95d7bc6ed789845b12d55b58fc2fa64ff7d13d391e5ac062 DIST OOo_2.4.1_src_binfilter.tar.bz2 6674779 RMD160 04ffce167f94a250f94f05923a70af0b0744c417 SHA1 a50c7f317643b756c2b0e8937fa9d64b99f05ed9 SHA256 b40403f9adc395846e33f2fc02e0bff133976766988702ef8b13e83448fbd390 DIST OOo_2.4.1_src_core.tar.bz2 153573457 RMD160 64f43d426005b6c5f464cf55e72df41fe833620b SHA1 170642263c32f614ee7e9439a8af30410e00d318 SHA256 abf576f3d451a981887c2a1985b2b72724af204491da6407a1c6e3b0baa10590 DIST OOo_2.4.1_src_l10n.tar.bz2 81193580 RMD160 d41f43b27e84ae5a4620b591e46d884e0c94a72c SHA1 b21f4531ea8182d87ff6f5f68809086c1c063295 SHA256 7abf85bdf53730d4461376a3e44721763ded5e076fba1739da8c2a64752fe571 @@ -15,30 +14,30 @@ DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193 DIST ooo-build-2.4.1.8.tar.gz 8867690 RMD160 5e451495bf8454cc40b8a30a43e2de63af88afff SHA1 bfdf798dc82e14b9ae8bae304fe3255852d1cd23 SHA256 d1220bfab1ed484cc1be77bc189b14821286d64709f147137d6431efe7899c88 -DIST ooo-build-3.0.0.3.2.tar.gz 9554638 RMD160 1a2fcb6145b2f022d2675f2801266e2dc1eec6d1 SHA1 9c36c9930fb62c00de6d0a0c8a27790d60c7e857 SHA256 50f4ee28c57a29ae22895fc22d387944653f4eedcec01e4f3b08e3bec55072da -DIST ooo300-m7-artwork.tar.bz2 9656637 RMD160 5ad38925840d64320538b0c783a4fd09266e2a9b SHA1 ffed984afbf2a80987ecab02b0f97730b8d51dc4 SHA256 8022f2fbd53053d10e438e2b7b84ff6e9fa015644d51425ede9d83da6ed5c422 -DIST ooo300-m7-base.tar.bz2 2937774 RMD160 756a2a960934026f71c5a1d835174daadef2c387 SHA1 8aaa4def0ace58faac9860273072c5b1c37e7709 SHA256 2c8d35ece8f2718f70777da9c4b2816bf5531640e0767ae9f3541b0691226a18 -DIST ooo300-m7-bootstrap.tar.bz2 7037632 RMD160 04860a956ca3f884cc65d6442bd39c39e50f759e SHA1 c28ff1380c9988e264a9d30500483ea7f5c1b9b6 SHA256 5467ee1dfd95354bf28a14302625941643832186a62d566c9d40913c56d7fe86 -DIST ooo300-m7-calc.tar.bz2 8709087 RMD160 9130256c3a79a380cde900aae71287c460574415 SHA1 b813d8462e1aa8c655d1306d927b8e6e4104344b SHA256 8f322d849ef7fa4ec258f945412787d957c0686f998c83b6446f0606ba2230b4 -DIST ooo300-m7-components.tar.bz2 5574392 RMD160 f40e1e183c4c1b3a416b6f0b865532cca9e62440 SHA1 2a201c7d68427c1936567cbded449bfbb2799b05 SHA256 190b463bde63226d6f0920ab039a830fdef205ceff6b4769231f07c44ba626f2 -DIST ooo300-m7-extensions.tar.bz2 13934750 RMD160 c548bf23bdd2282e3f7e69a39794ab29bbed7842 SHA1 4832659e302874153f0aa8ed5eac5cb64402e7fc SHA256 6bfb7fae355dac4a8dd96e186bec6422c35efbba50bbcc3cbf451217c4486893 -DIST ooo300-m7-filters.tar.bz2 10971006 RMD160 fc2bbbc2631258b9e8b7838c31c55aa33137e9fc SHA1 8158eff1ab5a7691bff8d6a6883322e90e973ef6 SHA256 b48465d5e2aad1d33ef2edf3f408b4a7e6461a04ee91bc99edf0fdf4a9069963 -DIST ooo300-m7-impress.tar.bz2 3373058 RMD160 ffc237d4cfdf2ac230c8e82808b7044dce7b828f SHA1 8575524472f7fcd4f39fafb07f07fce1ef46f5e5 SHA256 5fb1ff079b09e37e710bb2de43626a65a7cae7ed0884f09095eb7237fc5560ae -DIST ooo300-m7-l10n.tar.bz2 86581453 RMD160 68d11717feda067ee70e9b4f9aa2693079bef4d1 SHA1 f53744024653a118b10a61832fcb70d086134147 SHA256 d0d29b14f2683c4f7040f7f5514137024184f61d07a56cad2f8fe9d8338041b9 -DIST ooo300-m7-libs_core.tar.bz2 23896515 RMD160 85c331254cf54ca45317010d7a5e258f9fe9fa11 SHA1 685d4a5247abca293c65d9169d498da69e9e448d SHA256 db9b1331d8bdc87234929ad4c47caa91f599c491c7abe9ff4691f79fc88a8826 -DIST ooo300-m7-libs_extern.tar.bz2 39397710 RMD160 258e4d395f3ab3d20830f8acc6576708a014c897 SHA1 a09a659f6cb741a3d7903a6ecf4546de40f54bf6 SHA256 02a4afe2244af2d5b95f630747abd290d8a7a6b17414f09cb6e7acae141381af -DIST ooo300-m7-libs_extern_sys.tar.bz2 94533149 RMD160 03e43e37f5f1f19b0acb03119dae030282b0472b SHA1 7b8083821ca43fd4a8a101f11791db49026a4d1f SHA256 32ac229ecde1d5738dcaf2fcb77a05dc721e3331fde5d6f6102139e7eaf79a41 -DIST ooo300-m7-libs_gui.tar.bz2 11146379 RMD160 f1ad444582bb1fce862b56c3b66404786868bbc1 SHA1 55d5f875afdd1ae4b5a2abd1179e56cf81cad736 SHA256 02d4249a379dd527976ff8fe4019a4345195ecfbd55ce837fcde5d34381cdbf8 -DIST ooo300-m7-postprocess.tar.bz2 17365 RMD160 607c78238cfdffd88707fa1c560927a2880b4132 SHA1 c6824086932fec63980915e715eec0f7173b18ed SHA256 a6d51eb3b6d9050485bc2bc8fe6b9826e63ba641cd08f048c2353294800f0ef4 -DIST ooo300-m7-sdk.tar.bz2 1616685 RMD160 95a2f96f354138a88dc934c3a12b62dbc9902eb3 SHA1 ad2f7803500365cab7fe89d3df2967bbe6db300e SHA256 d9b2276f4ad957c2086929d627496efbfce16e236538eb3c3d3a02e2e2579504 -DIST ooo300-m7-testing.tar.bz2 1764465 RMD160 81004282e70db5199174ffa301883c6fcd41dc49 SHA1 425e69d30a6b1405c568c3afcbdb9cc054e6d5b3 SHA256 48f7891410e74d6115c53b28f5f7736f4076085759c9d9c41b42bed5afbe5624 -DIST ooo300-m7-ure.tar.bz2 5279308 RMD160 8835b9389b9a6c89cab203e3f7843b9598899dc4 SHA1 14fa8ed6b1074b5d9492b6204dc77360282a7aa3 SHA256 3bf7387cb28dbc2735ec3f95a349d8ecd90e4d578e41dba9f0fb1adbe6d4c21d -DIST ooo300-m7-writer.tar.bz2 8351356 RMD160 e35e16cab4b8f85662557c7161319c98f207d9dc SHA1 5721ea7209e99a04e6486d71e5b871c19cc30a72 SHA256 fd902e3914b930e39d0d93011f019bae400c2b2db44cac085a85a409a84130db +DIST ooo-build-3.0.0.3.3.tar.gz 9595400 RMD160 d991db53a7fc25712ff80b13e722e44a8d3ec7e7 SHA1 5590eeae1c4d575375f4ad18b484d0e477000334 SHA256 713654d3f8c1f2b7169d4303ee72bef2aee8e415a3a7a4444de6993b82480667 +DIST ooo300-m8-artwork.tar.bz2 9882324 RMD160 e8450aeb376119f411d1b054edcf44c8e6ea498a SHA1 58701154ddd288384d687aca071bd5e133fe5bb9 SHA256 73f11c7c660a27f35990f092858aadeffb9c3b8415206340ef5efa23743024c3 +DIST ooo300-m8-base.tar.bz2 2959749 RMD160 2395be5777c71edce28b0f724d8ed7adf2b7b9c0 SHA1 3e5f3426e644df6a4eb5124c7795d9779414d6e7 SHA256 669387644940a737eac9bac13abcad2aaea8551f045c1024bc971337d9f8642d +DIST ooo300-m8-bootstrap.tar.bz2 6964733 RMD160 7cb7421ccac9db071c82503037097cb7bab7c361 SHA1 350acf30a91413795d6964eecf606e5dbe9330af SHA256 2f32b455d3ae6f3c88352be34aea0da8ef8e48608713188c660857c06a2aa596 +DIST ooo300-m8-calc.tar.bz2 8726690 RMD160 f411a25d60bce1f9b86761394cd8854d107f7b52 SHA1 3ed7231c47d5ce6800c7b4e48fd65c318c03739d SHA256 1d6831f5494351a5432c80f55003e0059858d9c635d0a54b48552f1f284223e2 +DIST ooo300-m8-components.tar.bz2 5584893 RMD160 2fc667ef92b2552174c0c1074d1a612a5e59115e SHA1 1b2ab7869d18a8167efe6e7e261dba25fd7b0f3d SHA256 87510c24adc33443bc9f3cbc53ce1451172912701abffb5aadf1e57816ea3b3c +DIST ooo300-m8-extensions.tar.bz2 13954580 RMD160 36c00c0a7238e2b072e4b41abb493005948d8c7d SHA1 76d9c9c57a310acfff0985f52c8a3369ce258fa6 SHA256 b6084cd0c6aa00170651a7a6fd54629e945a2017df4a43ff29187792d788d884 +DIST ooo300-m8-filters.tar.bz2 11013982 RMD160 44d7ea7742b8349f258138d164db46ecf3aef1dc SHA1 5c04b9998f4d4586729563b6fca30a897486ddda SHA256 eade2419871e1b13c7f63c9fc1da23d835a77082f538b0d182f3bb1ff89d9878 +DIST ooo300-m8-impress.tar.bz2 3403733 RMD160 6c9ca21eb4512b8dcf28d42a873fec8cd0d8ba67 SHA1 048498c9cca45b10b649ecfbe0fd3f881d5f400c SHA256 3f63eaeb6067f3cf53739a4149ee2b68142002f3eea4183b20dfce4dae7f883d +DIST ooo300-m8-l10n.tar.bz2 86880937 RMD160 b9d2d95571ac1654a89ac417c63b380e5104f21b SHA1 3977a654bdb77c47512e4bfc1c26015d0991c2c2 SHA256 5289d8ff1d2d03c1b7aad4eb90692b12310e2f38e0107f1459e88d67d1965173 +DIST ooo300-m8-libs_core.tar.bz2 24625047 RMD160 b9eacdf668fb7cff98ddb87738b9e1f8ccd87e23 SHA1 cd8577c30df3d0f9dda712f9d87971c4811e0dd7 SHA256 f36c6ba887075216770855c2caf993d50514c2b2c27f40265bc3abb7c3bf2e28 +DIST ooo300-m8-libs_extern.tar.bz2 39390354 RMD160 12f973dd8a447e9a813c729666b1e09456201fe8 SHA1 58815650e4a45d088e14d1dc04c2cdb683aa1f9e SHA256 68460b0a1f78ca0a95e38868c39c339febfaabc96f4adf80966e7a7c1ed74b45 +DIST ooo300-m8-libs_extern_sys.tar.bz2 94509594 RMD160 b7cb76c92d63880eb17eb1e14f7f9e57010501c4 SHA1 c37c98b276bd2b4c21a66dd19b76a9e7af06b3ab SHA256 49e85d2aa5915884b1f844ae1be3b1930c03a89ba415be9cad6f5f017e4719d4 +DIST ooo300-m8-libs_gui.tar.bz2 11332033 RMD160 bbc525976a96f58ce76b9772c2b31cb35ac3eda5 SHA1 59949ec0d7e890bbb5fca9c97d6f393106ee5b72 SHA256 4057961427d889148b24538cc834d2097d9b988d2206db5af7d166b63ee9cb91 +DIST ooo300-m8-postprocess.tar.bz2 17446 RMD160 9369ae35d0b90db168026c31c003962b9bbd24b0 SHA1 11242e7410cf32e7f9e711f1ba7e43e43eaef836 SHA256 90ef94387e4ab4700f41c0cda38fde576bee826bd1b94f11aa116a5de74d516e +DIST ooo300-m8-sdk.tar.bz2 1613696 RMD160 1e3113438fddf79362ea1b6a08fab1ff86bb3a86 SHA1 6b4771b85ffc27fb71383f70187d23fe6c1b8942 SHA256 9cb8e1f473327657509182e9de68382e94d92980a0fe71c622c5147819c89a17 +DIST ooo300-m8-testing.tar.bz2 1810355 RMD160 974d9a8da9916530a8124d2cfe1b73d2b70efe4a SHA1 42ad3c0d0b1c7a7005da98ec97e1bab2686dd68e SHA256 ad20e0dcf1794f39767ba94f5baa205861f716cb8f5fd8741d983424adf23aad +DIST ooo300-m8-ure.tar.bz2 5326745 RMD160 8d199fbba6cd11d330490a473798537c01e7e834 SHA1 40bf443ed2d43d01a403d7e1c184898d4f3dde20 SHA256 ffa868986cda32d2d19fc277fc8a0c65e8a5003fd11106d53691fbea18217db0 +DIST ooo300-m8-writer.tar.bz2 8424376 RMD160 9022aaf9aa15d3d77a0b23f8964f926e2e1bd1e9 SHA1 e01f1e01643178a5ae9ea4d9193e3d6793309588 SHA256 df2daf57bfc70e1f76ef6db7442f4cd7e39eb3a29948922c9576c3049669d522 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685 -DIST scsolver.2008-09-08.tar.bz2 217228 RMD160 ce72548a6743a58d2306a3ae99443136dd7c731f SHA1 9d8a87c4ab2ee656239cb54ddfefe45e4cace613 SHA256 38a4a1ebda8a6d4f2607e15c77a3ccd1e4c8abe8ba7266a617feff7fd337c724 +DIST scsolver.2008-09-30.tar.bz2 227515 RMD160 0a2dd2bf9fc8447f77b91aa61eee547852daa096 SHA1 4d0481d0a2367bf0f08388c2f88c4cd3db1ce2ab SHA256 a1b23bb003bedf19c6c7f1f3c0cc157769ea23a9c9be9f772bec22700511bbb3 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94 EBUILD openoffice-2.4.1.ebuild 12597 RMD160 cfeb6649376b401d6a24d46c989526e042044b06 SHA1 7c88d424b6de8ef1d041b15df6b219cd017a4dd4 SHA256 402e684acf7565024b645c024f0cce4f8f56579f3fe50b9120fe7db0eccaa7a8 -EBUILD openoffice-3.0.0_rc2.ebuild 12506 RMD160 3ea3f968180bb4ff999fe1a97a67c12c5b66755a SHA1 e2803fbd6ac34e37dd1324236ca3474fbcafef84 SHA256 474052939e91f0273e4f1314e06791e195e2581125c0fcb4a29a7a1496ef3234 -MISC ChangeLog 87108 RMD160 57a9f98b54e0e4b6f7b7239f9c28b36c53e3f132 SHA1 6a9ae646d69f6914ce135f2f4a04b179e2175e81 SHA256 c97e437c7d0fcec2914818d23bad4563089d6c496f92d77bab657342b0b7c276 +EBUILD openoffice-3.0.0_rc3.ebuild 12102 RMD160 5cdb8e2041e707e957c22e74f7b0f1a9a618583a SHA1 cea126ca74fbc23913e933a6bb64784cabad3268 SHA256 0b8ecaee3be130d873941307c7766a7591e2e6daa699f05b34ce5f209a53ee81 +MISC ChangeLog 87440 RMD160 9c87fa10857894ff2a0854f24e6ea27eb90f32ef SHA1 f2772cdb63c6afd8ad45afea6b648c2d37290034 SHA256 930bb2144f1d1ae14149c707b8f765e4e965529ff09312b8c5c21f55da6188a7 MISC metadata.xml 635 RMD160 b0b38a6072b2c813ab06e217cd7df90065bd9123 SHA1 8d0686f133cdb62b23b95e837c40b0dad12f5a41 SHA256 3415df8f17c3868078747c22ea1105bb0a2a1444d577214b81fd05cc2fac604f diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff b/app-office/openoffice/files/gentoo-3.0.0_rc2.diff deleted file mode 100644 index 9c11bd993f70..000000000000 --- a/app-office/openoffice/files/gentoo-3.0.0_rc2.diff +++ /dev/null @@ -1,22 +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 ---- patches/dev300/apply -+++ patches/dev300/apply -@@ -1437,6 +1437,8 @@ - #vcl_font-NO_LIST.diff - # linux-headers-2.6.22 issue?! - linux-headers.diff -+#fix build without java -+stax-saxon-no-java.diff - - [ DebianBaseOnly ] - SectionOwner => rengelha - diff --git a/app-office/openoffice/files/gentoo-3.0.0_rc3.diff b/app-office/openoffice/files/gentoo-3.0.0_rc3.diff new file mode 100644 index 000000000000..6d371cadb979 --- /dev/null +++ b/app-office/openoffice/files/gentoo-3.0.0_rc3.diff @@ -0,0 +1,46 @@ +--- 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 +--- distro-configs/Gentoo.conf.in ++++ distro-configs/Gentoo.conf.in +@@ -1,10 +1,7 @@ + --disable-fontooo + --disable-qadevooo +---enable-libsn + --enable-neon +---enable-ogltrans +---enable-xsltproc +---with-dynamic-xinerama ++--enable-xrender-link + --with-external-dict-dir=/usr/share/myspell + --with-external-hyph-dir=/usr/share/myspell + --with-external-thes-dir=/usr/share/myspell +@@ -19,9 +16,7 @@ + --with-system-neon + --with-system-openssl + --with-system-vigra +---with-system-xmlsec + --with-system-xrender-headers +---without-nas + --without-myspell-dicts + --without-stlport + --with-vendor=\"Gentoo Foundation\" +--- patches/dev300/apply ++++ patches/dev300/apply +@@ -1425,7 +1425,7 @@ + SectionOwner => aprosky + + # system lucene classpath +-gentoo-system-lucene.diff ++#gentoo-system-lucene.diff + # Allow build to proceed with PaX enabled + gentoo-pax-fix.diff, aprosky + # support server-only versions of 64bit JDKs + diff --git a/app-office/openoffice/files/stax-saxon-no-java.diff b/app-office/openoffice/files/stax-saxon-no-java.diff deleted file mode 100644 index a47e5a728763..000000000000 --- a/app-office/openoffice/files/stax-saxon-no-java.diff +++ /dev/null @@ -1,32 +0,0 @@ -? stax/unxlngx6.pro -? saxon/unxlngx6.pro -Index: stax/makefile.mk -=================================================================== -RCS file: /cvs/external/stax/makefile.mk,v -retrieving revision 1.4 -diff -u -r1.4 makefile.mk ---- stax/makefile.mk 28 Jul 2008 11:59:31 -0000 1.4 -+++ stax/makefile.mk 26 Sep 2008 09:32:56 -0000 -@@ -64,5 +64,7 @@ - - .INCLUDE : set_ext.mk - .INCLUDE : target.mk -+.IF "$(SOLAR_JAVA)" != "" - .INCLUDE : tg_ext.mk -+.ENDIF - -Index: saxon/makefile.mk -=================================================================== -RCS file: /cvs/external/saxon/makefile.mk,v -retrieving revision 1.1 -diff -u -r1.1 makefile.mk ---- saxon/makefile.mk 14 Jul 2008 15:43:51 -0000 1.1 -+++ saxon/makefile.mk 26 Sep 2008 09:32:56 -0000 -@@ -63,5 +63,7 @@ - - .INCLUDE : set_ext.mk - .INCLUDE : target.mk -+.IF "$(SOLAR_JAVA)" != "" - .INCLUDE : tg_ext.mk -+.ENDIF - diff --git a/app-office/openoffice/openoffice-3.0.0_rc2.ebuild b/app-office/openoffice/openoffice-3.0.0_rc3.ebuild index c06b9c3608f4..2d70766ead52 100644 --- a/app-office/openoffice/openoffice-3.0.0_rc2.ebuild +++ b/app-office/openoffice/openoffice-3.0.0_rc3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc2.ebuild,v 1.3 2008/09/26 11:27:03 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0_rc3.ebuild,v 1.1 2008/10/03 11:57:28 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -10,10 +10,10 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam" -MY_PV="3.0.0.3.2" +MY_PV="3.0.0.3.3" PATCHLEVEL="OOO300" SRC="OOo_${PV}_src" -MST="ooo300-m7" +MST="ooo300-m8" DEVPATH="http://download.go-oo.org/${PATCHLEVEL}/${MST}" S="${WORKDIR}/ooo" S_OLD="${WORKDIR}/ooo-build-${MY_PV}" @@ -43,7 +43,7 @@ SRC_URI="${DEVPATH}-artwork.tar.bz2 http://download.go-oo.org/SRC680/extras-3.tar.bz2 http://download.go-oo.org/SRC680/biblio.tar.bz2 http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz - http://download.go-oo.org/DEV300/scsolver.2008-09-08.tar.bz2 + http://download.go-oo.org/DEV300/scsolver.2008-09-30.tar.bz2 http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz" @@ -104,7 +104,6 @@ COMMON_DEPEND="!app-office/openoffice-bin >=dev-libs/icu-3.8 >=sys-libs/db-4.3 >=app-text/libwpd-0.8.8 - >=media-libs/libsvg-0.1.4 >=media-libs/vigra-1.4 >=app-text/poppler-0.8.0 linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) @@ -245,8 +244,6 @@ src_unpack() { epatch "${FILESDIR}/gentoo-${PV}.diff" epatch "${FILESDIR}/ooo-env_log.diff" - cp -f "${FILESDIR}/stax-saxon-no-java.diff" ${S}/patches/dev300/ || die - #Use flag checks if use java ; then echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE} @@ -281,15 +278,14 @@ src_unpack() { echo "`use_enable eds evolution2`" >> ${CONFFILE} echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE} echo "`use_enable gnome lockdown`" >> ${CONFFILE} - echo "`use_enable gnome atkbridge`" >> ${CONFFILE} echo "`use_enable gstreamer`" >> ${CONFFILE} echo "`use_enable gtk systray`" >> ${CONFFILE} echo "`use_enable ldap`" >> ${CONFFILE} echo "`use_enable opengl`" >> ${CONFFILE} echo "`use_enable pam`" >> ${CONFFILE} echo "`use_with ldap openldap`" >> ${CONFFILE} - echo "`use_enable debug crashdump`" >> ${CONFFILE} + echo "`use_enable debug strip-solver`" >> ${CONFFILE} # Use splash screen without Sun logo echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE} @@ -385,10 +381,4 @@ pkg_postinst() { elog " according to your language needs. " elog - ewarn " Please note that this release of OpenOffice.org uses a " - ewarn " new user install dir. As a result you will have to redo " - ewarn " your settings. Alternatively you might copy the old one " - ewarn " over from ~/.ooo-2.0 to ~/.ooo3, but be warned that this " - ewarn " might break stuff. " - ewarn } |