mirrors: drop country-name

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Reference: https://bugs.gentoo.org/831807

2 files changed, 56 insertions, 56 deletions

diff --git a/files/mirrors/distfiles.xml b/files/mirrors/distfiles.xml
index 23d01d0..024aebe 100644
--- a/files/mirrors/distfiles.xml
+++ b/files/mirrors/distfiles.xml
@@ -2,7 +2,7 @@
 vim: ft=xml et ts=2 sts=2 sw=2:
 -->
 <mirrors>
-  <mirrorgroup region="North America" country="CA" countryname="Canada">
+  <mirrorgroup region="North America" country="CA">
     <mirror>
       <name>Tera-byte Dot Com Inc</name>
       <uri protocol="ftp" ipv4="y" ipv6="n" partial="n">ftp://mirrors.tera-byte.com/pub/gentoo</uri>
@@ -22,7 +22,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://gentoo.gossamerhost.com/gentoo-distfiles/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="North America" country="US" countryname="USA">
+  <mirrorgroup region="North America" country="US">
     <mirror>
       <name>OSU Open Source Lab (Corvallis; New York; Chicago)</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://gentoo.osuosl.org/</uri>
@@ -62,7 +62,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://mirror.rackspace.com/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="South America" country="BR" countryname="Brazil">
+  <mirrorgroup region="South America" country="BR">
     <mirror>
       <name>C3SL, Federal University of Paraná</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://gentoo.c3sl.ufpr.br/</uri>
@@ -70,7 +70,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://gentoo.c3sl.ufpr.br/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="South America" country="CL" countryname="Chile">
+  <mirrorgroup region="South America" country="CL">
     <mirror>
       <name>Universidad de La Frontera</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">https://mirror.ufro.cl/gentoo/</uri>
@@ -78,7 +78,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://gentoo.ufro.cl/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="BE" countryname="Belgium">
+  <mirrorgroup region="Europe" country="BE">
     <mirror>
       <name>Belnet</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://ftp.belnet.be/pub/rsync.gentoo.org/gentoo/</uri>
@@ -87,10 +87,10 @@ vim: ft=xml et ts=2 sts=2 sw=2:
     </mirror>
   </mirrorgroup>
   <!--
-  <mirrorgroup region="Europe" country="BG" countryname="Bulgaria">
+  <mirrorgroup region="Europe" country="BG">
   </mirrorgroup>
   -->
-  <mirrorgroup region="Europe" country="CH" countryname="Switzerland">
+  <mirrorgroup region="Europe" country="CH">
     <mirror>
       <name>Init7</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.init7.net/gentoo/</uri>
@@ -98,7 +98,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://mirror.init7.net/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="CZ" countryname="Czech Republic">
+  <mirrorgroup region="Europe" country="CZ">
     <mirror>
       <name>Masaryk University Brno</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://ftp.fi.muni.cz/pub/linux/gentoo/</uri>
@@ -118,7 +118,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://mirror.dkm.cz/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="DK" countryname="Denmark">
+  <mirrorgroup region="Europe" country="DK">
     <mirror>
       <name>dotsrc.org</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirrors.dotsrc.org/gentoo/</uri>
@@ -127,7 +127,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://mirrors.dotsrc.org/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="FR" countryname="France">
+  <mirrorgroup region="Europe" country="FR">
     <mirror>
       <name>OVH</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://gentoo.mirrors.ovh.net/gentoo-distfiles/</uri>
@@ -154,7 +154,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://gentoo.modulix.net/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="DE" countryname="Germany">
+  <mirrorgroup region="Europe" country="DE">
     <mirror>
       <name>LeaseWeb (Anycast: Frankfurt)</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.leaseweb.com/gentoo/</uri>
@@ -235,28 +235,28 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://packages.hs-regensburg.de/gentoo-distfiles/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="GR" countryname="Greece">
+  <mirrorgroup region="Europe" country="GR">
     <mirror>
       <name>National Technical University of Athens</name>
       <uri protocol="ftp" ipv4="y" ipv6="y" partial="n">ftp://ftp.ntua.gr/pub/linux/gentoo/</uri>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://ftp.ntua.gr/pub/linux/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="IT" countryname="Italy">
