Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
Date: Wed, 29 Nov 2017 23:20:04
Message-Id: 1511997561.ecfcfd8e746ba83d767b2af5757bcf9838e4c28b.asturm@gentoo
1 commit: ecfcfd8e746ba83d767b2af5757bcf9838e4c28b
2 Author: Mykyta Holubakha <hilobakho <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 19 23:50:58 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 29 23:19:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfcfd8e
7
8 app-editors/kakoune: drop old 0_pre20160620
9
10 app-editors/kakoune/Manifest | 1 -
11 app-editors/kakoune/files/kakoune-makefile.patch | 40 -----------------------
12 app-editors/kakoune/kakoune-0_pre20160620.ebuild | 41 ------------------------
13 3 files changed, 82 deletions(-)
14
15 diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
16 index afcb832a7eb..0ef5c4bdd7b 100644
17 --- a/app-editors/kakoune/Manifest
18 +++ b/app-editors/kakoune/Manifest
19 @@ -1,2 +1 @@
20 -DIST kakoune-0_pre20160620.tar.gz 370523 SHA256 4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512 c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c WHIRLPOOL c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
21 DIST kakoune-0_pre20170523.tar.gz 420837 SHA256 3a083916729336dfd9e1e49cda62b5e3e881dbda7d6c7b5826377d5af15b1af9 SHA512 6d7d8f7afda75b824e4150512d9e0710cf22ef79af985c68b724a0f8e6949e5b0e7aab288f165a229f17706b30b51b462305538c7b56fd50689019118e913219 WHIRLPOOL 2e3a4c6b57944be46dbc8ddbc466fe3953453719146f4feabf8ae9688248a0d20ba2da3379fc7a503e7de7669df5f92d02e25dfc54c711a6ecdbee133b7a6ef8
22
23 diff --git a/app-editors/kakoune/files/kakoune-makefile.patch b/app-editors/kakoune/files/kakoune-makefile.patch
24 deleted file mode 100644
25 index 54a22d5ac92..00000000000
26 --- a/app-editors/kakoune/files/kakoune-makefile.patch
27 +++ /dev/null
28 @@ -1,40 +0,0 @@
29 -diff --git a/src/Makefile b/src/Makefile
30 -index c79c270..9409a8c 100644
31 ---- a/src/Makefile
32 -+++ b/src/Makefile
33 -@@ -3,10 +3,10 @@ pedantic ?= yes
34 -
35 - ifeq ($(debug),yes)
36 - CPPFLAGS += -DKAK_DEBUG
37 -+ CXXFLAGS += -g
38 - suffix := .debug
39 - else
40 - ifeq ($(debug),no)
41 -- CXXFLAGS += -O3
42 - suffix := .opt
43 - else
44 - $(error debug should be either yes or no)
45 -@@ -26,8 +26,6 @@ mandocs := $(docs:.asciidoc=.gz)
46 - PREFIX ?= /usr/local
47 - DESTDIR ?= # root dir
48 -
49 --NCURSESW_INCLUDE ?= /usr/include/ncursesw
50 --
51 - bindir := $(DESTDIR)$(PREFIX)/bin
52 - sharedir := $(DESTDIR)$(PREFIX)/share/kak
53 - docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
54 -@@ -53,11 +51,10 @@ else ifneq (,$(findstring CYGWIN,$(os)))
55 -- LIBS += -lncursesw -lboost_regex -ldbghelp
56 -+ LIBS += -lboost_regex -ldbghelp
57 - else
58 -- LIBS += -lncursesw -lboost_regex
59 -+ LIBS += -lboost_regex
60 -- CPPFLAGS += -I$(NCURSESW_INCLUDE)
61 - LDFLAGS += -rdynamic
62 - endif
63 -
64 --CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
65 -+CXXFLAGS += -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
66 -
67 - kak : $(objects)
68 - $(CXX) $(LDFLAGS) $(CXXFLAGS) $(objects) $(LIBS) -o $@
69
70 diff --git a/app-editors/kakoune/kakoune-0_pre20160620.ebuild b/app-editors/kakoune/kakoune-0_pre20160620.ebuild
71 deleted file mode 100644
72 index 1dbd8389304..00000000000
73 --- a/app-editors/kakoune/kakoune-0_pre20160620.ebuild
74 +++ /dev/null
75 @@ -1,41 +0,0 @@
76 -# Copyright 1999-2017 Gentoo Foundation
77 -# Distributed under the terms of the GNU General Public License v2
78 -
79 -EAPI=6
80 -
81 -inherit flag-o-matic toolchain-funcs vcs-snapshot
82 -
83 -REF="34c8e6a9cf15410a433c8a8c3901703708b85611"
84 -
85 -DESCRIPTION="Selection-oriented code editor inspired by vim"
86 -HOMEPAGE="https://github.com/mawww/kakoune"
87 -SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
88 -
89 -LICENSE="Unlicense"
90 -SLOT="0"
91 -KEYWORDS="amd64 x86"
92 -IUSE="debug"
93 -
94 -RDEPEND="
95 - sys-libs/ncurses:=[unicode]
96 - dev-libs/boost
97 -"
98 -DEPEND="
99 - app-text/asciidoc
100 - virtual/pkgconfig
101 - ${RDEPEND}
102 -"
103 -
104 -PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
105 -
106 -src_configure() {
107 - append-cppflags $(pkg-config --cflags ncursesw)
108 - append-libs $(pkg-config --libs ncursesw)
109 - export CXX=$(tc-getCXX)
110 - export debug=$(usex debug)
111 - S="${WORKDIR}/${P}/src"
112 -}
113 -
114 -src_install() {
115 - emake DESTDIR="${D}" PREFIX="/usr" docdir="${D}/usr/share/doc/${PF}" install
116 -}