Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2tools/, sys-fs/e2tools/files/
Date: Wed, 31 Jul 2019 22:09:04
Message-Id: 1564610824.479b7ad33cb036999472364d18e391b9a125bc32.polynomial-c@gentoo
1 commit: 479b7ad33cb036999472364d18e391b9a125bc32
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 31 22:07:04 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 31 22:07:04 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479b7ad3
7
8 sys-fs/e2tools: Removed old
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/e2tools/Manifest | 1 -
14 sys-fs/e2tools/e2tools-0.0.16.ebuild | 32 ----
15 .../e2tools/files/e2tools-0.0.16-prototypes.patch | 167 ---------------------
16 .../e2tools/files/e2tools-0.0.16-qsort-const.patch | 102 -------------
17 4 files changed, 302 deletions(-)
18
19 diff --git a/sys-fs/e2tools/Manifest b/sys-fs/e2tools/Manifest
20 index 5795bfbcb4d..7dc2be92e9f 100644
21 --- a/sys-fs/e2tools/Manifest
22 +++ b/sys-fs/e2tools/Manifest
23 @@ -1,2 +1 @@
24 DIST e2tools-0.0.16.4.tar.gz 70444 BLAKE2B 3db75ca2ecca27bfbd65890f595c9523f373555e771f21113ca1c3bd1f08d74f5e1d70db39bbe0ac215a1766e702a37c2c2752f671320d45f3bfa56b39fd8296 SHA512 35bda0005d0ba4d9541eabf45bd9bed0e7e85144dce88c3bd8afd8eb5ed5db610bc5654aee82978b2a4955d363fd5af4ff40667fa8001955267c96cb84e6792b
25 -DIST e2tools-0.0.16.tar.gz 72333 BLAKE2B c843938b2217bfe1e36fcb1197b3a0d27d6fb5867c99d89b5e2af2eebe807aa6cf264b8fb0ea5573f22507f19e676eb124ef694866b8f76bf815880ce2a0f876 SHA512 8be79385c07027286951755a7ca0407215b517d4abba5546a0958fcb5e8feaffc993d35dd56bde39e14d397875941fc812c713db3d27247cd8e9ee7ed6a153b4
26
27 diff --git a/sys-fs/e2tools/e2tools-0.0.16.ebuild b/sys-fs/e2tools/e2tools-0.0.16.ebuild
28 deleted file mode 100644
29 index 2471b9e8b1b..00000000000
30 --- a/sys-fs/e2tools/e2tools-0.0.16.ebuild
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="5"
37 -
38 -inherit toolchain-funcs eutils
39 -
40 -DESCRIPTION="utilities to read, write, and manipulate files in an ext2/ext3 filesystem"
41 -HOMEPAGE="http://home.earthlink.net/~k_sheff/sw/e2tools/"
42 -SRC_URI="http://home.earthlink.net/~k_sheff/sw/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="~amd64 ~x86"
47 -IUSE=""
48 -
49 -DEPEND="sys-fs/e2fsprogs
50 - sys-libs/e2fsprogs-libs"
51 -RDEPEND="${DEPEND}"
52 -
53 -src_prepare() {
54 - epatch "${FILESDIR}"/${P}-prototypes.patch
55 - epatch "${FILESDIR}"/${P}-qsort-const.patch
56 - sed -i '/e2cp_LDADD/s:-L@[^@]*@::' Makefile.in || die
57 -}
58 -
59 -src_configure() {
60 - # The configure script is ancient.
61 - export CONFIG_SHELL="/bin/bash"
62 - tc-export CC
63 - default
64 -}
65
66 diff --git a/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch b/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch
67 deleted file mode 100644
68 index 39a9ddb7daa..00000000000
69 --- a/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch
70 +++ /dev/null
71 @@ -1,167 +0,0 @@
72 -fix various missing prototype warnings
73 -
74 ---- a/e2tools.h
75 -+++ b/e2tools.h
76 -@@ -63,38 +63,33 @@
77 - #define E2T_FORCE 1
78 - #define E2T_DO_MV 2
79 -
80 --#ifndef COPY_C
81 -+/* copy.c */
82 - extern long copy(int argc, char *argv[]);
83 - extern int my_strcmp(const void *n1, const void *n2);
84 --#endif
85 -
86 --#ifdef LN_C
87 -+/* ln.c */
88 - extern long do_ln(int argc, char *argv[]);
89 -
90 - extern long create_hard_link(ext2_filsys fs, ext2_ino_t cwd, ext2_ino_t
91 - new_file_ino, char *newfile, int ln_flags);
92 --#endif
93 -
94 --#ifndef LS_C
95 -+/* ls.c */
96 - extern long do_list_dir(int argc, char *argv[]);
97 --#endif
98 -
99 --#ifndef MKDIR_C
100 -+/* mkdir.c */
101 - extern long e2mkdir(int argc, char *argv[]);
102 - extern long create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
103 - char *dirname, struct stat *def_stat);
104 --#endif
105 -+extern long change_cwd(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
106 -+ char *dirname);
107 -
108 --#ifdef MV_C
109 -+/* mv.c */
110 - extern long do_mv(int argc, char *argv[]);
111 - extern long get_file_parts(ext2_filsys fs, ext2_ino_t root, char *pathname,
112 - ext2_ino_t *dir_ino, char **dir_name,
113 - char **base_name);
114 -
115 --#endif
116 --
117 --
118 --#ifndef READ_C
119 -+/* read.c */
120 - extern long get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
121 - char *infile, char *outfile, int keep);
122 - extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd,
123 -@@ -102,17 +97,14 @@ extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd,
124 - ext2_off_t *ret_pos);
125 - extern long read_to_eof(ext2_file_t infile, int dest_fd, ext2_off_t offset,
126 - ext2_off_t *ret_pos);
127 --#endif
128 -
129 --#ifndef RM_C
130 -+/* rm.c */
131 - extern long e2rm(int argc, char *argv[]);
132 --#endif
133 -
134 --#ifndef TAIL_C
135 -+/* tail.c */
136 - extern long do_tail(int argc, char *argv[]);
137 --#endif
138 -
139 --#ifndef UTIL_C
140 -+/* util.c */
141 - extern mode_t ext2_mode_xlate(__u16 lmode);
142 - extern __u16 host_mode_xlate(mode_t hmode);
143 - extern long open_filesystem(char *name, ext2_filsys *fs, ext2_ino_t *root, int
144 -@@ -125,13 +117,14 @@ extern long rm_file(ext2_filsys fs, ext2_ino_t cwd, char *outfile, ext2_ino_t
145 - delfile);
146 - extern long delete_file(ext2_filsys fs, ext2_ino_t inode);
147 - extern void init_stat_buf(struct stat *buf);
148 --#endif
149 -+#include <regex.h>
150 -+extern regex_t *make_regexp(char *shell);
151 -+extern int is_file_regexp(char *ptr);
152 -
153 --#ifndef WRITE_C
154 -+/* write.c */
155 - extern long
156 - put_file(ext2_filsys fs, ext2_ino_t cwd, char *infile, char *outfile,
157 - ext2_ino_t *outfile_ino, int keep, struct stat *def_stat);
158 --#endif
159 -
160 - #endif
161 -
162 ---- a/elist.c
163 -+++ b/elist.c
164 -@@ -41,12 +41,9 @@
165 - /* Feature Test Switches */
166 - /* Headers */
167 - #include <memory.h>
168 -+#include <stdlib.h>
169 - #include "elist.h"
170 -
171 --#ifndef NULL
172 --#define NULL ((void *)0)
173 --#endif
174 --
175 - elist_t *
176 - elist_new()
177 - {
178 ---- a/ls.c
179 -+++ b/ls.c
180 -@@ -703,7 +703,7 @@ void short_disp(ls_file_t *info, int *col, int options)
181 - char lbr, rbr;
182 - char tmp[300];
183 - int thislen;
184 -- static max_col_size = 0;
185 -+ static int max_col_size = 0;
186 -
187 - if (max_col_size == 0)
188 - {
189 ---- a/mkdir.c
190 -+++ b/mkdir.c
191 -@@ -357,7 +357,7 @@ create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
192 - def_stat)))
193 - {
194 - fprintf(stderr,
195 -- "create_dir: error creating directory %s/%s:%d\n",
196 -+ "create_dir: error creating directory %s/%s:%ld\n",
197 - dirname, dname, retval);
198 - ext2fs_free_mem((void **) &buf);
199 - return(retval);
200 -@@ -415,7 +415,7 @@ create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
201 - if ((retval = create_subdir(fs, root, cwd, dirname, def_stat)))
202 - {
203 - fprintf(stderr,
204 -- "create_dir: error creating directory %s:%d\n",
205 -+ "create_dir: error creating directory %s:%ld\n",
206 - dirname, retval);
207 - return(retval);
208 - }
209 ---- a/progress.c
210 -+++ b/progress.c
211 -@@ -26,6 +26,8 @@
212 - /* Feature Test Switches */
213 - /* System Headers */
214 - #include <stdio.h>
215 -+#include <stdlib.h>
216 -+#include <string.h>
217 - #include <unistd.h>
218 - #include <sys/stat.h>
219 - #include <sys/time.h>
220 -@@ -154,7 +156,7 @@ void update_progress(unsigned long num_bytes)
221 - if (prog_sbuf != NULL && prog_time != tv.tv_sec)
222 - {
223 - prog_time = tv.tv_sec;
224 -- fprintf(stderr, "%s %10d / %10d\r", prog_file, num_bytes,
225 -+ fprintf(stderr, "%s %10lu / %10jd\r", prog_file, num_bytes,
226 - prog_sbuf->st_size);
227 - fflush(stderr);
228 - }
229 ---- a/rm.c
230 -+++ b/rm.c
231 -@@ -244,7 +244,6 @@ e2rm(int argc, char *argv[])
232 - retval = ext2fs_dir_iterate2(gbl_fs, curr_ino,
233 - DIRENT_FLAG_INCLUDE_EMPTY, 0,
234 - rm_dir_proc,
235 -- (void *)
236 - (verbose) ? &verbose : NULL);
237 - }
238 - else
239
240 diff --git a/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch b/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch
241 deleted file mode 100644
242 index 532b8fb4563..00000000000
243 --- a/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch
244 +++ /dev/null
245 @@ -1,102 +0,0 @@
246 -the qsort func expects a callback with const pointers, so update all the
247 -prototypes to match
248 -
249 ---- a/elist.c
250 -+++ b/elist.c
251 -@@ -136,7 +133,7 @@ elist_insert(elist_t *l, void *data)
252 - return(l);
253 - }
254 -
255 --void elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse)
256 -+void elist_sort(elist_t *l, int (sort_func)(const void *, const void *), int reverse)
257 - {
258 - int c=0;
259 - elist_t *tl;
260 ---- a/elist.h
261 -+++ b/elist.h
262 -@@ -33,7 +33,7 @@ extern void elist_free(elist_t *l, void (*data_free)(void *));
263 - extern elist_t * elist_append(elist_t *l, void *data);
264 - extern elist_t * elist_insert(elist_t *l, void *data);
265 - extern void
266 --elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse);
267 -+elist_sort(elist_t *l, int (sort_func)(const void *, const void *), int reverse);
268 - #endif
269 -
270 - #endif
271 ---- a/ls.c
272 -+++ b/ls.c
273 -@@ -98,15 +98,15 @@ long_disp(ls_file_t *info, int *col, int options);
274 - void
275 - short_disp(ls_file_t *info, int *col, int options);
276 - int
277 --no_sort(void *n1, void *n2);
278 -+no_sort(const void *n1, const void *n2);
279 - int
280 --name_sort(void *n1, void *n2);
281 -+name_sort(const void *n1, const void *n2);
282 - int
283 --inode_sort(void *n1, void *n2);
284 -+inode_sort(const void *n1, const void *n2);
285 - int
286 --mod_time_sort(void *n1, void *n2);
287 -+mod_time_sort(const void *n1, const void *n2);
288 - int
289 --creat_time_sort(void *n1, void *n2);
290 -+creat_time_sort(const void *n1, const void *n2);
291 - long
292 - add_ls_file(char *name, int namelen, ext2_ino_t dir, ext2_ino_t ino,
293 - int entry, int type, struct list_dir_struct *ls);
294 -@@ -331,7 +331,7 @@ do_list_dir(int argc, char *argv[])
295 - char *dup_path = NULL;
296 - char *dir_name;
297 - char *base_name;
298 -- int (*file_sort)(void *n1, void *n2) = name_sort;
299 -+ int (*file_sort)(const void *n1, const void *n2) = name_sort;
300 - void (*file_disp)(ls_file_t *n, int *col, int options) = short_disp;
301 - elist_t *files=NULL;
302 - int col=0;
303 -@@ -791,7 +791,7 @@ void short_disp(ls_file_t *info, int *col, int options)
304 - * MM/DD/YY Name Description
305 - *
306 - */
307 --int no_sort(void *n1, void *n2)
308 -+int no_sort(const void *n1, const void *n2)
309 - {
310 - ls_file_t *f1 = *((ls_file_t **) n1);
311 - ls_file_t *f2 = *((ls_file_t **) n2);
312 -@@ -835,7 +835,7 @@ int no_sort(void *n1, void *n2)
313 - * MM/DD/YY Name Description
314 - *
315 - */
316 --int name_sort(void *n1, void *n2)
317 -+int name_sort(const void *n1, const void *n2)
318 - {
319 - ls_file_t *f1 = *((ls_file_t **) n1);
320 - ls_file_t *f2 = *((ls_file_t **) n2);
321 -@@ -880,7 +880,7 @@ int name_sort(void *n1, void *n2)
322 - * MM/DD/YY Name Description
323 - *
324 - */
325 --int inode_sort(void *n1, void *n2)
326 -+int inode_sort(const void *n1, const void *n2)
327 - {
328 - ls_file_t *f1 = *((ls_file_t **) n1);
329 - ls_file_t *f2 = *((ls_file_t **) n2);
330 -@@ -925,7 +925,7 @@ int inode_sort(void *n1, void *n2)
331 - * MM/DD/YY Name Description
332 - *
333 - */
334 --int mod_time_sort(void *n1, void *n2)
335 -+int mod_time_sort(const void *n1, const void *n2)
336 - {
337 - ls_file_t *f1 = *((ls_file_t **) n1);
338 - ls_file_t *f2 = *((ls_file_t **) n2);
339 -@@ -971,7 +971,7 @@ int mod_time_sort(void *n1, void *n2)
340 - * MM/DD/YY Name Description
341 - *
342 - */
343 --int creat_time_sort(void *n1, void *n2)
344 -+int creat_time_sort(const void *n1, const void *n2)
345 - {
346 - ls_file_t *f1 = *((ls_file_t **) n1);
347 - ls_file_t *f2 = *((ls_file_t **) n2);