gentoo resync : 28.04.2021

3 files changed, 17 insertions, 4 deletions

diff --git a/app-emacs/filladapt/Manifest b/app-emacs/filladapt/Manifest
index 9b02b0802c25..6d56014940b0 100644
--- a/app-emacs/filladapt/Manifest
+++ b/app-emacs/filladapt/Manifest
@@ -1,4 +1,5 @@
 AUX 50filladapt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX filladapt-2.12-backquote.patch 293 BLAKE2B 2f782e4830e31c8ddd1c13df8a228cbc1e8afe091d468f32542b25818742b7fd2a8ae46f308baa7ebf18e698b56dfc27a9dc515354869f06ef8d0a3436dfc043 SHA512 1f3394561d42792e1f789b36710cc9a0a7e683646cb1f0edecb3d46522f01b6c27b45b3a165daf0fd1014491748ba367eba6423ac604ed2b548be9d50ae35460
 DIST filladapt-2.12.el.gz 9267 BLAKE2B 81510bd51808f7aaa4874a1127a74bfc7d35c5f1dca0100694853025fd1bc884d75c2023f0e373eb1fe69cc5d423a48d884b4ff5cfdfc82b161f6a404965b6bd SHA512 31bf3dca48129cc25653827678215eb4c62ff777cfbdf0d71142c0cc3111a078b1af316e121b27be2a47c317cfa440ac00e7fbc2bdf3e8ac7d54748297249328
-EBUILD filladapt-2.12-r1.ebuild 579 BLAKE2B 378fd990f9d8cc913421b5274a85b1693002dd8238f747d1f42ea03afc75e7086e179d410084b9cfffa471b263ce6ba23789d020b54f57a8690011163294e121 SHA512 54c0a8bb3d6c0ee14998d098acd73ba3c1a0e11123d70d2ee0d99914e4d6bbae7301d428600026b76338fec01ed9a410528b9e541ece1088b35c12d9af0f6595
+EBUILD filladapt-2.12-r2.ebuild 624 BLAKE2B 91fd835fd79fe66abe934f767ab6dc3f0981aad715cdebe366fdc261688b559076933a5bf424c78cd1ea8e25270ddf02e5b161a07e9dc6435f889d5ba800f25c SHA512 a17b2e08dffd4e2af8dc6390173f41fe9466ef9a20f5ab18a2e8e1d0a8f87ee91dd3f770fcf7367f14c5a694682d09a35aae4c7bcad2139350973cceb31973f4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/filladapt/files/filladapt-2.12-backquote.patch b/app-emacs/filladapt/files/filladapt-2.12-backquote.patch
new file mode 100644
index 000000000000..83f5f921e2ed
--- /dev/null
+++ b/app-emacs/filladapt/files/filladapt-2.12-backquote.patch
@@ -0,0 +1,11 @@
+--- a/filladapt.el
++++ b/filladapt.el
+@@ -86,7 +86,7 @@
+     (defmacro defgroup (&rest args)
+       nil)
+     (defmacro defcustom (var value doc &rest args) 
+-      (` (defvar (, var) (, value) (, doc))))))
++      `(defvar ,var ,value ,doc))))
+ 
+ (defgroup filladapt nil
+   "Enhanced filling"
diff --git a/app-emacs/filladapt/filladapt-2.12-r1.ebuild b/app-emacs/filladapt/filladapt-2.12-r2.ebuild
index 00f83dc21851..096e1c966494 100644
--- a/app-emacs/filladapt/filladapt-2.12-r1.ebuild
+++ b/app-emacs/filladapt/filladapt-2.12-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 DESCRIPTION="Filladapt enhances the behavior of Emacs' fill functions"
 HOMEPAGE="http://www.wonderworks.com/"
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
+PATCHES=("${FILESDIR}"/${P}-backquote.patch)
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="Filladapt is not enabled as a site default. Add the following
 	lines to your ~/.emacs file to enable adaptive fill by default: