summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-08-10 12:58:20 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-08-10 12:58:20 +0000
commit5570623f0059ecf0e01dbe78d36121650aa043ff (patch)
tree156bd75fce3098d976a9ada59f0f49ce243600cb /dev-util/cmake
parentCleanup old stuff. (diff)
downloadhistorical-5570623f0059ecf0e01dbe78d36121650aa043ff.tar.gz
historical-5570623f0059ecf0e01dbe78d36121650aa043ff.tar.bz2
historical-5570623f0059ecf0e01dbe78d36121650aa043ff.zip
Drop older stuff.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-util/cmake')
-rw-r--r--dev-util/cmake/ChangeLog7
-rw-r--r--dev-util/cmake/Manifest15
-rw-r--r--dev-util/cmake/cmake-2.8.1-r1.ebuild157
-rw-r--r--dev-util/cmake/cmake-2.8.1.ebuild155
-rw-r--r--dev-util/cmake/files/cmake-2.8.0-more-no_host_paths.patch108
5 files changed, 7 insertions, 435 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index d1695d9c8664..175856e3b972 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/cmake
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.140 2010/08/06 14:26:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.141 2010/08/10 12:58:19 scarabeus Exp $
+
+ 10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/cmake-2.8.0-more-no_host_paths.patch, -cmake-2.8.1.ebuild,
+ -cmake-2.8.1-r1.ebuild:
+ Drop older stuff.
06 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
cmake-2.8.1-r2.ebuild:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 27dc0ef91703..150cb4e7638e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
@@ -9,7 +6,6 @@ AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 RMD160 d927ce8bb08d57f452db3371
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.0-more-no_host_paths.patch 2981 RMD160 4a6de86385e6bc0c42d49c4860300d590077cc81 SHA1 f13b33f5f8724590ff5edd57486c079fffd08f4b SHA256 e3b6a554239ee0cfc2dcac5298b702d9eca4b403f5839db9bb6ad3f42cfd6d81
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
@@ -21,15 +17,6 @@ AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989ae
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-r1.ebuild 4047 RMD160 5d68604c2c9ffb76ef400058a61f73ab6de73643 SHA1 b36f343d961b0b030e142b63fb5c4b7f60ed7830 SHA256 c8cb7c23043afddaa9ae646eba211d226ab8f1bb8f9b56be69167acb6383251f
EBUILD cmake-2.8.1-r2.ebuild 4286 RMD160 03972b663aea50a425b04a601ed6f3fb04b7174f SHA1 fb586cea9b84e58d97c04e3201beed4af57ceae4 SHA256 2de3a4436029d86a2a6c16874676cba2c46e34557bd98a9c0548b37d42eddb3a
-EBUILD cmake-2.8.1.ebuild 4060 RMD160 9b0fc37214b5368b83fe922736deb17838fe9557 SHA1 19927fd33f4671558cfd4086b3e83a0d71ef7c7c SHA256 713f767eb2017664b46b4c215f04516b1eaf17e932c8b5f8d988ccfdfaf619ee
-MISC ChangeLog 21776 RMD160 225ccec215832eda05e6c16cbb433e200a96f717 SHA1 ca31d3544fb4e2cb50bca7231945d1a84f567f15 SHA256 df91dad2c7c5d1436d7b12d07e3884526e1b4bfa4d6e28c96861af78a1983cd0
+MISC ChangeLog 21950 RMD160 a9518940bffd09c505d1532112898abdc7d41b7f SHA1 4a5edbbec6ce22c1497ec9b8c504d0a81558966e SHA256 81b6477d6beb4b1504ad1916be96a989c5d8713c0cde484bf84568b6d1e22f43
MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxcHD8ACgkQNQqtfCuFneNnvwCfXPBiuIYgFDm0DxtvozksEueN
-ClQAn3uQkynuJrHE4b7c16POUDG/mo8x
-=mV0R
------END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.1-r1.ebuild b/dev-util/cmake/cmake-2.8.1-r1.ebuild
deleted file mode 100644
index eba8400356da..000000000000
--- a/dev-util/cmake/cmake-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-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
-)
-
-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
-
- 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
-
- 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/cmake-2.8.1.ebuild b/dev-util/cmake/cmake-2.8.1.ebuild
deleted file mode 100644
index 35682f7b14f2..000000000000
--- a/dev-util/cmake/cmake-2.8.1.ebuild
+++ /dev/null
@@ -1,155 +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.ebuild,v 1.2 2010/03/17 20:10:25 grobian 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
-)
-
-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
-
- 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
-
- 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.8.0-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.0-more-no_host_paths.patch
deleted file mode 100644
index a4cdf3905a12..000000000000
--- a/dev-util/cmake/files/cmake-2.8.0-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@ @GENTOO_PORTAGE_EPREFIX@usr
- /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
- )
-