gentoo resync : 31.10.2017

12 files changed, 3 insertions, 904 deletions

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 1ee8447a6cd1..982004cd0715 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -5,16 +5,8 @@ AUX fftw-2.1.5-no-test.patch 1028 SHA256 0c7fcea676ecfcca1d91b99e69b38d419b17771
 AUX fftw-2.1.5-parallel-tests.patch 3720 SHA256 b8502275cdb7e07c5fd47f0d7de0bb59e390857200aaa6607ea028a2e15a1ae5 SHA512 2e02c69dcbae6c11b8bdf0edb1a49c9754c9a599438e1073eb2bcff04c52c38c1e76eb352f21957a0518d61ee2e32d302e5624e234d28344fc99036313394d3e WHIRLPOOL e95407297d223597d4dba8e9cecf426947bd87ef88a4c758011c235fa8f05cfd0e8a1e4195068f63c318671280f53ac6425c5c77f04d5f4d4a724eee963502cd
 AUX fftw-2.1.5-texinfo5.1.patch 596 SHA256 00e61fd86bd0e742efb72212c005615964da4eade40c3024443504e50b9c7186 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214 WHIRLPOOL 9f382908ab6dac7c41c80c7e88a391bb2a71d1c3d8b0e38d153a5fdd8f48b46aee4a216860b599495275ef0f1e2c1501dbe2c12598eae0c637bb16f0878ce2a0
 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10
-DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
-DIST fftw-3.3.5.tar.gz 4148447 SHA256 8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf SHA512 a81f02d884cfe4171fab479b0e5ec76eceb9c5da6d4eda1f89281b7e1efa2d8176c9ba87051595c402889eb32172d216ce40eb2bef41289c646f01002fb4ba8e WHIRLPOOL dc044c73dbb1b9fa595a0f1e71b5958d3e023c38cd6b1bb8a486adcad506fc6e411a3d8d0657a32346ff6636cf25396bd9bcdbcd720e8c799f6e40f1e04bfd65
-DIST fftw-3.3.6-pl1.tar.gz 4179807 SHA256 1ef4aa8427d9785839bc767f3eb6a84fcb5e9a37c31ed77a04e7e047519a183d SHA512 e2ed33fcb068a36a841bbd898d12ceec74f4e9a0a349e7c55959878b50224a69a0f87656347dad7d7e1448ebc50d28d8f34f6da7992c43072d26942fd97c0134 WHIRLPOOL 8ccd7a3dfc49be2053e8c3f334ea348a3455bcb6f84a636cd531f15822abd3452cfa50cd0bca4295b1dc922897e38613cf5cb865e60b83e9e357af396f2d9c99
 DIST fftw-3.3.6-pl2.tar.gz 4185261 SHA256 a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2 SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472 WHIRLPOOL 92b55473e1aaca71e07869c12b5f0e9b94e21317c1d8e37c2f0ae5e4ff1bb803a7f8c8104ad52ede56211964a6374e4cb054809ca2df9b22306bb1ca89e2bfa7
-EBUILD fftw-2.1.5-r8.ebuild 3877 SHA256 c7b7cb1a24c756921f83650cbaa434c837072d1a2d3a0f334a1df4e4aea4935b SHA512 5448e80c07ae6e299c8055752b2b9f0110d2b2df0010b5743fd041e3ea4263f74fbfad38137b170453cdb27f45923c480549456847a7aa001c47469e25119a76 WHIRLPOOL f5bcdd9b9df0874bd33cf03d753c7fcb1527be8e01aa2035baee432e9fe2c40f5f78e79154c00c6cf623aeda61da20fb1e041f029e0615d183e9a805a11f67ed
 EBUILD fftw-2.1.5-r9.ebuild 3141 SHA256 a4ad424e4622a761d63e7d21ba7750647d30e6280f76d7b8bb24101eaad95838 SHA512 24787a4634e03f6a82ca6b14a43f30c7de70b88d844acd9261d2799ff09d19e693f83246209765bc8a174ebf5a9aec2900b1226c5d20034c9237eacd295bab2e WHIRLPOOL 6ef531a2e5be71ce60c1b4138e4cb3c983f62b40d10e0068212ca9f7a80ba20a4085fd63fe4e710e4b2742c72617f825f753f4af5d2817efae5979bcdbf9ef20
