gentoo resync : 28.04.2021

4 files changed, 2 insertions, 75 deletions

diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 22b283ded598..9a098aa595bf 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -1,7 +1,4 @@
 AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a820101611afa51164a521aedbb780f04d2a7dbdf87e70506b2387d3edd95aacdaf46bc2adabb901b5a365ffecbca3b4 SHA512 b2edee110d53e2b31fe13ccfffd792668febd20e27a8014d77e9ad0b0a4540ab38cde97742ed67c515e58594808713edf9079812604521f1f1d481cd717a0132
-DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
 DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
-EBUILD flim-1.14.9-r2.ebuild 946 BLAKE2B 71d04deaf26d1395156ef2a4cb6c3198e5990901321c6ca520f54a98253fe20cc39585759b26ecda284fc36341b359919bac46c1e3300d87df5ba9e0cd95e29c SHA512 e218c4653d0d335fe109c1e24b826cbabb895a14d171fe81833d67fa93379e9129d9453baa19df483e63f53afa328f50ccaa718bb46d8f776d704a6fc39ecd1c
-EBUILD flim-1.14.9_p20190526.ebuild 1037 BLAKE2B 14f24cdffaf72a2294105da18c9625d6763a92f0d30fbc6558b50ef5c60e10986c9751e1c8ec654650ada71b2db2a726c204c6336a57d8bddc3921fac1857d17 SHA512 7046c1e3f0298a1964af5bac3e13a69ed470989972ec431052345c282c7ff2a18a1fb88ab1261723bd8bb125eb65d3f48c1ed3b1025618d92f032f51ba02fa5e
+EBUILD flim-1.14.9_p20190526.ebuild 939 BLAKE2B a2cc523e803ce3e1a0d88e4f5105d83f2552bbb08098848ceca512a76876578287f0daf7c02e9b4b720fe9561b6bd9f51330ecbb8c2d731e78e3fc640dd449dc SHA512 17cf24ad7990ba1086bd0323352105b158775b0808be8f8f40767b72ddfa542dbd4f51948c3e62c06b030b0a18d97a2573c62dd4054ca389cb5c7e33bfe18da7
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch b/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch
deleted file mode 100644
index 35f645052284..000000000000
--- a/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/292449
-
---- flim-1.14.9-orig/mel-q-ccl.el	2006-06-12 17:10:02.000000000 +0200
-+++ flim-1.14.9/mel-q-ccl.el	2009-11-13 15:38:28.000000000 +0100
-@@ -893,7 +893,13 @@
-   (defun quoted-printable-ccl-encode-region (start end)
-     "Encode the region from START to END with quoted-printable encoding."
-     (interactive "*r")
--    (decode-coding-region start end 'mel-ccl-quoted-printable-lf-lf-rev))
-+    (save-excursion
-+      (goto-char start)
-+      (insert (prog1
-+		(decode-coding-string
-+		  (string-as-unibyte (buffer-substring start end))
-+		  'mel-ccl-quoted-printable-lf-lf-rev)
-+		(delete-region start end)))))
- 
-   (defun quoted-printable-ccl-insert-encoded-file (filename)
-     "Encode contents of the file named as FILENAME, and insert it."
-@@ -932,7 +938,10 @@
- (defun quoted-printable-ccl-write-decoded-region (start end filename)
-   "Decode quoted-printable encoded current region and write out to FILENAME."
-   (interactive "*r\nFWrite decoded region to file: ")
--  (let ((coding-system-for-write 'mel-ccl-quoted-printable-lf-lf-rev)
-+  (let ((coding-system-for-write
-+	 (if (coding-system-p 'mel-ccl-quoted-printable-lf-lf-rev-unix)
-+	     'mel-ccl-quoted-printable-lf-lf-rev-unix
-+	   'mel-ccl-quoted-printable-lf-lf-rev))
- 	jka-compr-compression-info-list jam-zcat-filename-list)
-     (write-region start end filename)))
- 
diff --git a/app-emacs/flim/flim-1.14.9-r2.ebuild b/app-emacs/flim/flim-1.14.9-r2.ebuild
deleted file mode 100644
index 68c6d6a58669..000000000000
--- a/app-emacs/flim/flim-1.14.9-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A library to provide basic features about message representation or encoding"
-HOMEPAGE="http://git.chise.org/elisp/flim/"
-SRC_URI="http://git.chise.org/elisp/dist/${PN}/${P%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-DEPEND=">=app-emacs/apel-10.3"
-RDEPEND="${DEPEND}
-	!app-emacs/limit"
-
-ELISP_PATCHES="${P}-mel-q-ccl.patch"
-SITEFILE="60${PN}-gentoo.el"
-
-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}/${SITEFILE}"
-
-	dodoc FLIM-API.en NEWS VERSION README* ChangeLog
-}
diff --git a/app-emacs/flim/flim-1.14.9_p20190526.ebuild b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
index 38e708b0d332..270cd7667f31 100644
--- a/app-emacs/flim/flim-1.14.9_p20190526.ebuild
+++ b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
@@ -22,9 +22,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 SITEFILE="60${PN}-gentoo.el"
 
 src_compile() {
-	emake PREFIX="${ED}/usr" \
-		LISPDIR="${ED}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+	default
 }
 
 src_install() {