gentoo auto-resync : 24:10:2022 - 21:52:37

2 files changed, 0 insertions, 45 deletions

diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index c0a064feac12..165c841e6a7b 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,5 +1,4 @@
 AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX buttercup-1.24-properties-equal.patch 1596 BLAKE2B 384adba33517c2f6677e10aac40c5a939914f74a936d7891e52eb4b706d33c0005f1ce63e0ba8b9672fdad403f6ec36e3191246c252c30574c448408ce24a1aa SHA512 a7dfe3a0d9df701b47287afd8718fbe01886870ab0665cfb73ba240b03facae5b1dc53d5e07ac2cbf21823a203e46a038e64025a82d627d2e8a516997bc8e654
 DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
 DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
 DIST buttercup-1.27.tar.gz 87761 BLAKE2B d372e3285bb80a0005e79142dc95d219a2219959974039083df502ceeec10281aaeaa57f97c8bf45ec1d31b530934faf03b24d2a40e94f09f1cce4a986ae602b SHA512 537c1cc1fc560000537f3894f0917738ab344a4b117eac927b290bc8b5d01b6ad1df1caad63e1f339edc8f4bcaa9cdf483995e2730661481b53dd5e693a33f34
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..000000000000
--- 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 <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)