Fix the case with empty linguas.

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

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 7ced66e3c465b2cfec561ae53e38a64575492d81..638051e4d8785241907b8b27aeba48d2967426f5 100644 (file)
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -422,23 +422,23 @@ DIST LibO_3.3.4_Linux_x86_langpack-rpm_zu.tar.gz 1915795 RMD160 8cca07c2b4fd0c7a
 DIST LibO_3.4.3_Linux_x86-64_install-rpm_en-US.tar.gz 168465443 RMD160 dbc898954190027dfb63bd18d061a497fca03f74 SHA1 228f951a8503100ec94c49def8b4f1cf7f82f893 SHA256 0d9003225816e2d130e9454aad186ce851233abc5a027bc84057420211429db1
 DIST LibO_3.4.3_Linux_x86_install-rpm_en-US.tar.gz 153607902 RMD160 9997288695e57281b518bce94f84b4483c71a07b SHA1 afb281927057b8b3a708291c12013512b816fcdc SHA256 69db7f815ca396fcbeb7d4c37a3f582ea4d150215019a976aad0c6feff14da3d
 EBUILD libreoffice-bin-3.3.4.ebuild 6973 RMD160 77e5b05e09157fa15b075ff26005dc79f40857ee SHA1 d0f295697dcfbc94cd4562a722370c0bd15de04e SHA256 f1a82b62e0cdccb061df37923f9cf2fe7045cb5f5d7bf82d274510a640d00f85
-EBUILD libreoffice-bin-3.4.3-r1.ebuild 4847 RMD160 8177930611080f3ff9479ae712ca5fa0b08dca8a SHA1 34b84aca5ef46ef1d99f65f0f11922ff4763103f SHA256 8b9380ac508063aa48ccce88a5aa2088440f1c50f785e294c6b75313fa9aa947
+EBUILD libreoffice-bin-3.4.3-r1.ebuild 4850 RMD160 ddc10db0bc98226b7962f81022b355c2c7efaabf SHA1 cea18ecd6543091e9b22f92e40555ad3b9aafc7d SHA256 389d0e49db7b1649e3d1331c6a23241b3f91c53a138e3c52b9f52e0c54308d96
 MISC ChangeLog 6104 RMD160 0d4b2927d4c095ed16c2724c316f291830427ae6 SHA1 a34b0c840f258999fac318ef76cd50bc6dd2ee27 SHA256 23e05112847c818594cc18ea162549dde00981181789f78df20346c3210590a0
 MISC metadata.xml 474 RMD160 7104bf15d70449529df6259b71620443392a14e9 SHA1 a4055e99444213fea16f282b2fa7c25ec0b21be6 SHA256 b92b55b2aec0028aaac8afdb01f4b9ea416c8e00a2207dd8d0db317e4fad48b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOYhYWAAoJEOSiRoyO7jvo3mUQALGDL1pfdiMgIORxGS3Uvy6H
