1 |
commit: 863aea8ddc6cf3904f39f5014e323a46e8467bf6 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 18 00:17:53 2022 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 18 00:17:53 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=863aea8d |
7 |
|
8 |
sys-libs/slang: remove eapi5 ebuild |
9 |
|
10 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
11 |
|
12 |
sys-libs/slang/Manifest | 1 - |
13 |
sys-libs/slang/files/slang-2.2.3-slsh-libs.patch | 11 ---- |
14 |
sys-libs/slang/files/slang-2.2.4-memset.patch | 32 ---------- |
15 |
.../files/slang-2.2.4-rename-posix_close.patch | 21 ------- |
16 |
sys-libs/slang/metadata.xml | 8 --- |
17 |
sys-libs/slang/slang-2.3.0.ebuild | 71 ---------------------- |
18 |
6 files changed, 144 deletions(-) |
19 |
|
20 |
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest |
21 |
deleted file mode 100644 |
22 |
index 1b79ed64..00000000 |
23 |
--- a/sys-libs/slang/Manifest |
24 |
+++ /dev/null |
25 |
@@ -1 +0,0 @@ |
26 |
-DIST slang-2.3.0.tar.bz2 1532986 SHA256 f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050 WHIRLPOOL 395dc36d2f571ed19d88ee1f1c3594ab50d3a955949724d46582191430aa0c23cf3f78f966b184f3220ab86f2939e4601821160455159783793df30597c53257 |
27 |
|
28 |
diff --git a/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch |
29 |
deleted file mode 100644 |
30 |
index 2c999fb1..00000000 |
31 |
--- a/sys-libs/slang/files/slang-2.2.3-slsh-libs.patch |
32 |
+++ /dev/null |
33 |
@@ -1,11 +0,0 @@ |
34 |
---- slsh/Makefile.in |
35 |
-+++ slsh/Makefile.in |
36 |
-@@ -80,7 +80,7 @@ |
37 |
- $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o |
38 |
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS) |
39 |
- $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o |
40 |
-- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS) |
41 |
-+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS) |
42 |
- $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile |
43 |
- cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c |
44 |
- $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile |
45 |
|
46 |
diff --git a/sys-libs/slang/files/slang-2.2.4-memset.patch b/sys-libs/slang/files/slang-2.2.4-memset.patch |
47 |
deleted file mode 100644 |
48 |
index 0be90fdc..00000000 |
49 |
--- a/sys-libs/slang/files/slang-2.2.4-memset.patch |
50 |
+++ /dev/null |
51 |
@@ -1,32 +0,0 @@ |
52 |
-From e06be392e42c23dd9bd7205445f3c5232ddb9ed7 Mon Sep 17 00:00:00 2001 |
53 |
-From: Sergei Trofimovich <slyfox@g.o> |
54 |
-Date: Tue, 19 Nov 2013 15:17:52 +0300 |
55 |
-Subject: [PATCH] modules/png-module.c: add declaration of 'memset' |
56 |
-MIME-Version: 1.0 |
57 |
-Content-Type: text/plain; charset=UTF-8 |
58 |
-Content-Transfer-Encoding: 8bit |
59 |
- |
60 |
- * QA Notice: Package triggers severe warnings which indicate that it |
61 |
- * may exhibit random runtime failures. |
62 |
- * /tmp/portage/sys-libs/slang-2.2.4/work/slang-2.2.4/modules/png-module.c:122:2: warning: incompatible implicit declaration of built-in function ‘memset’ [enabled by default] |
63 |
- |
64 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
65 |
---- |
66 |
- modules/png-module.c | 1 + |
67 |
- 3 files changed, 403 insertions(+), 259 deletions(-) |
68 |
- |
69 |
-diff --git a/modules/png-module.c b/modules/png-module.c |
70 |
-index 92ede3d..fed9392 100644 |
71 |
---- a/modules/png-module.c |
72 |
-+++ b/modules/png-module.c |
73 |
-@@ -23,6 +23,7 @@ USA. |
74 |
- #include "config.h" |
75 |
- |
76 |
- #include <stdio.h> |
77 |
-+#include <string.h> /* memset() */ |
78 |
- #include <errno.h> |
79 |
- #include <slang.h> |
80 |
- |
81 |
--- |
82 |
-1.8.4 |
83 |
- |
84 |
|
85 |
diff --git a/sys-libs/slang/files/slang-2.2.4-rename-posix_close.patch b/sys-libs/slang/files/slang-2.2.4-rename-posix_close.patch |
86 |
deleted file mode 100644 |
87 |
index 35235edf..00000000 |
88 |
--- a/sys-libs/slang/files/slang-2.2.4-rename-posix_close.patch |
89 |
+++ /dev/null |
90 |
@@ -1,21 +0,0 @@ |
91 |
-diff -Naur slang-2.2.4.orig/src/slposio.c slang-2.2.4/src/slposio.c |
92 |
---- slang-2.2.4.orig/src/slposio.c 2011-04-10 22:37:07.000000000 -0400 |
93 |
-+++ slang-2.2.4/src/slposio.c 2015-07-16 13:02:06.594941984 -0400 |
94 |
-@@ -363,7 +363,7 @@ |
95 |
- return 0; |
96 |
- } |
97 |
- |
98 |
--static int posix_close (SLFile_FD_Type *f) |
99 |
-+static int posix_close_1 (SLFile_FD_Type *f) |
100 |
- { |
101 |
- int status = do_close (f); |
102 |
- |
103 |
-@@ -1001,7 +1001,7 @@ |
104 |
- MAKE_INTRINSIC_2("write", posix_write, V, F, B), |
105 |
- MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F), |
106 |
- MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I), |
107 |
-- MAKE_INTRINSIC_1("close", posix_close, I, F), |
108 |
-+ MAKE_INTRINSIC_1("close", posix_close_1, I, F), |
109 |
- MAKE_INTRINSIC_1("_close", posix_close_fd, I, I), |
110 |
- #if defined(TTYNAME_R) |
111 |
- MAKE_INTRINSIC_0("ttyname", posix_ttyname, V), |
112 |
|
113 |
diff --git a/sys-libs/slang/metadata.xml b/sys-libs/slang/metadata.xml |
114 |
deleted file mode 100644 |
115 |
index 6f2ca22d..00000000 |
116 |
--- a/sys-libs/slang/metadata.xml |
117 |
+++ /dev/null |
118 |
@@ -1,8 +0,0 @@ |
119 |
-<?xml version="1.0" encoding="UTF-8"?> |
120 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
121 |
-<pkgmetadata> |
122 |
- <maintainer type="project"> |
123 |
- <email>cjk@g.o</email> |
124 |
- <name>Cjk</name> |
125 |
- </maintainer> |
126 |
-</pkgmetadata> |
127 |
|
128 |
diff --git a/sys-libs/slang/slang-2.3.0.ebuild b/sys-libs/slang/slang-2.3.0.ebuild |
129 |
deleted file mode 100644 |
130 |
index a788edd0..00000000 |
131 |
--- a/sys-libs/slang/slang-2.3.0.ebuild |
132 |
+++ /dev/null |
133 |
@@ -1,71 +0,0 @@ |
134 |
-# Copyright 1999-2017 Gentoo Foundation |
135 |
-# Distributed under the terms of the GNU General Public License v2 |
136 |
- |
137 |
-EAPI=5 |
138 |
-inherit eutils multilib-minimal |
139 |
- |
140 |
-DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software" |
141 |
-HOMEPAGE="http://www.jedsoft.org/slang/" |
142 |
-SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2 |
143 |
- http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2" |
144 |
- |
145 |
-LICENSE="GPL-2" |
146 |
-SLOT="0" |
147 |
-KEYWORDS="amd64 arm arm64 ~mips ppc x86" |
148 |
-IUSE="cjk pcre png readline static-libs zlib" |
149 |
- |
150 |
-# ncurses for ncurses5-config to get terminfo directory |
151 |
-RDEPEND="sys-libs/ncurses:0= |
152 |
- pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] ) |
153 |
- png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] ) |
154 |
- cjk? ( >=dev-libs/oniguruma-5.9.5[${MULTILIB_USEDEP}] ) |
155 |
- readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] ) |
156 |
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" |
157 |
-DEPEND="${RDEPEND}" |
158 |
- |
159 |
-MAKEOPTS="${MAKEOPTS} -j1" |
160 |
- |
161 |
-src_prepare() { |
162 |
- epatch "${FILESDIR}"/${PN}-2.2.3-slsh-libs.patch |
163 |
- epatch "${FILESDIR}"/${PN}-2.2.4-memset.patch |
164 |
- epatch "${FILESDIR}"/${PN}-2.2.4-rename-posix_close.patch |
165 |
- |
166 |
- # avoid linking to -ltermcap race with some systems |
167 |
- sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die |
168 |
- # we use the GNU linker also on Solaris |
169 |
- sed -i -e 's/-G -fPIC/-shared -fPIC/g' \ |
170 |
- -e 's/-Wl,-h,/-Wl,-soname,/g' configure || die |
171 |
- |
172 |
- # slang does not support configuration from another dir |
173 |
- multilib_copy_sources |
174 |
-} |
175 |
- |
176 |
-multilib_src_configure() { |
177 |
- local myconf=slang |
178 |
- use readline && myconf=gnu |
179 |
- |
180 |
- econf \ |
181 |
- --with-readline=${myconf} \ |
182 |
- $(use_with pcre) \ |
183 |
- $(use_with cjk onig) \ |
184 |
- $(use_with png) \ |
185 |
- $(use_with zlib z) |
186 |
-} |
187 |
- |
188 |
-multilib_src_compile() { |
189 |
- emake elf $(use static-libs && echo static) |
190 |
- |
191 |
- pushd slsh >/dev/null |
192 |
- emake slsh |
193 |
- popd |
194 |
-} |
195 |
- |
196 |
-multilib_src_install() { |
197 |
- emake DESTDIR="${D}" install $(use static-libs && echo install-static) |
198 |
-} |
199 |
- |
200 |
-multilib_src_install_all() { |
201 |
- rm -rf "${ED}"/usr/share/doc/{slang,slsh} |
202 |
- dodoc NEWS README *.txt doc/{,internal,text}/*.txt |
203 |
- dohtml doc/slangdoc.html slsh/doc/html/*.html |
204 |
-} |