gentoo resync : 30.05.2020

5 files changed, 57 insertions, 103 deletions

diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 8764bb754b59..e49e7cc21c1f 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +1,4 @@
-DIST kakoune-0_pre20171120.tar.gz 460659 BLAKE2B 443583e5d766b227f678f9adec76f06a0dfe6a29e2d6f38896b20a911e08e933e1e631d1018e1510a49fbb71b4b0258029fd33ece8c478bd228ef67b6fae939a SHA512 0208fd932dcf6cef3fac3338dfc15f0ba36ed4e3fa282cc5ffac5ad823f91b553a8c34747ff33ec4382257a1eb71f21181b63595031f9f237cba3bc8eeda3626
-EBUILD kakoune-0_pre20171120.ebuild 1096 BLAKE2B c6ceef7195ed877fa4d6de7e905f41f5fac78eedd1824d03cc3e5552f0ac21b77de241128e214c3821a9d71c786d2e00bd9b2a881d70247129d344b5bc73040b SHA512 92f13420ab2324095b41b0b1a29df3779dc9328ee5ccf3ab576f46765b9c6104e4ad097fcbd0347192b60fb907097ce040c33dbd7f95a036db575dfe8d563c8d
-EBUILD kakoune-9999.ebuild 1013 BLAKE2B 9255ed63a1c4b7923e77f4edb2b2fe209937e5b5ffe8339933a017c66ab178d8253f33b46e5138a9ce3b47bc236b6727f92a1c4fbc86ef9ea4559a27c9f8ed8f SHA512 87f9ecc92473631e9b3c835aaf310411ec1892571c83f4a87593de1aa976fdc44b4946c982b1cd8e54663c1e83df2db5558980d1b5e0007ad0b7042cad372931
+AUX kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch 433 BLAKE2B 3cfe90cfa73bb82faa45402041160ce644f7cbff9a6072b4be7a68e8ea9249eda49946e6ffca898f38213aea2515c614b0b47f66bda7f53479c68ed6019fefb6 SHA512 790c0b84b044fc90a4ec8e9c6c116a169748326c383ee3d3e993a9768588749fb409291092edc3df93ae72a6e8a649c13c1c3a86d8ade6a70735483909e47cd0
+DIST kakoune-2020.01.16.tar.gz 579837 BLAKE2B 46abfd7f2bf2db6f9755a5b4f547e63e72ac7eef46ad0903dac08d0f422774632ac5aa3dc1e6c69aa6f0527bdff0ea1792574933ceb35b2495927f747be94aaf SHA512 81a0fb522fd7f289ede36f966e815d03550df389b05d27fa430474dd55a90cc0e1c5231e660328040f3bd79d155d37b7b135b52b93cee536c15d13fc9d06baa0
+EBUILD kakoune-2020.01.16.ebuild 836 BLAKE2B de4895474fc0a779620f6260fcc8f8cd3edee5d284d1090ec287d3df36bf7116e76b2d87530ca26d8a692316330233a4f93d72162a5314f6b83d79de9083f20f SHA512 6ecc3211f65185767bc0abea810aac81486f2bcf7e57068ad6c4b2ce2a66d31e1265a34586c2ff35df81bd7f4ea6771d9fbf2cf31bf07e41fdb7f49a9c544ce5
 MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
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
new file mode 100644
index 000000000000..726968e0e8c6
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
@@ -0,0 +1,15 @@
+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/kakoune-0_pre20171120.ebuild b/app-editors/kakoune/kakoune-0_pre20171120.ebuild
deleted file mode 100644
index 862daa7fc9be..000000000000
--- a/app-editors/kakoune/kakoune-0_pre20171120.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs vcs-snapshot versionator
-
-REF="079b006cdab6f0ae594f80fff18ad61b71b0754d"
-
-DESCRIPTION="Selection-oriented code editor inspired by vim"
-HOMEPAGE="https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
-			die "Clang or GCC >=5.0 is required to build this version"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
-		die "Failed to patch makefile"
-}
-
-src_configure() {
-	tc-export CXX
-	export debug=$(usex debug)
-	export static=$(usex static)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr" docdir="${ED%/}/usr/share/doc/${PF}" install
-}
diff --git a/app-editors/kakoune/kakoune-2020.01.16.ebuild b/app-editors/kakoune/kakoune-2020.01.16.ebuild
new file mode 100644
index 000000000000..476bbd2e9376
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2020.01.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-libs/ncurses:0=[unicode]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
+
+src_configure() { :; }
+
+src_compile() {
+	cd src/ || die
+
+	emake static=$(usex static-libs yes no) all
+}
+
+src_test() {
+	cd src/ || die
+	emake test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
+
+	rm "${D}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}
diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
deleted file mode 100644
index f083c66b5e3e..000000000000
--- a/app-editors/kakoune/kakoune-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs git-r3 versionator
-
-DESCRIPTION="Selection-oriented code editor inspired by vim"
-HOMEPAGE="https://github.com/mawww/kakoune"
-EGIT_REPO_URI="https://github.com/mawww/kakoune.git"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
-			die "Clang or GCC >=5.0 is required to build this version"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
-		die "Failed to patch makefile"
-}
-
-src_configure() {
-	tc-export CXX
-	export debug=$(usex debug)
-	export static=$(usex static)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr" docdir="${ED%/}/usr/share/doc/${PF}" install
-}