From fcf6ad06a8776a164876270a5b14bde4c91a0621 Mon Sep 17 00:00:00 2001 From: John Turner Date: Tue, 13 Feb 2024 17:18:15 -0500 Subject: [PATCH] app-emacs/flycheck: create flycheck-33.1_p20240213.ebuild This commit allows dropping pkg-info as a dependency! --- app-emacs/flycheck/Manifest | 2 +- .../flycheck/files/50flycheck-gentoo-r1.el | 2 + app-emacs/flycheck/files/50flycheck-gentoo.el | 2 - .../flycheck-32_p20220328-no-pkg-info.diff | 37 --------------- .../flycheck-32_p20230305-no-pkg-info.diff | 41 ----------------- .../flycheck/flycheck-32_p20220328.ebuild | 31 ------------- .../flycheck/flycheck-32_p20230305.ebuild | 31 ------------- .../flycheck/flycheck-33.1_p20240213.ebuild | 45 +++++++++++++++++++ 8 files changed, 48 insertions(+), 143 deletions(-) create mode 100644 app-emacs/flycheck/files/50flycheck-gentoo-r1.el delete mode 100644 app-emacs/flycheck/files/50flycheck-gentoo.el delete mode 100644 app-emacs/flycheck/files/flycheck-32_p20220328-no-pkg-info.diff delete mode 100644 app-emacs/flycheck/files/flycheck-32_p20230305-no-pkg-info.diff delete mode 100644 app-emacs/flycheck/flycheck-32_p20220328.ebuild delete mode 100644 app-emacs/flycheck/flycheck-32_p20230305.ebuild create mode 100644 app-emacs/flycheck/flycheck-33.1_p20240213.ebuild diff --git a/app-emacs/flycheck/Manifest b/app-emacs/flycheck/Manifest index 881b05c..4222fbf 100644 --- a/app-emacs/flycheck/Manifest +++ b/app-emacs/flycheck/Manifest @@ -1 +1 @@ -DIST flycheck-32_p20220328.tar.gz 1037565 BLAKE2B 385d73e9ccae06db09d23819600317b807b7ff8cf0679be510cac27d539e57374fffd67575687067e8d6beeae66472b2831a5ece4adbe7b85da9b484dc8b6346 SHA512 f2c5dad66a1bae826f1b48242d3b1202cf41615fa2eadba55c4aabbbd9616ca873ba93c8c9f53cbefc22587b70ed1a2cd4fcbdcb2d6caf13d0c21c4d36e4ffc7 +DIST flycheck-33.1_p20240213.tar.gz 1045458 BLAKE2B 526e1eaeb24ae1e6c747add0a3d461d2d8eab2147de27843cabffa35e4d0a517be36b83e1da2814ae10a492918d66282e0b043f36b7e897f6a6531bfa0804349 SHA512 1d7fcabbd0535521d5c7c310158317a5be2484f8ea38cd7496f6e48ff2dd58bfa81e764e2f182dfdbbb41b5c4e85229324dc190f8fe338c8b1c0734541691b8a diff --git a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el new file mode 100644 index 0000000..84a054e --- /dev/null +++ b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el @@ -0,0 +1,2 @@ +(add-to-list 'load-path "@SITELISP@") +(load "@SITELISP@/flycheck-autoloads" nil t) diff --git a/app-emacs/flycheck/files/50flycheck-gentoo.el b/app-emacs/flycheck/files/50flycheck-gentoo.el deleted file mode 100644 index 46ab676..0000000 --- a/app-emacs/flycheck/files/50flycheck-gentoo.el +++ /dev/null @@ -1,2 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(load "@SITELISP@/flycheck-autoloads") diff --git a/app-emacs/flycheck/files/flycheck-32_p20220328-no-pkg-info.diff b/app-emacs/flycheck/files/flycheck-32_p20220328-no-pkg-info.diff deleted file mode 100644 index c35e6d0..0000000 --- a/app-emacs/flycheck/files/flycheck-32_p20220328-no-pkg-info.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- a/flycheck.el -+++ b/flycheck.el -@@ -10,7 +10,7 @@ - ;; URL: http://www.flycheck.org - ;; Keywords: convenience, languages, tools - ;; Version: 32 --;; Package-Requires: ((dash "2.12.1") (pkg-info "0.4") (let-alist "1.0.4") (seq "1.11") (emacs "24.3")) -+;; Package-Requires: ((dash "2.12.1") (let-alist "1.0.4") (seq "1.11") (emacs "24.3")) - - ;; This file is not part of GNU Emacs. - -@@ -81,15 +81,13 @@ - (require 'find-func) ; `find-function-regexp-alist' - (require 'json) ; `flycheck-parse-tslint' - (require 'ansi-color) ; `flycheck-parse-with-patterns-without-color' -+(require 'lisp-mnt) ; `lm-version' - - - ;; Declare a bunch of dynamic variables that we need from other modes - (defvar sh-shell) ; For shell script checker predicates - (defvar ess-language) ; For r-lintr predicate - --;; Tell the byte compiler about autoloaded functions from packages --(declare-function pkg-info-version-info "pkg-info" (package)) -- - - ;;; Compatibility - (eval-and-compile -@@ -1275,7 +1273,7 @@ - if called interactively, or if SHOW-VERSION is non-nil, otherwise - just return nil." - (interactive (list t)) -- (let ((version (pkg-info-version-info 'flycheck))) -+ (let ((version (lm-version (find-library-name "flycheck")))) - (when show-version - (message "Flycheck version: %s" version)) - version)) diff --git a/app-emacs/flycheck/files/flycheck-32_p20230305-no-pkg-info.diff b/app-emacs/flycheck/files/flycheck-32_p20230305-no-pkg-info.diff deleted file mode 100644 index e205510..0000000 --- a/app-emacs/flycheck/files/flycheck-32_p20230305-no-pkg-info.diff +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/flycheck.el b/flycheck.el -index a364b000..cca47864 100644 ---- a/flycheck.el -+++ b/flycheck.el -@@ -10,7 +10,7 @@ - ;; URL: http://www.flycheck.org - ;; Keywords: convenience, languages, tools - ;; Version: 33-cvs --;; Package-Requires: ((emacs "25.1") (dash "2.12.1") (pkg-info "0.4") (let-alist "1.0.4") (seq "1.11")) -+;; Package-Requires: ((emacs "25.1") (dash "2.12.1") (let-alist "1.0.4") (seq "1.11")) - - ;; This file is not part of GNU Emacs. - -@@ -81,7 +81,7 @@ - (require 'find-func) ; `find-function-regexp-alist' - (require 'json) ; `flycheck-parse-tslint' - (require 'ansi-color) ; `flycheck-parse-with-patterns-without-color' -- -+(require 'lisp-mnt) - - ;; Declare a bunch of dynamic variables that we need from other modes - (defvar sh-shell) ; For shell script checker predicates -@@ -90,9 +90,6 @@ - (defvar markdown-fontify-code-block-default-mode) ; For rust-error-explainer - (defvar markdown-fontify-code-blocks-natively) ; - --;; Tell the byte compiler about autoloaded functions from packages --(declare-function pkg-info-version-info "pkg-info" (package)) -- - - ;;; Compatibility - (eval-and-compile -@@ -1287,7 +1284,7 @@ If the version number could not be determined, signal an error, - if called interactively, or if SHOW-VERSION is non-nil, otherwise - just return nil." - (interactive (list t)) -- (let ((version (pkg-info-version-info 'flycheck))) -+ (let ((version (lm-version (find-library-name "flycheck")))) - (when show-version - (message "Flycheck version: %s" version)) - version)) diff --git a/app-emacs/flycheck/flycheck-32_p20220328.ebuild b/app-emacs/flycheck/flycheck-32_p20220328.ebuild deleted file mode 100644 index 8c01ec0..0000000 --- a/app-emacs/flycheck/flycheck-32_p20220328.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -NEED_EMACS="24.3" - -inherit elisp - -DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs" -HOMEPAGE="https://www.flycheck.org/" -COMMIT="3b5b4248074f016922c2674789d4a242528cf4c7" -SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # test requires cask and ert-runner which are not packaged yet - -RDEPEND=">=app-emacs/dash-2.12.1" - -SITEFILE="50${PN}-gentoo.el" -PATCHES=( ${FILESDIR}/${P}-no-pkg-info.diff ) -DOCS=( README.md ) -ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el" - -src_compile() { - elisp_src_compile - elisp-make-autoload-file -} diff --git a/app-emacs/flycheck/flycheck-32_p20230305.ebuild b/app-emacs/flycheck/flycheck-32_p20230305.ebuild deleted file mode 100644 index b6d6f7e..0000000 --- a/app-emacs/flycheck/flycheck-32_p20230305.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -NEED_EMACS="24.3" - -inherit elisp - -DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs" -HOMEPAGE="https://www.flycheck.org/" -COMMIT=5f2ef177cb21ae8b73714575802beef04abd0f5e -SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # test requires cask and ert-runner which are not packaged yet - -RDEPEND=">=app-emacs/dash-2.12.1" - -SITEFILE="50${PN}-gentoo.el" -PATCHES=( ${FILESDIR}/${P}-no-pkg-info.diff ) -DOCS=( README.md ) -ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el" - -src_compile() { - elisp_src_compile - elisp-make-autoload-file -} diff --git a/app-emacs/flycheck/flycheck-33.1_p20240213.ebuild b/app-emacs/flycheck/flycheck-33.1_p20240213.ebuild new file mode 100644 index 0000000..b44a24a --- /dev/null +++ b/app-emacs/flycheck/flycheck-33.1_p20240213.ebuild @@ -0,0 +1,45 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp + +DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs" +HOMEPAGE="https://www.flycheck.org/ https://github.com/flycheck/flycheck/" +COMMIT="d2c0ec52dd16d7b16f6789e207122d78a3530775" +SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" +LICENSE="GPL-3+" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="" +BDEPEND=" + test? ( + app-emacs/buttercup + app-emacs/shut-up + ) +" + +ELISP_REMOVE=" + test/specs/test-documentation.el + test/specs/test-melpa-package.el +" + +SITEFILE="50${PN}-gentoo-r1.el" +DOCS=( CHANGES.rst README.md ) + +src_compile() { + elisp-compile "${PN}.el" + elisp-make-autoload-file +} + +src_install() { + elisp-install "${PN}" ${PN}.el{,c} "${PN}-autoloads.el" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + einstalldocs +} -- 2.39.5