+  <mirrorgroup region="Europe" country="IT">
     <mirror>
       <name>GARR</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://gentoo.mirror.garr.it/</uri>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://gentoo.mirror.garr.it/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="LU" countryname="Luxembourg">
+  <mirrorgroup region="Europe" country="LU">
     <mirror>
       <name>root S.A.</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://gentoo.mirror.root.lu/</uri>
       <uri protocol="ftp" ipv4="y" ipv6="y" partial="n">ftp://mirror.root.lu/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="NL" countryname="Netherlands">
+  <mirrorgroup region="Europe" country="NL">
     <mirror>
       <name>Universiteit Twente</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://ftp.snt.utwente.nl/pub/os/linux/gentoo</uri>
@@ -271,7 +271,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://mirror.leaseweb.com/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="PL" countryname="Poland">
+  <mirrorgroup region="Europe" country="PL">
     <mirror>
       <name>Vectranet</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://ftp.vectranet.pl/gentoo/</uri>
@@ -279,7 +279,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="ftp" ipv4="y" ipv6="y" partial="n">ftp://ftp.vectranet.pl/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="PT" countryname="Portugal">
+  <mirrorgroup region="Europe" country="PT">
     <mirror>
       <name>RNL - Técnico Lisboa</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://ftp.rnl.tecnico.ulisboa.pt/pub/gentoo/gentoo-distfiles/</uri>
@@ -293,7 +293,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://ftp.dei.uc.pt/pub/linux/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="RO" countryname="Romania">
+  <mirrorgroup region="Europe" country="RO">
     <mirror>
       <name>xservers.ro Gazduire Web</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://mirrors.xservers.ro/gentoo/</uri>
@@ -303,9 +303,9 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://ftp.romnet.org/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <!-- <mirrorgroup region="Europe" country="SE" countryname="Sweden">
+  <!-- <mirrorgroup region="Europe" country="SE">
   </mirrorgroup> -->
-  <mirrorgroup region="Europe" country="SK" countryname="Slovakia">
+  <mirrorgroup region="Europe" country="SK">
     <mirror>
       <name>Wheel.sk</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.wheel.sk/gentoo</uri>
@@ -317,9 +317,9 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="ftp" ipv4="y" ipv6="n" partial="n">ftp://tux.rainside.sk/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="ES" countryname="Spain">
+  <mirrorgroup region="Europe" country="ES">
   </mirrorgroup>
-  <mirrorgroup region="Europe" country="TR" countryname="Turkey">
+  <mirrorgroup region="Europe" country="TR">
     <mirror>
       <name>Turkish Linux Users Group - Linux Kullanicilari Dernegi(LKD)</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">https://ftp.linux.org.tr/gentoo/</uri>
@@ -327,10 +327,10 @@ vim: ft=xml et ts=2 sts=2 sw=2:
     </mirror>
   </mirrorgroup>
   <!--
-  <mirrorgroup region="Europe" country="UA" countryname="Ukraine">
+  <mirrorgroup region="Europe" country="UA">
   </mirrorgroup>
   -->
-  <mirrorgroup region="Europe" country="UK" countryname="UK">
+  <mirrorgroup region="Europe" country="UK">
     <mirror>
       <name>Bytemark Hosting</name>
       <uri protocol="ftp" ipv4="y" ipv6="y" partial="n">ftp://mirror.bytemark.co.uk/gentoo/</uri>
@@ -359,7 +359,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://mirror.rackspace.com/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Australia and Oceania" country="AU" countryname="Australia">
+  <mirrorgroup region="Australia and Oceania" country="AU">
     <mirror>
       <name>AARnet</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.aarnet.edu.au/pub/gentoo/</uri>
@@ -379,7 +379,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://mirror.rackspace.com/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Australia and Oceania" country="NC" countryname="New Caledonia">
+  <mirrorgroup region="Australia and Oceania" country="NC">
     <mirror>
       <name>Lagoon</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.lagoon.nc/gentoo/</uri>
@@ -388,7 +388,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://mirror.lagoon.nc/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="CN" countryname="China">
+  <mirrorgroup region="Asia" country="CN">
     <mirror>
       <name>Alibaba Cloud Computing</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">https://mirrors.aliyun.com/gentoo/</uri>
