3 files changed, 38 insertions, 5 deletions
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))