diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for dev-util/cmake -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.144 2010/09/11 15:13:49 armin76 Exp $ + 11 Jan 2011; Nathan Brink -cmake-2.6.4-r3.ebuild: + Drop cmake-2.6.4-r3 as official portage tree dropped cmake-2.6. + 18 Oct 2010; Nathan Phillip Brink (binki) -cmake-2.8.1-r2.ebuild, +cmake-2.8.1-r3.ebuild, files/cmake-2.8.1-portage-multilib-lib32.patch: diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - 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 @@ -18,26 +15,7 @@ AUX cmake-FindJNI.patch 2020 RMD160 4fcb 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.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a SHA1 c7e295683e061c2ed19773a1f0444972f75db092 SHA256 9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2 DIST cmake-2.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022 -EBUILD cmake-2.6.4-r3.ebuild 3476 RMD160 e20f6f85b5291ced7e3ee53ff933a0da704b8f14 SHA1 72bb72aeea2261d1c5c5642018234803c35c32c5 SHA256 1c4a2f60dffb72d1134932b580e46d07a7784420a0c786f204d4b71dbfd928f0 EBUILD cmake-2.8.1-r3.ebuild 4348 RMD160 8e61214bfc873906474474ea4e4b32c57b835a79 SHA1 66bf8f5962fb7237972b8aaf3f4963588fbc0294 SHA256 bb36cee8c233507bf17e2f094946ceaf530bc51244570d86b04351fac9398999 -MISC ChangeLog 23347 RMD160 b9444960b93b29c65ef809fdf4eaa37a90565463 SHA1 6ba56d936c5784e79e7b9113599d4df68f38464f SHA256 31f84e5d49d388bae0983d936670ecf0d0945eb04719495cb7de1058bc6a5734 +MISC ChangeLog 23489 RMD160 d1b7a30ad5db935501c7d08f9289422bcb038775 SHA1 e08473e87523c5c1bc9daddc81c47e8846c9f7f4 SHA256 fa7463c64d928bd53345e4154f56011129b24793c761b44e9ce3c20c24cd3199 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAEBCAAGBQJMu7BaAAoJEHQ6UuhrqBBQtMgQAK60ldxTqn/n7jlAnODuv2lb -m5w8AkrcB2P/tSfQ66dy5lzZj2i3HAP3nFFgBpeiKmXr+k4LDWKRIAuTi6gCyR3t -s7nTcx9tWL/YBKAsrfio7A9HnrIqspsFgwsEa1eVCu3pIta+U+j0tz/FvUf5JOOy -7zab5xp7kNjjcvgJ/ZXSudL8RYEKjSsdqfqM7s6D3Y21VRg7wSa8mI/ftTD/hclw -FDVjvf+TJ31RtPgqTypTGXUzT/LUwXiKyQBi9Dy2D2vkQxZl9Eu5PNSgfGfm0w0l -Rs2Q7vj/GQfLhhLDTEQELKsmhWfOBWovDshcn/TC73YTTBGs2353ZENelpA4M15+ -QZYJfY9s4PRflgWnzdKBhx2U38sGNIgFzcidCzHWN/6HYIN98RDcOrOsxiC674mn -Mzz6PnVApUjwAKaieM1/bU8QsTNCK0evFBu81GOP1F+cw/sgDco+WaTK2f9rtzk/ -dSw0NgH9/ckcDJKvPri/DI9ZchaA7+IVR+GsyksdNiLKZuA8KoayQCAXr1VcCjS7 -j7/5wS0Ni2TQVXu6rNSE09+R1RJBC68n+48aK/jTgIEbklDB3mTw0cDXxeId4cOy -fMIzvPe+5JzLuCa1Gi27u142RBqYfsjuoUDqD/vVNwZlavArQVXD6C+UjryaOLsQ -wVfJNxDxz/o7h8RE/veX -=8OIP ------END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.6.4-r3.ebuild b/dev-util/cmake/cmake-2.6.4-r3.ebuild deleted file mode 100644 --- a/dev-util/cmake/cmake-2.6.4-r3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.4-r3.ebuild,v 1.8 2009/11/24 15:59:55 armin76 Exp $ - -EAPI="2" - -inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils - -MY_PV="${PV/rc/RC-}" -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 ~sparc-fbsd ~x86-fbsd" -SLOT="0" -IUSE="emacs qt4 vim-syntax" - -DEPEND=" - >=net-misc/curl-7.16.4 - >=dev-libs/expat-2.0.1 - >=dev-libs/libxml2-2.6.28 - >=dev-libs/xmlrpc-c-1.06.27[curl] - emacs? ( virtual/emacs ) - qt4? ( x11-libs/qt-gui:4 ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" -RDEPEND="${DEPEND}" - -SITEFILE="50${PN}-gentoo.el" -VIMFILE="${PN}.vim" - -S="${WORKDIR}/${MY_P}" - -CMAKE_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}/${PN}-FindJNI.patch" - "${FILESDIR}/${PN}-FindPythonLibs.patch" - "${FILESDIR}/${PN}-FindPythonInterp.patch" - "${FILESDIR}/${P}-FindBoost.patch" -) - -src_configure() { - local qt_arg par_arg - - if [[ "$(gcc-major-version)" -eq "3" ]] ; then - append-flags "-fno-stack-protector" - fi - - 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 - if ! [[ $? = 0 ]]; then - bootstrap=1 - fi - fi - - if [[ ${bootstrap} = 1 ]]; then - 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=/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 preffer it if some cmake is - # around. - use qt4 && qt_arg="ON" || qt_arg="OFF" - mycmakeargs="-DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DBUILD_CursesDialog=ON - -DBUILD_QtDialog=${qt_arg}" - 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() { - einfo "Please note that test \"58 - SimpleInstall-Stage2\" might fail." - einfo "If any package installs with cmake, it means test failed but cmake work." - emake test -} - -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 "${S}"/Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins "${S}"/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 -}