diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-06 12:51:49 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-06 12:51:49 +0000 |
| commit | 601d055c72588e8310042e527528332f940742ba (patch) | |
| tree | 6bc38ea9e581c8982e121530e210d4bec0b8ecd6 /app-office | |
| parent | remove intermediate version, cleanup changelog to show proper intentions (diff) | |
| download | gentoo-2-601d055c72588e8310042e527528332f940742ba.tar.gz gentoo-2-601d055c72588e8310042e527528332f940742ba.tar.bz2 gentoo-2-601d055c72588e8310042e527528332f940742ba.zip | |
Fix unpacking help for not-supported langs. Fixes bug #382031.
(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice-l10n/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog index d4a6ac7c2603..008998f8e451 100644 --- a/app-office/libreoffice-l10n/ChangeLog +++ b/app-office/libreoffice-l10n/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-l10n # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.4 2011/09/04 09:32:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.5 2011/09/06 12:51:49 scarabeus Exp $ + + 06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-l10n-3.4.3-r1.ebuild: + Fix unpacking help for not-supported langs. Fixes bug #382031. *libreoffice-l10n-3.4.3-r1 (04 Sep 2011) diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild index fad7db0b2d1a..54f187c49bfa 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.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-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v 1.1 2011/09/04 09:32:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v 1.2 2011/09/06 12:51:49 scarabeus Exp $ EAPI=4 @@ -49,7 +49,6 @@ nb nl nn pl pt ru sk sl sv tn zu" for X in ${SPELL_DICTS} ; do SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" done -unset X RDEPEND="${SPELL_DICTS_DEPEND}" unset X SPELL_DICTS SPELL_DICTS_DEPEND @@ -80,8 +79,7 @@ src_unpack() { rm -rf "${S}/${rpmdir}/"*dict*.rpm rpm_unpack "./${rpmdir}/"*.rpm fi - - if use offlinehelp; then + if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then [[ ${lang} == en ]] && dir="en-US" rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/" rpm_unpack ./"${rpmdir}/"*.rpm @@ -94,10 +92,11 @@ src_configure() { :; } src_compile() { :; } src_install() { + local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/ # Condition required for people that do not install anything eg no linguas # or just english with no offlinehelp. - if [[ -d "${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/ ]] ; then + if [[ -d "${dir}" ]] ; then insinto /usr/$(get_libdir)/${PN/-l10n/} - doins -r "${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/* + doins -r "${dir}"/* fi } |