dev-util/cmake: Drop old
authorAndreas Sturmlechner <asturm@gentoo.org>
Fri, 14 Jun 2019 17:51:45 +0000 (19:51 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Fri, 14 Jun 2019 20:42:20 +0000 (22:42 +0200)
Closes: https://bugs.gentoo.org/644860
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

16 files changed:
dev-util/cmake/Manifest
dev-util/cmake/cmake-3.11.4-r1.ebuild [deleted file]
dev-util/cmake/cmake-3.12.3.ebuild [deleted file]
dev-util/cmake/cmake-3.13.4.ebuild [deleted file]
dev-util/cmake/cmake-3.14.4.ebuild [deleted file]
dev-util/cmake/cmake-3.9.6.ebuild [deleted file]
dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch [deleted file]
dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch [deleted file]
dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch [deleted file]
dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch [deleted file]
dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch [deleted file]
dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch [deleted file]
dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch [deleted file]
dev-util/cmake/files/cmake-3.9.0_rc2-FindImageMagick.patch [deleted file]
dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch [deleted file]
dev-util/cmake/metadata.xml

index 44cf237f9aff09489c08a9b1192e7c2c94013118..a0243d340bd2aee921ddd8d835fa4bf19ba33b12 100644 (file)
@@ -1,7 +1,2 @@
-DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
-DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
-DIST cmake-3.14.4.tar.gz 8853821 BLAKE2B 8005387dbb9a0d2ceffda324d81e38710b51d9e1befa40322441722038a9a5bf04127edec1feb4ab9a75779e4cbac6eb0f8bd3e0d08b7d2427e88df095851d46 SHA512 1011ba6cc54680699e97a5e25c4be6055c04f47847225f87f91ada0b2ace2d6f709a3fa49a37fd5c2276118bf29f5ce9d6e24473bff6f3c90f25e92083a5c412
 DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
-DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
diff --git a/dev-util/cmake/cmake-3.11.4-r1.ebuild b/dev-util/cmake/cmake-3.11.4-r1.ebuild
deleted file mode 100644 (file)
index 9df5664..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-       app-crypt/rhash
-       >=app-arch/libarchive-3.0.0:=
-       >=dev-libs/expat-2.0.1
-       >=dev-libs/libuv-1.10.0:=
-       >=net-misc/curl-7.21.5[ssl]
-       sys-libs/zlib
-       virtual/pkgconfig
-       emacs? ( virtual/emacs )
-       ncurses? ( sys-libs/ncurses:0= )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-       )
-       system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-       # prefix
-       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-       # handle gentoo packaging in find modules
-       "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-       "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-       "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-       # respect python eclasses
-       "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-       # boost (#660980)                                                                                                                                                                                          
-       "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
-
-       # upstream fixes (can usually be removed with a version bump)
-       "${FILESDIR}"/${P}-libuv-1.21.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
-
-       # disable running of cmake in boostrap command
-       sed -i \
-               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-               bootstrap || die "sed failed"
-
-       # 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.
-       #    BundleUtilities: bundle creation broken
-       #    CTest.updatecvs: which fails to commit as root
-       #    Fortran: requires fortran
-       #    Qt4Deploy, which tries to break sandbox and ignores prefix
-       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-       #        debugedit binary is not in the expected location
-       #    TestUpload, which requires network access
-       "${BUILD_DIR}"/bin/ctest ${ctestargs} \
-               -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-               || die "Tests failed"
-
-       popd > /dev/null
-}
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       # disable Xcode hooks, bug #652134
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-                       Source/cmGlobalXCodeGenerator.cxx || die
-       fi
-
-       # 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"
-       if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-               CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-               cmake_src_bootstrap
-       fi
-}
-
-src_configure() {
-       # Fix linking on Solaris
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-       local mycmakeargs=(
-               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
-               -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-               -DCMAKE_DOC_DIR=/share/doc/${PF}
-               -DCMAKE_MAN_DIR=/share/man
-               -DCMAKE_DATA_DIR=/share/${PN}
-               -DSPHINX_MAN=$(usex doc)
-               -DSPHINX_HTML=$(usex doc)
-               -DBUILD_CursesDialog="$(usex ncurses)"
-       )
-
-       if 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 Auxiliary/cmake-mode.el
-}
-
-src_test() {
-       virtx cmake_src_test
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       if use emacs; then
-               elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-       fi
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins Auxiliary/vim/syntax/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/indent
-       doins Auxiliary/vim/indent/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/ftdetect
-       doins "${FILESDIR}/${PN}.vim"
-
-       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-       rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
diff --git a/dev-util/cmake/cmake-3.12.3.ebuild b/dev-util/cmake/cmake-3.12.3.ebuild
deleted file mode 100644 (file)
index 1b862b5..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-       app-crypt/rhash
-       >=app-arch/libarchive-3.0.0:=
-       >=dev-libs/expat-2.0.1
-       >=dev-libs/libuv-1.10.0:=
-       >=net-misc/curl-7.21.5[ssl]
-       sys-libs/zlib
-       virtual/pkgconfig
-       emacs? ( virtual/emacs )
-       ncurses? ( sys-libs/ncurses:0= )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-       )
-       system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-       doc? (
-               dev-python/requests
-               dev-python/sphinx
-       )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-       # prefix
-       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-       # handle gentoo packaging in find modules
-       "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-       "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-       "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-       # respect python eclasses
-       "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-       # boost (#660980)
-       "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
-
-       # upstream fixes (can usually be removed with a version bump)
-)
-
-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
-
-       # disable running of cmake in boostrap command
-       sed -i \
-               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-               bootstrap || die "sed failed"
-
-       # 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.
-       #    BundleUtilities: bundle creation broken
-       #    CTest.updatecvs: which fails to commit as root
-       #    Fortran: requires fortran
-       #    Qt4Deploy, which tries to break sandbox and ignores prefix
-       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-       #        debugedit binary is not in the expected location
-       #    TestUpload, which requires network access
-       "${BUILD_DIR}"/bin/ctest ${ctestargs} \
-               -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-               || die "Tests failed"
-
-       popd > /dev/null
-}
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       # disable Xcode hooks, bug #652134
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-                       Source/cmGlobalXCodeGenerator.cxx || die
-       fi
-
-       # 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"
-       if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-               CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-               cmake_src_bootstrap
-       fi
-}
-
-src_configure() {
-       # Fix linking on Solaris
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-       local mycmakeargs=(
-               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
-               -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-               -DCMAKE_DOC_DIR=/share/doc/${PF}
-               -DCMAKE_MAN_DIR=/share/man
-               -DCMAKE_DATA_DIR=/share/${PN}
-               -DSPHINX_MAN=$(usex doc)
-               -DSPHINX_HTML=$(usex doc)
-               -DBUILD_CursesDialog="$(usex ncurses)"
-       )
-
-       if 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 Auxiliary/cmake-mode.el
-}
-
-src_test() {
-       virtx cmake_src_test
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       if use emacs; then
-               elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-       fi
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins Auxiliary/vim/syntax/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/indent
-       doins Auxiliary/vim/indent/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/ftdetect
-       doins "${FILESDIR}/${PN}.vim"
-
-       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-       rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
diff --git a/dev-util/cmake/cmake-3.13.4.ebuild b/dev-util/cmake/cmake-3.13.4.ebuild
deleted file mode 100644 (file)
index 9acfa35..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-       app-crypt/rhash
-       >=app-arch/libarchive-3.0.0:=
-       >=dev-libs/expat-2.0.1
-       >=dev-libs/libuv-1.10.0:=
-       >=net-misc/curl-7.21.5[ssl]
-       sys-libs/zlib
-       virtual/pkgconfig
-       emacs? ( virtual/emacs )
-       ncurses? ( sys-libs/ncurses:0= )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-       )
-       system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-       doc? (
-               dev-python/requests
-               dev-python/sphinx
-       )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-       # prefix
-       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-       "${FILESDIR}"/${PN}-3.13.4-prefix-dirs.patch
-       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-       # handle gentoo packaging in find modules
-       "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
-       "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-       "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-       # respect python eclasses
-       "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-       # boost (#660980)
-       "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
-
-       # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-       # Cleanup args to extract only JOBS.
-       # Because bootstrap does not know anything else.
-       grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
-       if [[ $? -eq 0 ]] ; then
-               par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
-               par_arg="--parallel=${par_arg}"
-       else
-               par_arg="--parallel=1"
-       fi
-
-       # disable running of cmake in boostrap command
-       sed -i \
-               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-               bootstrap || die "sed failed"
-
-       # 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.
-       #    BundleUtilities: bundle creation broken
-       #    CMakeOnly.AllFindModules: pthread issues
-       #    CTest.updatecvs: which fails to commit as root
-       #    Fortran: requires fortran
-       #    RunCMake.CompilerLauncher: also requires fortran
-       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-       #        debugedit binary is not in the expected location
-       #    TestUpload, which requires network access
-       "${BUILD_DIR}"/bin/ctest \
-               -j "$(makeopts_jobs)" \
-               --test-load "$(makeopts_loadavg)" \
-               ${ctestargs} \
-               -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
-               || die "Tests failed"
-
-       popd > /dev/null
-}
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       # disable Xcode hooks, bug #652134
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-                       Source/cmGlobalXCodeGenerator.cxx || die
-       fi
-
-       # Add gcc libs to the default link paths
-       sed -i \
-               -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-               -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-               -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-               Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-       if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-               CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-               cmake_src_bootstrap
-       fi
-}
-
-src_configure() {
-       # Fix linking on Solaris
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-       local mycmakeargs=(
-               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
-               -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-               -DCMAKE_DOC_DIR=/share/doc/${PF}
-               -DCMAKE_MAN_DIR=/share/man
-               -DCMAKE_DATA_DIR=/share/${PN}
-               -DSPHINX_MAN=$(usex doc)
-               -DSPHINX_HTML=$(usex doc)
-               -DBUILD_CursesDialog="$(usex ncurses)"
-       )
-
-       if 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 Auxiliary/cmake-mode.el
-}
-
-src_test() {
-       virtx cmake_src_test
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       if use emacs; then
-               elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-       fi
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins Auxiliary/vim/syntax/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/indent
-       doins Auxiliary/vim/indent/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/ftdetect
-       doins "${FILESDIR}/${PN}.vim"
-
-       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-       rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
diff --git a/dev-util/cmake/cmake-3.14.4.ebuild b/dev-util/cmake/cmake-3.14.4.ebuild
deleted file mode 100644 (file)
index 0ec7395..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
-
-RDEPEND="
-       app-crypt/rhash
-       >=app-arch/libarchive-3.0.0:=
-       >=dev-libs/expat-2.0.1
-       >=dev-libs/libuv-1.10.0:=
-       >=net-misc/curl-7.21.5[ssl]
-       sys-libs/zlib
-       virtual/pkgconfig
-       emacs? ( virtual/emacs )
-       ncurses? ( sys-libs/ncurses:0= )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-       )
-       system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       doc? (
-               dev-python/requests
-               dev-python/sphinx
-       )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-       # prefix
-       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-       "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-       # Next patch requires new work from prefix people
-       #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-       # handle gentoo packaging in find modules
-       "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
-       "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
-       "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-       # respect python eclasses
-       "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-       # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-       # Cleanup args to extract only JOBS.
-       # Because bootstrap does not know anything else.
-       grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
-       if [[ $? -eq 0 ]] ; then
-               par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
-               par_arg="--parallel=${par_arg}"
-       else
-               par_arg="--parallel=1"
-       fi
-
-       # disable running of cmake in boostrap command
-       sed -i \
-               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-               bootstrap || die "sed failed"
-
-       # 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.
-       #    BundleUtilities: bundle creation broken
-       #    CMakeOnly.AllFindModules: pthread issues
-       #    CTest.updatecvs: which fails to commit as root
-       #    Fortran: requires fortran
-       #    RunCMake.CompilerLauncher: also requires fortran
-       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-       #        debugedit binary is not in the expected location
-       #    TestUpload, which requires network access
-       "${BUILD_DIR}"/bin/ctest \
-               -j "$(makeopts_jobs)" \
-               --test-load "$(makeopts_loadavg)" \
-               ${ctestargs} \
-               -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
-               || die "Tests failed"
-
-       popd > /dev/null
-}
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       # disable Xcode hooks, bug #652134
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-                       Source/cmGlobalXCodeGenerator.cxx || die
-       fi
-
-       # Add gcc libs to the default link paths
-       sed -i \
-               -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-               -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-               -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-               Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-       if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-               CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-               cmake_src_bootstrap
-       fi
-}
-
-src_configure() {
-       # Fix linking on Solaris
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-       local mycmakeargs=(
-               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
-               -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-               -DCMAKE_DOC_DIR=/share/doc/${PF}
-               -DCMAKE_MAN_DIR=/share/man
-               -DCMAKE_DATA_DIR=/share/${PN}
-               -DSPHINX_MAN=$(usex doc)
-               -DSPHINX_HTML=$(usex doc)
-               -DBUILD_CursesDialog="$(usex ncurses)"
-               -DBUILD_TESTING=$(usex test)
-       )
-
-       if 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 Auxiliary/cmake-mode.el
-}
-
-src_test() {
-       virtx cmake_src_test
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       if use emacs; then
-               elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-       fi
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins Auxiliary/vim/syntax/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/indent
-       doins Auxiliary/vim/indent/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/ftdetect
-       doins "${FILESDIR}/${PN}.vim"
-
-       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-       rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
-       use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-       use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
deleted file mode 100644 (file)
index 094197a..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
-
-RDEPEND="
-       app-crypt/rhash
-       >=app-arch/libarchive-3.0.0:=
-       >=dev-libs/expat-2.0.1
-       >=net-misc/curl-7.21.5[ssl]
-       sys-libs/zlib
-       virtual/pkgconfig
-       emacs? ( virtual/emacs )
-       ncurses? ( sys-libs/ncurses:0= )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-       )
-       server? ( >=dev-libs/libuv-1.0.0:= )
-       system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-       # prefix
-       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
-       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-       # handle gentoo packaging in find modules
-       "${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
-       "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-       "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-       "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-       "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-       # respect python eclasses
-       "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-       "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-       # upstream fixes (can usually be removed with a version bump)
-)
-
-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
-
-       # disable running of cmake in boostrap command
-       sed -i \
-               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-               bootstrap || die "sed failed"
-
-       # 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.
-       #    BundleUtilities: bundle creation broken
-       #    CTest.updatecvs: which fails to commit as root
-       #    Fortran: requires fortran
-       #    Qt4Deploy, which tries to break sandbox and ignores prefix
-       #    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-       #        debugedit binary is not in the expected location
-       #    TestUpload, which requires network access
-       "${BUILD_DIR}"/bin/ctest ${ctestargs} \
-               -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
-               || die "Tests failed"
-
-       popd > /dev/null
-}
-
-src_prepare() {
-       cmake-utils_src_prepare
-
-       # 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"
-       if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-               CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-               cmake_src_bootstrap
-       fi
-}
-
-src_configure() {
-       # Fix linking on Solaris
-       [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-       local mycmakeargs=(
-               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
-               -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-               -DCMAKE_DOC_DIR=/share/doc/${PF}
-               -DCMAKE_MAN_DIR=/share/man
-               -DCMAKE_DATA_DIR=/share/${PN}
-               -DSPHINX_MAN=$(usex doc)
-               -DSPHINX_HTML=$(usex doc)
-               -DBUILD_CursesDialog="$(usex ncurses)"
-               -DCMake_ENABLE_SERVER_MODE="$(usex server)"
-               -DCMAKE_USE_LIBUV="$(usex server)"
-       )
-
-       if 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 Auxiliary/cmake-mode.el
-}
-
-src_test() {
-       virtx cmake_src_test
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       if use emacs; then
-               elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-       fi
-
-       insinto /usr/share/vim/vimfiles/syntax
-       doins Auxiliary/vim/syntax/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/indent
-       doins Auxiliary/vim/indent/cmake.vim
-
-       insinto /usr/share/vim/vimfiles/ftdetect
-       doins "${FILESDIR}/${PN}.vim"
-
-       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-       rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-       if use qt5; then
-               gnome2_icon_cache_update
-               xdg_desktop_database_update
-               xdg_mimeinfo_database_update
-       fi
-}
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch
deleted file mode 100644 (file)
index 342a431..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -4,6 +4,10 @@
- #
- # Find BLAS library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
- # list of libraries searched for is taken from the autoconf macro file,
-@@ -50,6 +54,23 @@
- # (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(PC_BLAS blas)
-+if(PC_BLAS_FOUND)
-+  foreach(PC_LIB ${PC_BLAS_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) 
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
-+  mark_as_advanced(BLAS_LIBRARIES)
-+else(PC_BLAS_FOUND)
-+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
-@@ -688,3 +709,5 @@
- endif()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_BLAS_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
deleted file mode 100644 (file)
index 321f053..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -4,6 +4,10 @@
- #
- # Find LAPACK library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- #
-@@ -140,6 +144,23 @@
- endmacro()
-+#
-+# first, try PkgConfig
-+#
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+  mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -348,3 +369,5 @@
- endif()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
deleted file mode 100644 (file)
index 6bad45b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -4,6 +4,10 @@
- #
- # Find BLAS library
- #
-+# Version modified for Gentoo Linux.
-+# If a valid PkgConfig configuration is found, this overrides and cancels
-+# all further checks.
-+#
- # This module finds an installed fortran library that implements the
- # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
- # list of libraries searched for is taken from the autoconf macro file,
-@@ -50,6 +54,9 @@
- # (To distribute this file outside of CMake, substitute the full
- #  License text for the above reference.)
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
diff --git a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
deleted file mode 100644 (file)
index bcf229a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/660980
-
---- cmake-3.11.4/Modules/FindBoost.cmake
-+++ cmake-3.11.4/Modules/FindBoost.cmake
-@@ -1680,7 +1680,7 @@
-     list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
-     list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
-     # Gentoo
--    list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
-+    list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}.${COMPONENT_PYTHON_VERSION_MINOR}")
-     # RPMs
-     list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
-   endif()
diff --git a/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
deleted file mode 100644 (file)
index 664c39a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Sat, 23 Jun 2018 20:30:07 +0200
-Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection
-
-Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
-Make FindLibUV aware of the file's new location for configuration to work.
-
-Upstream change: https://github.com/libuv/libuv/pull/1429
----
- Source/Modules/FindLibUV.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
-index ba13d75..0554d62 100644
---- a/Source/Modules/FindLibUV.cmake
-+++ b/Source/Modules/FindLibUV.cmake
-@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
- set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
- if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
-+  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- else()
---
-libgit2 0.27.0
diff --git a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch
deleted file mode 100644 (file)
index bb60aaf..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 9 Jun 2017 01:47:55 +0200
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
-Updated by Chris Reffett (cmake-2.8.11)
-Updated by Michael Palimaka (cmake-3.0.0)
-Updated by Lars Wendler (cmake-3.9.0_rc2)
----
- Modules/Platform/Darwin.cmake    | 12 ++++++++----
- Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++-----
- 2 files changed, 32 insertions(+), 9 deletions(-)
-
-Index: cmake-3.13.3/Modules/Platform/Darwin.cmake
-===================================================================
---- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake
-+++ cmake-3.13.3/Modules/Platform/Darwin.cmake
-@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
--  set(CMAKE_FIND_FRAMEWORK FIRST)
-+  set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
- # Older OS X linkers do not report their framework search path
-@@ -132,6 +132,8 @@ endif()
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Frameworks
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-   ~/Library/Frameworks
-   )
- if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT)
-   endif()
- endif()
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
--  set(CMAKE_FIND_APPBUNDLE FIRST)
-+  set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+  @GENTOO_PORTAGE_EPREFIX@Applications
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   "~/Applications"
-   "/Applications"
-   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake
-===================================================================
---- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake
-+++ cmake-3.13.3/Modules/Platform/UnixPaths.cmake
-@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
--  /usr/local /usr /
-+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-+  @GENTOO_HOST@/usr/local /usr /
-   # CMake install location
-   "${_CMAKE_INSTALL_DIR}"
-@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # X11
--  /usr/include/X11
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   )
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # X11
--  /usr/lib/X11
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  )
-+
-+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-+  @GENTOO_PORTAGE_EPREFIX@bin
-   )
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
-   )
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-+  @GENTOO_HOST@/usr/include
-   )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-+  @GENTOO_HOST@/usr/include
-   )
- list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
diff --git a/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch
deleted file mode 100644 (file)
index 441650b..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 7d3a5c466bf14a0c12edc6ece359012b723e39bc Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 23 Mar 2017 11:36:39 +0100
-Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
-
-Gentoo-bug: 400969
-Gentoo-bug: 613442
----
- Modules/FindBoost.cmake | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index e795aadcc..11269c30b 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -1481,6 +1481,16 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
-   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
-+  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+    # If a certain version of python has already been selected ensure we select the corresponding boost python version.
-+    if(PYTHON_EXECUTABLE)
-+      set(GENTOO_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
-+    else()
-+      set(GENTOO_PYTHON_EXECUTABLE "python")
-+    endif()
-+    execute_process(COMMAND "${GENTOO_PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
-+  endif()
-+
-   # Compute component-specific hints.
-   set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
-   if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
-@@ -1529,6 +1539,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+      list(APPEND _boost_RELEASE_NAMES
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+    endif()
-+
-   if(_boost_STATIC_RUNTIME_WORKAROUND)
-     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
-     list(APPEND _boost_RELEASE_NAMES
-@@ -1536,6 +1555,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+        list(APPEND _boost_RELEASE_NAMES
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+      endif()
-   endif()
-   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
-      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -1571,6 +1597,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+      list(APPEND _boost_DEBUG_NAMES
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
-+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+    endif()
-   if(_boost_STATIC_RUNTIME_WORKAROUND)
-     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
-     list(APPEND _boost_DEBUG_NAMES
-@@ -1578,6 +1613,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+        list(APPEND _boost_DEBUG_NAMES
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+      endif()
-   endif()
-   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
-      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
--- 
-2.12.1
-
diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-FindImageMagick.patch b/dev-util/cmake/files/cmake-3.9.0_rc2-FindImageMagick.patch
deleted file mode 100644 (file)
index ce63988..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From f51ccd38ed85e5799b2f0a88829eb6a40574ab05 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 9 Jun 2017 02:07:11 +0200
-Subject: [PATCH] Find more variants of ImageMagick
-
----
- Modules/FindImageMagick.cmake | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
-index 7d5534bc2..488d7e0bf 100644
---- a/Modules/FindImageMagick.cmake
-+++ b/Modules/FindImageMagick.cmake
-@@ -196,24 +196,30 @@ foreach(component ${ImageMagick_FIND_COMPONENTS}
-   if(component STREQUAL "Magick++")
-     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
-       Magick++ CORE_RL_Magick++_
-+      Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI
-       Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI
-       Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI
-+      Magick++-7.Q64 Magick++-7.Q64HDRI Magick++-7.Q32 Magick++-7.Q32HDRI
-       Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
-   elseif(component STREQUAL "MagickWand")
-     FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h"
-       Wand MagickWand CORE_RL_wand_
-+      MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI
-       MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI
-       MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI
-+      MagickWand-7.Q64 MagickWand-7.Q64HDRI MagickWand-7.Q32 MagickWand-7.Q32HDRI
-       MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
-   elseif(component STREQUAL "MagickCore")
-     FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h"
-       Magick MagickCore CORE_RL_magick_
-+      MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI
-       MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI
-       MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI
-+      MagickCore-7.Q64 MagickCore-7.Q64HDRI MagickCore-7.Q32 MagickCore-7.Q32HDRI
-       MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
--- 
-2.13.1
-
diff --git a/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch
deleted file mode 100644 (file)
index f4e9a27..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 9 Jun 2017 01:47:55 +0200
-Subject: [PATCH] Set some proper paths to make cmake find our tools.
-
-The ebuild now adds an extra / at the end of $EPREFIX so that it is
-never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
-correct)
-
-Original patch by Heiko Przybyl.
-Updated by Chris Reffett (cmake-2.8.8)
-Updated by Johannes Huber (cmake-2.8.9)
-Updated by Michael Palimaka (cmake-2.8.10)
-Updated by Chris Reffett (cmake-2.8.11)
-Updated by Michael Palimaka (cmake-3.0.0)
-Updated by Lars Wendler (cmake-3.9.0_rc2)
----
- Modules/Platform/Darwin.cmake    | 12 ++++++++----
- Modules/Platform/UnixPaths.cmake | 29 ++++++++++++++++++++++++-----
- 2 files changed, 32 insertions(+), 9 deletions(-)
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index 727baa6e1..543d9e034 100644
---- a/Modules/Platform/Darwin.cmake
-+++ b/Modules/Platform/Darwin.cmake
-@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
- set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
--# default to searching for frameworks first
-+# default to searching for frameworks last
- if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
--  set(CMAKE_FIND_FRAMEWORK FIRST)
-+  set(CMAKE_FIND_FRAMEWORK LAST)
- endif()
- # Older OS X linkers do not report their framework search path
-@@ -132,6 +132,8 @@ endif()
- # set up the default search directories for frameworks
- set(CMAKE_SYSTEM_FRAMEWORK_PATH
-+  @GENTOO_PORTAGE_EPREFIX@Frameworks
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-   ~/Library/Frameworks
-   )
- if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT)
-   endif()
- endif()
--# default to searching for application bundles first
-+# default to searching for application bundles last
- if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
--  set(CMAKE_FIND_APPBUNDLE FIRST)
-+  set(CMAKE_FIND_APPBUNDLE LAST)
- endif()
- # set up the default search directories for application bundles
- set(_apps_paths)
- foreach(_path
-+  @GENTOO_PORTAGE_EPREFIX@Applications
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-   "~/Applications"
-   "/Applications"
-   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
-diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 5687653cf..be7695898 100644
---- a/Modules/Platform/UnixPaths.cmake
-+++ b/Modules/Platform/UnixPaths.cmake
-@@ -23,6 +23,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-   # Standard
-+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
-   /usr/local /usr /
-   # CMake install location
-@@ -50,23 +51,41 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # X11
--  /usr/include/X11
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   )
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # X11
--  /usr/lib/X11
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  )
-+
-+list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
-+  @GENTOO_PORTAGE_EPREFIX@usr/bin
-+  @GENTOO_PORTAGE_EPREFIX@bin
-   )
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
-+  @GENTOO_PORTAGE_GCCLIBDIR@
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
-+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
-+  @GENTOO_PORTAGE_EPREFIX@usr/lib
-+  @GENTOO_PORTAGE_EPREFIX@lib
-+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
-   )
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-   /usr/include
-   )
--- 
-2.13.1
-
index c5d121a7e9cb48e0a5bafedcbff98d9d6a8b2e6b..437189ffd4f8b5de563606c1ee8281681f12379f 100644 (file)
@@ -6,7 +6,6 @@
                <name>Gentoo KDE Project</name>
        </maintainer>
        <use>
-               <flag name="server">Enable cmake-server support.</flag>
                <flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
        </use>
 </pkgmetadata>