old

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 6 insertions, 295 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index d3f117bfd5c1..8e0443cf5233 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
 # 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.149 2010/12/25 19:21:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.150 2010/12/26 22:39:38 scarabeus Exp $
+
+  26 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.6.4-r3.ebuild,
+  -cmake-2.8.3.ebuild:
+  old
 
   25 Dec 2010; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.3-r1.ebuild,
   +files/cmake-2.8.3-fix_assembler_test.patch:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index e7e0c65220dc..82869c21fd4c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -21,12 +21,9 @@ AUX cmake-FindJNI.patch 2020 RMD160 4fcb9714de65eb146a2696cd6613357684515b2d SHA
 AUX cmake-FindPythonInterp.patch 498 RMD160 a4113724d0c2bdb53e7c947790d8a7e337759c84 SHA1 abd7754549fef5aae515361acd6a509c98227bf5 SHA256 8c3d4dc1898eae4adaa392b556286076594470277bc7c1bddbe2a28213fff7c0
 AUX cmake-FindPythonLibs.patch 546 RMD160 429021001f1b464d8321703052890a34141a34ec SHA1 e5d62feab16058f123e1399e0504a50f50ee5a88 SHA256 86a5e78ff4e62cf8987401255197f7ba4ae70d00c257df3048372c5dcc035bdd
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
-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
 DIST cmake-2.8.3.tar.gz 5436543 RMD160 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c SHA1 e9bfbec47b3939be6f83ffa8006884285c687dc2 SHA256 689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288
-EBUILD cmake-2.6.4-r3.ebuild 3478 RMD160 c0ca9b92cbdc561c0fd9691ea009f3fcc9f9418a SHA1 6f19cfd2d86a796061324f37e7bcf97c4abe7d44 SHA256 883c9d4176f2cc1be136418ce03c5498ef55ac5eafb4c8d5aff2af88284eef9f
 EBUILD cmake-2.8.1-r2.ebuild 4383 RMD160 4bddb8e75bc3bfdace40bffc937d57b5e1fcdcd1 SHA1 43d5a4e45080899eb4dee38018097fa7add682a6 SHA256 acde4f84795ce01035c7cff3a3bbc739ab52eb568c5b252fd6d3dda912d53fc1
 EBUILD cmake-2.8.3-r1.ebuild 4162 RMD160 211f642d0205adfa320f3c6c0a41c5419a18c07d SHA1 17e65873aca118ae11e43721c6522d6a5553f3a9 SHA256 e7e0074ef12268f76f85e15c35fadd80e6c5a2867af48a307e99090bcf086752
-EBUILD cmake-2.8.3.ebuild 4012 RMD160 137537d2deebdf1942fedf8963751b4881294764 SHA1 9d984b764401741735cda9374fcae02ea0eb3c20 SHA256 4ca9afccec5b0b6ee159e0bf46b7e483f3c67eebf6d8a6987d803cecbda044ba
-MISC ChangeLog 23372 RMD160 1a27ccdc6d6463522e8c8b010b9639c535380751 SHA1 f6c744155de21afb5f5802bde85377a5df3f57a9 SHA256 952d775e9ecca2b4ad3a8936ac1b3e17cf72c7cd08e36fc83c98b7908a4afe9d
+MISC ChangeLog 23481 RMD160 43a78fd45ef5844691f9044b698407d0c72c7486 SHA1 8fabcabacb109e9149120bc07e5fffd96953775b SHA256 1c9192d61ea6eae0c066d6ad0c8c05081749e0e35f413ccc874a68db04ee0b88
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.6.4-r3.ebuild b/dev-util/cmake/cmake-2.6.4-r3.ebuild
deleted file mode 100644
index 10dd525e4cca..000000000000
--- a/dev-util/cmake/cmake-2.6.4-r3.ebuild
+++ /dev/null
@@ -1,144 +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.6.4-r3.ebuild,v 1.9 2010/12/16 12:36:21 scarabeus Exp $
-
-EAPI="2"
-
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils
-
-MY_PV="${PV/rc/RC-}"
-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 ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="emacs qt4 vim-syntax"
-
-DEPEND="
-	>=net-misc/curl-7.16.4
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libxml2-2.6.28
-	>=dev-libs/xmlrpc-c-1.06.27[curl]
-	emacs? ( virtual/emacs )
-	qt4? ( x11-libs/qt-gui:4 )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}/${PN}-FindJNI.patch"
-	"${FILESDIR}/${PN}-FindPythonLibs.patch"
-	"${FILESDIR}/${PN}-FindPythonInterp.patch"
-	"${FILESDIR}/${P}-FindBoost.patch"
-)
-
-src_configure() {
-	local qt_arg par_arg
-
-	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
-		if ! [[ $? = 0 ]]; then
-			bootstrap=1
-		fi
-	fi
-
-	if [[ ${bootstrap} = 1 ]]; then
-		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=/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 preffer it if some cmake is
-		# around.
-		use qt4 && qt_arg="ON" || qt_arg="OFF"
-		mycmakeargs="-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-			-DCMAKE_DOC_DIR=/share/doc/${PF}
-			-DCMAKE_MAN_DIR=/share/man
-			-DCMAKE_DATA_DIR=/share/${PN}
-			-DBUILD_CursesDialog=ON
-			-DBUILD_QtDialog=${qt_arg}"
-		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() {
-	einfo "Please note that test \"58 - SimpleInstall-Stage2\" might fail."
-	einfo "If any package installs with cmake, it means test failed but cmake work."
-	emake test
-}
-
-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 "${S}"/Docs/cmake-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins "${S}"/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.3.ebuild b/dev-util/cmake/cmake-2.8.3.ebuild
deleted file mode 100644
index e588be4fd57c..000000000000
--- a/dev-util/cmake/cmake-2.8.3.ebuild
+++ /dev/null
@@ -1,146 +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.3.ebuild,v 1.3 2010/12/20 13:40:01 scarabeus 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="
-	>=app-arch/libarchive-2.8.0
-	>=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_BINARY="${S}/Bootstrap.cmk/cmake"
-CMAKE_IN_SOURCE_BUILD=1
-
-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.0-darwin-no-app-with-qt.patch
-	"${FILESDIR}"/${PN}-2.8.1-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindLibArchive.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-FindPythonInterp.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-)
-_src_bootstrap() {
-	  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"
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# disable bootstrap cmake and make run, we use eclass for that
-	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"
-
-	_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
-	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 || die
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins Docs/cmake-indent.vim || die
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}