Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/qemacs/, app-editors/qemacs/files/
Date: Sat, 07 Apr 2018 11:53:25
Message-Id: 1523101989.b5c07195e5ac3ec9bb7da86b7d3d0795cafc225d.ulm@gentoo
1 commit: b5c07195e5ac3ec9bb7da86b7d3d0795cafc225d
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 7 11:52:11 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 7 11:53:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c07195
7
8 app-editors/qemacs: Remove old.
9
10 Package-Manager: Portage-2.3.28, Repoman-2.3.9
11
12 app-editors/qemacs/Manifest | 1 -
13 .../files/qemacs-0.3.2_pre20070226-tty_utf8.patch | 43 ------------
14 .../files/qemacs-0.4.0_pre20080605-Makefile.patch | 35 ----------
15 .../qemacs-0.4.0_pre20080605-make_backup.patch | 68 -------------------
16 .../files/qemacs-0.4.0_pre20090420-nostrip.patch | 36 ----------
17 .../qemacs/qemacs-0.4.0_pre20090420-r1.ebuild | 76 ----------------------
18 6 files changed, 259 deletions(-)
19
20 diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
21 index 41d0dd3d054..16ed5004d09 100644
22 --- a/app-editors/qemacs/Manifest
23 +++ b/app-editors/qemacs/Manifest
24 @@ -1,3 +1,2 @@
25 -DIST qemacs-0.4.0_pre20090420.tar.bz2 1393436 BLAKE2B 73cc34e711957db31d765e07712b5fb0ec94523c8d3a175beec95ca244929335088c69156a0f9f8c4875868c1add52a1c5f76e74a07f70d89f2c1c5d80917669 SHA512 4595e34d3a83cbd7f25514dd96b7578976b30de80eb19b1391448ecdb9c06d24088880978961e5abb94b3f715057e7563ae0976d704bc5afaaf83e62a67e8dd4
26 DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467
27 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
28
29 diff --git a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch b/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch
30 deleted file mode 100644
31 index 1f51ada5c2b..00000000000
32 --- a/app-editors/qemacs/files/qemacs-0.3.2_pre20070226-tty_utf8.patch
33 +++ /dev/null
34 @@ -1,43 +0,0 @@
35 -utf8 input in tty.c
36 -http://lists.gnu.org/archive/html/qemacs-devel/2004-03/msg00000.html
37 -http://bugs.gentoo.org/62829
38 -
39 ---- qemacs-orig/tty.c 2007-02-08 00:27:33.000000000 +0100
40 -+++ qemacs/tty.c 2007-02-26 15:07:41.000000000 +0100
41 -@@ -78,7 +78,6 @@
42 - /* input handling */
43 - enum InputState input_state;
44 - int input_param;
45 -- int utf8_state;
46 - int utf8_index;
47 - unsigned char buf[10];
48 - char *term_name;
49 -@@ -374,15 +373,19 @@
50 -
51 - /* charset handling */
52 - if (s->charset == &charset_utf8) {
53 -- if (ts->utf8_state == 0) {
54 -- const char *p;
55 -- p = (const char *)ts->buf;
56 -- ch = utf8_decode(&p);
57 -- } else {
58 -- ts->utf8_state = utf8_length[ts->buf[0]] - 1;
59 -- ts->utf8_index = 0;
60 -- return;
61 -- }
62 -+ /* Make sure utf8 input works correctly 20040314 <damm@××××××××××.se> */
63 -+ ts->utf8_index++;
64 -+
65 -+ if (utf8_length[ts->buf[0]] == ts->utf8_index) {;
66 -+ const char *p;
67 -+ p = (const char *)ts->buf;
68 -+ ch = utf8_decode(&p);
69 -+ ts->utf8_index = 0;
70 -+ }
71 -+ else {
72 -+ return;
73 -+ }
74 -+
75 - } else {
76 - ch = ts->buf[0];
77 - }
78
79 diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch
80 deleted file mode 100644
81 index 73c3f68b13a..00000000000
82 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-Makefile.patch
83 +++ /dev/null
84 @@ -1,35 +0,0 @@
85 ---- Makefile.orig 2009-03-07 21:27:48.000000000 +0100
86 -+++ Makefile 2009-03-07 21:28:43.000000000 +0100
87 -@@ -19,32 +19,6 @@
88 -
89 - include config.mak
90 -
91 --ifeq ($(CC),gcc)
92 -- CFLAGS := -Wall -g -O2 -funsigned-char
93 -- # do not warn about zero-length formats.
94 -- CFLAGS += -Wno-format-zero-length
95 -- LDFLAGS := -g
96 --endif
97 --
98 --#include local compiler configuration file
99 ---include cflags.mk
100 --
101 --ifdef TARGET_GPROF
102 -- CFLAGS += -p
103 -- LDFLAGS += -p
104 --endif
105 --
106 --TLDFLAGS := $(LDFLAGS)
107 --
108 --ifdef TARGET_ARCH_X86
109 -- #CFLAGS+=-fomit-frame-pointer
110 -- ifeq ($(GCC_MAJOR),2)
111 -- CFLAGS+=-m386 -malign-functions=0
112 -- else
113 -- CFLAGS+=-march=i386 -falign-functions=0
114 -- endif
115 --endif
116 --
117 - DEFINES=-DHAVE_QE_CONFIG_H
118 -
119 - ########################################################
120
121 diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch
122 deleted file mode 100644
123 index cdfe4c439db..00000000000
124 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20080605-make_backup.patch
125 +++ /dev/null
126 @@ -1,68 +0,0 @@
127 -Add make-backup-files command for backup toggling, from upstream mailing list:
128 -http://lists.gnu.org/archive/html/qemacs-devel/2004-11/msg00007.html
129 -http://bugs.gentoo.org/75052
130 -
131 ---- buffer.c.orig 2009-03-07 21:14:02.000000000 +0100
132 -+++ buffer.c 2009-03-07 21:15:40.000000000 +0100
133 -@@ -1657,12 +1657,14 @@
134 - if (stat(filename, &st) == 0)
135 - mode = st.st_mode & 0777;
136 -
137 -- /* backup old file if present */
138 -- if (strlen(filename) < MAX_FILENAME_SIZE - 1) {
139 -+ /* backup old file if present and make-backup-files is on */
140 -+ if(mbf == 1) {
141 -+ if (strlen(filename) < MAX_FILENAME_SIZE - 1) {
142 - if (snprintf(buf1, sizeof(buf1), "%s~", filename) < ssizeof(buf1)) {
143 - // should check error code
144 - rename(filename, buf1);
145 - }
146 -+ }
147 - }
148 -
149 - /* CG: should pass mode to buffer_save */
150 ---- qe.c.orig 2009-03-07 21:14:09.000000000 +0100
151 -+++ qe.c 2009-03-07 21:17:01.000000000 +0100
152 -@@ -71,6 +71,7 @@
153 - static int screen_height = 0;
154 - static int no_init_file;
155 - static const char *user_option;
156 -+mbf = 1;
157 -
158 - /* mode handling */
159 -
160 -@@ -5316,6 +5317,14 @@
161 - do_refresh(qs->first_window);
162 - }
163 -
164 -+static void make_backup_files(EditState *s) {
165 -+ if(mbf == 1) {
166 -+ mbf = 0;
167 -+ } else {
168 -+ mbf = 1;
169 -+ }
170 -+}
171 -+
172 - /* compute default path for find/save buffer */
173 - static void get_default_path(EditState *s, char *buf, int buf_size)
174 - {
175 ---- qeconfig.h.orig 2009-03-07 21:14:19.000000000 +0100
176 -+++ qeconfig.h 2009-03-07 21:17:37.000000000 +0100
177 -@@ -192,6 +192,7 @@
178 - "downcase-region", do_changecase_region, ESi, -1, "*v")
179 - CMD3( KEY_CTRLX(KEY_CTRL('u')), KEY_NONE,
180 - "upcase-region", do_changecase_region, ESi, 1, "*v")
181 -+ CMD0( KEY_NONE, KEY_NONE, "make-backup-files", make_backup_files)
182 -
183 - /*---------------- Command handling ----------------*/
184 -
185 ---- qe.h.orig 2009-03-07 21:14:26.000000000 +0100
186 -+++ qe.h 2009-03-07 21:17:53.000000000 +0100
187 -@@ -1765,6 +1765,7 @@
188 - /* image.c */
189 - void fill_border(EditState *s, int x, int y, int w, int h, int color);
190 - int qe_bitmap_format_to_pix_fmt(int format);
191 -+int mbf;
192 -
193 - /* shell.c */
194 - EditBuffer *new_shell_buffer(EditBuffer *b0, const char *name,
195
196 diff --git a/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch b/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch
197 deleted file mode 100644
198 index 120b09c2129..00000000000
199 --- a/app-editors/qemacs/files/qemacs-0.4.0_pre20090420-nostrip.patch
200 +++ /dev/null
201 @@ -1,36 +0,0 @@
202 ---- qemacs-orig/Makefile
203 -+++ qemacs/Makefile
204 -@@ -151,7 +151,6 @@
205 - qe$(EXE): qe_g$(EXE) Makefile
206 - rm -f $@
207 - cp $< $@
208 -- -$(STRIP) $@
209 - @ls -l $@
210 - echo `size $@` `wc -c $@` qe $(OPTIONS) \
211 - | cut -d ' ' -f 7-10,13,15-40 >> STATS
212 -@@ -165,7 +164,6 @@
213 - tqe$(EXE): tqe_g$(EXE) Makefile
214 - rm -f $@
215 - cp $< $@
216 -- -$(STRIP) $@
217 - @ls -l $@
218 - echo `size $@` `wc -c $@` tqe $(OPTIONS) \
219 - | cut -d ' ' -f 7-10,13,15-40 >> STATS
220 -@@ -329,7 +327,7 @@
221 - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
222 - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/man/man1
223 - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/qe
224 -- $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
225 -+ $(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
226 - ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
227 - ifdef CONFIG_FFMPEG
228 - ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
229 -@@ -337,7 +335,7 @@
230 - $(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(prefix)/share/qe
231 - $(INSTALL) -m 644 qe.1 $(DESTDIR)$(prefix)/man/man1
232 - ifdef CONFIG_HTML
233 -- $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
234 -+ $(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin
235 - endif
236 -
237 - uninstall:
238
239 diff --git a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild b/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
240 deleted file mode 100644
241 index 44aa76fbf48..00000000000
242 --- a/app-editors/qemacs/qemacs-0.4.0_pre20090420-r1.ebuild
243 +++ /dev/null
244 @@ -1,76 +0,0 @@
245 -# Copyright 1999-2013 Gentoo Foundation
246 -# Distributed under the terms of the GNU General Public License v2
247 -
248 -EAPI=5
249 -
250 -inherit eutils flag-o-matic toolchain-funcs
251 -
252 -DESCRIPTION="QEmacs is a very small but powerful UNIX editor"
253 -HOMEPAGE="https://savannah.nongnu.org/projects/qemacs"
254 -SRC_URI="mirror://gentoo/${P}.tar.bz2"
255 -
256 -LICENSE="LGPL-2.1+ GPL-2+"
257 -SLOT="0"
258 -KEYWORDS="amd64 arm ~ppc x86"
259 -IUSE="X png unicode xv"
260 -RESTRICT="test"
261 -
262 -RDEPEND="
263 - X? ( x11-libs/libX11
264 - x11-libs/libXext
265 - xv? ( x11-libs/libXv ) )
266 - png? ( >=media-libs/libpng-1.2:0= )"
267 -
268 -DEPEND="${RDEPEND}
269 - >=app-text/texi2html-5"
270 -
271 -S="${WORKDIR}/${PN}"
272 -
273 -src_prepare() {
274 - # Removes forced march setting and align-functions on x86, as they
275 - # would override user's CFLAGS..
276 - epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-Makefile.patch"
277 - # Make backup files optional
278 - epatch "${FILESDIR}/${PN}-0.4.0_pre20080605-make_backup.patch"
279 - # Suppress stripping
280 - epatch "${FILESDIR}/${P}-nostrip.patch"
281 -
282 - use unicode && epatch "${FILESDIR}/${PN}-0.3.2_pre20070226-tty_utf8.patch"
283 -
284 - # Change the manpage to reference a /real/ file instead of just an
285 - # approximation. Purely cosmetic!
286 - sed -i -e "s,^/usr/share/doc/qemacs,&-${PVR}," qe.1 || die
287 -
288 - # Fix compability with >=app-text/texi2html-5
289 - sed -i -e "/texi2html/s,-number,&-sections," Makefile || die
290 -}
291 -
292 -src_configure() {
293 - # when using any other CFLAGS than -O0, qemacs will segfault on startup,
294 - # see bug 92011
295 - replace-flags "-O?" -O0
296 - econf --cc="$(tc-getCC)" \
297 - $(use_enable X x11) \
298 - $(use_enable png) \
299 - $(use_enable xv)
300 -}
301 -
302 -src_compile() {
303 - # Does not support parallel building.
304 - emake -j1
305 -}
306 -
307 -src_install() {
308 - emake install DESTDIR="${D}"
309 - dodoc Changelog README TODO config.eg
310 - dohtml *.html
311 -
312 - # Fix man page location
313 - mv "${D}"/usr/{,share/}man || die
314 -
315 - # Install headers so users can build their own plugins.
316 - insinto /usr/include/qe
317 - doins *.h
318 - insinto /usr/include/qe/libqhtml
319 - doins libqhtml/*.h
320 -}