Fix get_TIMEZONE output #519256 by Daniel Kenzelmann.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 25 insertions, 21 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index a6672cd30575..84cf2f36ec18 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.307 2014/08/07 00:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.308 2014/08/08 07:23:09 vapier Exp $
+
+  08 Aug 2014; Mike Frysinger <vapier@gentoo.org> timezone-data-2014e.ebuild,
+  timezone-data-2014f.ebuild:
+  Fix get_TIMEZONE output #519256 by Daniel Kenzelmann.
 
 *timezone-data-2014f (07 Aug 2014)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index c5b78fd9e350..3fdd90d5e759 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -55,24 +55,24 @@ EBUILD timezone-data-2014a.ebuild 3829 SHA256 cdd7615b033bc89ba5ec0d753e0c78a5d1
 EBUILD timezone-data-2014b.ebuild 3845 SHA256 98f1ec5078de19b37523defd1d9fd7b95104be91a78a9a39074ab59c08ed9f4b SHA512 25e0e1ba617de25d96c275a55891fcbf061af95bfa9714c55cd62be4bdadfd9f97ab82e2414892defe8f51734ae1117101059751f927633c855fdb8fb2179259 WHIRLPOOL 7048542b8256c9997589e3b2bfcd4d65b8eca6db814109dc2699b4952faaf055c297aef4f80a7d58d058028d621b0e7b52a90b85be7a95f568a68de7bac63291
 EBUILD timezone-data-2014c.ebuild 3842 SHA256 0ffbd0bf80590896251064a833d858065e69b7e0b1a2bf6f8741832f0b7315c5 SHA512 a017053ec5cbd34e6471106aa8ac42c8978181a752dc3b95e3d9aa099685126790bf897606a59a5c816e7f73110a05b15ac61d56ce98be5a8868b6d8e822aacb WHIRLPOOL b8a7b933ceb56e38d285188d822518cb26c06b4cb8eed21c4632555163aef38c13f0cfcbdb654a27875b7026dff27c5759a4c5b25945299c536449a3e95e8840
 EBUILD timezone-data-2014d.ebuild 3832 SHA256 e1724625907f0855e7b83dab183e21cbc771570b26657ceeae898781305b9d88 SHA512 fc882f48682950f3ba4b89cd2a44df02e7685d382b24612159bb9f4477da5af88fa9d2f513d47bc2ba75beb6565737fa25e2e4ab3b65473a04ddaf25833c8b53 WHIRLPOOL 07ebbfbe9b693109c43259a8baa8729044593e7f634d1468a5cca685d2422ec4582be244feadf110b0029d33bfe7154f2207af35dc9d80fcfe1d2a5636e60322
