Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

5 files changed, 6 insertions, 312 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 35e29a3a9ec0..e0a45625e0f0 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.254 2013/09/11 18:00:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.255 2013/10/19 12:18:57 johu Exp $
+
+  19 Oct 2013; Johannes Huber <johu@gentoo.org> -cmake-2.8.11.1.ebuild,
+  -files/cmake-2.8.10-FindPythonLibs.patch, -files/cmake-2.8.10-tests.patch,
+  -files/cmake-2.8.10.2-qt5.patch:
+  Remove old.
 
 *cmake-2.8.11.2 (11 Sep 2013)
 
diff --git a/dev-util/cmake/cmake-2.8.11.1.ebuild b/dev-util/cmake/cmake-2.8.11.1.ebuild
deleted file mode 100644
index 4ac7020ebecd..000000000000
--- a/dev-util/cmake/cmake-2.8.11.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.11.1.ebuild,v 1.4 2013/06/14 17:17:22 kensington Exp $
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5 vim-syntax"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0:=
-	>=dev-libs/expat-2.0.1
-	>=net-misc/curl-7.20.0-r1[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	ncurses? ( sys-libs/ncurses )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
-	"${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.7-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
-	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
-	"${FILESDIR}"/${PN}-2.8.10-desktop.patch
-	"${FILESDIR}"/${PN}-2.8.10-libform.patch
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
-	"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-2.8.11-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-2.8.11-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:]]+' | tail -n1 | 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 and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/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.
-	#    CTest.updatecvs, which fails to commit as root
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    TestUpload, which requires network access
-	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-pkg_setup() {
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
-	cmake-utils_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)
-	)
-
-	if use qt4 || use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-	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.10-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
deleted file mode 100644
index d4f18ff50f80..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10-FindPythonLibs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0a9a990..6a13d22 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -79,6 +79,8 @@ unset(_PYTHON1_VERSIONS)
- unset(_PYTHON2_VERSIONS)
- unset(_PYTHON3_VERSIONS)
- 
-+EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
-+       OUTPUT_VARIABLE _Python_VERSIONS)
- foreach(_CURRENT_VERSION ${_Python_VERSIONS})
-   string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
-   if(WIN32)
diff --git a/dev-util/cmake/files/cmake-2.8.10-tests.patch b/dev-util/cmake/files/cmake-2.8.10-tests.patch
deleted file mode 100644
index 944e3c56a782..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index b404333..50f4292 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -271,23 +271,6 @@ if(BUILD_TESTING)
-       )
-     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()
- 
-@@ -1587,30 +1570,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
-       list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
-     endif()
- 
--    # Test CTest Update with CVS
--    if(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake)
--      find_package(CVS QUIET)
--    else()
--      find_program(CVS_EXECUTABLE NAMES cvs)
--      set(CVS_FOUND ${CVS_EXECUTABLE})
--    endif()
--    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()
--    endif()
--    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()
--
-     # Test CTest Update with BZR
-     find_program(BZR_EXECUTABLE NAMES bzr)
-     mark_as_advanced(BZR_EXECUTABLE)
-@@ -1706,17 +1665,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
-     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)
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
deleted file mode 100644
index 1f2bef0cec14..000000000000
--- a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Source/QtDoalog/CMakeLists.txt
-+++ Source/QtDialog/CMakeLists.txt
-@@ -11,7 +11,12 @@
- #=============================================================================
- 
- project(QtDialog)
--find_package(Qt5Widgets QUIET)
-+option(WITH_Qt5 ON)
-+
-+if(WITH_Qt5)
-+  find_package(Qt5Widgets QUIET)
-+endif()
-+
- if (Qt5Widgets_FOUND)
-   include_directories(${Qt5Widgets_INCLUDE_DIRS})
-   add_definitions(${Qt5Widgets_DEFINITONS})