gentoo auto-resync : 01:08:2023 - 10:47:11

7 files changed, 22 insertions, 6 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f9cad42fd515..aa80a5c2962d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 57560f557ad4..5d7f1cf49de3 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -11,5 +11,5 @@ DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9
 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD caffe2-1.13.1-r6.ebuild 5221 BLAKE2B 64a0309f8601752187205d49629245ae8a3305d9fad0626eff293fa555e50c7c147bfa9879ada2bd0a076e41120a9f5f9667cd784a4a3418cee9a4711eb69b05 SHA512 d1162bb88a1ac0c412cc2fa828521f98be9eda5f55d63f4a5162c727940121db1a7ab8155bd151fe1a2b9985851ff82bb49e3f3e01c4e4f1fdc1f3f4444d56ce
 EBUILD caffe2-2.0.0-r4.ebuild 5292 BLAKE2B f0560c057af3e24e81e4538f4ef6f35eba6b3e70a435c00be0e08aed40e1991997beea05127e195fcefe019147b10ca74c338e3b5a1b8bd61c631b680805a587 SHA512 4556d43911ca5fd8438d603529cf74bde4ec8ac30b9e7a45debab2252a9a8db53dde09b20d1be08a76f90dc783bd70401b1252427da6556d6c3e7d487b656345
