gentoo resync : 04.08.2018

7 files changed, 21 insertions, 27 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3bc53c08368f..219756cb465a 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index d65c29768d8d..b6341525473e 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -2,5 +2,5 @@ AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a
 DIST libgeotiff-1.4.0.tar.gz 1517881 BLAKE2B 5340029481b1d529626170e61b73948a620cf24e86297178eb84a76e4988dd5bde2c278f995d39fa598a84eaaac69e93a62e7d091a77830c5fd16a43cb20a750 SHA512 1336e9b5345d69c47807f350d2f757c753543fecc477a6fc036743e78fbfca7b7f99db1b0fdf03e80418fbd4c66db100d04ac7c3338913f9a2b922b9c9f91f1b
 DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
 EBUILD libgeotiff-1.4.0.ebuild 1504 BLAKE2B 1fe286a7dd5709b2ba11c68161e2e6eed9ef36e2388c2e43fddb2f394e9af5e02e6f8b273649fd54e90c4215474a8d3fda1226bf99832a505a3a53e964a35a1b SHA512 7ead72d31550a10908d9a5e54ef6954bd4ba5ed9987f5fb5ce40e74abecf22c237a29e2591664eb9b0871a83c451408202732fad2308b3601f0b748c981b824d
-EBUILD libgeotiff-1.4.1.ebuild 1516 BLAKE2B dd80fa3723a7d3bfde18b60d0e0cbb7b76253ab71a990f246f217e300d9f8fecb3dd4e889892d53de3f956b63e572cff09852018d5dae58a23eb90b94212d108 SHA512 2d0b269239a6d8e273a5aa2072e4b8e886fa7968ad94a6dd7adc5f5e5692c2be351d715d92dc0eeac7cf4a902bb5430d32192427a3295991525a2d2c08adbe51
+EBUILD libgeotiff-1.4.1-r1.ebuild 1288 BLAKE2B 29d7fc36597ec31717fdcfdda203123b972069af3364f3d27f8782563ceb11b76d0a9f29bc0579314077f58397ca4489320736e306ecab64f66462d89fbbeb70 SHA512 e5fc2a4623d9a5f94dda82b0fd4d00e10b86c9f3e27fbebc05b84fb11e4b506b07209de809b1310b3b4e36d80951f47b9a61dc1bbcc6d4a4b1a2bf3605e2fd52
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
index d2e161b24ea7..d30e21eb05f2 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 MY_P=${P/_rc/RC}
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/${MY_P/RC*/}
 DOCS=( README ChangeLog )
 
 src_prepare() {
-	epatch_user
+	default
 	sed -i \
 		-e "s:-O3::g" \
 		configure.ac || die
@@ -40,7 +40,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		--enable-debug=$(use debug && echo yes || echo no) \
+		--enable-debug=$(usex debug) \
 		--with-jpeg="${EPREFIX}"/usr/ \
 		--with-zip="${EPREFIX}"/usr/
 
@@ -49,8 +49,8 @@ src_compile() {
 	default
 
 	if use doc; then
-		mkdir -p docs/api
-		cp "${FILESDIR}"/Doxyfile Doxyfile
+		mkdir -p docs/api || die
+		cp "${FILESDIR}"/Doxyfile Doxyfile || die
 		doxygen -u Doxyfile || die "updating doxygen config failed"
 		doxygen Doxyfile || die "docs generation failed"
 	fi
@@ -60,14 +60,5 @@ src_install() {
 	default
 
 	use doc && dohtml docs/api/*
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	ewarn "You should rebuild any packages built against ${PN} by running:"
-	ewarn "# revdep-rebuild"
-	ewarn "or using preserved-rebuild features of portage-2.2:"
-	ewarn "# emerge @preserved-rebuild"
-	echo
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index fefda1061e24..f6d8247eca7c 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -60,5 +60,5 @@ DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 EBUILD tensorflow-1.8.0-r1.ebuild 12704 BLAKE2B 09da9048917ec2a5919179791fe0ef6607d2453e8a0e16ea0809820629a10002fbb157b96a9aad2c4999a78a8cfe75f4d43db8d1ed428741188fa12932ed0f15 SHA512 d6ec346fa14febaefe985c428d151477243cf7f1d4f21ecc24ea19204acaf2ff28fb192879206e46bbb771bfe10958cc0c460d351c9dc9ea5798b9211a40d84e
-EBUILD tensorflow-1.9.0.ebuild 15995 BLAKE2B 552de5111ab960c60666937e38a9b7f3d541072f2ae00359c448a6833dd5433d798ecf4500d955c96f2dc7177f573b714e305cde9aad90ae1e4abc092aed500a SHA512 5342ec10168105c950d8de266bfa0addaf3a3349577dbac2e60939a18314bae79b33d71724df152d9bead14a03a18f965bd41d0b413a6a971525a99a4b1514ad
+EBUILD tensorflow-1.9.0.ebuild 16027 BLAKE2B a3a46215df0dec77d15ef828fe0fc73f9b209d3c1433c7893edd594a46161a30d73b8a811bc73829b540560cfadbf6fdd92fe132c12a374cb768c62d1bcea0de SHA512 ab6bcacacc67714628f7353c22052e6a659eb3d4a1d596c1caaca52157b90f23529a1fa37c192249faaf5909e320d6c54a32a09831494bcfa28611b596894ff5
 MISC metadata.xml 720 BLAKE2B f8069d999e401f2110a64b002912462d9a6f30674dd42efcd4d5f9d16641e320ba078c539f562d9257c5be1028d58963d060672c9df0f4615519bc02baa0bcd2 SHA512 5f5813e3a398381254e86c96c718ecfd3b0503029f10adc6601476ab3f5f80033cbfd5292280c94d4ca1cda7774b66bc13796e62d1d3d3181b7c72dcb6420b47
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
index 696d6345d09b..f1842e6e36f5 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0.ebuild
@@ -301,8 +301,8 @@ src_configure() {
 		export TF_CUDA_CLANG=0
 		export TF_NEED_TENSORRT=0
 		if use cuda; then
-			export CUDA_TOOLKIT_PATH="${EROOT%/}/opt/cuda"
-			export CUDNN_INSTALL_PATH="${EROOT%/}/opt/cuda"
+			export CUDA_TOOLKIT_PATH="${EPREFIX%/}/opt/cuda"
+			export CUDNN_INSTALL_PATH="${EPREFIX%/}/opt/cuda"
 			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
 			export TF_NCCL_VERSION="1"
 
@@ -371,7 +371,7 @@ src_install() {
 		# Symlink to the main .so file
 		python_export PYTHON_SITEDIR
 		rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
-		dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
+		dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR#${EPREFIX%/}}/${PN}/lib${PN}_framework.so" || die
 
 		python_optimize
 	}
@@ -379,12 +379,12 @@ src_install() {
 	if use python; then
 		python_foreach_impl run_in_build_dir do_install
 
-		rm -f "${D}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
+		rm -f "${ED}"/usr/lib/python-exec/*/tensorboard || die "failed to remove tensorboard"
 
 		# Symlink to python-exec scripts
-		for i in "${D}"/usr/lib/python-exec/*/*; do
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
 			n="${i##*/}"
-			[[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
 		done
 
 		python_setup
@@ -413,7 +413,7 @@ src_install() {
 
 	einfo "Installing libs"
 	# Generate pkg-config file
-	${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${PN}.pc
 
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 75bab3953fa4..4affc013eec2 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-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 1766 BLAKE2B 31641e640461982cd1de9544f2b66b09b61ea0090a9646671f0900925858e7b9366f8e2d0d92726caaa0407b5b65017a2498c83fd686ee69814bf1075d0c96ca SHA512 590a9f44aed89b12bfa73bc520d9d27c3ee6db408a7d67d1fea928532d5b1705ca7095c53964a9b0a288ce35fe7dfe886dbfb8d56195a4ca4779680e6f49ad8a
+EBUILD xdmf2-1.0_p141226-r2.ebuild 1842 BLAKE2B 68a934b26e310b71f731dce6976e6cfed38748772c5901266d78cdfd329499cdab6da4f13643db97320de22c14eb52fe0fc3246caba714c1e2d8ab2b7c95a329 SHA512 2449dc11ade78c5675d468fc76843a4a61a9485bad1bcc07dcbcf56ed0c070d48f2ad0d6c5a5372ffffaf7c5ae626e062c95059f0766901d21e62f0d6aa379ab
 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
index 605039d40cff..08550ddf6c16 100644
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r2.ebuild
@@ -23,7 +23,10 @@ RDEPEND="
 	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 )
 "