gentoo resync : 12.05.2022

4 files changed, 39 insertions, 12 deletions

diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index 1b8cf3e9346c..499fd674d852 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,5 +1,7 @@
-AUX 50buttercup-gentoo.el 84 BLAKE2B ef557e509cca97f5ed6b899d4911c6e2419b60721ce8c6f975bdd60647bcff184d564fdfca92c83a6b25d587307fd1333eada20b80105ef23556df9b1caa78a2 SHA512 e404d7a78b58d7547d96d7f91ad844ebf39f76cec816d050485cb570d12f819a9b2e670f63685235b72581eea3576bbd12e7fe072f082851b262396f6af061d1
+AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 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
+DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
+EBUILD buttercup-1.24-r1.ebuild 804 BLAKE2B 209c2c4c9c1f1cf00c60cf08d50fc56ca5846716de74f8f628233c04737f6622b8839756fa05c54e74bfb32eee0180040f22d815d83fa639504c710de7dca10b SHA512 b231b7049a5b9ef1fb8033bbafc727c02ce5723a7d7255a8f7f84e9a784b4b9f29c376d449247a31feb9f3d14a6f153af1613276f0cc717a9b2738ddd54f9c44
+EBUILD buttercup-1.25.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
 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-r1.ebuild
index dd3441cae617..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"
+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/buttercup-1.25.ebuild b/app-emacs/buttercup/buttercup-1.25.ebuild
new file mode 100644
index 000000000000..cfebece4d7cc
--- /dev/null
+++ b/app-emacs/buttercup/buttercup-1.25.ebuild
@@ -0,0 +1,30 @@
+# 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-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DOCS=( docs/{running,writing}-tests.md  )
+SITEFILE="50${PN}-gentoo.el"
+
+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
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)