gentoo resync : 12.05.2022

4 files changed, 2 insertions, 158 deletions

diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index dfccbfdc5d37..2124c72544a5 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,8 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
-DIST libsavitar-4.12.1.tar.gz 100730 BLAKE2B cb9dd3ed6802e88235769f70092dbd50113d107b3d2ec17851120338ad6b6ee809c1243f406ee0c96358e5e618d883640e2c3ff9c7f3b41fa6e3a4993939c044 SHA512 c848730cca44b942cd0aba343880a68b23f1bfe95b3348cf1d9d490d9a99be3db9d1940ae473a74ad695823404fab86b728327783c8cc3cfb04ebff8cc6a1b3c
 DIST libsavitar-4.13.0.tar.gz 100723 BLAKE2B d631c572e20fcf92cb2053959fad7c806b18981eaad7a0ad1efb52870a7f5874459d4012a7583be8bcdd7cbfad863dea9c4f8c13579269db3ea3a3cf92383b4f SHA512 a446131c0bbcc34e55c093032af823b9750797f06297bea9fd4d64838e793811e71679a1f6ae99be9fc9382a23e8763140147c7a6eea0a310f6f2d40b53be3bf
-DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
-EBUILD libsavitar-4.12.1.ebuild 1750 BLAKE2B 00c423703ff17155641b8fa101dc1d557b26e44c2afbd568b929705681d65008b56898558e7538fe1e662200d39281f924de0d1637f4ed3d04a947ffcb237703 SHA512 44c940c74668938c1a49177fc2a12ef2eafb577af8a43e0b5af4fb7b2ffcc25293f2ed139892ad5762ddfd9822f810e4c51827806959cef150253ab6d25f148a
-EBUILD libsavitar-4.13.0.ebuild 1751 BLAKE2B 8c8324f39f9abbbe2ec5f53038b95e66b08da3f1ba38d4d065918153833e0f7883891a32adc4bd90536fdb47eab8effc1e3c27f22e93f3c1dc723ed4a430255f SHA512 db217921582a2fc6b0a565a6d2e4f7053af62682d1c3608c6d4a393577f175c8fc7d043d48101c9d51bd3865e134489fe78d339b338f82f72858ce447057947b
-EBUILD libsavitar-4.9.1.ebuild 1751 BLAKE2B 40e8748df6934c20fc4843a8194461e49242fe6b344fa40a1b31dfd64ab84263612bc669039fdc926e48c7f6150916b803a5c9f783531b71f9d794d0209f6e18 SHA512 11fe811ee9165ed118957ed7576b7af8b2c7a070e0587327f110d00657d6a88680fc357059e7078a57494fefdcc066f43c5ccd243a9899bb53aa4471f65bb36d
+EBUILD libsavitar-4.13.0.ebuild 1750 BLAKE2B 00c423703ff17155641b8fa101dc1d557b26e44c2afbd568b929705681d65008b56898558e7538fe1e662200d39281f924de0d1637f4ed3d04a947ffcb237703 SHA512 44c940c74668938c1a49177fc2a12ef2eafb577af8a43e0b5af4fb7b2ffcc25293f2ed139892ad5762ddfd9822f810e4c51827806959cef150253ab6d25f148a
 MISC metadata.xml 975 BLAKE2B 0d0faa17d5fad674babdfcbb4da1366f0a25eb8e28dfd091c006da263b5915b1909d2843cf9eb2cd8ae6205c56bd9b7fd3ac0d39f7594217c69f9b3cb727bc66 SHA512 91548b2cd344eb43f8b9e2e7596d86b9eec8c856c60dd5b41710d53da1e224d7c2c83283fe04031f7e0ede2be92bed1ebb46b3e897289d7b5a5de5fe93a6f1b8
diff --git a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild
deleted file mode 100644
index dc295a503afe..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-IUSE="+python static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		<dev-python/sip-5[${PYTHON_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-cpp/tbb
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-BUILD_DIR="${S}/build"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# remove bundled pugixml
-	rm -r "${S}"/pugixml || die
-
-	find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
-		-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
-
-	if use test; then
-		find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
-			-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
-	fi
-
-	# find SIP for current python version, not the latest installed
-	sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		CMakeLists.txt cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}
diff --git a/dev-libs/libsavitar/libsavitar-4.13.0.ebuild b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild
index 6d2bdda023f0..dc295a503afe 100644
--- a/dev-libs/libsavitar/libsavitar-4.13.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE="+python static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
deleted file mode 100644
index 263cdd5d1947..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="+python static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	$(python_gen_cond_dep '
-		<dev-python/sip-5[${PYTHON_USEDEP}]
-	')"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-cpp/gtest
-		dev-cpp/tbb
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-BUILD_DIR="${S}/build"
-
-PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# remove bundled pugixml
-	rm -r "${S}"/pugixml || die
-
-	find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
-		-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
-
-	if use test; then
-		find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
-			-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
-	fi
-
-	# find SIP for current python version, not the latest installed
-	sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
-		CMakeLists.txt cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-		-DBUILD_TESTS=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_src_test
-}