gentoo resync : 13.06.2020

3 files changed, 58 insertions, 80 deletions

diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 92d4d90814a2..99e68f6c0eb4 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -2,5 +2,5 @@ AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987
 AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
-EBUILD xdmf2-1.0_p141226-r3.ebuild 1826 BLAKE2B 163017498172125a0c3705e7c72fe0d711cd5208444e8871623bc0a7ec854ae1cb787def9fedbb18d18bae31b9a0fe7fdafde58176e12f5e9b76aaca35e52c67 SHA512 460bb0336178754a71daaa80df233e4502980af316e6a28440e29cd886d83cc2e2fa0f1f4f6d4f3270b8612b6fdc63cd70e4accc0daecf2097b118e4558637c7
+EBUILD xdmf2-1.0_p141226-r4.ebuild 1152 BLAKE2B 7243e0c54008dfe0a141a4f97fe9d2ef0975e81696176220a4cbfed9783f021dd15a7d4f7f442f253ad361b38dfd7b1e4ba92c6abe07e09afd800f3bed1433f0 SHA512 28f7106ede60193dc0d8d9272e37b1ec13e7682f874521cbc69cfec66a92ce3fcfaa615db414419a4d91ee727e4dc31d7b4e276dc181d05323280620503b71e2
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
deleted file mode 100644
index fe0d3fcb2bc5..000000000000
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-DESCRIPTION="eXtensible Data Model and Format"
-HOMEPAGE="http://xdmf.org/index.php/Main_Page"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="VTK"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-libs/hdf5:=
-	dev-libs/libxml2:2
-	python? ( ${PYTHON_DEPS} )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-module.patch
-	"${FILESDIR}"/${P}-cannot-find-hdf5-bug-591302.patch
-	"${FILESDIR}"/${P}-cmake-3.12.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup && python_export
-}
-
-src_prepare() {
-	if use python; then
-		local _site=$(python_get_sitedir)
-		sed \
-			-e "/DESTINATION/s:python:${_site##${EPREFIX}/usr/$(get_libdir)/}:g" \
-			-i CMakeLists.txt || die
-	fi
-
-	sed \
-		-e "/DESTINATION/s:lib:$(get_libdir):g" \
-		-e "/INSTALL/s:lib:$(get_libdir):g" \
-		-i CMakeLists.txt core/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug 619604
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=1
-		-DXDMF_BUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DXDMF_WRAP_PYTHON=$(usex python)
-#		-DXDMF_WRAP_JAVA=$(usex java)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake
-
-	# need to byte-compile 'XdmfCore.py' and 'Xdmf.py'
-	# as the CMake build system does not compile them itself
-	use python && python_optimize "${D%/}$(python_get_sitedir)"
-}
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
new file mode 100644
index 000000000000..e196d6f8dd2b
--- /dev/null
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="eXtensible Data Model and Format"
+HOMEPAGE="http://xdmf.org/index.php/Main_Page"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="VTK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2:2
+	sci-libs/hdf5:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-module.patch
+	"${FILESDIR}"/${P}-cannot-find-hdf5-bug-591302.patch
+	"${FILESDIR}"/${P}-cmake-3.12.patch
+)
+
+src_prepare() {
+	sed \
+		-e "/DESTINATION/s:lib:$(get_libdir):g" \
+		-e "/INSTALL/s:lib:$(get_libdir):g" \
+		-i CMakeLists.txt core/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=1
+		-DXDMF_BUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+		-DXDMF_WRAP_PYTHON=OFF
+		-DXDMF_WRAP_JAVA=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake
+}