From: John Turner <jturner.usa+gentoo@gmail.com>
Date: Sun, 5 Dec 2021 04:51:49 +0000 (-0500)
Subject: app-emacs/flycheck: Patched out the pkg-info requirement. Created live template to... 
X-Git-Url: https://jturnerusa.dev/gitweb/?a=commitdiff_plain;h=8994f53af9bf63fb21caa0ff434b0c466d24d20d;p=ebuilds

app-emacs/flycheck: Patched out the pkg-info requirement. Created live template to share between ebuilds.
---

diff --git a/app-emacs/flycheck/files/flycheck-32-remove-pkg-info.diff b/app-emacs/flycheck/files/flycheck-32-remove-pkg-info.diff
new file mode 100644
index 0000000..2bb67aa
--- /dev/null
+++ b/app-emacs/flycheck/files/flycheck-32-remove-pkg-info.diff
@@ -0,0 +1,44 @@
+# Removes pkg-info and epl as depdendencies by replacing functions provided by them with built ins.
+# https://github.com/flycheck/flycheck/pull/1818
+
+
+diff --git a/flycheck.el b/flycheck.el
+index e3722fd50..33e667671 100644
+--- a/flycheck.el
++++ b/flycheck.el
+@@ -10,7 +10,7 @@
+ ;; URL: http://www.flycheck.org
+ ;; Keywords: convenience, languages, tools
+ ;; Version: 32-cvs
+-;; 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.
+ 
+@@ -79,6 +79,7 @@
+ (require 'rx)                    ; Regexp fanciness in `flycheck-define-checker'
+ (require 'help-mode)             ; `define-button-type'
+ (require 'find-func)             ; `find-function-regexp-alist'
++(require 'lisp-mnt)              ; `lm-version'
+ (require 'json)                  ; `flycheck-parse-tslint'
+ (require 'ansi-color)            ; `flycheck-parse-with-patterns-without-color'
+ 
+@@ -90,9 +91,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
+@@ -1284,7 +1282,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_p20210825.ebuild b/app-emacs/flycheck/flycheck-32_p20210825.ebuild
index c7352b1..8655676 100644
--- a/app-emacs/flycheck/flycheck-32_p20210825.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20210825.ebuild
@@ -7,20 +7,38 @@ NEED_EMACS="24.3"
 
 inherit elisp
 
+if [[ ${PV} = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flycheck/flycheck"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT="784f184cdd9f9cb4e3dbb997c09d93e954142842"
+		SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
+	else
+		SRC_URI="https://github.com/flycheck/flycheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64"
+fi
+
 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 mirror" # test requires cask and ert-runner which are not packaged yet
+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.el"
-DOCS=( README.md )
+PATCHES=( "${FILESDIR}/flycheck-32-remove-pkg-info.diff" )
+DOCS=( README.md CHANGES.rst )
 ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el"
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}
diff --git a/app-emacs/flycheck/flycheck-9999.ebuild b/app-emacs/flycheck/flycheck-9999.ebuild
new file mode 100644
index 0000000..b5f3e38
--- /dev/null
+++ b/app-emacs/flycheck/flycheck-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NEED_EMACS="24.3"
+
+inherit elisp
+
+if [[ ${PV} = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flycheck/flycheck"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	COMMIT="784f184cdd9f9cb4e3dbb997c09d93e954142842"
+	SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs"
+HOMEPAGE="https://www.flycheck.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+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}/flycheck-32-remove-pkg-info.diff" )
+DOCS=( README.md CHANGES.rst )
+ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el"
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}