3 files changed, 183 insertions, 251 deletions

diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index dbdfbbeec040..6b4fae3b8425 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	tzinfo
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3.0
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/10558/
+MASTER_SITES=	http://rubyforge.rubyuser.de/tzinfo/ \
+		http://rubyforge.iasi.roedu.net/files/tzinfo/ \
+		http://rubyforge.halostatue.info/tzinfo/ \
+		http://files.rubyforge.vm.bytemark.co.uk/tzinfo/
 
 MAINTAINER=	rgl@ruilopes.com
 COMMENT=	Daylight-savings aware timezone support for Ruby
 
-BROKEN=		fails to fetch
-
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
diff --git a/devel/rubygem-tzinfo/distinfo b/devel/rubygem-tzinfo/distinfo
index e422b4afb3c4..5c1721297a75 100644
--- a/devel/rubygem-tzinfo/distinfo
+++ b/devel/rubygem-tzinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/tzinfo-0.2.2.gem) = 9f6b731d63b76b219c9fbd3453921e12
-SHA256 (rubygem/tzinfo-0.2.2.gem) = bb04510c88413365158a29ffee7032c7e4699623894d4d2862923689b9e2a432
-SIZE (rubygem/tzinfo-0.2.2.gem) = 374272
+MD5 (rubygem/tzinfo-0.3.0.gem) = 5f8090fc1139f3d8a6616fdd4e63fc79
+SHA256 (rubygem/tzinfo-0.3.0.gem) = f7b3e4e125e96457167101e223c5bf481fc7172703fed4a8834b0eef1226b45f
+SIZE (rubygem/tzinfo-0.3.0.gem) = 287744
diff --git a/devel/rubygem-tzinfo/pkg-plist b/devel/rubygem-tzinfo/pkg-plist
index d8ee896f5e1b..513acfa6cafb 100644
--- a/devel/rubygem-tzinfo/pkg-plist
+++ b/devel/rubygem-tzinfo/pkg-plist
@@ -1,251 +1,147 @@
 %%GEM_CACHE%%
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/AmbiguousTime.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000014.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000015.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000016.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000017.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000018.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000019.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000020.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000021.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000022.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000024.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000025.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000026.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000027.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000028.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000029.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src/M000030.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000006.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000007.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000008.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000009.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000010.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000011.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000012.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src/M000013.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/InvalidCountryCode.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/InvalidTimezoneIdentifier.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/NoOffsetsDefined.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/PeriodNotFound.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.src/M000001.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.src/M000002.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.src/M000003.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.src/M000004.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.src/M000005.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000031.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000032.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000033.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000034.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000035.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000036.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000037.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000038.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000039.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000040.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000041.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000042.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000043.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000044.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000045.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000046.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000047.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000048.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000049.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000050.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000051.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000052.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000053.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000054.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000055.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000056.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000058.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000059.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000060.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000061.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000062.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src/M000063.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000064.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000065.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000066.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000067.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000069.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000070.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000071.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000072.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000073.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000074.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000075.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000076.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000077.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000078.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000079.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000080.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000081.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000082.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000083.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000084.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000085.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000086.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src/M000087.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src/M000088.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src/M000089.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src/M000090.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src/M000091.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src/M000092.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src/M000093.html
+%%GEM_DOC_DIR%%/rdoc/classes/TZInfo/UnknownTimezone.html
+%%GEM_DOC_DIR%%/rdoc/created.rid
+%%GEM_DOC_DIR%%/rdoc/files/CHANGES.html
+%%GEM_DOC_DIR%%/rdoc/files/README.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/country_index_definition_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/country_info_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/country_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/country_timezone_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/data_timezone_info_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/data_timezone_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/info_timezone_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/linked_timezone_info_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/linked_timezone_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/offset_rationals_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/time_or_datetime_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_definition_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_index_definition_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_info_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_offset_info_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_period_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_proxy_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/timezone_transition_info_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo/tzdataparser_rb.html
+%%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo_rb.html
+%%GEM_DOC_DIR%%/rdoc/fr_class_index.html
+%%GEM_DOC_DIR%%/rdoc/fr_file_index.html
+%%GEM_DOC_DIR%%/rdoc/fr_method_index.html
+%%GEM_DOC_DIR%%/rdoc/index.html
+%%GEM_DOC_DIR%%/rdoc/rdoc-style.css
 %%GEM_LIB_DIR%%/CHANGES
 %%GEM_LIB_DIR%%/LICENSE
 %%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/Rakefile
 %%GEM_LIB_DIR%%/lib/tzinfo.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AQ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AX.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/AZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BB.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BJ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BV.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/BZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CV.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CX.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/CZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/DE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/DJ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/DK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/DM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/DO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/DZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/EC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/EE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/EG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/EH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ER.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ES.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ET.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/FI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/FJ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/FK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/FM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/FO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/FR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GB.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GP.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GQ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/GY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/HK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/HM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/HN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/HR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/HT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/HU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ID.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IQ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/IT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/Index.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/JM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/JO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/JP.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KP.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/KZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LB.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LV.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/LY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ML.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MP.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MQ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MV.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MX.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/MZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NP.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/NZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/OM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/PY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/QA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/RE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/RO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/RU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/RW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SB.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SJ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ST.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SV.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/SZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TD.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TH.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TJ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TK.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TL.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TO.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TR.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TV.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TW.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/TZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/UA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/UG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/UM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/US.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/UY.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/UZ.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VC.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VG.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VI.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VN.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/VU.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/WF.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/WS.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/YE.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/YT.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ZA.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ZM.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/countries/ZW.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/country.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/country_index_definition.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/country_info.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/country_timezone.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/data_timezone.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/data_timezone_info.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Africa/Abidjan.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Africa/Accra.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Africa/Addis_Ababa.rb
