app-office/openoffice-infra: Readed 3.0.1 due a lot of regressions at 3.1.0

svn path=/sunrise/; revision=8682

16 files changed, 1056 insertions, 11 deletions

diff --git a/app-office/openoffice-infra/ChangeLog b/app-office/openoffice-infra/ChangeLog
index 5a3993b42..6824a445e 100644
--- a/app-office/openoffice-infra/ChangeLog
+++ b/app-office/openoffice-infra/ChangeLog
@@ -2,6 +2,21 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2009; Yar Odin (yarodin) <yarodin@gmail.com> +files/3.0.1,
+  +files/3.0.1/gentoo-completion_matches.diff,
+  +files/3.0.1/buildfix-mono-2-2.diff, +openoffice-infra-3.0.1.ebuild,
+  +files/3.0.1/gentoo-configure.diff, +files/3.0.1/gentoo-configure-pg.diff,
+  +files/3.0.1/gentoo-infragentoo.diff,
+  +files/3.0.1/hunspell-one-dir-nocrash.diff, openoffice-infra-3.1.0.ebuild,
+  +files/3.0.1/gentoo-scripts.diff, +files/3.0.1/nojavanostax.diff,
+  -files/3.1.0/buildfix-gcc44.diff,
+  -files/3.1.0/gentoo-dont_strip_libs.diff,
+  -files/3.1.0/gentoo-mkdepend.diff,
+  -files/3.1.0/gentoo-vba-parallel-build.diff, +files/buildfix-gcc44.diff,
+  +files/gentoo-dont_strip_libs.diff, +files/gentoo-mkdepend.diff,
+  +files/gentoo-vba-parallel-build.diff:
+  Readed 3.0.1 due a lot of regressions at 3.1.0
+
   15 Jun 2009; Yar Odin (yarodin) <yarodin@gmail.com>
   files/3.1.0/gentoo-configure-pg.diff, openoffice-infra-3.1.0.ebuild,
   files/3.1.0/gentoo-infra-gentoo.diff, -files/3.1.0/gentoo-ru_dict.diff,
diff --git a/app-office/openoffice-infra/Manifest b/app-office/openoffice-infra/Manifest
index 863c4aa4f..c1764b338 100644
--- a/app-office/openoffice-infra/Manifest
+++ b/app-office/openoffice-infra/Manifest
@@ -1,24 +1,39 @@
-AUX 3.1.0/buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
+AUX 3.0.1/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-pg.diff 462 RMD160 4a16957ceebc9bde6fbfe60a2503b3439712059c SHA1 fae773f59ee378981ca17edb2b99f62aa251026d SHA256 ede7075103e3633bfb2e3faee1fc4560f835c6929e4c9a0fdb5b755333173bec
+AUX 3.0.1/gentoo-configure.diff 1998 RMD160 bd3afe18b3c354788d49b98905831c47dc7d479b SHA1 658a9456b32800443e7bc76f178d091cab134b65 SHA256 d6063b61830645f0a1297756b47cb299c8430f35f677c95d3458358a10839e72
+AUX 3.0.1/gentoo-infragentoo.diff 3543 RMD160 d0dc7a4a09ab92bb946c97b3ad6c860ed323d499 SHA1 35eb8716995e2e0fec9a2d5aa24fccf7c95cbbdb SHA256 8d0563b8717c52684a9a8531757a97f479828cab4abcddc5825a9b0b3a87a807
+AUX 3.0.1/gentoo-scripts.diff 1086 RMD160 53dfcce0407d2fc7b00cf7c478a64de0f7201049 SHA1 d238824eccbd0741047807c2f47902dba973095a SHA256 774e3a26d31838796e0cfa822d51589c6a07b8ce2481233c1b1113a81bf0a612
+AUX 3.0.1/hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
+AUX 3.0.1/nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX 3.1.0/gentoo-configure-pg.diff 434 RMD160 2abaf9c212edb9cdf60445756a998637bf9a8f06 SHA1 d5da7bbc98c5b2852bd5a4a7d3873404903dac7f SHA256 6140c9ace18b4d338f2e5d68920e12e553d34bddb039fbf9073bcdd775d90f29
 AUX 3.1.0/gentoo-configure.diff 1453 RMD160 cd74d0dfcd1c0ff9c560ad778c01da23984f928b SHA1 994e990bcce9e9418ed2e7be9558eeb95f1442fc SHA256 70c44f6f8cfaec3024fc46ff60a04a4766fd52be3bcfee6fe79c00bc74a5a10e
-AUX 3.1.0/gentoo-dont_strip_libs.diff 955 RMD160 3815892d75a70966533372ab72da73200037958b SHA1 e57b5b49e0d9f918e90b36570c0a8a0125d54709 SHA256 c7410c402ac8322e63686c2e6d725ed3c2242a6b4026705c8344684fa34b108e
 AUX 3.1.0/gentoo-infra-builder.diff 1118 RMD160 bd16e8064c89469cac0ea291b31c9f5caba8a028 SHA1 a731a03ef25f6a884e722bc2a4b4da80f5f46132 SHA256 1d6fcb2b31e605edad597ff8da44e2a8adfdb67eec65ca821c453a958718ca50
 AUX 3.1.0/gentoo-infra-gentoo.diff 3560 RMD160 f152cbebbf5fec19a9a094dba2db36bd86b00193 SHA1 ef6b933a4a5e4a0d5628399522e3e1df7c625808 SHA256 9b86b8c06296759d11e0a3b18f0705af812a8db3f49293458ea30f9c1006a266
 AUX 3.1.0/gentoo-layout-simple-dialogs-svx.diff 1207 RMD160 28c8f2394cebf860701b36d3b5c4f0d7583736bd SHA1 807ba97128197fa1d16be3fb7bb0948a444d06da SHA256 7135bb29a6b36e3deca6094119c34b17549d4959a12bac91ec30aa22bcc141f4
-AUX 3.1.0/gentoo-mkdepend.diff 1694 RMD160 e6970418012f5cdf569188907543c6e4a51b7851 SHA1 a6c941492d69840b2705fbe885ad655a9922cbc5 SHA256 9596bf24a44b8b55a46c5a039944c3b2dc40adafae125ed77c81704255ec901b
-AUX 3.1.0/gentoo-vba-parallel-build.diff 2725 RMD160 b5952a1d86c0ac8a242d2c1bff63dd052e270f6a SHA1 ce5b638b54ddabc08c30511141ddfc3516427790 SHA256 0dc84f44e27af0191b4b2ef561b2e30ae85dcb9a4ae941658a49bf73a3debab4
 AUX 3.1.0/solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
+AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
+AUX gentoo-dont_strip_libs.diff 955 RMD160 3815892d75a70966533372ab72da73200037958b SHA1 e57b5b49e0d9f918e90b36570c0a8a0125d54709 SHA256 c7410c402ac8322e63686c2e6d725ed3c2242a6b4026705c8344684fa34b108e
 AUX gentoo-epm-3.7.patch.diff 2627 RMD160 18d2ac9bea7e9ceb5adc40599cfb151ac3de1f84 SHA1 d2e6b612ce7df5606e7101fffe2cff2f0d16c0e3 SHA256 eb801d90856c48f04b4fee8d21b01d0dd2951288efd6aa4ed5cf6807074c2c12
+AUX gentoo-mkdepend.diff 1694 RMD160 e6970418012f5cdf569188907543c6e4a51b7851 SHA1 a6c941492d69840b2705fbe885ad655a9922cbc5 SHA256 9596bf24a44b8b55a46c5a039944c3b2dc40adafae125ed77c81704255ec901b
 AUX gentoo-system_pgsql.diff 646 RMD160 7354b333ca619617616e6b8dba2a259a68cb4aa3 SHA1 f3bb553f042bf62b527dee3067f02be245a431d6 SHA256 2c5cb32de91ca71402cc590cc539bd6f4f0dab921507edb7a41f1bf9717bedf5
+AUX gentoo-vba-parallel-build.diff 2725 RMD160 b5952a1d86c0ac8a242d2c1bff63dd052e270f6a SHA1 ce5b638b54ddabc08c30511141ddfc3516427790 SHA256 0dc84f44e27af0191b4b2ef561b2e30ae85dcb9a4ae941658a49bf73a3debab4
 AUX java-set-classpath.in 2608 RMD160 b47b6046bfeb1c01512534d4c19308cf5892c208 SHA1 45a3a40a6fcb707a4783e81c04a0c084cd9d68a1 SHA256 4c4e24eeb801d758b896f537de6d50263e1a23d285a24d67fe72e6a7ec50fd59
 AUX wrapper.in 96 RMD160 34ca656bc8af3c5b44ed16cebedf5d3297b09a2d SHA1 5861b8434da84efff56e5ceaf53a7668a5f52cea SHA256 97b603968d423e5d8e52c1c14c118647df0a7a858d6a1cb10524af9ea90a9dbc
+DIST OOo_3.0.1_src_binfilter.tar.bz2 6595398 RMD160 c6859a376c55cd453be214dbfa2d56f1b845a32b SHA1 d84518159538ef736271177b7ebe4697fc4b811d SHA256 3c8920d97777d7e2c579c8ade5ef13c9184278aa6b6185b7f15e70a61ea0077b
+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 OOo_3.1.0_src_binfilter.tar.bz2 6543459 RMD160 e7ff15bd78713dcdbfd0df0ca499727cd412b070 SHA1 7128a2f8af0b0f1163a2f03331057242ec254f34 SHA256 beef276633c12ed8ccd98b1682ec41cbcd7befaaf5899c6b848a58a378cc0ef6
 DIST OOo_3.1.0_src_core.tar.bz2 186059913 RMD160 3395799874fd376fa82827f4b1b2d7af193748f8 SHA1 7a2812823376c028d81c4d3aeaac56e00f89636c SHA256 5ae7ba714499822872aecbe419dbc5357f48c497ef98fc96c85298d5af9b474f
 DIST OOo_3.1.0_src_extensions.tar.bz2 14867603 RMD160 d66bc267f92291ec0cc1b1530d95c8d9cfac7f62 SHA1 fd6dff089f722c9d647f2ee5dd0e818b1a7e6576 SHA256 5429f6c2115213f1441cdc7e5e6e8e7727aa178750861b10e7077cd786e83ba7
 DIST OOo_3.1.0_src_l10n.tar.bz2 96360273 RMD160 35ea76f926342a8bfa8b6b30edd08f048bb06811 SHA1 3ba93e779492bc6cf4955394a211462529057f03 SHA256 40baaf144de1cf5ff90f985ac55466aeb145127ab9389f01dba023144ff618ad
 DIST OOo_3.1.0_src_system.tar.bz2 53314585 RMD160 9ffd6694d4cdd7d3f4f8fd6aaf1ffa6c64b39d27 SHA1 a73c6aa867b7686d33611694e33d6351110d2a0a SHA256 52d74c30fa333498e4236d876ad31d4dc5d08eb5b72a42e2c378cb8f59162694
+DIST infra-ooo-files_3.0.1.tar.gz 20712561 RMD160 76be30a30f6cd859a2342018550fc48637518d06 SHA1 28a79a28769548d0bf39fdb8c1bfa2f14e97576b SHA256 2b4daca6b551f71a31c0746d5be63ce7a126b5d281041222f8c637b3b522d411
 DIST infra-ooo-files_3.1.0.tar.gz 14893448 RMD160 137a78f9c77bff141e6f8138c53a11d2217719d8 SHA1 9f86b12773ab781b8ea4c18261eccce850807c11 SHA256 e70ca0680388e1355e4ab9136888972724698fec1c9e9079d89509e91f09e0e0
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-infra-3.1.0.ebuild 23472 RMD160 7e939660843aa6ade52835c1276d7b266fc9b191 SHA1 5078fb67cb5a9c33b4ebc3aafb4510ed7ea8b994 SHA256 df5017cf43978662200ed67a0fe92a887ef5152fca60e7057efbedc52788fe3f
-MISC ChangeLog 6365 RMD160 2b7cb36af2b0b271bad76890f1fb1f23a7bdb50d SHA1 0d487b428af35418ba7e965a81055aab414dac34 SHA256 d993fdd2a0fe92ab78d31b6e748c451603767d01bca4c347fd4fd1a2d083cc4e
+EBUILD openoffice-infra-3.0.1.ebuild 23603 RMD160 4befad37500c1ddd526bdf388cd932952e95b72a SHA1 0fb00a2bbcf439fd0cdfba3cce9209b77b21dd94 SHA256 94e6e1ccb407a22300c834546f50a8abda25ab170d6bc1802ebf954f7482ef00
+EBUILD openoffice-infra-3.1.0.ebuild 23436 RMD160 d544696ad61a247dea98d435afcd131befe6301b SHA1 f8c6edb7fd716f74100d1b167c33975c9c00f197 SHA256 7d2e98a6f1189b23acd53015a20b2e5f4cf5dbd5ed3453bd04ad4b72d2c2c242
+MISC ChangeLog 7163 RMD160 8732f7e63f78a5e393787c75b64689e52f5864e9 SHA1 f5da90713353ebac7190e0ab36e7eddfa9caaee6 SHA256 314b0846039304fca45170adbf72a292440d6c3e4fbe96e87b940447ed992aad
 MISC metadata.xml 792 RMD160 49e85491fc9d94fe35bc920ce42fd8d50b9d3c83 SHA1 8dc753d1070e92d715be182de51d9168d13368c6 SHA256 a41c190a51e34cfa042f6aa1914dd646fa6ab47ad25a1bab4d011c33a5d4f154
