summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYar Odin (yarodin) <yarodin@gmail.com>2009-02-15 09:22:00 +0000
committerYar Odin (yarodin) <yarodin@gmail.com>2009-02-15 09:22:00 +0000
commitf929e146e5b4d68b59c22edd2cd336ce880c5b71 (patch)
tree3146f3782dfa7da4979ab6ad67ad8215ad2d9be6
parentmedia-gfx/printoxx: Version bumb for Printoxx. (diff)
downloadsunrise-f929e146e5b4d68b59c22edd2cd336ce880c5b71.tar.gz
sunrise-f929e146e5b4d68b59c22edd2cd336ce880c5b71.tar.bz2
sunrise-f929e146e5b4d68b59c22edd2cd336ce880c5b71.zip
app-office/openoffice-infra: Version bump to 3.0.1 for openoffice-infra, and some fixes for version 2.4.2
svn path=/sunrise/; revision=7926
-rw-r--r--app-office/openoffice-infra/ChangeLog26
-rw-r--r--app-office/openoffice-infra/Manifest50
-rw-r--r--app-office/openoffice-infra/files/2.4.2/gentoo-fixsandbox.diff (renamed from app-office/openoffice-infra/files/gentoo-fixsandbox.diff)0
-rw-r--r--app-office/openoffice-infra/files/2.4.2/gentoo-python-2.3.4.diff224
-rw-r--r--app-office/openoffice-infra/files/3.0.0/gentoo-infragentoo.diff55
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-ReturnInteger.hdl (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-ReturnInteger.hdl)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-ReturnInteger.hpp (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-ReturnInteger.hpp)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-XVBAToOOEventDescGen.hdl (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-XVBAToOOEventDescGen.hdl)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-XVBAToOOEventDescGen.hpp (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-XVBAToOOEventDescGen.hpp)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-buildfix-mono-2-2.diff12
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-completion_matches.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-completion_matches.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-configure.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-configure.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-hunspell.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-hunspell.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-infragentoo.diff31
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-mkdepend.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-mkdepend.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-nojavanostax.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-nojavanostax.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-ru_dict.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-ru_dict.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-scripts.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-scripts.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-solenv_kde_mess.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-solenv_kde_mess.diff)0
-rw-r--r--app-office/openoffice-infra/files/3.0.1/gentoo-vba_incl.diff (renamed from app-office/openoffice-infra/files/3.0.0/gentoo-vba_incl.diff)0
-rw-r--r--app-office/openoffice-infra/openoffice-infra-2.4.2.ebuild25
-rw-r--r--app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild (renamed from app-office/openoffice-infra/openoffice-infra-3.0.0.ebuild)53
22 files changed, 355 insertions, 121 deletions
diff --git a/app-office/openoffice-infra/ChangeLog b/app-office/openoffice-infra/ChangeLog
index b13acdefa..fd7205cdd 100644
--- a/app-office/openoffice-infra/ChangeLog
+++ b/app-office/openoffice-infra/ChangeLog
@@ -2,6 +2,32 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Feb 2009; Yar Odin (yarodin) <yarodin@gmail.com>
+ -files/3.0.0/gentoo-ReturnInteger.hdl,
+ -files/3.0.0/gentoo-XVBAToOOEventDescGen.hdl,
+ -files/3.0.0/gentoo-XVBAToOOEventDescGen.hpp, +files/3.0.1,
+ +files/3.0.1/gentoo-ReturnInteger.hdl, openoffice-infra-2.4.2.ebuild,
+ -files/3.0.0/gentoo-ReturnInteger.hpp, -files/3.0.0/gentoo-configure.diff,
+ -files/3.0.0/gentoo-hunspell.diff, +files/3.0.1/gentoo-ReturnInteger.hpp,
+ +files/3.0.1/gentoo-XVBAToOOEventDescGen.hdl,
+ +files/2.4.2/gentoo-python-2.3.4.diff, -openoffice-infra-3.0.0.ebuild,
+ +files/2.4.2/gentoo-fixsandbox.diff, -files/3.0.0,
+ -files/3.0.0/gentoo-completion_matches.diff,
+ -files/3.0.0/gentoo-infragentoo.diff, -files/3.0.0/gentoo-mkdepend.diff,
+ +files/3.0.1/gentoo-XVBAToOOEventDescGen.hpp,
+ +files/3.0.1/gentoo-completion_matches.diff,
+ +openoffice-infra-3.0.1.ebuild, -files/3.0.0/gentoo-nojavanostax.diff,
+ -files/3.0.0/gentoo-ru_dict.diff, -files/3.0.0/gentoo-scripts.diff,
+ -files/3.0.0/gentoo-solenv_kde_mess.diff,
+ -files/3.0.0/gentoo-vba_incl.diff, +files/3.0.1/gentoo-configure.diff,
+ +files/3.0.1/gentoo-hunspell.diff, +files/3.0.1/gentoo-infragentoo.diff,
+ +files/3.0.1/gentoo-mkdepend.diff, +files/3.0.1/gentoo-nojavanostax.diff,
+ +files/3.0.1/gentoo-ru_dict.diff, +files/3.0.1/gentoo-vba_incl.diff,
+ +files/3.0.1/gentoo-buildfix-mono-2-2.diff,
+ +files/3.0.1/gentoo-scripts.diff,
+ +files/3.0.1/gentoo-solenv_kde_mess.diff, -files/gentoo-fixsandbox.diff:
+ Version bump to 3.0.1 for openoffice-infra, and some fixes for version 2.4.2
+
12 Jan 2009; Yar Odin (yarodin) <yarodin@gmail.com> +files/2.4.2,
+files/2.4.2/build-gcc43-missingincludes.diff,
+files/2.4.2/gentoo-completion_matches.diff,
diff --git a/app-office/openoffice-infra/Manifest b/app-office/openoffice-infra/Manifest
index fcc0f3a12..90d6389ff 100644
--- a/app-office/openoffice-infra/Manifest
+++ b/app-office/openoffice-infra/Manifest
@@ -1,26 +1,28 @@
AUX 2.4.2/build-gcc43-missingincludes.diff 3025 RMD160 fe8dad4762cf4ab428313965e9d1892415b0f087 SHA1 d905a3448f933d2a5fd0d1e46f1fad27ad1814cb SHA256 fc57d9a3288258768f9483c1295e75a65d0ac3f295502ecf8e9b731b38f244cf
AUX 2.4.2/gentoo-completion_matches.diff 698 RMD160 057d3d3b931c88889ef8fe6044bba89646119c76 SHA1 60b7be8278afd35587f465cf4f4a8371c47236ad SHA256 f8890eebea86cc1aa5302041b370bba7f5a31c5cb73430a51915c9d1eb2ae4f9
AUX 2.4.2/gentoo-configure.diff 2320 RMD160 a75fae055c028e35f28d9e330356908b970ed1a5 SHA1 659ca53218e33252ea59cfffa162fb177abe0341 SHA256 7196efbcdc7d6800ba64c5c0070369c756a2904cf660fda9881da49a51755660
+AUX 2.4.2/gentoo-fixsandbox.diff 486 RMD160 7695ae51e590030c67d746080acf32e4f6ecc07a SHA1 55fa01e5b9ced476744fe2e323bfe179649f47e8 SHA256 235bcf294618f70d52beeb0f276073cc09410a9b23e6b5a94aec60b51fe65e13
AUX 2.4.2/gentoo-gentooinfra.diff 1970 RMD160 c9ecc502d280f8240c671dab8d6e6dca20305331 SHA1 da173eab658deea681ed7ddfc2e2cb1c3fdd6d99 SHA256 db441e3a0304ff3ef3ed3e6614be3063149375194541ae4b9bcb8e4e580eadc9
AUX 2.4.2/gentoo-macolor.diff 619 RMD160 1c8511a7dd573274b47d5f4088f62bb1d5a9137d SHA1 ec0cf61a41e7f93be2ef429017d7ede612ab3e1b SHA256 10d272e96c5a61c86040ea66c577316c869012a9b67f88c8bd6fb5d6d1e3b3a8
AUX 2.4.2/gentoo-mkdepend.diff 411 RMD160 bec06f29b47c604c559765684c39a168b8b561e0 SHA1 41c392a1d4f197cebee49d474b686f318218d6bc SHA256 92627d6662329fb49102f5a0c9a5c1347fe125fec6933f2615a43a39171ea2ae
+AUX 2.4.2/gentoo-python-2.3.4.diff 7511 RMD160 65aa0a28399b5741f821ee62f3faed039fe5f64c SHA1 1e3c252952d7dc24e8855102dd559fae64a0b222 SHA256 a15a79c7d8eea20a090c7e9ef376898fc94de48e0b8d39a8dc6759c7e4326289
AUX 2.4.2/gentoo-scripts.diff 1181 RMD160 9e86bc9a137cad7d16c6a75c0479cc6fab3f0b63 SHA1 4dc205ad2841756742ac0c6defc2e1047f29cc18 SHA256 62e2c280b988e2cd9258eedaacbed9c8a9e96e7aea0bc8d8fd61c6e3edf0a049
-AUX 3.0.0/gentoo-ReturnInteger.hdl 754 RMD160 2e2ad754d338e458ae39ab953d0bf00895b00e40 SHA1 39c1e2648c90813e8d1cf80ae54d44f90cf3879f SHA256 8f6adc5108b52872a3dddc4b261be71e9ecebcf1290cc7c2c512b93ac26aa8d2
-AUX 3.0.0/gentoo-ReturnInteger.hpp 1402 RMD160 aafa5507e5b39f2a37d6b2c83d7863791f44bf62 SHA1 3078a431f3055786784528f5b0eb741c10bc488b SHA256 d26cc55eabe836bdd3e21fc46e3cd0883dfa51139c039bba540779f3442243a9
-AUX 3.0.0/gentoo-XVBAToOOEventDescGen.hdl 1722 RMD160 3988f9a0d8279b4290afbdec45282894a3ba5f2f SHA1 0ec7c9351f80746c51fcc8c1e3ba086639b5b7b5 SHA256 95abb7e536b09a91b06f4cd3ba94e0540a4cf990aff50e36363a7aa9edb8c883
-AUX 3.0.0/gentoo-XVBAToOOEventDescGen.hpp 1649 RMD160 2c16c1e76c8857cd8416008638ce3c004215f967 SHA1 72e4033a48f937cd826564e2439f6d1f1f35bd3d SHA256 34a87b207852869d4d4f5037cfb6e01e81257633047113db5dc6adc301877b02
-AUX 3.0.0/gentoo-completion_matches.diff 695 RMD160 c4dbf41740073786c31eb543d846282383e5fff6 SHA1 7898aafab4406382a44fb2bd7ce0face0bb11d63 SHA256 6af7c86d8fb6af166c388f202dbff64587cd546715b6d28f49c3188cf0de4594
-AUX 3.0.0/gentoo-configure.diff 2321 RMD160 b632b76c345756ea71457325881fdb70427a0537 SHA1 6458fa22c15b945f95c29af984684b906b53a3f2 SHA256 09dab321d63d1eaf983c1a5d6f9b484275d5734967dd4661f35a214553434b57
-AUX 3.0.0/gentoo-hunspell.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
-AUX 3.0.0/gentoo-infragentoo.diff 3465 RMD160 73b1a3bc4f053c46c47aecccb3a964d5f565962e SHA1 00bc8f288c0062415ab12157308fa85255f44ed2 SHA256 26f4ecb3bda5f60b3864c04cd6d35a202daa330cd8adb73b0961ab0dddb1f6a3
-AUX 3.0.0/gentoo-mkdepend.diff 345 RMD160 f76234b5fd970d71e6e06af3d50e21459c72a373 SHA1 b0d01f2c6062beec0c836b93ce8f774b928b04e5 SHA256 ef6732854c02b09887f74176b0ea4b330a11ebaf7ecd5f78c595a633af320ae2
-AUX 3.0.0/gentoo-nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
-AUX 3.0.0/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661
-AUX 3.0.0/gentoo-scripts.diff 1086 RMD160 53dfcce0407d2fc7b00cf7c478a64de0f7201049 SHA1 d238824eccbd0741047807c2f47902dba973095a SHA256 774e3a26d31838796e0cfa822d51589c6a07b8ce2481233c1b1113a81bf0a612
-AUX 3.0.0/gentoo-solenv_kde_mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
-AUX 3.0.0/gentoo-vba_incl.diff 697 RMD160 63c4f319bf879e2287c45d9e685845b99473595c SHA1 d23061f3079ff121dec57a0b09313d2849dee513 SHA256 29f7a8297f9fcbe6cdd50fefbe2beedfbc3003c9333fc6bb4af692f1db853157
+AUX 3.0.1/gentoo-ReturnInteger.hdl 754 RMD160 2e2ad754d338e458ae39ab953d0bf00895b00e40 SHA1 39c1e2648c90813e8d1cf80ae54d44f90cf3879f SHA256 8f6adc5108b52872a3dddc4b261be71e9ecebcf1290cc7c2c512b93ac26aa8d2
+AUX 3.0.1/gentoo-ReturnInteger.hpp 1402 RMD160 aafa5507e5b39f2a37d6b2c83d7863791f44bf62 SHA1 3078a431f3055786784528f5b0eb741c10bc488b SHA256 d26cc55eabe836bdd3e21fc46e3cd0883dfa51139c039bba540779f3442243a9
+AUX 3.0.1/gentoo-XVBAToOOEventDescGen.hdl 1722 RMD160 3988f9a0d8279b4290afbdec45282894a3ba5f2f SHA1 0ec7c9351f80746c51fcc8c1e3ba086639b5b7b5 SHA256 95abb7e536b09a91b06f4cd3ba94e0540a4cf990aff50e36363a7aa9edb8c883
+AUX 3.0.1/gentoo-XVBAToOOEventDescGen.hpp 1649 RMD160 2c16c1e76c8857cd8416008638ce3c004215f967 SHA1 72e4033a48f937cd826564e2439f6d1f1f35bd3d SHA256 34a87b207852869d4d4f5037cfb6e01e81257633047113db5dc6adc301877b02
+AUX 3.0.1/gentoo-buildfix-mono-2-2.diff 523 RMD160 993dee1c2ab796980e7f04f8b9c0aeefc19743c7 SHA1 b2aee23fa2a7d6fb0b1a1d1ca97609bfaaa7f696 SHA256 5f807dd7b892dfa30c177ed20e69c19f50541bfec2f94a2ff1caaa5aa656a324
+AUX 3.0.1/gentoo-completion_matches.diff 695 RMD160 c4dbf41740073786c31eb543d846282383e5fff6 SHA1 7898aafab4406382a44fb2bd7ce0face0bb11d63 SHA256 6af7c86d8fb6af166c388f202dbff64587cd546715b6d28f49c3188cf0de4594
+AUX 3.0.1/gentoo-configure.diff 2321 RMD160 b632b76c345756ea71457325881fdb70427a0537 SHA1 6458fa22c15b945f95c29af984684b906b53a3f2 SHA256 09dab321d63d1eaf983c1a5d6f9b484275d5734967dd4661f35a214553434b57
+AUX 3.0.1/gentoo-hunspell.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
+AUX 3.0.1/gentoo-infragentoo.diff 1901 RMD160 c0990c4dd55177fa8bf974cfb170063e2d954d6e SHA1 e39a114de2a8ef26beecd697c5ccdd2bf0e33f36 SHA256 9b9816ee0aa6c1ad5986887d4c0db822d5398f2d84ef00e33a8c8fbe6d5e0393
+AUX 3.0.1/gentoo-mkdepend.diff 345 RMD160 f76234b5fd970d71e6e06af3d50e21459c72a373 SHA1 b0d01f2c6062beec0c836b93ce8f774b928b04e5 SHA256 ef6732854c02b09887f74176b0ea4b330a11ebaf7ecd5f78c595a633af320ae2
+AUX 3.0.1/gentoo-nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
+AUX 3.0.1/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661
+AUX 3.0.1/gentoo-scripts.diff 1086 RMD160 53dfcce0407d2fc7b00cf7c478a64de0f7201049 SHA1 d238824eccbd0741047807c2f47902dba973095a SHA256 774e3a26d31838796e0cfa822d51589c6a07b8ce2481233c1b1113a81bf0a612
+AUX 3.0.1/gentoo-solenv_kde_mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
+AUX 3.0.1/gentoo-vba_incl.diff 697 RMD160 63c4f319bf879e2287c45d9e685845b99473595c SHA1 d23061f3079ff121dec57a0b09313d2849dee513 SHA256 29f7a8297f9fcbe6cdd50fefbe2beedfbc3003c9333fc6bb4af692f1db853157
AUX gentoo-epm-3.7.patch.diff 2627 RMD160 18d2ac9bea7e9ceb5adc40599cfb151ac3de1f84 SHA1 d2e6b612ce7df5606e7101fffe2cff2f0d16c0e3 SHA256 eb801d90856c48f04b4fee8d21b01d0dd2951288efd6aa4ed5cf6807074c2c12
-AUX gentoo-fixsandbox.diff 486 RMD160 7695ae51e590030c67d746080acf32e4f6ecc07a SHA1 55fa01e5b9ced476744fe2e323bfe179649f47e8 SHA256 235bcf294618f70d52beeb0f276073cc09410a9b23e6b5a94aec60b51fe65e13
AUX gentoo-system_pgsql.diff 646 RMD160 7354b333ca619617616e6b8dba2a259a68cb4aa3 SHA1 f3bb553f042bf62b527dee3067f02be245a431d6 SHA256 2c5cb32de91ca71402cc590cc539bd6f4f0dab921507edb7a41f1bf9717bedf5
AUX java-set-classpath.in 2608 RMD160 b47b6046bfeb1c01512534d4c19308cf5892c208 SHA1 45a3a40a6fcb707a4783e81c04a0c084cd9d68a1 SHA256 4c4e24eeb801d758b896f537de6d50263e1a23d285a24d67fe72e6a7ec50fd59
AUX wrapper.in 96 RMD160 34ca656bc8af3c5b44ed16cebedf5d3297b09a2d SHA1 5861b8434da84efff56e5ceaf53a7668a5f52cea SHA256 97b603968d423e5d8e52c1c14c118647df0a7a858d6a1cb10524af9ea90a9dbc
@@ -29,20 +31,20 @@ DIST OOo_2.4.2_src_core.tar.bz2 153673147 RMD160 d29ed7d23a7616b05d855c172e6f148
DIST OOo_2.4.2_src_l10n.tar.bz2 81193726 RMD160 7a2bf7cbe404b7fe8cb61c670717f54046e1cab9 SHA1 c59fefaf9f7e3372fbeb2a1e468270613b7b1fa6 SHA256 0b1869f8c9fc56ee7c6830bd844f212f6e8587d9deb0c7c3105c1acf22da63e8
DIST OOo_2.4.2_src_sdk.tar.bz2 38354 RMD160 6f1334b4609a372970c03b33d9d8b9fe1a582d69 SHA1 5129e3ebd4ca18b0772f9916a94c52933896c68f SHA256 46f3f832384dd17dd503bd6090277f8937483c74850dd6b2666feb82361bb653
DIST OOo_2.4.2_src_system.tar.bz2 44071903 RMD160 172fcde006f5e81f3be526ab50dbb10a67d277b3 SHA1 67dd2af4c25a311c2e83a7dcd3a8229378ee1625 SHA256 28eb0c3f53be94d01e93821669c9652a135f61faebf77b8a131e9632d1e090e4
-DIST OOo_3.0.0_src_binfilter.tar.bz2 6596201 RMD160 edc71b8b0596d63e60431c7266140bf5188abc6d SHA1 09ff91fd871f00c696befa8064fe04d7a88a3c8a SHA256 465cd3f28ce687634cd658fd937f9062f1a2ceb209cb361ce7910fb0720204b2
-DIST OOo_3.0.0_src_core.tar.bz2 183003517 RMD160 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d SHA1 8fc1e6140f8a0695accf8d34746253af431c2542 SHA256 6949513a20844cd5fb451dd045ccc615b35880a68f6fc8726b8bcc083ce3ad85
-DIST OOo_3.0.0_src_extensions.tar.bz2 13941316 RMD160 a19bdd687abc7829de937b46e4e484a4b27f045b SHA1 1632374bf75eb6080c0d36e88fd981529be17a0f SHA256 fbd38f406b337fe76570eb399a12bcf70ddc613e2ba7f183dc841355111584ad
-DIST OOo_3.0.0_src_l10n.tar.bz2 86009445 RMD160 cb3eac1537b75cb34485037b916b634b90c6ff13 SHA1 0ee7f44cea5549a3d3473ff7669974e8914caf97 SHA256 b9b1bafc9890b8a27c73204be379a1a96621a87d67e77ef6ff834de9b8da0da7
-DIST OOo_3.0.0_src_system.tar.bz2 44882699 RMD160 10c8b58ade00cf22fdb699f38d60abee8e150436 SHA1 b8af1787bd4651c808d298e81ee797bf2b7ebdcd SHA256 ad8ecc0ab3f24565ea583ec20628cf89751c59a6484ecf355bac32ce96c130b5
+DIST OOo_3.0.1_src_binfilter.tar.bz2 20331 RMD160 24bb1234c790c754d230edee7512fa52faf69d79 SHA1 8db21f4f9cad8b0ad2ca327ed849f31650b65e26 SHA256 353a4d4e39060ec950acf22a6a798a78dbb24262f2d69be90b7e85e6e56093f8
+DIST OOo_3.0.1_src_core.tar.bz2 182573274 RMD160 9c4f18779a03cdabb0204d8eb1b661b4d9cc1369 SHA1 2da6b2cf0b75873477f22cc9d69a4f0c8b43b435 SHA256 00e3a4c634b3522b006b6ca5690a97c814be546be5a19b80edfa53638e3df339
+DIST OOo_3.0.1_src_extensions.tar.bz2 13941829 RMD160 e89c7594f642147a95e85612d5646bc3edc869db SHA1 c695982d166422a838560ef7b134a5665bc61198 SHA256 dfc70ba2ac28c0c5f6942499bfd9dfa2fb147695f96ee4ec12d44d4b5f45e5b6
+DIST OOo_3.0.1_src_l10n.tar.bz2 86008240 RMD160 a02e8c06c67ac7b2833afa4a54993d81674e8b9b SHA1 13f1bf0989a09c52c57dbc1d6cf1feaec369a085 SHA256 53f0e621d2b38b97742ab67ef18313a868dbde43924ef54f9133121f29d4d75b
+DIST OOo_3.0.1_src_system.tar.bz2 45625279 RMD160 35f1822f3e3aa2f6af0c268dd51534568473e636 SHA1 8c73821b542c9c96b071550fe0e3e813e21a1246 SHA256 bb3dadb23570f1d36f0b1bcbe5a39782921b955513db28d05e9ca75eeca2e8fe
DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
DIST infra-ooo-files_2.4.2.tar.gz 16480053 RMD160 8b14a6b019c10d1ddb073d85a596aeb2471e3a4d SHA1 0da8caabf9d778d232e118418337b56a5c1629af SHA256 57cb12e730a74e1518ab4444fbfb07c268bdb1485c2bc4512aba7a98f8ad40a1
-DIST infra-ooo-files_3.0.0.tar.gz 20610327 RMD160 84e5b6af75a40bc0e366a49659b1612543b928b8 SHA1 a619920cd5799836af4c23c3b6c1085b33121f26 SHA256 8487cd58447100bb2c1418979a05c34d53dbe60275a79d69ee5bffc555443625
+DIST infra-ooo-files_3.0.1.tar.gz 20712561 RMD160 76be30a30f6cd859a2342018550fc48637518d06 SHA1 28a79a28769548d0bf39fdb8c1bfa2f14e97576b SHA256 2b4daca6b551f71a31c0746d5be63ce7a126b5d281041222f8c637b3b522d411
DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
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-infra-2.4.2.ebuild 23505 RMD160 f87a05cf431ec22516dc3d8edede3005a4208193 SHA1 f7a5ea3e9c2ad63060c3eca8bd866da4870ecc24 SHA256 9900637289223163fb055842bb7fa912dbedbb52d8e340125ec40c01a4b2d535
-EBUILD openoffice-infra-3.0.0.ebuild 23432 RMD160 54fc780f6e892ca5e251063b2762c259d1b37118 SHA1 d9976a084f8589f220cfe3cbe4b70fb7dc6cf7ad SHA256 530d821683d5e18284e3bef89eace9581d154833d5964d1e0a13fb9b0994b8b5
-MISC ChangeLog 1355 RMD160 a80e7d9c96adcf3d656637224f029f91e3b24cae SHA1 2573dd528fd2aaaaaf9b3246ca90601e7839ebab SHA256 09e838b08175bf8d5002686f6a1108832734dbd67ce8632d150d43c16abf2e97
+EBUILD openoffice-infra-2.4.2.ebuild 23302 RMD160 f585e6163d917dc0b75095384942d0e86ea3cc97 SHA1 3adde6a63e41ce665e69e6955f799dbc5db77ed8 SHA256 ed02f1853872bd4e4fda5343c0ff5505e96b64f48b81518d3e663a18c8385de8
+EBUILD openoffice-infra-3.0.1.ebuild 23287 RMD160 4f740617237ab1e1a3eda208b4ee197e9f4d0e5b SHA1 6f8c74cb2d7e5fe87a954b5ef1957f528fede59b SHA256 3e5b7f55ea069f7884c5be6ec8c90a4becd81ec0c59a9993c483ce576a571293
+MISC ChangeLog 2895 RMD160 85a407cf2a9fc0da5e1856386764a223d5eb8205 SHA1 e798bb920f07db386c8ba06cf97ad68ff70cf6da SHA256 61602ab9c0ed5d24ea2147bba1f98dadd71d24b87864fc349e98dc147a7f543d
MISC metadata.xml 786 RMD160 7ade4465c360cd6e056bb17ad84d734b0632bfa0 SHA1 02dc5171d3660ff4471d40eb9f344b1e7d195254 SHA256 cf87cefd0eca5cfdf69024e119d003b02d7cba4e18cf05a939dcc4766af4ed25
diff --git a/app-office/openoffice-infra/files/gentoo-fixsandbox.diff b/app-office/openoffice-infra/files/2.4.2/gentoo-fixsandbox.diff
index 07b923d3e..07b923d3e 100644
--- a/app-office/openoffice-infra/files/gentoo-fixsandbox.diff
+++ b/app-office/openoffice-infra/files/2.4.2/gentoo-fixsandbox.diff
diff --git a/app-office/openoffice-infra/files/2.4.2/gentoo-python-2.3.4.diff b/app-office/openoffice-infra/files/2.4.2/gentoo-python-2.3.4.diff
new file mode 100644
index 000000000..917fd6a2e
--- /dev/null
+++ b/app-office/openoffice-infra/files/2.4.2/gentoo-python-2.3.4.diff
@@ -0,0 +1,224 @@
+--- python/Python-2.3.4.patch.orig 2009-02-15 10:33:05.000000000 +0500
++++ python/Python-2.3.4.patch 2009-02-15 10:36:09.000000000 +0500
+@@ -155,6 +155,23 @@
+ *** misc/Python-2.3.4/Makefile.pre.in Tue Nov 18 20:54:00 2003
+ --- misc/build/Python-2.3.4/Makefile.pre.in Wed Oct 17 14:01:01 2007
+ ***************
++*** 56,62 ****
++ OPT= @OPT@
++ BASECFLAGS= @BASECFLAGS@
++ CFLAGS= $(BASECFLAGS) $(OPT)
++! CPPFLAGS= -I. -I$(srcdir)/Include
++ LDFLAGS= @LDFLAGS@
++ LDLAST= @LDLAST@
++ SGI_ABI= @SGI_ABI@
++--- 56,62 ----
++ OPT= @OPT@
++ BASECFLAGS= @BASECFLAGS@
++ CFLAGS= $(BASECFLAGS) $(OPT)
++! CPPFLAGS= -D_FORTIFY_SOURCE=0 -I. -I$(srcdir)/Include
++ LDFLAGS= @LDFLAGS@
++ LDLAST= @LDLAST@
++ SGI_ABI= @SGI_ABI@
++***************
+ *** 114,123 ****
+ RUNSHARED= @RUNSHARED@
+
+@@ -1540,7 +1557,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,48 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _bsddb.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _bsddb.mak
+ !
+ ! ..\Modules\_bsddb.c : \
+ ! "..\Include\abstract.h"\
+@@ -1838,7 +1855,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,49 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _csv.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _csv.mak
+ !
+ ! ..\Modules\_csv.c : \
+ ! "..\Include\abstract.h"\
+@@ -2136,7 +2153,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,53 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _socket.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _socket.mak
+ !
+ ! ..\Modules\socketmodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -2438,7 +2455,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,51 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _sre.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _sre.mak
+ !
+ ! ..\Modules\_sre.c : \
+ ! "..\Include\abstract.h"\
+@@ -2738,7 +2755,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,50 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _symtable.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _symtable.mak
+ !
+ ! ..\Modules\symtablemodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -3036,7 +3053,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,50 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _testcapi.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _testcapi.mak
+ !
+ ! ..\Modules\_testcapimodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -3333,7 +3350,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,49 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _tkinter.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _tkinter.mak
+ !
+ ! ..\Modules\_tkinter.c : \
+ ! "..\Include\abstract.h"\
+@@ -3641,7 +3658,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,50 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von bz2.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von bz2.mak
+ !
+ ! ..\Modules\bz2module.c : \
+ ! "..\Include\abstract.h"\
+@@ -3890,7 +3907,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,50 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von datetime.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von datetime.mak
+ !
+ ! ..\Modules\datetimemodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -4191,7 +4208,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,5 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von make_versioninfo.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von make_versioninfo.mak
+ !
+ ! ..\PC\make_versioninfo.c : \
+ ! "..\Include\patchlevel.h"\
+@@ -4428,7 +4445,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,48 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von mmap.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von mmap.mak
+ !
+ ! ..\Modules\mmapmodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -4723,7 +4740,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,53 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von parser.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von parser.mak
+ !
+ ! ..\Modules\parsermodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -5025,7 +5042,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,85 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von pyexpat.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von pyexpat.mak
+ !
+ ! ..\Modules\pyexpat.c : \
+ ! "..\Include\abstract.h"\
+@@ -5390,7 +5407,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,52 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von python.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von python.mak
+ !
+ ! ..\Modules\python.c : \
+ ! "..\Include\abstract.h"\
+@@ -5725,7 +5742,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,5452 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von pythoncore.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von pythoncore.mak
+ !
+ ! ..\Modules\_codecsmodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -12624,7 +12641,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,52 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von pythonw.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von pythonw.mak
+ !
+ ! ..\PC\python_exe.rc : \
+ ! "..\PC\pycon.ico"\
+@@ -12943,7 +12960,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,48 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von select.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von select.mak
+ !
+ ! ..\Modules\selectmodule.c : \
+ ! "..\Include\abstract.h"\
+@@ -13241,7 +13258,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,51 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von unicodedata.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von unicodedata.mak
+ !
+ ! ..\Modules\unicodedata.c : \
+ ! "..\Include\abstract.h"\
+@@ -13539,7 +13556,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,2 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von w9xpopen.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von w9xpopen.mak
+ !
+ *** misc/Python-2.3.4/PCbuild/w9xpopen.mak Wed Oct 17 13:58:38 2007
+ --- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak Wed Oct 17 14:01:02 2007
+@@ -13731,7 +13748,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,49 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von winreg.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von winreg.mak
+ !
+ ! ..\PC\_winreg.c : \
+ ! "..\Include\abstract.h"\
+@@ -14045,7 +14062,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,48 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von winsound.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von winsound.mak
+ !
+ ! ..\PC\winsound.c : \
+ ! "..\Include\abstract.h"\
+@@ -14340,7 +14357,7 @@
+ *** 1 ****
+ ! dummy
+ --- 1,49 ----
+-! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von zlib.mak
++! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von zlib.mak
+ !
+ ! ..\Modules\zlibmodule.c : \
+ ! "..\Include\abstract.h"\
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-infragentoo.diff b/app-office/openoffice-infra/files/3.0.0/gentoo-infragentoo.diff
deleted file mode 100644
index 2b043a449..000000000
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-infragentoo.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- patches/dev300/apply.orig 2008-10-19 13:05:05.000000000 +0600
-+++ patches/dev300/apply 2009-01-11 01:31:19.000000000 +0500
-@@ -142,6 +142,7 @@
-
- InfraUnix: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, IntegrateExtensions
- InfraLinux: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, UbuntuIntrepidOnly
-+InfraGentoo: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, Gentoo
- InfraSolaris: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
- InfraWin32: Win32Common, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
- InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
-@@ -265,6 +266,9 @@
- # (happened to me with DirectX SDK)
- buildfix-directx-path.diff, i#93333, jholesov
-
-+# workaround for building with KDE when both KDE 3.5 and 4.1 are present
-+solenv.workaround-for-the-kde-mess.diff, i#95552, dtardon
-+
- [ CJK ]
- #set default CJK font fontsize as 10.5pt
- sw-default-cjk-fontsize.diff i#72010, jianhua
-@@ -1436,7 +1440,11 @@
- SectionOwner => aprosky
-
- # system lucene classpath
--gentoo-system-lucene.diff
-+#gentoo-system-lucene.diff
-+# No java build
-+nojavanostax.diff
-+# Fix freezes with dict|hyph-stuff in one dir
-+hunspell-one-dir-nocrash.diff
- # Allow build to proceed with PaX enabled
- gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
---- patches/dev300/scp2_build_extensions.diff.orig 2009-01-11 11:57:12.000000000 +0100
-+++ patches/dev300/scp2_build_extensions.diff 2009-01-11 11:57:24.000000000 +0100
-@@ -4,7 +4,7 @@
- cp scp2\source\canvas nmake - all cp_canvas cp_langmacros cp_langtemplates NULL
- cp scp2\source\crashrep nmake - all cp_crashrep cp_langmacros cp_langtemplates NULL
- cp scp2\source\draw nmake - all cp_draw cp_langmacros cp_langtemplates NULL
--+cp scp2\source\extensions nmake - all cp_extensions cp_langmacros NULL
-++cp scp2\source\extensions nmake - all cp_extensions cp_langmacros cp_langtemplates NULL
- cp scp2\source\gnome nmake - all cp_gnome cp_langmacros cp_langtemplates NULL
- cp scp2\source\graphicfilter nmake - all cp_graphicfilter cp_langmacros cp_langtemplates NULL
- cp scp2\source\impress nmake - all cp_impress cp_langmacros cp_langtemplates NULL
---- patches/dev300/svg-import-filter.diff
-+++ patches/dev300/svg-import-filter.diff
-@@ -787,7 +787,7 @@
- + $(SLO)$/units.obj
- +
- +.IF "$(COMID)"=="gcc3"
--+.IF "$(CCNUMVER)">="000400000000"
-++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
- +CFLAGS+=-DUSE_MODERN_SPIRIT
- +.ENDIF
- .ENDIF
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-ReturnInteger.hdl b/app-office/openoffice-infra/files/3.0.1/gentoo-ReturnInteger.hdl
index 15816d831..15816d831 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-ReturnInteger.hdl
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-ReturnInteger.hdl
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-ReturnInteger.hpp b/app-office/openoffice-infra/files/3.0.1/gentoo-ReturnInteger.hpp
index 804e96269..804e96269 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-ReturnInteger.hpp
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-ReturnInteger.hpp
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-XVBAToOOEventDescGen.hdl b/app-office/openoffice-infra/files/3.0.1/gentoo-XVBAToOOEventDescGen.hdl
index 5f7e3b764..5f7e3b764 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-XVBAToOOEventDescGen.hdl
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-XVBAToOOEventDescGen.hdl
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-XVBAToOOEventDescGen.hpp b/app-office/openoffice-infra/files/3.0.1/gentoo-XVBAToOOEventDescGen.hpp
index 7f18420a4..7f18420a4 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-XVBAToOOEventDescGen.hpp
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-XVBAToOOEventDescGen.hpp
diff --git a/app-office/openoffice-infra/files/3.0.1/gentoo-buildfix-mono-2-2.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-buildfix-mono-2-2.diff
new file mode 100644
index 000000000..69ca27cb5
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-buildfix-mono-2-2.diff
@@ -0,0 +1,12 @@
+--- cli_ure/source/climaker/makefile.mk
++++ cli_ure/source/climaker/makefile.mk
+@@ -62,7 +62,7 @@
+
+ $(BIN)$/climaker : climaker_csharp.cs
+ gmcs -debug -unsafe climaker_csharp.cs -reference:$(BIN)/cli_basetypes.dll -out:$(BIN)$/climaker.exe
+- mkbundle2 --static -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
++ mkbundle2 -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
+
+ .INCLUDE : target.mk
+ .ENDIF # "$(ENABLE_MONO_CLIMAKER)" != "YES"
+
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-completion_matches.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-completion_matches.diff
index 7dbd1ec9d..7dbd1ec9d 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-completion_matches.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-completion_matches.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-configure.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-configure.diff
index 7821d7b41..7821d7b41 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-configure.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-configure.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-hunspell.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-hunspell.diff
index 85fa3e8fc..85fa3e8fc 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-hunspell.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-hunspell.diff
diff --git a/app-office/openoffice-infra/files/3.0.1/gentoo-infragentoo.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-infragentoo.diff
new file mode 100644
index 000000000..b7cacfe05
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-infragentoo.diff
@@ -0,0 +1,31 @@
+--- patches/dev300/apply.orig 2009-02-07 16:05:00.000000000 +0500
++++ patches/dev300/apply 2009-02-14 11:27:27.000000000 +0500
+@@ -150,6 +150,7 @@
+
+ InfraUnix: LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, IntegrateExtensions
+ InfraLinux: LinuxCommon, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, UbuntuIntrepidOnly
++InfraGentoo: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, Gentoo
+ InfraSolaris: LinuxCommon, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
+ InfraWin32: Win32Common, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
+ InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
+@@ -1474,6 +1475,10 @@
+ [ GentooOnly ]
+ SectionOwner => aprosky
+
++# No java build
++nojavanostax.diff
++# Fix freezes with dict|hyph-stuff in one dir
++hunspell-one-dir-nocrash.diff
+ # Allow build to proceed with PaX enabled
+ gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs
+@@ -1555,6 +1560,9 @@
+ mono-climaker-config.diff
+ mono-climaker-bridgetest.diff
+
++# Buildfix with Mono 2.2, aprosky
++buildfix-mono-2-2.diff
++
+ [ VBAObjects ]
+ SectionOwner => noelpwer
+
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-mkdepend.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-mkdepend.diff
index dca854ed1..dca854ed1 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-mkdepend.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-mkdepend.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-nojavanostax.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-nojavanostax.diff
index 9134872f8..9134872f8 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-nojavanostax.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-nojavanostax.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-ru_dict.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-ru_dict.diff
index c3b60c910..c3b60c910 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-ru_dict.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-ru_dict.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-scripts.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-scripts.diff
index 6ccc649a9..6ccc649a9 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-scripts.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-scripts.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-solenv_kde_mess.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-solenv_kde_mess.diff
index 714709e21..714709e21 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-solenv_kde_mess.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-solenv_kde_mess.diff
diff --git a/app-office/openoffice-infra/files/3.0.0/gentoo-vba_incl.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-vba_incl.diff
index 7851284cb..7851284cb 100644
--- a/app-office/openoffice-infra/files/3.0.0/gentoo-vba_incl.diff
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-vba_incl.diff
diff --git a/app-office/openoffice-infra/openoffice-infra-2.4.2.ebuild b/app-office/openoffice-infra/openoffice-infra-2.4.2.ebuild
index dd1e51e14..3f102f996 100644
--- a/app-office/openoffice-infra/openoffice-infra-2.4.2.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-2.4.2.ebuild
@@ -6,7 +6,7 @@ WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
EAPI="1"
-inherit autotools check-reqs db-use eutils gnome2-utils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk java kde ldap mono odk oodict opengl pam seamonkey xulrunner"
@@ -312,8 +312,10 @@ src_unpack() {
# fix handling of system libs for postgresql-base
epatch "${FILESDIR}/gentoo-system_pgsql.diff"
# fix sandbox
- epatch "${FILESDIR}/gentoo-fixsandbox.diff"
-#
+ epatch "${FILESDIR}/${PV}/gentoo-fixsandbox.diff"
+ # fix python 2.3.4 build
+ epatch "${FILESDIR}/${PV}/gentoo-python-2.3.4.diff"
+
# Use flag checks
if use java; then
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-ant-home=${ANT_HOME}"
@@ -524,21 +526,20 @@ src_install() {
cd "${D}"${instdir}/share/xdg/
for i in ${allcomponents}; do
- mv "${i}".desktop openoffice.org2.4-"${i}".desktop
if [[ "${i}" == "printeradmin" ]]; then
- sed -i -e s/openoffice.org2.4-/oo/g openoffice.org2.4-"${i}".desktop || die "Sed failed"
+ sed -i -e s/openoffice.org2.4-/oo/g "${i}".desktop || die "Sed failed"
else
- sed -i -e s/openoffice.org2.4/ooffice/g openoffice.org2.4-"${i}".desktop || die "Sed failed"
+ sed -i -e s/openoffice.org2.4/ooffice/g "${i}".desktop || die "Sed failed"
fi
if [[ "${i}" == "draw" ]]; then
sed -i -e "s/Name\=OpenOffice\.org 2\.4 Draw/Name\=OpenOffice\.org 2\.4 Draw\nGenericName\=Draw\nGenericName[ru]\=Рисунки, блок-схемы и логотипы/g" \
- openoffice.org2.4-"${i}".desktop || die "Sed failed"
+ "${i}".desktop || die "Sed failed"
fi
if [[ "${i}" == "math" ]]; then
sed -i -e "s/Name\=OpenOffice\.org 2\.4 Math/Name\=OpenOffice\.org 2\.4 Math\nGenericName\=Math\nGenericName[ru]\=Формулы и уравнения/g" \
- openoffice.org2.4-"${i}".desktop || die "Sed failed"
+ "${i}".desktop || die "Sed failed"
fi
- domenu openoffice.org2.4-"${i}".desktop
+ domenu "${i}".desktop
done
# Icons
@@ -622,9 +623,6 @@ pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
- if use gtk || use gnome; then
- gnome2_icon_cache_update
- fi
use !oodict && eselect oodict update --libdir $(get_libdir)
@@ -660,9 +658,6 @@ pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
- if use gtk || use gnome; then
- gnome2_icon_cache_update
- fi
use !oodict && [[ ! -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && rm -rf /usr/$(get_libdir)/openoffice
diff --git a/app-office/openoffice-infra/openoffice-infra-3.0.0.ebuild b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
index 187aba6a2..05db90f88 100644
--- a/app-office/openoffice-infra/openoffice-infra-3.0.0.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
@@ -11,7 +11,7 @@ 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 oodict opengl pam"
PATCHLEVEL="OOO300"
-MILESTONE="9"
+MILESTONE="15"
OOOTAG=${PATCHLEVEL}_m${MILESTONE}
OOOBUILDTAG=ooo300-m${MILESTONE}
@@ -63,6 +63,9 @@ COMMON_DEPEND="!app-office/openoffice-infra-bin
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
mono? ( >=dev-lang/mono-1.2.3.1 )
+ nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
+ >=dev-libs/nspr-4.6.6
+ >=dev-libs/nss-3.11-r1 )
opengl? ( virtual/opengl
virtual/glu )
>=net-misc/neon-0.24.7
@@ -109,13 +112,9 @@ DEPEND="${COMMON_DEPEND}
>=net-misc/curl-7.12
sys-libs/zlib
sys-apps/coreutils
- media-gfx/imagemagick
pam? ( sys-libs/pam )
!dev-util/dmake
>=dev-lang/python-2.3.4
- nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
- >=dev-libs/nspr-4.6.6
- >=dev-libs/nss-3.11-r1 )
java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
>=dev-java/ant-core-1.7 )
ldap? ( net-nds/openldap )
@@ -166,6 +165,12 @@ pkg_setup() {
ewarn
fi
+ if use !gtk && use !gnome; then
+ ewarn " If you want the OpenOffice.org systray quickstarter to work "
+ ewarn " activate the 'gtk' and 'gnome' use flags. "
+ ewarn
+ fi
+
if is-flagq -ffast-math ; then
eerror
eerror " You are using -ffast-math, which is known to cause problems. "
@@ -232,7 +237,7 @@ src_unpack() {
# Patches from go-oo mainstream
cp -f "${FILESDIR}/${PV}/gentoo-nojavanostax.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/nojavanostax.diff" || die
cp -f "${FILESDIR}/${PV}/gentoo-hunspell.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/hunspell-one-dir-nocrash.diff" || die
- cp -f "${FILESDIR}/${PV}/gentoo-solenv_kde_mess.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/solenv.workaround-for-the-kde-mess.diff" || die
+ cp -f "${FILESDIR}/${PV}/gentoo-buildfix-mono-2-2.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/buildfix-mono-2-2.diff" || die
cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2"
cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/ru/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_ru.tar.bz2"
@@ -273,8 +278,6 @@ src_unpack() {
epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
# fix handling of system libs for postgresql-base
epatch "${FILESDIR}/gentoo-system_pgsql.diff"
- # fix sandbox
- epatch "${FILESDIR}/gentoo-fixsandbox.diff"
# more stabillity on multiprocessing build
epatch "${FILESDIR}/${PV}/gentoo-vba_incl.diff"
cp -f "${FILESDIR}/${PV}/gentoo-ReturnInteger.hdl" "${WORKSRC}/scripting/source/vbaevents/ReturnInteger.hdl" || die
@@ -330,7 +333,7 @@ src_unpack() {
CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome gnome-vfs`"
CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome lockdown`"
CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gstreamer`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome systray`"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gtk systray`"
CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable ldap`"
CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable opengl`"
CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_with ldap openldap`"
@@ -412,6 +415,7 @@ src_compile() {
`use_enable odk` \
`use_enable pam` \
`use_with java` \
+ --with-system-jpeg \
--with-system-libxml \
--with-system-libwpd \
--with-system-hunspell \
@@ -432,6 +436,10 @@ src_compile() {
--enable-xrender-link \
--with-system-xrender \
--with-system-openssl \
+ --with-system-python \
+ --with-vba-package-format=builtin \
+ --without-gpc \
+ --without-agg \
--mandir=/usr/share/man \
--libdir=/usr/$(get_libdir) \
--with-use-shell=bash \
@@ -500,10 +508,13 @@ src_install() {
gentoo_env_set_dst="linux-2.6-intel"
fi
+ allcomponents="${basecomponents}"
if use cups; then
- allcomponents="${basecomponents} printeradmin"
- else
- allcomponents="${basecomponents}"
+ allcomponents="${allcomponents} printeradmin"
+ fi
+
+ if use gtk || use gnome; then
+ allcomponents="${allcomponents} qstart"
fi
dodir "${instdir}"
@@ -537,13 +548,12 @@ src_install() {
cd "${D}"${instdir}/share/xdg/
for i in ${allcomponents}; do
- mv "${i}".desktop openoffice.org3-"${i}".desktop
if [[ "${i}" == "printeradmin" ]]; then
- sed -i -e s/openoffice.org3-/oo/g openoffice.org3-"${i}".desktop || die "Sed failed"
+ sed -i -e s/openoffice.org3-/oo/g "${i}".desktop || die "Sed failed"
else
- sed -i -e s/openoffice.org3/ooffice/g openoffice.org3-"${i}".desktop || die "Sed failed"
+ sed -i -e s/openoffice.org3/ooffice/g "${i}".desktop || die "Sed failed"
fi
- domenu openoffice.org3-"${i}".desktop
+ domenu "${i}".desktop
done
# Icons
@@ -599,11 +609,6 @@ src_install() {
# Fix the permissions for security reasons
# chown -R root:0 "${D}"
- # Fix lib handling for internal old python 2.3
- if [[ ! -e /usr/$(get_libdir)/libpython2.3.so.1.0 ]]; then
- dolib.so "${D}"${instdir}/basis3.0/program/libpython2.3.so.1.0
- fi
-
# Non-java weirdness see bug #99366
use !java && rm -f "${D}"${instdir}/ure/bin/javaldx
@@ -623,9 +628,6 @@ pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
- if use gtk || use gnome; then
- gnome2_icon_cache_update
- fi
[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
@@ -674,8 +676,5 @@ pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
- if use gtk || use gnome; then
- gnome2_icon_cache_update
- fi
}