gentoo auto-resync : 06:04:2023 - 23:28:41

7 files changed, 88 insertions, 56 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 58306034df4b..c3d013dd91bb 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/XNNPACK/Manifest b/sci-libs/XNNPACK/Manifest
index efba28139b7c..f86265b358d7 100644
--- a/sci-libs/XNNPACK/Manifest
+++ b/sci-libs/XNNPACK/Manifest
@@ -1,4 +1,6 @@
 AUX XNNPACK-2022.02.17-gentoo.patch 434 BLAKE2B 23c3f9b2f368c827f9ee13da6bec050aeeb2caf7c9ff17bd1b3a4ece60f15d2e0cbfd2aab655d643e85dc0ee0b7514834d487bf1befa68331aee86ca51530e61 SHA512 38f42606a83d6fc8ee74c2ca547c9bdad9c4e38393efa22757716b76c7f527a4648f67828bb39b9e7cf044860b087fce174eea156dc8cd54907d3e863f264bdc
 DIST XNNPACK-2022.02.17.tar.gz 6761154 BLAKE2B 59be5d9efe6f46d22bc41d3152e6cd3103f6dfafd94cdf3229b86ecf44a46175c613760f3de35c98a24ccdec1783f205c1eceaf21133706fedd5f384529748eb SHA512 aacbe907bb2b7429143f4ec612881fb709fe37e7b3a7f4fd68193dee6bbe82e17d20b2c6f5a8025845a09f8269c1dfeaebfc5bd64ef196fa376d82ac9a44cb8f
+DIST XNNPACK-2022.12.22.tar.gz 8342018 BLAKE2B 50426a47121418ef00a29b390ab4bb28211c17faaa7f4eacbf3a363fc3511b8655687e7f7f93f13b06a72ff9bcbde033305372687b6f2df1e1d5abaa910fe8be SHA512 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b
 EBUILD XNNPACK-2022.02.17-r1.ebuild 1754 BLAKE2B 4808696f0afe4219972c3e40feb86b9227f031b584a68753ae1fd48daea983737350a8f3bdb32e954f53109b134195b0e8931ebf4a3ecd05b51ebd16c33d806e SHA512 a1cc06d2885731684d16f4ddb1fe55a85212130ae0b09118dd66226f54e2b70643399110057f425a907b05aeafed1b4b7b5eefb2d9fd325d5b2172319a3349ee
+EBUILD XNNPACK-2022.12.22.ebuild 1829 BLAKE2B e228b0be6a4781adb1a70c5f9ba6e312b2d72b6713c654f7163b4bcd8f86d7f6cedbbde59878544abbb8e0721f64fc371a7924600aa4aec50aeb02457f3f0860 SHA512 e60ab6ded7802b1a10b39845e0627ec10b580b362b3502efa1f9ee083053c5bcbd782f3dc6987e9108d9a7a225d65cf9c4b24d0420f49a44c5c6eff7790288f4
 MISC metadata.xml 614 BLAKE2B 4f33a22a79f975aaf528ba53bf6e26aeb91af4244f7aac4259a61033c0841f2ea3c29a62c6a984429bf2a87b8e8173df7481079e3438e76d2d7050a31856501a SHA512 e55c7b603f37211338d1472796015a24ff2d034339461eb67411ed4d59202ed52a9e8d554de5cd72636e35875421f983dee12b7173056c806cd9541148ca0f71
