[gentoo-commits] repo/gentoo:master commit in: dev-python/cramjam/

[Michał Górny]

commit:     a4ad7933c83fd4bafdeb395b1e2857d6a9a087c2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 11:41:19 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 11:55:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ad7933

dev-python/cramjam: Bump to 2.11.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/cramjam/Manifest              |   7 +
 dev-python/cramjam/cramjam-2.11.0.ebuild | 235 +++++++++++++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/dev-python/cramjam/Manifest b/dev-python/cramjam/Manifest
index 96cbb4d2f515..b97609cd40e3 100644
--- a/dev-python/cramjam/Manifest
+++ b/dev-python/cramjam/Manifest
@@ -25,6 +25,7 @@ DIST cmake-0.1.54.crate 18955 BLAKE2B 
8ea4f8c4e5a383e406436343e3635449662788cf8e
 DIST colorchoice-1.0.3.crate 7923 BLAKE2B 
7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee
 SHA512 
fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14
 DIST copy_dir-0.1.3.crate 5831 BLAKE2B 
de7e655e9716500db72cdb16394cf76a50f7b9861b9df6e0bd0a450b9475112f7e3ba3bc53ffde2c74ce540f4a48e2703f8e5ce83ad8cbfae06e51c16b2cdc63
 SHA512 
cd83244960be0bae32ab0480d1057c8a99e4bfd1c4622eb0b85692f2255ccac38678e608c663cf76ccf11d8c0d2415b15ebfd8328efdfbb37bca448245338fa2
 DIST cramjam-2.10.0.tar.gz 47801 BLAKE2B 
ff567e7abdb36e959ed502f38402c5257609c30dad3c0d1beda6699a5567d31f22ab075bbaf20ec9fe0512d06131ce912ec9f40e1b08137d1a3904ed19878921
 SHA512 
0c44643844c6278160d9e2efa3005da265e464edb1d3dd670cadc3effaa744c21c772c0bfeac1ceec6e5f7e8a9a02440d79e5080c432e4dcb73984e613281ad2
+DIST cramjam-2.11.0.tar.gz 99100 BLAKE2B 
69a68b6e83adec4434f61608082f992bfc00d2b52bed91f18a4bd55f2f5310986a5d325c0e81194d41c266e5d4d6c03735e41f9bc7f8b13f8f15d9df03002961
 SHA512 
d92446c0c0ef885f3544783caa1f179fd50b6a6290ada011495b7385411527f75a2544c0c8cdc36910c83c879dbac7dd130f4fe8f3dc3b885a84a45286cb3695
 DIST cramjam-2.11.0rc3.tar.gz 77632 BLAKE2B 
c4b0966eb42cc2eee97665288924bfe1a10af84e740cd2d009cc5d9c92b0f273d9cd4ee99ebd998e24a6aa1cd19eecdbbca6134236edfa3a4cf190371b39ada5
 SHA512 
7e4ba4b4dd2c625a9ba04591219f35c7bed1d315bea6c004425021b5ecf7fb0ae52e1f65add35031abd00241fe3f45b26d794997704f5d4112a35d37dc7594e8
 DIST crc32fast-1.4.2.crate 38491 BLAKE2B 
aaa3acca66e5814a45f12a90ae09f6ff5fc14ca94c8539184dab6ed928abc68cd1d37e539c268c1effd50ab3af20de6038593fb9c6bd6a664785dac52f6939fd
 SHA512 
c7608d33022062e217d3576f536ffbd51479855a5e5874529c71db2bf6a937ce04d814c39cf777309c38445393bf43cb9996161947e28738abd432f11beb7266
 DIST equivalent-1.0.2.crate 7419 BLAKE2B 
7ce4fb7b911961cd4ccfb48323eea4952110a069789c6bd177a63391c270df861afadd00c07db7b22768f0864f320e429e0200c433284f528336e2f81d071eff
 SHA512 
8e0e2dc070794a85b276e93f9e4a65d3bbb8587b33fda211c34479a0b88504c913d8bef9e84d7996254aeabe1efe4ff1ef6259ff4fe3f9ccb90dd90070b3e4d4
@@ -44,6 +45,7 @@ DIST itoa-1.0.14.crate 11210 BLAKE2B 
b2d33dc384757963eab3ae7d80bb672d828a5499679
 DIST jobserver-0.1.32.crate 27549 BLAKE2B 
5f6556788d10af992fafcb578ecfd2c81698eea31b636d3adb7544e12155796082623735c8b10ac4c04d891d1acc307fb4e4ac3f88b2006e181013006f51c8cb
 SHA512 
