Revision bump adds patch to find the correct version libboost_python outside of portage by Christoph Junghans <ottxor@gentoo.org>, bug #500442.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 285 insertions, 1 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index b05a0a62c712..dc7b7aa43903 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.276 2014/04/01 18:58:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.277 2014/05/06 12:21:42 johu Exp $
+
+*cmake-2.8.12.2-r1 (06 May 2014)
+
+  06 May 2014; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.2-r1.ebuild,
+  +files/cmake-2.8.12.2-FindBoost-python.patch:
+  Revision bump adds patch to find the correct version libboost_python outside
+  of portage by Christoph Junghans <ottxor@gentoo.org>, bug #500442.
 
   01 Apr 2014; Markus Meier <maekke@gentoo.org> cmake-2.8.12.2.ebuild:
   arm stable, bug #504794
diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
new file mode 100644
index 000000000000..cd4a0a4baf1b
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2-r1.ebuild,v 1.1 2014/05/06 12:21:42 johu Exp $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/"
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+DEPEND="
+	>=app-arch/libarchive-2.8.0:=
+	>=dev-libs/expat-2.0.1
+	>=net-misc/curl-7.20.0-r1[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	ncurses? ( sys-libs/ncurses )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
+	"${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	# make things work with gentoo java setup
+	# in case java-config cannot be run, the variable just becomes unset
+	# per bug #315229
+	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		$(cmake-utils_use_build ncurses CursesDialog)
+	)
+
+	if use qt4 || use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Docs/cmake-syntax.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Docs/cmake-indent.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
+	rm -rf "${D}/usr/share/cmake/completions" || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
new file mode 100644
index 000000000000..4a5474abc027
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch
@@ -0,0 +1,77 @@
+--- Modules/FindBoost.cmake
++++ Modules/FindBoost.cmake
+@@ -905,6 +905,15 @@
+ 
+   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
++  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++    # Get version of Python.
++    if (NOT PYTHON_EXECUTABLE)
++      #if a certain version of python was detected by cmake before use that one
++        set(PYTHON_EXECUTABLE "python")
++      endif (NOT PYTHON_EXECUTABLE)
++    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
++  endif()
++
+ 
+   #
+   # Find RELEASE libraries
+@@ -915,6 +924,14 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_RELEASE_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
+     list(APPEND _boost_RELEASE_NAMES
+@@ -922,6 +939,13 @@
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_RELEASE_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
+@@ -951,6 +975,15 @@
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
+     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
++    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++      list(APPEND _boost_DEBUG_NAMES
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
++        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
++    endif()
+   if(_boost_STATIC_RUNTIME_WORKAROUND)
+     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
+     list(APPEND _boost_DEBUG_NAMES
+@@ -958,6 +991,13 @@
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
+       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++        list(APPEND _boost_DEBUG_NAMES
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
++          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
++      endif()
+   endif()
+   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
+      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})