diff --git a/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild b/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild
new file mode 100644
index 000000000000..c30a840eaf57
--- /dev/null
+++ b/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=51a987591a6fc9f0fc0707077f53d763ac132cbf
+
+DESCRIPTION="library of floating-point neural network inference operators"
+HOMEPAGE="https://github.com/google/XNNPACK/"
+SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+assembly jit +memopt +sparse static-libs test"
+
+RDEPEND="
+	dev-libs/cpuinfo
+	dev-libs/pthreadpool
+"
+DEPEND="${RDEPEND}
+	dev-libs/FP16
+	dev-libs/FXdiv
+"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.02.17-gentoo.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "/PRIVATE fp16)/d" \
+		-e "/PRIVATE fxdiv)/d" \
+		-e "/PRIVATE clog)/d" \
+		-e "/TARGET_LINK_LIBRARIES/s: fp16::" \
+		CMakeLists.txt \
+		|| die
+	dropTest=(
+		"add-nd-test"
+		"subtract-nd-test"
+		"f32-velu-test"
+		"qc8-dwconv-minmax-fp32-test"
+		"qs8-dwconv-minmax-fp32-test"
+		"qs8-vadd-minmax-test"
+		"qs8-vaddc-minmax-test"
+		"qu8-dwconv-minmax-fp32-test"
+		"qu8-vadd-minmax-test"
+		"qu8-vaddc-minmax-test"
+	)
+	for id in ${dropTest[@]}
+	do
+		sed -i \
+			-e "/ADD_TEST(${id}/d" \
+			CMakeLists.txt \
+			|| die
+	done
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DXNNPACK_BUILD_BENCHMARKS=OFF
+		-DXNNPACK_USE_SYSTEM_LIBS=ON
+		-DXNNPACK_BUILD_TESTS=$(usex test ON OFF)
+		-DXNNPACK_LIBRARY_TYPE=$(usex static-libs static shared)
+		-DXNNPACK_ENABLE_ASSEMBLY=$(usex assembly ON OFF)
+		-DXNNPACK_ENABLE_JIT=$(usex jit ON OFF)
+		-DXNNPACK_ENABLE_MEMOPT=$(usex memopt ON OFF)
+		-DXNNPACK_ENABLE_SPARSE=$(usex sparse ON OFF)
+		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+	)
+
+	cmake_src_configure
+	cd "${BUILD_DIR}"
+}
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index d1e36a8db4c2..6ae0809a3d4d 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -7,5 +7,5 @@ AUX caffe2-2.0.0-gentoo.patch 6682 BLAKE2B 67657b1ca48ded05a6b07ce18df89c4b87590
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
 EBUILD caffe2-1.13.1-r4.ebuild 5009 BLAKE2B dd92c8d27be86d635a832e286ed2b1617e10520f02447d7aaf097cdabcd9c8ba634490ef4af59325d64048bf63f39d00a693373ab921c855e5716514c212d38c SHA512 5269a5c121b2bb9c5d4a1a07c6d1300577e4abec418625c2cae88c6d0385768fe73f380a997b5f46837eba29948c6397e4a4ac642c9d1c94f5ac0fba6e794732
-EBUILD caffe2-2.0.0.ebuild 4969 BLAKE2B 7a352b5944a9876ebdbd5fdb27d9bbda98e57f323264b06e5b401e545a75ace66ab54aed647110fce1f79e3c1776d459dd6466e1aa545c94e738acd8781abc4e SHA512 5498186968a757d2ad3055eb5d2210f081ac5e89c7994a657b3610b71b4bf6c7e5d4c6288128671b02e96e78fdd22ec22ca5fe9aac508685c400014f26281ccf
+EBUILD caffe2-2.0.0.ebuild 4982 BLAKE2B 36012cf4c19f5d93084cdcd6d2d185db391d73e81e68d34eb73d7be66a2ff12ec1ee676921d663a80cf4080d2e2ef8accb15d2bbfb08eefcf94c89999b2cedb4 SHA512 b7d0b2811d11a197c9977070b2332c2a86e616bbd6c6b2dd967580a6de889853a88019ec02fd04907d759e7d493acd755938552812c3d167ce4d19f30833558f
 MISC metadata.xml 1076 BLAKE2B e1128f64fe04ef1af67219ffa450f52dadf3e4062b0e9e958c41555acc390966945c431b589181101d3366f9d474605ea48f8b332a2f6ff49a9eb1a9a79a1a37 SHA512 3fc9df5640bd5239cf3e738ca248d6de4be84fac667b1a33484dd572377c02debac29aea369c048cb5bd907209071339e1ff0d2d1d1bb94c12b97a481f8b257d
