gentoo resync : 03.11.2018

3 files changed, 3 insertions, 83 deletions

diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 4f3898144366..66160288b2ff 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -3,6 +3,5 @@ AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd4
 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-r1.ebuild 1540 BLAKE2B fb84d09a0aa7082f90deb5ec8fffa003a409da6ed0318b33837473d1c61bbb9bce6793eeb92152efe4e5495e0baf255432170866764318218250b92b40052f92 SHA512 4758b233409d8979fe16e6c700528692c61784573613f74d154e99902e09b80bf37463558e96627b4e422bdcc98516aaf10066533465d9a0315c8f917c115115
-EBUILD xdmf2-1.0_p141226-r2.ebuild 1842 BLAKE2B 68a934b26e310b71f731dce6976e6cfed38748772c5901266d78cdfd329499cdab6da4f13643db97320de22c14eb52fe0fc3246caba714c1e2d8ab2b7c95a329 SHA512 2449dc11ade78c5675d468fc76843a4a61a9485bad1bcc07dcbcf56ed0c070d48f2ad0d6c5a5372ffffaf7c5ae626e062c95059f0766901d21e62f0d6aa379ab
-EBUILD xdmf2-1.0_p141226-r3.ebuild 1804 BLAKE2B d28284c7baea14314147481b2ddce3a27c80b0b71355e71f9a6930bac821113010c3d3e41d72e7926a7fa34ee116b971c58af5036509e9a3162580232965d445 SHA512 00a34db9765b2d20faeaf27f6b4c3ca086c5e4eb101c024f4f857aa021ffb4c5fd92ce2f9da4f3b996a60c0b09c4bc9c924f891fb8d5dd96bbb2fe5f02120557
+EBUILD xdmf2-1.0_p141226-r3.ebuild 1800 BLAKE2B 127b5fc924f917e410e0264a613a57fc7b481367ddf382eff184c5e8648f6e17fdd1edf37e57aef2073438d9a02ba24c530ffb08cd80a201592063c8dd672d71 SHA512 86fba3e44c93562df87a4a518cd0c720387d75e3d29a8b05ee483e8174872d6466e597fd6866321014a1825efba4f27e1bd4cd84732ee1dc446fea2b0c740537
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
deleted file mode 100644
index 08550ddf6c16..000000000000
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-libs/hdf5:=
-	dev-libs/libxml2:2
-	python? ( ${PYTHON_DEPS} )
-	"
-
-# TODO: fix builds for cmake 3.12+. See bug #661860
-DEPEND="${RDEPEND}
-	<=dev-util/cmake-3.12
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-module.patch
-	"${FILESDIR}"/${P}-cannot-find-hdf5-bug-591302.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-r3.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
index 205807de8ada..87f9c1e1fbb2 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="VTK"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"