Update pyuno patch wrt bug#435222.

Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64

4 files changed, 67 insertions, 18 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index cc572a2c660f..518ccf7374ba 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.370 2012/09/20 07:36:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.371 2012/09/20 08:19:36 scarabeus Exp $
+
+  20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.7-system-pyuno.patch, libreoffice-9999-r2.ebuild:
+  Update pyuno patch wrt bug#435222.
 
   20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild,
   metadata.xml:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2744fec9e93e..36b44d691d37 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ AUX libreoffice-3.5-hebrew-icu49.patch 5661 SHA256 169ec723b1453b932deefafada3e4
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724 SHA512 3fdeaaffc82e2b43ba162b45866c0bb795b23b6be671f4bdc71459d9ab169fd62487d9339c7d6e8dc4721d567027c049b861ddf56cb097594641b0bf357c7c42 WHIRLPOOL c55ff6ff62b63ccfc4fec7f21ac01bafa21d2228897cda2d3033738a31fd99159a717d463228ba3843f9a45edba87a5a07be9d3d83a0b00f3a763598affe56bd
 AUX libreoffice-3.5.4-libexttextcat.patch 910 SHA256 5e2acf868f511d8937d6551b6fe52e73e808082cc5bf327815a95c8fe4c9a6d2 SHA512 eb3ac4eff756812d3b2a149f30a98501abc625b2177bfed73bb35ab37bfbf09fd3c214aa58fa29b0a4bdc38788dfdb625aa48ba9dc5d05b971bfe4f06a1bc129 WHIRLPOOL 7f1a771765296cce6c38eaec6c2abf50913355cf1d2909fbd51636045c8ac38bdd05dd2cf54edfffeab5c904c2de1de5be57b1347961c55fee937c90afd0758f
 AUX libreoffice-3.6-system-pyuno.patch 1628 SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b SHA512 e7eb2c26932dd3fdff22c0c72a28542a42c26fc04a0fcc2a813e7b4d7fe642f211a395d41042cfc735670127a81104fcc2a4b845a59235a4d7924db2659916b0 WHIRLPOOL 09863ef7c67e8ed5d3edfd758fcdebd3ad785d3f82de47b9f1cc60d41cc18a56973515088abe9a4584311b551073b0db8bdd7e74fb72a81576a5a0d71c900998
+AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0
 AUX libreoffice-system-pyuno.patch 1634 SHA256 8a45fe2d6eb9b9a529c9f237b7219b221296d270caa7d42d4ea1a47c5e30841f SHA512 30d6ea3e648ce21e2e9cabf8b1ffc05e7a97ac691fadc56d02f9fa32df914628735fce2101abc1e30b5a31967f3ce124a85ecb481041b9f61713acd9d9489220 WHIRLPOOL c2f10535ed97b9eb5fa9f271ff4c9ad8b552595f58234899d2b5091daacc4444532bdee1d2ec2bd24f0ce601f0e5b5ce408fcbe169e21184f263c7bac86bfa69
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
@@ -27,23 +28,23 @@ DIST libreoffice-help-3.6.1.2.tar.xz 1863760 SHA256 41672c3548f95ff8ad3b491b0ff7
 EBUILD libreoffice-3.5.6.2.ebuild 15672 SHA256 50964a32b3ccda096c43a01cf804b69f83807eef4ad3a791469250c25a40da6b SHA512 8ba424c19b59149b3f0b5635e99256a66d80dc6269eb14da1065ec126ef98a77c425c0d5424955cbb6ca1779d05f4be5a662838e65367e5a8c9dbbf4b90fe949 WHIRLPOOL 46172d9c9efa07f7254c9f5055da2e7f1c43c13574c5f706ea1610f89ff667091e0be40066ec0504f01135c1ab55d2635cf2618386e617de92a0bb9263f3c53d
 EBUILD libreoffice-3.6.1.2.ebuild 17507 SHA256 25037e3b15e33b42de6f4894151cc05ab9de8c4071ad05ac73c8a1e4539f31a4 SHA512 6aa1aab7d13a3475148115d9be2685abec8eed5ca98ea90d130d5ca3bde7013813190cb3e0c1938602c4417c55fd62515920f97d077ec894862122cb30fcdd44 WHIRLPOOL 37c85b6e3faefb31b03d6b32c777bce82d83084d46e3bc99362f1c4c5d20b4df1f24b486028db4bc2a8d5ececc810e6e287d8c6bb9440fe1afc01ca52a8522ed
 EBUILD libreoffice-3.6.9999.ebuild 17508 SHA256 d3736a5e414ee037beba6ddb0f997acda0f95292869893242669e16d08caed95 SHA512 a9b0db3428e7c10a36ca3de297704436298c479a7497770cb5dc719acc040e4d56e22475f2c804c173413e76e7df40bc67f5c8a5728e25f13af90fb387d351fc WHIRLPOOL 33c91560af89b634d666981b430b38e9789642ad13620f324cb7ea57f3111682c8b73f711469c0d36fd07ea1c6b6d835e5fdeedb6d8caf4ebd05a62d7073b78d
