From f8ded3373d45aec2ee9dc2d455405eeb0b24801d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 14 Feb 2015 02:07:48 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- sys-libs/timezone-data/ChangeLog | 8 +- sys-libs/timezone-data/Manifest | 28 +++- .../files/timezone-data-2015a-makefile.patch | 113 +++++++++++++ .../timezone-data/timezone-data-2015a.ebuild | 151 ++++++++++++++++++ 4 files changed, 297 insertions(+), 3 deletions(-) create mode 100644 sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch create mode 100644 sys-libs/timezone-data/timezone-data-2015a.ebuild diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index 2509f95fa72d..9ba9a99ebf52 100644 --- a/sys-libs/timezone-data/ChangeLog +++ b/sys-libs/timezone-data/ChangeLog @@ -1,6 +1,12 @@ # 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.319 2015/02/14 02:07:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.320 2015/02/14 02:07:46 vapier Exp $ + +*timezone-data-2015a (14 Feb 2015) + + 14 Feb 2015; Mike Frysinger + +files/timezone-data-2015a-makefile.patch, +timezone-data-2015a.ebuild: + Version bump. 14 Feb 2015; Mike Frysinger timezone-data-2014j.ebuild: Stabilize for all. diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 4072aa9eb1b9..c0bc8375eab5 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX timezone-data-2008h-makefile.patch 4037 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39 SHA512 85871ce688d529660ad8948ebf73918fdada5d950abbd9f33241d2d89e6df521223f7a1a24369c00b3f7258ce41bf296ee6f04cf2b91d0591d08640d06a6e4d6 WHIRLPOOL ade3e7e17318abf2e4989c4d673f643ebcbd787f26719c22ca0f90ba8b70d293c9f99334f6594fc1eaa2ef233539bed3ff0b5f20d9042b990f5ec4671432a8ee AUX timezone-data-2012a-makefile.patch 4022 SHA256 4bbcd3fa36ee6b2506df766b0f283826fd5bd2402b24aa25845971e8f38b51e2 SHA512 cddf38b690d1631d26f9d338bdf55e48692e240437d999fb494043ae24dd2b3167de9244f94e10605dba990777e20e886ba6f30429a6855286996004551dcc23 WHIRLPOOL dc92fd0dadd20e0f6504c7ce4dd736854e683336e08168f62badcdf6d1730ce830791f10ad71aee614760df4c89f6bf826101df7291994c736022d2d3d9c1d1b AUX timezone-data-2012i-makefile.patch 2977 SHA256 c2ad2ff248962d12a7fdc2689172b7220bbaee52bc846e8f10f5a57a8b6d345e SHA512 2b61ba4791ba9bde7605fadbfed0104a7f862e2907bd067239c7cd1a731b4a85f7597a547290f7c604b6f37972913b9167eb72033f458af047bd0d5a127d463c WHIRLPOOL c60158a1c849ee78bc37ee25bf723688ee107dfc3a8032e42947582be036d8be3eac70abf7fdd8a052dfa284819082019d583c344943220f569ef996bc6507be @@ -8,17 +11,38 @@ AUX timezone-data-2013h-makefile.patch 3745 SHA256 c6ff4692c63998a85fd7639aa6770 AUX timezone-data-2014f-makefile.patch 3750 SHA256 a8d2438e4cd132052acdb4fd17f99e45981f7f278777485cc20eb1b6e78742c9 SHA512 b748790745fca23b34d8c4ad1be453b8111591925f542cae219af37ce1eaf174dfc918d1b4c8cd8d3dd95657a22be7120ebf2f2e7b442f89f59ffb2f80724f07 WHIRLPOOL 5f580beb195124c4e5d9db10336c4c864a24f9abd95447e2f76de2db74909d3b7bd50aaa20341f2741cb7b9665e668fb513a8de9d83138d513ea6972376dfa3c AUX timezone-data-2014g-makefile.patch 3833 SHA256 71eb5fb7a78c6f08d72bd8c69ae06701c064c411708e05101b1fe324f1fafa05 SHA512 fa2edfc02fa0a482709edbcbe255a438973fd38c5ce12873ae366366b4e5d2eab2b79c6881ebaad018a4e1ff553eadbe3df226764e6cf8db128b864a51d32ecd WHIRLPOOL a16c58b755c490ca3c9df3052e4f7291aa91d04fe170f2b14f18d53217eea8adef92222b745682d00d40f59dfbfd08d7fc10d961953149861e96eb419f70f3cd AUX timezone-data-2014h-makefile.patch 3811 SHA256 815932985476d2ff349e7dbbe8f22d136ec753575eca65b676ab6425b0fde0c7 SHA512 0cd2312d526015420a3195658471d1e94da3b7743f8fd7725c968bbff1486f0178314a63eadab8b54fbafea8e149fcd5230efbc837258b6786423134d6a2ee31 WHIRLPOOL e3b34dddbd5cfd055bbf16ecd746c0512c5e210581025c32d0a6db2600d465f3a01cfb05c8183fb8dfa3438c73f2b3acc4d64ca35c327480e64a226ab754be27 +AUX timezone-data-2015a-makefile.patch 3823 SHA256 bfa72cc46dd00524e2a0f3f89395838b6c0085725d4b0d72799aa0cfe30a01f5 SHA512 b03a3afcfb0ede401aca62ad9fad0bf1fbc61a1d73dc32b1e468ce2e35b96a681a14e22564bafe43301fdf651555357488bafd890aeb9d1eac7713d8da2be839 WHIRLPOOL 950778014c82f9ffc2b576043863a9a3179fa8b6e687524799c78e04b2e098b7171f330142e580867754842c9f53279fbba8f4c7180e1607d7450e9b1f23bf5d DIST tzcode2012j.tar.gz 134654 SHA256 ee4361b3b4ae201a270857c84d0f063c2a2191b3e4cd7414ea4622bb8bae9a82 SHA512 a0182438fedb1d855b52c0734f52bfd4dd3707d65c6f347833d5a68aab132a68f2b77a0e182d7ecfe7c58185245d7181ab01da909c2fdc84b71150c3090382c2 WHIRLPOOL 430e7320976e184753364d034f16109713a350ec0828d864be2f30ce6d29dd403d8f9c25866f828c664f0324f57ad72197fd752ba343f316d80d7c11a1ebdee6 DIST tzcode2013i.tar.gz 173169 SHA256 63bba6790afc1cb2ea0af2b998a35fc237e247608140dbe4e08b4216a8c31358 SHA512 863d181339d8b44ae9876a02e436da33b723f81e592a0e0f51f1300a2dac277bc18ed422b8631e27032769620323c94c848f3abc926d8bc28074d3d4b4bb8a28 WHIRLPOOL 9de16a388ac7a1e7965b1aaed4461657a2f822a08fe6c8c5f025bdad6512b53ef0ea6960ef03bc372df3541f9c8588797cd1e2b2dcecb10afb9041965b3684a1 DIST tzcode2014i.tar.gz 181815 SHA256 62591075fb0d47459889b71bac3c8487f09b7417b81dfa541d750b4889e84783 SHA512 ed780815a1e209616c791997f14da56cb9311c6585b70c503b32a11e8ec15e0dc04c37bdeaa5a1a1378ada714935a2d931679d0aa4ab42808d185b600e5d0582 WHIRLPOOL ba5bdf8117b64eda76dc559dd211fa83ee0662792a93004fd696b3d8463da2046d91a0cb45b88656230ac935b528b5cd3e8ce9a460c5e27fdb0b4a19ddadb666 DIST tzcode2014j.tar.gz 182416 SHA256 7fd46125464856309fc81fe85a67a61de862b8ab884ce8ca82051f5fa308ede2 SHA512 1207670c168a80fe9db86307028efa3af8ca304817ebe36df5b5c2d2b67deba4294f05f4d6afa04220c3b255ad1903e2850bfb0649b2edfb2d754345a4b2490a WHIRLPOOL 87275670bc5eeaa634ea7cc858e0c52e61e69640d89a98119d42bf087f26b65216146749648c1347dca0924776e9f6f914ba85aac19c5a3e581ad329fb85de84 +DIST tzcode2015a.tar.gz 182993 SHA256 885bab11f286852f34030d7a86ede7d4126319ca74b8ee22be8ca7c17d72dd19 SHA512 80d3bd3aeb70e21552a599c6203670fe742ca8d270c3fc430a3045d8e8a6610ebfe74941532c0791d5a99d6e4bf5fbdf62918de57d377d3fd26e7f7f786c66a4 WHIRLPOOL de4d9ea9611cc47e71f6e64fc4b0f6c45e5b3c995268d6244ed58fdc9b5e6d896c0e3ce1299e04ae018681523dc1e57f2dfcd0fb7f03423a93282123eb8a0376 DIST tzdata2012j.tar.gz 214075 SHA256 4b6a3c2831bdbb68ab1a1bf906bcf11d18ab78009713a0339da6fe96b6afceaa SHA512 98515b92268a2ee49386f6955211c14b9fe47460ba1c3ec5d60681b1a934688c3de4452f8f757ca3a6924e15784585967c768e7c86be730378d0332c249584fe WHIRLPOOL 17af29d05587bea2b05762751d146101a8bcc647346aa22a33e06a095805ecf4feab62693b3216ba5d75cf87f8a63d8cbcee9167be4b6dfe7936e1828bbc4b8a DIST tzdata2013i.tar.gz 218866 SHA256 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda SHA512 679645837b940c0d4c63cb070e26c042461a520caa5fbe1ed12897a6bfb5c440352d54a9e1ffb8b7098a10dd9e2f33cf4c6f9cb0b6fc84c0dfc3898501ce4082 WHIRLPOOL f5c559b8bd3869e2f90792079329582d26d3e95f744543c40b5c3aa6429390a39e04697d68151730019e60cfa3c6fe6b4f8d3d3e79b6b4bed28dc4e81cffa9ce DIST tzdata2014i.tar.gz 289312 SHA256 2af331bdd2b794ec59b8ded7300fb29dc3573a009ec14183f5c9ad38e3886153 SHA512 d8893703cebfa337254a6cfb26b0c0083533922016d51dcb56c0cbc46ff7fb76d83e4e1359eec3a7728b4ebffd24e912117ac1f7425a150cad4d33e20033c40e WHIRLPOOL ca2fb6f470ff975168124ee30c2f4638ce9f0a68b0d999e451c19d328c0df438f6934b458b48e7d05a724445e7fc5c3e1ca5adbcc97e1998f88983630f132e43 DIST tzdata2014j.tar.gz 290688 SHA256 a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d SHA512 4c2979be3a96f91f8576304ec905d571b73df0842c8300c1d7317819b45ab3e29948ed911aa265b12a4ad587d5cba44f646dd02e40e4fbf9e68556a2d327142e WHIRLPOOL adf3fc77aae18dccf05e3c990052fc2cb735a2c91bf9e93136cb45862e6f283e706beaa79373354817662a8b17449000a58760cb8f95fa78de88690207014a3e +DIST tzdata2015a.tar.gz 292131 SHA256 c52490917d00a8e7fc9b5f0b1b65ef6ec76d612b5b20c81bf86a04147af18e4c SHA512 ff36feb437238ba42fe67257e81ade0a2179d11f6c6449146e28e4b6553c62348b4131af75e440b4467109c9edba13e25ddaf701f2fcebb2a258b4ac9b57293c WHIRLPOOL 22d42c60e87948c691255282aea9e4c9d69b46db8c19ef1c06a262b5e6054e45fec39c5fa8d1dc24ad121ed70bd3dfa24ea61fe97961938b733262238d74b5bb EBUILD timezone-data-2012j.ebuild 3226 SHA256 189e893f9a2de810a15d4c36dc060bd488486238eb0b62e3e34b0f94f4580887 SHA512 b421e8f2ac49de3e5c35a429821c3b10a4545c11b03974d9091f088543bfdbb3276893ca08829d1bfc7d8c7eb9bf958c8de9543fece5b511e315bc031d4a5a9a WHIRLPOOL 8972b6e607f11ea8f4564d10213449afdb1c3961a18514f5a4881dd56a80fe24c59ad326899c302ee55f99823445810b18b7e85c2512384dad5bfaba44a30e2f 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 6fce71679c27fb1a43b717fa3c269f1b793cbce4794842b3366af08d74fe0ab3 SHA512 85f9723541ed4d8c21c9422c2cfdf7d247202d13a1aa03d0f717fffcd9637be50e04eedbf310d0637f0f933efadb14119bb2ef772f7a2ec0cfbaf2cb8c4c7efe WHIRLPOOL 4f91d7fe4a72374f0e1773c886da72285468094da8e6b0190872b5460b7f381b2d5fee3bf6841bcb1e77a09c59530d7fde3b24f4a1a979c2e37da8f44217d313 -MISC ChangeLog 43423 SHA256 a7adb5a3d883679d117e33320ab5571e99b4354a7ea6a493ca9c6419630e84be SHA512 f59205feba3ac151ca7ab079ca991e80ad49ded3561c2491c8502356e28ab5bf5ab389292dd237cdf634ee766e0492a86bb6561cbac9f4e73e781a29dd3dfa86 WHIRLPOOL 9c564a1e6deb264aca87dd560d8f30766f9f99869212e54e14606cd848206c58ea1006b67b079615033aca75343658ae484ce82b20825f6ebdba31a033a6197f +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 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 +-----END PGP SIGNATURE----- diff --git a/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch new file mode 100644 index 000000000000..2153d764981d --- /dev/null +++ b/sys-libs/timezone-data/files/timezone-data-2015a-makefile.patch @@ -0,0 +1,113 @@ + - Fix up default paths + - Support env CC + - Don't build/install libtz.a + - Don't install man-pages provided by sys-apps/man-pages + - Move zic, zdump to sbin and tzselect to bin ala glibc + - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc + - Install leaps zoneinfo into zoneinfo/right/ ala glibc + - Do not run network based unittests + +--- a/Makefile ++++ b/Makefile +@@ -45,21 +45,21 @@ POSIXRULES= America/New_York + + # Everything gets put in subdirectories of. . . + +-TOPDIR= /usr/local ++TOPDIR= /usr + + # "Compiled" time zone information is placed in the "TZDIR" directory + # (and subdirectories). + # Use an absolute path name for TZDIR unless you're just testing the software. + + TZDIR_BASENAME= zoneinfo +-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) ++TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) + + # Types to try, as an alternative to time_t. int64_t should be first. + TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t + + # The "tzselect", "zic", and "zdump" commands get installed in. . . + +-ETCDIR= $(TOPDIR)/etc ++SBINDIR= $(TOPDIR)/sbin + + # If you "make INSTALL", the "date" command gets installed in. . . + +@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin + + # Manual pages go in subdirectories of. . . + +-MANDIR= $(TOPDIR)/man ++MANDIR= $(TOPDIR)/share/man + + # Library functions are put in an archive in LIBDIR. + +@@ -298,8 +298,10 @@ GZIPFLAGS= -9n + + ############################################################################### + +-cc= cc +-CC= $(cc) -DTZDIR=\"$(TZDIR)\" ++CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" ++ifeq ($(NLS),1) ++CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" ++endif + + AR= ar + +@@ -352,17 +354,14 @@ ALL: all date + install: all $(DATA) $(REDO) $(MANS) + mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ +- $(DESTDIR)$(LIBDIR) \ ++ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 + $(ZIC) -y $(YEARISTYPE) \ + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. +- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. ++ cp zic zdump $(DESTDIR)$(SBINDIR)/. ++ cp tzselect $(DESTDIR)$(BINDIR)/. +- cp libtz.a $(DESTDIR)$(LIBDIR)/. +- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. +- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. + + INSTALL: ALL install date.1 + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 +@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA) + # to using them, or vice versa. + right_posix: right_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-leaps +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ ln -s . $(DESTDIR)$(TZDIR)/right || \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) + + posix_right: posix_only leapseconds + rm -fr $(DESTDIR)$(TZDIR)-posix +- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ ln -s . $(DESTDIR)$(TZDIR)/posix || \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ + -L /dev/null $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ + -L leapseconds $(TDATA) + + posix_packrat: posix_only backzone +@@ -440,7 +442,7 @@ tzselect: tzselect.ksh + chmod +x $@ + + check: check_character_set check_white_space check_links check_sorted \ +- check_tables check_web ++ check_tables + + check_character_set: $(ENCHILADA) + LC_ALL=en_US.utf8 && export LC_ALL && \ diff --git a/sys-libs/timezone-data/timezone-data-2015a.ebuild b/sys-libs/timezone-data/timezone-data-2015a.ebuild new file mode 100644 index 000000000000..8d4607e16d18 --- /dev/null +++ b/sys-libs/timezone-data/timezone-data-2015a.ebuild @@ -0,0 +1,151 @@ +# 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 $ + +EAPI="4" + +inherit eutils toolchain-funcs flag-o-matic + +code_ver=${PV} +data_ver=${PV} +DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" +HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm" +SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz + http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" + +LICENSE="BSD public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="nls right_timezone elibc_FreeBSD elibc_glibc" + +RDEPEND="!sys-libs/glibc[vanilla(+)]" + +S=${WORKDIR} + +pkg_setup() { + # Deal with the case where older timezone-data installed a + # dir here, but newer one installs symlinks. Portage will + # barf when you try to transition file types. + if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then + # In case of a failed upgrade, clean up the symlinks #506570 + if [ -L .gentoo-upgrade ] ; then + rm -rf posix .gentoo-upgrade + fi + if [ -d posix ] ; then + rm -rf .gentoo-upgrade #487192 + mv posix .gentoo-upgrade || die + ln -s .gentoo-upgrade posix || die + fi + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2015a-makefile.patch + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native +} + +_emake() { + emake \ + TOPDIR="${EPREFIX}/usr" \ + REDO=$(usex right_timezone posix_right posix_only) \ + "$@" +} + +src_compile() { + local LDLIBS + tc-export CC + if use elibc_FreeBSD || use elibc_Darwin ; then + append-cppflags -DSTD_INSPIRED #138251 + fi + export NLS=$(usex nls 1 0) + if use nls && ! use elibc_glibc ; then + LDLIBS+=" -lintl" #154181 + fi + # TOPDIR is used in some utils when compiling. + _emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + CFLAGS="${CFLAGS} -std=gnu99" \ + LDFLAGS="${LDFLAGS}" \ + LDLIBS="${LDLIBS}" + if tc-is-cross-compiler ; then + _emake -C "${S}"-native \ + CC="$(tc-getBUILD_CC)" \ + CFLAGS="${BUILD_CFLAGS}" \ + CPPFLAGS="${BUILD_CPPFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + LDLIBS="${LDLIBS}" \ + zic + fi +} + +src_install() { + local zic="" + tc-is-cross-compiler && zic="zic=${S}-native/zic" + _emake install ${zic} DESTDIR="${D}" + dodoc CONTRIBUTING README NEWS Theory + dohtml *.htm + + # install the symlink by hand to not break existing timezones + if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then + dosym . /usr/share/zoneinfo/posix + fi +} + +get_TIMEZONE() { + local tz src="${EROOT}etc/timezone" + if [[ -e ${src} ]] ; then + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") + else + tz="FOOKABLOIE" + fi + [[ -z ${tz} ]] && return 1 || echo "${tz}" +} + +pkg_preinst() { + local tz=$(get_TIMEZONE) + if ! use right_timezone && [[ ${tz} == right/* ]] ; then + eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." + die "Please fix your USE or timezone" + fi +} + +pkg_config() { + # make sure the /etc/localtime file does not get stale #127899 + local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" + + tz=$(get_TIMEZONE) || return 0 + if [[ ${tz} == "FOOKABLOIE" ]] ; then + elog "You do not have TIMEZONE set in ${src}." + + if [[ ! -e ${etc_lt} ]] ; then + # if /etc/localtime is a symlink somewhere, assume they + # know what they're doing and they're managing it themselves + if [[ ! -L ${etc_lt} ]] ; then + cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" + elog "Setting ${etc_lt} to Factory." + else + elog "Assuming your ${etc_lt} symlink is what you want; skipping update." + fi + else + elog "Skipping auto-update of ${etc_lt}." + fi + return 0 + fi + + if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then + elog "You have an invalid TIMEZONE setting in ${src}" + 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}" +} + +pkg_postinst() { + rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & + pkg_config + wait +} -- 2.26.2