From: Tomas Chvatal Date: Tue, 6 Dec 2011 16:02:08 +0000 (+0000) Subject: Starting with 3.5 branch it uses uniform location so no need for live version when... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=69cddf732f3b9980e047ca2d04a1fed5e303fe19;p=gentoo.git Starting with 3.5 branch it uses uniform location so no need for live version when we can use 3.5.0 and later Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog index ec252e49458b..1b1964bd0285 100644 --- a/app-office/libreoffice-l10n/ChangeLog +++ b/app-office/libreoffice-l10n/ChangeLog @@ -1,6 +1,11 @@ # 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.21 2011/11/30 10:15:28 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.22 2011/12/06 16:02:08 scarabeus Exp $ + + 06 Dec 2011; Tomáš Chvátal + -libreoffice-l10n-9999-r1.ebuild: + Starting with 3.5 branch it uses uniform location so no need for live version + when we can use 3.5.0 and later *libreoffice-l10n-3.5.0 (30 Nov 2011) diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index f53a82f5c5fd..8cabf4d6b652 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -324,23 +324,22 @@ EBUILD libreoffice-l10n-3.4.3-r3.ebuild 3892 RMD160 d35706fb4d9ddb13c38655a0a464 EBUILD libreoffice-l10n-3.4.4-r1.ebuild 5055 RMD160 43f0c3be4a2bf0b2df06eeb5f85a4df3e3988085 SHA1 d15e89b4f4f204bd266fe71139f44a71a0590a6a SHA256 7044f79be17e178f3a601d752a62ea881e54758d81401f2ea06a244e9dbf3bc9 EBUILD libreoffice-l10n-3.4.4.ebuild 3635 RMD160 b207749e1391029a74e6f5f82b73e31534d7c201 SHA1 eff7c9b5c559418a4eb983deeec2af1a9e2b4da2 SHA256 166b6c5a00c5589c44b08d6466c8e0e0215b989d68a5e35f44b8c011469ef1aa EBUILD libreoffice-l10n-3.5.0.ebuild 4919 RMD160 544c963c1c5e1152c7f6dc0296978755fde3309d SHA1 fe77d2b630bc4d01a252d431f8f2b18079bfc847 SHA256 ef13f1bf25ee5643c2f7dcb835c0a8aa90def6ff5fb09e6522550e6df23443ee -EBUILD libreoffice-l10n-9999-r1.ebuild 4921 RMD160 715b41f4773786360de044cec471df976d3802db SHA1 1e78f967e9ef6ac545ec9ab4084e8fcbc6d9a05b SHA256 4d1081aed28236853e7775db8f81f7f9171df4d10c3a908651f61b1112195f90 -MISC ChangeLog 4158 RMD160 c518ec1186e58798179dcda38a5f59bf15694869 SHA1 2bb1992c335177f33445b96190cf3d37a4a20e7a SHA256 2bc75870f427f9f0cc5ed551a31f3fa110d0f1036e6bf103b2f4531712dfe212 +MISC ChangeLog 4364 RMD160 fd2f217cfad94b86458d3e69058284aa078f232f SHA1 64b565a9de635bcbfaeab0b3daf4b86844d6b5e4 SHA256 e577779416f4f539d11ff208dc3f36a3121ec9bc7495e8c8a4a353938cde70e3 MISC metadata.xml 347 RMD160 9f877917cd81032044930b5585910cacd590ea41 SHA1 71e2840a19fab2cf3a6f1c32e305e457cdb29ba3 SHA256 8b80b71771e14ffebe84e2537b6207a459d1160b4d0880773657ce2f082eae0b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJO1gKVAAoJEOSiRoyO7jvoz2oP/RmAxtgctlT82w3YCI1GbPl1 -nxhjZSewGi6LO8nBqnzXRrHKnMs1Tfla/wu3gHbwfW6mVOXsZzV1x7/CKXf1oLdr -sE8FQYFps3h4YTSFSHLwsSt1+VnZ+n2Uhsi/sNgNHHg29WJrUO/ZOPeNIH7nl0u2 -8IfFVMhCiEKvqBkdftDj68toL6gin4KMPN126zsG5qTOO/yI7lHDhbW7tFLPntsR -J3Xym6z5cnGBw1Sh9ubRKg7UcY7z73OUejI93Y4jFI9xsJYytGxtVUJUZui4yKK5 -Q3NZiZQ/Z1IYG/6n1xTsc82IDyOD2fdLAzOR1/zj79g2dBaL25y/9sZ7h4A3WPkT -eby7WwpNQXol2nV0H40AzBAbclkLzCZHOBXc6CAlQEc+OzC5DzEm6klv/1s2COiP -Qd0nGiILjRSXY2P76LyntL/VAB5rZrI2Eb2xon9CxsCrBLVuMpOu1Tm5OH70Y4bn -BSp1GK1rqckkinm7OW7Y1mHQemBESo+b6KSrVsmyXACoweaqs1LKmSso6Afw/FVN -d8ZudjGRu3dsZa+ETubfCgPYVY7nTYrStXU90XBvEiYhXaHNxGHZtw7M9n8CKzSX -cmkWK0tb5NCbXCjvO+2ZEGJdiXqeP5/3ZXhftwOEWqoAXbgxIFszb2CYWbpDA51R -aGtKIREHXkWDUlOAEga0 -=Cuwg +iQIcBAEBAgAGBQJO3jx/AAoJEOSiRoyO7jvoujMP/j6hmyt18nIHOE/9ThOiw68b +y0WKsRYUC3uDqFtaXCeYbmlNTcK9OOlS1H7Svjn52QwWB7gavpRnJ7mO01jmz1of +R9HK6D9QD1j5Fh/9T4YYVkZT4JDLNdGgfpg5QQNiNWkq585RGXQCv9+J1hoI+NXH +M0FJpIKnh2vrkRceqFFHZs5KTxDvu3e1WslYRYB4gbhAVOEFL5YTg4x3G87GSdo4 +7PgirQahi6W732qv9oGg0mXx9CopTHK3AVNcOE1FzR03NQVaEx60romcaJvshrjJ +FyAo3dI6Bpycvyw2dnOrkZydvfWlKKRchDtdJVivTg4/RwIt24kYpsPu80tPPjZG +HOGSoR14AIr5Ch200MCyrIEhfGkh8PnAkvNpXUoZP3e6jPq2Pciz2Yz/zhFmzIYJ +cUq/hziPhwLEUGmWnDqD+eNEnfIvewur4EIr0pb1LiikguJMNiPXPlUWvTkZsEQe +YzAZ8+hOSAzUGOGgkK3uwAB1pRLfHuyWk0WuZYhUaA4076/A/KpFwvsdxXdoNf/W +hs21ur7UNAw82rb+2E+Fi4/3g5LNR9iHZBCBjVjP+OXo0zei6oKlt3wU8wOEf235 +dwL2zLKFmfDB+eH61spZBcOttkzyxpIYZoZFhR41cCQS0PsO5uLoGmGusK8l1wlQ +cJdso4xfV/1IDImau4pv +=lZ6K -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild deleted file mode 100644 index 0f73bd2cb43d..000000000000 --- a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# 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-9999-r1.ebuild,v 1.3 2011/11/30 10:15:28 scarabeus Exp $ - -EAPI=4 - -[[ ${PV} == 9999 ]] && MY_PV="3.4.4" || MY_PV="${PV}" - -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 - -DESCRIPTION="Translations for the Libreoffice suite." -HOMEPAGE="http://www.libreoffice.org" - -LICENSE="LGPL-3" -SLOT="0" -[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="offlinehelp templates" - -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 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" -LANGUAGES="${LANGUAGES_HELP} af ar as ast 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 uz ve xh zu" - -for lang in ${LANGUAGES}; do - helppack="" - langpack="" - if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then - [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang} - helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) " - fi - [[ ${lang} == en ]] \ - || langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz " - SRC_URI+=" linguas_${lang}? ( - ${langpack} - ${helppack} - )" - IUSE+=" linguas_${lang}" -done -unset lang helppack langpack lang2 - -# dictionaries -SPELL_DICTS="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_DICTS} ; do - SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" -done -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 - !=app-office/libreoffice-9999-r1 - || ( - >=app-office/libreoffice-3.4.4.2-r1 - >=app-office/libreoffice-bin-3.4.4.2-r1 - ) -" - -RESTRICT="strip" - -S="${WORKDIR}" - -src_unpack() { - default - - local lang dir rpmdir i - local ooextused=() - - for lang in ${LANGUAGES}; do - # break away if not enabled; paludis support - use_if_iuse linguas_${lang} || continue - - dir=${lang/_/-} - - # for english we provide just helppack, as translation is always there - if [[ ${lang} != en ]]; then - rpmdir="LibO_${MY_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 - fi - if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then - [[ ${lang} == en ]] && dir="en-US" - rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/" - [[ -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 - OO_EXTENSIONS+=( ${i} ) - done -} - -src_prepare() { :; } -src_configure() { :; } -src_compile() { :; } - -src_install() { - local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/ - # Condition required for people that do not install anything eg no linguas - # or just english with no offlinehelp. - if [[ -d "${dir}" ]] ; then - insinto /usr/$(get_libdir)/${PN/-l10n/}/ - doins -r "${dir}"/* - fi - - echo "${OO_EXTENSIONS[@]}" - office-ext_src_install -} - -pkg_postinst() { - office-ext_pkg_postinst -} -pkg_prerm() { - office-ext_pkg_prerm -} diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 7713128ac27d..735234eaec1e 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -179,24 +179,24 @@ EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 f97b7a6b4af7c5187fece7d7c233fc EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 f08a3b1e7826d489a580087b1638a4b98acfbca8 SHA1 f81fb848f6895c3c947fc56f0aef0963f15c93e3 SHA256 9c8adc1a3c217697dcaa7eb3722ae84b47926a9119c39f53b330243bd4b81ed4 EBUILD libreoffice-3.4.9999-r2.ebuild 14991 RMD160 7abb80f9936495407114fa70260a6fc0f859fa07 SHA1 9f98e13f004793ce15a7285fe7bb2e9860ee31df SHA256 302684d2d6ccdb7ed8a48068f101d0b04037d6ff413bf8b3feccaf9141f19db7 EBUILD libreoffice-3.5.0.0.ebuild 14007 RMD160 720a4c381e131a6e826edb976b46ca9cfc5f85e9 SHA1 99f4175284365c9bf328f7888f203a52a85278c0 SHA256 bdbdecddc996c5db2c702a109b00d9a5782acf3dd49a30d0534526d7a6a35a88 -EBUILD libreoffice-3.5.9999.ebuild 14008 RMD160 1a41246b48038b3e9252039de57f39573b53e15c SHA1 2475d1a206d73fae65c1bd87bab2b1aa6af1aae8 SHA256 de627e2d560007ea2dfe95fabb8e653c90d63960a3650641a0dd3b4e09760d21 -EBUILD libreoffice-9999-r2.ebuild 14008 RMD160 4d7c683b8b81c0a6330b6b61f91756ce5cd14477 SHA1 e65b02347099879eb53a1736d54bfeacf03754ea SHA256 6e49e0864a49c1770e0ef93ad04233fe9a713935924702622f38f382ec8ca744 -MISC ChangeLog 38362 RMD160 8bc0c9005eaa14b67ca63ca3e9e65a6ad164279a SHA1 4889c3ab4c5167da22981caddf9543bb3f1782d3 SHA256 f7e4a062c97b6ec660864b2e5d7dfe95553d2527ca272383171778029bbd0d9e +EBUILD libreoffice-3.5.9999.ebuild 13979 RMD160 babe6b644e4ad99cf5df7139a6d8da63d6584d46 SHA1 abffa2d7b2187f9d8d4413acc4da180385bc2a65 SHA256 105dae10efbbaedf10bf2f02c019275f148768b2f0a868efdb52a0e8a8117b85 +EBUILD libreoffice-9999-r2.ebuild 13977 RMD160 2b0e283f579ecfdeae9869d55424d9ade103781d SHA1 1af24719330f32f7bc30c1cd01db5aeab6a37add SHA256 e458a05d2419295fbe8aa5d871ff8b506c6e40da26af6565c2a8be994d7f6c1a +MISC ChangeLog 38548 RMD160 7ae059fd3c5c81be68b0d34492a668de3ce62771 SHA1 55b800ea6dc3e80c204edc8fee3e07658e8057ef SHA256 54eb112fbd0b963a78a6e891dc0b53be9f10936699a3796d739bff1de76d2024 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJO3jqpAAoJEOSiRoyO7jvoSpwQALCZscRfZAZOwOpKDQS+qbBj -9jAdtRoaLCQriqzrGcTSlMqXY7RcDGARY/GuQblRgOFtx6gAmdHsgrJc86nFi4FH -aBoHWOrVeaSALatlpX5EIoT0UWfedS+CMaqXgu9TeIuwWKnFCB0bQnSPQ4+iAz4Q -WXsRWo8xO3JMCvWZGcK2QpaEyeMaykTmrEJlAKIACrUCecd2ZcTpUt5extmuVui+ -W2khTNOkeBYVRmE48+uK/sxnteZgjVUDwYM+JkqP4dT3giA+1SVEjk50iJ003L8d -jetg77WTv1ikDOb7R3zU4l7Xat5qxF5XHgoW+OtL4fZWLtFX472fRK7SxESt2UDo -cTxopVBvaKsnwVIbFo8hHWF5kgWzFjYR+uf3wxVw+x8ZnWNfkTLrO/50B/ivSufp -HJnbABjoo1uhKG6bu2+hlXL4TpzUonWiPQ4bdfrtNnVJKohrlX1roBqGjNX8HAPD -dt6xYo9vokBlGTP6V73uw6mBSbfQW/2ofM1GdOQDpmUIBREV04w/dOuAUK+rXiOa -vahjDYe3Fgq442q9CAoXP7DSNsTz84Q6WDPQ5Kz51k1OjpfaXHcqE5sninOOkK9p -VoN/T4qRHAePNZPV/NMu24wfbeQ6TAC9VYAbxSPfIfU+zTm6FR01SNcrpzFDJBXz -SFzVjQE8vFEllGzliS3k -=ksWB +iQIcBAEBAgAGBQJO3j0UAAoJEOSiRoyO7jvoGtUP/3nY3pn+7U5r8TOWM8GEKcZa +Fbdnt7s5uSghLQaINT56DqWgs1bW5g7tsMwDQFEwoMxcvcd+YhLGu5aCc0GsPo3q +kkSxM3tyNdGhXbZywmb++3mB3rzPSe648GhD5qOj/35JPzcMFG/Jhtk/Z2EQfxbz ++SS1qiJHUvizO2T2LqJtAhIim2O2SNFVnnz8bzgZtu3IWLSmpxI/sdNTufxjTqJN +mO6tscpwiUVxuVH3hGvYTaTUEX+z13Ea8a/uXdM+i0V5FkfCMJ4gTduGGeb9RYR/ +sesRtBYUVFv5jlrj9w4So6Kufjjia0NmryDczeJq3SKkkiG7SlDJIZ4ZDXsXx7yg +GA0Xqk3DVp6aPWqmTfeZKyWqdCTpbR+hK/shqtXmMY3nAeq0sMuAZigVbk2/1+og +XNODfL+cylDwjN2m81JriKILNKD5oQaD6BbvW7wVpYIwCUtBpkzBD+F3o2490Rqs +5pEMZS0siNQ/sonL/smtStOzc0jCN+doKd2ebEdHdpGq0xte6jfEg9rNdNfTKD67 +SOxutSGVo4YZexmAMdbY4rPTDJv1ZoJwfOAGHK2Y9dYgx3SkByuKGQDZlPtZJDpX +aF8wmgm4KtMGMUVuTn8V8qKfqp8nj5sP3iQH8sa8vjDNvp+YHzfxZlHws0avzkg7 +imsQsIyaM+Zn6D9sQrby +=DAwc -----END PGP SIGNATURE-----