commit: 558099ca417b8dbb16310beb3c3e65f4a53e28fe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 11:04:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 11:04:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=558099ca
dev-util/cmake: move Emacs files to app-emacs/cmake-mode
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{cmake-9999.ebuild => cmake-3.28.1-r1.ebuild} | 25 ++++++----------------
dev-util/cmake/cmake-9999.ebuild | 24 +++++----------------
2 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/dev-util/cmake/cmake-9999.ebuild
b/dev-util/cmake/cmake-3.28.1-r1.ebuild
similarity index 93%
copy from dev-util/cmake/cmake-9999.ebuild
copy to dev-util/cmake/cmake-3.28.1-r1.ebuild
index c13fb3391127..defa28f4cf1f 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-3.28.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
: ${CMAKE_DOCS_PREBUILT:=1}
CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=3.27.0
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
# See bug #784815
CMAKE_DOCS_USEFLAG="+doc"
@@ -19,7 +20,7 @@ CMAKE_DOCS_USEFLAG="+doc"
# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
toolchain-funcs virtualx xdg-utils
MY_P="${P/_/-}"
@@ -59,7 +60,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -72,7 +73,6 @@ RDEPEND="
sys-libs/zlib
virtual/pkgconfig
dap? ( dev-cpp/cppdap )
- emacs? ( >=app-editors/emacs-23.1:* )
gui? (
!qt6? (
dev-qt/qtcore:5
@@ -105,6 +105,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
# Upstream fixes (can usually be removed with a version bump)
+ "${FILESDIR}"/${PN}-3.28.0-c99.patch
)
cmake_src_bootstrap() {
@@ -211,11 +212,6 @@ src_configure() {
cmake_src_configure
}
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
src_test() {
# Fix OutDir and SelectLibraryConfigurations tests
# these are altered thanks to our eclass
@@ -254,11 +250,6 @@ src_install() {
doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
fi
- 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
@@ -272,8 +263,6 @@ src_install() {
}
pkg_postinst() {
- use emacs && elisp-site-regen
-
if use gui; then
xdg_icon_cache_update
xdg_desktop_database_update
@@ -282,8 +271,6 @@ pkg_postinst() {
}
pkg_postrm() {
- use emacs && elisp-site-regen
-
if use gui; then
xdg_icon_cache_update
xdg_desktop_database_update
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index c13fb3391127..45477a10bfce 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
: ${CMAKE_DOCS_PREBUILT:=1}
CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=3.27.0
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
# See bug #784815
CMAKE_DOCS_USEFLAG="+doc"
@@ -19,7 +20,7 @@ CMAKE_DOCS_USEFLAG="+doc"
# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+inherit bash-completion-r1 cmake flag-o-matic multiprocessing \
toolchain-funcs virtualx xdg-utils
MY_P="${P/_/-}"
@@ -59,7 +60,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
+IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -72,7 +73,6 @@ RDEPEND="
sys-libs/zlib
virtual/pkgconfig
dap? ( dev-cpp/cppdap )
- emacs? ( >=app-editors/emacs-23.1:* )
gui? (
!qt6? (
dev-qt/qtcore:5
@@ -211,11 +211,6 @@ src_configure() {
cmake_src_configure
}
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
src_test() {
# Fix OutDir and SelectLibraryConfigurations tests
# these are altered thanks to our eclass
@@ -254,11 +249,6 @@ src_install() {
doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
fi
- 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
@@ -272,8 +262,6 @@ src_install() {
}
pkg_postinst() {
- use emacs && elisp-site-regen
-
if use gui; then
xdg_icon_cache_update
xdg_desktop_database_update
@@ -282,8 +270,6 @@ pkg_postinst() {
}
pkg_postrm() {
- use emacs && elisp-site-regen
-
if use gui; then
xdg_icon_cache_update
xdg_desktop_database_update
