app-antivirus/kav4fileservers, app-antivirus/panda, app-office/openoffice-infra, media-video/r5u870, net-dns/inadyn-mt, net-libs/raknet, sci-astronomy/midas, www-plugins/nexus_personal_SE-bin: Remove the set of distfile-missing packages.

svn path=/sunrise/; revision=11091
author: Michał Górny <mgorny@gentoo.org> 2010-08-05 20:44:52 +0000
committer: Michał Górny <mgorny@gentoo.org> 2010-08-05 20:44:52 +0000
commit: 955393b42c3521727eba51b4f764a9eff7db7a24 (patch)
tree: 21727e33a5220dbc538eb6238514e2c1af3a8f96 /app-office
parent: dev-perl/Net-Subnets, net-misc/blocksshd: Remove masked package and its bug-l... (diff)
download: sunrise-955393b42c3521727eba51b4f764a9eff7db7a24.tar.gz
sunrise-955393b42c3521727eba51b4f764a9eff7db7a24.tar.bz2
sunrise-955393b42c3521727eba51b4f764a9eff7db7a24.zip
18 files changed, 0 insertions, 1725 deletions
diff --git a/app-office/openoffice-infra/ChangeLog b/app-office/openoffice-infra/ChangeLog
deleted file mode 100644
index 8887928f4..000000000
--- a/app-office/openoffice-infra/ChangeLog
+++ /dev/null
@@ -1,172 +0,0 @@
-# ChangeLog for app-office/openoffice-infra
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  23 Jun 2010; Justin Lecher <jlec@gentoo.org>
-  openoffice-infra-3.1.0.ebuild:
-  net-misc/neon -> net-libs/neon
-
-  18 Jun 2010; Johan Bergström (jbergstroem) <bugs@bergstroem.nu>
-  openoffice-infra-3.1.0.ebuild:
-  Migrating away from deprecated postgres virtuals
-
-  11 Feb 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-  openoffice-infra-3.1.0.ebuild:
-  Fix poppler dep
-
-  20 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-  -files/3.0.1/buildfix-mono-2-2.diff,
-  -files/3.0.1/gentoo-completion_matches.diff,
-  -files/3.0.1/gentoo-configure.diff, -openoffice-infra-3.0.1.ebuild,
-  -files/3.0.1/gentoo-configure-pg.diff,
-  -files/3.0.1/gentoo-infragentoo.diff, -files/3.0.1/gentoo-scripts.diff,
-  -files/3.0.1/hunspell-one-dir-nocrash.diff,
-  -files/3.0.1/nojavanostax.diff, openoffice-infra-3.1.0.ebuild,
-  -files/3.0.1/vba-basic-parallel-build.diff:
-  Drop optional kde support. Also drop old ebuild
-
-  22 Jul 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-  openoffice-infra-3.0.1.ebuild, openoffice-infra-3.1.0.ebuild:
-  Fix dependency (virtual/perl-IO-Compress-Base and virtual/perl-Compress-Zlib
-  got masked)
-
-  29 Jun 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  +files/3.0.1/vba-basic-parallel-build.diff, openoffice-infra-3.0.1.ebuild,
-  openoffice-infra-3.1.0.ebuild, files/3.1.0/gentoo-infra-gentoo.diff,
-  files/gentoo-vba-parallel-build.diff:
-  Some code cleanup for 3.0.1/3.1.0
-
-  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,
-  metadata.xml:
-  Close to original Infra-Resource build. Take your attention to use flags
-  changes: oodict - removed, infradicts - added, infradicts and postgres -
-  enabled by default. And a number of small fixes.
-
-  05 Jun 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  openoffice-infra-3.1.0.ebuild:
-  Fix gconf issue
-
-  03 Jun 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,
-  -files/2.4.2/gentoo-configure.diff, -files/3.0.1,
-  -files/3.0.1/gentoo-ReturnInteger.hdl, -openoffice-infra-2.4.2.ebuild,
-  -files/2.4.2/gentoo-configure-pg.diff,
-  -files/2.4.2/gentoo-fixsandbox.diff,
-  -files/3.0.1/gentoo-ReturnInteger.hpp,
-  -files/3.0.1/gentoo-XVBAToOOEventDescGen.hpp,
-  -files/3.0.1/gentoo-completion_matches.diff,
-  -files/3.0.1/gentoo-configure.diff, +files/3.1.0/gentoo-configure-pg.diff,
-  -files/3.0.1/gentoo-buildfix-mono-2-2.diff,
-  -openoffice-infra-3.0.1.ebuild, -files/2.4.2/gentoo-infragentoo.diff,
-  -files/3.0.1/gentoo-XVBAToOOEventDescGen.hdl,
-  -files/3.0.1/gentoo-configure-pg.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-scripts.diff,
-  -files/3.0.1/gentoo-solenv_kde_mess.diff,
-  -files/3.0.1/gentoo-vba_incl.diff, +files/3.1.0,
-  +files/3.1.0/buildfix-gcc44.diff, +files/3.1.0/gentoo-configure.diff,
-  +files/3.1.0/gentoo-dont_strip_libs.diff,
-  +files/3.1.0/gentoo-infra-builder.diff,
-  +files/3.1.0/gentoo-vba-parallel-build.diff,
-  +files/3.1.0/solenv.workaround-for-the-kde-mess.diff,
-  +openoffice-infra-3.1.0.ebuild, -files/2.4.2/gentoo-macolor.diff,
-  -files/2.4.2/gentoo-mkdepend.diff, -files/2.4.2/gentoo-scripts.diff,
-  +files/3.1.0/gentoo-infra-gentoo.diff,
-  -files/2.4.2/gentoo-python-2.3.4.diff,
-  +files/3.1.0/gentoo-layout-simple-dialogs-svx.diff,
-  +files/3.1.0/gentoo-mkdepend.diff, +files/3.1.0/gentoo-ru_dict.diff:
-  Version bump to 3.1.0
-
-  17 Apr 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  openoffice-infra-3.0.1.ebuild:
-  Change app-text/poppler to virtual/poppler at deps.
-
-  06 Mar 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  openoffice-infra-3.0.1.ebuild:
-  Some cleanups to the 3.0.1 ebuild, also switching to EAPI=2, mostly the work
-  of Peter Volkov <pva@gentoo.org> and Andreas Proschofsky <suka@gentoo.org>
-
-  27 Feb 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  -files/2.4.2/gentoo-gentooinfra.diff:
-  delete useless patch for openoffice-infra 2.4.2
-
-  27 Feb 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  files/2.4.2/build-gcc43-missingincludes.diff,
-  files/2.4.2/gentoo-configure.diff, +files/2.4.2/gentoo-configure-pg.diff,
-  +files/2.4.2/gentoo-infragentoo.diff, files/3.0.1/gentoo-configure.diff,
-  openoffice-infra-2.4.2.ebuild, +files/3.0.1/gentoo-configure-pg.diff,
-  openoffice-infra-3.0.1.ebuild, files/3.0.1/gentoo-infragentoo.diff:
-  Added new use flag 'postgres', fix build of sdbc-postgres extension, some
-  code cleanup - for both versions of openoffice-infra: 2.4.2/3.0.1
-
-  15 Feb 2009; Yar Odin (yarodin) <yarodin@gmail.com>
-  openoffice-infra-2.4.2.ebuild:
-  Some additional fixes for openoffice-infra-2.4.2
-
-  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,
-  +files/2.4.2/gentoo-configure.diff, +files/2.4.2/gentoo-gentooinfra.diff,
-  +files/2.4.2/gentoo-mkdepend.diff, +files/2.4.2/gentoo-scripts.diff,
-  +files/3.0.0, +files/3.0.0/gentoo-ReturnInteger.hdl,
-  +files/gentoo-epm-3.7.patch.diff, +files/2.4.2/gentoo-macolor.diff,
-  +files/3.0.0/gentoo-ReturnInteger.hpp,
-  +files/3.0.0/gentoo-XVBAToOOEventDescGen.hdl,
-  +files/3.0.0/gentoo-XVBAToOOEventDescGen.hpp,
-  +files/3.0.0/gentoo-completion_matches.diff,
-  +files/3.0.0/gentoo-configure.diff, +files/3.0.0/gentoo-hunspell.diff,
-  +files/3.0.0/gentoo-infragentoo.diff, +files/3.0.0/gentoo-mkdepend.diff,
-  +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, +openoffice-infra-2.4.2.ebuild,
-  +openoffice-infra-3.0.0.ebuild, +files/gentoo-fixsandbox.diff,
-  +files/gentoo-system_pgsql.diff, +files/java-set-classpath.in,
-  +files/wrapper.in, +metadata.xml:
-  New Ebuild for bug 254572 thanks to Peter Volkov <pva@gentoo.org>
-
diff --git a/app-office/openoffice-infra/Manifest b/app-office/openoffice-infra/Manifest
deleted file mode 100644
index a80598b54..000000000
--- a/app-office/openoffice-infra/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-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-infra-builder.diff 1118 RMD160 bd16e8064c89469cac0ea291b31c9f5caba8a028 SHA1 a731a03ef25f6a884e722bc2a4b4da80f5f46132 SHA256 1d6fcb2b31e605edad597ff8da44e2a8adfdb67eec65ca821c453a958718ca50
-AUX 3.1.0/gentoo-infra-gentoo.diff 3439 RMD160 80888986faeae04096a72356b00c68cdef05b2dd SHA1 a51ffc4b2da156d58e4f565da6e5ff2379685ee9 SHA256 9e07aaccf6e97b334b0b581905419f95a7584214296f0b90b5156478877102df
-AUX 3.1.0/gentoo-layout-simple-dialogs-svx.diff 1207 RMD160 28c8f2394cebf860701b36d3b5c4f0d7583736bd SHA1 807ba97128197fa1d16be3fb7bb0948a444d06da SHA256 7135bb29a6b36e3deca6094119c34b17549d4959a12bac91ec30aa22bcc141f4
-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 3520 RMD160 abd3d1ef1fa8ac0aaa204a87896573888244a86e SHA1 d3e55f99369a2e98531445d179f2b6be6a97c922 SHA256 fff239e4b52c5ee195f0d36e2871de2ba2fbf9ae149e676b42e5ec218da87c1d
-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.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.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 23725 RMD160 0be5f800bb686a43487eb0438468bbf91b7b8ec0 SHA1 0ff37e102a68b3b246c209b561d435ebfdc15c7b SHA256 e28ea1ecf041e184224adf92bb9dc12b9d5a820fea0019685b42019448c1c44c
-MISC ChangeLog 8570 RMD160 179d2e1d19ad7581a456b68004df114cabe6062d SHA1 d215e3aa501887cc3d9c5e2cff24390476e697eb SHA256 3a09d2861ded739bc3897d25109904cab9dd7640a2efd335c9f328046af8f7d9
-MISC metadata.xml 851 RMD160 3c0a826360767ddd7dd892d5857a7b24a697f9b8 SHA1 a94c08f80da1ef994efa51cf22d2b48673f86d7b SHA256 5c22d26af0edaca9105ad12fe78481e95c11f115f05a797ebeedba77130b980a
diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff
deleted file mode 100644
index 8437d4c75..000000000
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2008-10-26 12:57:20.000000000 +0500
-+++ 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.1.0/gentoo-configure.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-configure.diff
deleted file mode 100644
index e00d4da6c..000000000
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-configure.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.in.orig	2008-10-26 12:57:20.000000000 +0500
-+++ configure.in	2008-10-26 12:57:57.000000000 +0500
-@@ -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.1.0/gentoo-infra-builder.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-infra-builder.diff
deleted file mode 100644
index 823570216..000000000
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-builder.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- bin/apply.pl.orig	2009-05-30 14:14:39.000000000 +0600
-+++ bin/apply.pl	2009-05-30 14:14:53.000000000 +0600
-@@ -918,7 +918,7 @@
-     my $ver_line;
-     my $is_old = 1;
- 
--    open ($Patch, "/usr/local/bin/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) {
-@@ -1280,7 +1280,7 @@
- 
-     $opts = join ' ', @arguments;
-     $patch_args = " -l -p0 $opts -d $dest_dir";
--    $patch_cmd = "/usr/local/bin/gpatch";
-+    $patch_cmd = "patch";
-     if ($pieces) {
- 	# nasty path mess
- 	$patch_cmd = "$patch_dir/../../bin/sloppypatch.pl";
---- bin/enable-dict.orig	2009-05-30 13:44:33.000000000 +0600
-+++ bin/enable-dict		2009-05-30 13:44:40.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.1.0/gentoo-infra-gentoo.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff
deleted file mode 100644
index 8c7f38290..000000000
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- patches/dev300/apply.orig	2009-06-28 13:42:16.000000000 +0600
-+++ patches/dev300/apply	2009-06-28 13:58:45.000000000 +0600
-@@ -151,6 +151,12 @@
- 
- InfraUnix:  LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions
- InfraLinux:  UbuntuJaunty, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, InfraLinuxOnly
-+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, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, IntegrateExtensions
- InfraWin32: Win32Common, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions
- InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
-@@ -1601,7 +1607,7 @@
- sc-export-shape-macro-bindings.diff, n#304739, noelpwer
- 
- # export of hlink bindings for shapes
--# sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
-+sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
- 
- # attributes present in the vba streams can override the default shape name
- # used for the control in the binary format
-@@ -1768,6 +1774,8 @@
- # fix crash when attempting to use geometry attributes of
- # control on sheet/document
- vba-fix-control-shape-geom-fix.diff, n#500006
-+#must ask kendy about this ( noelp )
-+vba-parallel-build.diff, #no-upstrea
- [ VBAUntested ]
- SectionOwner => noelpwer
- # needs more extensive testing, disable for 3.1
-@@ -2970,7 +2978,7 @@
- xlsx-shared-import-and-export.diff
- 
- xlsx-arabic-export-crash.diff, n#497419, janneke
--xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke
-+#xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke
- xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
- xlsx-export-simple-autofilter.diff, n#497559, janneke
- # hack to ignore writerfilter when odf-converter is present
-@@ -3065,15 +3073,22 @@
- sc-toogle-grid-menubar.diff
- infra-palette.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
- reportbuilder-no-license-infra.diff
- wikipublisher-no-license-infra.diff
-@@ -3081,7 +3096,6 @@
- scp2_extensions-remove-SUN.diff
- extensions-dont-install-by-default.diff
- extensions-separate-java-based.diff
--extensions-zemberek.diff
- officecfg-create-backups.diff
- 
- [InfraLinuxOnly]
-@@ -3090,8 +3104,10 @@
- sfx2-remove-check-update-on-fileload.diff, kohei
- default-system-fpicker.diff, michael
- 
--[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.1.0/gentoo-layout-simple-dialogs-svx.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-layout-simple-dialogs-svx.diff
deleted file mode 100644
index c65a7160a..000000000
--- a/app-office/openoffice-infra/files/3.1.0/gentoo-layout-simple-dialogs-svx.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- patches/dev300/layout-simple-dialogs-svx.diff.orig	2009-05-30 16:22:25.000000000 +0600
-+++ patches/dev300/layout-simple-dialogs-svx.diff	2009-05-30 16:23:35.000000000 +0600
-@@ -38,9 +38,9 @@
-  inline BOOL SvxSearchDialog::HasSearchAttributes() const
-  {
-  	int bLen = aSearchAttrText.GetText().Len();
----- svx/source/dialog/makefile.mk.old	2009-04-06 16:41:56.000000000 +0000
--+++ svx/source/dialog/makefile.mk	2009-04-06 16:42:13.000000000 +0000
--@@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
-+--- svx/source/dialog/makefile.mk	2009-04-06 16:42:06.000000000 +0000
-++++ svx/source/dialog/makefile.mk		2009-04-06 16:42:13.000000000 +0000		
-+@@ -39,8 +39,4 @@ ENABLE_EXCEPTIONS=TRUE
-  .INCLUDE :  settings.mk
-  .INCLUDE :  $(PRJ)$/util$/makefile.pmk
-  
-@@ -48,9 +48,9 @@
- -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
- -.ENDIF # ENABLE_LAYOUT == TRUE
- -
-- .IF "$(ENABLE_GTK)" != ""
-- CFLAGS+=-DENABLE_GTK
-- .ENDIF
-+ # --- Files --------------------------------------------------------
-+
-+ SRS1NAME=dialogs
- --- svx/source/dialog/srchdlg.cxx.old	2009-04-06 16:42:06.000000000 +0000
- +++ svx/source/dialog/srchdlg.cxx	2009-04-06 16:42:13.000000000 +0000
- @@ -78,6 +78,8 @@
diff --git a/app-office/openoffice-infra/files/3.1.0/solenv.workaround-for-the-kde-mess.diff b/app-office/openoffice-infra/files/3.1.0/solenv.workaround-for-the-kde-mess.diff
deleted file mode 100644
index 714709e21..000000000
--- a/app-office/openoffice-infra/files/3.1.0/solenv.workaround-for-the-kde-mess.diff
+++ /dev/null
@@ -1,262 +0,0 @@
-unchanged:
---- solenv/inc/_tg_shl.mk
-+++ solenv/inc/_tg_shl.mk
-@@ -441,10 +441,10 @@ $(SHL1TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
--	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
-+	@echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
- 	$(SHL1VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+	$(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -981,10 +981,10 @@ $(SHL2TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
--	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
-+	@echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
- 	$(SHL2VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+	$(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -1521,10 +1521,10 @@ $(SHL3TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
--	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
-+	@echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
- 	$(SHL3VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+	$(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -2061,10 +2061,10 @@ $(SHL4TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
--	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
-+	@echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
- 	$(SHL4VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+	$(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -2601,10 +2601,10 @@ $(SHL5TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
--	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
-+	@echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
- 	$(SHL5VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+	$(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -3141,10 +3141,10 @@ $(SHL6TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
--	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
-+	@echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
- 	$(SHL6VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+	$(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -3681,10 +3681,10 @@ $(SHL7TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
--	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
-+	@echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
- 	$(SHL7VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+	$(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -4221,10 +4221,10 @@ $(SHL8TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
--	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
-+	@echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
- 	$(SHL8VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+	$(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -4761,10 +4761,10 @@ $(SHL9TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
--	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
-+	@echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
- 	$(SHL9VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+	$(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
- .IF "$(UPDATER)"=="YES"
-@@ -5301,10 +5301,10 @@ $(SHL10TARGETN) : \
- .ENDIF
- .ELSE			# "$(OS)"=="MACOSX"
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
--	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
-+	@echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
- 	$(SHL10VERSIONOBJ) -o $@ \
- 	`cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
--	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+	$(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
- .IF "$(UPDATER)"=="YES"
-diff -u solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
---- solenv/inc/_tg_app.mk	(working copy)
-+++ solenv/inc/_tg_app.mk
-@@ -116,10 +116,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
--	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP1OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
--	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+	@echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
- 	@ls -l $@
-@@ -400,10 +400,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
--	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP2OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
--	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+	@echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
- 	@ls -l $@
-@@ -684,10 +684,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
--	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP3OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
--	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+	@echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
- 	@ls -l $@
-@@ -968,10 +968,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
--	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP4OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
--	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+	@echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
- 	@ls -l $@
-@@ -1252,10 +1252,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
--	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP5OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
--	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+	@echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
- 	@ls -l $@
-@@ -1536,10 +1536,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
--	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP6OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
--	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+	@echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
- 	@ls -l $@
-@@ -1820,10 +1820,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
--	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP7OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
--	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+	@echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
- 	@ls -l $@
-@@ -2104,10 +2104,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
--	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP8OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
--	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+	@echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
- 	@ls -l $@
-@@ -2388,10 +2388,10 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
--	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP9OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
--	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+	@echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
- 	@ls -l $@
-@@ -2672,7 +2672,7 @@
- .ELSE		# "$(OS)"=="MACOSX"
- 	@echo unx
- 	@-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
--	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
-+	@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
- 	$(APP10OBJS:s/.obj/.o/) '\' >  $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#'  >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
- 	@echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
diff --git a/app-office/openoffice-infra/files/buildfix-gcc44.diff b/app-office/openoffice-infra/files/buildfix-gcc44.diff
deleted file mode 100644
index 5da661e1f..000000000
--- a/app-office/openoffice-infra/files/buildfix-gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- sw/source/core/doc/docbm.cxx	2009-05-17 16:41:34.765483089 -0500
-+++ sw/source/core/doc/docbm.cxx	2009-05-17 16:41:39.141355157 -0500
-@@ -33,6 +33,7 @@
- #include "precompiled_sw.hxx"
- 
- 
-+#include <cstdio>
- #include <tools/pstm.hxx>
- #include <svx/linkmgr.hxx>
- #include <fmtanchr.hxx>
---- sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:33.556313757 -0500
-+++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-17 17:06:46.964547351 -0500
-@@ -32,6 +32,7 @@
- #include "precompiled_sw.hxx"
- 
- #include <iostream> 
-+#include <cstdio>
- #include "WW8TableInfo.hxx"
- #include "swtable.hxx"
- #include "pam.hxx"
diff --git a/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff b/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff
deleted file mode 100644
index 1f77f9a3f..000000000
--- a/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- solenv/bin/make_installer.pl.orig	2009-03-14 14:28:15.000000000 +0500
-+++ solenv/bin/make_installer.pl	2009-03-14 14:29:33.000000000 +0500
-@@ -1388,11 +1388,11 @@
- 			# 1. copy all files that need to be stripped locally 
- 			# 2. strip all these files
- 
--			if ( $installer::globals::strip )
--			{
--				installer::strip::strip_libraries($filesinpackage, $languagestringref);
--				if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
--			}
-+			#if ( $installer::globals::strip )
-+			#{
-+			#	installer::strip::strip_libraries($filesinpackage, $languagestringref);
-+			#	if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
-+			#}
- 			
- 			###############################################################
- 			# Searching for files in $filesinpackage with flag LINUXLINK
diff --git a/app-office/openoffice-infra/files/gentoo-epm-3.7.patch.diff b/app-office/openoffice-infra/files/gentoo-epm-3.7.patch.diff
deleted file mode 100644
index a256e0f9a..000000000
--- a/app-office/openoffice-infra/files/gentoo-epm-3.7.patch.diff
+++ /dev/null
@@ -1,88 +0,0 @@
---- epm/epm-3.7.patch.orig	2008-09-21 21:01:59.000000000 +0600
-+++ epm/epm-3.7.patch	2008-09-21 22:31:54.000000000 +0600
-@@ -98,8 +98,8 @@
- *** misc/epm-3.7/configure	Thu Jul 24 03:20:54 2003
- --- misc/build/epm-3.7/configure	Mon Nov 20 15:01:11 2006
- ***************
--*** 1238,1244 ****
----- 1238,1249 ----
-+*** 1238,1243 ****
-+--- 1238,1248 ----
-   fi
-   fi;
-   
-@@ -107,11 +107,48 @@
- + if test "${enable_fltk+set}" = set; then
- +   enableval="$enable_fltk"
- + fi;
--  
- + 
-+  
-   # Check whether --with-docdir or --without-docdir was given.
-   if test "${with_docdir+set}" = set; then
--    withval="$with_docdir"
-+***************
-+*** 2683,2690 ****
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+!     ac_cv_path_RPM="$as_dir/$ac_word$ac_exec_ext"
-+!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+    fi
-+  done
-+--- 2688,2695 ----
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+! #    ac_cv_path_RPM="$as_dir/$ac_word$ac_exec_ext"
-+! #    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+    fi
-+  done
-+***************
-+*** 2722,2729 ****
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+!     ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
-+!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+    fi
-+  done
-+--- 2727,2734 ----
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+! #    ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
-+! #    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+    fi
-+  done
- ***************
- *** 4904,4939 ****
-   fi
-@@ -410,8 +447,22 @@
- *** misc/epm-3.7/epm.c	Tue Oct 28 15:48:30 2003
- --- misc/build/epm-3.7/epm.c	Mon Nov 20 14:54:51 2006
- ***************
-+*** 184,194 ****
-+  	     /*
-+  	      * Use dpkg as the native format, if installed...
-+  	      */
-+- 
-+- 	      if (access("/usr/bin/dpkg", 0))
-+  		format = PACKAGE_RPM;
-+- 	      else
-+- 		format = PACKAGE_DEB;
-+              }
-+  #elif defined(__sgi)
-+  	      format = PACKAGE_INST;
-+--- 184,190 ----
-+***************
- *** 547,552 ****
----- 547,553 ----
-+--- 543,549 ----
-   {
-     puts(EPM_VERSION);
-     puts("Copyright 1999-2003 by Easy Software Products.");
diff --git a/app-office/openoffice-infra/files/gentoo-mkdepend.diff b/app-office/openoffice-infra/files/gentoo-mkdepend.diff
deleted file mode 100644
index d62b8a828..000000000
--- a/app-office/openoffice-infra/files/gentoo-mkdepend.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- soltools/mkdepend/makefile.mk.orig	2008-04-11 00:06:06.000000000 +0600
-+++ soltools/mkdepend/makefile.mk	2008-10-25 22:25:48.000000000 +0600
-@@ -49,7 +49,7 @@
- LIBSALCPPRT=
- UWINAPILIB=
- 
--CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS
-+CDEFS+=-Wno-implicit-function-declaration -DNO_X11 -DXP_PC -DHW_THREADS
- 
- OBJFILES=  \
- 		$(OBJ)$/cppsetup.obj \
---- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
- 
- char			*copy();
- char			*base_name();
--char			*getline();
-+char			*ooo_getline();
- char			*isdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
---- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *ooo_getline(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
---- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- 	register int	type;
- 	boolean recfailOK;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- 		case IF:
- 		doif:
-@@ -168,7 +168,7 @@
- 	register char	*line;
- 	register int	type;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- 		case IF:
- 		case IFFALSE:
diff --git a/app-office/openoffice-infra/files/gentoo-system_pgsql.diff b/app-office/openoffice-infra/files/gentoo-system_pgsql.diff
deleted file mode 100644
index f94f210c1..000000000
--- a/app-office/openoffice-infra/files/gentoo-system_pgsql.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- connectivity/source/drivers/postgresql/makefile.mk.orig	2008-11-22 13:45:15.000000000 +0500
-+++ connectivity/source/drivers/postgresql/makefile.mk	2008-11-22 13:46:58.000000000 +0500
-@@ -94,6 +94,10 @@
- POSTGRESQL_INCLUDES=-I`pg_config --includedir`
- .ENDIF
- 
-+.IF "$(SYSTEM_POSTGRESQL)" = "YES"
-+POSTGRESQL_LIBS=-L`pg_config --libdir`
-+.ENDIF
-+
- CFLAGS+=$(POSTGRESQL_INCLUDES) \
- 	-DPOSTGRESQL_MAJOR=$(POSTGRESQL_MAJOR) \
- 	-DPOSTGRESQL_MINOR=$(POSTGRESQL_MINOR) \
-@@ -124,6 +128,8 @@
- PQLIB=-lpq -lcrypt
- .IF "$(OS)"=="FREEBSD"
- PQLIB+=-L/usr/local/lib
-+.ELSE
-+PQLIB+=$(POSTGRESQL_LIBS)
- .ENDIF
- .ENDIF
- SHL2TARGET=postgresql-sdbc-impl.uno
diff --git a/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff b/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
deleted file mode 100644
index 1f49fa0a9..000000000
--- a/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
+++ /dev/null
@@ -1,97 +0,0 @@
---- patches/vba/vba-parallel-build.diff.orig	2009-06-28 18:20:22.000000000 +0600
-+++ patches/vba/vba-parallel-build.diff	2009-06-28 18:43:58.000000000 +0600
-@@ -1,79 +1,33 @@
----- basic/source/classes/makefile.mk	2007-03-01 16:50:05.000000000 +0100
--+++ basic/source/classes/makefile.mk	2007-03-01 16:50:39.000000000 +0100
--@@ -53,10 +53,6 @@ ALLTAR : \
--         $(MISC)$/$(TARGET).don \
--         $(SLOTARGET)
-+--- scripting/source/vbaevents/makefile.mk.orig		2009-05-31 14:11:28.000000000 +0600
-++++ scripting/source/vbaevents/makefile.mk				2009-05-31 15:25:22.000000000 +0600
-+@@ -19,15 +19,6 @@
-  
---$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
---        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
---        echo $@
---
-- # --- Allgemein -----------------------------------------------------------
-- 
-- COMMON_SLOFILES=	\
--@@ -85,3 +81,9 @@ LIB1OBJFILES = $(SLOFILES)
-- 
-- .INCLUDE :  target.mk
-- 
--+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
--+        echo $@
--+
--+$(OBJFILES) : $(MISC)$/$(TARGET).don
--+
----- sc/source/ui/vba/makefile.mk	2007-03-01 14:51:01.000000000 +0100
--+++ sc/source/ui/vba/makefile.mk	2007-03-01 15:24:47.000000000 +0100
--@@ -1,6 +1,6 @@
---PRJ=../..$/..
--+PRJ=..$/..$/..
-- 
---PRJNAME=
--+PRJNAME=sc
-- TARGET=vbaobj
-- .IF "$(ENABLE_VBA)"!="YES"
-- dummy:
--@@ -21,10 +21,6 @@ ALLTAR : \
--         $(MISC)$/$(TARGET).don \
--         $(SLOTARGET)
-+ # ------------------------------------------------------------------
-  
-+-ALLTAR : \
-+-        $(MISC)$/$(TARGET).don \
-+-        $(SLOTARGET)
-+-
- -$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- -        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
- -        echo $@
-+-# ------------------------------------------------------------------
- -
-- # ------------------------------------------------------------------
-+ #.INCLUDE :  ..$/cppumaker.mk
-  
-  SLOFILES= \
--@@ -65,3 +61,10 @@ SLOFILES= \
-+@@ -56,3 +47,14 @@
-  # --- Targets ------------------------------------------------------
-  
-  .INCLUDE :	target.mk
- +
--+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
--+        echo $@
--+
--+$(OBJFILES) : $(MISC)$/$(TARGET).don
-++ALLTAR : \
-++        $(MISC)$/$(TARGET).don \
-++        $(SLOTARGET)
- +
----- scripting/source/vbaevents/makefile.mk	2007-03-01 16:54:36.000000000 +0100
--+++ scripting/source/vbaevents/makefile.mk	2007-03-01 16:56:15.000000000 +0100
--@@ -24,9 +24,6 @@ ALLTAR : \
--         $(MISC)$/$(TARGET).don \
--         $(SLOTARGET)
-- 
---$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
---        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
---        echo $@
-- # ------------------------------------------------------------------
-- 
-- #.INCLUDE :  ..$/cppumaker.mk
--@@ -57,3 +54,10 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
-- # --- Targets ------------------------------------------------------
-- 
-- .INCLUDE :	target.mk
-++$(SLOFILES) : $(MISC)$/$(TARGET).don
- +
- +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- +        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
- +        echo $@
- +
--+$(OBJFILES) : $(MISC)$/$(TARGET).don
--+
diff --git a/app-office/openoffice-infra/files/java-set-classpath.in b/app-office/openoffice-infra/files/java-set-classpath.in
deleted file mode 100644
index 50f81552a..000000000
--- a/app-office/openoffice-infra/files/java-set-classpath.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-#*****************************************************************************
-# 
-#  java-set-classpath - Utility to update the default CLASSPATH for OpenOffice.org
-# 
-#  Initial version by: Petr Mladek <pmladek@suse.cz>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2, as
-#  published by the Free Software Foundation.
-# 
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# 
-#*****************************************************************************
-
-if test "z$1" = "z" ; then
-    echo "Update the default CLASSPATH for OpenOffice.org"
-    echo ""
-    echo "Usage: $0 [dir|jar]..."
-    echo ""
-    echo "The utility updates the OpenOffice.org system setting. It adds or removes"
-    echo "the given directories and jar-files to or from the default CLASSPATH"
-    echo "depending on if they are available on the system or not."
-    echo ""
-    echo "Parameters:"
-    echo "        dir - absolute path to a directory"
-    echo "        jar - absolute path to a jar-file"
-    exit 0;
-fi
-
-JVM_CONFIG_FILE=@OOINSTBASE@/program/jvmfwk3rc
-
-for path in $@ ; do
-    if test "z${path%%/*}" != "z" ; then
-	echo "Warning: the path "$path" is not absolute and will be ignored"
-	continue
-    fi
-    if test -e $path ; then
-	# the file exist
-	grep "UNO_JAVA_JFW_CLASSPATH_URLS.*file:/*$path\([[:space:]].*\)\?$" $JVM_CONFIG_FILE >/dev/null && continue
-	# it is not registered
-	TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1
- 	sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)$|\1 file:$path|" $JVM_CONFIG_FILE >$TMP_FILE
-	mv -f $TMP_FILE $JVM_CONFIG_FILE
-	chmod 644 $JVM_CONFIG_FILE
-    else
-	# the file does not exist, remove it from the configuration
-	TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1;
-	sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)file:/*$path\([[:space:]].*\)\?$|\1\2|" \
-	    -e "s/\(UNO_JAVA_JFW_CLASSPATH_URLS=\)[[:space:]]\+/\1/" \
-	    -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]\+/ /g" \
-	    -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]*$//" $JVM_CONFIG_FILE >$TMP_FILE
-	mv -f $TMP_FILE $JVM_CONFIG_FILE
-	chmod 644 $JVM_CONFIG_FILE
-    fi
-done
diff --git a/app-office/openoffice-infra/files/wrapper.in b/app-office/openoffice-infra/files/wrapper.in
deleted file mode 100644
index 364b2af8d..000000000
--- a/app-office/openoffice-infra/files/wrapper.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export OOO_EXTRA_ARG=''
-unset PYTHONPATH
-/usr/LIBDIR/openoffice/program/soffice  "$@"
diff --git a/app-office/openoffice-infra/metadata.xml b/app-office/openoffice-infra/metadata.xml
deleted file mode 100644
index ac280765a..000000000
--- a/app-office/openoffice-infra/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-<longdescription>Openoffice-infra is the opensource version of staroffice
-with some extra patches from Infra-Resource and enhanced Russian support.
-This ebuild allows you to compile it yourself. Unfortunately this
-compilation can take up to a day depending on the speed of your
-computer. It will however make a snappier openoffice than the binary
-version</longdescription>
-<use>
-  <flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
-    file formats</flag>
-  <flag name='odk'>Build the Office Development Kit</flag>
-  <flag name='infradicts'>Use all bundled dicts from Infra-Resource</flag>
-</use>
-</pkgmetadata>
diff --git a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
deleted file mode 100644
index 639cc6763..000000000
--- a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
+++ /dev/null
@@ -1,677 +0,0 @@
-# Copyright 1999-2010 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 mono multilib toolchain-funcs
-
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk ldap mono nsplugin odk +infradicts opengl pam +postgres"
-
-PATCHLEVEL="OOO310"
-MILESTONE="11"
-OOOTAG=${PATCHLEVEL}_m${MILESTONE}
-OOOBUILDTAG=ooo310-m${MILESTONE}
-
-SRC=OOo_${PV}_src
-S=${WORKDIR}/infra-ooo-files_${PV}
-WORKSRC=${WORKDIR}/${OOOTAG}
-BASIS=basis3.1
-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 tr uk"
-LANGS="${LANGS1} en en_US"
-
-# proper 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
-	x11-libs/libXrandr
-	>=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 )
-	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-db/hsqldb-1.8.0.9 )
-	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.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 )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	>=net-libs/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
-	>=app-text/poppler-0.12.3-r3"
-
-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-IO-Compress
-	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? ( dev-db/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="6144"
-	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 ru uk"
-	else
-		for i in ${LINGUAS_OOO}; do
-			if [[ "${i}" != "tr" ]]; then
-				if [[ "${i}" == "en-US" ]]; then
-					DICTS_OOO="${DICTS_OOO} en"
-				else
-					DICTS_OOO="${DICTS_OOO} ${i}"
-				fi
-			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-Infra 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-infra 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/ || die "cp of unowinreg.dll failed"
-	fi
-
-	# Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}/gentoo-infra-builder.diff"
-	epatch "${FILESDIR}/${PV}/gentoo-layout-simple-dialogs-svx.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-infra-gentoo.diff"
-
-	# Patches from go-oo mainstream
-	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
-
-	cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2" || die "untar failed"
-
-	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" \
-			|| die "untar failed"
-		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}" \
-			|| die "enable-dict failed"
-		fi
-	done
-
-	# Infra branding
-	mkdir -p "${WORKSRC}"/{libwps,libwpg,libsvg}/download/ || die "mkdir failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwps*.tar.gz   "${WORKSRC}"/libwps/download/ || die "cp of libwps failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwpg*.tar.gz   "${WORKSRC}"/libwpg/download/ || die "cp of libwpg failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libsvg*.tar.gz   "${WORKSRC}"/libsvg/download/ || die "cp of libsvg failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/infra-logo-team.png   "${WORKSRC}"/default_images/sw/res/ || die "cp of *.png failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/go-oo-team.png   "${WORKSRC}"/default_images/sw/res/ || die "cp of *.png failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/intro.bmp    "${WORKSRC}"/ooo_custom_images/nologo/introabout/ || die "cp of *.png failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/about.bmp    "${WORKSRC}"/default_images/introabout/ || die "cp of *.png failed"
-	cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/backing*.png    "${WORKSRC}"/default_images/framework/res/ || die "cp of *.png failed"
-
-	local patchconf
-	patchconf="--tag=${OOOBUILDTAG} --distro=Localize"
-	local distrodicts
-	if use postgres; then
-		patchconf="${patchconf} --distro=InfraGentooPG"
-	else
-		patchconf="${patchconf} --distro=InfraGentoo"
-	fi
-	use binfilter && patchconf="${patchconf} --distro=Binfilter"
-	# add basic support of zemberek/tr
-	local dicts="${DICTS_OOO} tr"
-	for i in ${dicts}; do
-		if [[ "${i}" != "en" ]]; then
-			distrodicts="${distrodicts} --distro=InfraDict${i}"
-		fi
-	done
-	[[ -n "${distrodicts}" ]] && patchconf="${patchconf} ${distrodicts}"
-	"${WORKDIR}"/infra-ooo-files_${PV}/bin/apply.pl "${WORKDIR}"/infra-ooo-files_${PV}/patches/dev300 "${WORKSRC}" ${patchconf} || die "apply failed"
-	"${WORKDIR}"/infra-ooo-files_${PV}/bin/transform --apply "${WORKDIR}"/infra-ooo-files_${PV} "${WORKSRC}" || die "transform failed"
-
-	if use postgres; then
-		# fix using of pg lib
-		epatch "${FILESDIR}/${PV}/gentoo-configure-pg.diff"
-		# fix handling of system libs for postgresql-base
-		epatch "${FILESDIR}/gentoo-system_pgsql.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"
-	# disable rpm
-	epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
-	# 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}"
-
-	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-jvm-path=/usr/$(get_libdir)/"
-		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
-
-	# Handle new dicts system
-	CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-myspell-dicts"
-	local tempdicts=ENUS
-	for i in ${DICTS_OOO}; do
-		if [[ "${i}" != "en" ]]; then
-			tempdicts="${tempdicts},$(ls ${WORKSRC}/dictionaries/ | grep ${i} | sed -e 's/_//g;s/\///g' | tr '[a-z]' '[A-Z]')"
-		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 gconf)"
-	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"
-
-	# workaround for --with-system-*
-	export PKG_CONFIG=pkg-config
-
-	cd "${WORKSRC}"
-
-	# distro-configs are not hooked in infra build, passing configure options as commandline arguments
-	./configure \
-		--srcdir="${WORKSRC}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-build-version="${OOOTAG}" \
-		--disable-kde \
-		${GTKFLAG} \
-		$(use_enable mono) \
-		$(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 || die "bootstrap failed"
-
-	cd transex3; build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} && deliver.pl || die "build.pl failed"
-
-	cd "${WORKSRC}"
-
-	for i in ${LINGUAS_OOO}; do
-		if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then
-			if [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-vendor.sdf ]; then
-				"${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-vendor.sdf || die "localize failed"
-			fi
-		fi
-		if [[ "${i}" == "ru" ]]; then
-			if [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}.sdf ]; then
-				"${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}.sdf || die "localize failed"
-			fi
-			if [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-patched.sdf ]; then
-				"${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-patched.sdf || die "localize failed"
-			fi
-		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() {
-	export PYTHONPATH=""
-
-	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} || "cp of dist failed"
-
-	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} || "cp of langpacks failed"
-		fi
-	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
-				if [[ -f "${sizes}"/apps/"${i}".png ]]; then
-					mv "${sizes}"/apps/"${i}".png "${sizes}"/apps/openofficeorg3-"${i}".png || die "mv failed"
-				fi
-			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}" || die "mkdir failed"
-				mkdir -p "${D}"/usr/share/icons/gnome/"${size}/apps"|| die "mkdir failed"
-			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"
-
-	# Component symlinks
-	for i in ${basecomponents}; do
-		dosym "${instdir}"/program/s"${i}" /usr/bin/oo"${i}"
-	done
-
-	use cups && dosym "${instdir}"/program/spadmin /usr/bin/ooprinteradmin
-	dosym "${instdir}"/program/soffice /usr/bin/soffice
-	dosym "${instdir}"/"${BASIS}"/program/setofficelang /usr/bin/setofficelang
-	dosym "${instdir}"/program/unopkg  /usr/bin/unopkg
-
-	# dict extensions
-	rm -f "${D}"${instdir}/share/extension/install/dict-*.oxt || die "rm dict-*.oxt failed"
-	insinto ${instdir}/share/extension/install
-	for i in ${DICTS_OOO}; do
-		doins "${WORKSRC}"/dictionaries/unxlng"${arch_var}"6.pro/bin/dict-"${i}".oxt
-	done
-
-	# manual 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
-
-	# manual install Presenter Screen (Console) extension
-	cp -f "${WORKSRC}"/sdext/unxlng"${arch_var}"6.pro/bin/presenter-screen.oxt "${D}"${instdir}/share/extension/install/ \
-	|| die "cp of presenter-screen failed"
-
-	if use java; then
-		# manual install Wiki Publisher, Report Builder extensions
-		cp -f "${WORKSRC}"/swext/unxlng"${arch_var}"6.pro/bin/wiki-publisher.oxt "${D}"${instdir}/share/extension/install/ \
-		|| die "cp of wiki-publisher failed"
-		cp -f "${WORKSRC}"/reportbuilder/unxlng"${arch_var}"6.pro/bin/sun-report-builder.oxt "${D}"${instdir}/share/extension/install/ \
-		|| die "cp of sun-report-builder  failed"
-		# record java libraries
-		java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/"${BASIS}"/program/classes/*.jar
-		java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
-		# install java-set-classpath
-		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
-	else
-		# Non-java weirdness see bug #99366
-		rm -f "${D}"${instdir}/ure/bin/javaldx || die "rm javaldx failed"
-	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 " $ ooffice"
-	elog
-	elog " Also, for individual components, you can use any of:"
-	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
-}
author	Michał Górny <mgorny@gentoo.org>	2010-08-05 20:44:52 +0000
committer	Michał Górny <mgorny@gentoo.org>	2010-08-05 20:44:52 +0000
commit	955393b42c3521727eba51b4f764a9eff7db7a24 (patch)
tree	21727e33a5220dbc538eb6238514e2c1af3a8f96 /app-office
parent	dev-perl/Net-Subnets, net-misc/blocksshd: Remove masked package and its bug-l... (diff)
download	sunrise-955393b42c3521727eba51b4f764a9eff7db7a24.tar.gz sunrise-955393b42c3521727eba51b4f764a9eff7db7a24.tar.bz2 sunrise-955393b42c3521727eba51b4f764a9eff7db7a24.zip