Disable TestUpload test since it requires network access, wrt bug #436188.

Package-Manager: portage-2.1.11.23/cvs/Linux x86_64

4 files changed, 275 insertions, 9 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index e3e22168caad..03a19496eaa6 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.225 2012/10/01 11:28:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.226 2012/10/02 10:23:44 kensington Exp $
+
+*cmake-2.8.9-r1 (02 Oct 2012)
+
+  02 Oct 2012; Michael Palimaka <kensington@gentoo.org> +cmake-2.8.9-r1.ebuild,
+  +files/cmake-2.8.9-tests.patch:
+  Disable TestUpload test since it requires network access, wrt bug #436188.
 
   01 Oct 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.8-r3.ebuild,
   -files/cmake-2.8.8-more-no_host_paths.patch,
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 8521952323b3..190c1a8736fa 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,19 +14,21 @@ AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1
 AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911
 AUX cmake-2.8.8-tests.patch 2492 SHA256 07800482bcbf336eafc9132037a26dc16bffc3d31cda8732604c847ea1c1c860 SHA512 675dae75ca54a264f285c7d678669a75f02438de13c6abed52bcd8223e968a8d0474660f0a7e2432d2b90caaf85cdee0489db90366226bcf7b09067b58088611 WHIRLPOOL dd5ce7c898a5cf5776277be2f9d7ee6b51adbe7bcc6dfa0b02df9230f7dab2bbc4bd4dd8ce1fe740b6570714cc93bdfcd759cab40dadb389e8010e3971df6b98
 AUX cmake-2.8.9-more-no_host_paths.patch 4177 SHA256 376586fd32013150f75aed0b48e54751d9770e9b4756de60eb0a62005894538f SHA512 beb0b2849afbd50bf2cd6562392f96aff351578c873f7d117c4f5cfc5c25bfb3fc4f55cdc78824a2fca81e555ddb111c874086e5862e748a5dd1ab1fb2712c86 WHIRLPOOL 3b12790baac161c487df61077031d9452fe1e195d3028bf6024866c8436e08a51f64315d8fb6dfb648b32750e071faa2cf790ef19e0c12e75f48b85451b10ac1
+AUX cmake-2.8.9-tests.patch 3259 SHA256 969187f56aa38132c3e97e6fdee5f1ee0b028627cf86bdb81a9d6108c432214e SHA512 c2a4f79d6d1d28f8db1ac7c367bd868ff1b931415e12b55b312ce2b037b02d59995d5930cc8c9163784c43cd9c108da4b37daefd089fc2cfe04e582801b5a0b8 WHIRLPOOL 5bb7c23080c44d643cec78be172f6a2ffea6df8d2cb0aa85306edfe45a7de9eb92aa548fc4cc6adac9ca7c00f143d66bb1456e255b9d68f241252cf89db60b60
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
+EBUILD cmake-2.8.9-r1.ebuild 4893 SHA256 ab7a67610900b1d09daccd7747597fdaae274ae460ea0aaee8b7d814b8e039d5 SHA512 884aeaf5ac5179212339b5eef5982b9039dc98e2a7f028f26b12cf76bf1cbeb504490c395053de8b88dabc1ac72df15c6509b6be75cc129a48156fdfdc053d69 WHIRLPOOL 6c69d4b1d0070fcb8c8cbc0679e2434850353d66235dfab68c21779eb6941308bc2bbd232bde38db8e12d6fc6ef67b75b3d3ecb97a10fed18c00978fda8712d8
 EBUILD cmake-2.8.9.ebuild 4876 SHA256 afd5b890bf972c42947d29d8bcb7e8a91818074352e35a5e3572b74acbca31b7 SHA512 0f804d45fb8cb957d2e199a53960b1866f578d473b29cca5a8c98b5201f0f1b510bda1de350c7b5e3ebeb563ce238454ba2d08c111d3cea7e9c9315618ae75b7 WHIRLPOOL 28c6fb434fd6586596288c485c9e34ae43a646a990e8cab3c0eb042e11648d7e372cf35494e2501d24c1eab631b36f25c3c0229d0138db39015007911d4174f7
