diff --git a/dev-python/graph-tool/graph-tool-2.19.ebuild b/dev-python/graph-tool/graph-tool-2.19.ebuild
index d2515c4..45b35b9 100644
--- a/dev-python/graph-tool/graph-tool-2.19.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.19.ebuild
@@ -38,9 +38,6 @@ DEPEND="${RDEPEND}
 	dev-cpp/sparsehash
 	virtual/pkgconfig"
 
-# most machines don't have enough ram for parallel builds
-MAKEOPTS="${MAKEOPTS} -j1"
-
 # bug 453544
 CHECKREQS_DISK_BUILD="6G"
 
@@ -63,7 +60,7 @@ src_prepare() {
 
 src_configure() {
 	local threads
-	has_version dev-libs/boost[threads] && threads="-mt"
+	has_version "dev-libs/boost[threads]" && threads="-mt"
 
 	configure() {
 		econf \
@@ -77,12 +74,10 @@ src_configure() {
 }
 
 src_compile() {
-	python_foreach_impl run_in_build_dir default
+	python_foreach_impl run_in_build_dir emake -j1 || die "emake failed"
 }
 
 src_install() {
 	python_foreach_impl run_in_build_dir default
 	find "${D}" -name '*.la' -delete || die
-	einstalldocs
 }
-
diff --git a/sci-libs/nipype/ChangeLog b/sci-libs/nipype/ChangeLog
deleted file mode 100644
index 42410d3..0000000
--- a/sci-libs/nipype/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-  30 Oct 2016; Horea Christian <h.chr@mail.ru> nipype-9999.ebuild:
-  sci-libs/nipype: downloading from separate branch
-
-*nipype-9999 (30 Oct 2016)
-
-  30 Oct 2016; Horea Christian <h.chr@mail.ru> +metadata.xml,
-  +nipype-9999.ebuild:
-  sci-libs/nipype: my temporal nipype fork
diff --git a/sci-libs/nipype/metadata.xml b/sci-libs/nipype/metadata.xml
deleted file mode 100644
index 3873d5d..0000000
--- a/sci-libs/nipype/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>horea.christ@gmail.com</email>
-    <name>Horea Christian</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-	Nipype, an open-source, community-developed initiative under the
-	umbrella of NiPy, is a Python project that provides a uniform interface
-	to existing neuroimaging software and facilitates interaction between
-	these packages within a single workflow. Nipype provides an environment
-	that encourages interactive exploration of algorithms from different
-	packages (e.g., SPM, FSL, FreeSurfer, Camino, MRtrix, MNE, AFNI, Slicer),
-	eases the design of workflows within and between packages, and reduces
-	the learning curve necessary to use different packages. Nipype is
-	creating a collaborative platform for neuroimaging software development
-	in a high-level language and addressing limitations of existing pipeline systems.
-</longdescription>
- <upstream>
-    <remote-id type="sourceforge">nipy</remote-id>
- </upstream>
-  <use>
-    <flag name="spm">Pull in "Statistical Parametric Mapping" (sci-biology/spm)</flag>
-    <flag name="fsl">Pull in the "FMRIB Software Library" (sci-biology/fsl)</flag>
-    <flag name="afni">Pull in the NIH AFNI software bundle (sci-biology/afni)</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-libs/nipype/nipype-9999.ebuild b/sci-libs/nipype/nipype-9999.ebuild
deleted file mode 100644
index 668ed34..0000000
--- a/sci-libs/nipype/nipype-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Neuroimaging in Python: Pipelines and Interfaces"
-HOMEPAGE="http://nipy.sourceforge.net/nipype/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/TheChymera/nipype"
-EGIT_BRANCH="hack"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-DEPEND="
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/prov[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/nibabel[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7)
-	"
-RDEPEND="
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/pydotplus[${PYTHON_USEDEP}]
-	dev-python/pygraphviz[${PYTHON_USEDEP}]
-	dev-python/traits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	EXISTING_REQUIRE="setup_requires=\['future', 'configparser'\]"
-	CORRECTED_REQUIRE="setup_requires=\['future'\]"
-	sed \
-		-e "s/${EXISTING_REQUIRE}/${CORRECTED_REQUIRE}/g" \
-		-i setup.py \
-		|| die "sed setup.py"
-}
-
-python_test() {
-	nosetests -v || die
-}