@@ -404,7 +404,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirrors.tuna.tsinghua.edu.cn/gentoo</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="HK" countryname="Hong Kong">
+  <mirrorgroup region="Asia" country="HK">
     <mirror>
       <name>aditsu.net</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://gentoo.aditsu.net:8000/</uri>
@@ -417,7 +417,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://mirror.rackspace.com/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="JP" countryname="Japan">
+  <mirrorgroup region="Asia" country="JP">
     <mirror>
       <name>Internet Initiative Japan</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://ftp.iij.ad.jp/pub/linux/gentoo/</uri>
@@ -438,14 +438,14 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://ftp.riken.jp/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="PH" countryname="Philippines">
+  <mirrorgroup region="Asia" country="PH">
     <mirror>
       <name>RISE</name>
       <uri protocol="ftp" ipv4="y" ipv6="n" partial="n">ftp://mirror.rise.ph/gentoo</uri>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://mirror.rise.ph/gentoo</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="KR" countryname="South Korea">
+  <mirrorgroup region="Asia" country="KR">
     <mirror>
       <name>KAIST</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://ftp.kaist.ac.kr/pub/gentoo/</uri>
@@ -462,7 +462,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://ftp.daum.net/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="RU" countryname="Russia">
+  <mirrorgroup region="Asia" country="RU">
     <mirror>
       <name>Yandex.ru</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.yandex.ru/gentoo-distfiles/</uri>
@@ -481,7 +481,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://gentoo.bloodhost.ru/gentoo-distfiles</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="SG" countryname="Singapore">
+  <mirrorgroup region="Asia" country="SG">
     <mirror>
       <name>National University of Singapore</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">https://download.nus.edu.sg/mirror/gentoo/</uri>
@@ -489,21 +489,21 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://download.nus.edu.sg/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia" country="TW" countryname="Taiwan">
+  <mirrorgroup region="Asia" country="TW">
     <mirror>
       <name>National Center for High-Performance Computing</name>
       <uri protocol="http" partial="y" ipv4="y" ipv6="n">http://ftp.twaren.net/Linux/Gentoo/</uri>
       <uri protocol="ftp" partial="y" ipv4="y" ipv6="n">ftp://ftp.twaren.net/Linux/Gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Middle East" country="IL" countryname="Israel">
+  <mirrorgroup region="Middle East" country="IL">
     <mirror>
       <name>Hamakor FOSS Society</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.isoc.org.il/pub/gentoo/</uri>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">http://mirror.isoc.org.il/pub/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Middle East" country="KZ" countryname="Kazakhstan">
+  <mirrorgroup region="Middle East" country="KZ">
     <mirror>
       <name>Neo Lab's</name>
       <uri protocol="http" ipv4="y" ipv6="y" partial="n">https://mirror.ps.kz/gentoo/pub</uri>
@@ -512,13 +512,13 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://mirror.ps.kz/gentoo</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Africa" country="NA" countryname="Namibia">
+  <mirrorgroup region="Africa" country="NA">
     <mirror>
       <name>Namibia University of Science and Technology</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">http://download.nust.na/pub/gentoo/</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Africa" country="ZA" countryname="South Africa">
+  <mirrorgroup region="Africa" country="ZA">
     <mirror>
       <name>University of Cape Town</name>
       <uri protocol="http" ipv4="y" ipv6="n" partial="n">https://ftp.leg.uct.ac.za/pub/linux/gentoo/</uri>
diff --git a/files/mirrors/rsync.xml b/files/mirrors/rsync.xml
index 216cb5a..2e5fe81 100644
--- a/files/mirrors/rsync.xml
+++ b/files/mirrors/rsync.xml
@@ -2,7 +2,7 @@
 vim: ft=xml et ts=2 sts=2 sw=2:
 -->
 <mirrors>
-  <mirrorgroup region="North America (rsync.namerica.gentoo.org)" country="CA" countryname="Canada">
+  <mirrorgroup region="North America (rsync.namerica.gentoo.org)" country="CA">
     <mirror>
       <name>Any available mirror - rsync.ca.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.ca.gentoo.org</uri>
