[gentoo-commits] repo/gentoo:master commit in: app-emacs/buttercup/files/

[Maciej Barć]

commit: fe0dfbf474dd18c3e1672d0780a4300e52e0700e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Oct 24 18:19:39 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Oct 24 18:29:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe0dfbf4

app-emacs/buttercup: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27935
Signed-off-by: Maciej Barć  gentoo.org>

 .../files/buttercup-1.24-properties-equal.patch| 44 --
 1 file changed, 44 deletions(-)

diff --git a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch 
b/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
deleted file mode 100644
index 2af36a3560cd..
--- a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 108d2298cc34d906b196178ad955e3dc139e1779 Mon Sep 17 00:00:00 2001
-From: Philipp Stephani 
-Date: Mon, 6 Dec 2021 15:39:53 +0100
-Subject: [PATCH] Fix property comparisons in unit tests.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Before Emacs 29, ‘equal-including-properties’ should not be used to compare
-propertized strings due to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581.
-ERT provides a replacement ‘ert-equal-including-properties’.

- tests/test-buttercup.el | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-buttercup.el b/tests/test-buttercup.el
-index bda3e6f..4b73b78 100644
 a/tests/test-buttercup.el
-+++ b/tests/test-buttercup.el
-@@ -1,6 +1,6 @@
- ;;; buttercup-test.el --- Tests for buttercup.el -*-lexical-binding:t-*-
- 
--;; Copyright (C) 2015  Jorgen Schaefer 
-+;; Copyright (C) 2015, 2021  Jorgen Schaefer 
- 
- ;; This program is free software; you can redistribute it and/or
- ;; modify it under the terms of the GNU General Public License
-@@ -27,6 +27,7 @@
- (require 'autoload)
- (require 'ansi-color)
- (require 'ert)
-+(require 'ert-x)
- (require 'cl-lib)
- (require 'imenu)
- 
-@@ -1117,7 +1118,7 @@ text properties using `ansi-color-apply'."
- ;
- ;;; Reporters
- (buttercup-define-matcher-for-binary-function
--:to-equal-including-properties equal-including-properties)
-+:to-equal-including-properties ert-equal-including-properties)
- 
- (describe "The batch reporters"
-   :var (print-buffer)

[gentoo-commits] repo/gentoo:master commit in: app-emacs/buttercup/files/, app-emacs/buttercup/

[Maciej Barć]

commit: eae5247d919f96fc90d518b9923f8c1cef5dd5a0
Author: Maciej Barć  gentoo  org>
AuthorDate: Tue Apr 26 15:59:07 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Apr 26 16:09:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae5247d

app-emacs/buttercup: remove elisp autoload file; minor fixes

Signed-off-by: Maciej Barć  gentoo.org>

 .../{buttercup-1.24.ebuild => buttercup-1.24-r1.ebuild}  | 12 
 app-emacs/buttercup/files/50buttercup-gentoo.el  |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app-emacs/buttercup/buttercup-1.24.ebuild 
b/app-emacs/buttercup/buttercup-1.24-r1.ebuild
similarity index 69%
rename from app-emacs/buttercup/buttercup-1.24.ebuild
rename to app-emacs/buttercup/buttercup-1.24-r1.ebuild
index a10a06a28765..58f468512d73 100644
--- a/app-emacs/buttercup/buttercup-1.24.ebuild
+++ b/app-emacs/buttercup/buttercup-1.24-r1.ebuild
@@ -9,24 +9,20 @@ inherit elisp
 
 DESCRIPTION="Behaviour-driven Elisp testing"
 HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup;
-SRC_URI="https://github.com/jorgenschaefer/emacs-buttercup/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-buttercup-${PV}
+SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # https://github.com/jorgenschaefer/emacs-buttercup/pull/210
-PATCHES=( "${FILESDIR}"/${PN}-1.24-properties-equal.patch )
+PATCHES=( "${FILESDIR}"/${P}-properties-equal.patch )
 
 DOCS=( docs/{running,writing}-tests.md  )
+ELISP_REMOVE="buttercup-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
 
-src_compile() {
-   elisp_src_compile
-   elisp-make-autoload-file
-}
-
 src_test() {
${EMACS} ${EMACSFLAGS} -L . -l buttercup \
 -f buttercup-run-discover || die "tests failed"

diff --git a/app-emacs/buttercup/files/50buttercup-gentoo.el 
b/app-emacs/buttercup/files/50buttercup-gentoo.el
index 102ffcd8d3b9..431f7e90ae73 100644
--- a/app-emacs/buttercup/files/50buttercup-gentoo.el
+++ b/app-emacs/buttercup/files/50buttercup-gentoo.el
@@ -1,2 +1 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/buttercup-autoloads" nil t)