diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-08 11:33:39 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-08 11:33:39 +0000 |
commit | 376f54c88f146b4a07a651e1fdde175980180515 (patch) | |
tree | b7bd053d3e705a3f2bd0ef02d2df0adda8a3470a /dev-util | |
parent | Revision bump to fix pkgconfig file as noted by Alexis Ballier in bug #235013. (diff) | |
download | historical-376f54c88f146b4a07a651e1fdde175980180515.tar.gz historical-376f54c88f146b4a07a651e1fdde175980180515.tar.bz2 historical-376f54c88f146b4a07a651e1fdde175980180515.zip |
Drop older stuff. Keep just latest stable.
Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/cmake/ChangeLog | 14 | ||||
-rw-r--r-- | dev-util/cmake/Manifest | 25 | ||||
-rw-r--r-- | dev-util/cmake/cmake-2.8.1-r2.ebuild | 164 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.6.0-interix.patch | 48 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.6.4-FindBoost.patch | 22 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch | 74 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-FindBoost.patch | 14 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch | 108 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.1-mpi.patch | 20 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch | 12 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch | 11 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch | 13 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch | 12 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-FindJNI.patch | 71 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-FindPythonInterp.patch | 11 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 13 |
16 files changed, 18 insertions, 614 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 95cac10f347e..f2d517a4c9de 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.167 2011/05/07 16:52:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.168 2011/05/08 11:33:38 scarabeus Exp $ + + 08 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/cmake-2.6.0-interix.patch, -files/cmake-2.6.4-FindBoost.patch, + -files/cmake-2.8.0-darwin-no-app-with-qt.patch, -cmake-2.8.1-r2.ebuild, + -files/cmake-2.8.1-FindBoost.patch, + -files/cmake-2.8.1-more-no_host_paths.patch, -files/cmake-2.8.1-mpi.patch, + -files/cmake-2.8.3-FindLibArchive.patch, + -files/cmake-2.8.3-FindPythonInterp.patch, + -files/cmake-2.8.3-FindPythonLibs.patch, + -files/cmake-2.8.3-buffer_overflow.patch, -files/cmake-FindJNI.patch, + -files/cmake-FindPythonInterp.patch, -files/cmake-FindPythonLibs.patch: + Drop older stuff. Keep just latest stable. 07 May 2011; Raúl Porcel <armin76@gentoo.org> cmake-2.8.4-r1.ebuild: ia64/s390/sh/sparc stable wrt #357771 diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index f686a2c260e1..34d37dee58e8 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -2,21 +2,11 @@ Hash: SHA1 AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 -AUX cmake-2.6.0-interix.patch 1657 RMD160 fe2e9675da5b66c041d8ae5f1c667cf605494674 SHA1 d21fa5346a939411d579ab308005f7867f012975 SHA256 944401813cd66fdefc68935778fc3fe2328f17a2f00d559dac8add63bb37faf7 AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877049c5e7 SHA1 595740c64fd64e93763d7b1f59d341f9f8117482 SHA256 5429d3d7ba0d2bf2528b4cbf2bd36d3c83a051c064faa9c308d9adfeee334bca AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 RMD160 38094f9f8516656cc30d6ead147bc1e2ae41f429 SHA1 5458b92849292d9e8ca3003654a94e339cb4a48c SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371a0b2e11d252b96c9 SHA1 6f88171a816c1157ddcf3c3d5c3e3ec080471883 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 -AUX cmake-2.6.4-FindBoost.patch 1094 RMD160 58cbed09bcb5fadf166cf64481f9605b5882f6a2 SHA1 5a3a91737b436e9de50c955bdb3e32b8fa7bed30 SHA256 a3f266086335b96af8e0dd848a05a10373762de9b9d6cc3b8af4b27fb43d362c AUX cmake-2.8.0-darwin-default-install_name.patch 911 RMD160 6261482ff3f989ce455ea87cd5c540385420149b SHA1 6c473a538204826210f62fabdfafb2f5f19087bb SHA256 98b93389ad9a39c819b90f8694a9fb208da6bad15dbe1ca72e62783803ff5b6d -AUX cmake-2.8.0-darwin-no-app-with-qt.patch 2983 RMD160 088b54f0c1fd7d43867c0479deee0caada3a5fcd SHA1 1737e954c7bbb55f007226c48feac596ac290c45 SHA256 f678cb03ee646a231eedda894e8965bf7bc83b693b249e1ecd4590e933323224 -AUX cmake-2.8.1-FindBoost.patch 714 RMD160 8f7d2be9cc63289a3e4f79b43f4b8baa6d980810 SHA1 37925b584dc471148f756bd41158740704dbec37 SHA256 f110d2387c362c518480d804bf1ce9f4881af67755cafd41bb639b09a8afca88 AUX cmake-2.8.1-libform.patch 1818 RMD160 ca954dfe966cd73836ef9e01ffe8f0eda85f2f91 SHA1 8f8e9a0002b4a95cea7dcfc36c2df16c47008bec SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 -AUX cmake-2.8.1-more-no_host_paths.patch 2981 RMD160 fea9f1d96d8c29f55e424389fb4f2471dfe514d8 SHA1 90fdc2ad69aeb54530d1faf4867e40c233caf084 SHA256 0c3fbe76684851ee444be92a99f91e5a5e8dfef02d7426722e10025aeca03412 -AUX cmake-2.8.1-mpi.patch 857 RMD160 d41e4dd445b1a79d0a82619a8ad7371e80d937a8 SHA1 0192124d023953d35cb5fb0da148c914525099e6 SHA256 64092fbf637bfe625cf58abe93844aab2e75ba22a00e5ffdb05188961b7f51d7 -AUX cmake-2.8.3-FindLibArchive.patch 651 RMD160 ccff38785a20e66b3fbd7ea95c46b05052d7e4de SHA1 8c3ba96c7f4bd901a9089e7af315f22c78eb1d6c SHA256 521bc573c94f4a62c949caf0690902f1290d35969f68870967aa699caff60364 -AUX cmake-2.8.3-FindPythonInterp.patch 550 RMD160 c02295ce79f97cd6be16f90e3c89ad6deed09b4a SHA1 f8a67cd872b90a6dd77626bfd766f788b0775655 SHA256 96ebc2ae19a4d366ef4ed57db44ebd3baa6fb652d8bf5ea6867f64f972d7134e -AUX cmake-2.8.3-FindPythonLibs.patch 550 RMD160 b060930247da3d716fa9592d2d68ddec7d9c488f SHA1 4040bc3749b5f0e12ed07eb765d8863988352814 SHA256 fa6dcfad7c110c5ac264606aa7716c1d6078242802ee9fafc34e9a725cefd755 -AUX cmake-2.8.3-buffer_overflow.patch 525 RMD160 ba871f7c1892e7efaef69dd6b8e2012009f6b4fa SHA1 687019517947113c6d4933e911516d115df9e6d9 SHA256 a55fa858bea5ce6f696b6eb0385c8028e6c4e329f4c44d66d6008da56ca684a2 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 @@ -24,20 +14,15 @@ AUX cmake-2.8.4-FindBoost.patch 635 RMD160 4a665b76e4cf10ee67d5370527867882f9a39 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-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb -AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0 -AUX cmake-FindPythonLibs.patch 546 RMD160 429021001f1b464d8321703052890a34141a34ec SHA1 e5d62feab16058f123e1399e0504a50f50ee5a88 SHA256 86a5e78ff4e62cf8987401255197f7ba4ae70d00c257df3048372c5dcc035bdd AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 -DIST cmake-2.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc -EBUILD cmake-2.8.1-r2.ebuild 4383 RMD160 4bddb8e75bc3bfdace40bffc937d57b5e1fcdcd1 SHA1 43d5a4e45080899eb4dee38018097fa7add682a6 SHA256 acde4f84795ce01035c7cff3a3bbc739ab52eb568c5b252fd6d3dda912d53fc1 EBUILD cmake-2.8.4-r1.ebuild 4482 RMD160 b6f72007be31ac46f161a62f5f441accf570867d SHA1 696b930343d5b7bc86a7fb99d246b84dc4ab071c SHA256 a36a4e018e644811e6c70f4cefaaa0ad1976533be3aa4e780050a16e00a63177 -MISC ChangeLog 25814 RMD160 fc910f239f7d649547b5faa02a3a91d486b00e93 SHA1 e11646228019596422c1a3d4a15dd3710a9412c8 SHA256 18f188eb860a272304578170dd14ada4f818b5a5901a43bdad5d736c6451488f +MISC ChangeLog 26455 RMD160 e666c82a0456327662480d10c04d9e6e73ae4d01 SHA1 2ad98d4c1dc40f448b6c12b2f7ea48e3a0294c93 SHA256 f9c2a48a60632adcfa125705c691eaf735e2eb52a99ff19eabb6c8ce7ceba52a MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3FeNgACgkQuQc30/atMkC02ACgrqFf3pOYD7xhv3jg2gi9U24J -nKAAn3t9B6teS+f1xKaUdw7p9HCzHmVC -=m/Ej +iEYEARECAAYFAk3Gf40ACgkQHB6c3gNBRYdIUgCgh2LWoLYVMtYeyqr/LFeGFn0a +Z4gAn13nPfL4y8zdAABY0C1A+ByMfcQr +=HgK6 -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.8.1-r2.ebuild b/dev-util/cmake/cmake-2.8.1-r2.ebuild deleted file mode 100644 index 419cacb47b59..000000000000 --- a/dev-util/cmake/cmake-2.8.1-r2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.1-r2.ebuild,v 1.11 2010/12/16 12:36:21 scarabeus Exp $ - -EAPI="3" - -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils - -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=" - >=net-misc/curl-7.20.0-r1[ssl] - >=dev-libs/expat-2.0.1 - 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_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-FindPythonLibs.patch - "${FILESDIR}"/${PN}-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.6.0-interix.patch - "${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.0-darwin-no-app-with-qt.patch - "${FILESDIR}"/${PN}-2.8.1-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.1-FindBoost.patch - "${FILESDIR}"/${PN}-2.8.1-libform.patch - "${FILESDIR}"/${PN}-2.8.1-mpi.patch -) - -src_prepare() { - base_src_prepare - - # 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" -} - -src_configure() { - if [[ "$(gcc-major-version)" -eq "3" ]] ; then - append-flags "-fno-stack-protector" - fi - - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - - bootstrap=0 - has_version ">=dev-util/cmake-2.6.1" || bootstrap=1 - if [[ ${bootstrap} = 0 ]]; then - # Required version of CMake found, now test if it works - cmake --version &> /dev/null || bootstrap=1 - fi - - use test && bootstrap=1 #315223 - - if [[ ${bootstrap} = 1 ]]; then - local qt_arg par_arg - tc-export CC CXX LD - - if use qt4; then - qt_arg="--qt-gui" - else - qt_arg="--no-qt-gui" - fi - - 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 - - ./bootstrap \ - --system-libs \ - --prefix="${EPREFIX}"/usr \ - --docdir=/share/doc/${PF} \ - --datadir=/share/${PN} \ - --mandir=/share/man \ - "$qt_arg" \ - "$par_arg" || die "./bootstrap failed" - else - # this is way much faster so we should prefer it if some cmake is - # around. - 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 - fi -} - -src_compile() { - cmake-utils_src_compile - if use emacs; then - elisp-compile Docs/cmake-mode.el || die "elisp compile failed" - fi -} - -src_test() { - emake test || die "Tests failed" -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed" - 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.6.0-interix.patch b/dev-util/cmake/files/cmake-2.6.0-interix.patch deleted file mode 100644 index 0f0f1db0a90e..000000000000 --- a/dev-util/cmake/files/cmake-2.6.0-interix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ruN cmake-2.6.0.orig/Modules/Platform/Interix.cmake cmake-2.6.0/Modules/Platform/Interix.cmake ---- cmake-2.6.0.orig/Modules/Platform/Interix.cmake 1970-01-01 01:00:00 +0100 -+++ cmake-2.6.0/Modules/Platform/Interix.cmake 2008-06-02 14:22:45 +0200 -@@ -0,0 +1,31 @@ -+# This is a proposed Platform definition for Interix GCC/G++ -+ -+SET(CMAKE_DL_LIBS "dl") -+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") -+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h,") -+ -+SET(UNIX 1) -+ -+# also add the install directory of the running cmake to the search directories -+# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up -+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) -+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) -+ -+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ "${_CMAKE_INSTALL_DIR}" -+ "${CMAKE_INSTALL_PREFIX}" -+ ) -+ -+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH -+ "${CMAKE_INSTALL_PREFIX}"/include -+ ) -+ -+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH -+ "${CMAKE_INSTALL_PREFIX}"/lib -+ ) -+ -diff -ruN cmake-2.6.0.orig/Utilities/cmtar/encode.c cmake-2.6.0/Utilities/cmtar/encode.c ---- cmake-2.6.0.orig/Utilities/cmtar/encode.c 2008-06-02 13:00:44 +0200 -+++ cmake-2.6.0/Utilities/cmtar/encode.c 2008-06-02 14:02:39 +0200 -@@ -24,6 +24,9 @@ - # include <stdlib.h> - #endif - -+#ifdef HAVE_SYS_MKDEV_H -+# include <sys/mkdev.h> -+#endif - - /* magic, version, and checksum */ - void diff --git a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch b/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch deleted file mode 100644 index a251d4fd1c1a..000000000000 --- a/dev-util/cmake/files/cmake-2.6.4-FindBoost.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -57,7 +57,8 @@ - # - # Currently this module searches for the following version numbers: - # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, --# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0 -+# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0, -+# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0 - # - # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should - # add both 1.x and 1.x.0 as shown above. Official Boost include directories -@@ -271,7 +272,8 @@ - # The user has not requested an exact version. Among known - # versions, find those that are acceptable to the user request. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.38.0" "1.38" "1.37.0" "1.37" -+ "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42" "1.41.0" "1.41" -+ "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" - "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0" - "1.34" "1.33.1" "1.33.0" "1.33") - set(_boost_TEST_VERSIONS) diff --git a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch deleted file mode 100644 index 8149917d0a49..000000000000 --- a/dev-util/cmake/files/cmake-2.8.0-darwin-no-app-with-qt.patch +++ /dev/null @@ -1,74 +0,0 @@ -Description: Don't build the GUI's app-bundle. -Author: Heiko Przybyl <zuxez@cs.tu-berlin.de> ---- cmake-2.8.0/CMakeLists.txt.orig 2010-02-10 19:38:03 +0100 -+++ cmake-2.8.0/CMakeLists.txt 2010-02-10 19:38:49 +0100 -@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog) - ENDIF(BUILD_CursesDialog) - - IF(BUILD_QtDialog) -- IF(APPLE) -+ IF(FALSE) - SET(CMAKE_BUNDLE_NAME - "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}") - SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") -@@ -394,7 +394,7 @@ IF(BUILD_QtDialog) - ENDIF(NOT "${ENDCH}" STREQUAL "/") - SET(CMAKE_INSTALL_PREFIX - "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents") -- ENDIF(APPLE) -+ ENDIF(FALSE) - - SET(QT_NEED_RPATH FALSE) - IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64") ---- cmake-2.8.0/Source/QtDialog/CMakeLists.txt.orig 2010-02-10 19:39:59 +0100 -+++ cmake-2.8.0/Source/QtDialog/CMakeLists.txt 2010-02-10 19:42:12 +0100 -@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND) - IF(Q_WS_WIN) - SET(SRCS ${SRCS} CMakeSetup.rc) - ENDIF(Q_WS_WIN) -- IF(Q_WS_MAC) -+ IF(FALSE) - SET(SRCS ${SRCS} CMakeSetup.icns) - SET(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) - SET_SOURCE_FILES_PROPERTIES(CMakeSetup.icns PROPERTIES - MACOSX_PACKAGE_LOCATION Resources) -- ENDIF(Q_WS_MAC) -+ ENDIF(FALSE) - - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - -- ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) -+ ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS}) - TARGET_LINK_LIBRARIES(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}) - IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) -- IF(APPLE) -+ IF(FALSE) - SET_TARGET_PROPERTIES(cmake-gui PROPERTIES - OUTPUT_NAME ${CMAKE_BUNDLE_NAME}) -- ENDIF(APPLE) -+ ENDIF(FALSE) - SET(CMAKE_INSTALL_DESTINATION_ARGS - BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}") - ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) -@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND) - INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages ) - ENDIF(UNIX) - -- IF(APPLE) -+ IF(FALSE) - SET(CMAKE_POSTFLIGHT_SCRIPT - "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") - SET(CMAKE_POSTUPGRADE_SCRIPT -@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND) - INSTALL(CODE "set(input_file - \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")") - INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake") -- ENDIF(APPLE) -+ ENDIF(FALSE) - CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in" - "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY) - ENDIF(NOT QT4_FOUND)
\ No newline at end of file diff --git a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch b/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch deleted file mode 100644 index 56fb152d663a..000000000000 --- a/dev-util/cmake/files/cmake-2.8.1-FindBoost.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r cmake-2.8.1.orig/Modules/FindBoost.cmake cmake-2.8.1/Modules/FindBoost.cmake ---- cmake-2.8.1.orig/Modules/FindBoost.cmake 2010-03-16 21:29:29.000000000 +0100 -+++ cmake-2.8.1/Modules/FindBoost.cmake 2010-04-04 19:52:50.000000000 +0200 -@@ -70,7 +70,9 @@ - # omit the 3rd version number from include paths if it is 0 although not all - # binary Boost releases do so. - # --# SET(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0") -+SET(Boost_ADDITIONAL_VERSIONS "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" -+ "1.47.0" "1.47" "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" -+ "1.43" "1.42.0" "1.42") - # - # ===================================== ============= ======================== - # diff --git a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch deleted file mode 100644 index 0558b34e6efd..000000000000 --- a/dev-util/cmake/files/cmake-2.8.1-more-no_host_paths.patch +++ /dev/null @@ -1,108 +0,0 @@ -Set some proper paths to make cmake find our tools. -Original patch by Heiko Przybyl - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - ---- cmake-2.8.0/Modules/Platform/Darwin.cmake -+++ cmake-2.8.0/Modules/Platform/Darwin.cmake -@@ -213,19 +213,23 @@ - - - --# default to searching for frameworks first --SET(CMAKE_FIND_FRAMEWORK FIRST) -+# default to searching for frameworks last -+SET(CMAKE_FIND_FRAMEWORK LAST) - # set up the default search directories for frameworks - SET(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - /Library/Frameworks - /Network/Library/Frameworks - /System/Library/Frameworks) - --# default to searching for application bundles first --SET(CMAKE_FIND_APPBUNDLE FIRST) -+# default to searching for application bundles last -+SET(CMAKE_FIND_APPBUNDLE LAST) - # set up the default search directories for application bundles - SET(CMAKE_SYSTEM_APPBUNDLE_PATH -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - ~/Applications - /Applications - /Developer/Applications) ---- cmake-2.8.0/Modules/Platform/UnixPaths.cmake -+++ cmake-2.8.0/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ - # search types. - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -44,43 +45,39 @@ - - # List common include file locations not under the common prefixes. - LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /opt/local/include /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /opt/local/lib /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - /lib /usr/lib /usr/lib32 /usr/lib64 - ) - - LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - diff --git a/dev-util/cmake/files/cmake-2.8.1-mpi.patch b/dev-util/cmake/files/cmake-2.8.1-mpi.patch deleted file mode 100644 index 67f1001464dc..000000000000 --- a/dev-util/cmake/files/cmake-2.8.1-mpi.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake -index 481b0e9..43e97e8 100644 ---- a/Modules/FindMPI.cmake -+++ b/Modules/FindMPI.cmake -@@ -263,13 +263,13 @@ elseif (MPI_COMPILE_CMDLINE) - - # Extract the set of libraries to link against from the link command - # line -- string(REGEX MATCHALL "-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") -+ string(REGEX MATCHALL " -l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") - - # Determine full path names for all of the libraries that one needs - # to link against in an MPI program - set(MPI_LIBRARIES) - foreach(LIB ${MPI_LIBNAMES}) -- string(REGEX REPLACE "^-l" "" LIB ${LIB}) -+ string(REGEX REPLACE "^ -l" "" LIB ${LIB}) - set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) - find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH}) - if (MPI_LIB) diff --git a/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch b/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch deleted file mode 100644 index ede3400f012e..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-FindLibArchive.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN cmake-2.8.3.orig/Modules/FindLibArchive.cmake cmake-2.8.3/Modules/FindLibArchive.cmake ---- cmake-2.8.3.orig/Modules/FindLibArchive.cmake 2010-11-04 02:58:27.000000000 +0700 -+++ cmake-2.8.3/Modules/FindLibArchive.cmake 2010-11-05 17:40:53.712001939 +0700 -@@ -50,7 +50,7 @@ - - # Handle the QUIETLY and REQUIRED arguments and set LIBARCHIVE_FOUND - # to TRUE if all listed variables are TRUE. --include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") -+include("${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake") - find_package_handle_standard_args(LibArchive DEFAULT_MSG - LibArchive_LIBRARY LibArchive_INCLUDE_DIR - ) diff --git a/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch deleted file mode 100644 index 386457b91427..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-FindPythonInterp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -20,7 +20,7 @@ - # License text for the above reference.) - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python -+ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] diff --git a/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch deleted file mode 100644 index c4e5adc16486..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-FindPythonLibs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Modules/FindPythonLibs.cmake -+++ Modules/FindPythonLibs.cmake -@@ -27,7 +27,9 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _PYTHON_VERSION) -+FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION}) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY diff --git a/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch b/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch deleted file mode 100644 index 6bc5a6641a09..000000000000 --- a/dev-util/cmake/files/cmake-2.8.3-buffer_overflow.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx cmake-2.8.3//Source/kwsys/SystemInformation.cxx ---- cmake-2.8.3.orig//Source/kwsys/SystemInformation.cxx 2010-12-25 16:56:42.609163498 +0100 -+++ cmake-2.8.3//Source/kwsys/SystemInformation.cxx 2010-12-25 17:25:18.002163499 +0100 -@@ -152,7 +152,7 @@ - - public: - #define VENDOR_STRING_LENGTH (12 + 1) --#define CHIPNAME_STRING_LENGTH (48 + 1) -+#define CHIPNAME_STRING_LENGTH (68 + 1) - #define SERIALNUMBER_STRING_LENGTH (29 + 1) - - typedef struct tagID diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch deleted file mode 100644 index af723c52919f..000000000000 --- a/dev-util/cmake/files/cmake-FindJNI.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake ---- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100 -+++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100 -@@ -2,7 +2,7 @@ - # This module finds if Java is installed and determines where the - # include files and libraries are. It also determines what the name of - # the library is. This code sets the following variables: --# -+# - # JNI_INCLUDE_DIRS = the include dirs to use - # JNI_LIBRARIES = the libraries to use - # JAVA_AWT_LIBRARY = the path to the jawt library -@@ -51,6 +51,8 @@ - "${dir}" - "${dir}/client" - "${dir}/server" -+ "${dir}/j9vm" -+ "${dir}/classic" - ) - ENDFOREACH(dir) - -@@ -60,7 +62,7 @@ - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" - $ENV{JAVA_HOME}/include -- /usr/include -+ /usr/include - /usr/local/include - /usr/lib/java/include - /usr/local/lib/java/include -@@ -126,7 +128,7 @@ - ) - ENDIF(JAVA_HAVE_FRAMEWORK) - ELSE(APPLE) -- FIND_LIBRARY(JAVA_AWT_LIBRARY jawt -+ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt - PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES} - ) - FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM -@@ -134,18 +136,23 @@ - ) - ENDIF(APPLE) - --# add in the include path --FIND_PATH(JAVA_INCLUDE_PATH jni.h -+# add in the include path -+FIND_PATH(JAVA_INCLUDE_PATH jni.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ) - --FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h -+FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH}/win32 - ${JAVA_INCLUDE_PATH}/linux - ${JAVA_INCLUDE_PATH}/freebsd - ) - -+FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h -+ ${JAVA_AWT_INCLUDE_DIRECTORIES} -+ ${JAVA_INCLUDE_PATH} -+) -+ - FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h - ${JAVA_AWT_INCLUDE_DIRECTORIES} - ${JAVA_INCLUDE_PATH} -@@ -169,4 +176,3 @@ - ${JAVA_INCLUDE_PATH2} - ${JAVA_AWT_INCLUDE_PATH} - ) -- diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch deleted file mode 100644 index 2e4c47d6806f..000000000000 --- a/dev-util/cmake/files/cmake-FindPythonInterp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -7,7 +7,7 @@ - # - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python -+ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch deleted file mode 100644 index d7f4f627be4c..000000000000 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Modules/FindPythonLibs.cmake -+++ Modules/FindPythonLibs.cmake -@@ -14,7 +14,9 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _PYTHON_VERSION) -+FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION}) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |