Move keywords from 2.8.4 to r1 (even the stable ones), because the only change is in the cross-compilation finder, not really requiring the restabilisation.

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

4 files changed, 14 insertions, 170 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 3a2c288a9b45..513c1b9ac0bf 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.164 2011/04/18 10:17:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.165 2011/04/28 21:26:52 scarabeus Exp $
+
+  28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -cmake-2.8.4.ebuild,
+  cmake-2.8.4-r1.ebuild:
+  Move keywords from 2.8.4 to r1 (even the stable ones), because the only
+  change is in the cross-compilation finder, not really requiring the
+  restabilisation.
 
 *cmake-2.8.4-r1 (18 Apr 2011)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1e8eeae1b38f..90a1140488bb 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -31,14 +31,13 @@ AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989ae
 DIST cmake-2.8.1.tar.gz 3605611 RMD160 38b0876597def32a535d5305fb8f706ff29beabe SHA1 fb93c8766a3bd71f2a824291717700c118d29be5 SHA256 4b65b819c00874c34196640411f6f9e877abf23733ba0ef68f73b4fafd3b3022
 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
 EBUILD cmake-2.8.1-r2.ebuild 4383 RMD160 4bddb8e75bc3bfdace40bffc937d57b5e1fcdcd1 SHA1 43d5a4e45080899eb4dee38018097fa7add682a6 SHA256 acde4f84795ce01035c7cff3a3bbc739ab52eb568c5b252fd6d3dda912d53fc1
-EBUILD cmake-2.8.4-r1.ebuild 4495 RMD160 cd02e5f0a3fa1cc8a8335ba3598329275b2c4816 SHA1 f002b7d9a6e965d827f07db5b2afc06186009202 SHA256 c20487823b6ebac3c68b8586c8efe6936a611feb13e54084b964160430b8a51d
-EBUILD cmake-2.8.4.ebuild 4478 RMD160 20a40ec00450215c4577099f7dcd3824119f0e05 SHA1 b564af1ad3b144fbf2f808cc9001162f8f17f1c1 SHA256 b26eb274432fbf76f8c7348c5d96d45945ead8f994d14ab688fb89a536dc76b0
-MISC ChangeLog 25339 RMD160 f7b3ebedbd9bd97f5b3fbf2e70834a061c3427b4 SHA1 1791c530290cdb91fd8053265c0f14a942d4cf8d SHA256 fa8771f6a9232554228acaf90c0408da201845c34c5552c124760ca1461852fd
+EBUILD cmake-2.8.4-r1.ebuild 4489 RMD160 cce782ccf7aa1bf37812d2d9ed50e25940789a51 SHA1 910836a5c19d790ca37d97d31bf4ead83fdab907 SHA256 4c53e401ed7e4cb8b2f9278021e383d850a1a052301358c8ddbcd9e865554d00
+MISC ChangeLog 25604 RMD160 d2ecda81a6041ac1b2eb31de3834d346c5e051ac SHA1 8f36f26b96abed4a0818ea34621137d647923370 SHA256 a7f830d3db8b85aa8c5e1ac9c193de37a122943115d283b185c9eec535a24883
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2sD7kACgkQHB6c3gNBRYf0OwCfaIpAheiCbtwto71gYrRwt1+q
-v0UAoJcQKqBUsVnzK77tT54Ju6r+bPtY
-=f5zg
+iEYEARECAAYFAk2522gACgkQHB6c3gNBRYeGGgCdHmD6EfIbSCPj7rvgh3vvawX3
+5oYAoJq1TFMPI25LWDj4DMbVkSir7jK9
+=EcjJ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.4-r1.ebuild b/dev-util/cmake/cmake-2.8.4-r1.ebuild
index a978c612459d..0c4bb0c08d47 100644
--- a/dev-util/cmake/cmake-2.8.4-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4-r1.ebuild,v 1.1 2011/04/18 10:17:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4-r1.ebuild,v 1.2 2011/04/28 21:26:52 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ 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"
+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"
 
diff --git a/dev-util/cmake/cmake-2.8.4.ebuild b/dev-util/cmake/cmake-2.8.4.ebuild
deleted file mode 100644
index b267122f148b..000000000000
--- a/dev-util/cmake/cmake-2.8.4.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4.ebuild,v 1.12 2011/04/07 18:15:09 scarabeus Exp $
-
-EAPI=3
-
-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
-	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"
-
-# portme:
-# darwin-no-qt
-# findboost
-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.4-FindPythonInterp.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
-	"${FILESDIR}"/${PN}-2.8.3-fix_assembler_test.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindBoost.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
-	use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-_run_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
-	# 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 \
-		-E BootstrapTest SimpleCOnly_sdcc \
-		|| die "Tests failed"
-	popd > /dev/null
-}
-
-src_test() {
-	VIRTUALX_COMMAND="_run_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 || 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
-}