| 1 |
scarabeus 11/09/06 12:51:49 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-l10n-3.4.3-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix unpacking help for not-supported langs. Fixes bug #382031. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha53/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 app-office/libreoffice-l10n/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- ChangeLog 4 Sep 2011 09:32:13 -0000 1.4 |
| 23 |
+++ ChangeLog 6 Sep 2011 12:51:49 -0000 1.5 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-office/libreoffice-l10n |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.4 2011/09/04 09:32:13 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.5 2011/09/06 12:51:49 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 06 Sep 2011; Tomáš Chvátal <scarabeus@g.o> |
| 31 |
+ libreoffice-l10n-3.4.3-r1.ebuild: |
| 32 |
+ Fix unpacking help for not-supported langs. Fixes bug #382031. |
| 33 |
|
| 34 |
*libreoffice-l10n-3.4.3-r1 (04 Sep 2011) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: libreoffice-l10n-3.4.3-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- libreoffice-l10n-3.4.3-r1.ebuild 4 Sep 2011 09:32:13 -0000 1.1 |
| 52 |
+++ libreoffice-l10n-3.4.3-r1.ebuild 6 Sep 2011 12:51:49 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
|
| 61 |
@@ -49,7 +49,6 @@ |
| 62 |
for X in ${SPELL_DICTS} ; do |
| 63 |
SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" |
| 64 |
done |
| 65 |
-unset X |
| 66 |
RDEPEND="${SPELL_DICTS_DEPEND}" |
| 67 |
unset X SPELL_DICTS SPELL_DICTS_DEPEND |
| 68 |
|
| 69 |
@@ -80,8 +79,7 @@ |
| 70 |
rm -rf "${S}/${rpmdir}/"*dict*.rpm |
| 71 |
rpm_unpack "./${rpmdir}/"*.rpm |
| 72 |
fi |
| 73 |
- |
| 74 |
- if use offlinehelp; then |
| 75 |
+ if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then |
| 76 |
[[ ${lang} == en ]] && dir="en-US" |
| 77 |
rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/" |
| 78 |
rpm_unpack ./"${rpmdir}/"*.rpm |
| 79 |
@@ -94,10 +92,11 @@ |
| 80 |
src_compile() { :; } |
| 81 |
|
| 82 |
src_install() { |
| 83 |
+ local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/ |
| 84 |
# Condition required for people that do not install anything eg no linguas |
| 85 |
# or just english with no offlinehelp. |
| 86 |
- if [[ -d "${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/ ]] ; then |
| 87 |
+ if [[ -d "${dir}" ]] ; then |
| 88 |
insinto /usr/$(get_libdir)/${PN/-l10n/} |
| 89 |
- doins -r "${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/* |
| 90 |
+ doins -r "${dir}"/* |
| 91 |
fi |
| 92 |
} |
Archives