Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/multi-aterm/, x11-terms/multi-aterm/files/, profiles/
Date: Mon, 03 Feb 2020 06:10:55
Message-Id: 1580710110.ec9b6020b8390ec3da95bee9945be61aed1c8556.mgorny@gentoo
1 commit: ec9b6020b8390ec3da95bee9945be61aed1c8556
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 3 06:08:30 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 3 06:08:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9b6020
7
8 x11-terms/multi-aterm: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/692228
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 5 --
14 x11-terms/multi-aterm/Manifest | 1 -
15 .../multi-aterm/files/0.2.1-initialize-vars.patch | 11 ----
16 .../multi-aterm-0.2.1-display-security-issue.patch | 23 ---------
17 .../files/multi-aterm-0.2.1-libpng14.patch | 20 --------
18 x11-terms/multi-aterm/metadata.xml | 5 --
19 x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild | 58 ----------------------
20 7 files changed, 123 deletions(-)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index 2f972d4e4a9..300ba2a1e76 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -784,11 +784,6 @@ games-action/accelerator3d
27 # Removal in 30 days. Bug #693032.
28 games-kids/tuxmathscrabble
29
30 -# David Seifert <soap@g.o> (2019-12-24)
31 -# Unmaintained, uses dead POSIX streams interface, EAPI 4.
32 -# Bug #692228, Removal in 30 days.
33 -x11-terms/multi-aterm
34 -
35 # Tomáš Mózes <hydrapolic@g.o> (2019-12-19)
36 # Needs more testing.
37 =app-emulation/xen-4.13.0
38
39 diff --git a/x11-terms/multi-aterm/Manifest b/x11-terms/multi-aterm/Manifest
40 deleted file mode 100644
41 index fd0e3c1213d..00000000000
42 --- a/x11-terms/multi-aterm/Manifest
43 +++ /dev/null
44 @@ -1 +0,0 @@
45 -DIST multi-aterm-0.2.1.tar.gz 237428 BLAKE2B 44c20143ce55b20ba82dc1fec49b63a5c2c7387862203cd9eff0a6f4d1c34b599fe0ff965e50062ec144eab4655f4df1f421f73ecdaee095554024b4b4f4f60c SHA512 f5326314c97514609c84ae997c336afe6baa334d2295b4d4803e72411c07c377475a713473193a8d4260eca9008fbbc31c0ef93805e66024ea0814ab504c8d2a
46
47 diff --git a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch b/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
48 deleted file mode 100644
49 index 58be689bb96..00000000000
50 --- a/x11-terms/multi-aterm/files/0.2.1-initialize-vars.patch
51 +++ /dev/null
52 @@ -1,11 +0,0 @@
53 ---- src/command.c
54 -+++ src/command.c
55 -@@ -1487,7 +1487,7 @@
56 - static XComposeStatus compose = { NULL, 0 };
57 - static unsigned char kbuf[KBUFSZ];
58 - int ctrl, meta, shft, len;
59 -- KeySym keysym;
60 -+ KeySym keysym = 0;
61 -
62 - /*
63 - * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
64
65 diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
66 deleted file mode 100644
67 index 93978548403..00000000000
68 --- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
69 +++ /dev/null
70 @@ -1,23 +0,0 @@
71 -http://bugs.gentoo.org/219754
72 -
73 ---- src/main.c
74 -+++ src/main.c
75 -@@ -1853,15 +1853,13 @@
76 - //get_options(argc, argv);
77 - //display_options();
78 -
79 -- if (display_name == NULL)
80 -- if ((display_name = getenv("DISPLAY")) == NULL)
81 -- display_name = ":0";
82 --
83 - Xdisplay = XOpenDisplay(display_name);
84 -
85 - if (!Xdisplay)
86 - {
87 -- print_error("can't open display %s", display_name);
88 -+ print_error("can't open display %s", display_name?display_name:
89 -+ getenv("DISPLAY")?getenv("DISPLAY"):
90 -+ "as no -d given and DISPLAY not set");
91 - exit(EXIT_FAILURE);
92 - }
93 -
94
95 diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
96 deleted file mode 100644
97 index 6aeadc47780..00000000000
98 --- a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-libpng14.patch
99 +++ /dev/null
100 @@ -1,20 +0,0 @@
101 ---- src/png.c
102 -+++ src/png.c
103 -@@ -86,7 +86,7 @@
104 - display_depth = XDefaultDepth(display,XDefaultScreen(display));
105 -
106 - fread(sig, 1, 8, ifile);
107 -- if (!png_check_sig(sig, 8)){
108 -+ if (png_sig_cmp (sig, 0, 8)){
109 - fclose(ifile);
110 - return -1;
111 - }
112 -@@ -116,7 +116,7 @@
113 -
114 - if (png_depth < 8){
115 - if (png_color_type == PNG_COLOR_TYPE_GRAY ){
116 -- png_set_gray_1_2_4_to_8(png_ptr);
117 -+ png_set_expand_gray_1_2_4_to_8(png_ptr);
118 - png_row_bytes = png_width;
119 - }else{
120 - png_set_expand(png_ptr);
121
122 diff --git a/x11-terms/multi-aterm/metadata.xml b/x11-terms/multi-aterm/metadata.xml
123 deleted file mode 100644
124 index 6f49eba8f49..00000000000
125 --- a/x11-terms/multi-aterm/metadata.xml
126 +++ /dev/null
127 @@ -1,5 +0,0 @@
128 -<?xml version="1.0" encoding="UTF-8"?>
129 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
130 -<pkgmetadata>
131 -<!-- maintainer-needed -->
132 -</pkgmetadata>
133
134 diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
135 deleted file mode 100644
136 index da0c8e29163..00000000000
137 --- a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
138 +++ /dev/null
139 @@ -1,58 +0,0 @@
140 -# Copyright 1999-2017 Gentoo Foundation
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=4
144 -
145 -inherit eutils
146 -
147 -DESCRIPTION="rxvt compatible terminal emulator with transparency and tab support"
148 -HOMEPAGE="http://www.nongnu.org/materm/materm.html"
149 -SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz"
150 -
151 -LICENSE="GPL-2"
152 -SLOT="0"
153 -KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
154 -IUSE="cjk debug jpeg png"
155 -
156 -RDEPEND="x11-libs/libXpm
157 - jpeg? ( virtual/jpeg )
158 - png? ( media-libs/libpng )"
159 -DEPEND="${RDEPEND}
160 - >=sys-apps/sed-4"
161 -
162 -DOCS=( AUTHORS ChangeLog NEWS TODO )
163 -
164 -src_prepare() {
165 - epatch "${FILESDIR}"/${PV}-initialize-vars.patch \
166 - "${FILESDIR}"/${P}-display-security-issue.patch \
167 - "${FILESDIR}"/${P}-libpng14.patch
168 -
169 - sed -i \
170 - -e 's:png_check_sig:png_sig_cmp:' \
171 - configure || die
172 -}
173 -
174 -src_configure() {
175 - econf \
176 - --enable-transparency \
177 - --enable-fading \
178 - --enable-xterm-scroll \
179 - --enable-half-shadow \
180 - --enable-graphics \
181 - --enable-mousewheel \
182 - --with-x \
183 - --with-xpm=/usr \
184 - $(use_enable cjk kanji) \
185 - $(use_enable debug) \
186 - $(use_enable jpeg) \
187 - $(use_enable png)
188 -}
189 -
190 -src_compile() {
191 - emake CFLAGS="${CFLAGS}"
192 -}
193 -
194 -src_install() {
195 - default
196 - newdoc doc/TODO TODO.2
197 -}