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 0C73C15803E for ; Fri, 5 Jan 2024 09:39:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F16E52BC10B; Fri, 5 Jan 2024 09:39:18 +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 715132BC10B for ; Fri, 5 Jan 2024 09:39:17 +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 BDECA3430EF for ; Fri, 5 Jan 2024 09:39:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0ADF51339 for ; Fri, 5 Jan 2024 09:39:15 +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: <1704447439.aac64dad7bd5e8e6fcc4e63baff0f54807712280.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/ninja/ninja-1.11.1-r4.ebuild dev-util/ninja/ninja-9999.ebuild X-VCS-Directories: dev-util/ninja/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aac64dad7bd5e8e6fcc4e63baff0f54807712280 X-VCS-Branch: master Date: Fri, 5 Jan 2024 09:39:15 +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: 0435a00b-caca-4fe1-8438-768d986c2ad3 X-Archives-Hash: cc1824787516395258a4a63154c45228 commit: aac64dad7bd5e8e6fcc4e63baff0f54807712280 Author: Sam James gentoo org> AuthorDate: Fri Jan 5 09:11:36 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 5 09:37:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac64dad dev-util/ninja: move Emacs files to app-emacs/ninja-mode Bug: https://bugs.gentoo.org/921333 Signed-off-by: Sam James gentoo.org> .../{ninja-9999.ebuild => ninja-1.11.1-r4.ebuild} | 25 ++++++---------------- dev-util/ninja/ninja-9999.ebuild | 25 ++++++---------------- 2 files changed, 12 insertions(+), 38 deletions(-) diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-1.11.1-r4.ebuild similarity index 83% copy from dev-util/ninja/ninja-9999.ebuild copy to dev-util/ninja/ninja-1.11.1-r4.ebuild index c4874b6be066..e76fd4222cba 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-1.11.1-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs +inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" @@ -20,7 +20,6 @@ HOMEPAGE="https://ninja-build.org/" LICENSE="Apache-2.0" SLOT="0" - IUSE="doc emacs test" RESTRICT="!test? ( test )" @@ -35,8 +34,10 @@ BDEPEND=" ) test? ( dev-cpp/gtest ) " -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" -PDEPEND="app-alternatives/ninja" +PDEPEND=" + app-alternatives/ninja + emacs? ( app-emacs/ninja-mode ) +" PATCHES=( "${FILESDIR}"/ninja-cflags.patch @@ -75,10 +76,6 @@ src_compile() { if use doc; then ./ninja-build -v doxygen manual || die fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi } src_test() { @@ -112,20 +109,10 @@ src_install() { insinto /usr/share/zsh/site-functions newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi } pkg_postinst() { - use emacs && elisp-site-regen if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die fi } - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild index c4874b6be066..e76fd4222cba 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs +inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" @@ -20,7 +20,6 @@ HOMEPAGE="https://ninja-build.org/" LICENSE="Apache-2.0" SLOT="0" - IUSE="doc emacs test" RESTRICT="!test? ( test )" @@ -35,8 +34,10 @@ BDEPEND=" ) test? ( dev-cpp/gtest ) " -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" -PDEPEND="app-alternatives/ninja" +PDEPEND=" + app-alternatives/ninja + emacs? ( app-emacs/ninja-mode ) +" PATCHES=( "${FILESDIR}"/ninja-cflags.patch @@ -75,10 +76,6 @@ src_compile() { if use doc; then ./ninja-build -v doxygen manual || die fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi } src_test() { @@ -112,20 +109,10 @@ src_install() { insinto /usr/share/zsh/site-functions newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi } pkg_postinst() { - use emacs && elisp-site-regen if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die fi } - -pkg_postrm() { - use emacs && elisp-site-regen -}