* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: libreoffice-l10n-3.5.4.ebuild ChangeLog
@ 2012-05-31 9:59 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-05-31 9:59 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/05/31 09:59:26
Modified: libreoffice-l10n-3.5.4.ebuild ChangeLog
Log:
Drop the templates from here and move them to app-officeext/sun-templates.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.2 app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?r1=1.1&r2=1.2
Index: libreoffice-l10n-3.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-l10n-3.5.4.ebuild 31 May 2012 09:41:33 -0000 1.1
+++ libreoffice-l10n-3.5.4.ebuild 31 May 2012 09:59:26 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.5.4.ebuild,v 1.1 2012/05/31 09:41:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.2 2012/05/31 09:59:26 scarabeus Exp $
EAPI=4
@@ -9,15 +9,7 @@
RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-OO_EXTENSIONS=(
- "472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
- "53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
- "4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
- "a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
- "09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
- "b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
-)
-inherit rpm eutils versionator office-ext
+inherit rpm eutils versionator
DESCRIPTION="Translations for the Libreoffice suite."
HOMEPAGE="http://www.libreoffice.org"
@@ -25,7 +17,7 @@
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp templates"
+IUSE="offlinehelp"
LANGUAGES_HELP="bg 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
@@ -60,22 +52,6 @@
RDEPEND="${SPELL_DICTS_DEPEND}"
unset X SPELL_DICTS SPELL_DICTS_DEPEND
-# no need for iuse here as this needs to be written out and is subset
-# of lignuas anyway
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-TDEPEND=""
-for i in ${OO_EXTENSIONS[@]}; do
- lingua=${i/_*.oxt/}
- lingua=${lingua/*Pack-/}
- if [[ ${lingua} == en-US ]]; then
- TDEPEND+=" ${EXT_URI}/${i}"
- else
- TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
- fi
-done
-SRC_URI+=" templates? ( ${TDEPEND} )"
-unset i lingua TDEPEND EXT_URI
-
# blockers for old libreoffice with bundled linguas
RDEPEND+="
!=app-office/libreoffice-3.4.9999-r1
@@ -116,18 +92,6 @@
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
rpm_unpack ./"${rpmdir}/"*.rpm
fi
- if use templates; then
- for i in ${OO_EXTENSIONS[@]}; do
- lingua=${i/_*.oxt/}
- lingua=${lingua/*Pack-/}
- if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
- if [[ ! -f "${S}/${i}" ]]; then
- cp -v "${DISTDIR}/${i}" "${S}"
- ooextused+=( "${i}" )
- fi
- fi
- done
- fi
done
OO_EXTENSIONS=()
for i in ${ooextused[@]}; do
1.45 app-office/libreoffice-l10n/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?r1=1.44&r2=1.45
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog 31 May 2012 09:41:33 -0000 1.44
+++ ChangeLog 31 May 2012 09:59:26 -0000 1.45
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice-l10n
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.44 2012/05/31 09:41:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.45 2012/05/31 09:59:26 scarabeus Exp $
+
+ 31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-l10n-3.5.4.ebuild:
+ Drop the templates from here and move them to app-officeext/sun-templates.
*libreoffice-l10n-3.5.4 (31 May 2012)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: libreoffice-l10n-3.5.4.ebuild ChangeLog
@ 2012-06-01 6:16 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-06-01 6:16 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/06/01 06:16:11
Modified: libreoffice-l10n-3.5.4.ebuild ChangeLog
Log:
Fix command-not-found msgs. Thanks to Nikoli.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Revision Changes Path
1.4 app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?r1=1.3&r2=1.4
Index: libreoffice-l10n-3.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-l10n-3.5.4.ebuild 31 May 2012 10:07:26 -0000 1.3
+++ libreoffice-l10n-3.5.4.ebuild 1 Jun 2012 06:16:11 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.5.4.ebuild,v 1.3 2012/05/31 10:07:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.4 2012/06/01 06:16:11 scarabeus Exp $
EAPI=4
@@ -52,13 +52,10 @@
RDEPEND="${SPELL_DICTS_DEPEND}"
unset X SPELL_DICTS SPELL_DICTS_DEPEND
-# blockers for old libreoffice with bundled linguas
RDEPEND+="
- !=app-office/libreoffice-3.4.9999-r1
- !=app-office/libreoffice-9999-r1
|| (
- >=app-office/libreoffice-3.4.4.2-r1
- >=app-office/libreoffice-bin-3.4.4.2-r1
+ >=app-office/libreoffice-$(get_version_component_range 1-2 ${MY_PV})
+ >=app-office/libreoffice-bin-$(get_version_component_range 1-2 ${MY_PV})
)
"
@@ -93,10 +90,6 @@
rpm_unpack ./"${rpmdir}/"*.rpm
fi
done
- OO_EXTENSIONS=()
- for i in ${ooextused[@]}; do
- OO_EXTENSIONS+=( ${i} )
- done
}
src_prepare() { :; }
@@ -113,14 +106,4 @@
fi
# remove extensions that are in the l10n for some weird reason
rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/
-
- echo "${OO_EXTENSIONS[@]}"
- office-ext_src_install
-}
-
-pkg_postinst() {
- office-ext_pkg_postinst
-}
-pkg_prerm() {
- office-ext_pkg_prerm
}
1.48 app-office/libreoffice-l10n/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 31 May 2012 10:08:17 -0000 1.47
+++ ChangeLog 1 Jun 2012 06:16:11 -0000 1.48
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice-l10n
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.47 2012/05/31 10:08:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.48 2012/06/01 06:16:11 scarabeus Exp $
+
+ 01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-l10n-3.5.4.ebuild:
+ Fix command-not-found msgs. Thanks to Nikoli.
31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
Silence repoman wrt local desc in metadata.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: libreoffice-l10n-3.5.4.ebuild ChangeLog
@ 2012-06-02 6:28 Zac Medico (zmedico)
0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico (zmedico) @ 2012-06-02 6:28 UTC (permalink / raw
To: gentoo-commits
zmedico 12/06/02 06:28:55
Modified: libreoffice-l10n-3.5.4.ebuild ChangeLog
Log:
inherit multilib for get_libdir
(Portage version: 2.2.0_alpha108_p29/cvs/Linux i686)
Revision Changes Path
1.5 app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild?r1=1.4&r2=1.5
Index: libreoffice-l10n-3.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libreoffice-l10n-3.5.4.ebuild 1 Jun 2012 06:16:11 -0000 1.4
+++ libreoffice-l10n-3.5.4.ebuild 2 Jun 2012 06:28:55 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.5.4.ebuild,v 1.4 2012/06/01 06:16:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.5 2012/06/02 06:28:55 zmedico Exp $
EAPI=4
@@ -9,7 +9,7 @@
RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-inherit rpm eutils versionator
+inherit rpm eutils multilib versionator
DESCRIPTION="Translations for the Libreoffice suite."
HOMEPAGE="http://www.libreoffice.org"
1.49 app-office/libreoffice-l10n/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice-l10n/ChangeLog?r1=1.48&r2=1.49
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog 1 Jun 2012 06:16:11 -0000 1.48
+++ ChangeLog 2 Jun 2012 06:28:55 -0000 1.49
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice-l10n
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.48 2012/06/01 06:16:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.49 2012/06/02 06:28:55 zmedico Exp $
+
+ 02 Jun 2012; Zac Medico <zmedico@gentoo.org> libreoffice-l10n-3.5.4.ebuild:
+ inherit multilib for get_libdir
01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-l10n-3.5.4.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-02 6:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-31 9:59 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: libreoffice-l10n-3.5.4.ebuild ChangeLog Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2012-06-01 6:16 Tomas Chvatal (scarabeus)
2012-06-02 6:28 Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox