gentoo resync : 08.10.2021

4 files changed, 35 insertions, 19 deletions

diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 06e134310189..57fa8a731f2e 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,10 +1,11 @@
 AUX 50namazu-gentoo.el 72 BLAKE2B 1047f37bcd89dd27714342af9e88ef186860efe6de8be767f37a81164b8d6b821bba292a1785617b1da249f76171d449485b107a315ea4ef0342173d0ec74a65 SHA512 8e316add3dbe93049fd879bc93829b2c141a752133d065c2ee724e180b38f171f5b11dfa72b8651d7721e825e3ff35439c6afc33c6043ce42738739ff4988e8c
 AUX namazu-2.0.21-memmove.patch 2050 BLAKE2B d5a12989489c4db9a6a7c6288ce29ecbe654731bfd84e3baa40c02ad802aa975704dbab2b05dc8f496e30cc76a1cb7bfaf9f2d8a2f0484160465fbb1f41af9c9 SHA512 d445d77c45a30d4e71dd9129ebf7938f48058f89627e4130e0f921ca719918fdd654f8369d0ae24edcbfb5d3801d68eeeaee4b55c887b9d208e0d8df00effae5
+AUX namazu-emacs-27.patch 422 BLAKE2B 613d43536da45a8f7df12b1e2eb0c7644702a0c2ba8a8f6b1a9806f343dc467b5c20b501a38e7abe732947ebe35c7ec47ae346003c26a8271f88709c62943105 SHA512 65456a1d4bc3a54ddda7360c370fe1c3847711e5e78858e7a35628148fa38a6e844df8bc2e1f1b963697eaedfa0354cedecdc24badeaffb3da02eab5fe241555
 AUX namazu-gentoo.patch 1471 BLAKE2B 949429187d765e37a3fcfbcb9c455d4b92e5d1af11a4b0550a40240523b3862de8cf3b2cbab85c15be9848d1614cdccbeb0df346a006f445eea35aad35a05bc1 SHA512 bdc4946197f48fe87fe1e2eacbefaaf775458e28a96f2c5af70c1264e883f29c89673feaffd71afff9d9744bb7b81c3b3ede3258f585dab3b7f117c8fa77f93e
 AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a79811d0a651599b0e4d22ff4a8a515aca2047684e988d6a434025aca40d744c2aabe310f20ebbbb4ff43af72 SHA512 4a5faf2a889f9eb02a57db80c834a60560bbe2df718f541a24fbfc137145121336055c157458b5d3c4d9c5f573cf3964329adc1ae1e2448c254531df4fee8267
 AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
-DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
-EBUILD namazu-2.0.21.ebuild 1701 BLAKE2B da0cf2173235fe7efd2aa5b44ad1c79a7e32e204816e64e01e9480bff2082753d157bb1fbf5fc7be0993b185073eec5c176344dd46c91b57001fa6fb6ba876c6 SHA512 af0cf876363779efa6dd32b948bcc717bed8693f6365768c6d66cbf09663aadbf8a2f7fbd4181b76c7d2d7e6fa460b8959dd0293a51911645f37ce6dd38c4282
-EBUILD namazu-2.0.22_pre7.ebuild 1617 BLAKE2B f0eac6cbfc2842de4934c14aee296942a49b8f305a1c5ae408a5a07f6588814f2f6c1c6e589e5e409af3a3619035ca95aeaf6577de263742968f34ce3963588b SHA512 59be3e7022df5db40f6517915aed1ef9f1e4347d0e88fa86bb23fdce8dd224b4f0b532cd1c2ddc631c5faab113b6b64084fc69e65d5f929e3b412c2c2efc65f5
+DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0
+EBUILD namazu-2.0.21.ebuild 1763 BLAKE2B cc3fcd4711e10d41f92a80293d6393af310fd0a95ac51f3b0444aa7ae7242a25ecce511d461de74ba88763ff232d50337320b1cfb9be1aab45a2b0d9dad327ca SHA512 72068431e7a77021767dc3a72556e1fdd1d789d43f6428ddcedfbbba90569dfa78d7a817b70733bc0d08a73304543257df6f1c9c962c9428c940a8a7f449dfe9
+EBUILD namazu-2.0.22_pre8.ebuild 1643 BLAKE2B b87f7691dbc8ab191751d5b66819cdc9c409d4f35d312f0f94ca9a2e65d80ba94a391853135601242cfbbb73ce18feff71b8edfbacede7c1275e0a41c4869858 SHA512 3274b729bb781e93cd8fb692ed36e15350a0a6386bff264be2da11512c69290e54c5229b9a0a1867b16a48668fbdc32426d3da70053e8d8bd084b2d3ca714d22
 MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
diff --git a/app-text/namazu/files/namazu-emacs-27.patch b/app-text/namazu/files/namazu-emacs-27.patch
new file mode 100644
index 000000000000..cb9dd4de9590
--- /dev/null
+++ b/app-text/namazu/files/namazu-emacs-27.patch
@@ -0,0 +1,14 @@
+--- a/lisp/namazu.el
++++ b/lisp/namazu.el
+@@ -99,9 +99,9 @@
+     (defmacro defgroup (&rest args)
+       nil)
+     (defmacro defcustom (var value doc &rest args) 
+-      (` (defvar (, var) (, value) (, doc))))
++      `(defvar (, var) (, value) (, doc)))
+     (defmacro defface (var value doc &rest args)
+-      (` (make-face (, var))))
++      `(make-face (, var)))
+     (defmacro define-widget (&rest args)
+       nil)))
+ 
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 5d0b4d0d14e3..ef46e76118df 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools elisp-common
 
@@ -9,7 +9,7 @@ DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/"
 SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="emacs l10n_ja nls static-libs tk"
@@ -30,11 +30,12 @@ RDEPEND="dev-perl/File-MMagic
 		dev-lang/tk:0
 		www-client/lynx
 	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-emacs-27.patch
 	"${FILESDIR}"/${PN}-perl-5.18.patch
 	"${FILESDIR}"/${PN}-perl-5.26.patch
 	"${FILESDIR}"/${P}-memmove.patch
@@ -43,8 +44,8 @@ PATCHES=(
 src_prepare() {
 	default
 
-	mv configure.{in,ac}
-	mv tk${PN}/configure.{in,ac}
+	mv configure.{in,ac} || die
+	mv tk${PN}/configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -64,7 +65,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	default
 
 	if use emacs; then
 		cd lisp
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 8517c8554367..4c8146e3b313 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit autotools elisp-common
 
@@ -11,7 +11,7 @@ DESCRIPTION="Namazu is a full-text search engine"
 HOMEPAGE="http://www.namazu.org/"
 SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="emacs l10n_ja nls static-libs tk"
@@ -32,8 +32,8 @@ RDEPEND="dev-perl/File-MMagic
 		dev-lang/tk:0
 		www-client/lynx
 	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}"/${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
@@ -41,8 +41,8 @@ PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
 src_prepare() {
 	default
 
-	mv configure.{in,ac}
-	mv tk${PN}/configure.{in,ac}
+	mv configure.{in,ac} || die
+	mv tk${PN}/configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -62,7 +62,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	default
 
 	if use emacs; then
 		cd lisp