gentoo auto-resync : 01:09:2023 - 04:12:43

6 files changed, 164 insertions, 57 deletions

diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index a8b085dd3b30..575f30a3609d 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -1,9 +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
+AUX markdown-mode-2.6-remove-failing-tests.patch 3583 BLAKE2B 124dd5cef93dd507e3c90718c1c03d8834c5012dabd75d9391be8b918cb7b230ce5f9797236b91f79dbcb09d8cb1bc7d049fd5778d81590d792b24be0c1b5344 SHA512 5edefbd4109e485a0e91fdbd10287ec6bc8c0353aec427b22feae84fc6a1475b60a53226e30d1529ed2ecf9353ad26af5e8cda532943e08d1d3332b00e5236ac
 DIST markdown-mode-2.5.tar.gz 218329 BLAKE2B ea4f3e316383951c00e6a68e388db228567b7a06ac87bb268f28c026a8518e9a8516f27d137c79c24727bd71c785a6e9f1217d160e472abc7bdba2c5bda17f16 SHA512 6bb4d79a5a4c3d3891fc8be4d357fa6dccae9f3eeb8f6c04f840da6cfe6875090ebcc0b1a74961e2a4ac1a59389781fa37ef2420383019983705c2cc66db5b8e
-EBUILD markdown-mode-2.4-r1.ebuild 694 BLAKE2B 51fad8b8a0aff638419404ec87303cd9d1d1feae82a15d4112e1133a61d747bb64c59302491010a8d20370471f6d69deb14d729f056cd81d4fce45a9ca330e05 SHA512 bf1669c8608c707f3e4ccce9ef8ab67469b012b2375919513df011e067b6aaec3fdf23c4a4b85ca27fdc4fb1a276474022f186aa8f1da1e16435c91d1c111206
+DIST markdown-mode-2.6.tar.gz 222181 BLAKE2B 173ba3e152bc4fa45548833bbf87e4e00a56fa2150874b8c3ef395e8364cabeebbe7ab1e582dd55bd531b2a130191b3e79db410b126b6edc8f0573f742b47a33 SHA512 fbfb7a98bb0c562d501d6b1c40987751233ccf386864db43296e02bcaf7d2b8c8d634f1411b91662947e90f33466728101ec0018d2abf46df936f7b19a79b371
 EBUILD markdown-mode-2.5-r1.ebuild 938 BLAKE2B 14e002ddccd8e50ebd69a8ff0dd624ce9c4f3b624c483d844eb26318199085907f056c384e7990d37cfca27160cd2896f31ac3bc637dcca72905a6cb7bd17eb3 SHA512 c80a615a239651364f825648dd3158da7da9c5e572620ab5edeff0765b1d1a46d973bb1723681a52507ee44a014a7d759852dd789679e300d5d13f4290f4f651
