app-office/openoffice-infra: Some code cleanup for 3.0.1/3.1.0

svn path=/sunrise/; revision=8717
author: Yar Odin (yarodin) <yarodin@gmail.com> 2009-06-29 12:48:48 +0000
committer: Yar Odin (yarodin) <yarodin@gmail.com> 2009-06-29 12:48:48 +0000
commit: 87da965c2ae91d4b1dd05186ea18abc1462beba2 (patch)
tree: d2f2caaad7c2b7930d6ab17f03fa8349283ae9e1 /app-office
parent: media-libs/bellagio: Eapi2fy it, remove leading whitespaces (diff)
download: sunrise-reviewed-87da965c2ae91d4b1dd05186ea18abc1462beba2.tar.gz
sunrise-reviewed-87da965c2ae91d4b1dd05186ea18abc1462beba2.tar.bz2
sunrise-reviewed-87da965c2ae91d4b1dd05186ea18abc1462beba2.zip
7 files changed, 284 insertions, 293 deletions
diff --git a/app-office/openoffice-infra/ChangeLog b/app-office/openoffice-infra/ChangeLog
index 6824a445e..bd88731c7 100644
--- a/app-office/openoffice-infra/ChangeLog
+++ b/app-office/openoffice-infra/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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,
diff --git a/app-office/openoffice-infra/Manifest b/app-office/openoffice-infra/Manifest
index c1764b338..b4db18226 100644
--- a/app-office/openoffice-infra/Manifest
+++ b/app-office/openoffice-infra/Manifest
@@ -6,10 +6,11 @@ AUX 3.0.1/gentoo-infragentoo.diff 3543 RMD160 d0dc7a4a09ab92bb946c97b3ad6c860ed3
 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.0.1/vba-basic-parallel-build.diff 952 RMD160 756a91b0fcc5f7e71c851b2a4b9188e94308af34 SHA1 cf07d2080927ac5dfcc2b33f65503d73fd650568 SHA256 11032ef1759d1f4cd47a969671aaabe24a29926019f0fd4ad50c3b132da55e80
 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 3560 RMD160 f152cbebbf5fec19a9a094dba2db36bd86b00193 SHA1 ef6b933a4a5e4a0d5628399522e3e1df7c625808 SHA256 9b86b8c06296759d11e0a3b18f0705af812a8db3f49293458ea30f9c1006a266
+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
@@ -17,7 +18,7 @@ AUX gentoo-dont_strip_libs.diff 955 RMD160 3815892d75a70966533372ab72da732000379
 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 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.0.1_src_binfilter.tar.bz2 6595398 RMD160 c6859a376c55cd453be214dbfa2d56f1b845a32b SHA1 d84518159538ef736271177b7ebe4697fc4b811d SHA256 3c8920d97777d7e2c579c8ade5ef13c9184278aa6b6185b7f15e70a61ea0077b
@@ -33,7 +34,7 @@ DIST OOo_3.1.0_src_system.tar.bz2 53314585 RMD160 9ffd6694d4cdd7d3f4f8fd6aaf1ffa
 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.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
+EBUILD openoffice-infra-3.0.1.ebuild 24299 RMD160 bf7774685a59c3808f0229edecf500d4c7eb58fc SHA1 1154b399c3559351288bd4c587f331be527334a7 SHA256 4ca4dd52198d116273b237d6fc9381fd39644e0809db822bf259ebe29edf2b1d
+EBUILD openoffice-infra-3.1.0.ebuild 23999 RMD160 d8815225798721a110644c08d8ae82480ccfaf52 SHA1 6de1ede4b0fc96e1a7f956dbc4afe66dab6867f0 SHA256 60a5d9a28d8794325212574d0463b0472ca87962790b2d800469e639919facb2
+MISC ChangeLog 7442 RMD160 8c2dc42c412a678587fe2edb69a6e5f91099200d SHA1 9b4bf69435f877cb0bd87b192f31f696a4d28b15 SHA256 f844cec0318660bb66716b6db57985e0641533130a8dbb3ef51bb5d7c6d6197f
 MISC metadata.xml 792 RMD160 49e85491fc9d94fe35bc920ce42fd8d50b9d3c83 SHA1 8dc753d1070e92d715be182de51d9168d13368c6 SHA256 a41c190a51e34cfa042f6aa1914dd646fa6ab47ad25a1bab4d011c33a5d4f154
