8c8
< inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
---
> inherit toolchain-funcs cmake-utils python-r1 java-pkg-opt-2 java-ant-2
101d100
< 	use python && python-single-r1_pkg_setup
235,251d233
< 	if use python; then
< 		# Set all python variables to load the correct Gentoo paths
< 		mycmakeargs+=(
< 			-DWITH_PYTHON=ON
< 			-DGENTOO_PYTHON_EXECUTABLE=${EPYTHON}
< 			-DGENTOO_PYTHON_INCLUDE_PATH="$(python_get_includedir)"
< 			-DGENTOO_PYTHON_LIBRARIES="$(python_get_library_path)"
< 			-DGENTOO_PYTHON_PACKAGES_PATH="$(python_get_sitedir)"
< 			-DGENTOO_PYTHON_MAJOR=${EPYTHON:6:1}
< 			-DGENTOO_PYTHON_MINOR=${EPYTHON:8:1}
< 			-DGENTOO_PYTHON_DEBUG_LIBRARIES="" # Absolutely no clue what this is
< 		)
< 		use examples && mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
< 	else
< 		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
< 	fi
< 
267c249,279
< 	cmake-utils_src_configure
---
> 	if use python; then
> 		mycmakeargs+=( -DWITH_PYTHON=ON )
> 		use examples && mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
> 		premakeargs=${mycmakeargs}
> 		pyconfigure() {
> 			mycmakeargs=${premakeargs}
> 			mycmakeargs+=(
>         		-DGENTOO_PYTHON_EXECUTABLE=${EPYTHON}
>            		-DGENTOO_PYTHON_INCLUDE_PATH="$(python_get_includedir)"
>            		-DGENTOO_PYTHON_LIBRARIES="$(python_get_library_path)"
>             	-DGENTOO_PYTHON_PACKAGES_PATH="$(python_get_sitedir)"
>             	-DGENTOO_PYTHON_MAJOR=${EPYTHON:6:1}
>             	-DGENTOO_PYTHON_MINOR=${EPYTHON:8:1}
>             	-DGENTOO_PYTHON_DEBUG_LIBRARIES="" # Absolutely no clue what this is
>         	)
> 			cmake-utils_src_configure
> 		}
> 		python_foreach_impl run_in_build_dir pyconfigure
> 	else
> 		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
> 		cmake-utils_src_configure
> 	fi
> 	
> }
> 
> src_compile() {
> 	if use python; then
> 		python_foreach_impl run_in_build_dir cmake-utils_src_compile
> 	else
> 		cmake-utils_src_compile
> 	fi
268a281,289
> 
> src_install() {
> 	if use python; then
>         python_foreach_impl run_in_build_dir cmake-utils_src_install
> 	else
> 		cmake-utils_src_install
> 	fi
> }
>