d4528113dd5a5d4a3765d55599a07e0998c69c7d21a90d2872679755ec4bd7726e9721af9220c36e1179b153ad8a39214a422af63aea15eaafd7cefc828ddff4
 DIST libc-0.2.170.crate 760076 BLAKE2B 
5deb440e04b0614cf5ec5a379d66b0f05f6f3eec1268742eb9052081408ec5da5f5185e63de59f3751506541321c618fd623d7b46b1892d360b86b6e250a4c4c
 SHA512 
b716f1a76b208c5b84692fa3084c14dbfdb4a92b86c0e01215de04dc34c6e581e5f1c4561994c65a828838d5fa232efe93c3935faf5f83c8af127a5996f1f9d3
 DIST libcramjam-0.7.0.crate 16831 BLAKE2B 
76b27470c877c3eff29b6031082a42856651ee86500115ce5f9a90978db3e0083159e9652b7b3d7382dae5a29c1474f577c5f03e0348e25819c6b2e711ab6358
 SHA512 
e1563b0dd71f8b2fbc0d91ecfb724f6d037fe9eb6084680b2f9ad934cfb987710dee6555c12f2d6eaacadb8ae0794459c8acd0204a88eda52eeabc4e214c9d81
+DIST libcramjam-0.8.0.crate 20996 BLAKE2B 
b2d8de0b0dd660f2da5b00d193b6daad01d685e3709e98e8d21a372726fcf88769206ff6f087fa679bc89c0a97b19f24f59546cecb42f79b15a0e9b24982a4fd
 SHA512 
006c2c23aa2fed7ab976bd08c72b96c8ee99e7a225b1ea7532012a916c09f72147bd07027e19d8b8d81abb5f3d62b44e6bf9924e52f08afd2faa9dd9584d3413
 DIST libdeflate-sys-1.19.3.crate 192512 BLAKE2B 
b8417cc872e5038e9177179dde7f8c5eafdcbba273ff0c1fd107ec286cd54f4a0e3c3e4b3df55db5364d39d49f803539ee5b649526cd5e057a3d2d4beee42fed
 SHA512 
c1b708672f6ce85579e5dda2537fe6804e73d92053a08387b2ec09388f0697fa3230298931116f482ae4242a0bf7afda9d8f309a13222ef5dee94f56a009890e
 DIST libdeflater-1.19.3.crate 24046 BLAKE2B 
cc6a1824ca9f51e7c4f01fad9e433e8ef509078252d8fd7167e1fbdcab604a23f90d7cc593ac1dd15623454c4818d16e60c722397f537a0cae57a67f3ddf25b8
 SHA512 
b6bd4c8cb7d56771f92fd1491fec2a8a7cb1493b3e86866bd5e029c9b8a55fbc343433a5ae6f575adbb0774767aa7224e714d3db27b14557683e2ffb97e2a4c6
 DIST linux-raw-sys-0.4.15.crate 2150898 BLAKE2B 
d1936eb74377d9bfddccef3830b56eb716c38ea3cb7e13b73325dfd00f9fc0df74bae49e4214dd7f27c257403b8b12cd1ef332d53336279d13f7e9497caf4135
 SHA512 
b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309
@@ -62,10 +64,15 @@ DIST pkg-config-0.3.31.crate 20880 BLAKE2B 
ab7676e810751f89639b60ae70bdebe1d57ed
 DIST portable-atomic-1.11.0.crate 181258 BLAKE2B 
627bd7c306f6c4d7991abd9f995b7e0ce110a7ace738690c287a43ce3b979691214e525876f8ace0c2f0d10d781fba95c7d3bf29aea28e09b05b06f4764db03f
 SHA512 
71774f8308963c5399095c6b755befdf9ff3d28f9529b4bae1fe0f2aba733339a267aa6f0ff854e59fa5044a9b0c2c86bad3bc4fcaa951724c839b0d6a22041e
 DIST proc-macro2-1.0.93.crate 52388 BLAKE2B 
dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896
 SHA512 
1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c
 DIST pyo3-0.24.1.crate 1113050 BLAKE2B 
5a203f8c845b08b40ed64561d385d2e4134a38916723ef6b0b4be8f44fa9de594c4eca138c318ad83a156f66273b20b55acb19897dca3eba5d479e6333be815e
 SHA512 
6c2a8f9d554a3cf151a796ee20610b596ebdbf9e642d6b2ddc35d0142841d7be51e739ddef4332cfa8c4625c972d9705eae5f694b4d8907882bec4add7c6c6ed
+DIST pyo3-0.25.0.crate 1120850 BLAKE2B 
6f373129d032e6980d058ec5dbfea58a7ce0cb8ed2b32aa852a14746cfd3a541b02286676c934a5d7f7bc1bea03e986e93e44de42114f7620b487977c0092d85
 SHA512 
83336d284eefdef5bc26dec4880e21c608a001b4676b3628eb59b7c0011fb672ca81fca035666b714eeb158809064f9b5b0720802045d5ff8fc9f6af02813c30
 DIST pyo3-build-config-0.24.1.crate 34020 BLAKE2B 
34ed5a2385de138fde0308439c5fcd8a92a48b215b41799838d5b3106b0845f70023ccd97d60c39cea4729cd8bd850e1ef4e372ac332a06037dc5dd574b09834
 SHA512 
6008f6737685882b2fd958fcc5f171c0ddc10520631904ca759f857117241dc0a648d4cf30d9a84483662bfbc435eccc3deed9981f98b88016b12a5944ae3ff7
+DIST pyo3-build-config-0.25.0.crate 34122 BLAKE2B 
ba098ff1c963c43d0cd1fdfaec43573ee0d9afff7cc010b7b371504ab66e1fec9233bab04c8c7656c382366d622589d0d5e865a8a271c68a9831ca657b49fcb9
 SHA512 
f6580bcc12bf8235bd8bdc09908f861645adfcdee31cf88d6443e628601bf3107c1d823c09dacb8e1bdaa171ae49f15e19811b9752600b799a4e86cdea081d40
 DIST pyo3-ffi-0.24.1.crate 76435 BLAKE2B 
1fc7b122f0c1064382bf304491617abfd5a8f275ab7511cf31ed892576728b7b55814ea454761bb0fb4d01e263daf8f2c302504fc624970fc9940a5a2cb143fe
 SHA512 
b06265f3852f419a2a788fef049cf9032a5dd4fa6ca818d8d5ceae24b3642164497c61e67492a6576f1c8b22d66e2d887b295c48317fee94f8db8e14de25a71e
+DIST pyo3-ffi-0.25.0.crate 77991 BLAKE2B 
0474051570bf71070eab2578e0f9278327ccc48510419d292a81887fffad753ba434db6b795536512a688426eff42ea9805f99b1a3237ec927f6c731033850b2
 SHA512 
e03cb71493c898408a0692ba7fb4cd704e48c307f5115159f3375fae879e46f5cd7536325d70e7dbd3aeca8ea282a0fb5b5ac609bc807e8b9cb6abbd3a9a2ca5
 DIST pyo3-macros-0.24.1.crate 8866 BLAKE2B 
48436f5f1a6a6e93d916873be5e18cfdc892d59479e4963f267d2a1805bd134eed6890d53915fdafa8ff93c7458d136b57fbf783bee18f34a6087f7819c9dd92
 SHA512 
7b9fc55232284d7b138e3e9c9a9c864a1b0d9b5317c3263a057df5dc1976087e934558d6c046d784735e063f1009df35b91776c850ad709800ca8b2be8e993d8
+DIST pyo3-macros-0.25.0.crate 8876 BLAKE2B 
09c37cc5bdaec6859461a7bb4d1c28d0ddd77a448fb5097275fe7be373897900e2dcdb1c43eb4cc915e1089ac1204f4a7155c4b69478b0778e179aded1449ff0
 SHA512 
ee1218b6981d94a228bf55f31f0131c094728b12c19b312a77386cace2c4768ad8fc8a1a1999bf27c6a30012e20a1eb7a574d918ccacc421930c12cb1a6386ef
 DIST pyo3-macros-backend-0.24.1.crate 72588 BLAKE2B 
35f1810f5d1da5b5f0b5533d0c9e832ea7c7a7a5be20711d9694b84aad62d13b8a9a1c498c61a9a1f2679fda7d25bf508536d38cded43520ed97524681dcfabe
 SHA512 
8378154aa74c75a4d4533de673515298d8ada8377feb687694688bcf21fc5c2bcf856c2db7ce172cb038936b407e57a665ad6c3b9ce1a499a474e54c6bf119ff
+DIST pyo3-macros-backend-0.25.0.crate 75089 BLAKE2B 
ea4d87e16616782c60f46f97d87a002ea2873a2ab6f7335da68bab32d636988fa30834c946943d4c56c6e5992c78ba6dc2cf8b613c2a402218599ef3e7a6c5be
 SHA512 
