diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/cmake/Manifest | 19 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.7-r4.ebuild | 177 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.8-r2.ebuild | 177 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch | 17 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch | 11 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.4-FindQt4.patch | 219 |
7 files changed, 15 insertions, 613 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 50c38ada136c..40b880551fb3 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.204 2012/06/17 16:35:57 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.205 2012/06/28 15:47:02 kensington Exp $ + + 28 Jun 2012; Michael Palimaka <kensington@gentoo.org> -cmake-2.8.7-r4.ebuild, + -cmake-2.8.8-r2.ebuild, -files/cmake-2.8.3-fix_assembler_test.patch, + -files/cmake-2.8.4-FindPythonInterp.patch, -files/cmake-2.8.4-FindQt4.patch: + Remove old versions and unused patches. 17 Jun 2012; Fabian Groffen <grobian@gentoo.org> cmake-2.8.8-r3.ebuild: Run bootstrap with CONFIG_SHELL or (Prefix) sh, since the script is not @@ -898,4 +903,3 @@ 08 Dec 2003; Lisa Seelye <lisa@gentoo.org> cmake-1.8.1.ebuild: Initial checkin. Submitted by Sam Yates <sam@quux.dropbear.id.au> to close bug 25334. - diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 12a01baae5a2..962608b88c21 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -7,13 +7,10 @@ AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d AUX cmake-2.8.1-libform.patch 1818 RMD160 ca954dfe966cd73836ef9e01ffe8f0eda85f2f91 SHA1 8f8e9a0002b4a95cea7dcfc36c2df16c47008bec SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 -AUX cmake-2.8.3-fix_assembler_test.patch 968 RMD160 b2469fea53858b882a6850838bb23db8428ccff4 SHA1 d76592ae0ce5ec1252e3f66642cd84c9f367f0a6 SHA256 59db2b7de7afcbfbf0cee0ef3a1561b1ff5943c7ad9a9b4e7265476f7a40ddfe AUX cmake-2.8.3-more-no_host_paths.patch 3052 RMD160 fb11585292980d19a2810a7ce5741c94aa7391a3 SHA1 3980e7b522ebe934fbf0625221cc5b42e2e19716 SHA256 55165d67bad9def6b349bf67d02ede28a2fc291d28a2a5296897e25980ce623c AUX cmake-2.8.3-ruby_libname.patch 558 RMD160 b701ba52d7e13e69f25914ab661dcf9e7c7a606e SHA1 df61342fdae8b659ecb06fde85247f2c736501da SHA256 8205e354d78827b2a4cf67fb9d88fee39696398db07d1fa4f8d33c2bbeda3748 AUX cmake-2.8.4-FindBoost.patch 635 RMD160 4a665b76e4cf10ee67d5370527867882f9a39127 SHA1 9a2491484d8818584411bf08b37cf6580027a7f4 SHA256 3c4d42b772b85e6838eaaecdb71ea345630fe519102d7c2f2234bcf8b9c63154 -AUX cmake-2.8.4-FindPythonInterp.patch 543 RMD160 e71546dafa162726bce3f46994833a0d48ce9345 SHA1 cf61a9a45e5b6aece87453ff2c240f38ee0c8e0c SHA256 816a0c324abbb98ee342901715f7b07b31c2cdbede247a22178e13e5488264fc AUX cmake-2.8.4-FindPythonLibs.patch 642 RMD160 b116a8f6d4dfd722943a88b1998bfd194a014853 SHA1 f599c1e88a5a64a215e7d27cbfd097543b42e389 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3 -AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b494 SHA1 a7f1c589b115f6e5f9abfeb589cb07095510b1f4 SHA256 0aaa6b6a8fa4fdf3aea8efeaa831a3443e60a5a453cd7b71207e57980bce5564 AUX cmake-2.8.6-CodeBlocks.patch 1171 RMD160 ca898b0b0664f74dde77bfea742463436753e6da SHA1 083c105f5af4e215d109ddf4f90c91b454c85dfc SHA256 b274e3d9c82f5f7ffb21c44234a3b42bb671b9b8ad3314b09baa329c18447458 AUX cmake-2.8.6-FindBLAS-2.patch 1119 RMD160 e7b3976c2ef7c0358e9b1b90e567e4ef1d48bc64 SHA1 cab554930d495ca7baedd125ec637c36f511bcb0 SHA256 295999abe12fd8103bfccc22606ff2c730831f495c44d52d80dfe8952815874f AUX cmake-2.8.6-FindLAPACK-2.patch 1158 RMD160 2fb17c71e08e930ed9a71f59a4316c35749159b2 SHA1 6e4b552ea1d9a6a464089935a50ed1152b2323d1 SHA256 2caacc85c393d9ad09f2c92d0595480d1e02b8db6285aa35f270858075465425 @@ -31,16 +28,18 @@ DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 DIST cmake-2.8.7.tar.gz 5667409 RMD160 13b188e75152feef4e5692807e3a9e7c34b26fe3 SHA1 d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 SHA256 130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f DIST cmake-2.8.8.tar.gz 5691656 RMD160 db60999fd4d1b3e2e28368d45035a058ed7e7639 SHA1 a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1 SHA256 2b59897864d6220ff20aa8eac64cac8994e004898a1c0f899c8cb4d7b7570b46 EBUILD cmake-2.8.6-r4.ebuild 4912 RMD160 7fe756b422a8ac4ccb9d8d79ff29513ccc51c23b SHA1 61daa882ac8098115515898f10c56c7ecdbb854f SHA256 9a4240c99fc284d50066c3c93b770f9a246bf80820e68b2413ace735e8fc602a -EBUILD cmake-2.8.7-r4.ebuild 4882 RMD160 bc30106ec2f12f2b1e666ae1ea9703bc38f99179 SHA1 33e8d40b9783f6912f3cecfe74fb82d74b982ab6 SHA256 78fc4f9582ffadcf02effbf05813d6431235df8f1f856874f6434927445ac558 EBUILD cmake-2.8.7-r5.ebuild 4886 RMD160 69040d09998dd03ef76beb4a4b720808e247ad3f SHA1 ad326b6b790fc2d6a401532cc8b53d957f16fea6 SHA256 28ad7e686225eda878c1a34c13cddaeaf582ff066848fc95e29af5b95c1aeb97 -EBUILD cmake-2.8.8-r2.ebuild 4861 RMD160 428264687960120696f4ee7c7310af125ccb4730 SHA1 353770df02ccc2b6dddf4e7af5341de913e90ae6 SHA256 cc1067cf9469080860d3bdec38fcbb9d1619488c16995e33de5049e0d9ec5d6d EBUILD cmake-2.8.8-r3.ebuild 4933 RMD160 a0ec30dff1df698e7c9337bf6884a5ba4cce191b SHA1 f2adbe006eb417c3d1f39e021c1b7ae22149539d SHA256 d83360b71b01519b0b1b40074cbe2159e242ae438c6d37dac994f6ccad7eddb8 -MISC ChangeLog 32962 RMD160 28b29e11fe8450acfc2c1e2a3010300f8cea4e51 SHA1 fef63ad959d145b80d69f762100cb447a613b8ee SHA256 2d0ec39f9641ac71a0bb6e3abaddcb953367beaacc74e788e33fe319ae56bd59 +MISC ChangeLog 33237 RMD160 0c5daaf673c32cd80ea227b2b133420c4e79fe0b SHA1 f7accd6e1d769465b6da7e9add56efa472700a0e SHA256 4e43a3119d5f4ebcf0a92a31a9aeaa4dc09fbee839db7e6411af981b7f309f47 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (Darwin) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk/eB3IACgkQX3X2B8XHTolOygCgmhOwOUM09/ECPqHl6cwe+UXI -Vi4An1eZu33muRg3ufsX3RCQKgVDa8Ay -=jNQW +iQEcBAEBAgAGBQJP7Hx8AAoJEMbwO6tnXQ0sDn4H/3eoeTum5guOfHfagtMOtyaW +ht6Tz+sMbNIetwHquGJvj3sbYl77gICzYdRfK1ejeMnq2ntwmFxLiE+pkwpxPrpg +9N9ZfcrikVcPYFnPWbFvJadNKah+nGYCx/iUYgApVDdqVKj7yazlMGaScko5ApWz ++2yrXKhlPtYEj5FW+Gtio4gNay628086ZwlJQSrvFYaRIdY99pTx7TGRa5GXcjTN +JeJN57YiasQrvs4bhC0NoC/VDTSE0BwQYFXFSYjBItDoQcBf1R96V3SO9x761KVr +wcBlM82m8ISMNkKkBNojwWYIRM2XH9Qd7gVe0fK7RFgYXdZwqUoG5mBkgSLkKBI= +=71Xp -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.8.7-r4.ebuild b/dev-util/cmake/cmake-2.8.7-r4.ebuild deleted file mode 100644 index 3d06623d84c7..000000000000 --- a/dev-util/cmake/cmake-2.8.7-r4.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r4.ebuild,v 1.2 2012/05/02 22:05:10 jdhore Exp $ - -EAPI=4 - -CMAKE_REMOVE_MODULES="no" -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx - -MY_P="${PN}-$(replace_version_separator 3 - ${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 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 vim-syntax" - -DEPEND=" - >=app-arch/libarchive-2.8.0 - >=net-misc/curl-7.20.0-r1[ssl] - >=dev-libs/expat-2.0.1 - virtual/pkgconfig - sys-libs/zlib - ncurses? ( sys-libs/ncurses ) - qt4? ( x11-libs/qt-gui:4 ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -S="${WORKDIR}/${MY_P}" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -# Fixme: -# Boost patchset is foobared and should respect eselect / slotting -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch - "${FILESDIR}"/${PN}-2.8.1-libform.patch - "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.4-FindBoost.patch - "${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch - "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch - "${FILESDIR}"/${PN}-2.8.7-FindOpenMP.patch - "${FILESDIR}"/${PN}-2.8.7-FindBLAS.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:]]+' | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - tc-export CC CXX LD - - ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir test - # this is altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die - - pushd "${CMAKE_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. - # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test - # as it was never intended to be used this way. - "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E BootstrapTest SimpleCOnly_sdcc \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - einfo "Fixing java access violations ..." - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - base_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) - $(cmake-utils_use_build qt4 QtDialog) - ) - 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 - if use vim-syntax; then - 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}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-2.8.8-r2.ebuild b/dev-util/cmake/cmake-2.8.8-r2.ebuild deleted file mode 100644 index 1213feec72c4..000000000000 --- a/dev-util/cmake/cmake-2.8.8-r2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r2.ebuild,v 1.2 2012/05/12 13:57:55 aballier Exp $ - -EAPI=4 - -CMAKE_REMOVE_MODULES="no" -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx - -MY_P="${PN}-$(replace_version_separator 3 - ${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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 vim-syntax" - -DEPEND=" - >=app-arch/libarchive-2.8.0 - >=net-misc/curl-7.20.0-r1[ssl] - >=dev-libs/expat-2.0.1 - virtual/pkgconfig - sys-libs/zlib - ncurses? ( sys-libs/ncurses ) - qt4? ( x11-libs/qt-gui:4 ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -S="${WORKDIR}/${MY_P}" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch - "${FILESDIR}"/${PN}-2.8.1-libform.patch - "${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch - "${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch - "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch - "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch - "${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.8-tests.patch - "${FILESDIR}"/${PN}-2.8.8-pkgconfig.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:]]+' | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - tc-export CC CXX LD - - ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir test - # this is altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die - - pushd "${CMAKE_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. - # SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test - # as it was never intended to be used this way. - "${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E BootstrapTest SimpleCOnly_sdcc \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - einfo "Fixing java access violations ..." - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - base_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) - $(cmake-utils_use_build qt4 QtDialog) - ) - 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 - if use vim-syntax; then - 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}/${VIMFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch b/dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch deleted file mode 100644 index 0ea02b155278..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-fix_assembler_test.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN cmake-2.8.3.orig/Tests/Assembler/CMakeLists.txt cmake-2.8.3/Tests/Assembler/CMakeLists.txt ---- cmake-2.8.3.orig/Tests/Assembler/CMakeLists.txt 2010-12-25 16:56:42.646163500 +0100 -+++ cmake-2.8.3/Tests/Assembler/CMakeLists.txt 2010-12-25 20:18:17.156163502 +0100 -@@ -11,8 +11,11 @@ - enable_language(ASM-ATT OPTIONAL) - if(CMAKE_ASM-ATT_COMPILER_WORKS) - message(STATUS "Trying to enable ASM-ATT for Linux/x86 - succeeded") -- # this assembler file was created using gcc -S main.c -- set(SRCS main-linux-x86-gas.s) -+ # generate assembler file -+ execute_process(COMMAND ${CMAKE_C_COMPILER} -S -+ "${CMAKE_CURRENT_SOURCE_DIR}/main.c" -o -+ "${CMAKE_CURRENT_BINARY_DIR}/main-linux-x86-gas.s") -+ set(SRCS ${CMAKE_CURRENT_BINARY_DIR}/main-linux-x86-gas.s) - endif(CMAKE_ASM-ATT_COMPILER_WORKS) - endif(CMAKE_SYSTEM MATCHES Linux OR CMAKE_SYSTEM MATCHES FreeBSD) - endif(NOT SRCS AND CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86$") diff --git a/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch deleted file mode 100644 index 90a34aad0e83..000000000000 --- a/dev-util/cmake/files/cmake-2.8.4-FindPythonInterp.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN cmake-2.8.4.old/Modules/FindPythonInterp.cmake cmake-2.8.4/Modules/FindPythonInterp.cmake ---- cmake-2.8.4.old/Modules/FindPythonInterp.cmake 2011-02-20 19:32:16.545655003 +0100 -+++ cmake-2.8.4/Modules/FindPythonInterp.cmake 2011-02-20 20:22:37.597936743 +0100 -@@ -26,6 +26,7 @@ - ${Python_ADDITIONAL_VERSIONS} - 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - -+set(_Python_VERSIONS "") - # Run first with the Python version in the executable - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) - set(_Python_NAMES python${_CURRENT_VERSION}) diff --git a/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch b/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch deleted file mode 100644 index 1e2b99c20f86..000000000000 --- a/dev-util/cmake/files/cmake-2.8.4-FindQt4.patch +++ /dev/null @@ -1,219 +0,0 @@ ---- cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake.org 2011-03-09 19:08:15.384000064 +0100 -+++ cmake-2.8.4/usr/share/cmake/Modules/FindQt4.cmake 2011-03-09 19:09:18.162000065 +0100 -@@ -835,7 +835,7 @@ - PATHS - ${QT_HEADERS_DIR}/${QT_MODULE} - ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - # phonon doesn't seem consistent, let's try phonondefs.h for some - # installations -@@ -844,7 +844,7 @@ - PATHS - ${QT_HEADERS_DIR}/${QT_MODULE} - ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - ENDIF(${QT_MODULE} STREQUAL "phonon") - ENDFOREACH(QT_MODULE) -@@ -854,11 +854,11 @@ - # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR - FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt - PATHS ${QT_HEADERS_DIR}/ActiveQt -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt - PATHS ${QT_HEADERS_DIR}/ActiveQt -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - ENDIF(Q_WS_WIN) - -@@ -867,7 +867,7 @@ - PATHS - ${QT_HEADERS_DIR}/QtDesigner - ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - # Set QT_QTASSISTANT_INCLUDE_DIR -@@ -875,7 +875,7 @@ - PATHS - ${QT_HEADERS_DIR}/QtAssistant - ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR -@@ -883,7 +883,7 @@ - PATHS - ${QT_HEADERS_DIR}/QtAssistant - ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - ######################################## -@@ -897,11 +897,11 @@ - STRING(TOUPPER ${QT_MODULE} _upper_qt_module) - FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE - NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4 -- PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH -+ PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG - NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4 -- PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH -+ PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - ENDFOREACH(QT_MODULE) - -@@ -911,26 +911,26 @@ - ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) - - # Set QT_QTDESIGNERCOMPONENTS_LIBRARY -- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+ FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -+ FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents${QT_LIBINFIX}_debug QtDesignerComponents${QT_LIBINFIX}d QtDesignerComponents${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - - # Set QT_QTMAIN_LIBRARY - IF(Q_WS_WIN) -- FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+ FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -+ FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - ENDIF(Q_WS_WIN) - - # Set QT_QTASSISTANTCLIENT_LIBRARY -- FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+ FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -+ FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - - # Set QT_QTASSISTANT_LIBRARY -- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - - # Set QT_QTHELP_LIBRARY -- FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -+ FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} QtCLucene${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -+ FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene${QT_LIBINFIX}_debug QtCLucene${QT_LIBINFIX}d QtCLucene${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE) - FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene${QT_LIBINFIX} PATHS ${QT_LIBRARY_DIR}) - ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE) -@@ -993,67 +993,67 @@ - FIND_PROGRAM(QT_MOC_EXECUTABLE - NAMES moc-qt4 moc - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_UIC_EXECUTABLE - NAMES uic-qt4 uic - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_UIC3_EXECUTABLE - NAMES uic3 - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_RCC_EXECUTABLE - NAMES rcc - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE - NAMES qdbuscpp2xml - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE - NAMES qdbusxml2cpp - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_LUPDATE_EXECUTABLE - NAMES lupdate-qt4 lupdate - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_LRELEASE_EXECUTABLE - NAMES lrelease-qt4 lrelease - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE - NAMES qcollectiongenerator-qt4 qcollectiongenerator - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_DESIGNER_EXECUTABLE - NAMES designer-qt4 designer - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - FIND_PROGRAM(QT_LINGUIST_EXECUTABLE - NAMES linguist-qt4 linguist - PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - - IF (QT_MOC_EXECUTABLE) -@@ -1158,11 +1158,11 @@ - IF(QT_IS_STATIC) - FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_RELEASE - NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4 -- PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH -+ PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - FIND_LIBRARY(QT_${_upper_qt_plugin}_LIBRARY_DEBUG - NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4 -- PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH -+ PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - _QT4_ADJUST_LIB_VARS(${QT_PLUGIN}) - ELSE(QT_IS_STATIC) -@@ -1171,11 +1171,11 @@ - SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_MODULE_SUFFIX} ${CMAKE_SHARED_LIBRARY_SUFFIX}) - FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_RELEASE - NAMES ${QT_PLUGIN}${QT_LIBINFIX} ${QT_PLUGIN}${QT_LIBINFIX}4 -- PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH -+ PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - FIND_LIBRARY(QT_${_upper_qt_plugin}_PLUGIN_DEBUG - NAMES ${QT_PLUGIN}${QT_LIBINFIX}_debug ${QT_PLUGIN}${QT_LIBINFIX}d ${QT_PLUGIN}${QT_LIBINFIX}d4 -- PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH -+ PATHS ${QT_${_upper_qt_plugin_type}_PLUGINS_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH - ) - MARK_AS_ADVANCED(QT_${_upper_qt_plugin}_PLUGIN_RELEASE QT_${_upper_qt_plugin}_PLUGIN_DEBUG) - SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT}) |