From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- dev-libs/libsavitar/Manifest | 8 ++-- dev-libs/libsavitar/libsavitar-3.4.1.ebuild | 4 +- dev-libs/libsavitar/libsavitar-3.6.0.ebuild | 4 +- dev-libs/libsavitar/libsavitar-4.2.0.ebuild | 4 +- dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild | 52 ++++++++++++++++++++++++++ dev-libs/libsavitar/libsavitar-4.3.0.ebuild | 50 ------------------------- 6 files changed, 65 insertions(+), 57 deletions(-) create mode 100644 dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild delete mode 100644 dev-libs/libsavitar/libsavitar-4.3.0.ebuild (limited to 'dev-libs/libsavitar') diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 78eea66321da..9bf7c16d6e94 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -4,8 +4,8 @@ DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6 -EBUILD libsavitar-3.4.1.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30 -EBUILD libsavitar-3.6.0.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30 -EBUILD libsavitar-4.2.0.ebuild 938 BLAKE2B 6e0b3cee2d6a4a3cfdad5081446dc6294c6ebb6b675cd9e70ea19b811a39d941398f386ac44aa3b1be26c11e7d80ee2ae77d6de70d3717a33bfbc109eb99cc1b SHA512 8348a643cce7914d325004e40d94654b64abd1cb2d3b04c13cd48b9b05469e6a93b738b7694e28222adf5107d7f8042bb90ee3928882a5936b176362e1624b97 -EBUILD libsavitar-4.3.0.ebuild 1297 BLAKE2B 88b6c910fa8363f373c11aac2cab5b0a44589cd6d737c346f22c0a030a471294e717747cf6b38861da72b5b8a559575d470fa513992bc70acbc7ee7f66039e89 SHA512 e384f0e18573609feb3fe494c93f662a81ae00edaf2bdbbbf21fa8fd844161815ac0527bdf635d68e8a6f049dcc6e24c58f054880c00093f580058048b92b798 +EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9 +EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9 +EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6 +EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304 diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild index d9ecc72540b0..1ee1e2a50841 100644 --- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild +++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}" diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild index d9ecc72540b0..1ee1e2a50841 100644 --- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}" diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild index 26c10c69fca2..55f2b677a7ef 100644 --- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}" diff --git a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild new file mode 100644 index 000000000000..599349de9add --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 ) +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" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/pugixml + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # Find SIP for current python version, not the latest installed + sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die + sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PYTHON=$(usex python ON OFF) + -DBUILD_STATIC=$(usex static-libs ON OFF) + ) + + cmake_src_configure +} diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild deleted file mode 100644 index 1b2ed0ae3c2b..000000000000 --- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -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" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Find SIP for current python version, not the latest installed - sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die - sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - - cmake_src_configure -} -- cgit v1.2.3