-EBUILD libreoffice-9999-r2.ebuild 17695 SHA256 e85253732dadfe01ca5a54e046afeee50927dbedaade8fed0991b730993423d1 SHA512 aad307f9eb3ac7b0287376477398d252be9af025d5f63f4f5495c94c51bb5583a4a482531893a6eeff5c3a8132725bd7ffece77deebec9a47df67ad2de4c352e WHIRLPOOL a729a3369cb6340c9a93535ae96e9750a4018c7036a47e746840490b2d809d07826f984bbf808b59ebe4996e89b36b4d5ac8ef90329b88c575a0783eac2f5536
-MISC ChangeLog 68014 SHA256 3755d4a332265d038f044d5ddb1b12d6969d5e22884125b22911131fe1dc1566 SHA512 556d76bf0cbb1e7d56a2948eac8a9e4f76c8a8b59770538e1621ec99a2ec0c007d6084f0146376e26744dc572ab259626cc09b86d9afd2ad12356e545203fd95 WHIRLPOOL cd8a21fb57a942b6e3d46aeb2b12a0301cac9f578aeb0ebc3314acbcd22cbedcd4a2ea3f61ebbbfb2acce8e00b25aa173a169a605994c933f348b3551dda35a4
+EBUILD libreoffice-9999-r2.ebuild 17695 SHA256 fc0890d5f9148565d4f33372fcbbaf2d3b2fd1e3bcaf488bd5878a3c021634e9 SHA512 a4507d6f1a0d4fc837c45cdc5c512a9d97bf77bf45379e62e13031d5933cf92f0efe46ddfb91b5338bca4da107d551df2d2b2fd6526498c81dfd564c352cca45 WHIRLPOOL 6548bc29a419e137663ef34a937a5eec21224e6f6afe94dfc9e602991735b8c3699c33988c41680fa83ee0a49fb338775a0c678f8c9b32c04c1921d9f9928289
+MISC ChangeLog 68180 SHA256 eb1eac221c7e97f1f2c931270a503851142e097b8019c7eef47bf26cd0930f2f SHA512 f0b5a1d64a5aac39f7a4f27e7128466b8c46de323311901f3e475c1ffd71fefe24bad926c62e374fd4a1275920621d9eaed7824026c6834f3a7f5db3257f689a WHIRLPOOL 5cf9f0ac20043eda68805c09454aa3e408f2b692a7e033c133c3f2f8b8e51d234fc933a1b449ece69416a3c8c5155620f37fd37b6f807d087327db1138e51fe1
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQWsfoAAoJEOSiRoyO7jvojS0P/RiJ9oZDIQpY/Ym7iWmybPTu
-yqshrGR76aCYeKd5kDY57hL+BrUtRodbEbTiE2QzuZ8QMKmlH9AvDq3jPWe9qOZp
-u7e6Vn+uw4SQrWRxqYPdIgrVuhiuOk49HHnLttHdeOBAq/6aws4PgMWOIbwasPVj
-pHmMyXtHHJUKJsGG/eehtcU+68TEPvnwQmdadb9MoJxl//vdlq07i7j00iWtVAui
-2geQvDpzVeZVcuBR6R8+5axVwAXgQW74p3TlKtkecAPLXovtSi+7RmfaIlEwo19G
-6/B67+9BclI0ggaXhsU6s4q9WUe/bsijMT5MjXuhlNO2ZYnEhsMN1La+WZK+Iu2h
-Fv9TpToIZcv5zZwjdpVQIBFlbU0RXWGZQ5dGWoI/FxW1zOF3O7zb8LStecCLdtQu
-RVcSY6kVGRWGBpixyCF5YJkQ5vehytrTh54XiG8CErCN/KhmImY8Uj/BSy0nV57u
-U32yBHOo9dypB6MDdaaV9rd5s/3qdyeSGYE+3gWEWm3oX+MC0vGpfqQom449fl3d
-6vmro6Z/y9P5YNkCv2RqPyGKjYB0p10Wy0z8e3V9nPGEC+vsWx/N2h/SXBdkTtjy
-OyqaKTWC1x+LDlg9DbCVmdbCDTPO+Gpkrxouoq4pyz6P6MiAjmhpV3M8HsJLXLUO
-fuU/lZ2TLmyobwrw5rpY
-=VV3M
+iQIcBAEBCAAGBQJQWtGpAAoJEOSiRoyO7jvorwUP/i6EK6qjbFijbi9h7vHu4DgD
+isFlP3jAp31DrNF0GuPZYD75MZSFPX1AzAl91Yfv2NG8hA/eOBkRiy4uoPHeiDHf
+k4acFSvY+dd4DO4WOzAVt9ZiCa3OB4RmFPi2X0sNA1/zn7BHfgji2mmng8//hUkr
+RB0XpB3FKvcWKeV1AGcG5s0HOXRu8bqOOt+gQf7+pQLCIkCRW+LFGVw+wpYapLQF
+0SDKM6AJAL65y2hu+9goe6gcOBNGz6GNLy/SSiJu71a1XsVQy+iLcD+sJqxxmjN7
+AsWAPbxeUZzMp4PEfr43BvlnV9zVRExsncGgGxcGeGaEBA/hDvCkmYPC0t1smB7o
+wKxbof63H3BlUHrs0+YzNiB50A3Vzir70VIB+nS0QEwOpJsHnN76PCXdRejw1bWG
+58RjFBJkQWvXp6BHKhjQvCN95xmj/XPBqoWEgIdWx447KiQ1gD025+m5UWwYiRJ9
+LjDGgCBvnrigc1QxWzTEAup8mylgegkmXQV9M2bfRXR43kqh/uGt63ToNIZIDyXM
+RvToyLhNgwTL0Bp0gP4SX1Yfmqwrkin7XWh8F+uP+15euiCeWbZY8KlF2KVVk7Zw
+Dpz5kwkSgOaBYiAM9EOBMsFqvN/tUWrOnltfFWWf5y5PpkPfNTzkoaiBm0ZY1XBF
+ihwQNgNzvcVfnSEf3nSE
+=Bp2+
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch
new file mode 100644
index 000000000000..fe93728c289c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|FreeBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -16,8 +16,12 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import sys
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
+index 99d3b03..704edab 100755
+--- a/scripting/source/pyprov/officehelper.py
++++ b/scripting/source/pyprov/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 67f55332eafa..f9484ea9a5a7 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.110 2012/09/20 07:36:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.111 2012/09/20 08:19:36 scarabeus Exp $
 
 EAPI=4
 
@@ -224,7 +224,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
 )
 
 REQUIRED_USE="