@@ -24,7 +24,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync4.ca.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="North America (rsync.namerica.gentoo.org)" country="US" countryname="USA">
+  <mirrorgroup region="North America (rsync.namerica.gentoo.org)" country="US">
     <mirror>
       <name>Any available mirror - rsync.us.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.us.gentoo.org</uri>
@@ -50,13 +50,13 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync31.us.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="South America (rsync.samerica.gentoo.org)" country="BR" countryname="Brazil">
+  <mirrorgroup region="South America (rsync.samerica.gentoo.org)" country="BR">
     <mirror>
       <name>Any available mirror - rsync.br.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.br.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="CZ" countryname="Czech Republic">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="CZ">
     <mirror>
       <name>Any available mirror - rsync.cz.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.cz.gentoo.org</uri>
@@ -66,7 +66,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync1.cz.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="DE" countryname="Germany">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="DE">
     <mirror>
       <name>Any available mirror - rsync.de.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.de.gentoo.org</uri>
@@ -104,7 +104,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync15.de.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="FR" countryname="France">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="FR">
     <mirror>
       <name>Any available mirror - rsync.fr.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.fr.gentoo.org</uri>
@@ -114,7 +114,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync1.fr.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="NL" countryname="Netherlands">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="NL">
     <mirror>
       <name>Any available mirror - rsync.nl.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.nl.gentoo.org</uri>
@@ -124,7 +124,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync2.nl.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="PL" countryname="Poland">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="PL">
     <mirror>
       <name>Any available mirror - rsync.pl.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.pl.gentoo.org</uri>
@@ -138,7 +138,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync7.pl.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="PT" countryname="Portugal">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="PT">
     <mirror>
       <name>Any available mirror - rsync.pt.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.pt.gentoo.org</uri>
@@ -148,7 +148,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync2.pt.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="RO" countryname="Romania">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="RO">
     <mirror>
       <name>Any available mirror - rsync.ro.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.ro.gentoo.org</uri>
@@ -158,7 +158,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync3.ro.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="SK" countryname="Slovakia">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="SK">
     <mirror>
       <name>Any available mirror - rsync.sk.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.sk.gentoo.org</uri>
@@ -172,7 +172,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync3.sk.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="UK" countryname="UK">
+  <mirrorgroup region="Europe (rsync.europe.gentoo.org)" country="UK">
     <mirror>
       <name>Any available mirror - rsync.uk.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.uk.gentoo.org</uri>
@@ -190,7 +190,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://mirrors.gethosted.online/gentoo</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Australia (rsync.au.gentoo.org)" country="AU" countryname="Australia">
+  <mirrorgroup region="Australia (rsync.au.gentoo.org)" country="AU">
     <mirror>
       <name>Any available mirror - rsync.au.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.au.gentoo.org</uri>
@@ -208,7 +208,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync3.au.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="CN" countryname="China">
+  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="CN">
     <mirror>
       <name>Any available mirror - rsync.cn.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.cn.gentoo.org</uri>
@@ -222,7 +222,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync3.cn.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="JP" countryname="Japan">
+  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="JP">
     <mirror>
       <name>Any available mirror - rsync.jp.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.jp.gentoo.org</uri>
@@ -232,7 +232,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync5.jp.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="KR" countryname="South Korea">
+  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="KR">
     <mirror>
       <name>Any available mirror - rsync.kr.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.kr.gentoo.org</uri>
@@ -242,7 +242,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync1.kr.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="RU" countryname="Russia">
+  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="RU">
     <mirror>
       <name>Any available mirror - rsync.ru.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync.ru.gentoo.org</uri>
@@ -256,7 +256,7 @@ vim: ft=xml et ts=2 sts=2 sw=2:
       <uri protocol="rsync" ipv4="y" ipv6="y" partial="n">rsync://rsync2.ru.gentoo.org</uri>
     </mirror>
   </mirrorgroup>
-  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="TW" countryname="Taiwan">
+  <mirrorgroup region="Asia (rsync.asia.gentoo.org)" country="TW">
     <mirror>
       <name>Any available mirror - rsync.tw.gentoo.org</name>
       <uri protocol="rsync" ipv4="y" ipv6="n" partial="n">rsync://rsync.tw.gentoo.org</uri>