gentoo resync : 28.04.2021

7 files changed, 2 insertions, 331 deletions

diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index e4c8e79a77e0..118c1e5d12ba 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -1,11 +1,4 @@
 AUX 50apel-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX apel-10.8-010_ikazuhiro.patch 6631 BLAKE2B 729f790c0c638a41a6cd040268544ce2246c3161a7bab43b875c469b678e6fc6600a88741a413fce42a67bc5db58a6db2abb83e7f2ef1db1456290e17362cef6 SHA512 1630c45bec06b019815f1989b2279ba1e85634b9358f65254af1e40fcf51c8426715afe9c014a73928bc4ec59f6b71db1ddffeeadb3499ebc4324571631fd82c
-AUX apel-10.8-020_Prevent-fontset-error.patch 755 BLAKE2B a5d6a5eb718d99c058c736dc66e50affd8a0c748aabdefbb068f210bfb259290573eb5551bb14d3f8dca5e4af4cea89e65af3ef9d1b42c19b80d38ccf623a35d SHA512 4617ec3e48758fb85fffc9d07eb657e00451abc6605b3e65db5d01c99f37824c4232913fd445f387bdbe024409e7b01030b3337fa00ea3f52fafa289ecf11da6
-AUX apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch 888 BLAKE2B 1e79046bec7fa199eb0c055ee1d3e56c33229f493f2739537bb61012034fce06dd3644315e66c324c716386187ab6b7e92f4f571e03c7c63471d683df27e1ae5 SHA512 50795dff5cdb86a3a778257cfea5894b682e3c74e6b8a0b963606eb0b125158927c499ece14af0da418b491a30f6bbced4d101cf5ee29e4fc110a604d729a778
-AUX apel-10.8-050_escape-backslash.patch 942 BLAKE2B ab6ed79c8d6a8a75a1023dde38a9f8dae6b4d4252d8453dbd3bedd60999abb797294b4c66f291cf334df2e4f47d318aad4c411f3a8a84dbf9318b10934db6a69 SHA512 287d84ff23a22cbf0ae9ebeeb0e20759030239573c1d49d6e4b9bf67a8f7008fc494dade31c05bfb9f3383ea8882ebd9ff775f9ef9a139030cd083a9d5fd20ce
-DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2fec68033b44f1cf96117fcdcb9dad5dbbf4283a79cd19f358c2a3bdc80ce2f7517e8b396182141583a371c21a8df7db7d05156ffd16987a872 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274
-DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
 DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