-EBUILD fftw-3.3.4.ebuild 4653 SHA256 f476e5b17cfd969bb78844880baa83e230ec86c618e4f8a4390b2e3c70c41bab SHA512 58b3d1b6ddbde93e41b4a3a3f6770919f381198de6702850850bff2cdff5148933e2c6a609b1058fab4f79364e9bea209aa3d2fc79a385696f90e0edaab24e78 WHIRLPOOL d919ac6a883f3363a0d134c14a6692b704fefb7c9c5921b5f5ed8812a00f73d224f114ac2139872600681bf6c73a0c81678855086f8830a717658dd8db07c3b6
-EBUILD fftw-3.3.5-r1.ebuild 4911 SHA256 44c12c8e5713ec78fb410308b5af9fafeb4e2d6e18486861d070905f0cfdb4d0 SHA512 a38bbd733d1f439f98ab2305a0e3c699c3e533f4444082a9326de21a7938c3b9d8cba395d6e0f695657534903caf6c098d655b88537a3c2f6e2a12e9fc609012 WHIRLPOOL 90f2322de1b52c3ad1f3a515dfc2f6ab71e0cbaf0d891ba83a95ecc27db626e062da6a39ff358e66a29b72b64e369d510ee29cebb862dfae351767f22188748d
-EBUILD fftw-3.3.5-r2.ebuild 4460 SHA256 a1a5135af5ac106657ef6ac0b964c0151b22dc6c5956b33244ac6a19a5163e85 SHA512 b1ca80a4cab4f957ae0003df69dca2815881961ae9a0d16e4d088f36c6c6e9c315b7b8b2e2681b5d91c483952a42128bca12f47448eed676537b0b4f967a0dbc WHIRLPOOL 9b827ab174946cd093430f1c49701fd395d7e31a817c64fb81505b64d041d24a62b3178da019547460690368ceb4da3d9f835d977b69d5d57d9a06b0c62a22a5
-EBUILD fftw-3.3.6_p1.ebuild 4521 SHA256 3c415cec938036dd94354fcd76014925ee38f090278955520066383e69076631 SHA512 86b81e656cb1e7ac27bb6acb7f6410566120ff9977f8f2ebd0c361f6835c6084ea7e0779f78a84b4fef24f04e584db854822b374f461ec75959cf4424b14a28c WHIRLPOOL 8b885827bb7c62331972e72914286be5484891c06562965695f4b2be1724240d8e65a1212eb2593941d5ff2e85aa42a297ca4ca494dfd0316cf634f5ca9a8ef3
 EBUILD fftw-3.3.6_p2.ebuild 4433 SHA256 975b3f82a52c412990de962c0a2d4f83d5aa119e3e242ee5386d4b00f8e33fcb SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b WHIRLPOOL 6e2e953bdd62fb61e616141fb10cd0148b570e6ad264c2ed2c374aa1926db8959d99931edacb79b1e78a18ceecab3a472faa6841d338ba96eee8f5c2738b0847
 EBUILD fftw-9999.ebuild 4741 SHA256 bd185c79ad8d1bc55722017d23b9d0f70c12225eb0df5cc60106e702f418f010 SHA512 f7af96b322dd7f965cdc392e53c634ab8e503a29d7008da724984ac4b93f65e1361461190ee1fe2e620bd349139324564fa13f452aca875098d34583e2fc0f00 WHIRLPOOL d078e24918aa403747c708437b8b9ab020638a31d79b600c5b59364d215ac9fef78d72fd86d5f25587108fbea6444096b5f9a3abda02afe4b26332cc4674db94
 MISC ChangeLog 5081 SHA256 3f41774677e5d9a887c6009745cbfe4ba73065c3805e7eb8ec7909fb650a1c24 SHA512 f05421138dcb24a50964f27e74092d9907d7ff86adccdd8619e0b13626add217877d3ca684c324dde7552b769a809c68e92d33a652f5f63ac3674f5968a28409 WHIRLPOOL 754b9f1ffceeeabc75badb06821a4a7287e808642aed066719191a11c6eb6c37bd4ba3af7be1a571750abcf9e77218883d17167304f4075538504df7ca4ea76e
