gentoo resync : 20.03.2022

4 files changed, 81 insertions, 0 deletions

diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index c310d8d7b4da..b4ab93a23bd2 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -1,5 +1,9 @@
 AUX 50markdown-mode-gentoo.el 252 BLAKE2B 1b718b5fb40ac043f74647d1bbf344bf07a63e530bd4ab3a52231c148b3bf824815a5e15482481ef4a9a183acc8894b9edcf3726af270dcbcfd9b42d502105b2 SHA512 403f80133fddcd2647d1e0c077628bb984e33b89dd68fdee05f87a13aa6b89e344c76944d3885789789884e7298dc9c1ced716fe721b1b2ed6dcf9bbb0f24f91
 AUX markdown-mode-2.4-markdown-command.patch 728 BLAKE2B 4ad9e86528da9cda91871fe2fb4f94d753ef348c35384bc30305cb369197d4c038d0e76c904da6da38887562fbfbda2c78ba1869d9e34f12f7bac77ff0468304 SHA512 a99f6e91e58570e8141c7ca2f90fa4e5009cf57a2fc3e6c7e5b4a916932e1838e1a46ecca40e36de87f0c33115f024ae1fb2d50eca6031374bd18bfce7c7ee33
+AUX markdown-mode-2.5-markdown-command.patch 680 BLAKE2B 16e8c8f8225ee197aee2d112b4a6c26a22435d5f167140234afc78b5ba4a1f581270da293b6602a22c90f01f08ac710739b7d0df4632b71976129d0548c8c95c SHA512 25a9e93eee6692f7ad55dc494c2a8b3400062ae6ffebafa21b091e32dfc877c2d39974282f4f3b64dd5e1e5376e449cec1fe204ce3948316457736d8a546c032
+AUX markdown-mode-2.5-test.patch 1314 BLAKE2B f238a3bf1426845c83d7882fd745350166cd5cf3721a4f7611619b73c720ae2e4435e7c14b379d3399d3fe21f258ec0368be44ccee87d0da0391d3401496b14f SHA512 87c7a633d9f0fea730d29f240824224a8569fbc4dd9337e40838000b4aad7a056fc0779965b5c2b6b436d6b7fafdf221dac1374df9fccfb807fdc53a453e2f38
 DIST markdown-mode-2.4.tar.gz 211229 BLAKE2B 49a369d1b418634449cdac3103e1b107b5dd839edba6a3329539b80cf21bfb0f01aa436ec6deb256bfb5f03ef73b716943730adc4a87b52262dfccbd7923556e SHA512 8bf2acd7f402c036c57521340d26cea150935964f04f1343c2e17147d63226c815150be62c0b79a2ba48e55b3155d94f38caf1ec43c21d4f32dee6e73cc261a0
+DIST markdown-mode-2.5.tar.gz 218329 BLAKE2B ea4f3e316383951c00e6a68e388db228567b7a06ac87bb268f28c026a8518e9a8516f27d137c79c24727bd71c785a6e9f1217d160e472abc7bdba2c5bda17f16 SHA512 6bb4d79a5a4c3d3891fc8be4d357fa6dccae9f3eeb8f6c04f840da6cfe6875090ebcc0b1a74961e2a4ac1a59389781fa37ef2420383019983705c2cc66db5b8e
 EBUILD markdown-mode-2.4.ebuild 712 BLAKE2B b1ad8291e344d90c847d234d1158db0ada5a60953edf63e00c857780fb36917ec41bf70349a19bc265c5427fbc53ed51777ab1624934986ced9c7b8ae634eb22 SHA512 e30b4f400171a2f9d34590b0e305411dc0ecf06d410cad60e729593825b4176dd5d1f849022807644ba5529bef2698bcf8c317a68a5598cba41faecb99776d01
