diff options
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-util/cmake/Manifest | 27 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.4.7-r1.ebuild | 78 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.4.7-findkde4.patch | 49 | ||||
| -rw-r--r-- | dev-util/cmake/files/digest-cmake-2.4.7-r1 | 3 |
5 files changed, 159 insertions, 9 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 88ef25ba0527..58c047559d97 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-util/cmake # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.62 2007/07/19 08:02:26 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.63 2007/09/07 21:30:53 philantrop Exp $ + +*cmake-2.4.7-r1 (07 Sep 2007) + + 07 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> + +files/cmake-2.4.7-findkde4.patch, +cmake-2.4.7-r1.ebuild: + Added an upstream patch to fix cmake failing to detect an existing KDE4 + installation if the program being built is not going to be installed in the + same directory as KDE4. Fixes bug 191412. Thanks, Zephyrus, for reporting + this and providing the patch! 19 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org> cmake-2.4.7.ebuild: Moved to testing, fixes bug 185832. Sorry. diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index d8368c7126d5..fbefb84176c2 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -9,6 +9,10 @@ AUX cmake-2.0.6-rpath-fix.patch 526 RMD160 9039e42ce4def8ae7ce38946cb55b95b4502a MD5 cc142b07505b203f41d024728adb130f files/cmake-2.0.6-rpath-fix.patch 526 RMD160 9039e42ce4def8ae7ce38946cb55b95b4502a1e9 files/cmake-2.0.6-rpath-fix.patch 526 SHA256 18c58ecf9bdddce15764ab3481aba570e3378f8d8b1c5306a050b2c33323a1bc files/cmake-2.0.6-rpath-fix.patch 526 +AUX cmake-2.4.7-findkde4.patch 1884 RMD160 918d56910e18ffec856f1cc67d0b67117736ae09 SHA1 6314d9dea24bfbcd262517aceead4b273e116c54 SHA256 bd22024e222d7bd0d99fa932bf193803acb956887bb6b41ecf2eca96ba0a5e3b +MD5 62ae2e19cff7ebcde6aa94806e4c066f files/cmake-2.4.7-findkde4.patch 1884 +RMD160 918d56910e18ffec856f1cc67d0b67117736ae09 files/cmake-2.4.7-findkde4.patch 1884 +SHA256 bd22024e222d7bd0d99fa932bf193803acb956887bb6b41ecf2eca96ba0a5e3b files/cmake-2.4.7-findkde4.patch 1884 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 MD5 363293d7c4953c02b34d1ee398005fa3 files/cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 files/cmake.vim 217 @@ -43,14 +47,18 @@ EBUILD cmake-2.4.6.ebuild 1031 RMD160 e8cdb2eb27b8c2aa86583f4387de723447603763 S MD5 1f0647b93acbf8cc628cb0b6f7eaa292 cmake-2.4.6.ebuild 1031 RMD160 e8cdb2eb27b8c2aa86583f4387de723447603763 cmake-2.4.6.ebuild 1031 SHA256 780237c97b404ea9944d32e9772e132457d7c4b9628196efd34422870fe87c22 cmake-2.4.6.ebuild 1031 +EBUILD cmake-2.4.7-r1.ebuild 1996 RMD160 e4b9026e8555d73cec2c62605fa4492a4be53e26 SHA1 27763ef0654832ea7b33cbcb861d8dd216fc49d4 SHA256 c5e06ba119ce884c4c6020566a08290ec7ed8ccf07acdd2e9c23017066cda536 +MD5 f091f9eb04955695ebf821fe7ab76990 cmake-2.4.7-r1.ebuild 1996 +RMD160 e4b9026e8555d73cec2c62605fa4492a4be53e26 cmake-2.4.7-r1.ebuild 1996 +SHA256 c5e06ba119ce884c4c6020566a08290ec7ed8ccf07acdd2e9c23017066cda536 cmake-2.4.7-r1.ebuild 1996 EBUILD cmake-2.4.7.ebuild 1841 RMD160 0ba9666435fa6c594070fcd69e88fa487760fad3 SHA1 83aebd1a1d86697df41283947eb49c5708994a4a SHA256 a35afc15cd4c1de54ba12671228a3ebb0ad9aa30475468dcc581646801cc2e5f MD5 dc38f320d58f94a88c24d5e5f92180d4 cmake-2.4.7.ebuild 1841 RMD160 0ba9666435fa6c594070fcd69e88fa487760fad3 cmake-2.4.7.ebuild 1841 SHA256 a35afc15cd4c1de54ba12671228a3ebb0ad9aa30475468dcc581646801cc2e5f cmake-2.4.7.ebuild 1841 -MISC ChangeLog 8872 RMD160 d7736dbb35557eb4f3ab01130c5beaea6df89655 SHA1 3a417f5eeae74e69a3e4fb9ff78bd4befeeb7dbb SHA256 55bffc31933e5a486ac0acf5666bd104de187e5024f6cd81ae6178059bcdfc59 -MD5 4061286f6ca2b5d8f75fbfbe0d3832be ChangeLog 8872 -RMD160 d7736dbb35557eb4f3ab01130c5beaea6df89655 ChangeLog 8872 -SHA256 55bffc31933e5a486ac0acf5666bd104de187e5024f6cd81ae6178059bcdfc59 ChangeLog 8872 +MISC ChangeLog 9285 RMD160 e30afc54eca35ad4b2ef21743610f69d95ac41b1 SHA1 773f1e0598567f6f41d91f9400c59bb450102245 SHA256 b15d17b6dc42e97ed758e240e22e7f376fb5dcbb5b79c970e8aad9c207aea998 +MD5 6e9645e0508ac9b990101b8775b27c75 ChangeLog 9285 +RMD160 e30afc54eca35ad4b2ef21743610f69d95ac41b1 ChangeLog 9285 +SHA256 b15d17b6dc42e97ed758e240e22e7f376fb5dcbb5b79c970e8aad9c207aea998 ChangeLog 9285 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb metadata.xml 157 @@ -76,10 +84,13 @@ SHA256 b44d1fd7e118585ce9cf8248e815ab49d896162753a3e3fbc99a120fb6e287d8 files/di MD5 5e292f9a81c05fe721f316e78ff770d8 files/digest-cmake-2.4.7 238 RMD160 9a282ff0296c16f7620409705f5b488c19eee1ce files/digest-cmake-2.4.7 238 SHA256 c38ada811d01fc940e3984afba6671ca5477f67293007796798af3f75ce27e07 files/digest-cmake-2.4.7 238 +MD5 5e292f9a81c05fe721f316e78ff770d8 files/digest-cmake-2.4.7-r1 238 +RMD160 9a282ff0296c16f7620409705f5b488c19eee1ce files/digest-cmake-2.4.7-r1 238 +SHA256 c38ada811d01fc940e3984afba6671ca5477f67293007796798af3f75ce27e07 files/digest-cmake-2.4.7-r1 238 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.5 (GNU/Linux) +Version: GnuPG v2.0.6 (GNU/Linux) -iD8DBQFGnxqyntT9W3vfTuoRAkicAJ9i8MRophhIlQiaIcN873NebVk8HACeI8zT -Jh5mT95tnoue1IC9amqdlXg= -=UaKo +iD8DBQFG4cMVCkvF58q80IkRAhznAJ9hGI4HVA8K5I9RDihaE81yLIpwVwCglC2E +uD9iSh5GDEYernu+ZjQ3nZU= +=1ief -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.4.7-r1.ebuild b/dev-util/cmake/cmake-2.4.7-r1.ebuild new file mode 100644 index 000000000000..cdca09517de6 --- /dev/null +++ b/dev-util/cmake/cmake-2.4.7-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r1.ebuild,v 1.1 2007/09/07 21:30:53 philantrop Exp $ + +inherit elisp-common toolchain-funcs eutils versionator qt3 + +DESCRIPTION="Cross platform Make" +HOMEPAGE="http://www.cmake.org/" +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="emacs vim-syntax" + +DEPEND="emacs? ( virtual/emacs ) + vim-syntax? ( || ( + app-editors/vim + app-editors/gvim ) )" +RDEPEND="${DEPEND}" + +SITEFILE="50${PN}-gentoo.el" +VIMFILE="${PN}.vim" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Upstream patch to make sure KDE4 is found. cf. bug 191412. + epatch "${FILESDIR}/${P}-findkde4.patch" +} + +src_compile() { + cd ${S} + tc-export CC CXX LD + ./bootstrap \ + --prefix=/usr \ + --docdir=/share/doc/${PN} \ + --datadir=/share/${PN} \ + --mandir=/share/man || die "./bootstrap failed" + emake || die + if use emacs; then + elisp-compile Docs/cmake-mode.el || die "elisp compile failed" + fi +} + +src_test() { + einfo "Self tests broken" + make test || \ + einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure" +} + +src_install() { + make install DESTDIR=${D} || die "install failed" + mv ${D}usr/share/doc/cmake ${D}usr/share/doc/${PF} + 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 +} diff --git a/dev-util/cmake/files/cmake-2.4.7-findkde4.patch b/dev-util/cmake/files/cmake-2.4.7-findkde4.patch new file mode 100644 index 000000000000..2d52d89b430f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.4.7-findkde4.patch @@ -0,0 +1,49 @@ +--- Modules/FindKDE4.cmake.orig 2007-09-05 19:34:40.000000000 +0200 ++++ Modules/FindKDE4.cmake 2007-09-05 19:34:46.000000000 +0200 +@@ -1,9 +1,8 @@ + # Find KDE4 and provide all necessary variables and macros to compile software for it. + # It looks for KDE 4 in the following directories in the given order: +-# - CMAKE_INSTALL_PREFIX +-# - KDEDIRS +-# - /opt/kde4 +-# - /opt/kde ++# CMAKE_INSTALL_PREFIX ++# KDEDIRS ++# /opt/kde4 + # + # Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information. + # They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/. +@@ -14,6 +13,7 @@ + + # For KDE4 kde-config has been renamed to kde4-config + FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ++ PATH_SUFFIXES bin # the suffix is for the paths coming from KDEDIRS + PATHS + ${CMAKE_INSTALL_PREFIX}/bin + ${_KDEDIRS} +@@ -21,14 +21,11 @@ + NO_DEFAULT_PATH + ) + +- +-IF (NOT KDE4_KDECONFIG_EXECUTABLE) +- FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ) +-ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE) ++FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config ) + + IF (KDE4_KDECONFIG_EXECUTABLE) + # then ask kde4-config for the kde data dirs +- EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR ) ++ EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) + + FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) + +@@ -52,7 +49,7 @@ + FIND_PACKAGE(KDE4Internal ${_req} ${_quiet}) + ELSE (KDE4_DATA_DIR) + IF (KDE4_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}") ++ MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}") + ENDIF (KDE4_FIND_REQUIRED) + ENDIF (KDE4_DATA_DIR) + diff --git a/dev-util/cmake/files/digest-cmake-2.4.7-r1 b/dev-util/cmake/files/digest-cmake-2.4.7-r1 new file mode 100644 index 000000000000..159cbb370c75 --- /dev/null +++ b/dev-util/cmake/files/digest-cmake-2.4.7-r1 @@ -0,0 +1,3 @@ +MD5 4476c423b8f74266136964e42ea88028 cmake-2.4.7.tar.gz 2600960 +RMD160 7fed176c42f39c25e1d4c761436aa4d5a8a64e3a cmake-2.4.7.tar.gz 2600960 +SHA256 2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56 cmake-2.4.7.tar.gz 2600960 |