commit: aac64dad7bd5e8e6fcc4e63baff0f54807712280 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 5 09:11:36 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 -}
