Die when there is no such dir with translations/help.

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index 008998f8e45100d2b1df7d0c927523599d129d6b..1264e054e3a36f673cefb0cd90faf8cac222dfc5 100644 (file)
--- 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.5 2011/09/06 12:51:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.6 2011/09/06 19:24:43 scarabeus Exp $
+
+  06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-l10n-3.4.3-r1.ebuild:
+  Die when there is no such dir with translations/help.
 
   06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-l10n-3.4.3-r1.ebuild:

diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 13332931e7ae2d53f99557fa2fb67a1115869a9d..307e397ea5a03426d8cf2982ec44e7207f0620a5 100644 (file)
--- 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 3349 RMD160 0950badcf32b72e9bfab65c484a91a06da78c7f8 SHA1 884918f1820ed065aace79b188967b1040ce5305 SHA256 b50a8cc84dbff2a04364ddc40948a4f496a40d8f2feb806fb1e960904850adbc
-MISC ChangeLog 1104 RMD160 d69a956217bd35466f20c483295753094bc34d5e SHA1 240ccfc81a7b971b0de966e7a023e28d3fa3882d SHA256 9f3a38225c54a8c1a79f14f64bb4367250734eda4ab158ee74fc79cd213480ae
+EBUILD libreoffice-l10n-3.4.3-r1.ebuild 3477 RMD160 e23e7500c035c10d2b1389a280250803ce126b24 SHA1 0d25552c10c68382f70fd2383b9c302fde228cc5 SHA256 cf9728dd03cc5354d1c88bf2df5f84831f8c20e86dffdcbdf0dbe3de3c3d3e49
+MISC ChangeLog 1252 RMD160 454f7c84d0dc1514da07be4c4c490a6e86f1a9b2 SHA1 427c31d866fb9fcb3b77f3eb7ef648302c18a674 SHA256 cab487aaf893710cc29fcd815b238317cdf9c7767bb66dbac0ad5cb6dbda676c
 MISC metadata.xml 280 RMD160 b78a155215ec280b8b95fd2765aec06affdeb1ea SHA1 2236557635125ec389aee93c5cb052475a1ce472 SHA256 23e40d2f7f689371ad553226289772b45b7e8063ce88025615e5d86b208173df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-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
+iQIcBAEBAgAGBQJOZnOBAAoJEOSiRoyO7jvoTAkP/jAcox9iPALP2fqbsxn4URmK
+GkTBceoWo3xjsLPsiovO9/y/5hIldvEyr7Tgc/PL0S7XL0KvrhUWWseSqUZbDK8c
+huonheGzt5GYRMcKb1IaH6bFbMAHyFfwRk++5oL/nHvrIXUumvJdGQQMd/gIIGUU
+R3MYhTImUGzARlWNlzb0KpswKqI1OSX/F9NP4c5mR8iqeS0eHyTutKNbIoRbOpDi
+Ig9TD1qPpg1XrOOaK1jj3ukcMK2Tx5/Dyw4prW11vJqzoX5Dz9PGwHLB/FrzaqUH
+2FpsRI61wtY30WmlKXipDs+hpfyNeFH4jJQlUjqhV2fJGqInotkvPrCHgvkt9lSs
+vGlqbrtqMRHiwFJht3tOIFvJ+8a9JwkbGOCR7pXXhcStg/DwcJJFgm+qxde7IEgT
+0Bxc/U+aRYSR4R3Os0KOV7iDriDW2POWs79e0EabsVRpSFtp+Y0jxeHDsxMLTWcN
++EHz5BtkW48jmGIWhwZmV804cgCYgBZgX/UII3ZKcEJkyj5qegW2pt2ZxsDDEvJt
+VxTmY6Swwdi8u6c2tVZlhyCk2e1wYbmEF/juxIia77ICSHYDkoDeLpI75K3BP2U3
+ODZDSE3IrANWGMnR6YOjo/r5UkEVOF3ma6grck6GlhZisKIx6KiVdcyoS05pAoPS
+v/+eI86qv35OF9jRgVE/
+=OQKM
 -----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 54f187c49bfab1b2be4cc9cd348100da5c29eae7..2910767b157dc86a823d42c614d0f6e2ba034222 100644 (file)
--- 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.2 2011/09/06 12:51:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r1.ebuild,v 1.3 2011/09/06 19:24:43 scarabeus Exp $
 
 EAPI=4
 
@@ -75,6 +75,7 @@ src_unpack() {
                # for english we provide just helppack, as translation is always there
                if [[ ${lang} != en ]]; then
                        rpmdir="LibO_${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
@@ -82,6 +83,7 @@ src_unpack() {
                if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
                        [[ ${lang} == en ]] && dir="en-US"
                        rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+                       [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
                        rpm_unpack ./"${rpmdir}/"*.rpm
                fi
        done