commit: f20185d9e99d291dcc416c109c6141eb5c09ebe1 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Aug 28 09:24:06 2015 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Aug 28 09:29:16 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20185d9
dev-util/cmake: Added FindPkgConfig variable dereference fix to 3.2.x branch as well. Did some whitespace/quoting fixes in the 3.3.1-r1 ebuild. Package-Manager: portage-2.2.20.1 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> .../cmake/{cmake-3.3.1-r1.ebuild => cmake-3.2.3-r1.ebuild} | 13 +++++-------- dev-util/cmake/cmake-3.3.1-r1.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.2.3-r1.ebuild similarity index 91% copy from dev-util/cmake/cmake-3.3.1-r1.ebuild copy to dev-util/cmake/cmake-3.2.3-r1.ebuild index a2cda8a..0b02576 100644 --- a/dev-util/cmake/cmake-3.3.1-r1.ebuild +++ b/dev-util/cmake/cmake-3.2.3-r1.ebuild @@ -7,16 +7,14 @@ EAPI=5 CMAKE_REMOVE_MODULES="no" inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx -MY_P="${P/_/-}" - 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 +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" LICENSE="CMake" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~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" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~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" IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" RDEPEND=" @@ -42,8 +40,6 @@ DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) " -S="${WORKDIR}/${MY_P}" - SITEFILE="50${PN}-gentoo.el" CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" @@ -64,8 +60,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - #upstream fixes (can usually be removed with a version bump) - "${DISTDIR}/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" + # upstream backports + "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch + "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild index a2cda8a..69601e9 100644 --- a/dev-util/cmake/cmake-3.3.1-r1.ebuild +++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild @@ -64,8 +64,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - #upstream fixes (can usually be removed with a version bump) - "${DISTDIR}/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" + # upstream fixes (can usually be removed with a version bump) + "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch ) cmake_src_bootstrap() {