summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/libreoffice-l10n/ChangeLog10
-rw-r--r--app-office/libreoffice-l10n/libreoffice-l10n-4.0.5.2.ebuild (renamed from app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild)26
-rw-r--r--app-office/libreoffice-l10n/libreoffice-l10n-4.1.1.2.ebuild (renamed from app-office/libreoffice-l10n/libreoffice-l10n-4.1.0.4.ebuild)2
3 files changed, 21 insertions, 17 deletions
diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index 69a58fdf1374..70a448806c0b 100644
--- a/app-office/libreoffice-l10n/ChangeLog
+++ b/app-office/libreoffice-l10n/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-office/libreoffice-l10n
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.86 2013/07/25 14:50:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.87 2013/08/30 08:34:21 scarabeus Exp $
+
+*libreoffice-l10n-4.0.5.2 (30 Aug 2013)
+*libreoffice-l10n-4.1.1.2 (30 Aug 2013)
+
+ 30 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+ +libreoffice-l10n-4.0.5.2.ebuild, +libreoffice-l10n-4.1.1.2.ebuild,
+ -libreoffice-l10n-3.6.6.2.ebuild, -libreoffice-l10n-4.1.0.4.ebuild:
+ Version bump to 4.0.5.2 and 4.1.1.2.
*libreoffice-l10n-4.1.0.4 (25 Jul 2013)
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-4.0.5.2.ebuild
index a3acbe255657..4911db795e97 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.6.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-4.0.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.6.6.2.ebuild,v 1.6 2013/07/12 02:44:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-4.0.5.2.ebuild,v 1.1 2013/08/30 08:34:21 scarabeus Exp $
EAPI=4
@@ -14,36 +14,32 @@ BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_P
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="offlinehelp"
LANGUAGES_HELP="ast bg bn_IN bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo
-es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lb mk nb ne nl nn om pl
-pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
+es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR
+pt ro ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
LANGUAGES="${LANGUAGES_HELP} af am ar as be br brx cy dgo fa ga gd kk kn kok ks
-ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
-st sw_TZ ta te th tn ts tt uz ve xh zu"
+ku lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN rw sa_IN sat sd sh sr
+ss st sw_TZ ta te th tn ts tt uz ve xh zu"
for lang in ${LANGUAGES_HELP}; do
helppack=""
[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
- helppack="offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz )"
+ helppack="offlinehelp? ( ${BASE_SRC_URI}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
SRC_URI+=" linguas_${lang}? ( ${helppack} )"
done
for lang in ${LANGUAGES}; do
langpack=""
[[ ${lang} == en ]] \
- || langpack="${BASE_SRC_URI}/x86/LibO_${PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz"
+ || langpack="${BASE_SRC_URI}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
IUSE+=" linguas_${lang}"
done
unset lang helppack langpack lang2
-RDEPEND+="
- app-text/hunspell
- !<app-office/libreoffice-$(get_version_component_range 1-2)
- !<app-office/libreoffice-bin-$(get_version_component_range 1-2)
-"
+RDEPEND+="app-text/hunspell"
RESTRICT="strip"
@@ -63,7 +59,7 @@ src_unpack() {
# for english we provide just helppack, as translation is always there
if [[ ${lang} != en ]]; then
- rpmdir="LibO_${PV}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+ rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
# First remove dictionaries, we want to use system ones.
rm -rf "${S}/${rpmdir}/"*dict*.rpm
@@ -71,7 +67,7 @@ src_unpack() {
fi
if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
[[ ${lang} == en ]] && dir="en-US"
- rpmdir="LibO_${PV}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+ rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
rpm_unpack ./"${rpmdir}/"*.rpm
fi
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-4.1.0.4.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-4.1.1.2.ebuild
index d2c2b6cd9e12..7b53dd1bc0a3 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-4.1.0.4.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-4.1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-4.1.0.4.ebuild,v 1.1 2013/07/25 14:50:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-4.1.1.2.ebuild,v 1.1 2013/08/30 08:34:21 scarabeus Exp $
EAPI=4