Revision bump. Fix installation of bash completion files wrt bug 498056, credit to Alex Turbov for the fix. Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 20 insertions, 213 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 2749a638feee..300f15016977 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.268 2014/01/15 15:54:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.269 2014/01/24 04:17:20 creffett Exp $
+
+*cmake-2.8.12.1-r4 (24 Jan 2014)
+
+  24 Jan 2014; Chris Reffett <creffett@gentoo.org> +cmake-2.8.12.1-r4.ebuild,
+  -cmake-2.8.12.1-r2.ebuild, -cmake-2.8.12.1-r3.ebuild:
+  Revision bump. Fix installation of bash completion files wrt bug 498056,
+  credit to Alex Turbov for the fix. Drop old.
 
   15 Jan 2014; Jeroen Roovers <jer@gentoo.org>
   files/cmake-2.8.11.2-hppa-bootstrap.patch:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 9e695c2ba650..20845ba52a7e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -31,14 +31,15 @@ DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a
 DIST cmake-2.8.12.1.tar.gz 6068021 SHA256 fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 SHA512 91b07b33208fa66228b05a940422a99569ab8a0d8132de24b0ab19fc2f7a1f0697701234a5a374fb5884f0b48f693e917c284011f1c9ec9b94e82e06b70d9b7d WHIRLPOOL 674c07f82be6096723a0f772c3cac5224083507b7771ec887c527a0e84c11c9e5d25528b1b60ca20db67d08c01b2fdddebf07f3560f35c19cb057ffba2a65907
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
 EBUILD cmake-2.8.11.2.ebuild 5404 SHA256 acbffbbd6514986a9d383aa8248f8f6d6dc620e5d0e283fd60a65203e9c352c7 SHA512 500e8c411294bc50b30dfe93dfbbd6e31dd7a79399ac5eee110922672caa951715baa3633816a953ed4b26de9ff0b252606320bf5e1d5c520862f821a77a0885 WHIRLPOOL dd7b031ec28d6754a64c639b0e4a9d3243c9c84057ed9066afea2466ab132c388acd2869e58a52dfe43fa186284f354090579c954af112df6197f0f6600a58ba
-EBUILD cmake-2.8.12.1-r2.ebuild 5514 SHA256 bcc98aa6be5c9fa6a1bdc418b921fd4fc453081387652cff8bc3fbfaae0a19c6 SHA512 534df48dc905f1f14a9dd5072a3be55cd93c944538b06bdcc2fbf2fab9af676b774aa05d0d04db0ebee34d7e76dca01a87b3e1129f7e4aaa91c5cb80044ebf1e WHIRLPOOL 7aeb64f4053f4e49a4bb3cd05b1f7ac959edb4b1bf3737b90e48014c68586f638e97189d0f6df6f11a06f9ad348cd9d6b32c8512a28865d259b5f1705f338457
-EBUILD cmake-2.8.12.1-r3.ebuild 5386 SHA256 4444243c939341bf573180143fed2aca3680f0adccd8d30956ff0292153702db SHA512 1b74e2b6e04dfe2b66437cefb0b97f423e01b50934a4a355b8fb581bb9264033f548f30cd619f965288a57c5f58a10eb98c2aaf55502566d9171f8890173d603 WHIRLPOOL d726cb41b2b18abffed2cb25aa0d2a3ba9c7d99593f58d9dc3edc629355ca0203404fd3875f726c846820f0925c18eb9bf7860c9ed9d83884ccacafae9438b1b
-MISC ChangeLog 43208 SHA256 2c7a6e0537b1d3de504eb4b8eb26d19a508c7fafe780448edbe45ea59f690ba9 SHA512 8e444a46fe7d80196d0b465c8f1df227edd59a602cf312f010f567c5a655e12510e5622a306119b2f6253cc284b7c9465a9a6eb23fb01f900de926a2f9f0c194 WHIRLPOOL 006818c02027ddf919e99f6341c6fef85a9ef1067d6d609d5e8a24aaa42f7f69419f096f327079a02c0b8480c32baad769aaf8a24df2a0e85eda84ac33e2439b
+EBUILD cmake-2.8.12.1-r4.ebuild 5507 SHA256 87a20a903e3e897f8d930209b9d44e6ab941853c56ab1d1ca3e6197e85612a61 SHA512 4c2b23facc1e7eea011cc7bcd8ea029c0062609a9b27d1c2c4a2cd7d6a35e762dfb4a19a61579662ae1b223dd4f3801c71fe43eb5da976f2a381262978206c1c WHIRLPOOL 5338d265a3d9eb983b58c1e04e6d6b675f2c2816df24ba500f9a40c5016fcc0cc5e06b0583b300cacd95a5149120810baccace7f5f9796aaf6edef80bf41b71f
+MISC ChangeLog 43504 SHA256 2d0ac92433af2a1edec350efb729a29223bfce7da3205109deb45ab7adb1091c SHA512 bf61ebafb0744612195f88f6527ebe4ba828f08ae64494d24e4439603509b409b393941937bcc07f2f977e4501d89b8f673b72a7ab31fe444f1a09ea74eb773f WHIRLPOOL 89b1992cc47d96354dba2b73ef064aa247fe9c3fb4788d51f96ba7ad0c11eeb32b8739bf64a2ef431941791e922d4659f4bf3e4a4e2c69f51a412026071c1f0a
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLWry8ACgkQVWmRsqeSphMe1QCdGxYKiic+FowBNT1QlKb3Httv
-XVgAn1a/BU21EHfsvnysJTcoS2TaBP1t
-=rN63
+iKYEAREIAGYFAlLh6TBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1T2owCfd6TeLj+BjsL38N0hJV/3g3Dt
+hN4An1CRzgWAmiB8uVC5WHlc0L8GRN+B
+=tDKT
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.12.1-r2.ebuild b/dev-util/cmake/cmake-2.8.12.1-r2.ebuild
deleted file mode 100644
index 973c300bb15f..000000000000
--- a/dev-util/cmake/cmake-2.8.12.1-r2.ebuild
+++ /dev/null
@@ -1,204 +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.12.1-r2.ebuild,v 1.1 2013/12/15 00:16:15 johu 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.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-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.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
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	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 "${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
-	"${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/cmake-2.8.12.1-r3.ebuild b/dev-util/cmake/cmake-2.8.12.1-r4.ebuild
index 3d6022a96ac3..dfaf3bb18c2c 100644
--- a/dev-util/cmake/cmake-2.8.12.1-r3.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.1-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r3.ebuild,v 1.1 2014/01/10 01:33:13 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r4.ebuild,v 1.1 2014/01/24 04:17:20 creffett Exp $
 
 EAPI=5
 
 CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -185,6 +185,9 @@ src_install() {
 
 	insinto /usr/share/vim/vimfiles/ftdetect
 	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
+	rm -rf "${D}/usr/share/cmake/completions" || die
 }
 
 pkg_postinst() {