From: Tomas Chvatal Date: Sat, 3 Sep 2011 11:51:49 +0000 (+0000) Subject: Use the split l10n package instead of compiling the translations. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=032a14ac886016200a484319ed00f1e3799f2127;p=gentoo.git Use the split l10n package instead of compiling the translations. Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 3bf8b47c983b..61bf7df6cac3 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.119 2011/09/02 12:53:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.120 2011/09/03 11:51:49 scarabeus Exp $ + + 03 Sep 2011; Tomáš Chvátal + libreoffice-3.4.3.2.ebuild, libreoffice-3.4.9999.ebuild, + libreoffice-9999.ebuild, metadata.xml: + Use the split l10n package instead of compiling the translations. 02 Sep 2011; Tomáš Chvátal libreoffice-3.4.3.2.ebuild, libreoffice-3.4.9999.ebuild, diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0825772b5fe0..d5fbfff1c061 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -160,7 +160,6 @@ DIST libreoffice-sdk-3.4.3.2.tar.bz2 1721285 RMD160 beb624a2bac03cf546c371c7356b DIST libreoffice-testing-3.3.3.1.tar.bz2 50945720 RMD160 247ee46d2f21b7ad186dab8d87bbe3507f70a2c1 SHA1 32d7feceb7aaa0256f51a32761edb60d6aa46eac SHA256 47b2632cc564080008649e4ed5a071fb3a1feb6f8b209236aee1e1c304701a1b DIST libreoffice-testing-3.3.4.1.tar.bz2 50947859 RMD160 3a95e68a6430a5cd2432e7644e79776e00a9275a SHA1 4ae0faff80df62950e57dbb626a4ac3a8f06cdbc SHA256 3282a0ef87fe14763cd482796103209fd2fc8d377ced80db8c827c3c62cf885d DIST libreoffice-testing-3.4.3.2.tar.bz2 50848140 RMD160 a1b8b62e173230f2fde2654c70f6b439cdbec68a SHA1 a3102c3c46a30a1cdbf5e032ea9182ef688dea7c SHA256 89c25311bed6d9d8646bd0f8e7f37a9c227b125309cf7b49f2ab083a8b73d6c0 -DIST libreoffice-translations-3.4.3.2.tar.bz2 137012907 RMD160 c9a7f88dbdc28213dac38320f62d2f56c1d845cf SHA1 ca71e086691ed11cf4bfb8514110c851892ec624 SHA256 331596511967d7cc31b3a517d5887025f3bd131325830df5984c14b121acaae2 DIST libreoffice-ure-3.3.3.1.tar.bz2 6163742 RMD160 e046d55882b57080dac73f59736019f5dd8539bf SHA1 51ca4cd60e53ef5ad1e1297a80f1d24faae50cc5 SHA256 ddf053aa2c5db4b41e461f1009eb9d0ff218aadb0b4fa492e627dba06873ea2b DIST libreoffice-ure-3.3.4.1.tar.bz2 6164629 RMD160 1a3b874de71b719e4ea10134cc82dc43ddc7fbc2 SHA1 2c3562704e8cf275ec7db790dbf1cc8627587120 SHA256 535953cd6b97e109690d8b1329ef129218e38774109612d4390e21e0da4d8a70 DIST libreoffice-ure-3.4.3.2.tar.bz2 6214027 RMD160 188aa9c9621fa03d4af10832fc25fb80a2071c65 SHA1 d0dcf8531274cc80ca0104517b78dfbac148031f SHA256 9150a51fe93b803be51af02be585c8e9b2e2fce7c6a4061ed9b8c5d60183ca20 @@ -170,15 +169,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599 EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280 -EBUILD libreoffice-3.4.3.2.ebuild 19645 RMD160 350401979edc2a69f8624252d096c002253801fd SHA1 142003d2261decf02471946f3db63cd80483f337 SHA256 26889736c2b1ac425f8dae3982828c91c06ead782a71780d291261ed1daaeb00 -EBUILD libreoffice-3.4.9999.ebuild 19647 RMD160 9f3f28f38c9e6c925aa6f4bba1b87338a22a14e6 SHA1 fe12ec47abfc4b39b02c4de92d4799fc03389ab6 SHA256 731d03d4b0be885ecead48ab989c83753f9add52c1f4815b8be437ab0f0e45c7 -EBUILD libreoffice-9999.ebuild 18979 RMD160 55f0ad9f902ad2680b8ea5bf37e77bf949c4cab4 SHA1 0c47e9d7d9ca94f75f6db546a45215f4909e9a8e SHA256 1c28faa6f78314023521723799a27dd73b218a394d4291206fcc8d5d19a53f3b -MISC ChangeLog 23205 RMD160 6226e9e33871fb2d18d96f2a169841b8123a07ff SHA1 8c7c8ba37674e260c28475a675cafdbfef6a4243 SHA256 a9fee5268209dddd05d296412bf892018046dbbe35f8474b180c8336822330b9 -MISC metadata.xml 1081 RMD160 df0ee3e614054cbd5f850530a17c0958b81a5d19 SHA1 8fc6d58e473f009d55a8876dc77135c0234d943b SHA256 2c90f32341f47586996dce605e83037a6759854a2871b8396f9832cb64f4db19 +EBUILD libreoffice-3.4.3.2.ebuild 18526 RMD160 d133cf2ed136620675ac4923cc8b2049c485cbff SHA1 227b9b8489d282ddd1fda369060d50a3e6625619 SHA256 c7d978d96d2c77b976d835dc2d45b9258f9e2793b6e12ad6861d897fde45737f +EBUILD libreoffice-3.4.9999.ebuild 18528 RMD160 e40780a06977b6b00005e13658bade06897d7968 SHA1 2a00c287b7d4fe16558afc1539716cb3d4edc484 SHA256 2c12ea33d9a18a7db4763f8fcc6f91f79fd2fb765ea9288af7c32f8892e2d3e3 +EBUILD libreoffice-9999.ebuild 17855 RMD160 1ad726cb4a17fcd4db8649c9f0dec75aba0e37db SHA1 7f91af8abcbc01ad46d53fd7d3c60f1bff2c6a0a SHA256 f16226452732e6791d656423f2ec33483a6bd3f973fc69d3704aa2241520eb30 +MISC ChangeLog 23429 RMD160 e0c5bb6a320567c955f626cb1830d245a7fc953d SHA1 1d5629940139d0ee07f41fc1c6c015f99c46b292 SHA256 8e59cba18a85fc5eb7bae6743d2a7cccc05fbb9c98a49ba859a89dfc569f38be +MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5g0fcACgkQHB6c3gNBRYchmwCgrcoeb2xfr0IBnWBYC7mRRyhE -8aoAoKz/Tg+EsOGET1xi12hTPogjicTl -=NzFA +iQIcBAEBAgAGBQJOYhTiAAoJEOSiRoyO7jvonz4QAIHQWo1NHtekz0wRu7Fqy1nN +z/918ez27/8cifF3n7FuPEX8hBd5zJrVdCUEVUvbT78Y7+hF8jODl5k5Trqfkvh8 +tb5rkKDTJ53d/ioVd/KGyLuBdJIpBJt00fPjLP4vAItwVG8AnB4CrW1ZCtajo8QV +CJeQGJ7yv/jHKTDOQt3juN+XHH56i3UfaupQnWuiXUNSRm+EzpZ8yf0oLDo1SPS8 +Epoeom7O6FweqqfbhDG6LLSlVFWh46xUVPgs1emF+NWkf8MwSWNn0NLlGlOfCmze +XtMFCtkx7WKO9P4EC43+vMy2CMJy+AozIFyBhghVzoqrBWLYuSYCD5PrY3gFBYeC +cH00e6MuDkGIKh6altP9zaD4+ahIgAcwhtXFGEVsx2lo/odr3ZmxFEnaA8GLFGKv +MmtLhHGMCD7LtzFgilW1UpUQA9BpjDuqS7QE6fcRcmFHIZVg7rSYWiCdIsZc1j7T +fYIc1Nw+JLuxOmcp8JyMgrSDcz9/o4pLVyoj0yGoAu3AIAlcOc4pQGQf+YyhhE4y +7cVKDwnqZGe4iZokfP773OyZWDt6BlHDeA7zeQT9sOa8kAw1pDHn3mtTAcKADL+r +wxY9OJqUk1eRoTCthvQxJDtHHa+rD4NQmUDMTYEEs26Ktie2SimbhYvuGm2On9a5 +W5f1i9Ii1wpk9ZhEnSSC +=r3aD -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.3.2.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2.ebuild index 0a56f9d61be7..72712bb31109 100644 --- a/app-office/libreoffice/libreoffice-3.4.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.3.2.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/libreoffice-3.4.3.2.ebuild,v 1.3 2011/09/02 12:53:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild,v 1.4 2011/09/03 11:51:49 scarabeus Exp $ EAPI=3 @@ -25,7 +25,7 @@ ADDONS_URI="http://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.3.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} +inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite." @@ -35,7 +35,7 @@ SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )" # Bootstrap MUST be first! MODULES="bootstrap artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing -ure writer translations" +ure writer" # Only release has the tarballs if [[ ${PV} != *9999* ]]; then for i in ${DEV_URI}; do @@ -86,14 +86,6 @@ ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1- ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip" SRC_URI+=" ${ADDONS_SRC}" -# intersection of available linguas and app-dicts/myspell-* dictionaries -SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb -nl nn pl pt ru sk sl sv tn zu" -for X in ${SPELL_DIRS} ; do - SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" -done -unset X - TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )" TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )" @@ -109,18 +101,14 @@ unset EXT_URI unset ADDONS_SRC IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite -gstreamer gtk kde ldap mysql nsplugin odk offlinehelp opengl python templates -test +vba webdav" +gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba +webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -# translations -LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el -en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km -kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or -pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg -th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu" +# lingua for templates +LANGUAGES="de en_GB en_ZA es fr hu it" for X in ${LANGUAGES} ; do IUSE+=" linguas_${X}" done @@ -186,8 +174,8 @@ RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice + >=app-office/libreoffice-l10n-$(get_version_component_range 1-2) java? ( >=virtual/jre-1.6 ) - ${SPELL_DIRS_DEPEND} " DEPEND="${COMMON_DEPEND} @@ -350,22 +338,7 @@ src_unpack() { } src_prepare() { - strip-linguas ${LANGUAGES} - - # HACK: linguas needs special parsing until fixed upstream - if [[ -z ${LINGUAS} || ${LINGUAS} == en ]]; then - # if empty or just english we want empty - LO_LANGUAGES= - elif [[ ${LINGUAS} =~ en( |$) ]]; then - # otherwise if more then one language and english we - # replace en to en-US - LO_LANGUAGES="$(sed -e 's/\ben\b/en_US/;s/_/-/g' <<< ${LINGUAS})" - else - # and finally if no en is set we add en-US - LO_LANGUAGES="en-US ${LINGUAS//_/-}" - fi - - # Now for our optimization flags ... + # optimization flags export ARCH_FLAGS="${CXXFLAGS}" use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}" @@ -501,7 +474,7 @@ src_configure() { --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ --with-external-tar="${DISTDIR}" \ - --with-lang="${LO_LANGUAGES}" \ + --with-lang="" \ --with-max-jobs=${jbs} \ --with-num-cpus=1 \ --with-theme="${themes}" \ @@ -541,7 +514,6 @@ src_configure() { $(use_with ldap openldap) \ $(use_with mysql system-mysql-cppconn) \ $(use_with nsplugin system-mozilla libxul) \ - $(use_with offlinehelp helppack-integration) \ $(use_with templates sun-templates) \ ${internal_libs} \ ${java_opts} \ diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild index dc09e5ef6436..0636681caca3 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.9999.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/libreoffice-3.4.9999.ebuild,v 1.23 2011/09/02 12:53:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.24 2011/09/03 11:51:49 scarabeus Exp $ EAPI=3 @@ -25,7 +25,7 @@ ADDONS_URI="http://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.3.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS} +inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="LibreOffice, a full office productivity suite." @@ -35,7 +35,7 @@ SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )" # Bootstrap MUST be first! MODULES="bootstrap artwork base calc components extensions extras filters help impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing -ure writer translations" +ure writer" # Only release has the tarballs if [[ ${PV} != *9999* ]]; then for i in ${DEV_URI}; do @@ -86,14 +86,6 @@ ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1- ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip" SRC_URI+=" ${ADDONS_SRC}" -# intersection of available linguas and app-dicts/myspell-* dictionaries -SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb -nl nn pl pt ru sk sl sv tn zu" -for X in ${SPELL_DIRS} ; do - SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" -done -unset X - TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )" TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )" @@ -109,18 +101,14 @@ unset EXT_URI unset ADDONS_SRC IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite -gstreamer gtk kde ldap mysql nsplugin odk offlinehelp opengl python templates -test +vba webdav" +gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba +webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -# translations -LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el -en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km -kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or -pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg -th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu" +# lingua for templates +LANGUAGES="de en_GB en_ZA es fr hu it" for X in ${LANGUAGES} ; do IUSE+=" linguas_${X}" done @@ -186,8 +174,8 @@ RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice + >=app-office/libreoffice-l10n-$(get_version_component_range 1-2) java? ( >=virtual/jre-1.6 ) - ${SPELL_DIRS_DEPEND} " DEPEND="${COMMON_DEPEND} @@ -350,22 +338,7 @@ src_unpack() { } src_prepare() { - strip-linguas ${LANGUAGES} - - # HACK: linguas needs special parsing until fixed upstream - if [[ -z ${LINGUAS} || ${LINGUAS} == en ]]; then - # if empty or just english we want empty - LO_LANGUAGES= - elif [[ ${LINGUAS} =~ en( |$) ]]; then - # otherwise if more then one language and english we - # replace en to en-US - LO_LANGUAGES="$(sed -e 's/\ben\b/en_US/;s/_/-/g' <<< ${LINGUAS})" - else - # and finally if no en is set we add en-US - LO_LANGUAGES="en-US ${LINGUAS//_/-}" - fi - - # Now for our optimization flags ... + # optimization flags export ARCH_FLAGS="${CXXFLAGS}" use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}" @@ -501,7 +474,7 @@ src_configure() { --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ --with-external-tar="${DISTDIR}" \ - --with-lang="${LO_LANGUAGES}" \ + --with-lang="" \ --with-max-jobs=${jbs} \ --with-num-cpus=1 \ --with-theme="${themes}" \ @@ -541,7 +514,6 @@ src_configure() { $(use_with ldap openldap) \ $(use_with mysql system-mysql-cppconn) \ $(use_with nsplugin system-mozilla libxul) \ - $(use_with offlinehelp helppack-integration) \ $(use_with templates sun-templates) \ ${internal_libs} \ ${java_opts} \ diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index f6b595d2e96d..f640450b8ad7 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.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/libreoffice-9999.ebuild,v 1.20 2011/09/02 12:53:11 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.21 2011/09/03 11:51:49 scarabeus Exp $ EAPI=3 @@ -34,7 +34,7 @@ SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )" # Split modules following git/tarballs # Core MUST be first! -MODULES="core binfilter dictionaries help translations" +MODULES="core binfilter dictionaries help" # Only release has the tarballs if [[ ${PV} != *9999* ]]; then for i in ${DEV_URI}; do @@ -83,14 +83,6 @@ ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc- ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip" SRC_URI+=" ${ADDONS_SRC}" -# intersection of available linguas and app-dicts/myspell-* dictionaries -SPELL_DIRS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk nb -nl nn pl pt ru sk sl sv tn zu" -for X in ${SPELL_DIRS} ; do - SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" -done -unset X - TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )" TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )" @@ -106,18 +98,14 @@ unset EXT_URI unset ADDONS_SRC IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite -gstreamer gtk kde ldap mysql nsplugin odk offlinehelp opengl svg templates -test +vba webdav" +gstreamer gtk kde ldap mysql nsplugin odk opengl svg templates test +vba +webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -# translations -LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el -en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km -kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or -pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg -th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu" +# lingua for templates +LANGUAGES="de en_GB en_ZA es fr hu it" for X in ${LANGUAGES} ; do IUSE+=" linguas_${X}" done @@ -181,12 +169,13 @@ COMMON_DEPEND=" webdav? ( net-libs/neon ) " +# FIXME: l10n after release/branching RDEPEND="${COMMON_DEPEND} !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice + >=app-office/libreoffice-l10n-3.4 java? ( >=virtual/jre-1.6 ) - ${SPELL_DIRS_DEPEND} " DEPEND="${COMMON_DEPEND} @@ -340,22 +329,7 @@ src_unpack() { } src_prepare() { - strip-linguas ${LANGUAGES} - - # HACK: linguas needs special parsing until fixed upstream - if [[ -z ${LINGUAS} || ${LINGUAS} == en ]]; then - # if empty or just english we want empty - LO_LANGUAGES= - elif [[ ${LINGUAS} =~ en( |$) ]]; then - # otherwise if more then one language and english we - # replace en to en-US - LO_LANGUAGES="$(sed -e 's/\ben\b/en_US/;s/_/-/g' <<< ${LINGUAS})" - else - # and finally if no en is set we add en-US - LO_LANGUAGES="en-US ${LINGUAS//_/-}" - fi - - # Now for our optimization flags ... + # optimization flags export ARCH_FLAGS="${CXXFLAGS}" use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}" @@ -492,7 +466,7 @@ src_configure() { --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ --with-external-tar="${DISTDIR}" \ - --with-lang="${LO_LANGUAGES}" \ + --with-lang="" \ --with-max-jobs=${jbs} \ --with-num-cpus=1 \ --with-theme="${themes}" \ @@ -531,7 +505,6 @@ src_configure() { $(use_with ldap openldap) \ $(use_with mysql system-mysql-cppconn) \ $(use_with nsplugin system-mozilla libxul) \ - $(use_with offlinehelp helppack-integration) \ $(use_with templates sun-templates) \ ${internal_libs} \ ${java_opts} \ diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 535ddc1c4ca2..151c1bfb125c 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -13,8 +13,6 @@ version Enable support for non-Roman fonts via media-gfx/graphite2 Build the Office Development Kit - Install help files locally instead of - using the LibreOffice Wiki Enable installation of Sun templates Enable support for VBA compatibility and ActiveX embedding