-EBUILD caffe2-2.0.1-r2.ebuild 5341 BLAKE2B dbd68dc9ec032f17ccf06050fe0e181ac38187d93d3e7a697c6c1ae0cc06446fd15643ef05d37fcc99f22c07f9818545b6ec445666ca5bd9002d6c740c6fa07a SHA512 825942421b3c7fec44ea308d112aa92a4b95b70420fdea2aaa5e1bfb76204764060dd62bc29d709b557d7afd22083d8291b55e864397d448f9734892f8d73f8e
+EBUILD caffe2-2.0.1-r3.ebuild 5831 BLAKE2B a268da70eb7885d37e961197c97764f4182c8478a80b220333fe68f0fa3fea6976ce4ccd36c7ddafd862d2edd36ba352e7a05bf6af5d985973af2d869ca9afc6 SHA512 8c3b740da1dbe333f37e5d982d2f2f2347f3332ebbf9172dd95d571c7410bd539e631fc5bc100a7e8217bfd1cd92505cf55f8e809f7f8a4e0a47162e1b98218c
 MISC metadata.xml 1161 BLAKE2B af1b8f3ab7789f9aa5f635d5a3f1175bbdd7ccbf68f205bfc2769ccab2cb5c519f6fe62024759eb28f0e1353a04bed3216d222808b9f95100d3e0bb591f1d82b SHA512 1737d3dc8fa7786550930beb067ca4eca173a47095a88450ab5c913d3aed08f51fe21c875f484e5663542471a48ef55878cddc97881ff8be7648987b90b79126
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild b/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
index b8f88ae63e41..29087a44643f 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake cuda flag-o-matic
+inherit python-single-r1 cmake cuda flag-o-matic prefix
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -97,6 +97,20 @@ src_prepare() {
 	pushd torch/csrc/jit/serialization || die
 	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
 	popd
+	# prefixify the hardcoded paths, after all patches are applied
+	hprefixify \
+		aten/CMakeLists.txt \
+		caffe2/CMakeLists.txt \
+		cmake/Metal.cmake \
+		cmake/Modules/*.cmake \
+		cmake/Modules_CUDA_fix/FindCUDNN.cmake \
+		cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
+		cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
+		cmake/public/LoadHIP.cmake \
+		cmake/public/cuda.cmake \
+		cmake/Dependencies.cmake \
+		torch/CMakeLists.txt \
+		CMakeLists.txt
 }
 
 src_configure() {
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index c8d39bd87d24..cd2a72c74059 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,5 +5,5 @@ DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe737
 DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
 DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b
 EBUILD gdal-3.6.4.ebuild 6772 BLAKE2B 63e9d689bfbb54948a43756f47acb6aec7030f4fffda1fd5f2ca8d6a8ea9e2aa93ffe7e1c18404ec58e66ba9f94f648f004c7aa4497e1e2cdb9647c0bbd8bd79 SHA512 735ff9adbbc31ee5ac934a832637b35db99e9b64e67110c014a958f485692ae1e2d479bc2642bf35924e38bc3306c086386ae031b783ae03b1938f7586dff750
-EBUILD gdal-3.7.0.ebuild 7536 BLAKE2B a42af154dc1a0a8f816bd7bdb33d5e3b50cd1dfb10947fc6f3cbe48f9613df34a684251264842832b65050ca13a46dd5e78dce495c4adfdddc552ca048eaab28 SHA512 2d38a05d0a2b3a90b2e46ad3d4800c358d8587bc681644686a7b20e05f6958f8dac5176f7e4c932890588d17aa4db11c6e1b8d7e9a76440fa76c5aadc97b20d8
+EBUILD gdal-3.7.0.ebuild 7534 BLAKE2B 4df623ee5633720b2e44e4110410137bcff165b9d4302fbda11baade43a4a2d47faff4c5b332b382c3ee2fa37f3f1ab27ae77f9c398edcc0013ddac5e1ec2af2 SHA512 2971c2c703850337f2086dd305d8ec6b3d2c322b1629edd0f35edb54a1bfdd97bac16f354b7fee8d5cefb94fd0023b5ed334a237e5a390b46e8bcc1e901439b0
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
index 678382fc22d1..70f7cabb254a 100644
--- a/sci-libs/gdal/gdal-3.7.0.ebuild
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/33" # subslot is libgdal.so.<SONAME>
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index e7b66cd957ee..4436dce9d011 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -11,5 +11,5 @@ DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9
 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD pytorch-1.13.1-r2.ebuild 1512 BLAKE2B a83a2846755b3ad3dc62329f77b04e73be1f5a79a3c3e2311a61c0965c50a17a83deac89c22ce26470be415c0c48a760f1b74c207e6864a16aead25e42896867 SHA512 55a6ed013855c4d20fad0bb213e51b2881d0b7c3e456055800b16658f92460d998294148d041dba642a11be1a60d5d830edf8613cc09cdf9ce6eef7ecc809976
 EBUILD pytorch-2.0.0.ebuild 1549 BLAKE2B f347c1bb89ff80f4cec2f6d5ca27134c3936f02d80a285d2df88c7472e62dcdb025f72d7f88820bbda2422dd0810db2b53017fc91fdedd2cbb5a1880f79d0d74 SHA512 19e390bcb88b81d5eda1f143bcadce730e2c02776dbcad4327f36b0b61beb2932973ee6352bddd27da2fd030a8626fb6687abccff0cb503d159019006264f7d3
-EBUILD pytorch-2.0.1.ebuild 1593 BLAKE2B ca17265a2c32f5775289601cfd14730cb77cb819ae40a52011025886b3796d351e03fd58af413355272b4975fb9fef15ad769a6bb5106876e389a539cb5346fb SHA512 dafdc920d72b559d8cd8a77b5a13002e556fe5a85927c7f8233be2da4eb7618da20abe8f65929877f51bb5cbf14671df4de26abbfa50add82a970ad144c4d5fd
+EBUILD pytorch-2.0.1-r1.ebuild 1640 BLAKE2B f29660c3bf423ba697862d9ccc3bf3ac0f958d4fbc5c4dbeac0860ad5cf8e0c0675def1cd9eb4c0d26a7485baa33481f36a2e2da73d89c00a98cad595fabf8e0 SHA512 21325abae79b7c816822b5605c050d4c05be5b0303ffbbf6497907c5ff6f0c9321d30e9857d008e08697169823e31c297273d5ea31c759fa3f144242d37300ca
 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/pytorch-2.0.1.ebuild b/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
index b778dcb357c3..11f7d447a1e1 100644
--- a/sci-libs/pytorch/pytorch-2.0.1.ebuild
+++ b/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_EXT=1
-inherit distutils-r1
+inherit distutils-r1 prefix
 
 DESCRIPTION="Tensors and Dynamic neural networks in Python"
 HOMEPAGE="https://pytorch.org/"
@@ -49,6 +49,8 @@ src_prepare() {
 		tools/setup_helpers/env.py \
 		|| die
 	distutils-r1_src_prepare
+
+	hprefixify tools/setup_helpers/env.py
 }
 
 src_compile() {