commit: 15fa3b89ddced40cae0ca6025ba214a96ba634ae Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> AuthorDate: Sun Aug 30 14:52:54 2020 +0000 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> CommitDate: Sun Aug 30 18:37:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fa3b89
dev-libs/libsavitar: version bump 4.7.0 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/17336 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> dev-libs/libsavitar/Manifest | 1 + .../libsavitar-4.7.0-use-system-pugixml.patch | 8 +++ dev-libs/libsavitar/libsavitar-4.7.0.ebuild | 76 ++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index a4c6a4380d0..43cd7300b99 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -3,3 +3,4 @@ DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b6 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6 DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2 +DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d diff --git a/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch new file mode 100644 index 00000000000..cd9406da928 --- /dev/null +++ b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,7 @@ + find_package(Threads QUIET) + endif() + +-add_subdirectory(pugixml) ++find_package(pugixml REQUIRED) diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild new file mode 100644 index 00000000000..485ab1b9b93 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..8} ) + +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 ~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[${PYTHON_MULTI_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 +}