-EBUILD apel-10.8-r1.ebuild 1473 BLAKE2B 0e325c3235b51cc105dd0a1283b4eef29c87de88dbbbada2e227af7622af088c09d8afa041d286e739f3fc442111b35f1fe7460842076cbe0b549290757e4625 SHA512 7c09702eac64f2e618aff4ad43ef21605c28868f0e7a1c0ff92c2df85f0ea38eb368cf43adfc26e5552948c925588d6b1a03a0133e285c0574c757711587e737
-EBUILD apel-10.8_p20190407.ebuild 1201 BLAKE2B 322db424fa09fc8cbaa360790c4f966dd72444748f4f078e1a01e171590d3840b709c5e0901569e7764e3f47869d17fb07f73094c6a7c93c1f5200bb4afde490 SHA512 98549d9195d296b8675d91390729bfa806ef6243680800cbfd6c3944a95d38f55cb1d2e3158aabb87305ca14c2d9db36f8423d722c61023b2c11a53e64373466
+EBUILD apel-10.8_p20190407.ebuild 1103 BLAKE2B dd978f08c9b9bbb7469dc9b7b753d8d05ef860b803efbf1c393d2370d85ce271117f5ad3bd9ee20aa04dcdebce2c5558e0c5ef4f0874364a4524d71acdcb166e SHA512 a3b9ab568b86dd51f5d2f2455539ff0df43e5f659064808793b43721e38241148224da573a12b21dc79407891b0a07e301277189cc595ce43c2935ff4f23f88f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild
deleted file mode 100644
index 5bc2c060e9a5..000000000000
--- a/app-emacs/apel/apel-10.8-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
-HOMEPAGE="http://cvs.m17n.org/elisp/APEL/"
-SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz
-	https://dev.gentoo.org/~gienah/2big4tree/app-emacs/${PN}/${PN}-10.8-030_Use-new-style-backquotes.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-ELISP_PATCHES="${PN}-10.8-020_Prevent-fontset-error.patch
-	${PN}-10.8-030_Use-new-style-backquotes.patch
-	${PN}-10.8-010_ikazuhiro.patch
-	${PN}-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
-	${PN}-10.8-050_escape-backslash.patch"
-
-src_prepare() {
-	elisp_src_prepare
-	cat <<-EOF >> APEL-CFG
-	(setq APEL_PREFIX "apel")
-	(setq EMU_PREFIX "apel")
-	EOF
-}
-
-src_compile() {
-	emake PREFIX="${ED}/usr" \
-		LISPDIR="${ED}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		LISPDIR="${ED}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" \
-		install
-	elisp-site-file-install "${FILESDIR}/50apel-gentoo.el"
-	dodoc ChangeLog README*
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "See the README.en file in /usr/share/doc/${PF} for tips"
-	elog "on how to customize this package."
-	elog "And you need to rebuild packages depending on ${PN}."
-}
diff --git a/app-emacs/apel/apel-10.8_p20190407.ebuild b/app-emacs/apel/apel-10.8_p20190407.ebuild
index c99cc1c8b78d..3b61f310b058 100644
--- a/app-emacs/apel/apel-10.8_p20190407.ebuild
+++ b/app-emacs/apel/apel-10.8_p20190407.ebuild
@@ -25,9 +25,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake PREFIX="${ED}/usr" \
-		LISPDIR="${ED}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+	default
 }
 
 src_install() {
diff --git a/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch b/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch
deleted file mode 100644
index 558939dee9fc..000000000000
--- a/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch
+++ /dev/null
@@ -1,189 +0,0 @@
---- apel-10.8-orig/ChangeLog	2013-10-03 18:17:05.176741628 +1000
-+++ apel-10.8/ChangeLog	2013-10-03 18:16:54.442741731 +1000
-@@ -1,3 +1,56 @@
-+2013-07-05  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
-+
-+	* mcs-20.el: Really check whether the mule-vesion variable is defined.
-+
-+2013-07-04  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-20.el: Check whether the mule-vesion variable is defined.
-+	Cf. https://github.com/ikazuhiro/apel/commit/328c02e022340b36dd7e5f9250c7f86d2bafd793
-+
-+2013-03-24  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-20.el (mime-charset-to-coding-system): Display the message
-+	and use charset name as coding system when
-+	`mime-charset-coding-system-alist' indicates invalid coding
-+	system.
-+
-+2012-09-07  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-e20.el (coding-system-to-mime-charset): Coding system's
-+	setting is preferred to mime-charset-coding-system-alist's value.
-+	Detect MIME name from mime-charset-coding-system-alist's value
-+	more permissively.
-+
-+2012-08-08  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* poe.el (next-command-event): Fix that Emacs 21 and later were
-+	treated as 'Emacs 19, 20.1 and 20.2'.
-+
-+2012-07-28  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-e20.el (charsets-mime-charset-alist): Do not use
-+	`iso-2022-jp-2'.
-+
-+2012-07-28  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-20.el (detect-mime-charset-string): (Emacs23 and later) New
-+	function.
-+	(detect-mime-charset-region): Use it.
-+
-+2011-06-17  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-20.el (detect-mime-charset-region): (Emacs23 and later) Do
-+	not check whether `charsets-mime-charset-alist' contains non
-+	charset symbol.
-+
-+	* mcs-e20.el (charsets-mime-charset-alist): Remove non charset
-+	symbol for Emacs 23 and later.
-+
-+2010-03-19  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
-+
-+	* mcs-20.el (detect-mime-charset-region): Do not care priority of
-+	charsets on Emacs 23 and later.
-+
- 2011-07-17  David Maus  <dmaus@ictsoc.de>
- 
- 	* tinycustom.el (defcustom): Use new style backquotes.
---- apel-10.8-orig/mcs-20.el	2005-07-06 12:08:52.000000000 +1000
-+++ apel-10.8/mcs-20.el	2013-10-03 17:44:42.936760151 +1000
-@@ -84,11 +84,13 @@
-   (if (stringp charset)
-       (setq charset (intern (downcase charset)))
-     )
--  (let ((cs (assq charset mime-charset-coding-system-alist)))
--    (setq cs
--	  (if cs
--	      (cdr cs)
--	    charset))
-+  (let ((cs (cdr (assq charset mime-charset-coding-system-alist))))
-+    (unless (or (null cs) (find-coding-system cs))
-+      (message
-+       "Invalid coding system: %s.  Confirm mime-charset-coding-system-alist."
-+       cs)
-+      (setq cs nil))
-+    (unless cs (setq cs charset))
-     (if lbt
- 	(setq cs (intern (format "%s-%s" cs
- 				 (cond ((eq lbt 'CRLF) 'dos)
-@@ -96,12 +98,11 @@
- 				       ((eq lbt 'CR) 'mac)
- 				       (t lbt)))))
-       )
--    (if (find-coding-system cs)
--	cs
--      (if mime-charset-to-coding-system-default-method
--	  (funcall mime-charset-to-coding-system-default-method
--		   charset lbt cs)
--	))))
-+    (or (find-coding-system cs)
-+	(if mime-charset-to-coding-system-default-method
-+	    (funcall mime-charset-to-coding-system-default-method
-+		     charset lbt cs)
-+	  ))))
- 
- (defalias 'mime-charset-p 'mime-charset-to-coding-system)
- 
-@@ -209,6 +210,34 @@
- 	(setq rest (cdr rest)))
-       default-mime-charset-for-write)))
- )
-+
-+((eval-when-compile (and (boundp 'mule-version)
-+			 (null (string< mule-version "6.0"))))
-+;; for Emacs 23 and later
-+(defun detect-mime-charset-string (string)
-+  "Return MIME charset for STRING."
-+  (let ((src (string-to-list string))
-+	tmp)
-+    (setq tmp src)
-+    ;; Uniquify the list of characters.
-+    (while tmp
-+      (setq tmp (setcdr tmp (delq (car tmp) (cdr tmp)))))
-+    ;; Detect charset from the list of characters.
-+    (catch 'found
-+      (mapc (lambda (cons)
-+	      (catch 'next
-+		(mapc (lambda (ch) (unless (char-charset ch (car cons))
-+				     (throw 'next nil)))
-+		      src)
-+		(throw 'found (cdr cons))))
-+	    charsets-mime-charset-alist)
-+      default-mime-charset-for-write)))
-+
-+(defsubst detect-mime-charset-region (start end)
-+  "Return MIME charset for region between START and END."
-+  (detect-mime-charset-string
-+   (buffer-substring-no-properties start end))))
-+
- (t
- ;; for legacy Mule
- (defun detect-mime-charset-region (start end)
---- apel-10.8-orig/mcs-e20.el	2005-07-06 12:08:52.000000000 +1000
-+++ apel-10.8/mcs-e20.el	2013-10-03 17:44:42.936760151 +1000
-@@ -90,11 +90,15 @@
-      ((ascii korean-ksc5601)				. euc-kr)
-      ((ascii chinese-gb2312)				. gb2312)
-      ((ascii chinese-big5-1 chinese-big5-2)		. big5)
--     ((ascii thai-tis620 composition)			. tis-620)
--     ((ascii latin-iso8859-1 greek-iso8859-7
--	     latin-jisx0201 japanese-jisx0208-1978
--	     chinese-gb2312 japanese-jisx0208
--	     korean-ksc5601 japanese-jisx0212)		. iso-2022-jp-2)
-+     ,(static-cond
-+       ((null (string< mule-version "6.0"))
-+	'((ascii thai-tis620)				. tis-620))
-+       (t
-+	'((ascii thai-tis620 composition)      		. tis-620)))
-+     ;; ((ascii latin-iso8859-1 greek-iso8859-7
-+     ;; 	     latin-jisx0201 japanese-jisx0208-1978
-+     ;; 	     chinese-gb2312 japanese-jisx0208
-+     ;; 	     korean-ksc5601 japanese-jisx0212)		. iso-2022-jp-2)
-      ;;((ascii latin-iso8859-1 greek-iso8859-7
-      ;;        latin-jisx0201 japanese-jisx0208-1978
-      ;;        chinese-gb2312 japanese-jisx0208
-@@ -119,8 +123,16 @@
- (defun coding-system-to-mime-charset (coding-system)
-   "Convert CODING-SYSTEM to a MIME-charset.
- Return nil if corresponding MIME-charset is not found."
--  (or (car (rassq coding-system mime-charset-coding-system-alist))
--      (coding-system-get coding-system 'mime-charset)
-+  (or (coding-system-get coding-system 'mime-charset)
-+      (let ((coding (coding-system-base coding-system))
-+	    (alist mime-charset-coding-system-alist)
-+	    result)
-+	(while alist
-+	  (if (eq (coding-system-base (cdar alist)) coding)
-+	      (setq result (caar alist)
-+		    alist nil)
-+	    (setq alist (cdr alist))))
-+	result)
-       ))
- 
- (defun-maybe-cond mime-charset-list ()
---- apel-10.8-orig/poe.el	2013-10-03 17:43:11.327761025 +1000
-+++ apel-10.8/poe.el	2013-10-03 17:44:42.937760151 +1000
-@@ -1996,8 +1996,9 @@
- returned.
- If PROMPT is non-nil, it should be a string and will be displayed in
- the echo area while this function is waiting for an event."
--  ((and (>= emacs-major-version 20)
--	(>= emacs-minor-version 4))
-+  ((or (>= emacs-major-version 21)
-+       (and (>= emacs-major-version 20)
-+	    (>= emacs-minor-version 4)))
-    ;; Emacs 20.4 and later.
-    (read-event prompt))			; should specify 2nd arg?
-   ((and (= emacs-major-version 20)
diff --git a/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch b/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch
deleted file mode 100644
index 9cea1e675276..000000000000
--- a/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Prevent an error of fontset-pixel-size for Emacs 23.
-Bug-Debian: http://bugs.debian.org/477177
-Author: Tatsuya Kinoshita <tats@debian.org>
-
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -0,0 +1,5 @@
-+2010-02-14  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
-+
-+	* poem-e20.el (fontset-pixel-size): Don't cause an error. Workaround
-+	for Emacs 23.
-+
---- a/poem-e20.el
-+++ b/poem-e20.el
-@@ -25,6 +25,7 @@
- ;;; Code:
- 
- (defun fontset-pixel-size (fontset)
-+ (condition-case nil
-   (let* ((info (fontset-info fontset))
- 	 (height (aref info 1))
- 	 )
-@@ -32,7 +33,8 @@
- 	  ((string-match "-\\([0-9]+\\)-" fontset)
- 	   (string-to-number
- 	    (substring fontset (match-beginning 1)(match-end 1))))
--	  (t 0))))
-+	  (t 0)))
-+  (error 0)))
- 
- 
- ;;; @ character set
diff --git a/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch b/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
deleted file mode 100644
index 30b0abc8ef77..000000000000
--- a/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Subject: Fix wrong type argument on Emacs 24.3.50 to check make-temp-file
-From: Tatsuya Kinoshita <tats@debian.org>
-Bug-Debian: http://bugs.debian.org/718765
-
-diff --git a/ChangeLog b/ChangeLog
-index 8e96224..9505b2e 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -0,0 +1,5 @@
-+2013-08-05  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
-+
-+	* poe.el: Fix wrong type argument on Emacs 24.3.50 to check
-+	`make-temp-file'.
-+
-diff --git a/poe.el b/poe.el
-index be52847..b381f90 100644
---- a/poe.el
-+++ b/poe.el
-@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MINIBUF and FRAME."
-                      )))
-       ;; arglist: (prefix &optional dir-flag suffix)
-       (cond
--       ((not arglist)
-+       ((or (not arglist) (not (listp arglist)))
-         ;; `make-temp-file' is a built-in; expects 3-args.
-         (put 'make-temp-file 'defun-maybe '3-args))
-        ((> (length arglist) 3)
diff --git a/app-emacs/apel/files/apel-10.8-050_escape-backslash.patch b/app-emacs/apel/files/apel-10.8-050_escape-backslash.patch
deleted file mode 100644
index a2892d303b37..000000000000
--- a/app-emacs/apel/files/apel-10.8-050_escape-backslash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/poe.el	2018-07-27 19:34:05.959194677 -0500
-+++ b/poe.el	2018-07-27 19:40:06.409212629 -0500
-@@ -1081,7 +1081,7 @@
- If third arg LITERAL is non-nil, insert NEWTEXT literally.
- Otherwise treat `\' as special:
-   `\&' in NEWTEXT means substitute original matched text.
--  `\N' means substitute what matched the Nth `\(...\)'.
-+  `\\N' means substitute what matched the Nth `\(...\)'.
-        If Nth parens didn't match, substitute nothing.
-   `\\' means insert one `\'.
- FIXEDCASE and LITERAL are optional arguments.
-@@ -1133,7 +1133,7 @@
- If third arg LITERAL is non-nil, insert NEWTEXT literally.
- Otherwise treat `\' as special:
-   `\&' in NEWTEXT means substitute original matched text.
--  `\N' means substitute what matched the Nth `\(...\)'.
-+  `\\N' means substitute what matched the Nth `\(...\)'.
-        If Nth parens didn't match, substitute nothing.
-   `\\' means insert one `\'.
- FIXEDCASE and LITERAL are optional arguments.