gentoo resync : 02.08.2019

5 files changed, 2 insertions, 307 deletions

diff --git a/sys-fs/e2tools/Manifest b/sys-fs/e2tools/Manifest
index 89cccfece57e..e539fd37a7cc 100644
--- a/sys-fs/e2tools/Manifest
+++ b/sys-fs/e2tools/Manifest
@@ -1,7 +1,3 @@
-AUX e2tools-0.0.16-prototypes.patch 5088 BLAKE2B cbf4fce72342d0e76b0ded01bdf332d129fae59a67dc4207eaefc1937abcd50aea13c93c41c38f3eab1557381c9314cbd86cb2be08965186cad63b8fdca50e7a SHA512 88deb44d0534901c5238281459a06c4d15022bccf363ec27d62faa56d1a78ea90a77a5a46d0b6752067ff83ddf53791398e64f518fd9c59dba1203dd651796fa
-AUX e2tools-0.0.16-qsort-const.patch 3298 BLAKE2B 18bf14782936dc40b59a9daa1343a1f493c11bd7635853e9c9862b39166148040e2a174390b3dacfa90e8bafb3c409a25f1bdd38a5d1374fb655efb188760b8d SHA512 a063eceb7ccfbc5a2289d877ad3b5f025d7f3b40a445a40804743858d29822fdaae304b0718d71fbdd0d77f477e91caa23bc43914a1b11d7241b109a946208ea
 DIST e2tools-0.0.16.4.tar.gz 70444 BLAKE2B 3db75ca2ecca27bfbd65890f595c9523f373555e771f21113ca1c3bd1f08d74f5e1d70db39bbe0ac215a1766e702a37c2c2752f671320d45f3bfa56b39fd8296 SHA512 35bda0005d0ba4d9541eabf45bd9bed0e7e85144dce88c3bd8afd8eb5ed5db610bc5654aee82978b2a4955d363fd5af4ff40667fa8001955267c96cb84e6792b
-DIST e2tools-0.0.16.tar.gz 72333 BLAKE2B c843938b2217bfe1e36fcb1197b3a0d27d6fb5867c99d89b5e2af2eebe807aa6cf264b8fb0ea5573f22507f19e676eb124ef694866b8f76bf815880ce2a0f876 SHA512 8be79385c07027286951755a7ca0407215b517d4abba5546a0958fcb5e8feaffc993d35dd56bde39e14d397875941fc812c713db3d27247cd8e9ee7ed6a153b4
-EBUILD e2tools-0.0.16.4.ebuild 655 BLAKE2B 53b781a383efcc4446f3098be26580d89ec5b1160d8f97712a13418d2250e193d2fdbd531670758889c1801e7da140eeaa26d9ceea1c8da3044b113a84d3fbba SHA512 9a6be0396ac1291de7a836669869268aadc59f1d12172046545e8613dae63f3024d36d29a8addd09159c8be57ebbc17f014ff9a11fcf155c333d0ae811601d79
-EBUILD e2tools-0.0.16.ebuild 767 BLAKE2B d336901a4c02280e743dc95dd96890706cbec3a99e75e8b7a12d6ac89c9255531c4d7c7ffadf1b42066f17f56265ff87783eef35d068fce191517e4687031c2a SHA512 274dd304d3452efb511e8f721724487beebcda085e894b2db078c41a843885d6b7f3de0eec3ce982f5e34fe19ee610e1b0f14dba2f16acb9766407c2c0b3633c
+EBUILD e2tools-0.0.16.4.ebuild 640 BLAKE2B 166fae0012433e143891089b28161581a526f95e4f53851261cdd3c4796d54e1e2482d1ad54145cbfa1ca86cc0678d9f89b7a9bd0db43e7c2dbeb85e05415d8d SHA512 859e8640438d0e28a7e89c9157a13cc00232d99479fcefebb2ce134ee93fb9708f1cd6c91a11cdb0eec999d2cd36983b18345bb8f7e5a96e4e5f24e332a9d49d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/e2tools/e2tools-0.0.16.4.ebuild b/sys-fs/e2tools/e2tools-0.0.16.4.ebuild
index e869d21197a5..538223db686f 100644
--- a/sys-fs/e2tools/e2tools-0.0.16.4.ebuild
+++ b/sys-fs/e2tools/e2tools-0.0.16.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools toolchain-funcs
 
 DESCRIPTION="utilities to read, write, and manipulate files in an ext2/ext3 filesystem"
