Change cmake default behaviour to outsource.

Ports that build out of source now simply can use "USES=cmake"
instead of "USES=cmake:outsource". Ports that fail to build
out of source now need to specify "USES=cmake:insource".

I tried to only set insource where explictely needed.

PR:		232038
Exp-run by:	antoine

58 files changed, 58 insertions, 58 deletions

diff --git a/science/ALPSCore/Makefile b/science/ALPSCore/Makefile
index 9623030ffe4a..ded394379d9a 100644
--- a/science/ALPSCore/Makefile
+++ b/science/ALPSCore/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/szip
 
-USES=		cmake:outsource eigen:3
+USES=		cmake eigen:3
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 TEST_TARGET=	test # 2 to 3 tests fail: https://github.com/ALPSCore/ALPSCore/issues/388
diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index 41c247e6fdcd..e72b6585d679 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
 		libsz.so:science/szip \
 		libtiff.so:graphics/tiff
 
-USES=		cmake:outsource compiler:c11 jpeg
+USES=		cmake compiler:c11 jpeg
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DITK_USE_KWSTYLE:BOOL=OFF \
 		-DITK_USE_SYSTEM_LIBRARIES:BOOL=ON \
diff --git a/science/MOOSE-neural-simulator/Makefile b/science/MOOSE-neural-simulator/Makefile
index dda47f1acb4a..ff9d8ccca863 100644
--- a/science/MOOSE-neural-simulator/Makefile
+++ b/science/MOOSE-neural-simulator/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py-pygraphviz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.4:net/py-suds-jurko@${PY_FLAVOR}
 
-USES=		cmake:outsource fortran gettext-runtime pyqt:4 python:2.7
+USES=		cmake fortran gettext-runtime pyqt:4 python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	BhallaLab
 GH_PROJECT=	moose
diff --git a/science/agrum/Makefile b/science/agrum/Makefile
index 41fb26b174a5..119143e39901 100644
--- a/science/agrum/Makefile
+++ b/science/agrum/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Graphical modeler for Bayesian networks, influence diagrams, etc
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource
+USES=		cmake
 USE_GITLAB=	yes
 GL_ACCOUNT=	agrumery
 GL_PROJECT=	aGrUM
diff --git a/science/avogadro2/Makefile b/science/avogadro2/Makefile
index 47cca2ab8e29..fab60b0537de 100644
--- a/science/avogadro2/Makefile
+++ b/science/avogadro2/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	hdf5>0:science/hdf5
 LIB_DEPENDS=	libAvogadroCore.so:science/avogadrolibs \
 		libMoleQueueClient.so:misc/molequeue
 
-USES=		cmake:outsource compiler:c++11-lang desktop-file-utils gl libarchive qt:5
+USES=		cmake compiler:c++11-lang desktop-file-utils gl libarchive qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 GH_PROJECT=	avogadroapp
diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile
index 2508dfacf600..30352f80c2a6 100644
--- a/science/avogadrolibs/Makefile
+++ b/science/avogadrolibs/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/mmtf.hpp:science/mmtf
 
-USES=		cmake:outsource compiler:c++11-lang eigen:3,build,run # eigen needs to be 'run' because it is written into cmake files
+USES=		cmake compiler:c++11-lang eigen:3,build,run # eigen needs to be 'run' because it is written into cmake files
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 USE_LDCONFIG=	yes
diff --git a/science/chemps2/Makefile b/science/chemps2/Makefile
index 2dc40346d2fc..5dde503cd33a 100644
--- a/science/chemps2/Makefile
+++ b/science/chemps2/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libsz.so:science/szip
 
-USES=		blaslapack:openblas cmake:outsource fortran
+USES=		blaslapack:openblas cmake fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	SebWouters
 USE_LDCONFIG=	yes
diff --git a/science/chrono/Makefile b/science/chrono/Makefile
index 911cd8e340c5..868617e0d37a 100644
--- a/science/chrono/Makefile
+++ b/science/chrono/Makefile
@@ -16,7 +16,7 @@ PORTSCOUT=	skipv:3.0.0 # their development continues under the branch 2.X. 3.0.0
 
 BUILD_DEPENDS=	openmpi>0:net/openmpi
 
