gentoo resync : 01.12.2017

6 files changed, 18 insertions, 130 deletions

diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index a5c18ef60685..778beff69038 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,8 +1,4 @@
-AUX kakoune-0_pre20170523-makefile.patch 864 BLAKE2B d884a47c9d2b659e361006806b1831f6c28ab03ce81ff7359214bb230f7327334495602f2ad417c2deedf179a1e91d79b419a5ac8362510a9eba2451cf9a4539 SHA512 173ba9eae8528d14f0dfc98aab956e1cc280fd15fe32b720afbe24c718b36192cdec1aeab64596b85be5a7ffc60bcc0516f7b8384c4ac718d3c7cb04f31af7a0
-AUX kakoune-makefile.patch 1166 BLAKE2B c32a2a087a65147f919412d3f888ca29cacbf01999704e80606aa9a0a973257e33ec3fc323e8ffe6532a85796030c72810e64529a1a6ea9b1ac83e64d707454f SHA512 68f1080e97562a4572ed40a7ba0774fbddd56bae50c3aa2d32d64b70d3cc17d898107bb1916710cc9f9a4af842630098c26399b0d88ffba0303e3f4ae63c782c
-DIST kakoune-0_pre20160620.tar.gz 370523 SHA256 4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512 c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c WHIRLPOOL c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
-DIST kakoune-0_pre20170523.tar.gz 420837 SHA256 3a083916729336dfd9e1e49cda62b5e3e881dbda7d6c7b5826377d5af15b1af9 SHA512 6d7d8f7afda75b824e4150512d9e0710cf22ef79af985c68b724a0f8e6949e5b0e7aab288f165a229f17706b30b51b462305538c7b56fd50689019118e913219 WHIRLPOOL 2e3a4c6b57944be46dbc8ddbc466fe3953453719146f4feabf8ae9688248a0d20ba2da3379fc7a503e7de7669df5f92d02e25dfc54c711a6ecdbee133b7a6ef8
-EBUILD kakoune-0_pre20160620.ebuild 910 BLAKE2B 85423f159491967fd23f296265aabb2f135a93758cc5b655441ff21f271a90c0b1737b5c8c2f8d80c3f999d546eaf3e312b1b5c90e37adb9cc9bf0c4802b4dee SHA512 1c8d279c20edf9cf9e0a3ff2733e7d8590aa6122f19dcbaeab19352d7d398d441683d521758b16df4d7d030246c4cdd5da9a26395e7d269acd8b9013265e6297
-EBUILD kakoune-0_pre20170523.ebuild 1174 BLAKE2B b24b12246c01aa25a1c1a09a1f830f28458289119a59f4b889e1616a06b4e9f988862b75a08afe8ad2cf64a1fe858ca4c1f43aefb6fa523d1c2adef850d14264 SHA512 012b97ce1f2c9bca51a238bc840da253460f2752b5ce8ebd1faed313b0ecf1a13b0a2c89988727e8052b39c44eacef52707e478afb0a70fde392e4a6287755c1
-EBUILD kakoune-9999.ebuild 1091 BLAKE2B a7dc4c3d5261f6014af63979395bbc3b08710eb01d27353c4fd66c5a42a408bc10727d56a77374a036bdd5b8633d8f7dee5d90be43dd64708f10e5a79b53b53e SHA512 324c83272bbc1cbe50f1cd8194dd166932ae7b375bad5502ef0defa149066d06f361b6d8d4d63a37187e8856aade39ce1de3d2e3fb51bcb7639abb356eaee79d
+DIST kakoune-0_pre20171120.tar.gz 460659 SHA256 10aea28840e2b58ce224fbf54c899797852bb0361e8c6363f0cc6af451d30b65 SHA512 0208fd932dcf6cef3fac3338dfc15f0ba36ed4e3fa282cc5ffac5ad823f91b553a8c34747ff33ec4382257a1eb71f21181b63595031f9f237cba3bc8eeda3626 WHIRLPOOL d611723d726f52ba08ef1580a7d286b853d78722374897ad78743eba3946e995aa89da7ca2cbb61472d3245101ef1bef9aa62b113b949494cead061fa7a961c9
+EBUILD kakoune-0_pre20171120.ebuild 1096 BLAKE2B c6ceef7195ed877fa4d6de7e905f41f5fac78eedd1824d03cc3e5552f0ac21b77de241128e214c3821a9d71c786d2e00bd9b2a881d70247129d344b5bc73040b SHA512 92f13420ab2324095b41b0b1a29df3779dc9328ee5ccf3ab576f46765b9c6104e4ad097fcbd0347192b60fb907097ce040c33dbd7f95a036db575dfe8d563c8d
+EBUILD kakoune-9999.ebuild 1013 BLAKE2B 9255ed63a1c4b7923e77f4edb2b2fe209937e5b5ffe8339933a017c66ab178d8253f33b46e5138a9ce3b47bc236b6727f92a1c4fbc86ef9ea4559a27c9f8ed8f SHA512 87f9ecc92473631e9b3c835aaf310411ec1892571c83f4a87593de1aa976fdc44b4946c982b1cd8e54663c1e83df2db5558980d1b5e0007ad0b7042cad372931
 MISC metadata.xml 461 BLAKE2B 10780dda95d0505d21c847f6bde5e370588d4f935145f7cf12a879f0798bdfb9bd61285521fb2be8227c19efe17c408498b9860069bba5be496887c263eeb8f9 SHA512 36c7ce23f0c5259e7bec75c2506aaabcdac43c71b34479824976dbcfecc42c96d3144ce6def550c79f92b7f02c97a1e053532626142818dc05641a4ea2974c97