-EBUILD timezone-data-2014e.ebuild 4436 SHA256 265b32c903c98da0e9d4fa164659cada8a137bb74e3fd8d9d1bf5fab742aadd6 SHA512 fbccf002ddbd5dda6e0efabca298fb5a129697a3aa4552f37a15724873322e1f9059a68d2784e78bb20aec6bbef9a47703ca263a9786c441aabed1ab763a71f3 WHIRLPOOL 21453c74aa78a51c7b1ad2d70ca17b023f6a839e571d7559dde622220ca368039615d340526627989fd7892be1c650c5389133b26d8b9b80d169cd782b790217
-EBUILD timezone-data-2014f.ebuild 4436 SHA256 5cfd9609726822332f8592b2be10b6dab853015734b082e42ad56b963130b80b SHA512 52855a130361aa89b087966aa7005b54f5ea78bb51ba4ec6751b911fd2a8c69ff3a173edf3c7a8d6d32a05661dbea273959de739e725c3dbe45285bb27e5a551 WHIRLPOOL f3514c2f149ab3d1cb32f95d546b6274f3f781978e42d9764e34ae804954b49b80503eac3bd4728e5bf43fcf88b7a18e90e2debc1f47108ec589f2b3aa7ae491
-MISC ChangeLog 41385 SHA256 970ef3ff0252eb58700bc7aad90adb1f9bf667f28bd01718beee36dafdc05608 SHA512 fda1c2f6a198ad65b7f8d62e75750cc167455be4f43ab070867a48bba2036a89b30f65d2a02ce66451d24a04ceb9b0cf3f14e28a4d51d63e5a48beeafb6ff552 WHIRLPOOL cb6517aadf6ad5d7b21d32ab4a63be948d73aafea2e944de5c05df4a8b5219f3c78f0af43f657e867d70d0a5fe8e4ada917a961b17905fb9b906ab0ef0f91194
+EBUILD timezone-data-2014e.ebuild 4464 SHA256 be14485512201d7c39332c8fad06145144cc237cfdf884c862a7cef6a097083e SHA512 79740e607f82f4acd163e5cf67a7181795c25498622700f9f9ca0deb9646f5ad8a9cb434ed8cd2eaea6646e721c3ad0b799b4f7b51dc053f15b47f30b0483adc WHIRLPOOL 94c1f541b47cc1ae8d9bf5453b1c739df01339bfec6f3910ae4c7dd6f19f95d17ebe1ad2e5a4dbaafb7741d0d9f4f1e7a1f09c150a06d47e3794a7141f7296a7
+EBUILD timezone-data-2014f.ebuild 4464 SHA256 533348167d4a2387531220fc50f803a699f7ef3ec83b75eb65668aa007d95896 SHA512 d42ebc5d319bb27cf825d9fffd8813e6f5f1e21534ac88eaec0c3b5670c33c494e7d5d40a2efb000aa955305c57bfd62e16153c2ff323bc139926879da749259 WHIRLPOOL 7eec94a71daf8fdd32baf0abe7d89af5f61d4055832daa40d611b2979cceacaeea82bad99fbae9886d95a7cbc2aee507ac36c45ad318a9be3f58ddfcc1ca0e72
+MISC ChangeLog 41550 SHA256 38e6a6d7e051afbed255082d5462cdcb1660efadf5377062bf01d5a3c795a4b2 SHA512 19872c0be99110e3db0973a8b256c56eb4e7609799097efb47f4aa4202655edc17bc38066786d1c5e2d009bdf4a9d7de9b1fc3f27def58176ea524d33ebf34a8 WHIRLPOOL 47a86a8ff44ec35f227cccb92c753614b4ccf4a146b4a0ea72d82058f110ed22330717db887e6131ac2c23a403dc274acaaaf9d6b64fa310c44dc09c8f08fa07
 MISC metadata.xml 472 SHA256 4ab35a5283c62aa867e05bcfdcaeb90e5ac191347a32735d37290885502a2511 SHA512 f91ce6146a369ddb6ee82c0d6e221ceb1fbe9beb073c2e37c27b07e0684c701328891a51f58ef9fefea6007e0111979af7034787b167735fb6d79c8462d9dfcc WHIRLPOOL ab3bbde9fbc205a887f591b7362034b01081c9a477dab314acfd92b4aa4b7e010532fdee7b2684504044fb3df2e8e8d09466d67765ec9feff3a2223ff7c54a1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT4sNoAAoJEPGu1DbS6WIAWNIP/iD5QJtJUpIkDcrOOdEKoW+K
