gentoo resync : 20.03.2022

5 files changed, 101 insertions, 0 deletions

diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
new file mode 100644
index 000000000000..1b8cf3e9346c
--- /dev/null
+++ b/app-emacs/buttercup/Manifest
@@ -0,0 +1,5 @@
+AUX 50buttercup-gentoo.el 84 BLAKE2B ef557e509cca97f5ed6b899d4911c6e2419b60721ce8c6f975bdd60647bcff184d564fdfca92c83a6b25d587307fd1333eada20b80105ef23556df9b1caa78a2 SHA512 e404d7a78b58d7547d96d7f91ad844ebf39f76cec816d050485cb570d12f819a9b2e670f63685235b72581eea3576bbd12e7fe072f082851b262396f6af061d1
+AUX buttercup-1.24-properties-equal.patch 1596 BLAKE2B 384adba33517c2f6677e10aac40c5a939914f74a936d7891e52eb4b706d33c0005f1ce63e0ba8b9672fdad403f6ec36e3191246c252c30574c448408ce24a1aa SHA512 a7dfe3a0d9df701b47287afd8718fbe01886870ab0665cfb73ba240b03facae5b1dc53d5e07ac2cbf21823a203e46a038e64025a82d627d2e8a516997bc8e654
+DIST buttercup-1.24.tar.gz 85337 BLAKE2B fb40d0899f68aff5f2fdb989b2c0e42005e6667ecfe8a4ca806ddb4139f497f0eed5328ba6407136b757a0f13bc6ec5ee488792da3de1e84edba394a781c410c SHA512 0a436f5e5bcf386a3675ef281ac6c9f0125917058de88a5557d879004bbf7cd4298086aa3fb86f2bd807f46c166b0fb02e248cc485878891293147656525f8ca
+EBUILD buttercup-1.24.ebuild 852 BLAKE2B b53348b6d88b0512f9343243fd3f04adc7f8909d777f5cdc362129684f5ff08917582557e60fa2d23413a23b46f9e949251f0e7423089ebb34cbfad19b5be68b SHA512 19bff5996f37a261d3901f1d9ebdf145bdde1da57e5093e578abb47b3e5ff76c819cc0264860533b0c4bf8a84b2f21a4c04d04d808adec648463a457251291dd
+MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
diff --git a/app-emacs/buttercup/buttercup-1.24.ebuild b/app-emacs/buttercup/buttercup-1.24.ebuild
new file mode 100644
index 000000000000..dd3441cae617
--- /dev/null
+++ b/app-emacs/buttercup/buttercup-1.24.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="24.3"
+
+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}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# https://github.com/jorgenschaefer/emacs-buttercup/pull/210
+PATCHES=( "${FILESDIR}"/${PN}-1.24-properties-equal.patch )
+
+DOCS=( docs/{running,writing}-tests.md  )
+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"
+}
+
+src_install() {
+	elisp_src_install
+	dobin bin/${PN}
+}
diff --git a/app-emacs/buttercup/files/50buttercup-gentoo.el b/app-emacs/buttercup/files/50buttercup-gentoo.el
new file mode 100644
index 000000000000..102ffcd8d3b9
--- /dev/null
+++ b/app-emacs/buttercup/files/50buttercup-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/buttercup-autoloads" nil t)
diff --git a/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch b/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
new file mode 100644
index 000000000000..2af36a3560cd
--- /dev/null
+++ b/app-emacs/buttercup/files/buttercup-1.24-properties-equal.patch
@@ -0,0 +1,44 @@
+From 108d2298cc34d906b196178ad955e3dc139e1779 Mon Sep 17 00:00:00 2001
+From: Philipp Stephani <phst@google.com>
+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 <contact@jorgenschaefer.de>
++;; Copyright (C) 2015, 2021  Jorgen Schaefer <contact@jorgenschaefer.de>
+ 
+ ;; 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)
diff --git a/app-emacs/buttercup/metadata.xml b/app-emacs/buttercup/metadata.xml
new file mode 100644
index 000000000000..e62cdf68a9cb
--- /dev/null
+++ b/app-emacs/buttercup/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jorgenschaefer/emacs-buttercup</remote-id>
+  </upstream>
+  <stabilize-allarches/>
+</pkgmetadata>