From 71f3ef048cb1a572d4a14d2d5b39744b87e64bbc Mon Sep 17 00:00:00 2001
From: Maciej Barć <xgqt@gentoo.org>
Date: Mon, 23 Dec 2024 12:56:26 +0100
Subject: app-emacs/compat: require Emacs >=29.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/946803
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
 app-emacs/compat/compat-30.0.1.0-r1.ebuild | 55 ++++++++++++++++++++++++++++++
 app-emacs/compat/compat-30.0.1.0.ebuild    | 51 ---------------------------
 2 files changed, 55 insertions(+), 51 deletions(-)
 create mode 100644 app-emacs/compat/compat-30.0.1.0-r1.ebuild
 delete mode 100644 app-emacs/compat/compat-30.0.1.0.ebuild

(limited to 'app-emacs')

diff --git a/app-emacs/compat/compat-30.0.1.0-r1.ebuild b/app-emacs/compat/compat-30.0.1.0-r1.ebuild
new file mode 100644
index 000000000000..8438dd49ae05
--- /dev/null
+++ b/app-emacs/compat/compat-30.0.1.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="29.1"
+
+inherit elisp
+
+DESCRIPTION="Compatibility libraries for Emacs"
+HOMEPAGE="https://github.com/emacs-compat/compat/
+	https://git.sr.ht/~pkal/compat/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/emacs-compat/${PN}.git"
+else
+	SRC_URI="https://github.com/emacs-compat/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+	sys-apps/texinfo
+"
+
+ELISP_TEXINFO="${PN}.texi"
+
+src_test() {
+	local has_json="$("${EMACS}" ${EMACSFLAGS} --eval "(princ (fboundp 'json-parse-string))")"
+	if [[ "${has_json}" != t ]] ; then
+		local line
+		while read line ; do
+			ewarn "${line}"
+		done <<-EOF
+		Your current Emacs version does not support native JSON parsing,
+		which is required for running tests of ${CATEGORY}/${PN}.
+		Emerge >=app-editors/emacs-27 with USE="json" and use "eselect emacs"
+		to select that version.
+		EOF
+	else
+		emake test
+	fi
+}
+
+src_install() {
+	rm ./compat-tests.el || die
+
+	elisp_src_install
+}
diff --git a/app-emacs/compat/compat-30.0.1.0.ebuild b/app-emacs/compat/compat-30.0.1.0.ebuild
deleted file mode 100644
index 0de9f6e50e90..000000000000
--- a/app-emacs/compat/compat-30.0.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Compatibility libraries for Emacs"
-HOMEPAGE="https://github.com/emacs-compat/compat/
-	https://git.sr.ht/~pkal/compat/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/emacs-compat/${PN}.git"
-else
-	SRC_URI="https://github.com/emacs-compat/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-BDEPEND="
-	sys-apps/texinfo
-"
-
-ELISP_TEXINFO="${PN}.texi"
-
-src_compile() {
-	emake compile "${PN}.info"
-}
-
-src_test() {
-	local has_json="$("${EMACS}" ${EMACSFLAGS} --eval "(princ (fboundp 'json-parse-string))")"
-	if [[ "${has_json}" != t ]] ; then
-		local line
-		while read line ; do
-			ewarn "${line}"
-		done <<-EOF
-		Your current Emacs version does not support native JSON parsing,
-		which is required for running tests of ${CATEGORY}/${PN}.
-		Emerge >=app-editors/emacs-27 with USE="json" and use "eselect emacs"
-		to select that version.
-		EOF
-	else
-		emake test
-	fi
-}
-- 
cgit v1.2.3-65-gdbad