Updated ebuilds

sci-libs/itk/Manifest

@@ -1,3 +1,5 @@
+DIST InsightData-5.0.0.tar.gz 290800449 SHA256 8c29831687ee8bd75292edf1d78c7df889b099a33480f0acc504d1fea4ed010f SHA512 0a2b55971ca04040cd7b9732a66100a848437a36768902bb81a20103232fb25dc4766177a2dba1537e1888b56a7dd1dd5ec93f30273993b826453fe8c36adf14 WHIRLPOOL 6b46ed472fe152159a74443d8616d556613edb62021b2d6123f8c5fa47eb13671940c328c2856f506a31713670bae0672a790ebbcab9740cd2b3fbae03de2cb7
 DIST InsightData-5.0rc01.tar.gz 290621965 SHA256 c4b6172809fd86ee623311001bdf7b79e801bddb9bbb8cb7123b2e5cc04f5c4f SHA512 0be5568b75017a4c4cbfc4a4e7b0339537cd2dc23d5d5637a95002e040b96f923851bc354f3a1447d3802444a951b62d2ef66ad2a0db0961bf2bd9f47399fd9a WHIRLPOOL 35668bb25fc4fd6db3b63683cb26d62f46467f3304998ec3ddcd93cd55c9532f9701feda6f9e9e14c9d3a695434ce8c3e68ba916b1e26e3bb53df2f8aae7836b
-DIST itk-4.13.2.tar.gz 19341198 SHA256 98c2fd826e1987d797521d83031fcaa328135daf6524f7823363d66ab288c545 SHA512 78112f31feb389dbf98e2a1706c252408851a73c95912507b10f5bca5f498a5f73d77a4a6de73582b77b83d44196df4c3a7324d84002212725ff6b4aee69aa0b WHIRLPOOL a2fcfe40499af242f68effce3838f5106b73ba7f3855e6b911a066b0e13d1d89ae7f40b88f88f81dddf7a5db3b9a80899942ca0ffef13189fc67f4f211fed224
+DIST InsightToolkit-5.0.0.tar.gz 20617888 SHA256 6ef73c8972e775632e4022a3a3158eacd039f095bb660d235b0affb9a9282b38 SHA512 7cbff9e555fe0f351cb83828ef7c1a5fbd698290d53faa438b76192685ca188f7f65a506c31e7d0d637409ea19d56467b6a1177b93b9093055104f2ec031ecd8 WHIRLPOOL a5f97080f0deed2f81e2c0d3bcfc05b9b1351a444eb31072e088ce6001e8ad9573d8d9eb6cc17df874e6e08162099161188aa125559f6bbd4e26ac6c64ef9ed8
+DIST itk-4.13.2.tar.gz 19343413 SHA256 313422d9fedd94851133aad26a65ad9541b9c40099d22b5629d010603ad17f7c SHA512 86641537f804cc2d1ddf935a36e260033a53242e8286da43fd493e48cd2530e5562440a3ce2c61f491c12461b0f5e4fb855bb22a2611417ec8faaa54b97aea96 WHIRLPOOL 0198735615c296a72bd4b1016c90f15e80d7fc724af6ff1c7415512d820cf4ebd19183b514f9607b8907de57159a03c1b23b29eaf5b00bd487f8b4fe2a29940c
 DIST v5.0rc01.tar.gz 20944543 SHA256 fa6cd61bc39ccdc53808b9b0df5dd95d63a3c08be130e63ab0f4b77ca9594e46 SHA512 30e327708c7717bb2131911c86802c4104730d146b4263c68ae89384d3f01a6675b3abf5962af14cc7f40984cb1e8eedd911fe0f084a8deb4c79b4239b309728 WHIRLPOOL 6447eccbb17573233f750e3462dadd4c44c177613ca88520787579cc6e10ac523488e44dbf0f3e690a0cc009443b5adccdf62b588bdf6180dbda4a98b7d03cef

