Try to fix installation issues on amd64

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

2 files changed, 28 insertions, 15 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index c71c736aba72..fb3981b4d5da 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.194 2008/09/11 12:52:46 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.195 2008/09/15 12:14:29 suka Exp $
+
+  15 Sep 2008; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.0.0_rc1.ebuild:
+  Try to fix installation issues on amd64
 
 *openoffice-bin-3.0.0_rc1 (11 Sep 2008)
 
diff --git a/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild b/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild
index 4b17f3bd7cc7..f7a9e05e9990 100644
--- a/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild,v 1.2 2008/09/11 16:50:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.0.0_rc1.ebuild,v 1.3 2008/09/15 12:14:29 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -10,9 +10,18 @@ BUILDID="9350"
 MY_PV="${PV/_/}"
 MY_PV2="${MY_PV}_20080904"
 MY_PV3="${PV/_rc1/}-${BUILDID}"
-PACKED="OOO300_m5_native_packed-3"
-PACKED2="OOO300_m5_native_packed-2"
 BASIS="ooobasis3.0"
+
+if [ "${ARCH}" = "amd64" ] ; then
+	OOARCH="x86_64"
+	PACKED="OOO300_m5_native_packed-2"
+	PACKED2="OOO300_m5_native_packed-2"
+else
+	OOARCH="i586"
+	PACKED="OOO300_m5_native_packed-3"
+	PACKED2="OOO300_m5_native_packed-2"
+fi
+
 S="${WORKDIR}/${PACKED}_en-US.${BUILDID}/RPMS"
 DESCRIPTION="OpenOffice productivity suite"
 
@@ -64,21 +73,21 @@ src_unpack() {
 	unpack ${A}
 
 	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts ooolinguistic pyuno testtool writer xsltfilter ; do
-		rpm_unpack "${S}/${BASIS}-${i}-${MY_PV3}.i586.rpm"
+		rpm_unpack "${S}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
 	done
 
 	for j in base calc draw impress math writer; do
-		rpm_unpack "${S}/openoffice.org3-${j}-${MY_PV3}.i586.rpm"
+		rpm_unpack "${S}/openoffice.org3-${j}-${MY_PV3}.${OOARCH}.rpm"
 	done
 
-	rpm_unpack "${S}/openoffice.org3-${MY_PV3}.i586.rpm"
-	rpm_unpack "${S}/openoffice.org-ure-1.4.0-${BUILDID}.i586.rpm"
+	rpm_unpack "${S}/openoffice.org3-${MY_PV3}.${OOARCH}.rpm"
+	rpm_unpack "${S}/openoffice.org-ure-1.4.0-${BUILDID}.${OOARCH}.rpm"
 
 	rpm_unpack "${S}/desktop-integration/openoffice.org3.0-freedesktop-menus-3.0-${BUILDID}.noarch.rpm"
 
-	use gnome && rpm_unpack "${S}/${BASIS}-gnome-integration-${MY_PV3}.i586.rpm"
-	use kde && rpm_unpack "${S}/${BASIS}-kde-integration-${MY_PV3}.i586.rpm"
-	use java && rpm_unpack "${S}/${BASIS}-javafilter-${MY_PV3}.i586.rpm"
+	use gnome && rpm_unpack "${S}/${BASIS}-gnome-integration-${MY_PV3}.${OOARCH}.rpm"
+	use kde && rpm_unpack "${S}/${BASIS}-kde-integration-${MY_PV3}.${OOARCH}.rpm"
+	use java && rpm_unpack "${S}/${BASIS}-javafilter-${MY_PV3}.${OOARCH}.rpm"
 
 	strip-linguas ${LANGS}
 
@@ -94,10 +103,10 @@ src_unpack() {
 		else
 			LANGDIR="${WORKDIR}/${PACKED2}_${i}.${BUILDID}/RPMS/"
 		fi
-		rpm_unpack ${LANGDIR}/${BASIS}-${i}-${MY_PV3}.i586.rpm
-		rpm_unpack ${LANGDIR}/openoffice.org3-${i}-${MY_PV3}.i586.rpm
+		rpm_unpack ${LANGDIR}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm
+		rpm_unpack ${LANGDIR}/openoffice.org3-${i}-${MY_PV3}.${OOARCH}.rpm
 		for j in base binfilter calc draw help impress math res writer; do
-			rpm_unpack ${LANGDIR}/${BASIS}-${i}-${j}-${MY_PV3}.i586.rpm
+			rpm_unpack ${LANGDIR}/${BASIS}-${i}-${j}-${MY_PV3}.${OOARCH}.rpm
 		done
 	done
 
@@ -106,7 +115,7 @@ src_unpack() {
 src_install () {
 
 	#Multilib install dir magic for AMD64
-	has_multilib_profile && ABI=x86
+	has_multilib_profile && ABI=${ARCH}
 	INSTDIR="/usr/$(get_libdir)/openoffice"
 
 	einfo "Installing OpenOffice.org into build root..."