dc2e567a09e746893d7cea57aa456124df31b1e3cb25f5b1fabdc97cd2ae73eea1d57aa642268bdbef3dc1ba0e383893d1b5dfd9cf1f3e818f77b9fc0ef2c486
 DIST python3-dll-a-0.2.13.crate 85018 BLAKE2B 
4531172b7e985041fe3cf7d164c67dc74e5974fbdbc80f1b7fb5e351d8115cda0a7a8f64c037ff7fcf4c20918fa2a53a29c8784035c571e0c46be39cdc7faff4
 SHA512 
01438c7af7a936ae6b95e1b81f4596627043a4b02eea85241a18ed137c23dff644f3e8d8eeb45b8e64ef1fd2693ab47fde47b6341dfc56f6c4eca032da46647c
 DIST quote-1.0.38.crate 31252 BLAKE2B 
a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2
 SHA512 
530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af
 DIST redox_syscall-0.5.9.crate 30080 BLAKE2B 
e7a6d1f9e96bda9f5544bddee96ff51225339c96effa4b8f41daa414208a2052ec76a88400a504b7fe7ed7aee6917aaddf031a385955e7d9bebc6064e5e3000d
 SHA512 
5689ab9cb30fd1972fb275aa22afa876ce013cd91c2b0d6afea17d0b3d45d981809e128b0f483b9419597f3974081c115956fcc1fd14172bc94cf0078f5cdc52

