* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: ChangeLog libreoffice-l10n-3.4.3-r1.ebuild
@ 2011-09-06 12:51 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-09-06 12:51 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/09/06 12:51:49
Modified: ChangeLog libreoffice-l10n-3.4.3-r1.ebuild
Log:
Fix unpacking help for not-supported langs. Fixes bug #382031.
(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)
Revision Changes Path
1.5 app-office/libreoffice-l10n/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?r1=1.4&r2=1.5
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 4 Sep 2011 09:32:13 -0000 1.4
+++ ChangeLog 6 Sep 2011 12:51:49 -0000 1.5
@@ -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)
1.2 app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild
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
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
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
Index: libreoffice-l10n-3.4.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-l10n-3.4.3-r1.ebuild 4 Sep 2011 09:32:13 -0000 1.1
+++ libreoffice-l10n-3.4.3-r1.ebuild 6 Sep 2011 12:51:49 -0000 1.2
@@ -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 @@
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 @@
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_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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: ChangeLog libreoffice-l10n-3.4.3-r1.ebuild
@ 2011-09-06 19:24 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-09-06 19:24 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/09/06 19:24:43
Modified: ChangeLog libreoffice-l10n-3.4.3-r1.ebuild
Log:
Die when there is no such dir with translations/help.
(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)
Revision Changes Path
1.6 app-office/libreoffice-l10n/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 6 Sep 2011 12:51:49 -0000 1.5
+++ ChangeLog 6 Sep 2011 19:24:43 -0000 1.6
@@ -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.5 2011/09/06 12:51:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.6 2011/09/06 19:24:43 scarabeus Exp $
+
+ 06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-l10n-3.4.3-r1.ebuild:
+ Die when there is no such dir with translations/help.
06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-l10n-3.4.3-r1.ebuild:
1.3 app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild?r1=1.2&r2=1.3
Index: libreoffice-l10n-3.4.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-l10n-3.4.3-r1.ebuild 6 Sep 2011 12:51:49 -0000 1.2
+++ libreoffice-l10n-3.4.3-r1.ebuild 6 Sep 2011 19:24:43 -0000 1.3
@@ -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.2 2011/09/06 12:51:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v 1.3 2011/09/06 19:24:43 scarabeus Exp $
EAPI=4
@@ -75,6 +75,7 @@
# for english we provide just helppack, as translation is always there
if [[ ${lang} != en ]]; then
rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
# First remove dictionaries, we want to use system ones.
rm -rf "${S}/${rpmdir}/"*dict*.rpm
rpm_unpack "./${rpmdir}/"*.rpm
@@ -82,6 +83,7 @@
if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
[[ ${lang} == en ]] && dir="en-US"
rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
rpm_unpack ./"${rpmdir}/"*.rpm
fi
done
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-06 19:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-06 12:51 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: ChangeLog libreoffice-l10n-3.4.3-r1.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2011-09-06 19:24 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox