6 files changed, 57 insertions, 46 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3adcf30b41f4..cbd9cd9d8198 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/flycheck/Manifest b/app-emacs/flycheck/Manifest
index 6041426acf7e..8e96d24d0605 100644
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@@ -1,10 +1,8 @@
 AUX 50flycheck-gentoo-r1.el 83 BLAKE2B 5d35105289d99c3e33102c6f5d84135600ad4fcff435a7c691972a259071702cb240e17bee12e9dc61386e7f2397d5a6fdd52187f4beeb91e84855285a4c0f3b SHA512 e89e263133108f2a5be2539abc2fc67134d49217ca8db8da9fe3faa4107b32d42896875797811c879a6f1f4746a1f097acc38e6c1cefe093570d6de023cd4f09
 AUX 50flycheck-gentoo.el 168 BLAKE2B e1a9855c04e42743261f2d1483772fac65c8c6a30702aefbff97cb6e90d631e4e6e862f93b3bdba175d83c4e9dd95db5b13e07fb8a428cdda4e046d58cbae71f SHA512 a1a6bfe0a380d948e3e2e6b7f3d7034aaf25f110966ab991a04f818d493892d9cd50078cb709205189e7a7f59ea052ab16b5e4d4c43f66c1f0b3dfd2ada00988
-DIST flycheck-32_p20210825.tar.gz 1042020 BLAKE2B 1663340de24980b3a1e58929e327841b743495dbd5d5c8306f007d0dfa989707015ceadaf6e5cac673eddb45adf9ec05dc35d8cb35af322c9cde6644194dd75d SHA512 472e25956d804e7f7ba8ebda2e3a7527eaaf3aee47fa5bd43a46ae651f94d857657cf4594f5a1ed0c169ec0ac610139956d182818ffeedf2c4132a5583ca870d
 DIST flycheck-32_p20220328.tar.gz 1037565 BLAKE2B 385d73e9ccae06db09d23819600317b807b7ff8cf0679be510cac27d539e57374fffd67575687067e8d6beeae66472b2831a5ece4adbe7b85da9b484dc8b6346 SHA512 f2c5dad66a1bae826f1b48242d3b1202cf41615fa2eadba55c4aabbbd9616ca873ba93c8c9f53cbefc22587b70ed1a2cd4fcbdcb2d6caf13d0c21c4d36e4ffc7
 DIST flycheck-32_p20230305.tar.gz 1044121 BLAKE2B 6a31ea589f0aca4ed6785fe3e45e5df4af9b084af2d4de9b707c2909db53fd2d3694559b35da69ba05240638a8105fddc5017e1ef037d9ad8a07c77b0efe905a SHA512 1b2d41df199328a297f0623585f4692529a656671b17fd5fbe4b6f9abd7320b2d81f7da6e3e0f17f4bc65474661310f99856a003670276ba6fb2a81780fc8377
-EBUILD flycheck-32_p20210825.ebuild 714 BLAKE2B 0c63e62084ee11a5ff191e396278c924d06e1ae10c8d4e6214cf92ddba242ac9be1fbcca05c14b1f6f053e76f04571b432c5b5581285f28515aae271a28654d9 SHA512 dc93f0bb77db8e332761264860b7433abd9548aa2f3634df7f2c7a80d7762cc6f36b384ca60a6765b17422fbd4abbd5af65f5377ede58d046a0a5b7a5f293c9b
-EBUILD flycheck-32_p20220328-r1.ebuild 820 BLAKE2B 4acb46fed6de8dee17867c15b567be8fc82fbe95a4c9e8213a276fa742ae78aeee4e1b156dbc2bacd39d144635552dabb0d106218b49003fc2d0227d2c57eb22 SHA512 3075c8e8a26e8bb0a08f84fb09557de1c15726764775356e8ae5bc2d7baa974cac6738bcdec7ded2e9351be4dc28ce4069037a5e8759a215a3432b24d4146814
-EBUILD flycheck-32_p20230305-r1.ebuild 1208 BLAKE2B a8110b99a50ffb6525d0a3b77dccc00cbdd740bfd1ff14c0c7ba6035c057a5b08fde8ebc739a4ac1346ff7e9740072ab3541735a8491b8e7c03502aa25cff4ab SHA512 598ee44b0d4c695839e07217a66cafdf9a12a2056e903acbb7d3758d0f0b93c4ae650f7cf70ccc723969da8d19ffdbcd8ed6db730fd42f2ab66fa492afbfa3e2
-EBUILD flycheck-32_p20230305.ebuild 817 BLAKE2B 814a564bc2a2379987a9dcbe51ce21227e2b0d692eee95b231e86c7d0dfd045d5d5608169b6afa223db87905f0efe132406293ad390c504607d780191b81c4d3 SHA512 3830fd9af1fea7d3b72bacd5b8d327a4c88bb3ff108c60b237003abf5885cd60760c8c18d91d5727f7ed247f1c9e2d678679e57a8a9ecfc6f455b02e42443976
+EBUILD flycheck-32_p20220328-r1.ebuild 1100 BLAKE2B 305584cd7f3c462e8976dfa43b128e1b1dc7a6c1b0a566b16b12f9475e468e7e45d10c2d9a48d903e49b762cdcd85c649ae035f336b12c6170ea372d8901ce5f SHA512 c5aee78008a3e54f4f0966ebe2421d085f089955d0b7007d103e6b478b94672821198b48d025d1c07a737982fe7c865a7ca54791a39b1ac4170c803e4b2af07c
+EBUILD flycheck-32_p20230305-r1.ebuild 1488 BLAKE2B b93f662bac9990ab6c78e7ee6092e190a6b1273fda02d74b2dfece2d8359671436717f4ce83620d29b2131c5a3543c4787d3ee4959dd2bf5b060a906790bdb4f SHA512 bdbb64c5cb487d434b8ab0e528de71f8acc5ee0cab31e2f33314b7565b873fe34947341e22d68a5174efeb100922034308660de7ce08eace629221b47b8d1dcb
+EBUILD flycheck-32_p20230305.ebuild 1097 BLAKE2B f3f2e773bc972254359d23a8f06ac817e9dd6bb152cd81b84b6a993c64e6429e09b08adefd48dbe799baee39a9817ccf061bcfc9b00c8df467d49d8edc355e38 SHA512 c09ed772f5d6e95a1e123c4a2ccf0344dbbe7e7c51941098818e37d58a8bd321fc4c1772adf180cdf2a57fa9908e29a9ff5ba38d9531f511a1efe614c41df7a8
 MISC metadata.xml 909 BLAKE2B a1d56af4275d1d9dd4a1352981621332404a6d7f1205f7dbe503fae4f4c53cb7d9ab2639a1fd908350e27940ebcb1e2a808be05570d9fb96fc06261c067028fa SHA512 335378ba433d26c7e4992f8cdfc6dc0cb44f64fb28c86c715d602947c63d4ec147904063e3a64933a7d037f3a1ac9f271d2d7b66e065708b17ab3106a6010b2a
