gentoo auto-resync : 21:01:2024 - 08:09:25

6 files changed, 132 insertions, 60 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index e5c48bef1b6e..69d012d719d5 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 48884751d273..62482c5cc16e 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -9,7 +9,7 @@ DIST eigen-3.4.0.tar.bz2 2143091 BLAKE2B a32aac13cbab68cfaaa252d8a406e6a36ecfd12
 DIST eigen-3.4.0.tar.gz 2705005 BLAKE2B ae5f774a6ed36f52cf9fc3206e50796abacbba69fd0f67cd5759b4e04d847aa656861d5e06e6cd0d798a17f2b06abdb70b16f795a626bdd29edcc872c33821f8 SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
 DIST eigen-lapack_addons-3.4.1.tgz 6215074 BLAKE2B 564c3398de1f4ea249b58957a482cda0b5eb99e5021e1f18abf3b4d2893fed48912bfa8386681fcae03dd933eea91644f7429d47a53684d64462209a6ae76f30 SHA512 5a827d0befb521cb430f0d63f5000e7955359bc637cdb7292d942712e98c0702570a5b650a72fc609bf5b43633661c0e51de7761ae892df6ff0aab667f436edf
 EBUILD eigen-3.4.0-r1.ebuild 2588 BLAKE2B b24a464408f8f03282db44144e07080a0bac0b71a38d0847af12f8e506d218f437ebfba0b8ba5ccb654c4d317ecb8006ed02f0b63673038a5f91ed35968762ca SHA512 be51f2e62f6f954365dadefb1e33d7dd5bb094ff33d954b75ab1bbd2a1d0d8e54a673bb44040608668bbe5d936dd16e169cd5b16e9a3fdbe61fdc11a21ccc870
-EBUILD eigen-3.4.0-r2.ebuild 11716 BLAKE2B 3dccd3c3f297a6fe364ed4c74712547ac62cba5ac76e847bbbe656881d2204989d530dbcdd93d74ad1d1834a65ead3bb3024e5d670b0b60083b6436bcb2a2f9c SHA512 9256c99ac94f2fcadee4cef0c4a85ceb13dad822ab1718f7e517151a6be877fd14ba1f7c9e4f1022559cf7629e4d402bc4d2a5b91a921bb2f3c2d4295851b3fc
-EBUILD eigen-3.4.9999.ebuild 11148 BLAKE2B b30ab31680e18da913e50eed92d2ce5d4349cdb27b8bfe04672d91b31298564b96f5cacd38f1ffcaa882c6222fe40d3bb79755f096ab43a772d6f43e7af1e62f SHA512 4fcf92f08283034dbb29c5383fce80753d084d9fb0fb73b0411a506edecf6c2f8a5dea4347d398708758c8a2aac30db574299b13af64d15cb7257881cb5b7f56
-EBUILD eigen-9999.ebuild 11072 BLAKE2B 0d8dcc2215fae96b10a73136c381529e3cd153146058cd805f77dc8597ece19dd16809f2c64ad9962bcddfb73409440e6ff69466099d419794efd4eae1b80f7b SHA512 fae6875aa1569e2db497f50e3a749a170cfa7ef2f1b31d00b40c7a162502e437f9dbe5ca3400030a31205f6ddc682b077a0a39797d1df376b1ca22a7fd13d248
-MISC metadata.xml 2029 BLAKE2B 1eb9335471eaab398c88ab5c23f86d3afb0ee6f6c25d44f712ce1fd0a1b9c8551e3d9059b6e0d111f44aa4117c722e0523a3e5ad995d8a16f7069d685aa35217 SHA512 61aadcec7bc390188526eb433beecf430231f664096bea2abea9acebaf484446be49cf79217486a1333b1c8ea31814532423cb97868e34a2d6ce426108f6bc77
+EBUILD eigen-3.4.0-r2.ebuild 12327 BLAKE2B a6ea9f8ea649b639b4a3a6a34caa51a693c727a2d87c36a48296d92df6bea5315284d5d4e313d1792dc30a76bdc9d8decca686b130141cf97222e5e52de723f1 SHA512 e39417c2b699f4fd31b4c90b0c9bb9720df376bf9edf2d5a929fb7f88e3ad03ea8d5bfca09a31de623819961ff6eda146777c9b6bfc79ab81f152bae915211ef
+EBUILD eigen-3.4.9999.ebuild 11759 BLAKE2B acf5a6e72cfc922767b0a867ae55d15e9a1016b67a57d1957d1d0a8e7e975c9d3855e891bd72dc39983825b00898be0dcd3c328586fe025c576cea3e3a518f6e SHA512 a7569697f705dfc720e1a201d7c178aaba986b9f3233ee6e8886c605a5503fe3ecfc8eaede9cf14175aca0bafca7e77001f7e8d90878114fbbd81493e9a87f39
+EBUILD eigen-9999.ebuild 11683 BLAKE2B 405987f4e22b99670a07c7a593f1f33317e6b3d8e44f111757145f63ead1a36247e4c4feb6a4078590c277e0d46ce04a305771221ac64ac75e7daaa14c25f95d SHA512 60d8ead0d69e9cebb415e2682f89dda1be3bce484c18505ba7bec1ea38653663b58d3d729b3ac5e34d3d11d0c958a6050bc4d19faf51fbeab2e13b9914952532
+MISC metadata.xml 2122 BLAKE2B ce2287db5f80ce761bc100cc0f6fe3dd549dda68853f0fc40d362e9dce72d5a5398b3d2b9562aa8feafc5b869adaab78a87b65499404df072c35d353ec2f5cd8 SHA512 446fe2316a72f8c058445f4c14bfe4683476f1a041d9af55ab3d1f76b4e2b6e83d0f7aad4a7febcd7c4c5bdfdf1efc30483aaa276ace6ac941488ee3d137c5c7
diff --git a/dev-cpp/eigen/eigen-3.4.0-r2.ebuild b/dev-cpp/eigen/eigen-3.4.0-r2.ebuild
index 3ecf3d7a3bf7..04a52fe2d8ea 100644
--- a/dev-cpp/eigen/eigen-3.4.0-r2.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-r2.ebuild
@@ -58,11 +58,11 @@ X86_CPU_FEATURES=(
 # )
 
 CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}