-HOMEPAGE="http://home.earthlink.net/~k_sheff/sw/e2tools/"
+HOMEPAGE="https://github.com/ndim/e2tools"
 SRC_URI="https://github.com/ndim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-fs/e2tools/e2tools-0.0.16.ebuild b/sys-fs/e2tools/e2tools-0.0.16.ebuild
deleted file mode 100644
index 2471b9e8b1b6..000000000000
--- a/sys-fs/e2tools/e2tools-0.0.16.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="utilities to read, write, and manipulate files in an ext2/ext3 filesystem"
-HOMEPAGE="http://home.earthlink.net/~k_sheff/sw/e2tools/"
-SRC_URI="http://home.earthlink.net/~k_sheff/sw/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
-	sys-libs/e2fsprogs-libs"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-prototypes.patch
-	epatch "${FILESDIR}"/${P}-qsort-const.patch
-	sed -i '/e2cp_LDADD/s:-L@[^@]*@::' Makefile.in || die
-}
-
-src_configure() {
-	# The configure script is ancient.
-	export CONFIG_SHELL="/bin/bash"
-	tc-export CC
-	default
-}
diff --git a/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch b/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch
deleted file mode 100644
index 39a9ddb7daad..000000000000
--- a/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-fix various missing prototype warnings
-
---- a/e2tools.h
-+++ b/e2tools.h
-@@ -63,38 +63,33 @@
- #define E2T_FORCE 1
- #define E2T_DO_MV 2
- 
--#ifndef COPY_C
-+/* copy.c */
- extern long copy(int argc, char *argv[]);
- extern int my_strcmp(const void *n1, const void *n2);
--#endif
- 
--#ifdef LN_C
-+/* ln.c */
- extern long do_ln(int argc, char *argv[]);
- 
- extern long create_hard_link(ext2_filsys fs, ext2_ino_t cwd, ext2_ino_t
-                              new_file_ino, char *newfile, int ln_flags);
--#endif
- 
--#ifndef LS_C
-+/* ls.c */
- extern long do_list_dir(int argc, char *argv[]);
--#endif
- 
--#ifndef MKDIR_C
-+/* mkdir.c */
- extern long e2mkdir(int argc, char *argv[]);
- extern long create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
-                        char *dirname, struct stat *def_stat);
--#endif
-+extern long change_cwd(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
-+                       char *dirname);
- 
--#ifdef MV_C
-+/* mv.c */
- extern long do_mv(int argc, char *argv[]);
- extern long get_file_parts(ext2_filsys fs, ext2_ino_t root, char *pathname,
-                            ext2_ino_t *dir_ino, char **dir_name,
-                            char **base_name);
- 
--#endif
--
--
--#ifndef READ_C
-+/* read.c */
- extern long get_file(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-                      char *infile, char *outfile, int keep);
- extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd,
-@@ -102,17 +97,14 @@ extern long retrieve_data(ext2_filsys fs, ext2_ino_t src, int dest_fd,
-                           ext2_off_t *ret_pos);
- extern long read_to_eof(ext2_file_t infile, int dest_fd, ext2_off_t offset,
-                         ext2_off_t *ret_pos);
--#endif
- 
--#ifndef RM_C
-+/* rm.c */
- extern long e2rm(int argc, char *argv[]);
--#endif
- 
--#ifndef TAIL_C
-+/* tail.c */
- extern long do_tail(int argc, char *argv[]);
--#endif
- 
--#ifndef UTIL_C
-+/* util.c */
- extern mode_t ext2_mode_xlate(__u16 lmode);
- extern __u16 host_mode_xlate(mode_t hmode);
- extern long open_filesystem(char *name, ext2_filsys *fs, ext2_ino_t *root, int
-@@ -125,13 +117,14 @@ extern long rm_file(ext2_filsys fs, ext2_ino_t cwd, char *outfile, ext2_ino_t
-                     delfile); 
- extern long delete_file(ext2_filsys fs, ext2_ino_t inode);
- extern void init_stat_buf(struct stat *buf);
--#endif
-+#include <regex.h>
-+extern regex_t *make_regexp(char *shell);
-+extern int is_file_regexp(char *ptr);
- 
--#ifndef WRITE_C
-+/* write.c */
- extern long
- put_file(ext2_filsys fs, ext2_ino_t cwd, char *infile, char *outfile,
-          ext2_ino_t *outfile_ino, int keep, struct stat *def_stat);
--#endif
- 
- #endif
- 
---- a/elist.c
-+++ b/elist.c
-@@ -41,12 +41,9 @@
- /* Feature Test Switches */
- /* Headers */
- #include <memory.h>
-+#include <stdlib.h>
- #include "elist.h"
- 
--#ifndef NULL
--#define NULL ((void *)0)
--#endif
--
- elist_t *
- elist_new()
- {
---- a/ls.c
-+++ b/ls.c
-@@ -703,7 +703,7 @@ void short_disp(ls_file_t *info, int *col, int options)
-   char lbr, rbr;
-   char tmp[300];
-   int thislen;
--  static max_col_size = 0;
-+  static int max_col_size = 0;
- 
-   if (max_col_size == 0)
-     {
---- a/mkdir.c
-+++ b/mkdir.c
-@@ -357,7 +357,7 @@ create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
-                                               def_stat)))
-                     {
-                       fprintf(stderr,
--                              "create_dir: error creating directory %s/%s:%d\n",
-+                              "create_dir: error creating directory %s/%s:%ld\n",
-                               dirname, dname, retval);
-                       ext2fs_free_mem((void **) &buf);
-                       return(retval);
-@@ -415,7 +415,7 @@ create_dir(ext2_filsys fs, ext2_ino_t root, ext2_ino_t *cwd,
-       if ((retval = create_subdir(fs, root, cwd, dirname, def_stat)))
-         {
-           fprintf(stderr,
--                  "create_dir: error creating directory %s:%d\n",
-+                  "create_dir: error creating directory %s:%ld\n",
-                   dirname, retval);
-           return(retval);
-         }
---- a/progress.c
-+++ b/progress.c
-@@ -26,6 +26,8 @@
- /* Feature Test Switches */
- /* System Headers */
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-@@ -154,7 +156,7 @@ void update_progress(unsigned long num_bytes)
-   if (prog_sbuf != NULL && prog_time != tv.tv_sec)
-     {
-       prog_time = tv.tv_sec;
--      fprintf(stderr, "%s %10d / %10d\r", prog_file, num_bytes,
-+      fprintf(stderr, "%s %10lu / %10jd\r", prog_file, num_bytes,
-               prog_sbuf->st_size);
-       fflush(stderr);
-     }
---- a/rm.c
-+++ b/rm.c
-@@ -244,7 +244,6 @@ e2rm(int argc, char *argv[])
-                   retval = ext2fs_dir_iterate2(gbl_fs, curr_ino,
-                                                DIRENT_FLAG_INCLUDE_EMPTY, 0,
-                                                rm_dir_proc,
--                                               (void *)
-                                                (verbose) ? &verbose : NULL);
-                 }
-               else
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
deleted file mode 100644
index 532b8fb45630..000000000000
--- a/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-the qsort func expects a callback with const pointers, so update all the
-prototypes to match
-
---- a/elist.c
-+++ b/elist.c
-@@ -136,7 +133,7 @@ elist_insert(elist_t *l, void *data)
-   return(l);
- }
- 
--void elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse)
-+void elist_sort(elist_t *l, int (sort_func)(const void *, const void *), int reverse)
- {
-   int c=0;
-   elist_t *tl;
---- a/elist.h
-+++ b/elist.h
-@@ -33,7 +33,7 @@ extern void elist_free(elist_t *l, void (*data_free)(void *));
- extern elist_t * elist_append(elist_t *l, void *data);
- extern elist_t * elist_insert(elist_t *l, void *data);
- extern void
--elist_sort(elist_t *l, int (sort_func)(void *, void *), int reverse);
-+elist_sort(elist_t *l, int (sort_func)(const void *, const void *), int reverse);
- #endif
- 
- #endif
---- a/ls.c
-+++ b/ls.c
-@@ -98,15 +98,15 @@ long_disp(ls_file_t *info, int *col, int options);
- void
- short_disp(ls_file_t *info, int *col, int options);
- int
--no_sort(void *n1, void *n2);
-+no_sort(const void *n1, const void *n2);
- int
--name_sort(void *n1, void *n2);
-+name_sort(const void *n1, const void *n2);
- int
--inode_sort(void *n1, void *n2);
-+inode_sort(const void *n1, const void *n2);
- int
--mod_time_sort(void *n1, void *n2);
-+mod_time_sort(const void *n1, const void *n2);
- int
--creat_time_sort(void *n1, void *n2);
-+creat_time_sort(const void *n1, const void *n2);
- long
- add_ls_file(char *name, int namelen, ext2_ino_t dir, ext2_ino_t ino,
-             int entry, int type, struct list_dir_struct *ls);
-@@ -331,7 +331,7 @@ do_list_dir(int argc, char *argv[])
-   char *dup_path = NULL;
-   char *dir_name;
-   char *base_name;
--  int (*file_sort)(void *n1, void *n2) = name_sort;
-+  int (*file_sort)(const void *n1, const void *n2) = name_sort;
-   void (*file_disp)(ls_file_t *n, int *col, int options) = short_disp;
-   elist_t *files=NULL;
-   int col=0;
-@@ -791,7 +791,7 @@ void short_disp(ls_file_t *info, int *col, int options)
-  * MM/DD/YY      Name               Description
-  *
-  */
--int no_sort(void *n1, void *n2)
-+int no_sort(const void *n1, const void *n2)
- {
-   ls_file_t *f1 = *((ls_file_t **) n1);
-   ls_file_t *f2 = *((ls_file_t **) n2);
-@@ -835,7 +835,7 @@ int no_sort(void *n1, void *n2)
-  * MM/DD/YY      Name               Description
-  *
-  */
--int name_sort(void *n1, void *n2)
-+int name_sort(const void *n1, const void *n2)
- {
-   ls_file_t *f1 = *((ls_file_t **) n1);
-   ls_file_t *f2 = *((ls_file_t **) n2);
-@@ -880,7 +880,7 @@ int name_sort(void *n1, void *n2)
-  * MM/DD/YY      Name               Description
-  *
-  */
--int inode_sort(void *n1, void *n2)
-+int inode_sort(const void *n1, const void *n2)
- {
-   ls_file_t *f1 = *((ls_file_t **) n1);
-   ls_file_t *f2 = *((ls_file_t **) n2);
-@@ -925,7 +925,7 @@ int inode_sort(void *n1, void *n2)
-  * MM/DD/YY      Name               Description
-  *
-  */
--int mod_time_sort(void *n1, void *n2)
-+int mod_time_sort(const void *n1, const void *n2)
- {
-   ls_file_t *f1 = *((ls_file_t **) n1);
-   ls_file_t *f2 = *((ls_file_t **) n2);
-@@ -971,7 +971,7 @@ int mod_time_sort(void *n1, void *n2)
-  * MM/DD/YY      Name               Description
-  *
-  */
--int creat_time_sort(void *n1, void *n2)
-+int creat_time_sort(const void *n1, const void *n2)
- {
-   ls_file_t *f1 = *((ls_file_t **) n1);
-   ls_file_t *f2 = *((ls_file_t **) n2);