diff --git a/sci-libs/fftw/fftw-2.1.5-r8.ebuild b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
deleted file mode 100644
index e889eba4d768..000000000000
--- a/sci-libs/fftw/fftw-2.1.5-r8.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-SRC_URI="http://www.fftw.org/${P}.tar.gz"
-HOMEPAGE="http://www.fftw.org"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-SLOT="2.1"
-LICENSE="GPL-2+"
-IUSE="doc float fortran mpi openmp threads static-libs"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-pkg_setup() {
-	use openmp && FORTRAN_NEED_OPENMP="1"
-	fortran-2_pkg_setup
-	# this one is reported to cause trouble on pentium4 m series
-	filter-mfpmath "sse"
-
-	# here I need (surprise) to increase optimization:
-	# --enable-i386-hacks requires -fomit-frame-pointer to work properly
-	if use x86; then
-		is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-	fi
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
-		ewarn "If you want to build fftw with OpenMP, abort now,"
-		ewarn "and switch CC to an OpenMP capable compiler"
-		ewarn "Otherwise the configure script will select POSIX threads."
-	fi
-	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	# doc suggests installing single and double precision versions
-	#  via separate compilations. will do in two separate source trees
-	# since some sed'ing is done during the build
-	# (?if --enable-type-prefix is set?)
-
-	epatch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-configure.in.patch \
-		"${FILESDIR}"/${P}-no-test.patch \
-		"${FILESDIR}"/${P}-cc.patch \
-		"${FILESDIR}"/${P}-texinfo5.1.patch
-
-	# fix info files
-	for infofile in doc/fftw*info*; do
-		cat >> ${infofile} <<-EOF
-			INFO-DIR-SECTION Libraries
-			START-INFO-DIR-ENTRY
-			* fftw: (fftw).				${DESCRIPTION}
-			END-INFO-DIR-ENTRY
-		EOF
-	done
-
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-
-	eautoreconf
-
-	cd "${WORKDIR}"
-	cp -R ${P} ${P}-double
-	mv ${P} ${P}-single
-	ln -s ${P}-single ${P}
-}
-
-src_configure() {
-	local myconf="
-		--enable-shared
-		--enable-type-prefix
-		--enable-vec-recurse
-		$(use_enable fortran)
-		$(use_enable mpi)
-		$(use_enable static-libs static)
-		$(use_enable x86 i386-hacks)"
-	if use openmp; then
-		myconf="${myconf}
-			--enable-threads
-			--with-openmp"
-	elif use threads; then
-		myconf="${myconf}
-			--enable-threads
-			--without-openmp"
-	else
-		myconf="${myconf}
-			--disable-threads
-			--without-openmp"
-	fi
-	cd "${S}-single"
-	econf ${myconf} \
-		--enable-float \
-		--with-gcc=$(tc-getCC)
-
-	cd "${S}-double"
-	econf ${myconf} \
-		--with-gcc=$(tc-getCC)
-}
-
-src_compile() {
-	local dir
-	for dir in "${S}-single" "${S}-double"
-	do
-		einfo "Running compilation in ${dir}"
-		emake -C ${dir}
-	done
-}
-
-src_test() {
-	local dir
-	for dir in "${S}-single" "${S}-double"
-	do
-		einfo "Running tests in ${dir}"
-		emake -C ${dir} -j1 check
-	done
-}
-
-src_install () {
-	# both builds are installed in the same place
-	# libs are distinguished by prefix (s or d), see docs for details
-
-	local dir
-	for dir in "${S}-single" "${S}-double"
-	do
-		emake DESTDIR="${D}" -C ${dir} install
-	done
-
-	insinto /usr/include
-	doins fortran/fftw_f77.i
-	dodoc AUTHORS ChangeLog NEWS TODO README README.hacks
-	use doc && dohtml doc/*
-
-	if use float; then
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*sfft*; do
-			ln -s $(basename ${f}) ${f/sfft/fft}
-		done
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*srfft*; do
-			ln -s $(basename ${f}) ${f/srfft/rfft}
-		done
-	else
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*dfft*; do
-			ln -s $(basename ${f}) ${f/dfft/fft}
-		done
-		for f in "${ED}"/usr/{include,$(get_libdir)}/*drfft*; do
-			ln -s $(basename ${f}) ${f/drfft/rfft}
-		done
-	fi
-}
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
deleted file mode 100644
index 9174c474ef42..000000000000
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	# fix info file for category directory
-	[[ ${PV} = *9999 ]] || sed -i \
-		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."info" || die "failed to fix info file"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local x
-
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	my_configure() {
-		#a bit hacky improve after #483758 is solved
-		local x=${BUILD_DIR%-*}
-		x=${x##*-}
-		# there is no abi_x86_32 port of virtual/mpi right now
-		local enable_mpi=$(use_enable mpi)
-		multilib_is_native_abi || enable_mpi="--disable-mpi"
-
-		#jlec reported USE=quad on abi_x86_32 has too less registers
-		#stub Makefiles
-		if [[ ${ABI} == x86 && ${x} == quad ]]; then
-			mkdir -p "${BUILD_DIR}/tests" || die
-			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-			return 0
-		fi
-
-		local myeconfargs=(
-			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-			$(use_enable fortran)
-			$(use_enable zbus mips-zbus-timer)
-			$(use_enable threads)
-			$(use_enable openmp)
-		)
-		if [[ $x == single ]]; then
-			#altivec, sse, single-paired only work for single
-			myeconfargs+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_sse sse)
-				${enable_mpi}
-				$(use_enable neon)
-			)
-		elif [[ $x == double ]]; then
-			myeconfargs+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				${enable_mpi}
-			)
-		elif [[ $x == longdouble ]]; then
-			myeconfargs+=(
-				--enable-long-double
-				${enable_mpi}
-				)
-		elif [[ $x == quad ]]; then
-			#quad does not support mpi
-			myeconfargs+=( --enable-quad-precision )
-		else
-			die "${x} precision not implemented in this ebuild"
-		fi
-
-		autotools-utils_src_configure
-	}
-
-	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant autotools-multilib_src_compile
-}
-
-src_test () {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	#local testbase="perl check.pl --nthreads=1 --estimate"
-	#		${testbase} -${p}d || die "Failure: $n"
-	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
-}
-
-src_install () {
-	local u x
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib_foreach_abi autotools-utils_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		insinto /usr/share/doc/${PF}/faq
-		doins -r doc/FAQ/fftw-faq.html/*
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html
-	fi
-
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
-		done
-	done
-}
diff --git a/sci-libs/fftw/fftw-3.3.5-r1.ebuild b/sci-libs/fftw/fftw-3.3.5-r1.ebuild
deleted file mode 100644
index 8b95ce8b8ba9..000000000000
--- a/sci-libs/fftw/fftw-3.3.5-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# there is no abi_x86_32 port of virtual/mpi right now, bug 519700
-	local enable_mpi=$(multilib_native_use_enable mpi)
-
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			#altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				${enable_mpi}
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				${enable_mpi}
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				${enable_mpi}
-			)
-			;;
-
-		quad-*)
-			#quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	#workaroud for bug #590446
-	my_abi_install() {
-		pushd "${BUILD_DIR}" >/dev/null || die
-		emake DESTDIR="${D}" install
-		popd >/dev/null || die
-	}
-	multibuild_foreach_variant multilib_foreach_abi my_abi_install
-
-	einstalldocs
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/fftw/fftw-3.3.5-r2.ebuild b/sci-libs/fftw/fftw-3.3.5-r2.ebuild
deleted file mode 100644
index 07c2837181f1..000000000000
--- a/sci-libs/fftw/fftw-3.3.5-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED}"usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/fftw/fftw-3.3.6_p1.ebuild b/sci-libs/fftw/fftw-3.3.6_p1.ebuild
deleted file mode 100644
index 5b793c7a5ea2..000000000000
--- a/sci-libs/fftw/fftw-3.3.6_p1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-MY_P=${PN}-${PV/_p/-pl}
-
-if [[ ${PV} = *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-else
-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2+"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-check-openmp
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
-}
-
-multilib_src_configure() {
-	# jlec reported USE=quad on abi_x86_32 has too few registers
-	# stub Makefiles
-	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
-		mkdir -p "${BUILD_DIR}/tests" || die
-		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-		return 0
-	fi
-
-	local myconf=(
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-		$(use_enable fortran)
-		$(use_enable zbus mips-zbus-timer)
-		$(use_enable threads)
-		$(use_enable openmp)
-	)
-	case "${MULTIBUILD_ID}" in
-		single-*)
-			# altivec, sse, single-paired only work for single
-			myconf+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
-				$(use_enable mpi)
-			)
-			;;
-
-		double-*)
-			myconf+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-			;;
-
-		longdouble-*)
-			myconf+=(
-				--enable-long-double
-				$(use_enable mpi)
-			)
-			;;
-
-		quad-*)
-			# quad does not support mpi
-			myconf+=(
-				--enable-quad-precision
-			)
-			;;
-
-		*)
-			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
-			;;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake -C tests smallcheck
-}
-
-src_test() {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	# local testbase="perl check.pl --nthreads=1 --estimate"
-	#     ${testbase} -${p}d || die "Failure: $n"
-
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		docinto faq
-		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED}"usr/share/doc/${PF}/html || die
-	fi
-
-	local x
-	for x in "${ED}"usr/lib*/pkgconfig/*.pc; do
-		local u
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
-		done
-	done
-
-	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/openfoam-bin/Manifest b/sci-libs/openfoam-bin/Manifest
index 97e6d2359dcb..4543f396f5e5 100644
--- a/sci-libs/openfoam-bin/Manifest
+++ b/sci-libs/openfoam-bin/Manifest
@@ -5,4 +5,4 @@ DIST OpenFOAM-1.6.linuxGccDPOpt.tgz 41587474 SHA256 3c551134c0e1a8700c1257e54982
 EBUILD openfoam-bin-1.6.ebuild 2785 SHA256 2bea80c532d4e26ae900e492f46cb9269e459bd39015593f1b97a2849408e994 SHA512 09b4fb9ecbb8b871f017a28150880cba9e9d163d1f785d5c79c6341122a83214663534cead65c626b5e1ba9fc1ce3b8220e9dc8d7aefbab0a9cd4dccec442b41 WHIRLPOOL e96a073fcb9d33723452a19bdc3833d876711eea431ba973baeab14e1b00ecb2f66cb5a0e4667ccfd24f6fac7ad194e9eccc0f022836b15a3384b0f84de05b90
 MISC ChangeLog 2732 SHA256 bf592c9100b1070fef5cb32597fb23fc0078d96833bb7f2eb922865764d870bb SHA512 23e2bb772e3aae824c82a147acc9b99f5333d35c5b8ae2c56710cd5a7f8142ddba5b17b0b81ea74ab9f0d39cd4eee13429ef835c04dd00098248bb6cba3081e6 WHIRLPOOL dc3d25050a21c2ef4f0e86dfa0d2c6e30458c48136c0a69a60fd1f4b5defc3c93f1c28bb1080d1f9c134dd2077096155429bce848f22ace960b7ab2bca449297
 MISC ChangeLog-2015 2845 SHA256 1c6e10e5d931aeff2063b5ca921c3b1d56f543ac82f13b82fe7adf5853882e11 SHA512 ad7f1d5567e0fbd1649bc4cb85e6908c36b6b0d19112fd33ae7726de7a93811196c9edae5b1dd1e50489b1a4a2ddb07b0bc8d01ee6ae31cb58a87e2ca8d2ead2 WHIRLPOOL 301de00266688e4071f4a233365192ce6bf1f8cf104bbc331a00ee13b9d1d1e589043a69c0e34b0417a88f1b92dde13ebe7653a0464081812ca3e4ada9fc44b3
-MISC metadata.xml 541 SHA256 03ece79c97bbfe8eabb29a2deb588a45ecb81e9f7f82140d2023fa9b1e219f00 SHA512 9476f418d74a2ec01ba8eb2eedb79f0351889f67e36c27b1109882f4953b6379af012dbd922868ad5d1537fad3092c3d2a1741a1e6191bed4a8b10426abe60a4 WHIRLPOOL ee608a66540735fcef691e734c96fe7a1e61559e57d30e16adfd727e2c1fae2715ea7a670cf5a9a3419fc8dd5bb0b47e0bba123f269b7168d0ab223846e5e573
+MISC metadata.xml 321 SHA256 dab505f186808c28dfd7d5c64ce46f3cbf4f0cc9e5076a089c7e49d1bbe8aacb SHA512 41fdfcf128d1878c48966236899c2edc777fac16d2a7fd2dc7507124a0e9c7ee442da7d2730e45efaa11561e3293678aee80d84b885695164a4122921b40774b WHIRLPOOL 4b4b18ceaddab3cbd06b184ecd2cc04b7e6c92ad1f7ef901352f4c60ef1e95fb0eec297b8afeabfee518dcd5083a0ee8ebc96dc6c892cc234282a047e8a12a4e
diff --git a/sci-libs/openfoam-bin/metadata.xml b/sci-libs/openfoam-bin/metadata.xml
index 8146f9894c85..33f20063ea80 100644
--- a/sci-libs/openfoam-bin/metadata.xml
+++ b/sci-libs/openfoam-bin/metadata.xml
@@ -5,14 +5,6 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>oli.borm@web.de</email>
-		<name>Oliver Borm</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">foam</remote-id>
 	</upstream>
diff --git a/sci-libs/openfoam/Manifest b/sci-libs/openfoam/Manifest
index 6a61a2faa5c9..9bea84cd253b 100644
--- a/sci-libs/openfoam/Manifest
+++ b/sci-libs/openfoam/Manifest
@@ -10,4 +10,4 @@ EBUILD openfoam-2.3.1-r1.ebuild 3135 SHA256 5ab22e2149f464fbe3b951bb65cda3ee2a6e
 EBUILD openfoam-2.4.0-r1.ebuild 3152 SHA256 2090d03ea94e5b59ca531c5b2475e2c31907aec2dd8f03e9bd74fa1627a66d21 SHA512 89a58093dabb8f17f6c03bf39069da82cb6c125ab12df67701393fcac419e53ff42950d3efa5685770954982bcf2e4d91889e19f22b10073bf48a2c89d4d9bf5 WHIRLPOOL 32717c080c2efa82de9edeb0a2b64901d1aaeca7350b014257ff8cf01259c373069dfe707e6b3fc08dca01ebe97840955f7a80b8e455bda4215b1d2347866227
 MISC ChangeLog 3568 SHA256 bfdf7fad2c6cdf2315d43b64a7b34b5bb02f300070d8c9293525153467587292 SHA512 60e836259b83ebc85fe5708bf0a6cef7feabfd112ccb8fcec9726eddfc4a6652f4d295ba0cb935f23c15517e48f8fd5a4fa83c95190987d20769b5db88df4fd3 WHIRLPOOL 66f0238e2663cabbdbbdae06c5e924740dad1dd6be6318952a11cc0d5b9e5dadaf854b8800222a97f9cbba1e5307cf28e13402407da044b2c33280d67ebb96f7
 MISC ChangeLog-2015 7365 SHA256 6f208d81128ade178ffad934167a83de9314fa4639ac1c033a894f60e9f6eec2 SHA512 f5fd56863878fc07198f623dba67821d4c106b24b8834d7c1db72f7de263eef590d94d61cffbd125cb4d7f5eb1b638b1ffa7d9ca2f72e04774fab924f9d704a2 WHIRLPOOL ec2a2a733606e93a62bca60c65459b7756509039bf26df451f4699b2586624a754c1ebe41524aea9b93ee2940e202272067d1fbf24c5916a0059fa0054ebfb83
-MISC metadata.xml 770 SHA256 73ae5d5cdd00227d5ad47dde6001df6025ef434a57ec5255633ebb93a3066a4d SHA512 781ddd52c727ab75efa6c1dffb7bfa6ae971f29de5eb64e308921f85ababe50cab46b537dc13ae9eddd924359980ca851700a0c95e6a9f71319e33bb10bc8772 WHIRLPOOL 95a8dbfe49dba2baabbb4bee70ff5c52f72dc46e6908e55e40e9e157406740a10f6803d03961523cf572b38dd979712759dc52035c8614e0a9c35f229495511e
+MISC metadata.xml 538 SHA256 c7486cd0acb47dfd849dcb05f9525fc30f22f7b5e379e8fae2a850308c4bea16 SHA512 f69a0c2437906775c05a2130e1e3e0b16f9038f80158f9334453ec15d14bfc0fcb2791ab68147a34c62bb1f17100d51c2f120e869075b6921e1d9edf5cb76fb8 WHIRLPOOL b32dd22ab2eae2fada328aebd022e50683abd5ebce54cad50793e4c0948087605457f0c0ccd9a97c863e3adaf1fa1bde39157a7df78d9b6e9acae4f0a2939133
diff --git a/sci-libs/openfoam/metadata.xml b/sci-libs/openfoam/metadata.xml
index 2305ef0d7b97..3bb70c9ae50b 100644
--- a/sci-libs/openfoam/metadata.xml
+++ b/sci-libs/openfoam/metadata.xml
@@ -5,14 +5,6 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
-  <maintainer type="person">
-    <email>oli.borm@web.de</email>
-    <name>Oliver Borm</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <use>
     <flag name="opendx"> Install opendx visualisation tool</flag>
     <flag name="src"> Install source files</flag>
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 18ca1e967d9c..26554781f4e2 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -12,4 +12,4 @@ EBUILD scotch-6.0.4-r2.ebuild 4908 SHA256 d3217c63173679d62b17a35e64bce22368b183
 EBUILD scotch-6.0.4.ebuild 4628 SHA256 59840923e3a2e03cd5b760575460dcd3dca98d00f44fa0c4d76426d7817e74ba SHA512 0dd2f53982da1fc085f4cca6be9c0ca2c7b0c98548171ed3ad1bb2159389ebd55c6654d95372f47709c108aa7258c291f5f3e23e9e5054a5ebe0b16316fbe14e WHIRLPOOL 64932fb7175477e94dc6226f5c065ee10b58302e22843674c425a33774295383ea098b838c225fb2b2df8a11e25780e35f6d1bd63177b62ea198998efb890646
 MISC ChangeLog 2995 SHA256 1db07f15fb65b5f7131a3d7c5a4365c856994d1e843ce1638c3d042812a789ef SHA512 c294b07aeccfb070d205a2d50b33b547c4f6aeb5fcf2af08a15c9956050bbb33a1f397780570afb537fb75ce892979a17e603456b33b3357e250e2b59be9afa0 WHIRLPOOL 604d58660ff929f149007e20695e3af89405d75ce9a48b5847db305eae21c837e1443e433c9023668650797b63847d87c2f97026a112828b9ba3c8b4255303d4
 MISC ChangeLog-2015 3780 SHA256 cf4827e85ca121e1c8c84fdadfd65d2394ad65fdba205dde06bfbd83292ea41c SHA512 f2801e46d2710f1c529e5e09a66ba20815fa1e190684ea160a442194508db5e3ae4a4a88be5583f51943f513b99b78c57200630cf75a708413e88569f4fb14c9 WHIRLPOOL 4b3d4cfcab5882e5a251873b7874a863617bfb465caaedd14ff48916be388c0731172ff9715b60da6425d1b0a9089c0fd4629cdb50fbb041f8ba35ea3072b365
-MISC metadata.xml 1415 SHA256 9f291d7307dbb4c27c40e3da8494219a235af23daede2c19bc32e1e83b00b180 SHA512 059e33b0e1021dc07c716e0d04b61fe56e97be1ae26c771c8641ce0a2dac83cdc10b6582730778edcd9bb4a25a050e81ae6d8331451c272b2b3727a03b601712 WHIRLPOOL 4b0d9e7f59f92a46eb85a670b62cedd8ca08291ad4da7208b5fe54543ff64976eee03cb557322d513cb46d372cfad1b38eae09afef76ad93d2d37122a60eccf3
+MISC metadata.xml 1199 SHA256 c9564effda96cba104de26c66d6d4e3ed2a3f621e81521c527efc97ea670f456 SHA512 78345510290afd5d47a88595c3d2b07cbdb6f99d1341c6433095750bd27bb0f81fbe5e98cb6ffd23b5c8c2e0a346d1a2f25b5bf2f83093dff471906fdadc4eee WHIRLPOOL 1bb1ca6ee664695d569ad5ed489666b9001ad1904146a0581cffc50c5913c4b1ef41918d2b5d5c8415760a002a33d9c88e82a26663946abdb8aaeadc645282fe
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index 9b35c1ac8b7f..48cba73d79f1 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -5,18 +5,10 @@
   <email>patrick@gentoo.org</email>
   <name>Patrick Lauer</name>
 </maintainer>
-<maintainer type="person">
-  <email>oli.borm@web.de</email>
-  <name>Oliver Borm</name>
-</maintainer>
 <maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
 </maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
 <use>
   <flag name="int64">Build the 64 bits integer library (needed for &gt; 2^31 vertices)</flag>
   <flag name="tools">Build and install extra exec tools</flag>