sci-libs/itk/itk-4.13.2.ebuild

@@ -7,9 +7,14 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit eutils toolchain-funcs cmake-utils python-single-r1
 
+MY_HASH="3ee6f1e5c9a18235ca9ab88f7bba6056c09db56d"
+
 DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
 HOMEPAGE="http://www.itk.org"
-SRC_URI="https://github.com/InsightSoftwareConsortium/ITK/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/dzenanz/ITK/archive/${MY_HASH}.tar.gz -> ${P}.tar.gz
+	"
+	#https://github.com/InsightSoftwareConsortium/ITK/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -38,7 +43,8 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S="${WORKDIR}/${MYP}"
+#S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/ITK-${MY_HASH}"
 
 PATCHES=(
 	"${FILESDIR}"/nrrdio-linking.patch
@@ -59,9 +65,9 @@ pkg_pretend() {
 }
 
 src_configure() {
-	sed -i \
+	#sed -i \
-		-e '/find_package/d' \
+	#	-e 's/find_package(double-conversion REQUIRED)/find_package(double-conversion CONFIG REQUIRED)/g' \
-		Modules/ThirdParty/DoubleConversion/CMakeLists.txt || die
+	#	Modules/ThirdParty/DoubleConversion/CMakeLists.txt || die
 
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
@@ -78,14 +84,14 @@ src_configure() {
 		-DITK_COMPUTER_MEMORY_SIZE="${ITK_COMPUTER_MEMORY_SIZE:-1}"
 		-DWRAP_ITK_JAVA=OFF
 		-DWRAP_ITK_TCL=OFF
-		-Ddouble-conversion_INCLUDE_DIRS="${EPREFIX}/usr/include/double-conversion"
-		-Ddouble-conversion_LIBRARIES="-ldouble-conversion"
 		$(cmake-utils_use_build test TESTING)
 		$(cmake-utils_use_build examples EXAMPLES)
 		$(cmake-utils_use review ITK_USE_REVIEW)
 		$(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY)
 		$(cmake-utils_use cpu_flags_x86_sse2 VNL_CONFIG_ENABLE_SSE2)
 	)
+		#-Ddouble-conversion_INCLUDE_DIRS="${EPREFIX}/usr/include/double-conversion"
+		#-Ddouble-conversion_LIBRARIES="-ldouble-conversion"
 	if use fftw; then
 		mycmakeargs+=(
 			-DUSE_FFTWD=ON

sci-libs/itk/itk-5.0.0.ebuild

@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit eutils toolchain-funcs cmake-utils python-single-r1
+
+MY_PN="InsightToolkit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="NLM Insight Segmentation and Registration Toolkit"
+HOMEPAGE="http://www.itk.org"
+SRC_URI="
+	https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/${MY_P}.tar.gz
+	test? ( https://github.com/InsightSoftwareConsortium/ITK/releases/download/v${PV}/InsightData-${PV}.tar.gz )
+	"
+RESTRICT="primaryuri"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc examples fftw python review test vtkglue"
+
+RDEPEND="
+	dev-libs/double-conversion:0=
+	media-libs/openjpeg:2
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sci-libs/dcmtk:0=
+	sci-libs/hdf5:0=[cxx]
+	sys-libs/zlib:0=
+	virtual/jpeg:0=
+	fftw? ( sci-libs/fftw:3.0= )
+	vtkglue? ( sci-libs/vtk:0=[python?] )
+"
+DEPEND="${RDEPEND}
+	python? (
+		>=dev-lang/swig-2.0:0
+		dev-cpp/castxml
+	)
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -z ${ITK_COMPUTER_MEMORY_SIZE} ]]; then
+		elog "To tune ITK to make the best use of working memory you can set"
+		elog "    ITK_COMPUTER_MEMORY_SIZE=XX"
+		elog "in make.conf, default is 1 (unit is GB)"
+	fi
+	if use python && [[ -z ${ITK_WRAP_DIMS} ]]; then
+		elog "For Python language bindings, you can define the dimensions"
+		elog "you want to create bindings for by setting"
+		elog "    ITK_WRAP_DIMS=X;Y;Z..."
+		elog "in make.conf, default is 2;3 for 2D and 3D data"
+	fi
+}
+
+src_prepare() {
+	sed -i -e "s/find_package(OpenJPEG 2.0.0/find_package(OpenJPEG/g"\
+		Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DITK_USE_SYSTEM_DCMTK=ON
+		-DGDCM_USE_SYSTEM_OPENJPEG=ON
+		-DITK_USE_SYSTEM_DOUBLECONVERSION=ON
+		-DITK_USE_SYSTEM_CASTXML=ON
+		-DITK_USE_SYSTEM_HDF5=ON
+		-DITK_USE_SYSTEM_JPEG=ON
+		-DITK_USE_SYSTEM_PNG=ON
+		-DITK_USE_SYSTEM_SWIG=ON
+		-DITK_USE_SYSTEM_TIFF=ON
+		-DITK_USE_SYSTEM_ZLIB=ON
+		-DITK_USE_KWSTYLE=OFF
+		-DITK_BUILD_DEFAULT_MODULES=ON
+		-DITK_COMPUTER_MEMORY_SIZE="${ITK_COMPUTER_MEMORY_SIZE:-1}"
+		-DWRAP_ITK_JAVA=OFF
+		-DWRAP_ITK_TCL=OFF
+		-Ddouble-conversion_INCLUDE_DIRS="${EPREFIX}/usr/include/double-conversion"
+		-DExternalData_OBJECT_STORES="${WORKDIR}/InsightToolkit-${MY_PV}/.ExternalData"
+		-DBUILD_TESTING="$(usex test ON OFF)"
+		-DBUILD_EXAMPLES="$(usex examples ON OFF)"
+		-DITK_USE_REVIEW="$(usex review ON OFF)"
+		-DITK_INSTALL_LIBRARY_DIR=$(get_libdir)
+	)
+	if use fftw; then
+		mycmakeargs+=(
+			-DUSE_FFTWD=ON
+			-DUSE_FFTWF=ON
+			-DUSE_SYSTEM_FFTW=ON
+			-DITK_WRAP_double=ON
+			-DITK_WRAP_vector_double=ON
+			-DITK_WRAP_covariant_vector_double=ON
+			-DITK_WRAP_complex_double=ON
+		)
+	fi
+	if use vtkglue; then
+		mycmakeargs+=(
+			-DModule_ITKVtkGlue=ON
+		)
+	fi
+	if use python; then
+		mycmakeargs+=(
+			-DITK_WRAP_PYTHON=ON
+			-DITK_WRAP_DIMS="${ITK_WRAP_DIMS:-2;3}"
+		)
+	else
+		mycmakeargs+=(
+			-DITK_WRAP_PYTHON=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Examples/*
+	fi
+
+	echo "ITK_DATA_ROOT=${EROOT%/}/usr/share/${PN}/data" > ${T}/40${PN}
+	local ldpath="${EROOT%/}/usr/$(get_libdir)/InsightToolkit"
+	if use python; then
+		echo "PYTHONPATH=${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/Python" >> "${T}"/40${PN}
+		ldpath="${ldpath}:${EROOT%/}/usr/$(get_libdir)/InsightToolkit/WrapITK/lib"
+	fi
+	echo "LDPATH=${ldpath}" >> "${T}"/40${PN}
+	doenvd "${T}"/40${PN}
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/api-docs
+		cd "${WORKDIR}"/html
+		rm  *.md5 || die "Failed to remove superfluous hashes"
+		einfo "Installing API docs. This may take some time."
+		insinto /usr/share/doc/${PF}/api-docs
+		doins -r *
+	fi
+}