From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E323B15803E for ; Fri, 5 Jan 2024 11:18:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8654E2BC12A; Fri, 5 Jan 2024 11:18:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6300B2BC12A for ; Fri, 5 Jan 2024 11:18:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 630413430E1 for ; Fri, 5 Jan 2024 11:18:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5CDDAE5 for ; Fri, 5 Jan 2024 11:17:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1704452678.558099ca417b8dbb16310beb3c3e65f4a53e28fe.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.28.1-r1.ebuild dev-util/cmake/cmake-9999.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 558099ca417b8dbb16310beb3c3e65f4a53e28fe X-VCS-Branch: master Date: Fri, 5 Jan 2024 11:17:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0567276c-813f-49be-95d8-a2c5d84f91f8 X-Archives-Hash: ce4f0b7f02a3db11d9cfb1dcea68b1ac commit: 558099ca417b8dbb16310beb3c3e65f4a53e28fe Author: Sam James gentoo org> AuthorDate: Fri Jan 5 11:04:38 2024 +0000 Commit: Sam James gentoo 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 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