@@ -790,26 +686,49 @@
 %%GEM_LIB_DIR%%/lib/tzinfo/definitions/WET.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/definitions/W__m__SU.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Zulu.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/indexes/countries.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/indexes/timezones.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/info_timezone.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/linked_timezone.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/linked_timezone_info.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/offset_rationals.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/time_or_datetime.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/timezone.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/timezone_definition.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/timezone_index_definition.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/timezone_info.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/timezone_offset_info.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/timezone_period.rb
-%%GEM_LIB_DIR%%/lib/tzinfo/timezone_period_list.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/timezone_proxy.rb
+%%GEM_LIB_DIR%%/lib/tzinfo/timezone_transition_info.rb
 %%GEM_LIB_DIR%%/lib/tzinfo/tzdataparser.rb
 %%GEM_LIB_DIR%%/test/tc_country.rb
+%%GEM_LIB_DIR%%/test/tc_country_index_definition.rb
+%%GEM_LIB_DIR%%/test/tc_country_info.rb
+%%GEM_LIB_DIR%%/test/tc_country_timezone.rb
+%%GEM_LIB_DIR%%/test/tc_data_timezone.rb
+%%GEM_LIB_DIR%%/test/tc_data_timezone_info.rb
+%%GEM_LIB_DIR%%/test/tc_info_timezone.rb
+%%GEM_LIB_DIR%%/test/tc_linked_timezone.rb
+%%GEM_LIB_DIR%%/test/tc_linked_timezone_info.rb
 %%GEM_LIB_DIR%%/test/tc_offset_rationals.rb
 %%GEM_LIB_DIR%%/test/tc_time_or_datetime.rb
 %%GEM_LIB_DIR%%/test/tc_timezone.rb
+%%GEM_LIB_DIR%%/test/tc_timezone_definition.rb
+%%GEM_LIB_DIR%%/test/tc_timezone_index_definition.rb
+%%GEM_LIB_DIR%%/test/tc_timezone_info.rb
 %%GEM_LIB_DIR%%/test/tc_timezone_london.rb
 %%GEM_LIB_DIR%%/test/tc_timezone_melbourne.rb
 %%GEM_LIB_DIR%%/test/tc_timezone_new_york.rb
+%%GEM_LIB_DIR%%/test/tc_timezone_offset_info.rb
 %%GEM_LIB_DIR%%/test/tc_timezone_period.rb
-%%GEM_LIB_DIR%%/test/tc_timezone_period_list.rb
 %%GEM_LIB_DIR%%/test/tc_timezone_proxy.rb
+%%GEM_LIB_DIR%%/test/tc_timezone_transition_info.rb
 %%GEM_LIB_DIR%%/test/tc_timezone_utc.rb
 %%GEM_LIB_DIR%%/test/ts_all.rb
 %%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/test
+@dirrm %%GEM_LIB_DIR%%/lib/tzinfo/indexes
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo/definitions/US
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Pacific
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Mideast
@@ -832,7 +751,19 @@
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo/definitions/America
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo/definitions/Africa
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo/definitions
-@dirrm %%GEM_LIB_DIR%%/lib/tzinfo/countries
 @dirrm %%GEM_LIB_DIR%%/lib/tzinfo
 @dirrm %%GEM_LIB_DIR%%/lib
 @dirrm %%GEM_LIB_DIR%%
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/tzinfo
+@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib
+@dirrm %%GEM_DOC_DIR%%/rdoc/files
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezoneProxy.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TimezonePeriod.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Timezone.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo/TZDataParser.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo/CountryTimezone.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo/Country.src
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes/TZInfo
+@dirrm %%GEM_DOC_DIR%%/rdoc/classes
+@dirrm %%GEM_DOC_DIR%%/rdoc
+@dirrm %%GEM_DOC_DIR%%