Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/aee/files/, app-editors/aee/
Date: Sun, 10 May 2020 09:43:00
Message-Id: 1589103766.65532e4b25489f552610df6dce37e2c041b4545e.hattya@gentoo
1 commit: 65532e4b25489f552610df6dce37e2c041b4545e
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 10 09:41:53 2020 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sun May 10 09:42:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65532e4b
7
8 app-editors/aee: drop old
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
12
13 app-editors/aee/Manifest | 1 -
14 app-editors/aee/aee-2.2.15b.ebuild | 64 ----------------
15 .../aee/files/aee-2.2.15b-ae-location.patch | 89 ----------------------
16 3 files changed, 154 deletions(-)
17
18 diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
19 index 546e1aa98e5..11e79c3f720 100644
20 --- a/app-editors/aee/Manifest
21 +++ b/app-editors/aee/Manifest
22 @@ -1,2 +1 @@
23 -DIST aee-2.2.15b.tar.gz 184218 BLAKE2B f249c0974a971aa6a1bb38afb8675a3ace671d244c717add4ea2f724ac1d07bf1c57c5d27fb6f9f40f27b3055ba94cf959dd4b855181a83f4522c44124c0b994 SHA512 2810cd8f5148edb352fdaefbc823d417b9a83c8083644c8729be8595013ca8ba660bd72120db1e15915e454f5185d2d030c2f0c853b37eb83c213c1d581a640f
24 DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a
25
26 diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild
27 deleted file mode 100644
28 index 56d77568f79..00000000000
29 --- a/app-editors/aee/aee-2.2.15b.ebuild
30 +++ /dev/null
31 @@ -1,64 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="7"
36 -
37 -inherit toolchain-funcs
38 -
39 -DESCRIPTION="An easy to use text editor"
40 -#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
41 -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
42 -SRC_URI="mirror://gentoo/${P}.tar.gz"
43 -
44 -LICENSE="Artistic"
45 -SLOT="0"
46 -KEYWORDS="amd64 x86 ~amd64-linux"
47 -IUSE="X"
48 -
49 -RDEPEND="X? ( x11-libs/libX11 )"
50 -DEPEND="${RDEPEND}"
51 -
52 -PATCHES=(
53 - "${FILESDIR}"/${P}-ae-location.patch
54 - "${FILESDIR}"/${PN}-Wformat-security.patch
55 - "${FILESDIR}"/${PN}-gcc-10.patch
56 -)
57 -DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
58 -
59 -src_prepare() {
60 - sed -i \
61 - -e "s/make -/\$(MAKE) -/g" \
62 - -e "/^buildaee/s/$/ localaee/" \
63 - -e "/^buildxae/s/$/ localxae/" \
64 - Makefile
65 -
66 - sed -i \
67 - -e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
68 - -e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
69 - -e "/other_cflag/s/ \${strip_option}//" \
70 - create.mk.{aee,xae}
71 -
72 - default
73 -}
74 -
75 -src_compile() {
76 - local target="aee"
77 - use X && target="both"
78 -
79 - emake CC="$(tc-getCC)" ${target}
80 -}
81 -
82 -src_install() {
83 - dobin ${PN}
84 - dosym ${PN} /usr/bin/rae
85 - doman ${PN}.1
86 - einstalldocs
87 -
88 - insinto /usr/share/${PN}
89 - doins help.ae
90 -
91 - if use X; then
92 - dobin xae
93 - dosym xae /usr/bin/rxae
94 - fi
95 -}
96
97 diff --git a/app-editors/aee/files/aee-2.2.15b-ae-location.patch b/app-editors/aee/files/aee-2.2.15b-ae-location.patch
98 deleted file mode 100644
99 index 4a17642b915..00000000000
100 --- a/app-editors/aee/files/aee-2.2.15b-ae-location.patch
101 +++ /dev/null
102 @@ -1,89 +0,0 @@
103 ---- a/aee.1
104 -+++ b/aee.1
105 -@@ -678,7 +678,7 @@
106 - .\"
107 - .SS Initializing aee From A File
108 - .PP
109 --\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR,
110 -+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR,
111 - .I .init.ae
112 - in the user's home directory, then for \fI.init.ae\fR in the
113 - current directory. (This file may be created manually or by using the
114 -@@ -960,7 +960,7 @@
115 - .PP
116 - On-line help is provided through the 'help' command or menu item. This
117 - command uses a file with help information. By default the help file is
118 --located in \fB/usr/local/lib/help.ae\fR, but this file may be located
119 -+located in \fB/usr/share/aee/help.ae\fR, but this file may be located
120 - in the user's home directory with the name \fB.help.ae\fR, or in the
121 - current directory with the name \fBhelp.ae\fR.
122 - .\"
123 -@@ -1017,7 +1017,7 @@
124 - .\"
125 - .SH FILES
126 - .PP
127 --.I /usr/local/lib/init.ae
128 -+.I /usr/share/aee/init.ae
129 - .br
130 - .I $HOME/.aeeinfo
131 - .br
132 ---- a/aee.c
133 -+++ b/aee.c
134 -@@ -2612,7 +2612,7 @@
135 -
136 - char *init_name[4] = {
137 - "/usr/local/aee/init.ae",
138 -- "/usr/local/lib/init.ae",
139 -+ "/usr/share/aee/init.ae",
140 - NULL,
141 - ".init.ae"
142 - };
143 ---- a/aee.msg
144 -+++ b/aee.msg
145 -@@ -2,7 +2,7 @@
146 - $
147 - $set 1
148 - $quote "
149 --1 "/usr/local/lib/help.ae"
150 -+1 "/usr/share/aee/help.ae"
151 - 2 "main"
152 - 3 "modes menu"
153 - 4 "tabs to spaces "
154 ---- a/help.ae
155 -+++ b/help.ae
156 -@@ -1058,11 +1058,11 @@
157 -
158 - The file 'init.ae' may be used to set parameters and define keys to
159 - perform certain functions within ae. This file may reside in three
160 --locations: /usr/local/lib/init.ae, .init.ae in your home directory, and
161 -+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and
162 - .init.ae in the current working directory.
163 -
164 - First, aee checks for a system level initialization file, located in
165 --/usr/local/lib. Next the user's home directory is checked for a file named
166 -+/usr/share/aee. Next the user's home directory is checked for a file named
167 - .init.ae, then the current directory. The settings from each file are read,
168 - so that the directives from the most recently read file will take precedence
169 - over previously read files. This allows, for example, the .init.ae file in
170 ---- a/help.c
171 -+++ b/help.c
172 -@@ -12,7 +12,7 @@
173 -
174 - char *help_file_list[4] = {
175 - "/usr/local/aee/help.ae",
176 -- "/usr/local/lib/help.ae",
177 -+ "/usr/share/aee/help.ae",
178 - "~/.help.ae",
179 - "help.ae"
180 - };
181 ---- a/localize.c
182 -+++ b/localize.c
183 -@@ -64,7 +64,7 @@
184 - catalog = catopen("aee", 0);
185 - #endif /* NO_CATGETS */
186 -
187 -- ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae");
188 -+ ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae");
189 - main_buffer_name = catgetlocal( 2, "main");
190 -
191 -