From: Simon Stelling <blubb@gentoo.org>
Date: Sat, 8 Oct 2005 17:25:38 +0000 (+0000)
Subject: fix bug 107568
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad5ad53c5f30802de5727f7dad3bc6044bf19649;p=gentoo.git

fix bug 107568
Package-Manager: portage-2.0.51.22-r3
---

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 234ec3aa41d0..56652e65faf3 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.96 2005/09/27 19:43:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.97 2005/10/08 17:25:38 blubb Exp $
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  openoffice-bin-2.0.0_rc1.ebuild:
+  fix bug 107568
 
 *openoffice-bin-2.0.0_rc1 (27 Sep 2005)
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 1dde5bd2871d..6bf06640ac31 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,13 +1,13 @@
-MD5 8efb95641f1e2a31d2128f0d1361556d openoffice-bin-2.0.0_rc1.ebuild 6547
-MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718
+MD5 0cc33b8fad63b7cd33811f8cecdf8845 ChangeLog 17246
+MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 MD5 b986cfdd8585ed8adde6bcff8f427361 openoffice-bin-1.1.1.ebuild 5857
 MD5 d39203cfa3918278f573580eae65e184 openoffice-bin-1.1.4-r1.ebuild 5006
-MD5 38711fe363f196926af8c425066798d9 ChangeLog 17143
-MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
-MD5 753fd14ec632a7fe71ab9abef357f93f files/digest-openoffice-bin-1.1.4-r1 141
+MD5 56d86f2c4d757bb5c28f53df6f32732f openoffice-bin-2.0.0_rc1.ebuild 6641
+MD5 754b2a399f6c90c5a6f17d2efc30131d openoffice-bin-1.1.5.ebuild 4718
 MD5 2b70af485f57d1db6983b006f16a0587 files/digest-openoffice-bin-1.1.1 171
-MD5 5828bbd9e0139dae2ff43c23a65a844b files/digest-openoffice-bin-1.1.5 82
+MD5 753fd14ec632a7fe71ab9abef357f93f files/digest-openoffice-bin-1.1.4-r1 141
 MD5 e03d40bf3ce0e7ed62819425202e5849 files/digest-openoffice-bin-2.0.0_rc1 4647
+MD5 5828bbd9e0139dae2ff43c23a65a844b files/digest-openoffice-bin-1.1.5 82
 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
 MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
 MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
diff --git a/app-office/openoffice-bin/openoffice-bin-2.0.0_rc1.ebuild b/app-office/openoffice-bin/openoffice-bin-2.0.0_rc1.ebuild
index 3e07fe44d002..459ef8e78e24 100644
--- a/app-office/openoffice-bin/openoffice-bin-2.0.0_rc1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.0.0_rc1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2005 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.0.0_rc1.ebuild,v 1.1 2005/09/27 19:43:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.0_rc1.ebuild,v 1.2 2005/10/08 17:25:38 blubb Exp $
 
-inherit eutils fdo-mime rpm
+inherit eutils fdo-mime rpm multilib
+
+ABI=x86
 
 IUSE="gnome java kde"
 
-INSTDIR="/usr/lib/openoffice"
+INSTDIR="/usr/$(get_libdir)/openoffice"
 MY_PV="${PV/_}"
 MY_PV2="${MY_PV}_050923"
 MY_PV3="${PV/_rc1}"
@@ -144,6 +146,7 @@ src_install () {
 	# Install wrapper script
 	newbin ${FILESDIR}/${MY_PV3}/ooo-wrapper2 ooffice2
 	sed -i -e s/PV/${PV}/g ${D}/usr/bin/ooffice2 || die
+	sed -i -e "s:lib/:$(get_libdir)/:" ${D}/usr/bin/ooffice2 || die
 
 	# Component symlinks
 	for app in base calc draw fromtemplate impress math web writer; do