5 files changed, 57 insertions, 94 deletions
diff --git a/dev-cpp/json11/json11-1.0.0.ebuild b/dev-cpp/json11/json11-1.0.0.ebuild
deleted file mode 100644
index a7da588e277d..000000000000
--- a/dev-cpp/json11/json11-1.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A tiny JSON library for C++11"
-HOMEPAGE="https://github.com/dropbox/json11"
-SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-multiarch-install.patch
-)
diff --git a/dev-cpp/xsimd/Manifest b/dev-cpp/xsimd/Manifest
index 1411b4acf361..53212822b10f 100644
--- a/dev-cpp/xsimd/Manifest
+++ b/dev-cpp/xsimd/Manifest
@@ -1 +1 @@
-DIST xsimd-10.0.0.tar.gz 212082 BLAKE2B 2a3c6dd711f9e7ffd32ce3fd9a6056a56768a0f5b6ff412d2c5cd5f82682cac87ed0a68109a449ab6337f89a4719e9ab25f94060d3f675783ce00c79e3378512 SHA512 bd7a363bbebc9196954c8c87271f14f05ca177569fcf080dac91be06ad2801c43fccbb385afd700b80d58c83d77f26ba199a7105672e4a1e55c517d15dd6e8e3
+DIST xsimd-11.0.0.tar.gz 218589 BLAKE2B ce0021f51d541d8c713645c84c38df2cf0e769fba191ba1ef030da682aa6176467cc1cc2722feac4bc0d3f931e1611d16349818eb9b4e9e1803d39f0985ecfbd SHA512 75927ab1369aa8eb321d4a2e425f14d977cd1a5792d13a8ca5a393b030fce7a5ce00492a5145a3fbedd29c3ad38556d5a4b2242534eb76dc5164b7cef4f8406b
diff --git a/dev-cpp/xsimd/metadata.xml b/dev-cpp/xsimd/metadata.xml
index 03916bcd299d..c1aa073d78a3 100644
--- a/dev-cpp/xsimd/metadata.xml
+++ b/dev-cpp/xsimd/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>gentoo.kamal@tgf.pw</email>
-  <name>Kamal Abdellatif</name>
+  <email>tupone@gentoo.org</email>
+  <name>Tupone Alfredo</name>
  </maintainer>
  <upstream>
   <doc>https://xsimd.readthedocs.io/en/latest/</doc>
  </upstream>
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/xsimd/xsimd-10.0.0.ebuild b/dev-cpp/xsimd/xsimd-10.0.0.ebuild
deleted file mode 100644
index ddf5c985aad2..000000000000
--- a/dev-cpp/xsimd/xsimd-10.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# required because of manual install in src_install
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="C++ wrappers for SIMD intrinsics"
-HOMEPAGE="https://github.com/xtensor-stack/xsimd"
-SRC_URI="https://codeload.github.com/xtensor-stack/${PN}/tar.gz/refs/tags/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="doc test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		$(python_gen_any_dep '
-			dev-python/breathe[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? ( dev-cpp/doctest )
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	python_has_version \
-		"dev-python/breathe[${PYTHON_USEDEP}]" \
-		"dev-python/sphinx[${PYTHON_USEDEP}]" \
-		"dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_TESTS=$(usex test) )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	if use doc; then
-		cd "${WORKDIR}/${P}/docs" || die
-		emake html BUILDDIR="${BUILD_DIR}"
-		HTML_DOCS=( "${BUILD_DIR}/html/." )
-	fi
-}
-
-src_test() {
-	cmake_src_compile xtest
-}
-
-src_install() {
-	# Default install target depends on tests with USE=test enabled.
-	# However, this is a header-only library.
-	DESTDIR="${D}" cmake_build install/fast "$@"
-
-	einstalldocs
-}
diff --git a/dev-cpp/xsimd/xsimd-11.0.0.ebuild b/dev-cpp/xsimd/xsimd-11.0.0.ebuild
new file mode 100644
index 000000000000..ef4c7e854109
--- /dev/null
+++ b/dev-cpp/xsimd/xsimd-11.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ wrappers for SIMD intrinsics"
+HOMEPAGE="https://github.com/xtensor-stack/xsimd"
+SRC_URI="https://github.com/xtensor-stack/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/breathe
+		dev-python/sphinx
+		dev-python/sphinx-rtd-theme
+	)
+	test? ( dev-cpp/doctest )"
+
+src_prepare() {
+	sed -i \
+		-e '/fPIC/d' \
+		test/CMakeLists.txt \
+		|| die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && emake -C docs html
+}
+
+src_install() {
+	cmake_src_install
+	if use doc; then
+		dodoc -r docs/build/html
+	fi
+}