From c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 7 May 2021 01:33:16 +0100
Subject: gentoo resync : 07.05.2021

---
 app-editors/kakoune/Manifest                       |  3 ++-
 .../kakoune/files/kakoune-2020.01.16-gcc-11.patch  | 11 ++++++++
 .../kakoune/kakoune-2020.01.16_p20200601.ebuild    | 30 ++++++++++++++--------
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch

(limited to 'app-editors/kakoune')

diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 602cb3a90496..a0a9f7820d00 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +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.ebuild 903 BLAKE2B 8307aba24da0c372e10e301834651e586ef8f7f4d95c465643452e7de4d6a9f8c557e1104db04267bb0609940217f5f5574a41ea0a7a58004dbb29a66ae650ac SHA512 a0af7953ad6d02eeee286ebd3a519b0315a2f47e408efe33bcf1a6ddf49b408da15747e30d64f6158fadcc210ec4046d9f02b49a745c5ff5793f5551d330687f
+EBUILD kakoune-2020.01.16_p20200601.ebuild 1048 BLAKE2B b9d2da90932008b085d2e38aa1f84ad2c241bb35dc7ae6f89a23b3e4b1531b6ee9361d9ce80aefd39a38e860549f8678494f9b9b0712e611230aa04c5d4690ad SHA512 e91618763b8509d0b964bafc4e46109811af02a81c80ae710da2d9e27c52ca7a285ff933d017c3aa32d59dd0ad0c95ea3e7246378a7cc37fed19267bbbc56d2b
 MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
new file mode 100644
index 000000000000..d558c49347c1
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/787029
+--- a/src/regex_impl.cc
++++ b/src/regex_impl.cc
+@@ -12,6 +12,7 @@
+ 
+ #include <cstdio>
+ #include <cstring>
++#include <limits>
+ 
+ namespace Kakoune
+ {
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
index bcbba4882812..20c792e1d588 100644
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
+++ b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
@@ -1,13 +1,15 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
+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}"
 
 LICENSE="Unlicense"
 SLOT="0"
@@ -17,25 +19,31 @@ DEPEND="sys-libs/ncurses:0=[unicode]"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+)
 
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
 
-src_configure() { :; }
+src_configure() {
+	tc-export CXX
+}
 
 src_compile() {
-	cd src/ || die
-	emake all
+	emake -C src all
 }
 
 src_test() {
-	cd src/ || die
-	emake test
+	emake -C src test
 }
 
 src_install() {
-	emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
 
-	rm "${D}/usr/share/man/man1/kak.1.gz" || die
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
 	doman doc/kak.1
 }
-- 
cgit v1.2.3