-USES=		cmake:outsource compiler:c++14-lang fortran
+USES=		cmake compiler:c++14-lang fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	project${PORTNAME}
 USE_LDCONFIG=	yes
diff --git a/science/clhep/Makefile b/science/clhep/Makefile
index 755db009fabd..763fa7db671b 100644
--- a/science/clhep/Makefile
+++ b/science/clhep/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	multi
 
 WRKSRC=		${WRKDIR}/${PORTVERSION}/${PORTNAME:tu}
 
-USES=		cmake:outsource compiler:c++11-lang perl5 tar:tgz
+USES=		cmake compiler:c++11-lang perl5 tar:tgz
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
diff --git a/science/coordgenlibs/Makefile b/science/coordgenlibs/Makefile
index ef62696619bb..2d9a824569e8 100644
--- a/science/coordgenlibs/Makefile
+++ b/science/coordgenlibs/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/dynamic_bitset.hpp:devel/boost-libs
 LIB_DEPENDS=	libmaeparser.so:science/maeparser
 
-USES=		cmake:outsource compiler:c++11-lang localbase:ldflags
+USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	schrodinger
 USE_LDCONFIG=	yes
diff --git a/science/dalton/Makefile b/science/dalton/Makefile
index de3ed7f60ab1..692ca3243d7d 100644
--- a/science/dalton/Makefile
+++ b/science/dalton/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	liblapack.so:math/lapack \
 		libopenblas.so:math/openblas
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		cmake:outsource,noninja fortran python:build shebangfix
+USES=		cmake:noninja fortran python:build shebangfix
 SHEBANG_FILES=	dalton.in
 USE_GITLAB=	yes
 GL_COMMIT=	d16802317e0785578e491e600c73cfb6bfb70ff0
diff --git a/science/dft_tools/Makefile b/science/dft_tools/Makefile
index c3d16b89760d..549385bfd242 100644
--- a/science/dft_tools/Makefile
+++ b/science/dft_tools/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libcpp2py.so:devel/cpp2py \
 		libsz.so:science/szip \
 		libtriqs.so:science/triqs
 
-USES=		cmake:outsource,noninja fortran gettext-runtime python:-2.7
+USES=		cmake:noninja fortran gettext-runtime python:-2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	TRIQS
 
diff --git a/science/dkh/Makefile b/science/dkh/Makefile
index 4dec6c080b03..0943b67482bb 100644
--- a/science/dkh/Makefile
+++ b/science/dkh/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Wolf, Reiher, and Hess's Douglas-Kroll-Hess relativistic correction
 
 LICENSE=	GPLv3
 
-USES=		cmake:outsource fortran
+USES=		cmake fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi4
 USE_LDCONFIG=	yes
diff --git a/science/dlib-cpp/Makefile b/science/dlib-cpp/Makefile
index 40555918ebef..d013a9c39c4b 100644
--- a/science/dlib-cpp/Makefile
+++ b/science/dlib-cpp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Machine learning framework written in C++
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/dlib/LICENSE.txt
 
-USES=			cmake:outsource pkgconfig tar:bzip2
+USES=			cmake pkgconfig tar:bzip2
 USE_LDCONFIG=		yes
 
 OPTIONS_DEFINE=		X11 JPEG PNG GIF SQLITE BLASLAPACK PYTHON AVX
diff --git a/science/eccodes/Makefile b/science/eccodes/Makefile
index 1a740e2d944b..a93ebf0d317c 100644
--- a/science/eccodes/Makefile
+++ b/science/eccodes/Makefile
@@ -29,7 +29,7 @@ CMAKE_ARGS=	-DBUILD_SHARED_LIBS=BOTH
 CMAKE_OFF=	ENABLE_ECCODES_OMP_THREADS ENABLE_FORTRAN ENABLE_MEMFS ENABLE_PYTHON
 CMAKE_ON=	ENABLE_ECCODES_THREADS ENABLE_NETCDF ENABLE_PNG
 USE_LDCONFIG=	yes
-USES=		cmake:outsource shebangfix
+USES=		cmake shebangfix
 
 SHEBANG_FILES=	tools/bufr_compare_dir
 
diff --git a/science/erd/Makefile b/science/erd/Makefile
index f3fa332633f7..9b028f95835e 100644
--- a/science/erd/Makefile
+++ b/science/erd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	AcesIII electron repulsion integrals
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource fortran
+USES=		cmake fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi4
 USE_LDCONFIG=	yes
