From 340700ad5c50e17249eff255273f61fa03ad06c9 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Tue, 6 Sep 2011 12:51:49 +0000 Subject: [PATCH] Fix unpacking help for not-supported langs. Fixes bug #382031. Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64 --- app-office/libreoffice-l10n/ChangeLog | 6 +++- app-office/libreoffice-l10n/Manifest | 30 +++++++++---------- .../libreoffice-l10n-3.4.3-r1.ebuild | 11 ++++--- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog index d4a6ac7c2603..008998f8e451 100644 --- a/app-office/libreoffice-l10n/ChangeLog +++ b/app-office/libreoffice-l10n/ChangeLog @@ -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 + 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) diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index dfc392d83400..13332931e7ae 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -154,23 +154,23 @@ DIST LibO_3.4.3_Linux_x86_langpack-rpm_xh.tar.gz 8219580 RMD160 d0275c82d5078c57 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-CN.tar.gz 1772291 RMD160 19218e0cf581a0381662008a8d48857964e9ac1d SHA1 31780f19f2ec0577a73586c5e14020e95a815ebc SHA256 5f13189f7f689e71fe2556dca8e53240af3d7df91839de368c57b330545c7033 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-TW.tar.gz 1764731 RMD160 33de70443758e3cc38d62c254ea1bc98574f2bfc SHA1 d813ab13c16fba69e549b143d6948f08b1c0d62c SHA256 e1dcba904952b3feef0b9c3957960c49cb6d720b1d135becac1ddc71e67344a6 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zu.tar.gz 1721114 RMD160 058a2e21902ab9312464c9976ed6fa1edb341afe SHA1 0875fd47bb40fb0875c5c492cedcca60917dcee3 SHA256 5f866e2061b9dabee78a81fe9743b539e25a725d17312a66eecfd0139eab4a65 -EBUILD libreoffice-l10n-3.4.3-r1.ebuild 3345 RMD160 89d2100987c0093fe5408c1cbb7512568759bb2a SHA1 50c7a118be07c404612d5621db3acafc04ed15f3 SHA256 60914af4039f4ab5a609c27c7ffe047e9090b046caf7e3635f68a0ebb84d0cd7 -MISC ChangeLog 947 RMD160 42ee969b8c2b61712d90e7a84eab82b3eded9b86 SHA1 dc89535a70dab9de66e8ae9dfa50c9a77444c60a SHA256 c03c3ef576887fdbd223e2d78bb436c501e135d90b8a52542314069b8c2a914b +EBUILD libreoffice-l10n-3.4.3-r1.ebuild 3349 RMD160 0950badcf32b72e9bfab65c484a91a06da78c7f8 SHA1 884918f1820ed065aace79b188967b1040ce5305 SHA256 b50a8cc84dbff2a04364ddc40948a4f496a40d8f2feb806fb1e960904850adbc +MISC ChangeLog 1104 RMD160 d69a956217bd35466f20c483295753094bc34d5e SHA1 240ccfc81a7b971b0de966e7a023e28d3fa3882d SHA256 9f3a38225c54a8c1a79f14f64bb4367250734eda4ab158ee74fc79cd213480ae MISC metadata.xml 280 RMD160 b78a155215ec280b8b95fd2765aec06affdeb1ea SHA1 2236557635125ec389aee93c5cb052475a1ce472 SHA256 23e40d2f7f689371ad553226289772b45b7e8063ce88025615e5d86b208173df -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOY0WiAAoJEOSiRoyO7jvonuUP/0W2H1d7WJ6hkAe9CUI8Co1f -LjF7kgQ5atqwttBnSjI9i/STKXStlsIepodEJcohFzv8rzwfIp61mWdi7JqxmHl7 -BK5Ob1aK4V2btoCy7To13K8OGsV6+m4t9jWsAK8+Al44KnwJOp96qPIpUWBhAxUs -jVsseBfS0RKcbhv+r5nwLgxRJZOZjs+GDix/2PPigJThy0UsrysTDtnQFpfHiVm4 -yeofH+0+HeJs1XstlnBBv6VLDRvBNax/oVjpf7Q/Ac1kix5rJYE+cQPq7Fue8/ax -w8VIdF8LXuC0TK++9uEqgJzXpdI8kt7hids/IdcfRUAcyfjKltTBzK0140it9ZCf -0sH/WCumLKZPh99n7BkH3lrP56siwghALIcCXGv2CaS4T1mHWRQaRwvVG0/z+Dr2 -txU0dm1LuUb8vOZTyEN3Kwv4QC4wiBH9HgcmY42l1Qo20VHXdZprZXlP/F/DtMMP -KsXRKIlIwaq+q2Kc98nqPBsE6BuVpblpP9Ec2R8bf5FDDgH7j8Q6Zm3ZCOxHNlHC -2u6D3dGV2T/KYHAw4bqe+ESqD8dkTo3nAnn88cicdlgAU/m4oHEKmklKjVxIMPVT -oSAfL4QAr4asLGO2YUIonf1JNopWrYs+t7GfHKZmUYRioAVG0doO53Tx9hmrYWyk -d5GGq0BJ2+Yhcd1kvyzW -=RocG +iQIcBAEBAgAGBQJOZhd0AAoJEOSiRoyO7jvo9EMP/iw3ryHSfUtKNYLn5C1CJYeQ +e312rd6XcvO3Ra2KZHkAWcBQu5mdQh4MRiDFapfHdr6ojjnCoEQnxMUzCtH1KJqQ +MFMAjiPfEdLwl3uSOI4UsT1EL5h8nA+AE2FKPsEeQ7Hn8mjOuIC/j2JQGASqtiXA +5A2JITy7l/nPqwJ19QTA9YxBwUBz1Yzv4C6W4OlIBgJ/e61Dd5v5iV+sAQ3yIrdq +18+PVQs5mOkX/I73Dc1YXm2gWFAFLEIWTE8lU+Pbet6UyEsUVQ8e0OQdxkG55H0S +9WlJJ0jy2vaSo7sDsMzT8WLfu8A3QEq53I56IzMousfRGjQ08lzkq2fExNK/9E75 +k/lnW2b0UbcevIxEmxiWq974KEebXl2R1+0Nf5DDo7bbFYw5HS8IwT4TzdAYKGmh +Bs0zmVfXZwI5fKnG45Re/nBgEup0LaDce+GDGxsp9xomarVp2NU3Rr2ySUtU/xc9 +cBs6BgN8r+D2F9tSa0W/vvSot8lw8E6GjvIt4nP3pDXi4dhC/9G7Z4M1Fe8omybe +JJILhf2L/iLRFlnLPGe5jX7xSJSwscEViXZdhjuK2tWd0JLE3n4JT6gsPBIeu3XB +1jYBIy6pGmcMgFK2NN/JrVG/jTMdV82DGctjL/FvoXMXLinBQnm5GIAbjxZGlnN/ +IjDCXLmpXyrgcLwf3vuF +=GsIk -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild index fad7db0b2d1a..54f187c49bfa 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.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-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 @@ 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 -unset X RDEPEND="${SPELL_DICTS_DEPEND}" unset X SPELL_DICTS SPELL_DICTS_DEPEND @@ -80,8 +79,7 @@ src_unpack() { 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_configure() { :; } 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 } -- 2.26.2