flx/flx: Remove old, move to EAPI 5, fix quotes

Package-Manager: portage-2.1.12.3

14 files changed, 24 insertions, 652 deletions

diff --git a/flx/flx/ChangeLog b/flx/flx/ChangeLog
index 2b66ac38..5412a7da 100644
--- a/flx/flx/ChangeLog
+++ b/flx/flx/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  -files/0.1.31-respect-CFLAGS-LDFLAGS.diff, -files/0.1.31-warning-cast.diff,
+  -files/0.1.31-warning-implicit-declaration.diff, -files/0.6.7-cast.diff,
+  -files/0.6.7-gcc-2.9-define.diff, -files/0.6.7-quoted-FLX_poptions.diff,
+  -files/0.6.7-respect-CFLAGS-LDFLAGS.diff, -files/0.6.7-warnings.diff,
+  -flx-0.1.31.ebuild, -flx-0.6.7.ebuild, flx-0.1.34.ebuild, flx-9999.ebuild:
+  flx/flx: Remove old, move to EAPI 5, fix quotes
+
   28 May 2013; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml:
   Add missing metadata.xml
 
@@ -24,4 +32,3 @@
   +files/9999-warning-implicit-declaration.diff, +flx-0.1.31.ebuild,
   +flx-0.1.34.ebuild, +flx-0.6.7.ebuild, +flx-9999.ebuild:
   Add formilux tools/init-scripts
-
diff --git a/flx/flx/Manifest b/flx/flx/Manifest
index 55fbde06..8cd44a56 100644
--- a/flx/flx/Manifest
+++ b/flx/flx/Manifest
@@ -1,19 +1,9 @@
-AUX 0.1.31-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55
-AUX 0.1.31-warning-cast.diff 9513 SHA256 4bb4801f530869cb5e1bfecfa5cb007b4b5e5b1de1e25404f1c107135025a165 WHIRLPOOL 1cb86d258df028e7c46f10d8a5866f32565e359f1cfc644cadd46478de140b3f3ebc1c42a764056ca301c27b519907290ca77e7a277f0064cffba9d391b5d3a1
-AUX 0.1.31-warning-implicit-declaration.diff 1147 SHA256 610c41f21175e369bfe1185b59b875744506b4d5ec2fcdd529f7d3beb8d64d29 WHIRLPOOL 98483417447ab1a1d61facc32f65af5bf4ec70a99983592d4088d18f62840a5e35b9d31b95451a3f835b2eb3d40b12928ec52205f25bf7ae830867ffa46fecc4
 AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55
 AUX 0.1.34-warning-cast.diff 9513 SHA256 4bb4801f530869cb5e1bfecfa5cb007b4b5e5b1de1e25404f1c107135025a165 WHIRLPOOL 1cb86d258df028e7c46f10d8a5866f32565e359f1cfc644cadd46478de140b3f3ebc1c42a764056ca301c27b519907290ca77e7a277f0064cffba9d391b5d3a1
 AUX 0.1.34-warning-implicit-declaration.diff 1147 SHA256 610c41f21175e369bfe1185b59b875744506b4d5ec2fcdd529f7d3beb8d64d29 WHIRLPOOL 98483417447ab1a1d61facc32f65af5bf4ec70a99983592d4088d18f62840a5e35b9d31b95451a3f835b2eb3d40b12928ec52205f25bf7ae830867ffa46fecc4
-AUX 0.6.7-cast.diff 3845 SHA256 3e0917453c6deed578bed03ae40de1096617cbbaf4fd20d20d128c06def4e850 WHIRLPOOL 731b50135e3b9374c981168df51f8764d3d94578c4b5f4a5c1caef854c468033c0b0ef8d964e83711b1ffd0ea9e2ef640a90f4a42c141b9338168388df320b29
-AUX 0.6.7-gcc-2.9-define.diff 1101 SHA256 b5ddc7098c4f4ef2860a3cfe7347c3775b753b7fca4aa527ac68a8d128e2fc58 WHIRLPOOL 8f7c82fdad2b7b5c99fccc3534531e42bd2870e1ec1d9b9b2de1a40e4407a9141a0612f197824641938917f506d0d8d87e627c118382c1378ec1c46ecdd49385
-AUX 0.6.7-quoted-FLX_poptions.diff 897 SHA256 6d6e71bf88cdb521e530ebda93c85994f8551be597b0d67fc24a585823263976 WHIRLPOOL 78c1e87059ed7f7f61cb145a2d24b6e845422efee90e218aef7c61b7f1894ba58b7a6fc1299d80e72b88ade9354d319e61161a0c6f59f042dca04c20e718860d
-AUX 0.6.7-respect-CFLAGS-LDFLAGS.diff 507 SHA256 1483dcff7234be64f581d4a4a645fc6b9e575993d76230a5493fa86aa9368365 WHIRLPOOL c6295065570c4ccc0e1d5ee1077d134162d6706daf378b6fca48eeb21d06b6a4c9007786837ccdac855f91bb16b8ce707b8de328553559fb45226f29224ebf17
-AUX 0.6.7-warnings.diff 1124 SHA256 e13b569a38125a6a8373b13278dd4df85b8459028815277cb7bf687798aa0856 WHIRLPOOL fd7a6101c461e51ba80404d8c071de4f3a36ab068cb43512b0fbf16257040c4384393ea75ec8c23aab64e783425bdd079f16f9f3351dfda5195983119aad62d5
 AUX 9999-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55
 AUX 9999-warning-implicit-declaration.diff 1443 SHA256 8cb585822838656c1cb6a7f4f5b37108839122c3abac1d654093be642d69ff76 WHIRLPOOL 79a0ffadfe979ba7c69f6efb7b770a0a4bc2f399b2a827e2bd30f985447765651124f7decf278fc31306f302fbcad31e98bdcde0065e3d90aff15a6966841e34