diff --git a/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch b/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
deleted file mode 100644
index b30238d6f943..000000000000
--- a/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index dbef95d9..70f16b32 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -6,7 +6,6 @@ ifeq ($(debug),yes)
-     suffix := .debug
- else
-     ifeq ($(debug),no)
--        CXXFLAGS += -O3
-         suffix := .opt
-     else
-         $(error debug should be either yes or no)
-@@ -22,8 +21,6 @@ mandocs := $(docs:.asciidoc=.gz)
- PREFIX ?= /usr/local
- DESTDIR ?= # root dir
- 
--NCURSESW_INCLUDE ?= /usr/include/ncursesw
--
- bindir := $(DESTDIR)$(PREFIX)/bin
- sharedir := $(DESTDIR)$(PREFIX)/share/kak
- docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
-@@ -49,8 +46,7 @@ else ifneq (,$(findstring CYGWIN,$(os)))
-     CPPFLAGS += -D_XOPEN_SOURCE=700
-     LIBS += -lncursesw -lboost_regex -ldbghelp
- else
--    LIBS += -lncursesw -lboost_regex
--    CPPFLAGS += -I$(NCURSESW_INCLUDE)
-+    LIBS += -lboost_regex
-     LDFLAGS += -rdynamic
- endif
- 
diff --git a/app-editors/kakoune/files/kakoune-makefile.patch b/app-editors/kakoune/files/kakoune-makefile.patch
deleted file mode 100644
index 54a22d5ac925..000000000000
--- a/app-editors/kakoune/files/kakoune-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index c79c270..9409a8c 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,10 +3,10 @@ pedantic ?= yes
- 
- ifeq ($(debug),yes)
-     CPPFLAGS += -DKAK_DEBUG
-+    CXXFLAGS += -g
-     suffix := .debug
- else
-     ifeq ($(debug),no)
--        CXXFLAGS += -O3
-         suffix := .opt
-     else
-         $(error debug should be either yes or no)
-@@ -26,8 +26,6 @@ mandocs := $(docs:.asciidoc=.gz)
- PREFIX ?= /usr/local
- DESTDIR ?= # root dir
- 
--NCURSESW_INCLUDE ?= /usr/include/ncursesw
--
- bindir := $(DESTDIR)$(PREFIX)/bin
- sharedir := $(DESTDIR)$(PREFIX)/share/kak
- docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
-@@ -53,11 +51,10 @@ else ifneq (,$(findstring CYGWIN,$(os)))
--    LIBS += -lncursesw -lboost_regex -ldbghelp
-+    LIBS += -lboost_regex -ldbghelp
- else
--    LIBS += -lncursesw -lboost_regex
-+    LIBS += -lboost_regex
--    CPPFLAGS += -I$(NCURSESW_INCLUDE)
-     LDFLAGS += -rdynamic
- endif
- 
--CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
-+CXXFLAGS += -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
- 
- kak : $(objects)
- 	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(objects) $(LIBS) -o $@
diff --git a/app-editors/kakoune/kakoune-0_pre20160620.ebuild b/app-editors/kakoune/kakoune-0_pre20160620.ebuild
deleted file mode 100644
index 1dbd83893043..000000000000
--- a/app-editors/kakoune/kakoune-0_pre20160620.ebuild
+++ /dev/null
@@ -1,41 +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
-
-REF="34c8e6a9cf15410a433c8a8c3901703708b85611"
-
-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"
-
-RDEPEND="
-	sys-libs/ncurses:=[unicode]
-	dev-libs/boost
-"
-DEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
-
-src_configure() {
-	append-cppflags $(pkg-config --cflags ncursesw)
-	append-libs $(pkg-config --libs ncursesw)
-	export CXX=$(tc-getCXX)
-	export debug=$(usex debug)
-	S="${WORKDIR}/${P}/src"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/app-editors/kakoune/kakoune-0_pre20170523.ebuild b/app-editors/kakoune/kakoune-0_pre20171120.ebuild
index c03979ababee..862daa7fc9be 100644
--- a/app-editors/kakoune/kakoune-0_pre20170523.ebuild
+++ b/app-editors/kakoune/kakoune-0_pre20171120.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit flag-o-matic toolchain-funcs vcs-snapshot versionator
 
-REF="55d1d1020d215730737554045537cf3a8877c46a"
+REF="079b006cdab6f0ae594f80fff18ad61b71b0754d"
 
 DESCRIPTION="Selection-oriented code editor inspired by vim"
 HOMEPAGE="https://github.com/mawww/kakoune"
@@ -18,7 +18,6 @@ IUSE="debug static"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
-	dev-libs/boost:=
 "
 DEPEND="
 	app-text/asciidoc
@@ -26,8 +25,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" )
-
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
@@ -36,9 +33,14 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
+		die "Failed to patch makefile"
+}
+
 src_configure() {
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
-	append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
 	tc-export CXX
 	export debug=$(usex debug)
 	export static=$(usex static)
diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
index bd460c7c5746..f083c66b5e3e 100644
--- a/app-editors/kakoune/kakoune-9999.ebuild
+++ b/app-editors/kakoune/kakoune-9999.ebuild
@@ -16,7 +16,6 @@ IUSE="debug static"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
-	dev-libs/boost:=
 "
 DEPEND="
 	app-text/asciidoc
@@ -24,8 +23,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" )
-
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
@@ -34,9 +31,14 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	sed -i -e '/CXXFLAGS += -O3/d' src/Makefile || \
+		die "Failed to patch makefile"
+}
+
 src_configure() {
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
-	append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
 	tc-export CXX
 	export debug=$(usex debug)
 	export static=$(usex static)