--- /dev/null
+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))
+-
+ \f
+ ;;; 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))
--- /dev/null
+# 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
+}