-WvlqJUmM+wwvOLb8tve48x7hqTE3fGlQpvMeuEwlAiJDaC8OkroGqwgpmXJOrI03
-2asBvkqPIstYjqq6+jT2yT2lZ0hNfk2vTr5uSjGLKTlSWdXFLaseo/t94twM9CPZ
-I7VriFKHTK9swI0UvBck2UZjVJ5CmqjT4KwIOo/3mQ7gJDsIPx/kBGMi0mDfxDC7
-hWlZJPFw1g3+JifOQ1Kp0uK1XfNUOTxcc3Cwg07b6OyKOsvFafbpcCfW6at5IKLN
-8GTRJuXys9MqlvHWjwH5+tA3olFY6hr+KtFKdxlBg8bN0vxwuujnTgW5VqeKP9IJ
-xJBZhOvHjnkTVhJJAb2/Ai9jhX73o5HDeW9TUp97sJb5+uF2fcu9cecEup75Sx7h
-+3Z5i3v/PAsrmJ2/mCFrZ/8CTcrHPQmItHDhogEZZFqHejw2k08DPVAD4Yf4L5ai
-kmRt1mjwvHcEGoz9BQjXkoM+1ClFmqYHxaI6f5x0AApHS32nlq2i3UA1GuA9b92u
-cvfGuSSARv6Q+DtzthVyVGRyeBLXwjZZ2UWNKMPbF1PpteP/+pFXZyMztmnxy4j4
-dh76nlGUFKj66UyvuguYZyRn+hOBaxYaK03frYAUDNax/6L0XV6O6eF5yzgFR9l1
-h5+Dx1E40LSc3SEYfgHJ
-=Mmoi
+iQIcBAEBCAAGBQJT5HrfAAoJEPGu1DbS6WIAlpcQAJbkyZsJWE4GH6GdFO4qTNtd
+/XF+61arHwgtcbf2uzPMefZV43G5AKC1fx8ant7PR5Y3NaOdnRlsVGRrI+3VbJfz
+8fL7djs9zE8iF1OJxmhDhF0BAPoq0s/+T3TyWU+PjVN6PFVRf9UaJt3w9drw6vzd
+Pf50QAyq8xy+eFFiSXf6rlQ6NF3d9AdefNDVUWhQfI4sUMo2koUJr1dEGZIgc29E
+ocl6eU0Lyi2eTe9FZPKXQh84da0hvAeHQbXF7ANa1zEcNQXl7ETxqxcDgFHsmTLJ
+jaJPtR5avugBWgoXyhxVv77NYHAXToTw8ef3j7cQDkjegz7lGP5f7rAmJGvceNFf
+2cB0hOXRIUw2kEQTCtbpRt+Ke4X8WXcPZKCpfFb4+dJSQss+VApd2xAymFprArwK
+K3ZBqhd2dVZIhtJAfeNAXS1JCiGD6bMKqr81/jTjHy/xr1wU/o28t2Jl3Mdm+pGc
+Oja+LQqI2z4ZYo7psjiUwN2v7FqT/pToS6DH+6B6w8UH5D9D/AD1syTTEHRMDGw5
+vYXvLL8lY3ArwwIiWZ2GdyOaO9PTKwoNA+tEuSLr0aIwy6rewsv7UV69M8OETMcA
+J7XGaMGWnFDlY0vU2WtFyqWRyGERspjXCF5wPRjVvPt/xWVeXG1dJERuDCepd45/
+VdD9BRhYopBvMoex5JwG
+=EGAV
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2014e.ebuild b/sys-libs/timezone-data/timezone-data-2014e.ebuild
index d995faeacea1..876f952fe832 100644
--- a/sys-libs/timezone-data/timezone-data-2014e.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2014e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.3 2014/07/30 06:46:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.4 2014/08/08 07:23:09 vapier Exp $
 
 EAPI="4"
 
@@ -101,7 +101,7 @@ get_TIMEZONE() {
 	else
 		tz="FOOKABLOIE"
 	fi
-	[[ -z ${tz} ]]
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
 }
 
 pkg_preinst() {
diff --git a/sys-libs/timezone-data/timezone-data-2014f.ebuild b/sys-libs/timezone-data/timezone-data-2014f.ebuild
index 10ebcc314a13..00843c14ff23 100644
--- a/sys-libs/timezone-data/timezone-data-2014f.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2014f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014f.ebuild,v 1.1 2014/08/07 00:08:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014f.ebuild,v 1.2 2014/08/08 07:23:09 vapier Exp $
 
 EAPI="4"
 
@@ -101,7 +101,7 @@ get_TIMEZONE() {
 	else
 		tz="FOOKABLOIE"
 	fi
-	[[ -z ${tz} ]]
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
 }
 
 pkg_preinst() {