diff --git a/app-office/openoffice-infra/files/3.0.1/vba-basic-parallel-build.diff b/app-office/openoffice-infra/files/3.0.1/vba-basic-parallel-build.diff
new file mode 100644
index 000000000..ddc4a6dc3
--- /dev/null
+++ b/app-office/openoffice-infra/files/3.0.1/vba-basic-parallel-build.diff
@@ -0,0 +1,35 @@
+--- basic/source/classes/makefile.mk	2009-04-03 09:19:00.000000000 +0200
++++ basic/source/classes/makefile.mk	2009-04-03 09:14:42.000000000 +0200
+@@ -41,17 +41,20 @@ ENABLE_EXCEPTIONS=TRUE
+ 
+ .INCLUDE :  settings.mk
+ 
+-ALLTAR : \
++ALLTAR .SEQUENTIAL : \
+         $(MISC)$/$(TARGET).don \
+-        $(SLOTARGET)
++        $(MISC)$/$(TARGET).slo
+ 
+ $(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+         +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@
+ 
++$(MISC)$/$(TARGET).slo : $(SLOTARGET)
++        echo $@
++
+ # --- Allgemein -----------------------------------------------------------
+ 
+-COMMON_SLOFILES=	\
++SLOFILES=	\
+ 	$(SLO)$/sb.obj       \
+ 	$(SLO)$/sbxmod.obj	\
+ 	$(SLO)$/image.obj	\
+@@ -60,8 +63,6 @@ COMMON_SLOFILES=	\
+ 	$(SLO)$/propacc.obj	\
+ 	$(SLO)$/disas.obj \
+ 	$(SLO)$/errobject.obj \
+-
+-SLOFILES=	$(COMMON_SLOFILES)	\
+ 	$(SLO)$/eventatt.obj
+ 
+ OBJFILES=	\
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
index a76d65e6f..8c7f38290 100644
--- 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
@@ -1,5 +1,5 @@
---- patches/dev300/apply.orig	2009-06-13 20:41:03.000000000 +0600
-+++ patches/dev300/apply	2009-06-13 20:41:21.000000000 +0600
+--- 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
@@ -22,19 +22,16 @@
  
  # attributes present in the vba streams can override the default shape name
  # used for the control in the binary format
-@@ -1751,9 +1757,8 @@
- vba-import-globaltemplate-customizations.diff
- # fix problem with syntax like 'If LCase(str1) = str2 <> 0 Then'
- vba-basic-if-compare-fix.diff, i#100600, n#488588, Fong
--# fix parallel build problems in basic
--# (probably obsoletes vba-parallel-build.diff)
--vba-basic-parallel-build.diff
-+# fix parallel build problems
-+vba-parallel-build.diff
- # fix parallel build problems in oovbaapi
- vba-oovbaapi-parallel-build.diff
- 
-@@ -2970,7 +2975,7 @@
+@@ -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
@@ -43,7 +40,7 @@
  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 +3070,22 @@
+@@ -3065,15 +3073,22 @@
  sc-toogle-grid-menubar.diff
  infra-palette.diff
  
@@ -69,7 +66,7 @@
  extras-add-educate-officorr-misc-offimisc.diff
  reportbuilder-no-license-infra.diff
  wikipublisher-no-license-infra.diff
-@@ -3081,7 +3093,6 @@
+@@ -3081,7 +3096,6 @@
  scp2_extensions-remove-SUN.diff
  extensions-dont-install-by-default.diff
  extensions-separate-java-based.diff
@@ -77,7 +74,7 @@
  officecfg-create-backups.diff
  
  [InfraLinuxOnly]
-@@ -3090,8 +3101,10 @@
+@@ -3090,8 +3104,10 @@
  sfx2-remove-check-update-on-fileload.diff, kohei
  default-system-fpicker.diff, michael
  
diff --git a/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff b/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
index 0550346f7..1f49fa0a9 100644
--- a/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
+++ b/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff
@@ -1,18 +1,38 @@
---- patches/vba/vba-parallel-build.diff.orig	2009-05-23 14:37:45.000000000 +0600
-+++ patches/vba/vba-parallel-build.diff	2009-05-31 15:26:39.000000000 +0600
-@@ -21,59 +21,36 @@
- +
- +$(OBJFILES) : $(MISC)$/$(TARGET).don
- +
+--- 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=..$/..$/..
-+--- 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 @@
-  
+- 
 --PRJNAME=
 -+PRJNAME=sc
 - TARGET=vbaobj
@@ -45,12 +65,12 @@
 -+$(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)
  +
--+$(OBJFILES) : $(MISC)$/$(TARGET).don
--+
 ---- 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 : \
diff --git a/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
index 7ca29a9d0..c12dd07b2 100644
--- a/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-3.0.1.ebuild
@@ -124,7 +124,6 @@ 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 "
@@ -157,11 +156,15 @@ pkg_setup() {
 
 	# dicts
 	if use infradicts; then
-		export DICTS_OOO="en-US ru uk"
+		export DICTS_OOO="en ru uk"
 	else
 		for i in ${LINGUAS_OOO}; do
 			if [[ "${i}" != "tr" ]]; then
-			    DICTS_OOO="${DICTS_OOO} ${i}"
+				if [[ "${i}" == "en-US" ]]; then
+					DICTS_OOO="${DICTS_OOO} en"
+				else
+					DICTS_OOO="${DICTS_OOO} ${i}"
+				fi
 			fi
 		done
 		export DICTS_OOO
@@ -209,24 +212,20 @@ 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/
+		cp -f "${DISTDIR}"/unowinreg.dll "${WORKSRC}"/external/unowinreg/ || die "cp of unowinreg.dll failed"
 	fi
 
 	# Some fixes for our patchset
@@ -238,16 +237,18 @@ src_prepare() {
 	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
+	cp -f "${FILESDIR}/${PV}/nojavanostax.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
+	cp -f "${FILESDIR}/${PV}/hunspell-one-dir-nocrash.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
+	cp -f "${FILESDIR}/${PV}/buildfix-mono-2-2.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
+	cp -f "${FILESDIR}/${PV}/vba-basic-parallel-build.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
+	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"
+	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"
+			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
@@ -258,52 +259,49 @@ src_prepare() {
 			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}"
+			"${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,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/
+	mkdir -p "${WORKSRC}"/{libwps,libwpg,libwpd,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/libwpd*.tar.gz   "${WORKSRC}"/libwpd/download/ || die "cp of libwpd 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 distros
-	local distro
+	local distrodicts
 	if use postgres; then
-		distros="InfraGentooPG"
+		patchconf="${patchconf} --distro=InfraGentooPG"
 	else
-		distros="InfraGentoo"
+		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-US" ]]; then
-		    distros="${distros} InfraDict${i}"
+		if [[ "${i}" != "en" ]]; then
+			distrodicts="${distrodicts} --distro=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
+	[[ -n "${distrodicts}" ]] && patchconf="${patchconf} ${distrodicts}"
 
-	"${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}"
+	"${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 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"
@@ -313,10 +311,6 @@ src_prepare() {
 	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
@@ -325,11 +319,9 @@ src_prepare() {
 	cd "${WORKSRC}/config_office"
 
 	eautoreconf
-
 }
 
 src_configure() {
-
 	# Use flag checks
 	if use java; then
 		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-ant-home=${ANT_HOME}"
@@ -349,19 +341,12 @@ src_configure() {
 		CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-system-mozilla"
 	fi
 
+	# Handle new dicts system
 	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}"
+	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}"
@@ -480,48 +465,50 @@ src_configure() {
 		--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"
+		gentoo_env_set="${WORKSRC}/LinuxX86-64Env.Set.sh"
 	else
-	    gentoo_env_set="${WORKSRC}/LinuxX86Env.Set.sh"
+		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 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
-		[ -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
+		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"
+		cd instsetoo_native ;  build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} || die "Build failed"
 	else
-	    dmake || die "Build failed"
+		dmake || die "Build failed"
 	fi
-
 }
 
 src_install() {
-
 	einfo "Preparing Installation ..."
 
 	local instdir="/usr/$(get_libdir)/openoffice"
@@ -531,11 +518,11 @@ src_install() {
 	local gentoo_env_set_dst
 
 	if [[ "${ARCH}" == "amd64" ]]; then
-	    arch_var="x"
-	    gentoo_env_set_dst="linux-2.6-x86_64"
+		arch_var="x"
+		gentoo_env_set_dst="linux-2.6-x86_64"
 	else
-	    arch_var="i"
-	    gentoo_env_set_dst="linux-2.6-intel"
+		arch_var="i"
+		gentoo_env_set_dst="linux-2.6-intel"
 	fi
 
 	allcomponents="${basecomponents}"
@@ -545,49 +532,23 @@ src_install() {
 	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}
+		"${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}
+			"${D}"${instdir} || "cp of langpacks failed"
 	    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"
+			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"
+			sed -i -e s/openoffice.org3/ooffice/g "${i}".desktop || die "Sed failed"
 		fi
 		domenu "${i}".desktop
 	done
@@ -597,11 +558,13 @@ src_install() {
 	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
+		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
 	done
 
 	# Gnome icons
@@ -609,17 +572,17 @@ src_install() {
 	    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"
+			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
+			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
+		dosym /usr/share/icons/hicolor/48x48/apps/openofficeorg3-"${i}".png /usr/share/pixmaps/openofficeorg3-"${i}".png
 	done
 
 	# Mime types
@@ -630,48 +593,55 @@ src_install() {
 	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}"
+		dosym "${instdir}"/program/s"${i}" /usr/bin/oo"${i}"
 	done
 
-	if use cups; then
-		dosym "${instdir}"/program/spadmin /usr/bin/ooprinteradmin
-	fi
+	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
 
-	# Fix the permissions for security reasons
-#	chown -R root:0 "${D}"
+	# 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
+
+	# 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
 
-	# Non-java weirdness see bug #99366
-	use !java && rm -f "${D}"${instdir}/ure/bin/javaldx
+	# 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"
 
 	# record java libraries
 	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
-	fi
-
-	# install java-set-classpath
-	if use java; then
+		# 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
+		use !java && rm -f "${D}"${instdir}/ure/bin/javaldx
 	fi
-
 }
 
 pkg_postinst() {
-
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 
@@ -715,5 +685,4 @@ pkg_postinst() {
 		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 f133fbd9e..87681e5d7 100644
--- a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
+++ b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild
@@ -125,7 +125,6 @@ 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 "
@@ -158,11 +157,15 @@ pkg_setup() {
 
 	# dicts
 	if use infradicts; then
-		export DICTS_OOO="en-US ru uk"
+		export DICTS_OOO="en ru uk"
 	else
 		for i in ${LINGUAS_OOO}; do
 			if [[ "${i}" != "tr" ]]; then
-			    DICTS_OOO="${DICTS_OOO} ${i}"
+				if [[ "${i}" == "en-US" ]]; then
+					DICTS_OOO="${DICTS_OOO} en"
+				else
+					DICTS_OOO="${DICTS_OOO} ${i}"
+				fi
 			fi
 		done
 		export DICTS_OOO
@@ -210,24 +213,20 @@ 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/
+		cp -f "${DISTDIR}"/unowinreg.dll "${WORKSRC}"/external/unowinreg/ || die "cp of unowinreg.dll failed"
 	fi
 
 	# Some fixes for our patchset
@@ -240,14 +239,15 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}/gentoo-infra-gentoo.diff"
 
 	# Patches from go-oo mainstream
-	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
+	cp -f "${FILESDIR}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
+	cp -f "${FILESDIR}/${PV}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die "cp of hotfix patch failed"
 
-	cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2"
+	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"
+			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
@@ -258,50 +258,47 @@ src_prepare() {
 			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}"
+			"${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/
-	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/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/
+	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 distros
-	local distro
+	local distrodicts
 	if use postgres; then
-		distros="InfraGentooPG"
+		patchconf="${patchconf} --distro=InfraGentooPG"
 	else
-		distros="InfraGentoo"
+		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-US" ]]; then
-		    distros="${distros} InfraDict${i}"
+		if [[ "${i}" != "en" ]]; then
+			distrodicts="${distrodicts} --distro=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}"
+	[[ -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"
@@ -309,10 +306,6 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo-mkdepend.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
@@ -321,11 +314,9 @@ src_prepare() {
 	cd "${WORKSRC}"
 
 	eautoreconf
-
 }
 
 src_configure() {
-
 	# Use flag checks
 	if use java; then
 		CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-ant-home=${ANT_HOME}"
@@ -348,18 +339,10 @@ src_configure() {
 
 	# Handle new dicts system
 	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}"
+	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}"
@@ -479,11 +462,9 @@ src_configure() {
 		--with-vendor="Infra-Resource" \
 		${CONFIGURE_ARGS} \
 		|| die "Configuration failed!"
-
 }
 
 src_compile() {
-
 	cd "${WORKSRC}"
 
 	local gentoo_env_set
@@ -495,19 +476,25 @@ src_compile() {
 
 	source "${gentoo_env_set}"
 
-	./bootstrap
+	./bootstrap || die "bootstrap failed"
 
-	cd transex3; build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} && deliver.pl
+	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
-			[ -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
+			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
-			[ -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
+			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
 
@@ -516,11 +503,9 @@ src_compile() {
 	else
 		dmake || die "Build failed"
 	fi
-
 }
 
 src_install() {
-
 	export PYTHONPATH=""
 
 	einfo "Preparing Installation ..."
@@ -546,44 +531,17 @@ src_install() {
 	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}
+		"${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}
+				"${D}"${instdir} || "cp of langpacks failed"
 		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"
@@ -600,7 +558,9 @@ src_install() {
 	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
+				if [[ -f "${sizes}"/apps/"${i}".png ]]; then
+					mv "${sizes}"/apps/"${i}".png "${sizes}"/apps/openofficeorg3-"${i}".png || die "mv failed"
+				fi
 			done
 		done
 	done
@@ -610,8 +570,8 @@ src_install() {
 		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"
+				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
@@ -631,48 +591,54 @@ src_install() {
 	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
+	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
 
-	# Fix the permissions for security reasons
-#	chown -R root:0 "${D}"
+	# 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
 
-	# Non-java weirdness see bug #99366
-	use !java && rm -f "${D}"${instdir}/ure/bin/javaldx
+	# 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"
 
-	# record java libraries
 	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
-	fi
-
-	# install java-set-classpath
-	if use java; then
+		# 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
 
@@ -682,11 +648,9 @@ pkg_postinst() {
 	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
@@ -716,5 +680,4 @@ pkg_postinst() {
 		elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
 	fi
 	elog
-
 }
author	Yar Odin (yarodin) <yarodin@gmail.com>	2009-06-29 12:48:48 +0000
committer	Yar Odin (yarodin) <yarodin@gmail.com>	2009-06-29 12:48:48 +0000
commit	87da965c2ae91d4b1dd05186ea18abc1462beba2 (patch)
tree	d2f2caaad7c2b7930d6ab17f03fa8349283ae9e1 /app-office
parent	media-libs/bellagio: Eapi2fy it, remove leading whitespaces (diff)
download	sunrise-reviewed-87da965c2ae91d4b1dd05186ea18abc1462beba2.tar.gz sunrise-reviewed-87da965c2ae91d4b1dd05186ea18abc1462beba2.tar.bz2 sunrise-reviewed-87da965c2ae91d4b1dd05186ea18abc1462beba2.zip