6 files changed, 30 insertions, 30 deletions
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 1c96675674e2..700a7698869a 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,5 +1,5 @@
-AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
-AUX kakoune-2020.01.16-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
-DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
-EBUILD kakoune-2020.01.16_p20200601-r1.ebuild 1050 BLAKE2B 384beddd1657e9bcc14e82ce2fb59121a2de1325a9a4f81929b9ac7680bc88e4b471b339f64179a305a4a9da616c4a5f754b5e2df24de93ddf8069772fdb6d33 SHA512 de19599681da7055ae22699bf9305cc8916d853160d949ddc7ebc30581e94d27c3f2e1324457dd0baae51a31f5f3d7fe8716734f420119696d94f7a1b7e44c73
-MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
+AUX kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch 282 BLAKE2B e7a8e8e79fc81b42ac5cfc987684a38d8b73a3cabf7ccf3b35324f0cc49d2176a7aae4daefff46957cf3407a0c50544ae838d07f04b650cf2e2947fa3523ec59 SHA512 245138d130e32ca61dfdc5325362dae67113a73642f82356ef3a0d33367361e51011a8cac5c9bfc134c5aa2dd6461a0a9bc98ff54921a3763e8752d8f1fb4921
+AUX kakoune-2020.09.01-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
+DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126
+EBUILD kakoune-2020.09.01.ebuild 955 BLAKE2B e9e68960e0825839f40a167aa5604dca9e66ad6280935fdaab1495d0ecebdc0e96ed9cf44f0d47f2e9aecfffa19d72cda9b9aa4abb4917478760a0ebaf9258cf SHA512 bd8e52b290f30dc8e9972b27499c2b128b1e020347512598585221d4ce2877ff63362ecda440a9f0357b7fec6cdc9d8bf0f5dd41d5499b0bd3d1ff225e04fd19
+MISC metadata.xml 511 BLAKE2B 5ec5bbd3388e02601c560810a04e95e02f2d03f53e0539e98123ac3736849d49867301ebf02686ccf7c5e00b09800f6e8503792c63ffb0170ca0c7eaaffafec3 SHA512 20224a1e244a69b7d2536393b4d8f131bd97450a4223d530033b0e6391752ff0856a5929ba33c6466ee4f581c569afe11fdee1e2474f94ef18aea96675baa773
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index 726968e0e8c6..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
---- a/rc/filetype/sh.kak	2020-01-16 11:52:20.000000000 +0200
-+++ b/rc/filetype/sh.kak	2020-05-25 15:50:20.417809942 +0300
-@@ -2,6 +2,11 @@
-     set-option buffer filetype sh
- }
- 
-+hook global BufCreate .*\.ebuild %{
-+    set-option buffer filetype sh
-+}
-+
-+
- hook global WinSetOption filetype=sh %{
-     require-module sh
-     set-option window static_words %opt{sh_static_words}
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
new file mode 100644
index 000000000000..d7b9083a4281
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
@@ -0,0 +1,10 @@
+diff --git a/rc/filetype/gentoo-linux.kak b/rc/filetype/gentoo-linux.kak
+new file mode 100644
+index 00000000..251dad16
+--- /dev/null
++++ b/rc/filetype/gentoo-linux.kak
+@@ -0,0 +1,4 @@
++# portage ebuild file
++hook global BufCreate .*\.ebuild %{
++    set-option buffer filetype sh
++}
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
index d558c49347c1..d558c49347c1 100644
--- a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild b/app-editors/kakoune/kakoune-2020.09.01.ebuild
index 21dafc2dd2c7..bf078a51afe2 100644
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
+++ b/app-editors/kakoune/kakoune-2020.09.01.ebuild
@@ -1,15 +1,13 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
 DESCRIPTION="Modal editor inspired by vim"
 HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
+SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -20,8 +18,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
-	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+	"${FILESDIR}"/${PN}-2020.09.01-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.09.01-gcc-11.patch
 )
 
 src_prepare() {
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
index 9469b5728eda..0de50c33abc4 100644
--- a/app-editors/kakoune/metadata.xml
+++ b/app-editors/kakoune/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mawww/kakoune</remote-id>
-	</upstream>
+    <maintainer type="person" proxied="yes">
+        <email>mujo@sdf.org</email>
+        <name>Ian Hixson</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mawww/kakoune</remote-id>
+    </upstream>
 </pkgmetadata>