+EBUILD markdown-mode-2.5.ebuild 810 BLAKE2B f0bac20353eb9225dfe8a359dd4f9ea009138346319e6c74f124040e8a20de28a93189d6c15cee9dc6505fc20c299a64295864f4dbe28bc18851a37a661b187e SHA512 b9b99086592284add04f7dd27fcacce4fe11409f1e0f1843f0d3ee2e236128391f512a81ec53a0594298ce4afff67fdca3fb5eb2571ed6f99851bc927616441f
 MISC metadata.xml 358 BLAKE2B 49f5321a36efc152ede2ad03443a132faf724f14284beb33b158e57efa3947079941b0335a6eabb426b526cea05d487f0000eaa3efed7a2670312572e442b67c SHA512 0b76f672e5a53519121c2610921dd16fcf17cb90a150fd9021ff4bbb810739e663f2c284f6b996504f2141032177b6e2d7d8aa6456c37a716143592cb5bedf6a
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.5-markdown-command.patch b/app-emacs/markdown-mode/files/markdown-mode-2.5-markdown-command.patch
new file mode 100644
index 000000000000..99ed3d2149b7
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.5-markdown-command.patch
@@ -0,0 +1,13 @@
+dev-python/markdown2 installs its command as markdown2
+
+--- markdown-mode-2.5/markdown-mode.el
++++ markdown-mode-2.5/markdown-mode.el
+@@ -94,7 +94,7 @@
+   :group 'text
+   :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
+ 
+-(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown_py")
++(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown2" "markdown_py")
+                                                     when (executable-find cmd)
+                                                     return (file-name-nondirectory it))))
+                               (or command "markdown"))
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.5-test.patch b/app-emacs/markdown-mode/files/markdown-mode-2.5-test.patch
new file mode 100644
index 000000000000..0bd1e8b7f667
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.5-test.patch
@@ -0,0 +1,30 @@
+This test seems to expect interactive input, therefore disable.
+
+--- markdown-mode-2.5/tests/markdown-test.el
++++ markdown-mode-2.5/tests/markdown-test.el
+@@ -6643,25 +6643,6 @@
+             (should (string= (markdown-wiki-link-link) "Zettel Markdown")))
+         (kill-buffer)))))
+ 
+-(ert-deftest test-markdown-ext/wiki-link-search-under-project ()
+-  "Test that searching link under project root."
+-  (let ((markdown-enable-wiki-links t)
+-        (markdown-link-space-sub-char " ")
+-        (markdown-wiki-link-search-type '(project))
+-        (expected (expand-file-name "wiki/pr590/Guide/Zettel Markdown/math.md"
+-                                    markdown-test-dir)))
+-    (progn
+-      (find-file (expand-file-name "wiki/pr590/Guide/Plugin/Link.md" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            (re-search-forward "math")
+-            (goto-char (match-beginning 0))
+-            (markdown-wiki-link-p) ;; create match-data
+-            (let ((link (markdown-convert-wiki-link-to-filename (markdown-wiki-link-link))))
+-              (should (string= (expand-file-name link) expected))))
+-        (kill-buffer)))))
+-
+ (ert-deftest test-markdown-ext/wiki-link-major-mode ()
+   "Test major-mode of linked page."
+   (let ((markdown-enable-wiki-links t)
diff --git a/app-emacs/markdown-mode/markdown-mode-2.5.ebuild b/app-emacs/markdown-mode/markdown-mode-2.5.ebuild
new file mode 100644
index 000000000000..ccc41dbe1ba0
--- /dev/null
+++ b/app-emacs/markdown-mode/markdown-mode-2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Markdown-formatted text files"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
+SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="|| (
+		app-text/pandoc
+		dev-python/markdown2
+		dev-python/markdown
+	)"
+BDEPEND="test? (
+	app-text/pandoc
+	|| ( app-text/aspell[l10n_en] app-text/hunspell[l10n_en] )
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5-markdown-command.patch
+	"${FILESDIR}"/${PN}-2.5-test.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+DOCS="CHANGES.md CONTRIBUTING.md README.md"