reinit the tree, so we can have metadata

5 files changed, 316 insertions, 0 deletions

diff --git a/sys-fs/e2tools/Manifest b/sys-fs/e2tools/Manifest
new file mode 100644
index 000000000000..4531dfd73505
--- /dev/null
+++ b/sys-fs/e2tools/Manifest
@@ -0,0 +1,7 @@
+AUX e2tools-0.0.16-prototypes.patch 5088 SHA256 06f0a1351509cb96970e43f96e955c4243185972a85ed3310905514ac7a43846 SHA512 88deb44d0534901c5238281459a06c4d15022bccf363ec27d62faa56d1a78ea90a77a5a46d0b6752067ff83ddf53791398e64f518fd9c59dba1203dd651796fa WHIRLPOOL 0f87e6ed8deeb0d94faa8c6419fdb6a4e11b388712a95dc9e2ed1a653be17bad973843f40f311d03d307c24e68b9acfac1a3cc86cc5723280388727245e4f393
+AUX e2tools-0.0.16-qsort-const.patch 3298 SHA256 bca128e1f85f13f07a847b8064ea30d4b298b1ef0119ccc6d2ce218215ef2c1d SHA512 a063eceb7ccfbc5a2289d877ad3b5f025d7f3b40a445a40804743858d29822fdaae304b0718d71fbdd0d77f477e91caa23bc43914a1b11d7241b109a946208ea WHIRLPOOL 0c8c094682a00bf92ee9a24f958e87084098682ceedafd9c616a8b06a7a72fad14c4b6225e82fadc314ff2727992a96c233881c05f0925d3720b53323274418c
+DIST e2tools-0.0.16.tar.gz 72333 SHA256 4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b SHA512 8be79385c07027286951755a7ca0407215b517d4abba5546a0958fcb5e8feaffc993d35dd56bde39e14d397875941fc812c713db3d27247cd8e9ee7ed6a153b4 WHIRLPOOL 0131317a6e46fe9c55eb4a0e3da1bcf4480ebfc94e3b3b6f78b82bbac9d819017378ecabd54b57f6d7a31830bb5d260f5013be242840857d3a7ce1ade8b0843e
+EBUILD e2tools-0.0.16.ebuild 767 SHA256 5b52fa14ce024a9604b3ff8e7e8976064de064fe68113ca81b7330c210e370ee SHA512 274dd304d3452efb511e8f721724487beebcda085e894b2db078c41a843885d6b7f3de0eec3ce982f5e34fe19ee610e1b0f14dba2f16acb9766407c2c0b3633c WHIRLPOOL 09225a8a4e8532064e2153f3ee4d2169c0fc220c5d1a61922a8fdb4eb0dbedfc3162c049c1c6959562756ac5b1c203d4a180a9ebfa181d9f42c20d7176fd8fcb
+MISC ChangeLog 3480 SHA256 1083aa43fd71a5221e36cff069cce80cd36a615b3cd3dfa48208073f17c500e7 SHA512 14157eefc1f7f452c0dd566065952820ddc50bafe3bf1de8dfdfd9953adb0b32f5b5f22c3652491a7781f172963774a16a7d7a4d941c318814d33777cf1717bb WHIRLPOOL 7d5eb1be52950132660d756bcea3c9720cae1e1c943dfa1c1089efd491e661d42805153c955d6eb25f35534d3a582a417c70fbad20a33d53ed0a0cb81c42c1f3
+MISC ChangeLog-2015 348 SHA256 fc344ed0cb5d3634e908e9ae2960cc1c0dd26da2a219a1fd84dd70ae52dcdc8a SHA512 aa88b14689fabd11e2a4a61803900f5318e5062a68d5b94ff03a87932504fc541f52cb5ac84543089f5624c77ae58ee7ed60b04478eb05c871b126748c0cbd18 WHIRLPOOL 23abc7c6e5f4290ace14bdfcbc138a2d3648acbbdd87020adb65293b03f32b084990bbb7085475b0c2af54aefa7c16c4a4bc95f1472c007d635eb36c6829d4bc
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-fs/e2tools/e2tools-0.0.16.ebuild b/sys-fs/e2tools/e2tools-0.0.16.ebuild
new file mode 100644
index 000000000000..2471b9e8b1b6
--- /dev/null
+++ b/sys-fs/e2tools/e2tools-0.0.16.ebuild
@@ -0,0 +1,32 @@
+# 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
new file mode 100644
index 000000000000..39a9ddb7daad
--- /dev/null
+++ b/sys-fs/e2tools/files/e2tools-0.0.16-prototypes.patch
@@ -0,0 +1,167 @@
+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
new file mode 100644
index 000000000000..532b8fb45630
--- /dev/null
+++ b/sys-fs/e2tools/files/e2tools-0.0.16-qsort-const.patch
@@ -0,0 +1,102 @@
+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);
diff --git a/sys-fs/e2tools/metadata.xml b/sys-fs/e2tools/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/sys-fs/e2tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>