diff --git a/app-office/openoffice-infra/files/3.0.1/buildfix-mono-2-2.diff b/app-office/openoffice-infra/files/3.0.1/buildfix-mono-2-2.diff
new file mode 100644
index 000000000..69ca27cb5
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/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.1/gentoo-completion_matches.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-completion_matches.diff
new file mode 100644
index 000000000..7dbd1ec9d
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-completion_matches.diff
@@ -0,0 +1,17 @@
+--- python/Python-2.3.4.patch.orig	2008-06-09 19:04:49.000000000 +0600
++++ python/Python-2.3.4.patch	2008-10-26 00:31:23.000000000 +0600
+@@ -14661,3 +14661,14 @@
+  
+  /* Define the macros needed if on a UnixWare 7.x system. */
+  #if defined(__USLC__) && defined(__SCO_VERSION__)
++--- misc/build/Python-2.3.4/Modules/readline.c.orig	2008-08-04 18:36:17.000000000 +0600
+++++ misc/build/Python-2.3.4/Modules/readline.c	2008-08-04 20:08:02.000000000 +0600
++@@ -580,7 +580,7 @@
++ 	Py_XDECREF(endidx);
++ 	begidx = PyInt_FromLong((long) start);
++ 	endidx = PyInt_FromLong((long) end);
++-	return completion_matches(text, *on_completion);
+++	return rl_completion_matches(text, *on_completion);
++ }
++ 
++ 
diff --git a/app-office/openoffice-infra/files/3.0.1/gentoo-configure-pg.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-configure-pg.diff
new file mode 100644
index 000000000..191f675ca
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-configure-pg.diff
@@ -0,0 +1,11 @@
+--- config_office/configure.in.orig	2008-10-26 12:57:20.000000000 +0500
++++ config_office/configure.in	2008-10-26 12:57:57.000000000 +0500
+@@ -3990,7 +4000,7 @@
+ fi
+ save_CFLAGS=$CFLAGS
+ save_LIBS=$LIBS
+-CFLAGS="-I`pg_config --includedir`"
++CFLAGS="-I`pg_config --includedir` -L`pg_config --libdir`"
+ AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
+ AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
+ CFLAGS=$save_CFLAGS
diff --git a/app-office/openoffice-infra/files/3.0.1/gentoo-configure.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-configure.diff
new file mode 100644
index 000000000..b907eff17
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-configure.diff
@@ -0,0 +1,59 @@
+--- config_office/configure.in.orig	2008-10-26 12:57:20.000000000 +0500
++++ config_office/configure.in	2008-10-26 12:57:57.000000000 +0500
+@@ -105,6 +105,11 @@
+                           epm, however epm is useless for large scale
+                           package building.
+ ],,enable_epm="yes")
++AC_ARG_WITH(epm,
++[[  --with-epm[=internal|external]
++                          use internal or system epm.
++                          [default=internal]
++]],,with_epm=internal)
+ AC_ARG_WITH(package-format,
+ [  --with-package-format   specify package format(s) for OOo installsets.
+                           Default is "normal" one of the OS/Distribution.
+@@ -808,6 +813,10 @@
+   --disable-verbose       Decrease build verbosity.
+ ],,)
+ 
++AC_ARG_ENABLE(gstreamer,
++[  --enable-gstreamer      Enables GStreamer avmedia backend
++],,)
++
+ BUILD_TYPE="OOo"
+ 
+ dnl ===================================================================
+@@ -3367,12 +3376,12 @@
+       for a in "$RPM" rpmbuild rpm; do
+          $a --usage >/dev/null 2> /dev/null
+          if test $? -eq 0; then
+-            RPM=$a
++#            RPM=$a
+             break
+          else
+             $a --version >/dev/null 2> /dev/null
+             if test $? -eq 0; then
+-               RPM=$a
++#               RPM=$a
+                break
+             fi 
+          fi
+@@ -3385,7 +3394,8 @@
+        fi
+    fi
+    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
+-      AC_PATH_PROG(DPKG, dpkg, no)
++#      AC_PATH_PROG(DPKG, dpkg, no)
++	  DPKG=no
+       if test "$DPKG" = "no"; then
+          AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
+       fi
+@@ -4171,7 +4181,7 @@
+ AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
+ if test "$enable_mozilla" = "no"; then
+    AC_MSG_RESULT([no])
+-elif test "$with_system_mozilla" = "yes"; then
++elif test "$with_system_mozilla" = "yes" -o "$enable_kdeab" = "yes"; then
+    AC_MSG_RESULT([no, not possible with system-mozilla])
+ else
+    AC_MSG_RESULT([yes])
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..2d405fe58
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-infragentoo.diff
@@ -0,0 +1,82 @@
+--- patches/dev300/apply.orig	2009-06-20 22:08:01.000000000 +0600
++++ patches/dev300/apply	2009-06-20 22:08:36.000000000 +0600
+@@ -149,7 +149,13 @@
+ PlainLinux: PlainBuildFixes
+ 
+ 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 
++InfraLinux:  LinuxCommon, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, UbuntuIntrepidOnly
++InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, NotInfraLinux, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly
++InfraGentoo: InfraGentooBase
++InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL
++InfraDictru: InfraDictRU
++InfraDictuk: InfraDictUK
++InfraDicttr: InfraDictTR
+ 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
+@@ -1721,7 +1727,7 @@
+ vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
+ 
+ #must ask kendy about this ( noelp )
+-vba-parallel-build.diff, #no-upstream
++#vba-parallel-build.diff, #no-upstream
+ #not so useful but perhaps we can build on it later
+ basic-speedup-fix.diff
+ 
+@@ -1882,7 +1888,7 @@
+ sdbc-postgresql.diff
+ sdbc-postgresql-build-lst.diff
+ sdbc-postgresql-config_office.diff
+-# connectivity-workben-postgresql.diff
++connectivity-workben-postgresql.diff
+ gcc-4.3-postgresql.diff
+ 
+ 
+@@ -2783,15 +2789,22 @@
+ sc-toogle-grid-menubar.diff
+ # problems with update update_jre.diff
+ 
++[InfraDictRU]
++dictionaries-ru-RU.diff
++
++[InfraDictUK]
++dict-uk.diff
++
++[InfraDictTR]
++extensions-zemberek.diff
++
+ [NotInfraLinux]
+ build-xterm-title.diff
+-no-ure-sdk.diff
++#no-ure-sdk.diff
+ enable-quickstart.diff
+ updates.diff
+ build-javainstaller2.diff
+ icons-galaxy-as-default.diff
+-dictionaries-ru-RU.diff
+-dict-uk.diff
+ extras-add-educate-officorr-misc-offimisc.diff
+ # javainstaller2-discard-rpm-warnings.diff, i#93243, rail
+ reportbuilder-no-license-infra.diff
+@@ -2800,15 +2813,18 @@
+ scp2_extensions-remove-SUN.diff
+ extensions-dont-install-by-default.diff
+ extensions-separate-java-based.diff
+-extensions-zemberek.diff
+ 
+ [InfraLinuxOnly]
+ scp2-3layer-nicer-paths.diff, i#90430, jholesov
+ instset-prefer-langpacks.diff, thorsten
+ sfx2-remove-check-update-on-fileload.diff, kohei
++# fix parallel build problems
++vba-parallel-build.diff
+ 
+-[InfraUnixPatches]
++[InfraUnixPatchesPG]
+ connectivity-freebsd-libs.diff
++
++[InfraUnixPatches]
+ freebsd-store-alloca.diff
+ freebsd-gperf.diff, i#85469, rail
+ freebsd-writerfilter.diff
diff --git a/app-office/openoffice-infra/files/3.0.1/gentoo-scripts.diff b/app-office/openoffice-infra/files/3.0.1/gentoo-scripts.diff
new file mode 100644
index 000000000..6ccc649a9
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/gentoo-scripts.diff
@@ -0,0 +1,31 @@
+--- bin/apply.pl.orig	2008-10-18 03:32:19.000000000 +0600
++++ bin/apply.pl	2008-10-25 21:31:42.000000000 +0600
+@@ -767,7 +767,7 @@
+     my $ver_line;
+     my $is_old = 1;
+ 
+-    open ($Patch, "gpatch --version|") || die "Can't run patch: $!";
++    open ($Patch, "patch --version|") || die "Can't run patch: $!";
+     $ver_line = <$Patch>;
+     $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
+     if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
+@@ -1118,7 +1118,7 @@
+ 
+     $opts = join ' ', @arguments;
+     my $base_args = " -l -p0 $opts -d $dest_dir";
+-    $base_cmd = "gpatch";
++    $base_cmd = "patch";
+     if ($pieces) {
+ 	# nasty path mess
+ 	$base_cmd = "$patch_dir/../../bin/sloppypatch.pl";
+--- bin/enable-dict.orig	2008-10-18 11:48:50.000000000 +0600
++++ bin/enable-dict	2008-10-25 21:31:52.000000000 +0600
+@@ -6,7 +6,7 @@
+ 
+ test -f $ARC || exit 1
+ cd $WRKDIR/dictionaries || exit 2
+-gtar xjf $ARC
++tar xjf $ARC
+ grep -q $LNG prj/build.lst && exit 0
+ line="di      dictionaries\\$LNG      nmake   -       all     di_$LNG NULL"
+ echo "$line" >> prj/build.lst
diff --git a/app-office/openoffice-infra/files/3.0.1/hunspell-one-dir-nocrash.diff b/app-office/openoffice-infra/files/3.0.1/hunspell-one-dir-nocrash.diff
new file mode 100644
index 000000000..85fa3e8fc
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/hunspell-one-dir-nocrash.diff
@@ -0,0 +1,26 @@
+? unxlngx6.pro
+Index: source/lingutil/lingutil.cxx
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/lingutil.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 lingutil.cxx
+--- lingucomponent/source/lingutil/lingutil.cxx	13 Jun 2008 14:02:52 -0000	1.4
++++ lingucomponent/source/lingutil/lingutil.cxx	24 Oct 2008 15:01:43 -0000
+@@ -322,11 +322,15 @@
+ 		{
+ 			LanguageType nLang = MsLangId::convertIsoStringToLanguage( aIt2->aLocaleNames[0] );
+ 
++            if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
++            {
++                DBG_ERROR( "old style dictionary with invalid language found!" );
++                continue;
++            }
++
+ 			// language not yet added?
+ 			if (aNewStyleLanguages.count( nLang ) == 0)
+-			{
+ 				rNewStyleDics.push_back( *aIt2 );
+-			}
+ 		}
+ 		else
+ 		{
diff --git a/app-office/openoffice-infra/files/3.0.1/nojavanostax.diff b/app-office/openoffice-infra/files/3.0.1/nojavanostax.diff
new file mode 100644
index 000000000..9134872f8
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/nojavanostax.diff
@@ -0,0 +1,58 @@
+--- config_office/configure.in 
++++ config_office/configure.in 
+@@ -3452,6 +3452,7 @@
+ dnl ===================================================================
+ dnl Check for building stax
+ dnl ===================================================================
++if test "$SOLAR_JAVA" != ""; then
+ AC_MSG_CHECKING([whether to build the stax])
+ if test -f "../external/StAX/jsr173_1.0_api.jar"; then
+    BUILD_STAX=NO
+@@ -3459,6 +3460,7 @@
+ else
+    BUILD_STAX=YES
+    AC_MSG_RESULT([yes])
++fi
+ fi
+ AC_SUBST(BUILD_STAX)
+ 
+--- stax/makefile.mk 
++++ stax/makefile.mk 
+@@ -35,12 +35,13 @@
+ TARGET=stax
+ USE_JAVAVER=TRUE
+ 
++.IF "$(SOLAR_JAVA)" != ""
++
+ # --- Settings -----------------------------------------------------
+ 
+ .INCLUDE :	settings.mk
+ .INCLUDE : antsettings.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
+ .IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
+ all:
+ 	@echo "Your java version already contains StAX"
+@@ -68,14 +69,20 @@
+ 
+ OUT2CLASS=jsr173_1.0_api.jar
+ 
++.ENDIF			#  "$(BUILD_STAX)" != "YES"
++
++.ELSE			# $(SOLAR_JAVA)==""
++all:
++	@echo "Nothing to do: SOLAR_JAVA not set"
+ .ENDIF			# $(SOLAR_JAVA)!= ""
+ # --- Targets ------------------------------------------------------
+ 
++.IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : set_ext.mk
++.ENDIF
+ .INCLUDE : target.mk
+ .IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
+-.ENDIF
+ 
+ .ENDIF			#  "$(BUILD_STAX)" != "YES"
+ 
+
diff --git a/app-office/openoffice-infra/files/3.1.0/buildfix-gcc44.diff b/app-office/openoffice-infra/files/buildfix-gcc44.diff
index 5da661e1f..5da661e1f 100644
--- a/app-office/openoffice-infra/files/3.1.0/buildfix-gcc44.diff
+++ b/app-office/openoffice-infra/files/buildfix-gcc44.diff
diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-dont_strip_libs.diff b/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff
index 1f77f9a3f..1f77f9a3f 100644
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-dont_strip_libs.diff
+++ b/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff
diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-mkdepend.diff b/app-office/openoffice-infra/files/gentoo-mkdepend.diff
index d62b8a828..d62b8a828 100644
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-mkdepend.diff
+++ b/app-office/openoffice-infra/files/gentoo-mkdepend.diff
diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-vba-parallel-build.diff b/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
index 0550346f7..0550346f7 100644
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-vba-parallel-build.diff
+++ b/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
diff --git a/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
new file mode 100644
index 000000000..7ca29a9d0
--- /dev/null
+++ b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
@@ -0,0 +1,719 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+WANT_AUTOMAKE="1.9"
+EAPI="2"
+
+inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk +infradicts opengl pam +postgres"
+
+PATCHLEVEL="OOO300"
+MILESTONE="15"
+OOOTAG=${PATCHLEVEL}_m${MILESTONE}
+OOOBUILDTAG=ooo300-m${MILESTONE}
+
+SRC=OOo_${PV}_src
+S=${WORKDIR}/infra-ooo-files_${PV}
+WORKSRC=${WORKDIR}/${OOOTAG}
+BASIS=basis3.0
+DESCRIPTION="OpenOffice-Infra, office suite with enhanced Russian support from Infra-Resource"
+
+SRC_URI="binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
+	mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
+	mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2
+	mirror://openoffice/stable/${PV}/${SRC}_extensions.tar.bz2
+	mirror://openoffice/stable/${PV}/${SRC}_system.tar.bz2
+	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
+	http://download.i-rs.ru/pub/openoffice/${PV}/ru/infra-ooo-files_${PV}.tar.gz"
+
+LANGS1="ru uk tr"
+LANGS="${LANGS1} en en_US"
+
+# proprt linguas handling
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+HOMEPAGE="http://www.i-rs.ru/ http://www.go-oo.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="!app-office/openoffice-infra-bin
+	!app-office/openoffice
+	!app-office/openoffice-bin
+	x11-libs/libXaw
+	x11-libs/libXinerama
+	>=dev-lang/perl-5.0
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	gnome? ( >=x11-libs/gtk+-2.10
+		>=gnome-base/gnome-vfs-2.6
+		>=gnome-base/gconf-2.0
+		>=x11-libs/cairo-1.0.2 )
+	gtk? ( >=x11-libs/gtk+-2.10
+		>=x11-libs/cairo-1.0.2 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	gstreamer? ( >=media-libs/gstreamer-0.10
+			>=media-libs/gst-plugins-base-0.10 )
+	kde? ( kde-base/kdelibs:3.5 )
+	java? ( >=dev-java/bsh-2.0_beta4
+		>=dev-db/hsqldb-1.8.0.9 )
+	mono? ( >=dev-lang/mono-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
+	>=dev-libs/openssl-0.9.8g
+	>=x11-libs/startup-notification-0.5
+	>=media-libs/freetype-2.1.10-r2
+	>=media-libs/fontconfig-2.3.0
+	cups? ( net-print/cups )
+	media-libs/jpeg
+	media-libs/libpng
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.1.4-r1
+	dev-libs/expat
+	>=dev-libs/icu-3.8
+	>=sys-libs/db-4.3
+	>=app-text/libwpd-0.8.8
+	>=media-libs/vigra-1.4
+	>=virtual/poppler-0.8.0"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )
+	${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-proto/printproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xineramaproto
+	>=sys-apps/findutils-4.1.20-r1
+	dev-perl/Archive-Zip
+	virtual/perl-Compress-Zlib
+	>=virtual/perl-Compress-Raw-Zlib-2.002
+	virtual/perl-IO-Compress-Base
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=dev-libs/boost-1.33.1
+	sys-devel/flex
+	sys-devel/bison
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.0
+	>=dev-util/gperf-3
+	>=net-misc/curl-7.12
+	sys-libs/zlib
+	sys-apps/coreutils
+	pam? ( sys-libs/pam
+		sys-apps/shadow[pam] )
+	!dev-util/dmake
+	>=dev-lang/python-2.3.4[threads]
+	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+		>=dev-java/ant-core-1.7 )
+	ldap? ( net-nds/openldap )
+	postgres? ( virtual/postgresql-base )"
+
+PROVIDE="virtual/ooo"
+RESTRICT="strip" # the openoffice.org from infra-resource is already stripped
+
+pkg_setup() {
+
+	ewarn
+	ewarn " It is important to note that OpenOffice-Infra is a very fragile  "
+	ewarn " build when it comes to CFLAGS.  A number of flags have already "
+	ewarn " been filtered out.  If you experience difficulty merging this  "
+	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
+	ewarn " merge again. Also note that building OOo takes a lot of time and "
+	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
+	ewarn " the minimum requirements. If you have less, use openoffice-infra-bin "
+	ewarn
+	ewarn " Also if you experience a build break, please make sure to retry "
+	ewarn " with MAKEOPTS="-j1" before filing a bug. "
+	ewarn
+
+	# Check if we have enough RAM and free diskspace to build this beast
+	CHECKREQS_MEMORY="512"
+	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
+	check_reqs
+
+	strip-linguas ${LANGS}
+
+	if [[ -z "${LINGUAS}" ]]; then
+		export LINGUAS_OOO="en-US"
+		ewarn
+		ewarn " To get a localized build, set the according "
+		ewarn " LINGUAS variable(s). LINGUAS=ru for example. "
+		ewarn
+	else
+		export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g')
+	fi
+
+	# dicts
+	if use infradicts; then
+		export DICTS_OOO="en-US ru uk"
+	else
+		for i in ${LINGUAS_OOO}; do
+			if [[ "${i}" != "tr" ]]; then
+			    DICTS_OOO="${DICTS_OOO} ${i}"
+			fi
+		done
+		export DICTS_OOO
+	fi
+
+	if use !java; then
+		ewarn
+		ewarn " You are building with java-support disabled, this results in some "
+		ewarn " of the OpenOffice.org functionality (i.e. help) 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
+		ewarn " If you want the OpenOffice-Infra 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. "
+		eerror " Please remove it from your CFLAGS, using this globally causes "
+		eerror " all sorts of problems. "
+		eerror " After that you will also have to - at least - rebuild python otherwise "
+		eerror " the openoffice build will break. "
+		die
+	fi
+
+	if use nsplugin; then
+		if pkg-config --exists libxul; then
+			BRWS="libxul"
+		elif pkg-config --exists xulrunner-xpcom; then
+			BRWS="xulrunner"
+		elif pkg-config --exists seamonkey-xpcom; then
+			BRWS="seamonkey"
+		else
+			die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+
+	# sys-libs/db version used
+	local db_ver=$(db_findver '>=sys-libs/db-4.3')
+
+}
+
+src_unpack() {
+
+	unpack infra-ooo-files_${PV}.tar.gz
+	use binfilter && unpack ${SRC}_binfilter.tar.bz2
+	unpack ${SRC}_core.tar.bz2
+	unpack ${SRC}_l10n.tar.bz2
+	unpack ${SRC}_extensions.tar.bz2
+	unpack ${SRC}_system.tar.bz2
+
+}
+
+src_prepare() {
+
+	if use odk && use java; then
+	    cp -f "${DISTDIR}"/unowinreg.dll "${WORKSRC}"/external/unowinreg/
+	fi
+
+	# Some fixes for our patchset
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}/gentoo-scripts.diff"
+	# fix vba parallel build
+	epatch "${FILESDIR}/gentoo-vba-parallel-build.diff"
+	# Patch for using Gentoo specific goo team patches and InfraGentoo/InfraGentooPG distro targets
+	epatch "${FILESDIR}/${PV}/gentoo-infragentoo.diff"
+
+	# Patches from go-oo mainstream
+	cp -f "${FILESDIR}/${PV}/nojavanostax.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/${PV}/hunspell-one-dir-nocrash.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/${PV}/buildfix-mono-2-2.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
+
+	cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2"
+
+	for i in ${LINGUAS_OOO}; do
+		if [[ "${i}" == "ru" || "${i}" == "tr" ]]; then
+			cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/${i}/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_${i}.tar.bz2"
+		fi
+	done
+	local longlang
+	for i in ${DICTS_OOO}; do
+		if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then
+			if [[ "${i}" == "ru" ]]; then
+			    longlang="ru_RU"
+			else
+			    longlang="uk_UA"
+			fi
+			"${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict "${longlang}" "${WORKDIR}/infra-ooo-files_${PV}/files/dict_${longlang}.tar.bz2" "${WORKSRC}"
+		fi
+	done
+
+	# Infra branding
+	mkdir -p "${WORKSRC}"/{libwps,libwpg,libwpd,libsvg}/download/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwps*.tar.gz   "${WORKSRC}"/libwps/download/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwpg*.tar.gz   "${WORKSRC}"/libwpg/download/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwpd*.tar.gz   "${WORKSRC}"/libwpd/download/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libsvg*.tar.gz   "${WORKSRC}"/libsvg/download/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/infra-logo-team.png   "${WORKSRC}"/default_images/sw/res/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/go-oo-team.png   "${WORKSRC}"/default_images/sw/res/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/intro.bmp    "${WORKSRC}"/ooo_custom_images/nologo/introabout/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/about.bmp    "${WORKSRC}"/default_images/introabout/
+	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/backing*.png    "${WORKSRC}"/default_images/framework/res/
+
+	local patchconf
+	patchconf="--tag=${OOOBUILDTAG} --distro=Localize"
+	local distros
+	local distro
+	if use postgres; then
+		distros="InfraGentooPG"
+	else
+		distros="InfraGentoo"
+	fi
+	# add basic support of zemberek/tr
+	local dicts="${DICTS_OOO} tr"
+	for i in ${dicts}; do
+		if [[ "${i}" != "en-US" ]]; then
+		    distros="${distros} InfraDict${i}"
+		fi
+	done
+	for i in ${distros}; do
+		distro="${distro} --distro=${i}"
+	done
+	patchconf="${patchconf} ${distro}"
+	if use binfilter; then
+		patchconf="${patchconf} --distro=Binfilter"
+	fi
+
+	"${WORKDIR}"/infra-ooo-files_${PV}/bin/apply.pl "${WORKDIR}"/infra-ooo-files_${PV}/patches/dev300 "${WORKSRC}" ${patchconf}
+	"${WORKDIR}"/infra-ooo-files_${PV}/bin/transform --apply "${WORKDIR}"/infra-ooo-files_${PV} "${WORKSRC}"
+
+	if use postgres; then
+	    # fix using of pg lib
+	    epatch "${FILESDIR}/${PV}/gentoo-configure-pg.diff"
+	fi
+	# enable/disable-gstreamer, disable scanning for rpm/dpkg and etc
+	epatch "${FILESDIR}/${PV}/gentoo-configure.diff"
+	# fix mkdepend
+	epatch "${FILESDIR}/gentoo-mkdepend.diff"
+	# completion_matches -> rl_completion_matches
+	epatch "${FILESDIR}/${PV}/gentoo-completion_matches.diff"
+	# disable rpm
+	epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
+	if use postgres; then
+	    # fix handling of system libs for postgresql-base
+	    epatch "${FILESDIR}/gentoo-system_pgsql.diff"
+	fi
+	# don't strip libs
+	use debug && epatch "${FILESDIR}/gentoo-dont_strip_libs.diff"
+	# fix jfreereport cr issue
+	sed -i -e 's/\x0D$//' "${WORKSRC}"/jfreereport/patches/*.patch || die "sed failed"
+
+	cd "${WORKSRC}/config_office"
+
+	eautoreconf
+
+}
+
+src_configure() {
+
+	# Use flag checks
+	if use java; then
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-ant-home=${ANT_HOME}"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-jdk-home=$(java-config --jdk-home 2>/dev/null)"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-java-target-version=$(java-pkg_get-target)"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-beanshell"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-hsqldb"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)"
+	fi
+
+	if use nsplugin ; then
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-mozilla"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-mozilla=${BRWS}"
+	else
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-mozilla"
+		CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-system-mozilla"
+	fi
+
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-myspell-dicts"
+	local dicts
+	if use infradicts; then
+		dicts="${DICTS_OOO}"
+	else
+		dicts="${LINGUAS_OOO}"
+	fi
+	local tempdicts=ENUS
+	local tempdict
+	for i in ${dicts}; do
+		if [[ "${i}" != "en-US" ]]; then
+			tempdict=$(ls ${WORKSRC}/dictionaries/ | grep ${i} | sed -e 's/_//g;s/\///g' | tr '[a-z]' '[A-Z]')
+			tempdicts="${tempdicts},${tempdict}"
+		fi
+	done
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-dict=${tempdicts}"
+
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable binfilter)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable cups)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable dbus)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable eds evolution2)"
+	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 gtk systray)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable ldap)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable opengl)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_with ldap openldap)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable debug crashdump)"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable debug strip-solver)"
+
+	# Extension stuff
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-extension-integration"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-minimizer"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-pdfimport"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-presenter-console"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-wiki-publisher"
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-report-builder"
+
+	# Fix kdefilepicker crash on exit
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-alloc=system"
+
+	# Original branding results in black splash screens for some, so forcing ours
+	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-intro-bitmaps=\\\"${WORKSRC}/ooo_custom_images/nologo/introabout/intro.bmp\\\""
+
+	# Use multiprocessing by default now, it gets tested by upstream
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
+
+	# Compile problems with these ...
+	filter-flags "-funroll-loops"
+	filter-flags "-fprefetch-loop-arrays"
+	filter-flags "-fno-default-inline"
+	filter-flags "-fstack-protector"
+	filter-flags "-fstack-protector-all"
+	filter-flags "-ftracer"
+	filter-flags "-fforce-addr"
+
+	filter-flags "-O[s2-9]"
+
+	# not very clever to disable warning, but ... users afraid it
+	append-flags "-Wno-implicit"
+	append-flags "-fno-strict-aliasing"
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+	fi
+
+	# Build with NVidia cards breaks otherwise
+	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
+
+	# Now for our optimization flags ...
+	export ARCH_FLAGS="${CXXFLAGS}"
+	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# Make sure gnome-users get gtk-support
+	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
+
+	use kde && set-kdedir 3
+
+	# workaround for --with-system-*
+	export PKG_CONFIG=pkg-config
+
+	cd "${WORKSRC}/config_office"
+
+	# distro-configs are not hooked in infra build, passing configure options as commandline arguments
+	./configure \
+		--srcdir="${DISTDIR}" \
+		--with-lang="${LINGUAS_OOO}" \
+		--with-build-version="${OOOTAG}" \
+		${GTKFLAG} \
+		$(use_enable mono) \
+		$(use_enable kde) \
+		$(use_enable debug symbols) \
+		$(use_enable odk) \
+		$(use_enable pam) \
+		$(use_with java) \
+		--with-system-jpeg \
+		--with-system-libxml \
+		--with-system-libwpd \
+		--with-system-hunspell \
+		--disable-fontooo \
+		--disable-qadevooo \
+		--with-system-boost \
+		--with-system-curl \
+		--with-system-db \
+		--with-system-expat \
+		--with-system-icu \
+		--with-system-libxslt \
+		--with-system-vigra \
+		--without-stlport \
+		--with-system-zlib \
+		--with-system-stdlibs \
+		--enable-neon \
+		--with-system-neon \
+		--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 \
+		--with-epm=internal \
+		--with-linker-hash-style=both \
+		--with-package-format=native \
+		--with-vendor="Infra-Resource" \
+		${CONFIGURE_ARGS} \
+		|| die "Configuration failed!"
+
+}
+
+src_compile() {
+
+	cd "${WORKSRC}"
+
+	local gentoo_env_set
+	if [[ "${ARCH}" == "amd64" ]]; then
+	    gentoo_env_set="${WORKSRC}/LinuxX86-64Env.Set.sh"
+	else
+	    gentoo_env_set="${WORKSRC}/LinuxX86Env.Set.sh"
+	fi
+
+	source "${gentoo_env_set}"
+
+	./bootstrap
+
+	cd transex3; build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} && deliver.pl
+
+	cd "${WORKSRC}"
+
+	for i in ${LINGUAS_OOO}; do
+	    if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then
+		[ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-vendor.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-vendor.sdf
+	    fi
+	    if [[ "${i}" == "ru" ]]; then
+		[ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}.sdf
+		[ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-patched.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-patched.sdf
+	    fi
+	done
+
+	if [[ "${JOBS}" != "1" ]]; then
+	    cd instsetoo_native ;  build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} || die "Build failed"
+	else
+	    dmake || die "Build failed"
+	fi
+
+}
+
+src_install() {
+
+	einfo "Preparing Installation ..."
+
+	local instdir="/usr/$(get_libdir)/openoffice"
+	local basecomponents="base calc draw impress math writer"
+	local allcomponents
+	local arch_var
+	local gentoo_env_set_dst
+
+	if [[ "${ARCH}" == "amd64" ]]; then
+	    arch_var="x"
+	    gentoo_env_set_dst="linux-2.6-x86_64"
+	else
+	    arch_var="i"
+	    gentoo_env_set_dst="linux-2.6-intel"
+	fi
+
+	allcomponents="${basecomponents}"
+	use cups && allcomponents="${allcomponents} printeradmin"
+	{ use gtk || use gnome; } && allcomponents="${allcomponents} qstart"
+
+	dodir "${instdir}"
+
+	cp -af "${WORKSRC}"/instsetoo_native/unxlng"${arch_var}"6.pro/OpenOffice/native/install/en-US/"${gentoo_env_set_dst}"/buildroot/opt/* \
+	    "${D}"${instdir}
+
+	for i in ${LINGUAS_OOO}; do
+	    if [[ "${i}" != "en-US" ]]; then
+		cp -af "${WORKSRC}"/instsetoo_native/unxlng"${arch_var}"6.pro/OpenOffice_languagepack/native/install/"${i}"/"${gentoo_env_set_dst}"/buildroot/opt/* \
+		    "${D}"${instdir}
+	    fi
+	done
+
+	# manual install Wiki Publisher, Report Builder, Presenter Screen (Console)  extensions
+	if use java; then
+		cp -f "${WORKSRC}"/swext/unxlng"${arch_var}"6.pro/bin/wiki-publisher.oxt "${D}"${instdir}/share/extension/install/
+		cp -f "${WORKSRC}"/reportbuilder/unxlng"${arch_var}"6.pro/bin/sun-report-builder.oxt "${D}"${instdir}/share/extension/install/
+	fi
+	cp -f "${WORKSRC}"/sdext/unxlng"${arch_var}"6.pro/bin/presenter-screen.oxt "${D}"${instdir}/share/extension/install/
+
+	# dict extensions
+	local dicts
+	if use infradicts; then
+		dicts="${DICTS_OOO}"
+	else
+		dicts="${LINGUAS_OOO}"
+	fi
+	rm -f "${D}"${instdir}/share/extension/install/dict-*.oxt
+	insinto ${instdir}/share/extension/install
+	local dictlang
+	for i in ${dicts}; do
+		if [[ "${i}" == "en-US" ]]; then
+			dictlang=en
+		else
+			dictlang=${i}
+		fi
+		doins "${WORKSRC}"/dictionaries/unxlng"${arch_var}"6.pro/bin/dict-"${dictlang}".oxt
+	done
+
+	# Menu entries
+	cd "${D}"${instdir}/share/xdg/
+
+	for i in ${allcomponents}; do
+		if [[ "${i}" == "printeradmin" ]]; then
+		    sed -i -e s/openoffice.org3-/oo/g "${i}".desktop || die "Sed failed"
+		else
+		    sed -i -e s/openoffice.org3/ooffice/g "${i}".desktop || die "Sed failed"
+		fi
+		domenu "${i}".desktop
+	done
+
+	# Icons
+	insinto /usr/share/icons
+	doins -r "${WORKSRC}"/sysui/desktop/icons/{hicolor,locolor}
+	ecvs_clean "${D}/usr/share/icons"
+	for color in {hicolor,locolor}; do
+	    for sizes in "${D}"usr/share/icons/${color}/* ; do
+		for i in ${allcomponents}; do
+		    [[ -f "${sizes}"/apps/"${i}".png ]] && mv "${sizes}"/apps/"${i}".png "${sizes}"/apps/openofficeorg3-"${i}".png
+		done
+	    done
+	done
+
+	# Gnome icons
+	if use gnome; then
+	    mkdir -p "${D}"/usr/share/icons/gnome
+	    for size in {16x16,32x32,48x48}; do
+		if ! [[ -d "${D}"/usr/share/icons/gnome/"${size}" ]]; then
+		    mkdir -p "${D}"/usr/share/icons/gnome/"${size}"
+		    mkdir -p "${D}"/usr/share/icons/gnome/"${size}/apps"
+		fi
+		for i in ${allcomponents}; do
+		    dosym /usr/share/icons/hicolor/"${size}"/apps/openofficeorg3-"${i}".png /usr/share/icons/gnome/"${size}"/apps/openofficeorg3-"${i}".png
+		done
+	    done
+	fi
+
+	for i in ${allcomponents}; do
+	    dosym /usr/share/icons/hicolor/48x48/apps/openofficeorg3-"${i}".png /usr/share/pixmaps/openofficeorg3-"${i}".png
+	done
+
+	# Mime types
+	insinto /usr/share/mime/packages
+	doins "${WORKSRC}"/sysui/unxlng"${arch_var}"6.pro/misc/openoffice.org/openoffice.org.xml
+
+	# Install wrapper script
+	newbin "${FILESDIR}"/wrapper.in ooffice || die
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${D}"/usr/bin/ooffice || die "Wrapper script failed"
+
+	# Install PostgreSQL SDBC extension
+	if use postgres; then
+	    insinto /usr/$(get_libdir)/openoffice/share/extension/install
+	    doins "${WORKSRC}"/connectivity/unxlng"${arch_var}"6.pro/lib/postgresql-sdbc-0.7.6.zip
+	    fperms 444 /usr/$(get_libdir)/openoffice/share/extension/install/postgresql-sdbc-0.7.6.zip
+	fi
+
+	# Component symlinks
+	for i in ${basecomponents}; do
+	    dosym "${instdir}"/program/s"${i}" /usr/bin/oo"${i}"
+	done
+
+	if use cups; then
+		dosym "${instdir}"/program/spadmin /usr/bin/ooprinteradmin
+	fi
+	dosym "${instdir}"/program/soffice /usr/bin/soffice
+	dosym "${instdir}"/"${BASIS}"/program/setofficelang /usr/bin/setofficelang
+	dosym "${instdir}"/program/unopkg  /usr/bin/unopkg
+
+	# Fix the permissions for security reasons
+#	chown -R root:0 "${D}"
+
+	# Non-java weirdness see bug #99366
+	use !java && rm -f "${D}"${instdir}/ure/bin/javaldx
+
+	# record java libraries
+	if use java; then
+		java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/"${BASIS}"/program/classes/*.jar
+		java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
+	fi
+
+	# install java-set-classpath
+	if use java; then
+		insinto /usr/$(get_libdir)/openoffice/"${BASIS}"/program
+		newins "${FILESDIR}/java-set-classpath.in" java-set-classpath
+		fperms 755 /usr/$(get_libdir)/openoffice/"${BASIS}"/program/java-set-classpath
+	fi
+
+}
+
+pkg_postinst() {
+
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+
+	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
+
+	# Add available & useful jars to openoffice classpath
+	use java && /usr/$(get_libdir)/openoffice/"${BASIS}"/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+
+	elog " To start OpenOffice-Infra, run:"
+	elog
+	elog " $ ooffice"
+	elog
+	elog " Also, for individual components, you can use any of:"
+	elog
+	elog " oobase, oocalc, oodraw, ooimpress, oomath or oowriter"
+	elog
+	if use infradicts; then
+		elog " If You dont want to build extensions for all bundled dicts from Infra-Resource "
+		elog " re-emerge the package with USE=\"-infradicts\" "
+		elog
+	fi
+	elog " Spell checking is now provided through OO own dicts extensions, "
+	elog " please install the correct extension from /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	elog " via Extension Manager according to your language needs. "
+	elog
+	elog " Some aditional functionality can be installed via Extension Manager: "
+	elog " *) PDF Import "
+	elog " *) Presentation Console "
+	elog " *) Presentation Minimizer "
+	if use java; then
+		elog " *) Wiki Publisher "
+		elog " *) Report Builder "
+	fi
+	elog
+	elog " Please use the packages provided in "
+	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	elog " instead of those from the SUN extension site. "
+	if use postgres; then
+		elog
+		elog " PostgreSQL SDBC extension provided in "
+		elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+	fi
+	elog
+
+}
diff --git a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
index 0d5e3b2ae..f133fbd9e 100644
--- a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
@@ -235,12 +235,12 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}/gentoo-infra-builder.diff"
 	epatch "${FILESDIR}/${PV}/gentoo-layout-simple-dialogs-svx.diff"
 	# fix vba parallel build
-	epatch "${FILESDIR}/${PV}/gentoo-vba-parallel-build.diff"
+	epatch "${FILESDIR}/gentoo-vba-parallel-build.diff"
 	# Patch for using Gentoo specific goo team patches and InfraGentoo/InfraGentooPG distro targets
 	epatch "${FILESDIR}/${PV}/gentoo-infra-gentoo.diff"
 
 	# Patches from go-oo mainstream
-	cp -f "${FILESDIR}/${PV}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
+	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/${PV}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die
 
 	cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2"
@@ -305,8 +305,8 @@ src_prepare() {
 	fi
 	# enable/disable-gstreamer, disable scanning for rpm/dpkg and etc
 	epatch "${FILESDIR}/${PV}/gentoo-configure.diff"
-	# disable mkdepend warning
-	epatch "${FILESDIR}/${PV}/gentoo-mkdepend.diff"
+	# fix mkdepend
+	epatch "${FILESDIR}/gentoo-mkdepend.diff"
 	# disable rpm
 	epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
 	if use postgres; then
@@ -314,7 +314,7 @@ src_prepare() {
 		epatch "${FILESDIR}/gentoo-system_pgsql.diff"
 	fi
 	# don't strip libs
-	use debug && epatch "${FILESDIR}/${PV}/gentoo-dont_strip_libs.diff"
+	use debug && epatch "${FILESDIR}/gentoo-dont_strip_libs.diff"
 	# fix jfreereport cr issue
 	sed -i -e 's/\x0D$//' "${WORKSRC}"/jfreereport/patches/*.patch || die "sed failed"