diff --git a/dev-python/cramjam/cramjam-2.11.0.ebuild 
b/dev-python/cramjam/cramjam-2.11.0.ebuild
new file mode 100644
index 000000000000..099a11686f4e
--- /dev/null
+++ b/dev-python/cramjam/cramjam-2.11.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: you need to use top-level Cargo.lock to generate the crate list.
+CRATES="
+       adler2@2.0.0
+       alloc-no-stdlib@2.0.4
+       alloc-stdlib@0.2.2
+       anstream@0.6.18
+       anstyle-parse@0.2.6
+       anstyle-query@1.1.2
+       anstyle-wincon@3.0.7
+       anstyle@1.0.10
+       autocfg@1.4.0
+       bitflags@2.9.0
+       blosc2-rs@0.4.0+2.15.2
+       blosc2-sys@0.4.0+2.15.2
+       brotli-decompressor@4.0.2
+       brotli@7.0.0
+       bumpalo@3.17.0
+       bzip2-sys@0.1.13+1.0.8
+       bzip2@0.4.4
+       cbindgen@0.27.0
+       cc@1.2.16
+       cfg-if@1.0.0
+       clap@4.5.31
+       clap_builder@4.5.31
+       clap_lex@0.7.4
+       cmake@0.1.54
+       colorchoice@1.0.3
+       copy_dir@0.1.3
+       crc32fast@1.4.2
+       equivalent@1.0.2
+       errno@0.3.10
+       fastrand@2.3.0
+       flate2@1.1.0
+       getrandom@0.3.1
+       hashbrown@0.15.2
+       heck@0.4.1
+       heck@0.5.0
+       indexmap@2.7.1
+       indoc@2.0.5
+       is_terminal_polyfill@1.70.1
+       isal-rs@0.5.3+496255c
+       isal-sys@0.5.3+496255c
+       itoa@1.0.14
+       jobserver@0.1.32
+       libc@0.2.170
+       libcramjam@0.7.0
+       libcramjam@0.8.0
+       libdeflate-sys@1.19.3
+       linux-raw-sys@0.4.15
+       lock_api@0.4.12
+       log@0.4.26
+       lz4-sys@1.11.1+lz4-1.10.0
+       lz4@1.28.1
+       lzma-sys@0.1.20
+       memchr@2.7.4
+       memoffset@0.9.1
+       miniz_oxide@0.8.5
+       once_cell@1.20.3
+       parking_lot@0.12.3
+       parking_lot_core@0.9.10
+       pkg-config@0.3.31
+       portable-atomic@1.11.0
+       proc-macro2@1.0.93
+       pyo3-build-config@0.25.0
+       pyo3-ffi@0.25.0
+       pyo3-macros-backend@0.25.0
+       pyo3-macros@0.25.0
+       pyo3@0.25.0
+       python3-dll-a@0.2.13
+       quote@1.0.38
+       redox_syscall@0.5.9
+       rustix@0.38.44
+       rustversion@1.0.21
+       ryu@1.0.19
+       same-file@1.0.6
+       scopeguard@1.2.0
+       serde@1.0.218
+       serde_derive@1.0.218
+       serde_json@1.0.139
+       serde_spanned@0.6.8
+       shlex@1.3.0
+       smallvec@1.14.0
+       snap@1.1.1
+       strsim@0.11.1
+       syn@2.0.98
+       target-lexicon@0.13.2
+       tempfile@3.17.1
+       toml@0.8.20
+       toml_datetime@0.6.8
+       toml_edit@0.22.24
+       unicode-ident@1.0.17
+       unindent@0.2.3
+       utf8parse@0.2.2
+       walkdir@2.5.0
+       wasi@0.13.3+wasi-0.2.2
+       wasm-bindgen-backend@0.2.100
+       wasm-bindgen-macro-support@0.2.100
+       wasm-bindgen-macro@0.2.100
+       wasm-bindgen-shared@0.2.100
+       wasm-bindgen@0.2.100
+       winapi-util@0.1.9
+       windows-sys@0.59.0
+       windows-targets@0.52.6
+       windows_aarch64_gnullvm@0.52.6
+       windows_aarch64_msvc@0.52.6
+       windows_i686_gnu@0.52.6
+       windows_i686_gnullvm@0.52.6
+       windows_i686_msvc@0.52.6
+       windows_x86_64_gnu@0.52.6
+       windows_x86_64_gnullvm@0.52.6
+       windows_x86_64_msvc@0.52.6
+       winnow@0.7.3
+       wit-bindgen-rt@0.33.0
+       xz2@0.1.7
+       zstd-safe@7.2.3
+       zstd-sys@2.0.14+zstd.1.5.7
+       zstd@0.13.3
+"
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Thin Python bindings to de/compression algorithms in Rust"
+HOMEPAGE="
+       https://github.com/milesgranger/cramjam/
+       https://pypi.org/project/cramjam/
+"
+SRC_URI+="
+       ${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+       Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT MPL-2.0
+       Unicode-3.0
+"
+SLOT="0"
+
+DEPEND="
+       app-arch/bzip2:=
+       app-arch/libdeflate:=
+       app-arch/lz4:=
+       app-arch/xz-utils:=
+       app-arch/zstd:=
+       dev-libs/isa-l:=
+"
+#      dev-libs/c-blosc2:=
+RDEPEND="
+       ${DEPEND}
+"
+BDEPEND="
+       test? (
+               dev-python/numpy[${PYTHON_USEDEP}]
+       )
+"
+
+EPYTEST_PLUGINS=( hypothesis )
+# horrible workaround for https://github.com/milesgranger/cramjam/issues/201
+EPYTEST_RERUNS=5
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/cramjam/cramjam.*.so"
+
+src_prepare() {
+       sed -i -e '/strip/d' pyproject.toml || die
+       distutils-r1_src_prepare
+       export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+
+       # strip all the bundled C libraries
+       find "${ECARGO_VENDOR}"/*-sys-* \
+               -name '*.c' -delete || die
+
+       # https://github.com/10XGenomics/lz4-rs/pull/39
+       pushd "${ECARGO_VENDOR}"/lz4-sys* >/dev/null || Die
+       eapply -p2 "${FILESDIR}/lz4-sys-unbundle-lz4.patch"
+       popd >/dev/null || die
+
+       # https://github.com/milesgranger/isal-rs/pull/25 (cheap workaround)
+       sed -i -e '/default/d' "${ECARGO_VENDOR}"/isal-sys*/Cargo.toml || die
+
+       # enable system libraries where supported
+       export ZSTD_SYS_USE_PKG_CONFIG=1
+
+       # unpin C library versions
+       sed -i -e '/exactly_version/d' \
+               "${ECARGO_VENDOR}"/libdeflate-sys-*/build.rs || die
+
+       # bzip2-sys requires a pkg-config file
+       # https://github.com/alexcrichton/bzip2-rs/issues/104
+       mkdir "${T}/pkg-config" || die
+       export 
PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+       cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+               Name: bzip2
+               Version: 9999
+               Description:
+               Libs: -lbz2
+       EOF
+
+       local features=(
+               extension-module
+
+               snappy
+               lz4
+               bzip2
+               brotli
+               zstd
+
+               xz-shared
+               igzip-shared
+               ideflate-shared
+               izlib-shared
+               use-system-isal-shared
+               gzip-shared
+               zlib-shared
+               deflate-shared
+               # 
https://github.com/milesgranger/cramjam/issues/204#issuecomment-2692307708
+               # blosc2-shared
+               # use-system-blosc2-shared
+       )
+       local features_s=${features[*]}
+
+       DISTUTILS_ARGS=(
+               --no-default-features
+               --features="${features_s// /,}"
+       )
+}