diff options
Diffstat (limited to 'app-office/openoffice-bin')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice-bin/Manifest | 24 | ||||
| -rw-r--r-- | app-office/openoffice-bin/files/wrapper.in | 2 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild | 5 |
4 files changed, 21 insertions, 16 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index aeee918445af..855eabc6986c 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.173 2007/09/17 11:57:59 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.174 2007/09/18 05:53:50 suka Exp $ + + 18 Sep 2007; Andreas Proschofsky <suka@gentoo.org> files/wrapper.in, + openoffice-bin-2.3.0.ebuild: + Fix wrapper on AMD64 see bug #192833 *openoffice-bin-2.3.0 (17 Sep 2007) diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index 7c07b8e8ddd7..91c6597e98d7 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -10,10 +10,10 @@ AUX 50-openoffice-bin 61 RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 SHA1 01 MD5 bfd1ef5874ad7c444562c1d2e58ee808 files/50-openoffice-bin 61 RMD160 34c2a28029d6ee8eda6ac1f287a01743a28a33d1 files/50-openoffice-bin 61 SHA256 53baaa63383d1b34e537857e77daf22d821562db00589058a4230d2b7e47ebde files/50-openoffice-bin 61 -AUX wrapper.in 93 RMD160 237615c8f28dc29a848fb838e615ca1a2776470f SHA1 63759df1f85d51c3c9802e34c57751a27adb464d SHA256 d4ffff650292db006d9196733279d85c8d12ffb650b366c9be5a84a658b5e1fb -MD5 6f2b1e1aace1c9366d7c77812e92b6b0 files/wrapper.in 93 -RMD160 237615c8f28dc29a848fb838e615ca1a2776470f files/wrapper.in 93 -SHA256 d4ffff650292db006d9196733279d85c8d12ffb650b366c9be5a84a658b5e1fb files/wrapper.in 93 +AUX wrapper.in 96 RMD160 34ca656bc8af3c5b44ed16cebedf5d3297b09a2d SHA1 5861b8434da84efff56e5ceaf53a7668a5f52cea SHA256 97b603968d423e5d8e52c1c14c118647df0a7a858d6a1cb10524af9ea90a9dbc +MD5 8feb6eaa572c31b1ea7f2c737ae0d72f files/wrapper.in 96 +RMD160 34ca656bc8af3c5b44ed16cebedf5d3297b09a2d files/wrapper.in 96 +SHA256 97b603968d423e5d8e52c1c14c118647df0a7a858d6a1cb10524af9ea90a9dbc files/wrapper.in 96 DIST OOo_2.2.1_LinuxIntel_install_en-US.tar.gz 131624994 RMD160 3a9f8ea0c510a10f2026d68d1247fbf04d12a304 SHA1 43c7a042c4f6e8eadfb63caed75d69548dd994c6 SHA256 0907bbeb4033a59e63ee1aa1e177243025e9af34b0edbee8430342e004723784 DIST OOo_2.2.1rc3_20070529_LinuxIntel_langpack_af.tar.gz 13505647 RMD160 c5c330893dbf6c1face56d54598dc1afbcd6b6e1 SHA1 875b79e96bc091bb11456ce50e619dec4f9be463 SHA256 eae65f438b998835c04943b4d3e9c9deb63b11c9f5dad2eb4cb3b253ae20734d DIST OOo_2.2.1rc3_20070529_LinuxIntel_langpack_as-IN.tar.gz 13572531 RMD160 2b3c7cf776f555fa3ea2174675081f8f3e6ab75c SHA1 d38d142233ca0410cfc612726b81a8df27fd3291 SHA256 ce18e85fdd33785e869a4d4d0b15992b696b3e5ef0b2130119371b28e09ad542 @@ -161,14 +161,14 @@ EBUILD openoffice-bin-2.2.1.ebuild 5437 RMD160 eea707f49128cb98b27403052ed978412 MD5 2a769fd38c4881978852e4ac1d074807 openoffice-bin-2.2.1.ebuild 5437 RMD160 eea707f49128cb98b27403052ed9784127adce30 openoffice-bin-2.2.1.ebuild 5437 SHA256 1b61e6e346db4b421060395c3fff74d7fedc1f809bd9ef677f29c25c8a30c3b9 openoffice-bin-2.2.1.ebuild 5437 -EBUILD openoffice-bin-2.3.0.ebuild 5317 RMD160 6ae0bdec72e4cfc99403fbe4200d651b848d0760 SHA1 c98b2a4df51bd7b3d8f487cafee844f083f386af SHA256 6560fb29a13c81b5a65607f4f5d0cdd1ed0c4a6ce48bc6081480c4efa7b10289 -MD5 fe34fac50c2fc4f2a5c02881c60db29d openoffice-bin-2.3.0.ebuild 5317 -RMD160 6ae0bdec72e4cfc99403fbe4200d651b848d0760 openoffice-bin-2.3.0.ebuild 5317 -SHA256 6560fb29a13c81b5a65607f4f5d0cdd1ed0c4a6ce48bc6081480c4efa7b10289 openoffice-bin-2.3.0.ebuild 5317 -MISC ChangeLog 32227 RMD160 335650bdb6cc62c06decce3852d8ec5350090e81 SHA1 9b7171040a63bf80a255fd34b5f3648edce1c1e9 SHA256 6262ea7d4765d1a55c8df93f9e1c7a1533888a6646e5231dac8155a1bddbaace -MD5 e809349e5648e63edc1eb42c9e942e0c ChangeLog 32227 -RMD160 335650bdb6cc62c06decce3852d8ec5350090e81 ChangeLog 32227 -SHA256 6262ea7d4765d1a55c8df93f9e1c7a1533888a6646e5231dac8155a1bddbaace ChangeLog 32227 +EBUILD openoffice-bin-2.3.0.ebuild 5401 RMD160 83d09695a105201c80a4f221678ceed3b1ec8077 SHA1 961b20c74d2ae107a9eee5a0c29577d5cea6cefc SHA256 4bc1f3fb721eb5f8109638e34df3fd3264cb4ad575abd3fa989c18eec6ba3487 +MD5 d6d65bdc17011979ab9fab8600e407dd openoffice-bin-2.3.0.ebuild 5401 +RMD160 83d09695a105201c80a4f221678ceed3b1ec8077 openoffice-bin-2.3.0.ebuild 5401 +SHA256 4bc1f3fb721eb5f8109638e34df3fd3264cb4ad575abd3fa989c18eec6ba3487 openoffice-bin-2.3.0.ebuild 5401 +MISC ChangeLog 32369 RMD160 8ccbf3218a888cca2f3c775fbfa567b6ca756480 SHA1 983b2d490859fb1fd1a5f963697259a44d698527 SHA256 f85e22f189dffcfa76e639cac2e909e7db2cf78c52089f19187edb91b6f295dc +MD5 040d62cb6fccf8387f355ab04e8d9222 ChangeLog 32369 +RMD160 8ccbf3218a888cca2f3c775fbfa567b6ca756480 ChangeLog 32369 +SHA256 f85e22f189dffcfa76e639cac2e909e7db2cf78c52089f19187edb91b6f295dc ChangeLog 32369 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 metadata.xml 460 diff --git a/app-office/openoffice-bin/files/wrapper.in b/app-office/openoffice-bin/files/wrapper.in index b0dd900679f1..364b2af8d8c1 100644 --- a/app-office/openoffice-bin/files/wrapper.in +++ b/app-office/openoffice-bin/files/wrapper.in @@ -1,4 +1,4 @@ #!/bin/sh export OOO_EXTRA_ARG='' unset PYTHONPATH -/usr/lib/openoffice/program/soffice "$@" +/usr/LIBDIR/openoffice/program/soffice "$@" diff --git a/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild b/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild index 93aafdcdb05e..3264932a2084 100644 --- a/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild,v 1.1 2007/09/17 11:57:59 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.0.ebuild,v 1.2 2007/09/18 05:53:50 suka Exp $ inherit eutils fdo-mime rpm multilib @@ -110,6 +110,7 @@ src_install () { # Install wrapper script newbin ${FILESDIR}/wrapper.in ooffice + sed -i -e s/LIBDIR/$(get_libdir)/g ${D}/usr/bin/ooffice || die # Component symlinks for app in base calc draw impress math writer; do @@ -140,7 +141,7 @@ pkg_postinst() { eselect oodict update --libdir $(get_libdir) - [[ -x /sbin/chpax ]] && [[ -e /usr/lib/openoffice/program/soffice.bin ]] && chpax -zm /usr/lib/openoffice/program/soffice.bin + [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin elog " To start OpenOffice.org, run:" elog |