diff --git a/sci-libs/caffe2/caffe2-2.0.0.ebuild b/sci-libs/caffe2/caffe2-2.0.0.ebuild
index d06eaa5b375f..9b010cdda9a9 100644
--- a/sci-libs/caffe2/caffe2-2.0.0.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.0.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	tensorpipe? ( sci-libs/tensorpipe )
-	xnnpack? ( sci-libs/XNNPACK )
+	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index e91377411bf4..c1e1e906205e 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,5 +1,3 @@
-DIST htslib-1.16.tar.bz2 4466776 BLAKE2B 4957dd7a25b3d0b939d4e924db018916a5f8a13a81e55ebd1ce1acc548986e581d017ead9a08245a4af1ebdcd15536f082425ebe05f16eb4faad27d332e48482 SHA512 9fa0b1f9bba50f889d4542825c9543fb3b34c13b4cc0e18940a66fafd130749574bfa2c2663d8b39f0b4ed2b298bf130367cda1b17b2929093d64b386730cbc5
 DIST htslib-1.17.tar.bz2 4619884 BLAKE2B c45591b3f1da4f6ddfdf5e1a20864583d57de2a460d42049715335fce7dafe1f5cd14403e6033fee4f9d0bfc75f8777b5835d2d01bf2cadff0155d9fc92b97d9 SHA512 624ab449d57713dab2d34399926c065f8cff8a45e6fbe68e0bb518c601421f587b613caeb095f8639b1d67cdb4a65d658c85f942173bcaa48da026fe15def5d3
-EBUILD htslib-1.16.ebuild 1074 BLAKE2B d04ae956ac6d4819704e8342d9679d0c54274c09da155c6d73d0e889b3db75cfbbae80665e750c0d7387cf9eeeac7642ff31bbe301220cef06915d7081c3aa74 SHA512 6c617b18f47e2823077527653dcf2a6976577efde1481087d5188ce151089edc9a98343ef6ad3864117477c60531694287adae5def956f016d6e105445ae1963
 EBUILD htslib-1.17.ebuild 1074 BLAKE2B 2bfb261fbe65d7a3d2cd33aec2c3e1e3c649570abfa7b5a630e43f07118869731e22ee1180d8877237aa3423e76c5f3eba7c87c6b1bfe591a982a427eb7d6fc6 SHA512 d2901ebb4f8e43b7db795e6a6e4f53b5eaad3bbc5db5607d65db08f517fbf6c41547053ccf229a6f0849ba38921127233ce824e8d18bcefbd7a921c284703609
 MISC metadata.xml 342 BLAKE2B 1c27212ba39cbbd235e2b023af977d5dffbb53dab193e21c989b2da52641fec13317110cfb52fd73cbe7fbdd5aa6b3628ee7cd55ae919551fa82267b05f93e2d SHA512 5b61d1b204a33d6328d3964346c48dc35bc4e29c56dc7920a63caf2fc510be35b10f74f2649a2670239de90cff5ed4652fa99d4ef51a55245b7fc4b31f29674b
diff --git a/sci-libs/htslib/htslib-1.16.ebuild b/sci-libs/htslib/htslib-1.16.ebuild
deleted file mode 100644
index c4bd910685de..000000000000
--- a/sci-libs/htslib/htslib-1.16.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="C library for high-throughput sequencing data formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 curl +lzma"
-
-RDEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	curl? ( net-misc/curl )
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# upstream injects LDFLAGS into the .pc file,
-	# which is a big nono for QA
-	sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \
-		-i htslib.pc.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-gcs \
-		--disable-plugins \
-		--disable-s3 \
-		$(use_enable bzip2 bz2) \
-		$(use_enable curl libcurl) \
-		$(use_enable lzma)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# doesn't use libtool, can't disable static libraries
-	find "${ED}" -name '*.a' -delete || die
-}