app-emacs/flycheck: flycheck 32 is now in gentoo

7 files changed, 45 insertions, 35 deletions

diff --git a/app-emacs/flycheck/Manifest b/app-emacs/flycheck/Manifest
index 8abe02a..881b05c 100644
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@@ -1,2 +1 @@
-DIST flycheck-32_p20210825.tar.gz 1042020 BLAKE2B 1663340de24980b3a1e58929e327841b743495dbd5d5c8306f007d0dfa989707015ceadaf6e5cac673eddb45adf9ec05dc35d8cb35af322c9cde6644194dd75d SHA512 472e25956d804e7f7ba8ebda2e3a7527eaaf3aee47fa5bd43a46ae651f94d857657cf4594f5a1ed0c169ec0ac610139956d182818ffeedf2c4132a5583ca870d
 DIST flycheck-32_p20220328.tar.gz 1037565 BLAKE2B 385d73e9ccae06db09d23819600317b807b7ff8cf0679be510cac27d539e57374fffd67575687067e8d6beeae66472b2831a5ece4adbe7b85da9b484dc8b6346 SHA512 f2c5dad66a1bae826f1b48242d3b1202cf41615fa2eadba55c4aabbbd9616ca873ba93c8c9f53cbefc22587b70ed1a2cd4fcbdcb2d6caf13d0c21c4d36e4ffc7
diff --git a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
deleted file mode 100644
index 46ab676..0000000
--- a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/flycheck-autoloads")
diff --git a/app-emacs/flycheck/files/50flycheck-gentoo.el b/app-emacs/flycheck/files/50flycheck-gentoo.el
index 5f6c703..46ab676 100644
--- a/app-emacs/flycheck/files/50flycheck-gentoo.el
+++ b/app-emacs/flycheck/files/50flycheck-gentoo.el
@@ -1,4 +1,2 @@
-;;; Flycheck site-lisp configuration
 (add-to-list 'load-path "@SITELISP@")
-(autoload 'flycheck-mode "flycheck" nil t)
-(autoload 'global-flycheck-mode "flycheck" nil t)
+(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
new file mode 100644
index 0000000..c35e6d0
--- /dev/null
+++ b/app-emacs/flycheck/files/flycheck-32_p20220328-no-pkg-info.diff
@@ -0,0 +1,37 @@
+--- 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/flycheck-32_p20210825.ebuild b/app-emacs/flycheck/flycheck-32_p20210825.ebuild
deleted file mode 100644
index 2f6ead3..0000000
--- a/app-emacs/flycheck/flycheck-32_p20210825.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-NEED_EMACS="24.3"
-
-inherit elisp
-
-DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs"
-HOMEPAGE="https://www.flycheck.org/"
-COMMIT="784f184cdd9f9cb4e3dbb997c09d93e954142842"
-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
->=app-emacs/pkg-info-0.4"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS=( README.md )
-ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el"
diff --git a/app-emacs/flycheck/flycheck-32_p20220328.ebuild b/app-emacs/flycheck/flycheck-32_p20220328.ebuild
index 0d92a6a..8c01ec0 100644
--- a/app-emacs/flycheck/flycheck-32_p20220328.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328.ebuild
@@ -18,10 +18,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
 
-RDEPEND=">=app-emacs/dash-2.12.1
-	>=app-emacs/pkg-info-0.4"
+RDEPEND=">=app-emacs/dash-2.12.1"
 
-SITEFILE="50${PN}-gentoo-r1.el"
+SITEFILE="50${PN}-gentoo.el"
+PATCHES=( ${FILESDIR}/${P}-no-pkg-info.diff )
 DOCS=( README.md )
 ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el"
 
diff --git a/app-emacs/flycheck/metadata.xml b/app-emacs/flycheck/metadata.xml
index e96ebcf..a29ea6e 100644
--- a/app-emacs/flycheck/metadata.xml
+++ b/app-emacs/flycheck/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">flycheck/flycheck</remote-id>
     <doc>https://github.com/flycheck/flycheck/blob/master/README.md</doc>