Remove old.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

7 files changed, 7 insertions, 327 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 6c473f7475ce..56178b814e84 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.207 2012/07/08 18:16:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.208 2012/07/08 23:35:54 johu Exp $
+
+  08 Jul 2012; Johannes Huber <johu@gentoo.org> -cmake-2.8.6-r4.ebuild,
+  -files/cmake-2.8.3-ruby_libname.patch, -files/cmake-2.8.6-CodeBlocks.patch,
+  -files/cmake-2.8.6-FindBLAS-2.patch, -files/cmake-2.8.6-FindLAPACK-2.patch,
+  -files/cmake-2.8.6-testsvn17.patch:
+  Remove old.
 
   08 Jul 2012; Raúl Porcel <armin76@gentoo.org> cmake-2.8.7-r5.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #4143807
diff --git a/dev-util/cmake/cmake-2.8.6-r4.ebuild b/dev-util/cmake/cmake-2.8.6-r4.ebuild
deleted file mode 100644
index 62df8f133ec3..000000000000
--- a/dev-util/cmake/cmake-2.8.6-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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.6-r4.ebuild,v 1.10 2012/07/03 13:41:21 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 ~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
-		)
-	)
-"
-
-# bug 390533
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
-	"${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.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
-	"${FILESDIR}"/${PN}-2.8.6-CodeBlocks.patch
-	"${FILESDIR}"/${PN}-2.8.6-testsvn17.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 \
-		--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.3-ruby_libname.patch b/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
deleted file mode 100644
index 45d2b162c5b7..000000000000
--- a/dev-util/cmake/files/cmake-2.8.3-ruby_libname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN cmake-2.8.3.orig//Modules/FindRuby.cmake cmake-2.8.3//Modules/FindRuby.cmake
---- cmake-2.8.3.orig//Modules/FindRuby.cmake	2010-12-25 16:56:42.597163498 +0100
-+++ cmake-2.8.3//Modules/FindRuby.cmake	2010-12-25 16:57:55.207163499 +0100
-@@ -180,7 +180,7 @@
- 
- 
- # Determine the list of possible names for the ruby library
--SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
-+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
- 
- IF(WIN32)
-    SET( _RUBY_MSVC_RUNTIME "" )
diff --git a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch b/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
deleted file mode 100644
index 8a8fe6f392a8..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001
-From: Clinton Stimpson <clinton@elemtech.com>
-Date: Wed, 5 Oct 2011 10:02:32 -0600
-Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project.
-
----
- Source/cmExtraCodeBlocksGenerator.cxx |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
-index 7db91c7..9a0b1ea 100644
---- a/Source/cmExtraCodeBlocksGenerator.cxx
-+++ b/Source/cmExtraCodeBlocksGenerator.cxx
-@@ -19,6 +19,7 @@
- #include "cmGeneratedFileStream.h"
- #include "cmTarget.h"
- #include "cmSystemTools.h"
-+#include "cmXMLSafe.h"
- 
- #include <cmsys/SystemTools.hxx>
- 
-@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
-       for(std::vector<std::string>::const_iterator di = defs.begin();
-           di != defs.end(); ++di)
-         {
--        fout <<"            <Add option=\"-D" << di->c_str() << "\" />\n";
-+        cmXMLSafe safedef(di->c_str());
-+        fout <<"            <Add option=\"-D" << safedef.str() << "\" />\n";
-         }
-       }
- 
--- 
-1.7.0
-
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
deleted file mode 100644
index 16b6480f577b..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindBLAS-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cmake-2.8.6.orig/Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
---- cmake-2.8.6.orig/Modules/FindBLAS.cmake	2011-10-04 18:09:24.000000000 +0200
-+++ cmake-2.8.6/Modules/FindBLAS.cmake	2011-11-22 23:04:17.000000000 +0100
-@@ -1,3 +1,9 @@
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find BLAS library
- # This module finds an installed fortran library that implements the BLAS
- # linear-algebra interface (see http://www.netlib.org/blas/).
-@@ -39,6 +45,14 @@
- # (To distribute this file outside of CMake, substitute the full
- #  License text for the above reference.)
- 
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(BLAS blas)
-+if(NOT BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(CheckFunctionExists)
- include(CheckFortranFunctionExists)
- 
-@@ -622,3 +636,6 @@
- endif(BLA_F95)
- 
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(NOT BLAS_FOUND)
-+
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
deleted file mode 100644
index 579a07d880a1..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cmake-2.8.6.orig/Modules/FindLAPACK.cmake	2011-10-09 23:38:48.956933106 +0800
-+++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake	2011-10-09 23:39:52.002144646 +0800
-@@ -1,3 +1,9 @@ 
-+#
-+# Version modified for Gentoo Linux
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
-+
- # - Find LAPACK library
- # This module finds an installed fortran library that implements the LAPACK
- # linear-algebra interface (see http://www.netlib.org/lapack/).
-@@ -36,6 +42,14 @@ 
- # (To distribute this file outside of CMake, substitute the full
- #  License text for the above reference.)
- 
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(LAPACK lapack)
-+if(NOT LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- 
- get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
-@@ -304,4 +318,6 @@ 
-  endif(NOT LAPACK_FIND_QUIETLY)
- endif(BLA_F95)
- 
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(NOT LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch b/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
deleted file mode 100644
index 77467676c841..000000000000
--- a/dev-util/cmake/files/cmake-2.8.6-testsvn17.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Tests/CTestUpdateSVN.cmake.in b/Tests/CTestUpdateSVN.cmake.in
-index 97b2a07..edafb4ef 100644
---- a/Tests/CTestUpdateSVN.cmake.in
-+++ b/Tests/CTestUpdateSVN.cmake.in
-@@ -23,6 +23,16 @@ file(MAKE_DIRECTORY ${TOP}/config)
- set(SVNCMD ${SVN} --config-dir ${TOP}/config)
- set(SVNUSER --username "test author" --non-interactive)
- 
-+# Configure for this svn version.
-+execute_process(
-+  COMMAND ${SVN} help add OUTPUT_VARIABLE help_add ERROR_VARIABLE help_add
-+  )
-+if("${help_add}" MATCHES "--depth")
-+  set(depth_empty "--depth=empty")
-+else()
-+  set(depth_empty "")
-+endif()
-+
- #-----------------------------------------------------------------------------
- # Initialize the testing directory.
- message("Creating test directory...")
-@@ -63,7 +73,7 @@ update_content(user-source files_added files_removed dirs_added)
- if(dirs_added)
-   run_child(
-     WORKING_DIRECTORY ${TOP}/user-source
--    COMMAND ${SVNCMD} add ${dirs_added}
-+    COMMAND ${SVNCMD} add ${depth_empty} ${dirs_added}
-     )
- endif(dirs_added)
- run_child(