1 |
commit: f5291650ed9c07388840b6df45175dbccffba167 |
2 |
Author: Carlos Eduardo <carana2099 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 22 17:05:26 2022 +0000 |
4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
5 |
CommitDate: Tue Feb 22 17:05:26 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f5291650 |
7 |
|
8 |
app-misc/neo: update to 0.6.1 |
9 |
|
10 |
Also restricts BDEPEND to PV = 9999, and turns 9999 into the "master" file for |
11 |
easier symlink management. |
12 |
|
13 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
14 |
Signed-off-by: Carlos Eduardo <carana2099 <AT> gmail.com> |
15 |
|
16 |
app-misc/neo/Manifest | 2 +- |
17 |
.../neo-0.6-fixes-for-building-with-ncursesw.patch | 119 --------------------- |
18 |
app-misc/neo/neo-0.6.1.ebuild | 1 + |
19 |
app-misc/neo/neo-0.6.ebuild | 35 ------ |
20 |
4 files changed, 2 insertions(+), 155 deletions(-) |
21 |
|
22 |
diff --git a/app-misc/neo/Manifest b/app-misc/neo/Manifest |
23 |
index f700cd338..ef532e8a8 100644 |
24 |
--- a/app-misc/neo/Manifest |
25 |
+++ b/app-misc/neo/Manifest |
26 |
@@ -1 +1 @@ |
27 |
-DIST neo-0.6.tar.gz 141062 BLAKE2B 3e069e071281816913edb90218be551a5d82ded55f5b7cedbe305bce413acf624f0177945e90cf0ec48359ec47a0840adb7b5a32a5e553027e93945876c37a50 SHA512 de3f0d958ecaa284427b4271d7cf1f7569f545487ec0e525f381a999cae4a1dcd6b543c6e9cfe359fa1be8700fc38bbf091d077e6a5fbcea2a37f5cc3af83062 |
28 |
+DIST neo-0.6.1.tar.gz 134123 BLAKE2B 89ffea78033c7c3aa1e951fac777a784aecb433a062986df388c66f51f2861117ca9cf99dbd3d2c7a82ba26cab19680251524755474e851e2990dd740cf61e45 SHA512 ddd1dd602d2a375c7d292b6c3c71da0c8127c70774a74c0513c8c37aaa52318ada7d3f5540ecf325a586c46d572477d8848fda0a0ab2facce310b42d9137a817 |
29 |
|
30 |
diff --git a/app-misc/neo/files/neo-0.6-fixes-for-building-with-ncursesw.patch b/app-misc/neo/files/neo-0.6-fixes-for-building-with-ncursesw.patch |
31 |
deleted file mode 100644 |
32 |
index e2feda052..000000000 |
33 |
--- a/app-misc/neo/files/neo-0.6-fixes-for-building-with-ncursesw.patch |
34 |
+++ /dev/null |
35 |
@@ -1,119 +0,0 @@ |
36 |
-From c7e849a63327166b77e01e6d1683f44e129b3ef7 Mon Sep 17 00:00:00 2001 |
37 |
-From: Stewart Reive <3587451+st3w@××××××××××××××××××××.com> |
38 |
-Date: Sat, 18 Dec 2021 21:43:47 -0800 |
39 |
-Subject: [PATCH 11/12] Fixes for building with ncursesw |
40 |
- |
41 |
-This commit makes three improvements for building with ncursesw: |
42 |
- |
43 |
-1. Include "ncursesw/ncurses.h" if it exists |
44 |
-2. Explicitly link against libtinfow or libtinfo if necessary |
45 |
-3. Define _XOPEN_SOURCE_EXTENDED for Mac builds because it should |
46 |
- enable some of the widechar functions with the system's default |
47 |
- version of ncurses.h. |
48 |
---- |
49 |
- configure.ac | 18 +++++++++++++++++- |
50 |
- src/Makefile.am | 1 - |
51 |
- src/cloud.h | 12 ++++++++++-- |
52 |
- src/neo.cpp | 12 +++++++++++- |
53 |
- 4 files changed, 38 insertions(+), 5 deletions(-) |
54 |
- |
55 |
-diff --git a/configure.ac b/configure.ac |
56 |
-index 67fc25f..7b33b91 100644 |
57 |
---- a/configure.ac |
58 |
-+++ b/configure.ac |
59 |
-@@ -6,7 +6,23 @@ AC_LANG(C++) |
60 |
- AC_PROG_CXX |
61 |
- AC_PROG_INSTALL |
62 |
- AC_PROG_MAKE_SET |
63 |
--AC_CHECK_LIB(ncursesw, initscr) |
64 |
-+AC_CHECK_LIB(ncursesw, mvadd_wch) |
65 |
- AC_CHECK_HEADERS(getopt.h locale.h ncurses.h) |
66 |
-+ |
67 |
-+dnl Some systems have both ncurses.h and ncursesw/ncurses.h. |
68 |
-+dnl On many systems, the headers are identical (e.g. Ubuntu), |
69 |
-+dnl but for some systems they differ. So we should always try |
70 |
-+dnl to use ncursesw/ncurses.h if it exists. |
71 |
-+AC_CHECK_HEADER(ncursesw/ncurses.h, AC_DEFINE(HAVE_NCURSESW_H)) |
72 |
-+ |
73 |
-+dnl Some systems build ncurses with a separate "termlib" library. |
74 |
-+dnl This will usually be libtinfo or less frequently libtinfow. |
75 |
-+dnl These libraries provide functions that do not depend on whether |
76 |
-+dnl or not ncurses is using widechars (e.g. cbreak). This line adds |
77 |
-+dnl -ltinfow or -ltinfo to LIBS, if needed. If libncursesw |
78 |
-+dnl already provides cbreak, then the configure script should |
79 |
-+dnl print a message saying "none required", but it should not fail. |
80 |
-+AC_SEARCH_LIBS(cbreak, [tinfow tinfo]) |
81 |
-+ |
82 |
- AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile]) |
83 |
- AC_OUTPUT |
84 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
85 |
-index e34d8e3..6673492 100644 |
86 |
---- a/src/Makefile.am |
87 |
-+++ b/src/Makefile.am |
88 |
-@@ -2,7 +2,6 @@ bin_PROGRAMS = neo |
89 |
- AM_CXXFLAGS =\ |
90 |
- -DNCURSES_WIDECHAR\ |
91 |
- -std=c++11 |
92 |
--LDADD = -lncursesw |
93 |
- neo_SOURCES = \ |
94 |
- droplet.h \ |
95 |
- cloud.h \ |
96 |
-diff --git a/src/cloud.h b/src/cloud.h |
97 |
-index aca7630..20342d8 100644 |
98 |
---- a/src/cloud.h |
99 |
-+++ b/src/cloud.h |
100 |
-@@ -25,11 +25,19 @@ |
101 |
- #include "droplet.h" |
102 |
- #include "neo.h" |
103 |
- |
104 |
--#include <ncurses.h> |
105 |
-- |
106 |
- #include <random> |
107 |
- #include <vector> |
108 |
- |
109 |
-+#ifdef __APPLE__ |
110 |
-+ #define _XOPEN_SOURCE_EXTENDED 1 |
111 |
-+#endif |
112 |
-+ |
113 |
-+#ifdef HAVE_NCURSESW_H |
114 |
-+ #include <ncursesw/ncurses.h> |
115 |
-+#else |
116 |
-+ #include <ncurses.h> |
117 |
-+#endif |
118 |
-+ |
119 |
- using namespace std; |
120 |
- |
121 |
- class Cloud { |
122 |
-diff --git a/src/neo.cpp b/src/neo.cpp |
123 |
-index fd288f7..8fda940 100644 |
124 |
---- a/src/neo.cpp |
125 |
-+++ b/src/neo.cpp |
126 |
-@@ -23,7 +23,6 @@ |
127 |
- |
128 |
- #include <getopt.h> |
129 |
- #include <locale.h> |
130 |
--#include <ncurses.h> |
131 |
- #include <cassert> |
132 |
- #include <climits> |
133 |
- #include <cstdarg> |
134 |
-@@ -32,6 +31,17 @@ |
135 |
- #include <random> |
136 |
- #include <thread> |
137 |
- #include <utility> |
138 |
-+ |
139 |
-+#ifdef __APPLE__ |
140 |
-+ #define _XOPEN_SOURCE_EXTENDED 1 |
141 |
-+#endif |
142 |
-+ |
143 |
-+#ifdef HAVE_NCURSESW_H |
144 |
-+ #include <ncursesw/ncurses.h> |
145 |
-+#else |
146 |
-+ #include <ncurses.h> |
147 |
-+#endif |
148 |
-+ |
149 |
- using namespace std; |
150 |
- using namespace chrono; |
151 |
- |
152 |
--- |
153 |
-2.35.1 |
154 |
- |
155 |
|
156 |
diff --git a/app-misc/neo/neo-0.6.1.ebuild b/app-misc/neo/neo-0.6.1.ebuild |
157 |
new file mode 120000 |
158 |
index 000000000..132d15a69 |
159 |
--- /dev/null |
160 |
+++ b/app-misc/neo/neo-0.6.1.ebuild |
161 |
@@ -0,0 +1 @@ |
162 |
+neo-9999.ebuild |
163 |
\ No newline at end of file |
164 |
|
165 |
diff --git a/app-misc/neo/neo-0.6.ebuild b/app-misc/neo/neo-0.6.ebuild |
166 |
deleted file mode 100644 |
167 |
index 31dbbddfe..000000000 |
168 |
--- a/app-misc/neo/neo-0.6.ebuild |
169 |
+++ /dev/null |
170 |
@@ -1,35 +0,0 @@ |
171 |
-# Copyright 1999-2022 Gentoo Authors |
172 |
-# Distributed under the terms of the GNU General Public License v2 |
173 |
- |
174 |
-EAPI=8 |
175 |
- |
176 |
-DESCRIPTION="cmatrix clone with 32-bit color and Unicode support" |
177 |
-HOMEPAGE="https://github.com/st3w/neo" |
178 |
- |
179 |
-if [ "$PV" = 9999 ]; then |
180 |
- inherit git-r3 |
181 |
- EGIT_REPO_URI="https://github.com/st3w/neo/" |
182 |
- KEYWORDS="" |
183 |
-else |
184 |
- SRC_URI="https://github.com/st3w/neo/releases/download/v${PV}/${P}.tar.gz" |
185 |
- KEYWORDS="~amd64" |
186 |
- [ "$PV" = 0.6 ] && PATCHES=( |
187 |
- "${FILESDIR}"/neo-0.6-fixes-for-building-with-ncursesw.patch |
188 |
- ) |
189 |
-fi |
190 |
- |
191 |
-LICENSE="GPL-3" |
192 |
-SLOT="0" |
193 |
-IUSE="" |
194 |
- |
195 |
-DEPEND="sys-libs/ncurses" |
196 |
-RDEPEND="${DEPEND}" |
197 |
-BDEPEND=" |
198 |
- sys-devel/autoconf |
199 |
- sys-devel/autoconf-archive |
200 |
-" |
201 |
- |
202 |
-src_prepare() { |
203 |
- default |
204 |
- [ -f ./configure ] || ./autogen.sh || die 'autoreconf failed' |
205 |
-} |