Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 35 insertions, 25 deletions

diff --git a/python3-babel/.footprint b/python3-babel/.footprint
index 842147286..24d970db8 100644
--- a/python3-babel/.footprint
+++ b/python3-babel/.footprint
@@ -4,21 +4,19 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/not-zip-safe
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.9.1-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/not-zip-safe
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/Babel-2.10.1-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/__init__.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/_compat.cpython-310.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/_compat.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/core.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/core.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/dates.cpython-310.opt-1.pyc
@@ -39,7 +37,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/units.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/util.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/__pycache__/util.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/_compat.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/core.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/dates.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/global.dat
@@ -99,6 +96,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/bas_CM.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/be.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/be_BY.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/be_TARASK.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/bem.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/bem_ZM.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/bez.dat
@@ -144,8 +142,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ckb_IR.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/cs.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/cs_CZ.dat
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/cu.dat
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/cu_RU.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/cy.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/cy_GB.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/da.dat
@@ -163,6 +159,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/de_LU.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/dje.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/dje_NE.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/doi.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/doi_IN.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/dsb.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/dsb_DE.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/dua.dat
@@ -241,6 +239,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_MS.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_MT.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_MU.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_MV.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_MW.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_MY.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/en_NA.dat
@@ -438,6 +437,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/he_IL.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hi.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hi_IN.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hi_Latn.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hi_Latn_IN.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hr.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hr_BA.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/hr_HR.dat
@@ -480,6 +481,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/kde_TZ.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/kea.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/kea_CV.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/kgp.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/kgp_BR.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/khq.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/khq_ML.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ki.dat
@@ -504,6 +507,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ks.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ks_Arab.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ks_Arab_IN.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ks_Deva.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ks_Deva_IN.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ksb.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ksb_TZ.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ksf.dat
@@ -612,6 +617,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/nn_NO.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/nnh.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/nnh_CM.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/no.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/nus.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/nus_SS.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/nyn.dat
@@ -633,8 +639,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/pcm_NG.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/pl.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/pl_PL.dat
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/prg.dat
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/prg_001.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ps.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ps_AF.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/ps_PK.dat
@@ -676,6 +680,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/rw_RW.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/rwk.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/rwk_TZ.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sa.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sa_IN.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sah.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sah_RU.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/saq.dat
@@ -685,6 +691,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sat_Olck_IN.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sbp.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sbp_TZ.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sc.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sc_IT.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sd.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sd_Arab.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/sd_Arab_PK.dat
@@ -798,8 +806,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vai_Vaii_LR.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vi.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vi_VN.dat
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vo.dat
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vo_001.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vun.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/vun_TZ.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/wae.dat
@@ -817,6 +823,10 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/babel/locale-data/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yo.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yo_BJ.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yo_NG.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yrl.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yrl_BR.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yrl_CO.dat
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yrl_VE.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yue.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yue_Hans.dat
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/babel/locale-data/yue_Hans_CN.dat
diff --git a/python3-babel/.signature b/python3-babel/.signature
index 88b1858f7..cc05f51b4 100644
--- a/python3-babel/.signature
+++ b/python3-babel/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF372k/vOhjGCaBi9CeUz42noFAFQmfSTJLGaBMwd0ZMZSfVneOUpDLB0/OJqbifU4GEX6KeMn+ubXWITCDeFFdAc=
-SHA256 (Pkgfile) = 8a0d95c8605bf38c7d31be6aff4295bfa714047f7967eb2cc03214833bc3499f
-SHA256 (.footprint) = 74fe98fbcac13eb332979d25f075dad330cec905a6e10a60e9fd0bc9b624de5d
-SHA256 (python3-babel-2.9.1.tar.gz) = 96102878b273d0160c210d9323406d26c4a5cf0f5d3a0097a059836a624231f9
-SHA256 (cldr-common-37.0.zip) = ba93f5ba256a61a6f8253397c6c4b1a9b9e77531f013cc7ffa7977b5f7e4da57
+RWSagIOpLGJF3yEKxk+1iwDLXiZkebk/YJUqRqxE16w80Jg+b9cKJ/RD1/WJkX9IUh8PwIXTH37ht9Oylkb7RWvtmLl6PIbqYwY=
+SHA256 (Pkgfile) = 2bc469752381dc5cba5c8679177ac0f0a518546ababb09b2276d7bd2d6f17737
+SHA256 (.footprint) = d5b2bac53aba2c9b2a507ac2e39c5383bce0c3bdf172bea07354d4a893ab74e9
+SHA256 (python3-babel-2.10.1.tar.gz) = 7a61207b1d269a09462313ef3065d7bc1b54c9a14ae00f5006e169639674b230
+SHA256 (cldr-common-41.0.zip) = 823c6170c41e2de2c229574e8a436332d25f1c9723409867fe721e00bc92d853
diff --git a/python3-babel/Pkgfile b/python3-babel/Pkgfile
index 75898f998..cb993fbfd 100644
--- a/python3-babel/Pkgfile
+++ b/python3-babel/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on: python3-pytz python3-setuptools
 
 name=python3-babel
-version=2.9.1
+version=2.10.1
 release=1
-cldrver=37.0 # $SRC/babel-$version/scripts/download_import_cldr.py
+cldrver=41.0 # $SRC/babel-$version/scripts/download_import_cldr.py
 
 source=(https://github.com/python-babel/babel/archive/v$version/$name-$version.tar.gz
   https://unicode.org/Public/cldr/${cldrver::2}/cldr-common-$cldrver.zip)
@@ -17,7 +17,7 @@ unpack_source() {
       $name-$version.tar.gz)
         bsdtar -p -o -C $SRC -xf $(get_filename $file) ;;
       cldr-common-$cldrver.zip)
-        cp $(get_filename $file) $SRC/babel-$version/cldr/cldr-core-${cldrver::2}.zip ;;
+        cp $(get_filename $file) $SRC/babel-$version/cldr/cldr-common-$cldrver.zip ;;
       *)
         cp $(get_filename $file) $SRC ;;
     esac