From 026ecc51ed07ef375c0f752163b00837d1d41581 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Tue, 22 Mar 2011 16:50:55 +0000 Subject: Fix offlinehelp install, bug #359799 (Portage version: 2.2.0_alpha28/cvs/Linux x86_64) --- app-office/libreoffice-bin/ChangeLog | 6 +++++- app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app-office') diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index 212648c6d9ae..4d1e7a4a7436 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.21 2011/03/20 13:05:37 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.22 2011/03/22 16:50:55 suka Exp $ + + 22 Mar 2011; Andreas Proschofsky + libreoffice-bin-3.3.1.ebuild: + Fix offlinehelp install, bug #359799 20 Mar 2011; Andreas Proschofsky libreoffice-bin-3.3.1.ebuild: diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild index d5f7587d42c8..53f147af7b32 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.11 2011/03/20 13:05:37 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.12 2011/03/22 16:50:55 suka Exp $ EAPI="3" @@ -112,7 +112,7 @@ src_unpack() { rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm" rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm" rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm" - use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${XARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${XARCH}.rpm" + use offlinehelp && rpm_unpack "./${PACKED}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${XARCH}.rpm" for s in base binfilter calc math res writer ; do rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm" done @@ -139,7 +139,7 @@ src_unpack() { # Help files if use offlinehelp; then - LANGDIR2="LibO_${MY_PV2}_Linux_${XARCH2}_helppack-rpm_${m}/RPMS/" + LANGDIR2="${PACKED}_helppack-rpm_${m}/RPMS/" rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${XARCH}.rpm" fi fi -- cgit v1.2.3-65-gdbad