-MISC ChangeLog 35922 SHA256 3e358c9c59b6b5c4ecc481d63dd4cb6c26983bdbcd0f3d807c07456f88d2d4ec SHA512 18552dbf14cb81d8d29ba42799871118431562b96b62d0e3cdb2040bd9031267247028b89ed8ab44e15cd2ec0c6e471cae02b643e7ee14d0547f862cf459f8d9 WHIRLPOOL 69c83e20edeebf7cd4e7f5d700a39703b1cf5c5e02218540a2619bbbf7fa493d9f059bd9e64664af738bc5442865d320df0676cd9e64c0d7fa0ce0def6e45fc6
+MISC ChangeLog 36151 SHA256 d41263c5cc0086916a80b42b3fb4b2c54d995e3af879f4924e67a439c1fe97ae SHA512 d208b681c51d883414e94f813ba216c6adbaf98fc9f7f0b064a1cb5450821704430c07f277b801f740a56180263479d6fe14b13a1235e089a2783258a1ae75e5 WHIRLPOOL 99d5a711f11e54d5b3944eaf0be4cb85b7fc3e503e5e30980c5afe6a218148302fe39270499b2f32b519ac538e7cafc46cc22391cca1d4adf716fa7c94263da1
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQaX5rAAoJEO+t9ga+3I3atpIIAKx/L0D+UjvZK3TccrNTeKgc
-+6BuDPRMKRhG/WEtmowRwvj156yviG0zQKFeIWTDKCawVVYYIBhXlIPt1F2pWH7D
-KeDrSGp4UNziunvkwt036AVLJGekNPfGQ42btk/Gdr4DR2J2QVVTZANq21/ONRW1
-uEcoPDM7cgtwdCF2KkcZdXPZNFFjak0izhTViOrPmQ8ffhnV/vNs2DEeg4ORXSIy
-sqjorPEcaoky5Zyy/VFNTRwFyKVK+pPOcUowQe/42oZ+5UtiJ8ahYhZAWi9ZtfVB
-QsZlU1WUWcb5QCSsFPLcPuE/0d9Q0OLKrZ0J3DMoTp81HD7HLaStkvdwR4vAj8Q=
-=j8Yc
+iQEcBAEBCAAGBQJQasBvAAoJEMbwO6tnXQ0sSHAIAMGe28/nDYhgawjpLKcrbrCC
+KCKEteyjzWWL2nvq5rLCQod3kzgnLQbmLWD8UMcWFZOAeSmGd/qwHdHpRFCH55h7
+L3JuVT+bHGQLda0B3w/QitwAq5o+pN9RZC6OOTxUFZGfcjEHZ56vqsjo/kL+ueSm
+ftT7nspVSy9ot/b3qXwBGec8PLAxnRjjTDC0UgYsVC0l4FYE7x6xpKqZtVxjFHvU
+Ke7q5cK50mnhSSmenMJR3cllFy/TWXo0WJy1STjItqf3HQeqUbnPRlOgTm9T4e0q
+MhoPDWGBO/x2ag8MfXu8Rw8ep6r5gKFlb1PytRHT6G2ccMYcOQrydHA/2uOuA6w=
+=V9Z+
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.9-r1.ebuild b/dev-util/cmake/cmake-2.8.9-r1.ebuild
new file mode 100644
index 000000000000..d69e77d20e99
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.9-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+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 ~amd64-fbsd ~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="
+	>=app-arch/libarchive-2.8.0
+	>=net-misc/curl-7.20.0-r1[ssl]
+	>=dev-libs/expat-2.0.1
+	virtual/pkgconfig
+	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_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
+	"${FILESDIR}"/${PN}-2.8.1-libform.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
+	"${FILESDIR}"/${PN}-2.8.9-tests.patch
+	"${FILESDIR}"/${PN}-2.8.9-more-no_host_paths.patch
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	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
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir test
+	# this is altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+	#        as it was never intended to be used this way.
+	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E BootstrapTest SimpleCOnly_sdcc \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	einfo "Fixing java access violations ..."
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# 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"
+
+	cmake_src_bootstrap
+}
+
+src_configure() {
+	# make things work with gentoo java setup
+	# in case java-config cannot be run, the variable just becomes unset
+	# per bug #315229
+	export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
+
+	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
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		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.9-tests.patch b/dev-util/cmake/files/cmake-2.8.9-tests.patch
new file mode 100644
index 000000000000..251a87fa9804
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.9-tests.patch
@@ -0,0 +1,81 @@
+Removes the following tests:
+
+- DeployQt4, which tries to break sandbox and ignores prefix
+- CTest.updatecvs, which fails to commit as root
+- TestUpload, which requires network access
+
+--- Tests/CMakeLists.txt
++++ Tests/CMakeLists.txt
+@@ -273,23 +273,6 @@
+       )
+     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
+ 
+-    # run test for DeployQt4 on supported platforms/compilers (which depends on BundleUtilities)
+-    # this test also depends on the existence of the standard qtiff plugin
+-    if(QT4_WORKS AND QT_QTSQL_FOUND)
+-      ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND}
+-        --build-and-test
+-        "${CMake_SOURCE_DIR}/Tests/Qt4Deploy"
+-        "${CMake_BINARY_DIR}/Tests/Qt4Deploy"
+-        --build-generator ${CMAKE_TEST_GENERATOR}
+-        --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+-        --build-project Qt4Deploy
+-        --build-options
+-        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+-        )
+-      LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy")
+-    endif()
+-
+   endif()
+   endif()
+ 
+@@ -1582,30 +1565,6 @@
+       LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
+     ENDIF(Subversion_FOUND)
+ 
+-    # Test CTest Update with CVS
+-    IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-      FIND_PACKAGE(CVS QUIET)
+-    ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-      FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs)
+-      SET(CVS_FOUND ${CVS_EXECUTABLE})
+-    ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
+-    SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND})
+-    IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+-      IF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+-        MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe outside cygwin!")
+-        SET(CTEST_TEST_UPDATE_CVS 0)
+-      ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin")
+-    ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX)
+-    IF(CTEST_TEST_UPDATE_CVS)
+-      SET(CTestUpdateCVS_DIR "CTest UpdateCVS")
+-      CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in"
+-        "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY)
+-      ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND}
+-        -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake"
+-        )
+-      LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateCVS_DIR}")
+-    ENDIF(CTEST_TEST_UPDATE_CVS)
+-
+     # Test CTest Update with BZR
+     FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr)
+     MARK_AS_ADVANCED(BZR_EXECUTABLE)
+@@ -1701,17 +1660,6 @@
+     FAIL_REGULAR_EXPRESSION "SegFault")
+ 
+   CONFIGURE_FILE(
+-    "${CMake_SOURCE_DIR}/Tests/CTestTestUpload/test.cmake.in"
+-    "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake"
+-    @ONLY ESCAPE_QUOTES)
+-  ADD_TEST(CTestTestUpload ${CMAKE_CTEST_COMMAND}
+-    -S "${CMake_BINARY_DIR}/Tests/CTestTestUpload/test.cmake" -V
+-    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestUpload/testOut.log"
+-    )
+-  SET_TESTS_PROPERTIES(CTestTestUpload PROPERTIES
+-    PASS_REGULAR_EXPRESSION "Upload\\.xml")
+-
+-  CONFIGURE_FILE(
+     "${CMake_SOURCE_DIR}/Tests/CTestTestConfigFileInBuildDir/test1.cmake.in"
+     "${CMake_BINARY_DIR}/Tests/CTestTestConfigFileInBuildDir1/test1.cmake"
+     @ONLY ESCAPE_QUOTES)