-	${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}
-	${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}
-	# ${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}
-	# ${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}
+	"${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}"
+	"${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}"
+	"${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}"
+	# "${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}"
+	# "${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}"
 )
 
 IUSE_TEST_BACKENDS=(
@@ -80,7 +80,7 @@ IUSE_TEST_BACKENDS=(
 	"umfpack"
 )
 
-IUSE="${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack test ${IUSE_TEST_BACKENDS[*]}" #zvector
+IUSE="${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack mathjax test ${IUSE_TEST_BACKENDS[*]}" #zvector
 
 # Tests failing again because of compiler issues
 RESTRICT="!test? ( test )"
@@ -93,6 +93,7 @@ BDEPEND="
 		dev-texlive/texlive-fontutils
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
+		mathjax? ( dev-libs/mathjax )
 	)
 	test? ( virtual/pkgconfig )
 "
@@ -186,6 +187,10 @@ cuda_set_CUDAHOSTCXX() {
 	export CUDAHOSTCXX
 }
 
+pkg_setup() {
+	use test && use cuda && use clang && llvm_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} = *9999* ]] ; then
 		git-r3_src_unpack
@@ -202,18 +207,44 @@ src_unpack() {
 src_prepare() {
 	cmake_src_prepare
 
-	cmake_comment_add_subdirectory demos
+	sed \
+		-e "/add_subdirectory(bench\/spbench/s/^/#DONOTCOMPILE /g" \
+		-e "/add_subdirectory(demos/s/^/#DONOTCOMPILE /g" \
+		-i CMakeLists.txt || die
 
 	if ! use test; then
-		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+		sed \
+			-e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(scripts/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(failtest/s/^/#DONOTCOMPILE /g" \
 			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
 			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
 			-i CMakeLists.txt || die
 	fi
-
 }
 
 src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DEIGEN_BUILD_DOC="$(usex doc)" # Enable creation of Eigen documentation
+		-DEIGEN_BUILD_PKGCONFIG="yes" # Build pkg-config .pc file for Eigen
+	)
+	if use doc || use test; then
+		mycmakeargs+=(
+			# needs Qt4
+			-DEIGEN_TEST_NOQT="yes" # Disable Qt support in unit tests
+		)
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DEIGEN_DOC_USE_MATHJAX="$(usex mathjax)" # Use MathJax for rendering math in HTML docs
+			-DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
+		)
+	fi
+
 	if use test; then
 		mycmakeargs+=(
 			# the OpenGL testsuite is extremely brittle, bug #712808
@@ -221,9 +252,6 @@ src_configure() {
 			-DEIGEN_TEST_OPENGL="$(usex opengl)" # Enable OpenGL support in unit tests
 			-DEIGEN_TEST_OPENMP="$(usex openmp)" # Enable/Disable OpenMP in tests/examples
 
-			# needs Qt4
-			-DEIGEN_TEST_NOQT=yes # Disable Qt support in unit tests
-
 			-DCMAKE_DISABLE_FIND_PACKAGE_MPREAL=ON
 
 			-DEIGEN_TEST_CXX11=yes
@@ -234,11 +262,6 @@ src_configure() {
 
 			# -DEIGEN_BUILD_BTL=yes # Build benchmark suite
 
-			# -DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
-			# -DEIGEN_BUILD_DOC=yes # Enable creation of Eigen documentation
-			# -DEIGEN_BUILD_PKGCONFIG=yes # Build pkg-config .pc file for Eigen
-			# -DEIGEN_DOC_USE_MATHJAX=yes # Use MathJax for rendering math in HTML docs
-
 			-DEIGEN_TEST_BUILD_DOCUMENTATION="$(usex doc)" # Test building the doxygen documentation
 
 			# -DEIGEN_COVERAGE_TESTING=no # Enable/disable gcov
@@ -341,12 +364,12 @@ src_configure() {
 
 		if use cuda; then
 			cuda_add_sandbox -w
-			export CUDAFLAGS="${NVCCFLAGS}"
 			if use clang; then
 				local llvm_prefix
 				llvm_prefix="$(get_llvm_prefix -b)"
 				export CC="${llvm_prefix}/bin/clang"
 				export CXX="${llvm_prefix}/bin/clang++"
+				export LIBRARY_PATH="${ESYSROOT}/usr/$(get_libdir)"
 			else
 				cuda_set_CUDAHOSTCXX
 				mycmakeargs+=(
@@ -360,6 +383,8 @@ src_configure() {
 				NVCCFLAGS+=" -v"
 			fi
 
+			export CUDAFLAGS="${NVCCFLAGS}"
+
 			[[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS"
 			: "${CUDAARCHS:=$(__nvcc_device_query)}"
 			export CUDAARCHS
diff --git a/dev-cpp/eigen/eigen-3.4.9999.ebuild b/dev-cpp/eigen/eigen-3.4.9999.ebuild
index 223638535893..e4f1e0613661 100644
--- a/dev-cpp/eigen/eigen-3.4.9999.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.9999.ebuild
@@ -58,11 +58,11 @@ X86_CPU_FEATURES=(
 # )
 
 CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}
-	${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}
-	${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}
-	# ${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}
-	# ${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}
+	"${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}"
+	"${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}"
+	"${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}"
+	# "${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}"
+	# "${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}"
 )
 
 IUSE_TEST_BACKENDS=(
@@ -80,7 +80,7 @@ IUSE_TEST_BACKENDS=(
 	"umfpack"
 )
 
-IUSE="benchmark ${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack test ${IUSE_TEST_BACKENDS[*]}" #zvector
+IUSE="benchmark ${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack mathjax test ${IUSE_TEST_BACKENDS[*]}" #zvector
 
 # Tests failing again because of compiler issues
 RESTRICT="!test? ( test )"
@@ -93,6 +93,7 @@ BDEPEND="
 		dev-texlive/texlive-fontutils
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
+		mathjax? ( dev-libs/mathjax )
 	)
 	test? ( virtual/pkgconfig )
 "
@@ -185,6 +186,10 @@ cuda_set_CUDAHOSTCXX() {
 	export CUDAHOSTCXX
 }
 
+pkg_setup() {
+	use test && use cuda && use clang && llvm_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} = *9999* ]] ; then
 		git-r3_src_unpack
@@ -201,21 +206,45 @@ src_unpack() {
 src_prepare() {
 	cmake_src_prepare
 
-	cmake_comment_add_subdirectory demos
+	sed \
+		-e "/add_subdirectory(bench\/spbench/s/^/#DONOTCOMPILE /g" \
+		-e "/add_subdirectory(demos/s/^/#DONOTCOMPILE /g" \
+		-i CMakeLists.txt || die
 
 	if ! use test; then
-		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+		sed \
+			-e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(scripts/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(failtest/s/^/#DONOTCOMPILE /g" \
 			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
 			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
 			-i CMakeLists.txt || die
 	fi
-
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DEIGEN_BUILD_BTL="$(usex benchmark)"
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DEIGEN_BUILD_BTL="$(usex benchmark)" # Build benchmark suite
+		-DEIGEN_BUILD_DOC="$(usex doc)" # Enable creation of Eigen documentation
+		-DEIGEN_BUILD_PKGCONFIG="yes" # Build pkg-config .pc file for Eigen
 	)
+	if use doc || use test; then
+		mycmakeargs+=(
+			# needs Qt4
+			-DEIGEN_TEST_NOQT="yes" # Disable Qt support in unit tests
+		)
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DEIGEN_DOC_USE_MATHJAX="$(usex mathjax)" # Use MathJax for rendering math in HTML docs
+			-DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
+		)
+	fi
+
 	if use test; then
 		mycmakeargs+=(
 			# the OpenGL testsuite is extremely brittle, bug #712808
@@ -223,9 +252,6 @@ src_configure() {
 			-DEIGEN_TEST_OPENGL="$(usex opengl)" # Enable OpenGL support in unit tests
 			-DEIGEN_TEST_OPENMP="$(usex openmp)" # Enable/Disable OpenMP in tests/examples
 
-			# needs Qt4
-			-DEIGEN_TEST_NOQT=yes # Disable Qt support in unit tests
-
 			-DCMAKE_DISABLE_FIND_PACKAGE_MPREAL=ON
 
 			-DEIGEN_TEST_CXX11=yes
@@ -236,11 +262,6 @@ src_configure() {
 
 			# -DEIGEN_BUILD_BTL=yes # Build benchmark suite
 
-			# -DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
-			# -DEIGEN_BUILD_DOC=yes # Enable creation of Eigen documentation
-			# -DEIGEN_BUILD_PKGCONFIG=yes # Build pkg-config .pc file for Eigen
-			# -DEIGEN_DOC_USE_MATHJAX=yes # Use MathJax for rendering math in HTML docs
-
 			-DEIGEN_TEST_BUILD_DOCUMENTATION="$(usex doc)" # Test building the doxygen documentation
 
 			# -DEIGEN_COVERAGE_TESTING=no # Enable/disable gcov
@@ -343,12 +364,12 @@ src_configure() {
 
 		if use cuda; then
 			cuda_add_sandbox -w
-			export CUDAFLAGS="${NVCCFLAGS}"
 			if use clang; then
 				local llvm_prefix
 				llvm_prefix="$(get_llvm_prefix -b)"
 				export CC="${llvm_prefix}/bin/clang"
 				export CXX="${llvm_prefix}/bin/clang++"
+				export LIBRARY_PATH="${ESYSROOT}/usr/$(get_libdir)"
 			else
 				cuda_set_CUDAHOSTCXX
 				mycmakeargs+=(
@@ -362,6 +383,8 @@ src_configure() {
 				NVCCFLAGS+=" -v"
 			fi
 
+			export CUDAFLAGS="${NVCCFLAGS}"
+
 			[[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS"
 			: "${CUDAARCHS:=$(__nvcc_device_query)}"
 			export CUDAARCHS
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 6e17f2f00d02..219f6dba7d1c 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -58,11 +58,11 @@ X86_CPU_FEATURES=(
 # )
 
 CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}
-	${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}
-	${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}
-	# ${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}
-	# ${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}
+	"${ARM_CPU_FEATURES[@]/#/cpu_flags_arm_}"
+	"${PPC_CPU_FEATURES[@]/#/cpu_flags_ppc_}"
+	"${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}"
+	# "${MIPS_CPU_FEATURES[@]/#/cpu_flags_mips_}"
+	# "${S390_CPU_FEATURES[@]/#/cpu_flags_s390_}"
 )
 
 IUSE_TEST_BACKENDS=(
@@ -80,7 +80,7 @@ IUSE_TEST_BACKENDS=(
 	"umfpack"
 )
 
-IUSE="benchmark ${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack test ${IUSE_TEST_BACKENDS[*]}" #zvector
+IUSE="benchmark ${CPU_FEATURES_MAP[*]%:*} clang cuda hip debug doc lapack mathjax test ${IUSE_TEST_BACKENDS[*]}" #zvector
 
 # Tests failing again because of compiler issues
 RESTRICT="!test? ( test )"
@@ -93,6 +93,7 @@ BDEPEND="
 		dev-texlive/texlive-fontutils
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
+		mathjax? ( dev-libs/mathjax )
 	)
 	test? ( virtual/pkgconfig )
 "
@@ -183,6 +184,10 @@ cuda_set_CUDAHOSTCXX() {
 	export CUDAHOSTCXX
 }
 
+pkg_setup() {
+	use test && use cuda && use clang && llvm_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} = *9999* ]] ; then
 		git-r3_src_unpack
@@ -199,21 +204,45 @@ src_unpack() {
 src_prepare() {
 	cmake_src_prepare
 
-	cmake_comment_add_subdirectory demos
+	sed \
+		-e "/add_subdirectory(bench\/spbench/s/^/#DONOTCOMPILE /g" \
+		-e "/add_subdirectory(demos/s/^/#DONOTCOMPILE /g" \
+		-i CMakeLists.txt || die
 
 	if ! use test; then
-		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+		sed \
+			-e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(scripts/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(failtest/s/^/#DONOTCOMPILE /g" \
 			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
 			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
 			-i CMakeLists.txt || die
 	fi
-
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DEIGEN_BUILD_BTL="$(usex benchmark)"
+		-DBUILD_SHARED_LIBS="yes"
+		-DBUILD_TESTING="$(usex test)"
+
+		-DEIGEN_BUILD_BTL="$(usex benchmark)" # Build benchmark suite
+		-DEIGEN_BUILD_DOC="$(usex doc)" # Enable creation of Eigen documentation
+		-DEIGEN_BUILD_PKGCONFIG="yes" # Build pkg-config .pc file for Eigen
 	)
+	if use doc || use test; then
+		mycmakeargs+=(
+			# needs Qt4
+			-DEIGEN_TEST_NOQT="yes" # Disable Qt support in unit tests
+		)
+	fi
+
+	if use doc; then
+		mycmakeargs+=(
+			-DEIGEN_DOC_USE_MATHJAX="$(usex mathjax)" # Use MathJax for rendering math in HTML docs
+			-DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
+		)
+	fi
+
 	if use test; then
 		mycmakeargs+=(
 			# the OpenGL testsuite is extremely brittle, bug #712808
@@ -221,9 +250,6 @@ src_configure() {
 			-DEIGEN_TEST_OPENGL="$(usex opengl)" # Enable OpenGL support in unit tests
 			-DEIGEN_TEST_OPENMP="$(usex openmp)" # Enable/Disable OpenMP in tests/examples
 
-			# needs Qt4
-			-DEIGEN_TEST_NOQT=yes # Disable Qt support in unit tests
-
 			-DCMAKE_DISABLE_FIND_PACKAGE_MPREAL=ON
 
 			# -DEIGEN_TEST_CUSTOM_CXX_FLAGS= # Additional compiler flags when compiling unit tests.
@@ -232,11 +258,6 @@ src_configure() {
 
 			# -DEIGEN_BUILD_BTL=yes # Build benchmark suite
 
-			# -DEIGEN_INTERNAL_DOCUMENTATION=no # Build internal documentation
-			# -DEIGEN_BUILD_DOC=yes # Enable creation of Eigen documentation
-			# -DEIGEN_BUILD_PKGCONFIG=yes # Build pkg-config .pc file for Eigen
-			# -DEIGEN_DOC_USE_MATHJAX=yes # Use MathJax for rendering math in HTML docs
-
 			-DEIGEN_TEST_BUILD_DOCUMENTATION="$(usex doc)" # Test building the doxygen documentation
 
 			# -DEIGEN_COVERAGE_TESTING=no # Enable/disable gcov
@@ -339,12 +360,12 @@ src_configure() {
 
 		if use cuda; then
 			cuda_add_sandbox -w
-			export CUDAFLAGS="${NVCCFLAGS}"
 			if use clang; then
 				local llvm_prefix
 				llvm_prefix="$(get_llvm_prefix -b)"
 				export CC="${llvm_prefix}/bin/clang"
 				export CXX="${llvm_prefix}/bin/clang++"
+				export LIBRARY_PATH="${ESYSROOT}/usr/$(get_libdir)"
 			else
 				cuda_set_CUDAHOSTCXX
 				mycmakeargs+=(
@@ -358,6 +379,8 @@ src_configure() {
 				NVCCFLAGS+=" -v"
 			fi
 
+			export CUDAFLAGS="${NVCCFLAGS}"
+
 			[[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS"
 			: "${CUDAARCHS:=$(__nvcc_device_query)}"
 			export CUDAARCHS
diff --git a/dev-cpp/eigen/metadata.xml b/dev-cpp/eigen/metadata.xml
index 57571f41d055..6a83729afd0b 100644
--- a/dev-cpp/eigen/metadata.xml
+++ b/dev-cpp/eigen/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="cholmod">Add test support for CHOLMOD (<pkg>sci-libs/cholmod</pkg>)</flag>
 		<flag name="fftw">Add test support for fftw (<pkg>sci-libs/fftw</pkg>)</flag>
 		<flag name="klu">Add test support for KLU (<pkg>sci-libs/klu</pkg>)</flag>
+		<flag name="mathjax">Use MathJax for rendering math in HTML docs (dev-libs/mathjax)</flag>
 		<flag name="opengl">Add test support for OpenGL</flag>
 		<flag name="openmp">Add test support for the OpenMP (support parallel computing)</flag>
 		<flag name="pastix">Add test support for PaStiX (<pkg>sci-libs/pastix</pkg>)</flag>