-EBUILD flx-0.1.31.ebuild 726 SHA256 f6d33e0e87eba3f97429e6e33c17b145d3318bafb6c32be4eb2cac7d4295ffe4 WHIRLPOOL 954208f900ef9b4c251a78c26b70f981cde5819de94cb41efe10e6e556c6d704f3266692cfcdb49c8ebf58cf07323e1e3fd31cf7adb95d4869b95a3d5b1ab671
-EBUILD flx-0.1.34.ebuild 726 SHA256 f6d33e0e87eba3f97429e6e33c17b145d3318bafb6c32be4eb2cac7d4295ffe4 WHIRLPOOL 954208f900ef9b4c251a78c26b70f981cde5819de94cb41efe10e6e556c6d704f3266692cfcdb49c8ebf58cf07323e1e3fd31cf7adb95d4869b95a3d5b1ab671
-EBUILD flx-0.6.7.ebuild 779 SHA256 0d24a08fa82c692207caa33058a7b8db56816590573e3232c0e78fbe23a45d56 WHIRLPOOL ffeab29692d595acdf41e0d6abe9a9f3331e7032eb1873aa39545eb3899e0c9c4a1ca921fcef5a46621245e42a0257521d8479f7bfeae837090d77b296c15049
-EBUILD flx-9999.ebuild 726 SHA256 1e4430f77f95010c7804827cd6ed4ba93f367a2f97be391de1a3ecf4a642eaed WHIRLPOOL 101f787b80b2a073dcd5650a6970c5ea61550d90ae5151498c4460bbfa1ad8d6bf4d97a1835c2394f3d1c651893c0420408d4cb183d80ede556598eac837e231
-MISC ChangeLog 1083 SHA256 407df28437cea03b6a7706f7e8113f61d44dea57aea0d6b31d3f7e6ad5340eb1 WHIRLPOOL 72da7282ff83ccdb5aa4dcf99e8d35258c38551a52a62834cbf26e6a4bf9f0ae8305990f6aa6ffa34f9bb0db1114d3e4b0207e3fb438b63bb2d3421645fbcf43
+EBUILD flx-0.1.34.ebuild 737 SHA256 be2ed0719393fa76bca77e96e5205fae8ec1ad96414917fe9dca7606952ddfd0 WHIRLPOOL ff08e77b16117465f033da6db833254203f1845135a52d29d4de802f2a0c96cb39add79de6a654e8d80bc084829e1b430bba4034f052616c45423e475ec2c7e1
+EBUILD flx-9999.ebuild 728 SHA256 bc11dbf1ade460a6ecf42c040e3d877208d9182afcd0ebc31f3dd538d4abd297 WHIRLPOOL 61ab790a09f9382d1f919fcbe721200cd8b544240ed5de3830d5b2fe1ae3817a7c83d5a6e8dedbcfdad444709752852455b697e264e17d78e465c71ec863fbc7
+MISC ChangeLog 1563 SHA256 0988329c04ae3a2bb9c16c2f8cfca2772edb135aa1bf0481d53b355c3950800c WHIRLPOOL bcea1b9b4eab468682cee7c9c346b8a6b1a11732f9ed10aa9071557574d8eff9ebad34affad553ba42c37bd6ae1349f5eaba4adaf9fd58b0c7db8c8e0b2daf5d
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/flx/flx/files/0.1.31-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/0.1.31-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index 54f85b98..00000000
--- a/flx/flx/files/0.1.31-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/flx/Makefile b/flx/Makefile
-index 6bee331..7cb9fd2 100644
---- a/flx/Makefile
-+++ b/flx/Makefile
-@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
-     output.c output_file.c
- OBJ=$(SRC:.c=.o)
- COPTS=-O2
--CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
--LDFLAGS=-L. -Wl,--gc-sections
-+CFLAGS	+= -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
-+LDFLAGS	+= -Wl,--gc-sections
- 
- all:	$(NAME)
- 
diff --git a/flx/flx/files/0.1.31-warning-cast.diff b/flx/flx/files/0.1.31-warning-cast.diff
deleted file mode 100644
index 9c45d9af..00000000
--- a/flx/flx/files/0.1.31-warning-cast.diff
+++ /dev/null
@@ -1,255 +0,0 @@
-diff --git a/flx/check.c b/flx/check.c
-index 9589c5e..3f3e26a 100644
---- a/flx/check.c
-+++ b/flx/check.c
-@@ -384,25 +384,25 @@ t_file_diff   *fct_free_diff_desc(void *data, t_file_diff *desc) {
- 
- char  *build_diff_line(char *path, char *filename, t_file_diff *info) {
-     static char tmp[BUFFER_LENGTH];
--    static char opath[BUFFER_LENGTH];
-+    static unsigned char opath[BUFFER_LENGTH];
-     char        *s = tmp;
--    char        *ppath;
-+    unsigned char *ppath;
-     
-     *s = 0;
-     if (info->diff == 0) {
- 	ppath = opath;
--	if (Output_Str)    ppath += sprintf(ppath, "%s/", Output_Str);
--	if (Rewrite_Src1)  ppath += sprintf(ppath, "%s/", Rewrite_Src1);
--	sprintf(ppath, "%s", path);
-+	if (Output_Str)    ppath += sprintf((char *)ppath, "%s/", Output_Str);
-+	if (Rewrite_Src1)  ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1);
-+	sprintf((char *)ppath, "%s", path);
- 	s += sprintf(s, "= %s", build_line(opath, filename, info->src1));
- 	return (tmp);
-     }
- 
-     if (info->src1 && IS(Options, SHOW_OLD)) {
- 	ppath = opath;
--	if (Output_Str)    ppath += sprintf(ppath, "%s/", Output_Str);
--	if (Rewrite_Src1)  ppath += sprintf(ppath, "%s/", Rewrite_Src1);
--	sprintf(ppath, "%s", path);
-+	if (Output_Str)    ppath += sprintf((char *)ppath, "%s/", Output_Str);
-+	if (Rewrite_Src1)  ppath += sprintf((char *)ppath, "%s/", Rewrite_Src1);
-+	sprintf((char *)ppath, "%s", path);
- 	
- 	if (!info->src2) 
- 	    s += sprintf(s, "- %s", build_line(opath, filename, info->src1));
-@@ -412,9 +412,9 @@ char  *build_diff_line(char *path, char *filename, t_file_diff *info) {
-     }
-     if (info->src2  && IS(Options, SHOW_NEW)) {
- 	ppath = opath;
--	if (Output_Str)    ppath += sprintf(ppath, "%s/", Output_Str);
--	if (Rewrite_Src2)  ppath += sprintf(ppath, "%s/", Rewrite_Src2);
--	sprintf(ppath, "%s", path);
-+	if (Output_Str)    ppath += sprintf((char *)ppath, "%s/", Output_Str);
-+	if (Rewrite_Src2)  ppath += sprintf((char *)ppath, "%s/", Rewrite_Src2);
-+	sprintf((char *)ppath, "%s", path);
- 	
- 	if (!info->src1) 
- 	    s += sprintf(s, "+ %s", build_line(opath, filename, info->src2));
-diff --git a/flx/fct1.c b/flx/fct1.c
-index c074a7a..e9ade63 100644
---- a/flx/fct1.c
-+++ b/flx/fct1.c
-@@ -38,14 +38,14 @@ t_file_desc *complete_info_from_file(char *path, t_file_desc *desc, int flag) {
-         desc->md5 = checksum_md5_from_file(path);
-     else if (S_ISLNK(stat.st_mode) && !desc->link) { 
- 	/* get link and md5 associed */
--        char temp[BUFFER_LENGTH];
-+        unsigned char temp[BUFFER_LENGTH];
-         int  l;
- 
--        if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) {
-+        if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) {
-             PFERROR("readlink(%s)", path);
-         } else {
-             temp[l] = 0;
--            desc->link = strdup(temp);
-+            desc->link = (unsigned char *)strdup((char *)temp);
-             desc->md5 = checksum_md5_from_data(temp, l);
-         }
-     }   
-@@ -81,7 +81,7 @@ int  files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path)
- 	        diff |= DIFF_TIME; /* modification times diff */
-     }
-     if (DIFF(LINK) && S_ISLNK(f1->stat.st_mode) && S_ISLNK(f2->stat.st_mode)) {
--	char temp[BUFFER_LENGTH];
-+	unsigned char temp[BUFFER_LENGTH];
- 	int  l;
- 	
- 	if (f1->link != f2->link) {
-@@ -89,18 +89,18 @@ int  files_are_the_same(t_file_desc *f1, t_file_desc *f2, int Diff, char *path)
- 		if (!path) diff |= DIFF_LINK;
- 		else {
- 		    /* rebuild link and link's checksum */
--		    if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) {
-+		    if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) {
- 			PFERROR("readlink(%s)",path);
- 		    } else {
- 			temp[l] = 0;
--			if (!f1->link) f1->link = strdup(temp);
--			if (!f2->link) f2->link = strdup(temp);
-+			if (!f1->link) f1->link = (unsigned char *)strdup((char *)temp);
-+			if (!f2->link) f2->link = (unsigned char *)strdup((char *)temp);
- 			if (!f1->md5) f1->md5 = checksum_md5_from_data(temp, l);
- 			if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l);
- 		    }
- 		}
- 	    }
--	    if (!(diff & DIFF_LINK) && strcmp(f1->link, f2->link)) 
-+	    if (!(diff & DIFF_LINK) && strcmp((char *)f1->link, (char *)f2->link)) 
- 		diff |= DIFF_LINK; /* links differ */
- 	}
-     }
-@@ -223,10 +223,10 @@ int browse_over_path(char *path, PROTO_FS(*fct), void *data) {
- 
- 
- /* build an MD5 checksum from data in file */
--char *checksum_md5_from_file(char *file) {
-+unsigned char *checksum_md5_from_file(char *file) {
-     int       fd;
-     ssize_t   size;
--    char      *checksum_md5 = NULL, blk[BUFFER_LENGTH];
-+    unsigned char *checksum_md5 = NULL, blk[BUFFER_LENGTH];
-     MD5_CTX   md5_ctx;
-     
-     if ((fd = open(file, O_RDONLY)) < 0 ) {
-@@ -247,8 +247,8 @@ char *checksum_md5_from_file(char *file) {
- }
- 
- /* build an MD5 checksum from a string */
--char *checksum_md5_from_data(char *data, int len) {
--    char      *checksum_md5 = 0;
-+unsigned char *checksum_md5_from_data(unsigned char *data, int len) {
-+    unsigned char *checksum_md5 = 0;
-     MD5_CTX   md5_ctx;
-     
-     MD5_Init(&md5_ctx);
-@@ -310,7 +310,7 @@ int mkdir_with_parent(char *pathname, mode_t mode) {
- }
- 
- /* return formatted info into a static string */
--char *build_line(char *path, char *filename, t_file_desc *info) {
-+char *build_line(unsigned char *path, char *filename, t_file_desc *info) {
-     struct stat *st = &(info->stat);
-     static char blk[BUFFER_LENGTH], tmp[64];
-     int         s;
-diff --git a/flx/flx.h b/flx/flx.h
-index 3315ded..7030102 100644
---- a/flx/flx.h
-+++ b/flx/flx.h
-@@ -216,11 +216,11 @@ struct s_dtree {
- 
- 
- extern int browse_over_path(char *path, void *(*fct)(), void *data) ;
--extern char *checksum_md5_from_file(char *file) ;
--extern char *checksum_md5_from_data(char *data, int len) ;
-+extern unsigned char *checksum_md5_from_file(char *file) ;
-+extern unsigned char *checksum_md5_from_data(unsigned char *data, int len) ;
- extern char *end_field(char *line) ;
- extern int mkdir_with_parent(char *pathname, mode_t mode) ;
--extern char *build_line(char *path, char *filename, t_file_desc *info) ;
-+extern char *build_line(unsigned char *path, char *filename, t_file_desc *info) ;
- extern char *show_filename(char *path, char *filename, t_file_desc *info) ;
- extern void dump_tree(t_ft *tree) ;
- extern int dump_diff_tree(t_dtree *tree);
-diff --git a/flx/input_file.c b/flx/input_file.c
-index ec50c02..5dc8e80 100644
---- a/flx/input_file.c
-+++ b/flx/input_file.c
-@@ -132,7 +132,7 @@ t_file_desc *fill_from_signfs_line(char **tab, char **rpath, t_file_desc **desc)
- 	    if (rpath) *rpath = p1;
- 	    break;
- 	case 8: /* link */
--	    (*desc)->link = strdup(p1);
-+	    (*desc)->link = (unsigned char *)strdup(p1);
- 	    break;
- 	}
-     }
-diff --git a/flx/input_fs.c b/flx/input_fs.c
-index e64f9da..3a35759 100644
---- a/flx/input_fs.c
-+++ b/flx/input_fs.c
-@@ -40,14 +40,14 @@ static t_file_desc *complete_info_from_fs(char *path, t_file_desc *desc) {
-             desc->md5 = checksum_md5_from_file(path);
-         else if (S_ISLNK(stat.st_mode) && !desc->link) { 
- 	    /* get link and md5 associed */
--            char temp[BUFFER_LENGTH];
-+            unsigned char temp[BUFFER_LENGTH];
-             int  l;
- 
--            if ((l = readlink(path, temp, BUFFER_LENGTH)) < 0) {
-+            if ((l = readlink(path, (char *)temp, BUFFER_LENGTH)) < 0) {
-                 PFERROR("readlink(%s)", path);
-             } else {
-                 temp[l] = 0;
--                desc->link = strdup(temp);
-+                desc->link = (unsigned char *)strdup((char *)temp);
-                 desc->md5 = checksum_md5_from_data(temp, l);
-             }
-         }
-diff --git a/flx/utils.c b/flx/utils.c
-index 16aaad2..090e314 100644
---- a/flx/utils.c
-+++ b/flx/utils.c
-@@ -10,7 +10,7 @@
- 
- #include "utils.h"
- 
--static char bigbuffer[BUFFLEN];
-+static unsigned char bigbuffer[BUFFLEN];
- 
- POOL_INIT(p2void);
- 
-@@ -121,8 +121,8 @@ char *backslashed_strmchr(char *s, char *mc) {
- }
- 
- /* return the string with characters 'toback' backslashed */
--char *backslashed_str(char *s, char *toback) {
--    char        *pbuff = bigbuffer;
-+unsigned char *backslashed_str(char *s, char *toback) {
-+    unsigned char        *pbuff = bigbuffer;
- 	int         len = 0;
-     
-     while (*s && len < (BUFFLEN-1)) {
-@@ -136,8 +136,8 @@ char *backslashed_str(char *s, char *toback) {
- }
- 
- /* escape unprintable char with its hexadecimal value (url encode form) */
--char *escape_str(char *s) {
--	char        *pbuff = bigbuffer;
-+unsigned char *escape_str(unsigned char *s) {
-+	unsigned char *pbuff = bigbuffer;
- 	int         len = 0;
- 
- 	while (*s && len < (BUFFLEN-4)) {
-@@ -158,8 +158,8 @@ char *escape_str(char *s) {
- }
- 
- /* unescape string from %xx string form */
--char *unescape_str(char *s) {
--	char        *pbuff = bigbuffer;
-+unsigned char *unescape_str(char *s) {
-+	unsigned char        *pbuff = bigbuffer;
- 	int         len = 0;
- 
- 	while (*s && len < (BUFFLEN-1)) {
-diff --git a/flx/utils.h b/flx/utils.h
-index 984fc7a..707e620 100644
---- a/flx/utils.h
-+++ b/flx/utils.h
-@@ -186,9 +186,9 @@ int  fatal_error(char *,...);
- int  pferror(char *,...);
- char *backslashed_strchr(char *s, char c);
- char *backslashed_strmchr(char *s, char *mc);
--char *backslashed_str(char *, char *toback);
-+unsigned char *backslashed_str(char *, char *toback);
- void *push_str_sorted(void *ptr, char *str);
--char *escape_str(char *s);
--char *unescape_str(char *s);
-+unsigned char *escape_str(unsigned char *s);
-+unsigned char *unescape_str(char *s);
- 
- #endif /* __UTILS_H__ */
diff --git a/flx/flx/files/0.1.31-warning-implicit-declaration.diff b/flx/flx/files/0.1.31-warning-implicit-declaration.diff
deleted file mode 100644
index 6cbc45bf..00000000
--- a/flx/flx/files/0.1.31-warning-implicit-declaration.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/flx/arg.c b/flx/arg.c
-index d82d2d1..8b7c112 100644
---- a/flx/arg.c
-+++ b/flx/arg.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <stdlib.h>
- 
- #include "flx.h"
- #include "arg.h"
-diff --git a/flx/check.c b/flx/check.c
-index 0a425c3..9589c5e 100644
---- a/flx/check.c
-+++ b/flx/check.c
-@@ -23,6 +23,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include "flx.h"
- #include "check.h"
-diff --git a/flx/input.c b/flx/input.c
-index 182fa83..5e9ecbc 100644
---- a/flx/input.c
-+++ b/flx/input.c
-@@ -1,4 +1,6 @@
- #include <string.h>
-+#include <stdlib.h>
-+
- #include "utils.h"
- #include "source_type.h"
- #include "input.h"
-diff --git a/flx/output.c b/flx/output.c
-index 7898fc8..801bccc 100644
---- a/flx/output.c
-+++ b/flx/output.c
-@@ -1,4 +1,6 @@
- #include <string.h>
-+#include <stdlib.h>
-+
- #include "utils.h"
- #include "flx.h"
- #include "output.h"
-diff --git a/flx/utils.c b/flx/utils.c
-index 6b0272a..16aaad2 100644
---- a/flx/utils.c
-+++ b/flx/utils.c
-@@ -6,6 +6,7 @@
- #include <fcntl.h>
- #include <stdarg.h>
- #include <ctype.h>
-+#include <stdlib.h>
- 
- #include "utils.h"
- 
diff --git a/flx/flx/files/0.6.7-cast.diff b/flx/flx/files/0.6.7-cast.diff
deleted file mode 100644
index 5dcc297e..00000000
--- a/flx/flx/files/0.6.7-cast.diff
+++ /dev/null
@@ -1,110 +0,0 @@
---- fct1.c.ori	2009-04-23 17:25:23.000000000 +0200
-+++ fct1.c	2009-04-23 17:37:29.000000000 +0200
-@@ -45,7 +45,7 @@
-             PFERROR("readlink(%s)", path);
-         } else {
-             temp[l] = 0;
--            desc->link = strdup(temp);
-+            desc->link = (unsigned char*)strdup(temp);
-             desc->md5 = checksum_md5_from_data(temp, l);
-         }
-     }   
-@@ -92,13 +92,13 @@
- 			PFERROR("readlink(%s)",path);
- 		    } else {
- 			temp[l] = 0;
--			if (!f1->link) f1->link = strdup(temp);
--			if (!f2->link) f2->link = strdup(temp);
-+			if (!f1->link) f1->link = (unsigned char*)strdup(temp);
-+			if (!f2->link) f2->link = (unsigned char*)strdup(temp);
- 			if (!f1->md5) f1->md5 = checksum_md5_from_data(temp, l);
- 			if (!f2->md5) f2->md5 = checksum_md5_from_data(temp, l);
- 		    }
- 		}
--		if (strcmp(f1->link, f2->link)) 
-+		if (strcmp((const char*)f1->link, (const char*)f2->link)) 
- 		    diff |= DIFF_LINK; /* links differ */
- 	    }
- 	}
-@@ -222,10 +222,10 @@
- 
- 
- /* build an MD5 checksum from data in file */
--char *checksum_md5_from_file(char *file) {
-+unsigned char *checksum_md5_from_file(char *file) {
-     int       fd;
-     ssize_t   size;
--    char      *checksum_md5 = NULL, blk[BUFFER_LENGTH];
-+    unsigned char      *checksum_md5 = NULL, *blk[BUFFER_LENGTH];
-     MD5_CTX   md5_ctx;
-     
-     if ((fd = open(file, O_RDONLY)) < 0 ) {
-@@ -234,7 +234,7 @@
-     else {
- 	MD5_Init(&md5_ctx);
- 	while ((size = read(fd, blk, BUFFER_LENGTH)) > 0)
--	    MD5_Update(&md5_ctx, blk, size);
-+	    MD5_Update(&md5_ctx, (const void*)blk, size);
- 	close(fd);
-         // if size = -1, there is a read error, don't do anything
-         if (size == 0) { // last read is null
-@@ -246,12 +246,12 @@
- }
- 
- /* build an MD5 checksum from a string */
--char *checksum_md5_from_data(char *data, int len) {
--    char      *checksum_md5 = 0;
-+unsigned char *checksum_md5_from_data(char *data, int len) {
-+    unsigned char      *checksum_md5 = 0;
-     MD5_CTX   md5_ctx;
-     
-     MD5_Init(&md5_ctx);
--    MD5_Update(&md5_ctx, data, len);
-+    MD5_Update(&md5_ctx, (const void*)data, len);
-     checksum_md5 = MALLOC(16);
-     MD5_Final(checksum_md5, &md5_ctx);
-     return (checksum_md5);
-@@ -365,7 +365,7 @@
- 	s += sprintf(blk+s, "%s", backslashed_str(path, " \\\n()\t"));
- 	
- 	if (S_ISLNK(st->st_mode) && info->link)
--	    s += sprintf(blk+s, " %s", backslashed_str(info->link, " \\\n()\t"));
-+	    s += sprintf(blk+s, " %s", backslashed_str((char*)info->link, " \\\n()\t"));
-     }
-     else {
- 	if (IS(Options, GOPT_HUMAN_READABLE))
---- input_file.c.ori	2009-04-23 17:22:17.000000000 +0200
-+++ input_file.c	2009-04-23 17:24:09.000000000 +0200
-@@ -127,7 +127,7 @@
- 	    if (rpath) *rpath = p1;
- 	    break;
- 	case 8: /* link */
--	    (*desc)->link = strdup(p1);
-+	    (*desc)->link = (unsigned char*)strdup(p1);
- 	    break;
- 	}
-     }
---- input_fs.c.ori	2009-04-23 17:24:21.000000000 +0200
-+++ input_fs.c	2009-04-23 17:34:05.000000000 +0200
-@@ -46,7 +46,7 @@
-             PFERROR("readlink(%s)", path);
-         } else {
-             temp[l] = 0;
--            desc->link = strdup(temp);
-+            desc->link = (unsigned char*)strdup(temp);
-             desc->md5 = checksum_md5_from_data(temp, l);
-         }
-     }   
---- flx.h.ori	2009-04-23 17:42:49.000000000 +0200
-+++ flx.h	2009-04-23 17:26:52.000000000 +0200
-@@ -214,8 +214,8 @@
- 
- 
- extern int browse_over_path(char *path, void *(*fct)(), void *data) ;
--extern char *checksum_md5_from_file(char *file) ;
--extern char *checksum_md5_from_data(char *data, int len) ;
-+extern unsigned char *checksum_md5_from_file(char *file) ;
-+extern unsigned char *checksum_md5_from_data(char *data, int len) ;
- extern char *end_field(char *line) ;
- extern int mkdir_with_parent(char *pathname, mode_t mode) ;
- extern char *build_line(char *path, char *filename, t_file_desc *info) ;
diff --git a/flx/flx/files/0.6.7-gcc-2.9-define.diff b/flx/flx/files/0.6.7-gcc-2.9-define.diff
deleted file mode 100644
index 1a133adf..00000000
--- a/flx/flx/files/0.6.7-gcc-2.9-define.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- utils.h.ori	2009-04-23 16:34:45.000000000 +0200
-+++ utils.h	2009-04-23 17:16:23.000000000 +0200
-@@ -56,7 +56,7 @@
- 
- #define BUFFLEN BUFFER_LENGTH
- 
--#define PFERROR(str...)    PFERROR2(##str, 0)
-+#define PFERROR(str...)    PFERROR2(str, 0)
- #define PFERROR2(str, p...)  pferror("%s:%d: " str, __FILE__, __LINE__, ##p)
- #define HEXTODEC(a)  (('0'<=(a) && (a)<='9')?(a)-'0':(a)-'a'+10)
- 
-@@ -71,7 +71,7 @@
- #define POOL_ALLOC(type) ({                     \
-     void *p;                                    \
-     if ((p = pool_##type) == NULL)              \
--        p = malloc(sizeof(##type));              \
-+        p = malloc(sizeof(type));              \
-     else {                                      \
-         pool_##type = *(void **)pool_##type;    \
-     }                                           \
-@@ -94,7 +94,7 @@
- #define POOL_INIT_PROTO(type) extern type *pool_##type
- 
- #else
--#define POOL_ALLOC(type) (calloc(1,sizeof(##type)));
-+#define POOL_ALLOC(type) (calloc(1,sizeof(type)));
- #define POOL_FREE(type, ptr) (free(ptr));
- #define POOL_INIT        
- #endif  /* MEM_OPTIM */
diff --git a/flx/flx/files/0.6.7-quoted-FLX_poptions.diff b/flx/flx/files/0.6.7-quoted-FLX_poptions.diff
deleted file mode 100644
index 92c71534..00000000
--- a/flx/flx/files/0.6.7-quoted-FLX_poptions.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- main.c.ori	2009-04-23 16:28:35.000000000 +0200
-+++ main.c	2009-04-23 16:29:10.000000000 +0200
-@@ -36,12 +36,12 @@
- 
- 
- t_param FLX_poptions[] = {
--    { 0, NULL, 0xFFFF, 0, "sign -h|<options> input [...]
--                  sign data" },
--    { 0, NULL, 0xFFFF, 0, "check -h|<options>  src1 src2                
--                  check difference between src1 and src2" },
--    { 0, NULL, 0xFFFF, 0, "check -h|<options>  src1 [...] , src2 [...]  
--                  check difference between srcs1 and srcs2" },
-+    { 0, NULL, 0xFFFF, 0, "sign -h|<options> input [...]"
-+                  "sign data" },
-+    { 0, NULL, 0xFFFF, 0, "check -h|<options>  src1 src2" 
-+                  "check difference between src1 and src2" },
-+    { 0, NULL, 0xFFFF, 0, "check -h|<options>  src1 [...] , src2 [...]"
-+                  "check difference between srcs1 and srcs2" },
-     { 0, NULL, 0, 0}
- };
- 
diff --git a/flx/flx/files/0.6.7-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/0.6.7-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index 844cff51..00000000
--- a/flx/flx/files/0.6.7-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d7a4df0..3a0c0d9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -31,8 +31,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
-     input.c input_fs.c input_file.c \
-     output.c output_file.c
- OBJ=$(SRC:.c=.o)
--CFLAGS= -Wall -g2 -O0 -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
--LDFLAGS=-L.
-+
-+CFLAGS	+= -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
- 
- $(NAME): $(OBJ)
- 	$(CC) -o $(NAME) $(OBJ) $(LDFLAGS) 
diff --git a/flx/flx/files/0.6.7-warnings.diff b/flx/flx/files/0.6.7-warnings.diff
deleted file mode 100644
index 736b16ce..00000000
--- a/flx/flx/files/0.6.7-warnings.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- arg.c.ori	2009-04-23 16:32:31.000000000 +0200
-+++ arg.c	2009-04-23 16:32:52.000000000 +0200
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <stdlib.h>
- 
- #include "flx.h"
- #include "arg.h"
---- check.c.ori	2009-04-23 17:27:44.000000000 +0200
-+++ check.c	2009-04-23 17:27:55.000000000 +0200
-@@ -23,6 +23,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include "flx.h"
- #include "check.h"
---- output.c.ori	2009-04-23 17:20:26.000000000 +0200
-+++ output.c	2009-04-23 17:21:25.000000000 +0200
-@@ -1,4 +1,5 @@
- #include <string.h>
-+#include <stdlib.h>
- #include "utils.h"
- #include "flx.h"
- #include "output.h"
---- utils.c.ori	2009-04-23 16:32:02.000000000 +0200
-+++ utils.c	2009-04-23 16:48:19.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <stdarg.h>
-+#include <stdlib.h>
- 
- #include "utils.h"
- 
---- input.c.ori	2009-04-23 17:21:43.000000000 +0200
-+++ input.c	2009-04-23 17:21:54.000000000 +0200
-@@ -1,4 +1,5 @@
- #include <string.h>
-+#include <stdlib.h>
- #include "utils.h"
- #include "source_type.h"
- #include "input.h"
diff --git a/flx/flx/flx-0.1.31.ebuild b/flx/flx/flx-0.1.31.ebuild
deleted file mode 100644
index 84fffd96..00000000
--- a/flx/flx/flx-0.1.31.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit git-2 toolchain-funcs eutils
-
-DESCRIPTION="Formilux Tools"
-HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare ()
-{
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff
-	epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff
-
-	tc-export CC
-}
-
-src_compile ()
-{
-	emake -C flx \
-		VERSION=${PV}
-}
-
-src_install ()
-{
-	into /usr
-	dobin flx/flx
-	dodoc flx/{AUTHORS,ChangeLog,NOTES,README,TODO}
-}
diff --git a/flx/flx/flx-0.1.34.ebuild b/flx/flx/flx-0.1.34.ebuild
index 84fffd96..a759bbe7 100644
--- a/flx/flx/flx-0.1.34.ebuild
+++ b/flx/flx/flx-0.1.34.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit git-2 toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -16,12 +16,12 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_prepare ()
 {
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff
-	epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff
+	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
+	epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
 
 	tc-export CC
 }
@@ -29,7 +29,7 @@ src_prepare ()
 src_compile ()
 {
 	emake -C flx \
-		VERSION=${PV}
+		VERSION="${PV}"
 }
 
 src_install ()
diff --git a/flx/flx/flx-0.6.7.ebuild b/flx/flx/flx-0.6.7.ebuild
deleted file mode 100644
index 164b850e..00000000
--- a/flx/flx/flx-0.6.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit git-2 toolchain-funcs eutils
-
-DESCRIPTION="Tool to have an image of the filesystem"
-HOMEPAGE="http://master.formilux.org/git/dist/src/flx.git"
-EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flx.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare ()
-{
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff
-	epatch "${FILESDIR}"/${PV}-quoted-FLX_poptions.diff
-	epatch "${FILESDIR}"/${PV}-warnings.diff
-	epatch "${FILESDIR}"/${PV}-gcc-2.9-define.diff
-	epatch "${FILESDIR}"/${PV}-cast.diff
-
-	tc-export CC
-}
-
-src_install ()
-{
-	dobin flx
-	dodoc AUTHORS NOTES README TODO
-}
diff --git a/flx/flx/flx-9999.ebuild b/flx/flx/flx-9999.ebuild
index 60d9220b..b642e59b 100644
--- a/flx/flx/flx-9999.ebuild
+++ b/flx/flx/flx-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 inherit git-2 toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -12,16 +12,16 @@ EGIT_COMMIT="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_prepare ()
 {
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff
-	epatch "${FILESDIR}"/${PV}-warning-implicit-declaration.diff
+	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
+	epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
 
 	tc-export CC
 }
@@ -29,7 +29,7 @@ src_prepare ()
 src_compile ()
 {
 	emake -C flx \
-		VERSION=$PV
+		VERSION="${PV}"
 }
 
 src_install ()