diff --git a/science/erkale/Makefile b/science/erkale/Makefile
index 2fffd06cd6da..d30a2ab6f266 100644
--- a/science/erkale/Makefile
+++ b/science/erkale/Makefile
@@ -26,7 +26,7 @@ FLAVORS=	serial parallel
 FLAVOR?=	${FLAVORS:[1]}
 serial_PKGNAMESUFFIX=	-serial
 
-USES=		cmake:outsource,noninja fortran pkgconfig
+USES=		cmake:noninja fortran pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	susilehtola
 GH_TAGNAME=	0927d8c
diff --git a/science/esys-particle/Makefile b/science/esys-particle/Makefile
index 0e258e2f3fc7..b9bd457bb820 100644
--- a/science/esys-particle/Makefile
+++ b/science/esys-particle/Makefile
@@ -15,7 +15,7 @@ LICENSE=	APACHE20
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libmpi.so:net/mpich
 
-USES=		cmake:outsource fortran
+USES=		cmake fortran
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	${LOCALBASE}/lib/libboost_filesystem.so
diff --git a/science/fleur/Makefile b/science/fleur/Makefile
index 8e7974fc19bd..275080ff1702 100644
--- a/science/fleur/Makefile
+++ b/science/fleur/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
-USES=		cmake:outsource,noninja fortran gnome localbase:ldflags tar:tgz
+USES=		cmake:noninja fortran gnome localbase:ldflags tar:tgz
 USE_GNOME=	libxml2
 
 FFLAGS=		-I${LOCALBASE}/include
diff --git a/science/gdma/Makefile b/science/gdma/Makefile
index 95b4e9bb4064..b0a56d071a00 100644
--- a/science/gdma/Makefile
+++ b/science/gdma/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Anthony Stone's Gaussian Distributed Multipole Analysis
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource fortran
+USES=		cmake fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	psi4
 USE_LDCONFIG=	yes
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 2dda377f17b6..d5110e643fe1 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+=	libgeotiff.so:graphics/libgeotiff\
 USE_GITHUB=	yes
 GH_PROJECT=	gdl
 
-USES=		cmake:outsource compiler:c++11-lang fortran ncurses pkgconfig readline tar:tgz
+USES=		cmake compiler:c++11-lang fortran ncurses pkgconfig readline tar:tgz
 USE_WX=		3.0+
 USE_XORG=	x11 sm ice xext
 
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 849604331ce5..883d55bbc4ad 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	boost-libs>=1.44:devel/boost-libs
 LIB_DEPENDS=	libhwloc.so:devel/hwloc
 
-USES=		cmake:outsource compiler:c++11-lang fortran gnome perl5 pkgconfig shebangfix
+USES=		cmake compiler:c++11-lang fortran gnome perl5 pkgconfig shebangfix
 SHEBANG_FILES=	admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh
 bash_CMD=	${SH}
 USE_GNOME=	libxml2