-lFEgspPunOkG0DP9Dp/wwIc3+e8v+OQsrfNBBl+5abcayHKAjGJtbpmN6S0MEbEr
-e/UTs8TBlSAcMD4xiBEHYH6IxMoxrErryap8FtoeU6Oc+/9pCtL6WhPDZ5E+L0fN
-WEugFdgWGPWjJgKEl/WuOokzWPzqXfyVA8WcRdMbOFCgSR4QFpEnwOuNOvml3W8o
-au7oeFkGuc4hWsA4e2S6ZHf50FSD0HLa0ssvjHjBFM5sKZzaq+FsUTod2mO97+ml
-Buz2h6yMsQDIwSW0xj/RwXbAweJS4/ekHSbUS0UbeoX/jckVrdOFSMYFEQoAPKLG
-wJsxrPK2AhlzFhEAvIoRxxmIZGmQLi0CBwzV9AbTjh6o+VR2fFUWS8fKGcu+WUx7
-2thot0fJyLv7kXmzdW4qdiidWkYyuRuVUR1mi1BHLozs/OncqlgXTm3nzgh8v1eg
-tuBlWYgoJF7FDgH1+aOVq38pDD8F0fXrrXv6q7mlvtYRTNUrrd0eDqE7zDOnjSJd
-2l200QONpglbPUE3OfSoS/UQfA6sAWZ6fk/pVXpa1VbY1V0laJY9Ryj3HkXOzf1p
-L+wI4y6ZlmJiD5Y0yJwJZh8iKa8sElOMWLj2r7yAcTmHbLNglfCCLwo92aHjymjG
-hqPtvO3lhbkCEgeHjaZe
-=YFcU
+iQIcBAEBAgAGBQJOYnvqAAoJEOSiRoyO7jvoSOkQAIdCJO3woEfDyaopPxcJNnC5
+sNJHo1G+XD36z48Jb4gjrkqtRXPtcXX3Vfx3gmRW7JJ8omVcLIFM+EN+e2FmiCyi
+oH5nrBkgj85M93geigdrLIG4pV4UYrDSoIVBIA5vS9sx4VMi0B331dugM1Su/dRX
+Fyb569UYGsDH4XvOAw4UI0mI3Mjk3h+b8yI2aoU5UOxTObEYwAFi6X82+7FSZA0G
+VMaNy/cizaAK3MMxll0RBkKwPe7KsNz2LPvybO8mPWmrfs6mT3Ve2Z8LN33UwnZY
+WpIKT4BYzEV1PjbOiDKdIehWlu+2Jj8bvjkFHPsoLKHsP+gdPnsy2uTJphvOW4OI
+YRWJ8owvXI1XTCE25XbVWgBkVE9oN2OiCiObc2Xs4Vbi74ZFxw6wo6bvqAQdivYl
+oF4itPHm3hR1x+EO0+yeDF5e3FIvkqjHipj7kGyhNwwOvbejkI2PdxgS2CtgHgmd
+hYVGQwvdHz6unOjgURsJfNREQNl0csGEjAGmNyZvSmhPolKXMz1Lq2WkekNQDF0b
+xAd+idexp0wI2EqxIPLgZly5fExMJ9x84TKjNwS4Rw8SLiKIXDMlyQ0xcVdGuYQ0
++9M9J/0Wy3kaXpcFySLL0y+804DuR00oiQZVOHEiAoNw1j1ijZeWyxbEBi+/XJ8p
+aW6NMAOetNn/44VO6vpf
+=V1VE
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index f37df79ccba4c3ba14541415d2f5e062caf9726c..7e00b623be23ac1b26b15a95e1ab455b914e9f21 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.1 2011/09/03 11:45:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.2 2011/09/03 19:08:10 scarabeus Exp $
+
+  03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-l10n-3.4.3.ebuild:
+  Fix the case with empty linguas.
 
 *libreoffice-l10n-3.4.3 (03 Sep 2011)
 

diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index e16bb5d076370a613648f238fb072c675547af7a..e574e3224e2e165915af6e6d22f3b56200f746e7 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.ebuild 2836 RMD160 4c76706649a6865822ea4ce02b69e5b1a3862c31 SHA1 f873203245a901fc737a19f39d12b8b2fd5039c0 SHA256 3faf7b23ec8cd8487150e4f37f64955b55e35ca92aeaafe9fd1752e0de3434c0
-MISC ChangeLog 470 RMD160 302ce95ccd3b8c3c9d597a1f238b017b9bf9a7e6 SHA1 1f5e914c7be05dfe92047d3918d68eecdb897e9d SHA256 38b30c7ff2c37d3b93d9493d62ea94612472900008028808aab766627855e0b1
+EBUILD libreoffice-l10n-3.4.3.ebuild 3037 RMD160 2c26eb04fc91dc42b36595d6eaa1ed18505e1e49 SHA1 6d5fc13ca4fe0f29b15e821654920e156f3bf096 SHA256 00fbc73ae7b1ca7385509dd265916b8006a9cf2f08b35bca3dc4623388dee935
+MISC ChangeLog 594 RMD160 ac3eec32ad7753ad7cc6c7fc34189e6a0491ab16 SHA1 1f3a51bbf40f56bc950ca3a2ab961c2d828f0ae1 SHA256 9d5de4a18b9e67577c008582573f18b5c023e67783caa90f5808471f27b7ab4b
 MISC metadata.xml 280 RMD160 b78a155215ec280b8b95fd2765aec06affdeb1ea SHA1 2236557635125ec389aee93c5cb052475a1ce472 SHA256 23e40d2f7f689371ad553226289772b45b7e8063ce88025615e5d86b208173df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOYhN7AAoJEOSiRoyO7jvo0G8QAKtSbdbhn86f/FyZWiZPd1sz