diff --git a/app-emacs/flycheck/flycheck-32_p20210825.ebuild b/app-emacs/flycheck/flycheck-32_p20210825.ebuild
deleted file mode 100644
index 652f7f4670fe..000000000000
--- a/app-emacs/flycheck/flycheck-32_p20210825.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2022 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 arm64"
-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-r1.ebuild b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
index 68d7c5475c23..38acdbd6ab11 100644
--- a/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
@@ -8,14 +8,27 @@ 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}"
+HOMEPAGE="https://www.flycheck.org/
+	https://github.com/flycheck/flycheck/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	if [[ ${PV} == *_p20220328 ]] ; then
+		COMMIT=3b5b4248074f016922c2674789d4a242528cf4c7
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/${PN}-${COMMIT}
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+	fi
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~x64-macos"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~x64-macos"
 RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
 
 RDEPEND=">=app-emacs/dash-2.12.1
diff --git a/app-emacs/flycheck/flycheck-32_p20230305-r1.ebuild b/app-emacs/flycheck/flycheck-32_p20230305-r1.ebuild
index f1f18ee87b30..144233694866 100644
--- a/app-emacs/flycheck/flycheck-32_p20230305-r1.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20230305-r1.ebuild
@@ -7,15 +7,28 @@ NEED_EMACS="24.3"
 
 inherit edo elisp
 
-COMMIT="5f2ef177cb21ae8b73714575802beef04abd0f5e"
 DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs"
-HOMEPAGE="https://www.flycheck.org/"
-SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
+HOMEPAGE="https://www.flycheck.org/
+	https://github.com/flycheck/flycheck/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	if [[ ${PV} == *_p20230305 ]] ; then
+		COMMIT=5f2ef177cb21ae8b73714575802beef04abd0f5e
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/${PN}-${COMMIT}
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+	fi
+	KEYWORDS="~amd64 ~arm ~ppc64"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="test"
 # Tests fail for now, need more investigation
 RESTRICT="!test? ( test ) test"
diff --git a/app-emacs/flycheck/flycheck-32_p20230305.ebuild b/app-emacs/flycheck/flycheck-32_p20230305.ebuild
index 1ad096748312..2fae67dd6044 100644
--- a/app-emacs/flycheck/flycheck-32_p20230305.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20230305.ebuild
@@ -8,14 +8,27 @@ 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}"
+HOMEPAGE="https://www.flycheck.org/
+	https://github.com/flycheck/flycheck/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	if [[ ${PV} == *_p20230305 ]] ; then
+		COMMIT=5f2ef177cb21ae8b73714575802beef04abd0f5e
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz
+			-> ${P}.tar.gz"
+		S="${WORKDIR}"/${PN}-${COMMIT}
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+	fi
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x64-macos"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x64-macos"
 RESTRICT="test" # TODO: wire up now that cask and ert-runner are packaged
 
 RDEPEND=">=app-emacs/dash-2.12.1