diff --git a/science/jdftx/Makefile b/science/jdftx/Makefile
index 68e1456fb601..2d6a8b6b075c 100644
--- a/science/jdftx/Makefile
+++ b/science/jdftx/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libblas.so:math/blas \
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++11-lang cmake:outsource fortran localbase:ldflags shebangfix
+USES=		compiler:c++11-lang cmake fortran localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	scripts/*
 SHEBANG_LANG=	octave
diff --git a/science/kalzium-kde4/Makefile b/science/kalzium-kde4/Makefile
index d2e61c9cf9ca..81066195f0a8 100644
--- a/science/kalzium-kde4/Makefile
+++ b/science/kalzium-kde4/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
-USES=		cmake:outsource eigen:2 kde:4 pkgconfig qt:4 tar:xz
+USES=		cmake eigen:2 kde:4 pkgconfig qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=	yes
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index cb7bd3bbd1b4..6393a01e0237 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
-USES=		cmake:outsource desktop-file-utils gettext kde:5 pkgconfig qt:5 tar:xz
+USES=		cmake desktop-file-utils gettext kde:5 pkgconfig qt:5 tar:xz
 USE_GL=		gl glew glu
 USE_KDE=	auth archive attica bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools ecm emoticons guiaddons i18n \
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index a9a44ed7cfbd..0899aa949874 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libgsl.so:math/gsl \
 KST_VERSION=	2.0.8
 KST_DATE=	20181123
 
-USES=		cmake:outsource desktop-file-utils pkgconfig \
+USES=		cmake desktop-file-utils pkgconfig \
 		shared-mime-info
 _USE_QT4=	corelib gui xml designer network svg linguisttools_build \
 		qmake_build moc_build rcc_build uic_build
diff --git a/science/lammps/Makefile b/science/lammps/Makefile
index 6fc620a0eda2..b2c3c44fbe7e 100644
--- a/science/lammps/Makefile
+++ b/science/lammps/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_i386=	undefined reference to `__atomic_load'
 CONFLICTS_BUILD=	ga # conflicts with include/error.h, already fixed in the head
 
-USES=		blaslapack:openblas cmake:outsource,noninja eigen:3 fortran shebangfix
+USES=		blaslapack:openblas cmake:noninja eigen:3 fortran shebangfix
 USE_GITHUB=	yes
 GH_TAGNAME=	stable_12Dec2018
 SHEBANG_GLOB=	*.sh *.bash
diff --git a/science/latte/Makefile b/science/latte/Makefile
index 38f804b5c799..78cf428dd025 100644
--- a/science/latte/Makefile
+++ b/science/latte/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Quantum chemistry: Density functional tight binding molecular dynamics
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL-2.0
 
-USES=		blaslapack:openblas cmake:outsource,noninja fortran shebangfix
+USES=		blaslapack:openblas cmake:noninja fortran shebangfix
 SHEBANG_FILES=	tests/run_test.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	lanl
diff --git a/science/libcint/Makefile b/science/libcint/Makefile
index d5dc9bae3483..5ad1e7a8d7dc 100644
--- a/science/libcint/Makefile
+++ b/science/libcint/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
-USES=		cmake:outsource blaslapack:openblas
+USES=		cmake blaslapack:openblas
 USE_GITHUB=	yes
 GH_ACCOUNT=	sunqm
 USE_LDCONFIG=	yes
diff --git a/science/libefp/Makefile b/science/libefp/Makefile
index 4fb8993c67a4..8edc4d563a31 100644
--- a/science/libefp/Makefile
+++ b/science/libefp/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Effective fragment potential method in quantum chemistry
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	ilyak
 USE_LDCONFIG=	yes
diff --git a/science/libgeodecomp/Makefile b/science/libgeodecomp/Makefile
index e7a1c0172507..c09651869f32 100644
--- a/science/libgeodecomp/Makefile
+++ b/science/libgeodecomp/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=		${WRKSRC}/LICENSE
 LIB_DEPENDS=		libboost_system.so:devel/boost-libs libboost_date_time.so:devel/boost-libs \
 			libboost_filesystem.so:devel/boost-libs
 
-USES=			cmake:outsource compiler:c++11-lib
+USES=			cmake compiler:c++11-lib
 USE_GCC=		yes
 USE_LDCONFIG=		yes
 
diff --git a/science/libmsym/Makefile b/science/libmsym/Makefile
index adf1c179ffe0..090edf0099e4 100644
--- a/science/libmsym/Makefile
+++ b/science/libmsym/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Molecular point group symmetry library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	mcodev31
 USE_LDCONFIG=	yes
diff --git a/science/liggghts/Makefile b/science/liggghts/Makefile
index 8355537c7b63..14e8b37149a3 100644
--- a/science/liggghts/Makefile
+++ b/science/liggghts/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libtiff.so:graphics/tiff \
 		libvtkViewsCore-8.1.so:math/vtk8
 
-USES=		compiler:c++17-lang cmake:outsource fortran jpeg qt:5
+USES=		compiler:c++17-lang cmake fortran jpeg qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	CFDEMproject
 GH_PROJECT=	${PORTNAME:tu}-PUBLIC
diff --git a/science/luscus/Makefile b/science/luscus/Makefile
index 7baf1f6d42db..326c7e9f6df8 100644
--- a/science/luscus/Makefile
+++ b/science/luscus/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 RUN_DEPENDS=	bash:shells/bash \
 		babel:science/openbabel
 
-USES=		cmake:outsource gettext-runtime pkgconfig shebangfix
+USES=		cmake gettext-runtime pkgconfig shebangfix
 SHEBANG_GLOB=	*.sh
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango pangox-compat
 USE_GL=		gl glu
diff --git a/science/madness/Makefile b/science/madness/Makefile
index 7a3bbe1bd78d..de9a27a2fbc5 100644
--- a/science/madness/Makefile
+++ b/science/madness/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libblas.so:math/blas \
 		libtcmalloc.so:devel/google-perftools \
 		libxc.so:science/libxc
 
-USES=		cmake:outsource compiler:c++14-lang fortran localbase:ldflags python:build
+USES=		cmake compiler:c++14-lang fortran localbase:ldflags python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	m-a-d-n-e-s-s
 GH_TAGNAME=	ebb3fd7
diff --git a/science/maeparser/Makefile b/science/maeparser/Makefile
index ffe5127887eb..6be92700e24e 100644
--- a/science/maeparser/Makefile
+++ b/science/maeparser/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/dynamic_bitset.hpp:devel/boost-libs
 
-USES=		cmake:outsource compiler:c++11-lang
+USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	schrodinger
 USE_LDCONFIG=	yes
diff --git a/science/mcstas/Makefile b/science/mcstas/Makefile
index 59be935e570d..84acafa89a8a 100644
--- a/science/mcstas/Makefile
+++ b/science/mcstas/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Monte Carlo neutron ray tracing package
 
 LICENSE=	LGPL21+
 
-USES=		bison:build cmake:outsource
+USES=		bison:build cmake
 CMAKE_ARGS=	"-Denable_mcstas=1"
 
 MANDIRS=	${PREFIX}/${PORTNAME}/${DISTVERSION}/doc/man/man1
diff --git a/science/mcxtrace-comps/Makefile b/science/mcxtrace-comps/Makefile
index ebf0df46d479..efcad9d4f4ac 100644
--- a/science/mcxtrace-comps/Makefile
+++ b/science/mcxtrace-comps/Makefile
@@ -13,7 +13,7 @@ LICENSE=	LGPL21+
 
 RUN_DEPENDS=	${LOCALBASE}/mcxtrace/${DISTVERSION}/bin/mcxtrace:science/mcxtrace
 
-USES=		cmake:outsource
+USES=		cmake
 # Apparently cmake does not generate an install/strip target if nothing
 # is supposed to be stripped, so override the cmake-default install
 # target of install/strip by resetting STRIP
diff --git a/science/mcxtrace/Makefile b/science/mcxtrace/Makefile
index 6fa57e31a1d3..a5f57a424984 100644
--- a/science/mcxtrace/Makefile
+++ b/science/mcxtrace/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Monte Carlo X-ray tracing package
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/lib/LGPL
 
-USES=		bison:build cmake:outsource
+USES=		bison:build cmake
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
diff --git a/science/mmtf/Makefile b/science/mmtf/Makefile
index 975c84b4aa48..39b218801092 100644
--- a/science/mmtf/Makefile
+++ b/science/mmtf/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/include/msgpack.hpp:devel/msgpack
 
-USES=		cmake:outsource compiler:c++11-lang localbase:ldflags
+USES=		cmake compiler:c++11-lang localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	rcsb
 GH_PROJECT=	mmtf-cpp
diff --git a/science/molsketch/Makefile b/science/molsketch/Makefile
index eb0ef09b0f69..6e318eb9f6a6 100644
--- a/science/molsketch/Makefile
+++ b/science/molsketch/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
-USES=		cmake:outsource desktop-file-utils localbase:ldflags pkgconfig qt:5 shared-mime-info
+USES=		cmake desktop-file-utils localbase:ldflags pkgconfig qt:5 shared-mime-info
 USE_QT=		core gui network printsupport svg widgets buildtools_build qmake_build
 USE_LDCONFIG=	${PREFIX}/lib/molsketch
 
diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index ca5051f425b8..3b2f007a8035 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	babel-*
 
-USES=		compiler:c++11-lang cmake:outsource eigen:3 gnome
+USES=		compiler:c++11-lang cmake eigen:3 gnome
 USE_CXXSTD=	gnu++98
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
diff --git a/science/opensim-core/Makefile b/science/opensim-core/Makefile
index 37e3a75e553a..114ac053eb04 100644
--- a/science/opensim-core/Makefile
+++ b/science/opensim-core/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LIB_DEPENDS=	libdocopt.so:devel/docopt.cpp \
 		libSimTKcommon.so:science/simbody
 
-USES=		blaslapack:openblas cmake:outsource compiler:c++11-lib fortran gl # fortran only for simbody/openblas
+USES=		blaslapack:openblas cmake compiler:c++11-lib fortran gl # fortran only for simbody/openblas
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}-org
 GH_PROJECT=	${PORTNAME:tl}-core
diff --git a/science/openstructure/Makefile b/science/openstructure/Makefile
index 55c87569592a..130e6b8e5dc8 100644
--- a/science/openstructure/Makefile
+++ b/science/openstructure/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 RUN_DEPENDS=	${PYNUMPY} \
 		bash:shells/bash
 
-USES=		cmake:outsource eigen:3 python pyqt:4 qt:4 shebangfix
+USES=		cmake eigen:3 python pyqt:4 qt:4 shebangfix
 SHEBANG_FILES=	scripts/dng.in scripts/ost.in scripts/ost_config.in
 USE_QT=		corelib gui network opengl xml qmake_build moc_build rcc_build uic_build
 USE_PYQT=	core gui
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index bc549ad4da6f..efb08e3ce0c3 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 RUN_DEPENDS=	bash:shells/bash	\
 		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR}
 
-USES=		alias cmake:outsource jpeg localbase python:2.7 qt:5 shebangfix
+USES=		alias cmake jpeg localbase python:2.7 qt:5 shebangfix
 USE_QT=		core gui help network sql widgets x11extras xmlpatterns buildtools_build qmake_build
 USE_GL=		gl glu
 USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm xorgproto
diff --git a/science/pcmsolver/Makefile b/science/pcmsolver/Makefile
index 9805f53d89f3..581ed0eaba21 100644
--- a/science/pcmsolver/Makefile
+++ b/science/pcmsolver/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	fails to compile: SphericalDiffuse.cpp:182: invalid initialization of non-const reference
 
-USES=		cmake:outsource,noninja fortran python
+USES=		cmake:noninja fortran python
 USE_GITHUB=	yes
 GH_ACCOUNT=	PCMSolver
 USE_LDCONFIG=	yes
diff --git a/science/py-avogadrolibs/Makefile b/science/py-avogadrolibs/Makefile
index 7d91b5c869db..1586eab6928e 100644
--- a/science/py-avogadrolibs/Makefile
+++ b/science/py-avogadrolibs/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/../LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/include/pybind11/pybind11.h:devel/pybind11
 LIB_DEPENDS=	libAvogadroCore.so:science/avogadrolibs
 
-USES=		cmake:outsource compiler:c++11-lang eigen:3 python:3.5+
+USES=		cmake compiler:c++11-lang eigen:3 python:3.5+
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
 USE_PYTHON=	flavors
diff --git a/science/py-rmf/Makefile b/science/py-rmf/Makefile
index 11d3924a5948..20b7575be3b1 100644
--- a/science/py-rmf/Makefile
+++ b/science/py-rmf/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	swig3.0:devel/swig30
 LIB_DEPENDS=	libRMF.so:science/rmf
 
-USES=		cmake:outsource python shebangfix
+USES=		cmake python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	salilab
 GH_TAGNAME=	f917cf2
diff --git a/science/qmcpack/Makefile b/science/qmcpack/Makefile
index 1210f5cc0f87..07afcd854e7b 100644
--- a/science/qmcpack/Makefile
+++ b/science/qmcpack/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libopenblas.so:math/openblas \
 		libsz.so:science/szip
 
-USES=		cmake:outsource compiler:c++11-lang fortran gnome localbase:ldflags pkgconfig
+USES=		cmake compiler:c++11-lang fortran gnome localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 USE_GNOME=	libxml2
diff --git a/science/rdkit/Makefile b/science/rdkit/Makefile
index edf8d7972b33..8394342485bc 100644
--- a/science/rdkit/Makefile
+++ b/science/rdkit/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	catch>0:devel/catch \
 		rapidjson>=0:devel/rapidjson
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		bison:build cmake:outsource eigen:3 python
+USES=		bison:build cmake eigen:3 python
 USE_GITHUB=	yes
 GH_TUPLE=	schrodinger:maeparser:1.0.0:maeparser/External/CoordGen/maeparser \
 		schrodinger:coordgenlibs:ede3191:coordgenlibs/External/CoordGen/coordgenlibs
diff --git a/science/rmf/Makefile b/science/rmf/Makefile
index b28fda65b889..6aaa60b9baed 100644
--- a/science/rmf/Makefile
+++ b/science/rmf/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/szip
 
-USES=		compiler:c++11-lang cmake:outsource python:build shebangfix
+USES=		compiler:c++11-lang cmake python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	salilab
 GH_TAGNAME=	f917cf2
diff --git a/science/simbody/Makefile b/science/simbody/Makefile
index 6204db1e9549..c302d7fc8dd4 100644
--- a/science/simbody/Makefile
+++ b/science/simbody/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
-USES=		blaslapack:openblas cmake:outsource compiler:c++11-lang fortran # fortran only for openblas
+USES=		blaslapack:openblas cmake compiler:c++11-lang fortran # fortran only for openblas
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
diff --git a/science/simint/Makefile b/science/simint/Makefile
index 948f486df1b8..8fb8696d045f 100644
--- a/science/simint/Makefile
+++ b/science/simint/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Obara-Saika (OS) method of calculating electron repulsion integrals
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource tar:bz2
+USES=		cmake tar:bz2
 USE_LDCONFIG=	yes
 
 OPTIONS_SINGLE=		VECTOR
diff --git a/science/step-kde4/Makefile b/science/step-kde4/Makefile
index ca1138882b31..9519118b9a9f 100644
--- a/science/step-kde4/Makefile
+++ b/science/step-kde4/Makefile
@@ -14,7 +14,7 @@ EXPIRATION_DATE=	2018-12-31
 LIB_DEPENDS=	libqalculate.so:math/libqalculate \
 		libgsl.so:math/gsl
 
-USES=		cmake:outsource eigen:2 kde:4 pkgconfig qt:4 tar:xz
+USES=		cmake eigen:2 kde:4 pkgconfig qt:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT=		opengl moc_build qmake_build rcc_build uic_build
 
diff --git a/science/step/Makefile b/science/step/Makefile
index 2f1687cc0df6..d0252cd2051e 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libcln.so:math/cln \
 		libgsl.so:math/gsl \
 		libqalculate.so:math/libqalculate
 
-USES=		cmake:outsource compiler:c++11-lang eigen:3 gettext kde:5 \
+USES=		cmake compiler:c++11-lang eigen:3 gettext kde:5 \
 		pkgconfig qt:5 tar:xz
 USE_KDE=	attica auth bookmarks codecs completion config configwidgets \
 		coreaddons crash doctools ecm emoticons guiaddons i18n \
diff --git a/science/teem/Makefile b/science/teem/Makefile
index 12717886ff07..8859e9b50e6a 100644
--- a/science/teem/Makefile
+++ b/science/teem/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libpng16.so:graphics/png
 
-USES=		cmake:outsource
+USES=		cmake
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
diff --git a/science/triqs/Makefile b/science/triqs/Makefile
index 73298148c818..406f91cec1bf 100644
--- a/science/triqs/Makefile
+++ b/science/triqs/Makefile
@@ -28,7 +28,7 @@ RUN_DEPENDS=	${PYNUMPY}
 
 PORTSCOUT=	limit:^[0-9]+\.[0-9].*$$
 
-USES=		cmake:outsource,noninja fortran gettext-runtime python:2.7 # python:2.7 matches that in devel/cpp2py
+USES=		cmake:noninja fortran gettext-runtime python:2.7 # python:2.7 matches that in devel/cpp2py
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 USE_LDCONFIG=	yes
diff --git a/science/vipster/Makefile b/science/vipster/Makefile
index 9d38be517791..06998e3f1353 100644
--- a/science/vipster/Makefile
+++ b/science/vipster/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Crystalline and molecular structure visualisation program
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:outsource compiler:c++17-lang
+USES=		cmake compiler:c++17-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	sgsaenger
 USE_LDCONFIG=	yes