-2yzN0hGw0+TXMrOoShC932k7HxsNKfKqcUOfQi7Rxz6I0py5DtGSn2p13C0mnorX
-6C/OrFMi2/UuNGWX/lhhCaxo2UnVzUq4A9cqNNz122KOOT2wTPUzmNIwuhD8WWk1
-OVx6t8lLhU/0yIvcMY5cVytmNFUj0H5CsM/0xfdd2lJ5dm7tj0FF5p4GcXT5uD+c
-MkO+PfLAGFM25IjpQSOlxnTMXq9R9wTiBGVusvA2m7NvbRLkOQvM4cFH0aoRAwgZ
-2AWq12ea1lMa/JSAR4fh360Gax3Z0kojKlF+2y2Q/PqoEz+oppBCiscOzFxQeEiK
-+mf88RzOc9vwt3dkSe769e/w6FKBWGAjROVT6bFaWeLcKM2xWSkCLBXUnUFOF8wA
-3B9exPFL+YdrCS5Q1cbNcFpkjIMNqEefw/c9at7UYjzAymqxGU+obXPDNQst+uba
-xiJJlC8hHeeSxWFFy9dWlNelOYLMHTvij9aM2sSBqDTvOCZVsjZGrr24qiAQhPaX
-N6y++yYwQWI4G3C6bZw3XezaKOXsOZBUjLqCz9fUnTd4+dE7TodOcJl91GrEC0na
-ya+niAGpswYE9byIscxr8ekL20yiCHH4kxpUZ5n9ao4iGKg96jL2kgjdhdviGomm
-l3Rtszer2DLeNCiBijGM
-=3x/4
+iQIcBAEBAgAGBQJOYnsmAAoJEOSiRoyO7jvokQIQAJ1kiT3Fa3M2DETzAGNfoAoG
+Zwlj27lOZ+imXHcF323wZssd9B88aFr0I64KJu6C3rtGOUu+XOpGxVeSEd5Xttue
+HsmqEoeQWADKS8QCXvZrWszAceRVa90t+NsK6w2xg30PMecU0MkDiKJzBCIC5HMn
++Q9otCJlKv42A1XhkM2tM7xjua2uZLxTVANiGmXcTFwHtwFHWPB57emPYvaN+1Bi
+UEys9UYPvjTdNBKsQxqFmXCarx8egbaEgTkpVz+bUehyxOB6ebCCw9I+7IpqRGR7
+hnpHHpIAeDGDYSkuYJq7eJxa0bbkjHSY4t2IdUAuZJM0Hn6s0debHL9PjQS4b5Fi
+K35LcLNUE0IUfIJ7BZYrvbELnUYq+gNsAK50WGDKtAEbvfMyiRlLiZix+jkHWU6P
+Da1JBLUW73qfp2bipRbjG35WS8SQsujwKLkqWuM9olOhDFoIidux4Bgn/vc3jZ3b
+rBE8r+7Ko0wy9USQrERrAJjPRKYKUo1ilnacoH4rCAXsSDIUetqVW42vSZPuyVQW
+rpMd4rZqVSul0taiTuOd+c7T9yKo0XAJ53klEfcwICW7/nydWKCWRvI7qNx+R0Qg
+nSzPcogqtwRYE5le+7+xFA4sQER5uTngH/0Bcmk0ks/mEuUWoodaI7/czfnSIS8a
+R19NRyNHm6iuWdif68Bb
+=MdjD
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3.ebuild
index 73d8b6e0b0ef8f6c219660943569cb4dc262d4cc..c3317658f416360a5a3a0828cbaf90953b03c393 100644 (file)
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3.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.ebuild,v 1.1 2011/09/03 11:45:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3.ebuild,v 1.2 2011/09/03 19:08:10 scarabeus Exp $
 
 EAPI=4
 
@@ -84,6 +84,10 @@ src_configure() { :; }
 src_compile() { :; }
 
 src_install() {
-       insinto /usr/$(get_libdir)/${PN/-l10n/}
-       doins -r "${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
+               insinto /usr/$(get_libdir)/${PN/-l10n/}
+               doins -r "${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/*
+       fi
 }