diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2015-02-14 02:27:35 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2015-02-14 02:27:35 +0000 |
| commit | 25c5aa3d15a64c93675e2247542514d9dcb63248 (patch) | |
| tree | 9a504aa76dbe67f139de86066816b8760810d998 /sys-libs | |
| parent | Move custom autogen logic to the ebuild and call eautoreconf. (diff) | |
| download | historical-25c5aa3d15a64c93675e2247542514d9dcb63248.tar.gz historical-25c5aa3d15a64c93675e2247542514d9dcb63248.tar.bz2 historical-25c5aa3d15a64c93675e2247542514d9dcb63248.zip | |
If /etc/localtime is a symlink, don't replace it; this breaks systemd-timedated timezone reporting.
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/timezone-data/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/timezone-data/Manifest | 20 | ||||
| -rw-r--r-- | sys-libs/timezone-data/timezone-data-2015a.ebuild | 11 |
3 files changed, 17 insertions, 20 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index 9ba9a99ebf52..2ce9a425d73c 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-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.320 2015/02/14 02:07:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.321 2015/02/14 02:27:33 floppym Exp $ + + 14 Feb 2015; Mike Gilbert <floppym@gentoo.org> timezone-data-2015a.ebuild: + If /etc/localtime is a symlink, don't replace it; this breaks systemd- + timedated timezone reporting. *timezone-data-2015a (14 Feb 2015) diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index c0bc8375eab5..25bc85582b28 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -26,23 +26,13 @@ EBUILD timezone-data-2012j.ebuild 3226 SHA256 189e893f9a2de810a15d4c36dc060bd488 EBUILD timezone-data-2013i.ebuild 3845 SHA256 92a0ec88188d6b037a8b44f4ecfa02a39cd2c6789600291c758c7b71f7b08b3c SHA512 0945048dbb8372333a278c383ed742cdd2795717114e30850daa3a77ff277c3871b09797e9adc5ffecc44e7ac0b0d1d5211945e924a4efc06a6e52aef4980349 WHIRLPOOL 6ae79b2d8acd8858a5ad10c32f4eea08c379f528b33ef72d0b1a9a764fcf5b6c9c29bc416404b1a4882c70468805610d43bb5f790e402b87b7303cbc891af5f8 EBUILD timezone-data-2014i-r1.ebuild 4387 SHA256 9bd6c81988e70db63fa78b58bec3c78f57cbb647009333ba30989948277a133a SHA512 8a2f304411208a5417940fb6d2bd2a83450e6e6f309d9993b5ac352b26ba28c2e878f556bcd52b441978025173013fe6fc6eb58b2e9059d31b0ee49e9d838a25 WHIRLPOOL 695585b9f51f74649e12b20185e0b54a8d4706ac4ddb5fc4f198ef697f5ff5de81758c85c1e6cf9682f5e6e9c050bbc336b031e1199253df88dae7a0eec3fdb9 EBUILD timezone-data-2014j.ebuild 4384 SHA256 a7a460664a6e03e31f90a591a9179603fa006bf1b1378756aca01552051b1969 SHA512 7f647e11b2d307f384192dd0fb0d372bf887c25dc62c615c05539fd8e9a9c95d6be944972f43e2d54c32015ad6a38c35c72758996c5e72d61af29d07cb03d6a9 WHIRLPOOL 991a16c94ec780eca86a8caf2786e811ac45a0aa2bab6aced341a9741f0d025f9892a4ea7cd5d392b823ead1e33ef79dd6d6a3613f894dfe82609a34e0c8329e -EBUILD timezone-data-2015a.ebuild 4397 SHA256 7837cf1a88e1bf5bbb97de50768ef8fcd65090e8042a3b83401347a70e9482af SHA512 50eeefc0dac9ffa08c16aa15448cd39c5b3a4dca0924a3cb433ca38f41f17c621a455d4bc2affa90c28076b25990a6adaad83b305863e3bddad7bdf64f4ed057 WHIRLPOOL c0fa37d2271151af41b96c24d27ac4d412c4f4e43df5a45007d8be738c8a3a4452e25956aa29a4033f246c613f43e212d02666414015cc012e60a8b99d2bc5b1 -MISC ChangeLog 43703 SHA256 a6bd2b1d931b6c2044560652dd760ab88ede73e2dca0273f604df16b4337319d SHA512 17638b5adafd0cbd2918e9bfa46482b7b57a0ff09f3a6c366d2b87065b021fc65658a61f0efc8cc766ced31217f45ae1a76afe96f09980589ff8bbdaaae1d370 WHIRLPOOL 0265023d0ee8c45016aab85083066f9e8b7347d81bcee21facc091aa384f8ec6ee9047acc2e09b0c134eacdf4b4d16c5f84cd9520483d0b1baf953c70eca810d +EBUILD timezone-data-2015a.ebuild 4437 SHA256 261856065071e0537dbe67201f569063e85b13554da825352270a9ce5b1e18b4 SHA512 6548a9dfc0ba089e95a741267e8e03ee5f0c220c70f6dd16c3dc50b9b944f4ee739afabb1f6cc4c9cd94efb8b784441d22cad390bb760bc7e6c5f905efe56ab4 WHIRLPOOL 9622da12209addc7cb15d2edf65414f643e65e60177f23b22907abbe75fd0ec1901ce1aa430d807fc65885e7c7e28c2730097ecd6af1e53add565ccd18db8113 +MISC ChangeLog 43887 SHA256 e2fe5f5b40274136890417a963e4dcdc47491cac652516751dc9c6a027577803 SHA512 553639c5298e0039da09f9d439c63568b49076e81f77e7dde15d7a06b3b6fad786734114745bc022bea7dd9445148784f5952049a09ab17db5fe350825512faf WHIRLPOOL 0edcf61fb1340f847f2b98a262d4ab0bdb7bea422c3856bb4bfb204c5f71cd7ee954f2396702358f42ebf29bea997292e319947aabe0e061845ec866650e62fe MISC metadata.xml 472 SHA256 4ab35a5283c62aa867e05bcfdcaeb90e5ac191347a32735d37290885502a2511 SHA512 f91ce6146a369ddb6ee82c0d6e221ceb1fbe9beb073c2e37c27b07e0684c701328891a51f58ef9fefea6007e0111979af7034787b167735fb6d79c8462d9dfcc WHIRLPOOL ab3bbde9fbc205a887f591b7362034b01081c9a477dab314acfd92b4aa4b7e010532fdee7b2684504044fb3df2e8e8d09466d67765ec9feff3a2223ff7c54a1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU3q30AAoJEPGu1DbS6WIA0xgP/AzEDIanNcvxPAIQzDv3iTO7 -cCaCuoXPY26e2oN0xywLFvfZELeSRn4c8z/pUmXFBhy+pnPASdj4cH7vNvMxZGhD -tBMR8qaCB+xrWfIN/KnQqjO2PVD2bCsMywpsEzoNB2zsesNbZWDKrmvmHg2vx6sM -mlK7e51WaK0HXAnh6fsw2S486e7B+JDDt+KXPCZrZcj6tK0pn5dNU/x/bwyeoNX/ -b0wX4qLpqOWXyetj8/B3igdffseDGtzOIRUPB4Wox1UCzCcwdCipzLVoYqE9v9lp -kaRhcT/c5cFO88DGFFIdZhfvscUvLsAXoD/MRxcDmT22dls0N4863dHODOAtSIlc -0gJCIjJb73KeLpO0CRpacLVdqYqJ64lt10Dx0l37/EJEBBXbj8OV5ak4coAnH8Lz -oZfqZrr88bMbn4mXn/+Hn9MUOs7pxfLFb8kKZ6P1XGcPFOfrBTdHQg87bio9ZhoO -H5wHZ6mE4PJ+sO0717GKP1EQQU9z80ueZ0Vq87N7kQKtYvxUXUsvu0Tk/ni6Mws3 -HkR1SzywdUFEk43nwYjH2gIs0O9G26mXazBvyTJl6kBCK/+4BnTgQpqZRw9uPk53 -80d/HHBAWDFRvqCeGvsKAdGSava1MLG8ticZ/IHcmACD8/Cnbuw/sc2v+CbCQguh -LojwgFs9g4z1NLtaTgIc -=XIIb +iF4EAREIAAYFAlTespYACgkQC77qH+pIQ6S1fgD+PC7OKxjdvPIhI8rnlZMjVFGJ +NVuJ12StJNm57zCcqkkA/R1pZ6Y0GZOS4q72/9yMRzGB7sYE+s2cfKoqu2yQMfFZ +=uakN -----END PGP SIGNATURE----- diff --git a/sys-libs/timezone-data/timezone-data-2015a.ebuild b/sys-libs/timezone-data/timezone-data-2015a.ebuild index 8d4607e16d18..795dc975af01 100644 --- a/sys-libs/timezone-data/timezone-data-2015a.ebuild +++ b/sys-libs/timezone-data/timezone-data-2015a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild,v 1.1 2015/02/14 02:07:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2015a.ebuild,v 1.2 2015/02/14 02:27:33 floppym Exp $ EAPI="4" @@ -139,9 +139,12 @@ pkg_config() { elog "Your ${etc_lt} has been reset to Factory; enjoy!" tz="Factory" fi - einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" - [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" - cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" + if [[ -L ${etc_lt} ]]; then + einfo "Skipping symlinked ${etc_lt}" + else + einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" + cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" + fi } pkg_postinst() { |