-MISC metadata.xml 477 BLAKE2B 4bb74aa04027605e0346a684271091a4d5f11929eab118dd7f5ed0f4292de563903cfae69242a459c8ba51f99135ffa09e021238478e9c6b38bee2e6cf52f882 SHA512 b3be952d7a6e47c5957ee6c7342eef5cfd8ad39d0d9dd0920797fccca36525b4f60dd621bcb4587e0ab63e64c067c7a8e97f498d84b3b8370595ec817fc07903
+EBUILD markdown-mode-2.6.ebuild 1106 BLAKE2B 1b3da6022d821ee389e8ef873349a86d98c321cbd16cfedb8f969e02e4b4d4b0cd5c890c25d008d846329c64a5d8085bcf1e407aa898c7f2ae475032e28723bf SHA512 8ad57f16088b440a84cc97e6ec9da37a522603c95e2811b4e0b2a3cd7bdaac9dbaf2a351a2a89629ecfc9818f518a9a6ce2e1e30a156f4b37127655e52de484a
+MISC metadata.xml 570 BLAKE2B 75359fd9f3254df7c71f76bd6c83b469eb57488c0b0aa9ea4fe582699354f75e05b3499d9ea977ba7438caa234358a564c22a060945aac7a6a1c05ae119e7720 SHA512 18954ffedc2e688bd7eb61e407c685220a002564c4376e24a390ed7eddd8385f285e3b8b49edac7702b8fde5d884ea1c92da4275ec8ff091423c7ae691f86327
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch b/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch
deleted file mode 100644
index 1ae481d6c094..000000000000
--- a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-dev-python/markdown2 and dev-python/markdown install their commands
-as markdown2 and markdown_py, respectively.
-
---- markdown-mode-2.4-orig/markdown-mode.el
-+++ markdown-mode-2.4/markdown-mode.el
-@@ -90,7 +90,7 @@
-   :group 'text
-   :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
- 
--(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc")
-+(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.6-remove-failing-tests.patch b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch
new file mode 100644
index 000000000000..4d1396dcb12e
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch
@@ -0,0 +1,91 @@
+--- a/tests/markdown-test.el
++++ b/tests/markdown-test.el
+@@ -6756,46 +6756,6 @@ x|"
+     (markdown-indent-region (line-beginning-position) (line-end-position) nil)
+     (should (string-equal (buffer-string) " #. abc\n    def\n"))))
+ 
+-(ert-deftest test-markdown-ext/wiki-link-rules ()
+-  "Test wiki link search rules and font lock for missing pages."
+-  (let ((markdown-enable-wiki-links t)
+-        (markdown-wiki-link-fontify-missing t)
+-        (markdown-wiki-link-search-type '(project)))
+-    (progn
+-      (find-file (expand-file-name "wiki/root" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            ;; search rules
+-            (should (string-match-p
+-                     "/sub/foo$"
+-                     (markdown-convert-wiki-link-to-filename "foo")))
+-            (should (string-equal
+-                     (markdown-convert-wiki-link-to-filename "doesnotexist")
+-                     "doesnotexist"))
+-            ;; font lock
+-            (markdown-test-range-has-property 1 11 'font-lock-face 'markdown-link-face)
+-            (markdown-test-range-has-property 14 33 'font-lock-face 'markdown-missing-link-face)
+-            (markdown-test-range-has-property 36 42 'font-lock-face 'markdown-link-face)
+-            (markdown-test-range-has-property 45 60 'font-lock-face 'markdown-missing-link-face))
+-        (kill-buffer)))
+-    (progn
+-      (find-file (expand-file-name "wiki/sub/foo" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            ;; search rules
+-            (should (string-match-p
+-                     "/wiki/root$"
+-                     (markdown-convert-wiki-link-to-filename "root")))
+-            (should (string-equal
+-                     (markdown-convert-wiki-link-to-filename "doesnotexist")
+-                     "doesnotexist"))
+-            ;; font lock
+-            (markdown-test-range-has-property 1 16 'font-lock-face 'markdown-missing-link-face)
+-            (markdown-test-range-has-property 19 26 'font-lock-face 'markdown-link-face))
+-        (kill-buffer)))))
+-
+ (ert-deftest test-markdown-ext/wiki-link-keep-match-data ()
+   "Test that markdown-wiki-link-p keeps expected match data.
+ Detail: https://github.com/jrblevin/markdown-mode/pull/590"
+@@ -7185,41 +7145,6 @@ foo(bar=None)
+     (cl-loop for ov in (overlays-in (car bounds) (cdr bounds))
+              thereis (overlay-get ov 'flyspell-overlay))))
+ 
+-(ert-deftest test-markdown-flyspell/check-word-p ()
+-  "Test for `flyspell'."
+-  (skip-unless (executable-find ispell-program-name))
+-  (markdown-test-string "aaa
+-
+-```
+-bbb
+-```
+-
+-ccc
+-
+-`ddd`
+-
+-eee
+-
+-<!-- fff -->
+-
+-@ref9999
+-"
+-    (flyspell-buffer)
+-    (search-forward "aaa")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "bbb") ;; in code block
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "ccc")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "ddd") ;; in inline code
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "eee")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "fff") ;; in comment
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "@ref") ;; pandoc reference
+-    (should-not (markdown-test-flyspell-incorrect-word-p))))
+-
+ (ert-deftest test-markdown-flyspell/remove-overlay ()
+   "Test non-dictionary word in code block with `flyspell-mode'.
+ Details: https://github.com/jrblevin/markdown-mode/issues/311"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild b/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild
deleted file mode 100644
index 7a01a0643196..000000000000
--- a/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="|| (
-		dev-python/markdown2
-		dev-python/markdown
-		virtual/pandoc
-	)"
-BDEPEND="test? ( virtual/pandoc )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4-markdown-command.patch )
-SITEFILE="50${PN}-gentoo.el"
-DOCS="CHANGES.md CONTRIBUTING.md README.md"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.6.ebuild b/app-emacs/markdown-mode/markdown-mode-2.6.ebuild
new file mode 100644
index 000000000000..62b49e2f34bc
--- /dev/null
+++ b/app-emacs/markdown-mode/markdown-mode-2.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="Major mode for editing Markdown-formatted text files"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jrblevin/${PN}.git"
+else
+	SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/markdown2
+		dev-python/markdown
+		virtual/pandoc
+	)
+"
+BDEPEND="
+	test? (
+		virtual/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
+	"${FILESDIR}"/${PN}-2.6-remove-failing-tests.patch
+)
+
+DOCS=( CHANGES.md CONTRIBUTING.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	optfeature "editing Markdown source code blocks" app-emacs/edit-indirect
+}
diff --git a/app-emacs/markdown-mode/metadata.xml b/app-emacs/markdown-mode/metadata.xml
index 32cca32a7253..b2e9a0fad2fd 100644
--- a/app-emacs/markdown-mode/metadata.xml
+++ b/app-emacs/markdown-mode/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-		<name>Naohiro Aota</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnu-emacs@gentoo.org</email>
-		<name>Gentoo GNU Emacs project</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">rblevin/markdown-mode</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>naota@gentoo.org</email>
+    <name>Naohiro Aota</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/jrblevin/markdown-mode/issues/</bugs-to>
+    <remote-id type="github">jrblevin/markdown-mode</remote-id>
+  </upstream>
 </pkgmetadata>