Revision bump, add patch to set a default install_name on Darwin. This is sufficient for most cases, and allows us to revert some install_name_tool hacks for cmake-based packages.

Package-Manager: portage-2.2.00.15274-prefix/cvs/Darwin powerpc

4 files changed, 192 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 53268f564185..a32caaf04090 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,14 @@
 # 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.126 2010/01/24 22:12:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.127 2010/01/31 15:49:12 grobian Exp $
+
+*cmake-2.8.0-r2 (31 Jan 2010)
+
+  31 Jan 2010; Fabian Groffen <grobian@gentoo.org> +cmake-2.8.0-r2.ebuild,
+  +files/cmake-2.8.0-darwin-default-install_name.patch:
+  Revision bump, add patch to set a default install_name on Darwin. This is
+  sufficient for most cases, and allows us to revert some install_name_tool
+  hacks for cmake-based packages.
 
   24 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   cmake-2.8.0-r1.ebuild:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index fe6ad36133ea..efa6bc3d4c31 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -4,6 +4,7 @@ AUX cmake-2.6.3-darwin-bundle.patch 952 RMD160 157295c7080e3fa5a1414c6f7efba4877
 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-more-no_host_paths.patch 2981 RMD160 4a6de86385e6bc0c42d49c4860300d590077cc81 SHA1 f13b33f5f8724590ff5edd57486c079fffd08f4b SHA256 e3b6a554239ee0cfc2dcac5298b702d9eca4b403f5839db9bb6ad3f42cfd6d81
 AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA1 c463daa6e7d3a1d7065607f97993b5da3486e7e1 SHA256 c5390550c192aea18415087ed891f7e5192b2a385c9c72f4cda0c19b13f6bfbb
 AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0
@@ -13,6 +14,7 @@ DIST cmake-2.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a
 DIST cmake-2.8.0.tar.gz 3553247 RMD160 27e80a14b4970d85b12aaf18fbe738c02dc0620f SHA1 c35cb0d787c53aee768b154f05b68d3a20eccb3d SHA256 847d615ecadb97f2cd05964cad6b019b68a952cad0db1e8c05222dfc599f476d
 EBUILD cmake-2.6.4-r3.ebuild 3476 RMD160 e20f6f85b5291ced7e3ee53ff933a0da704b8f14 SHA1 72bb72aeea2261d1c5c5642018234803c35c32c5 SHA256 1c4a2f60dffb72d1134932b580e46d07a7784420a0c786f204d4b71dbfd928f0
 EBUILD cmake-2.8.0-r1.ebuild 4030 RMD160 46029d880f87bc391fa520ce26d6ee1c3693bb6b SHA1 ed6c5a44bfb151a02f2d659b59bebc32a86ae1f4 SHA256 a113d79466309a00e926d03a626ca99fbd07bab642a2df37c44de18ae51908b6
+EBUILD cmake-2.8.0-r2.ebuild 4082 RMD160 b04a8bae0ce7c814630602db2eefc6f0126cf3b1 SHA1 f6e5de40918e99570a982a45d961408eb02e4b44 SHA256 9ab9aa89ea19533b8260f78023128dbf12f1b720df3b450e33ba1a42ca9ca5ea
 EBUILD cmake-2.8.0.ebuild 4008 RMD160 402f951ece154f1fcc985c03a9272a569332ec24 SHA1 a2ff18b01ce1286b3324719f06bc2c9af70a94d0 SHA256 64394e560dc135b007792932b34138f30c0652055aac6c5135f9352f42f9ce69
-MISC ChangeLog 19299 RMD160 488406edf0aaf7c79cdcb5d672005f71eb6c041b SHA1 54fb704523c0024c3b302efeeab6c9e8dc69fcf0 SHA256 53029ad3772f8cfcb4bdd1f88c49adbbabe707acdf9445af2c95b019723f1673
+MISC ChangeLog 19646 RMD160 b085a460aebd666dc7c21fde6d94751f10cee49d SHA1 8eddc662167850adae4a4953b80cb02dab9afc88 SHA256 065836a1c24a22b811a2d363048d1df62fb7b2364bfae973eb4c9c0f0ab560c3
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.8.0-r2.ebuild b/dev-util/cmake/cmake-2.8.0-r2.ebuild
new file mode 100644
index 000000000000..b866d2f98265
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.0-r2.ebuild
@@ -0,0 +1,160 @@
+# 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.0-r2.ebuild,v 1.1 2010/01/31 15:49:12 grobian Exp $
+
+EAPI="2"
+
+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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+	|| (
+		>=net-misc/curl-7.16.7[gnutls]
+		>=net-misc/curl-7.16.7[nss]
+		>=net-misc/curl-7.16.7[openssl]
+	)
+	>=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}"/${P}-more-no_host_paths.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}"/${P}-darwin-default-install_name.patch
+)
+
+src_prepare() {
+	base_src_prepare
+
+	use prefix || EPREFIX=
+
+	# 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-darwin-default-install_name.patch b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
new file mode 100644
index 000000000000..4ef0c7b4b6fa
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.0-darwin-default-install_name.patch
@@ -0,0 +1,20 @@
+The install_name of a library can be compared to the ELF soname, setting
+it to just the library name (libx.1.dylib) is not sufficient on Mach-O,
+as it uses full paths.  Most apps have no clue about that, so they don't
+do something like http://www.cmake.org/pipermail/cmake/2006-June/009758.html
+
+Provide a sane default that will allow merging most cmake-based
+packages.  If this location is not correct, Portage's QA checks will
+catch that.
+
+--- Source/cmTarget.cxx
++++ Source/cmTarget.cxx
+@@ -974,7 +974,7 @@
+                        this->Makefile->IsOn("MINGW"));
+ 
+   // Setup default property values.
+-  this->SetPropertyDefault("INSTALL_NAME_DIR", "");
++  this->SetPropertyDefault("INSTALL_NAME_DIR", "${CMAKE_INSTALL_PREFIX}/lib");
+   this->SetPropertyDefault("INSTALL_RPATH", "");
+   this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
+   this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");