flx/wdd: Move to EAPI 6

Package-Manager: portage-2.2.28

7 files changed, 39 insertions, 79 deletions

diff --git a/flx/wdd/Manifest b/flx/wdd/Manifest
index 6fdc6e5e..95835805 100644
--- a/flx/wdd/Manifest
+++ b/flx/wdd/Manifest
@@ -2,12 +2,10 @@ AUX 0.1.34-remove-strip-diet.diff 1558 SHA256 16b19327d1c8487f3badefb2c5ad714f02
 AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
 AUX 0.1.34-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a
 AUX 0.1.34-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9
-AUX 9999-remove-strip-diet.diff 1558 SHA256 16b19327d1c8487f3badefb2c5ad714f020b0fe805aeab2d1e500d61cb2b774b WHIRLPOOL 819dac4e550c13ec6c7ba86bdb17d4525237c3fd1dc8275cbfd1c798b95c3f01bada25b66607ce63d94d56accd7b95d476376aa721dcd8a3275991bc989a067b
-AUX 9999-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
-AUX 9999-warning-cast.diff 812 SHA256 9c3aeafd401d0f2a4143d2b974bec506cb02de4d77d947f4cc0c70571a392926 WHIRLPOOL fedc910994fed6dec6a13a258540df4755b83b8601287f461db10d81b36c921967f96c72073fba315f95f3cf7c5128632a3cd99f1c94b21314544dec521de09a
-AUX 9999-warning-implicit-declaration.diff 378 SHA256 ea8b84942b0608fc29e9f0be3b6f7679c21ad9d56396e80f4ae55c24eef9cc6e WHIRLPOOL ab02aed0bdf75d5743331948a4c23f1b8a078ba89b81ddd2e405b6efced15421ceb8e1fb097810a42122949f637ff9166c4557b639bb530bd3b99a73e3a2c8a9
+AUX 9999-remove-strip-diet.diff 1475 SHA256 90dfb592c73c7f1b0e8608418af5bcd829577c7b50cf676c4816990d77ef26c5 WHIRLPOOL 26b41d73386121f0c6273bd5d05da73814a0678e899137126f4c696dd0faf319fed81b7e50acd30ea2a0d4d90028482fa61ac2b4225282d9650693113286406a
+AUX 9999-respect-CFLAGS-LDFLAGS.diff 768 SHA256 0ae2ca40da7bedf0d2d64e05ae7d5ad0aa2e970a3334d842e8ff9fe4d172fd2a WHIRLPOOL 1c0e3236aee5ce3eb92b0f4c389ec97c167c73aeab4fe3c3b853a0009ce376fa58aedb372224054f41af04b33748f15f00e11da70f5a08e6ba5d5523ae318064
 AUX wdd.confd 63 SHA256 bd66a212cb55fdf74bf967917f5d5a68e08ab855d3b44a97d3a634da19da8d88 WHIRLPOOL ff4487a3e0c178de715361eb7be56899d1614e211751b041a529ed9f7d01519d164b67cb0a26c47a129bbeeafccc634f007c50706e67bc19e630e6caf46cd15c
 AUX wdd.initd 637 SHA256 9e6b3e0db80b0e62f4056a2f68572c1ca57b3809c8e71cfe714b3c2f02bce44f WHIRLPOOL 8fdb8709cb9072b9cf7b8b64863a71efcd858a0d28659d8be8d73ea8da99389a8e52d828ebf5ff269dfa49a2d14e4e03d038469a79032be6c6a0da48857f02dc
-EBUILD wdd-0.1.34-r2.ebuild 815 SHA256 4fd9e9d709c9a832fe245b48d204e790b26650274b9b698840fb60d30cf1fea1 WHIRLPOOL 270718b4d948d26e98a1b4acbdf701d73c798488c1de0a1afbfa14f3c1d03229d82ea9c08a86496fa1813cfbb08dffc19ab9b98c3cf32a6bc37560795522e5a4
-EBUILD wdd-9999.ebuild 776 SHA256 2d9f48527c67a05c0694b52b79719fc4d04204a9c1af482f7e5d188003659b34 WHIRLPOOL 2a6f6b115207ebf34dbe12e5b43157f5b260e51b90a463b399f5e94b8078dc72a4451c75447961dbb2ae0c9f978537b2e81dbb109603d3f897c1e79931edc5a4
+EBUILD wdd-0.1.34-r2.ebuild 825 SHA256 0cfc82bd6d25a46c0ae95669d5a4dacbf4ebefcf9d57d13d572431673e999ade WHIRLPOOL b7d58ebc10f05cf07ecab911b02e559d0d745e8396c49137600d8855f1d7ce24d85ce5d5ad5e52e6de8f1ac58b8184234de9c75b7d5ce8acc62b04820778d9a5
+EBUILD wdd-9999.ebuild 678 SHA256 c4030cfecb4bb56544f9327db76f9efe980d6b032f51963d7cc7f3d9464778d0 WHIRLPOOL 02a2d445f96881de3f234f8b564958bf224f4d1ca774781df2000bc0a7d36f69c8cf4a5c9c3038d263e7b597c4aae4a93ce512d8622d7ce0c6075d70a7293ef8
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/wdd/files/9999-remove-strip-diet.diff b/flx/wdd/files/9999-remove-strip-diet.diff
index 166a3809..ffbbb0f5 100644
--- a/flx/wdd/files/9999-remove-strip-diet.diff
+++ b/flx/wdd/files/9999-remove-strip-diet.diff
@@ -1,16 +1,25 @@
+From e0fa5f0e5e772c91bd38be344f9d8162ed913da8 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 27 May 2013 22:36:39 +0200
+Subject: [PATCH] MEDIUM: Remove strip and uclibc
+
+---
+ include/rules.make | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
 diff --git a/include/rules.make b/include/rules.make
-index 99bff82..f373aad 100644
+index 715db29..ac19c79 100644
 --- a/include/rules.make
 +++ b/include/rules.make
-@@ -1,30 +1,16 @@
+@@ -1,30 +1,17 @@
  CC      ?= gcc
 -STRIP   ?= strip
 -OBJDUMP ?= objdump
 -SSTRIP  ?= sstrip
--DIET	?= diet
+-UCLIBC	?= uclibc
 -
 -CC_ORIG := $(CC)
--override CC := $(DIET) $(CC)
+-override CC := $(UCLIBC) $(CC) -Os
  
  CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
  #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
@@ -21,7 +30,7 @@ index 99bff82..f373aad 100644
  
  %:	%.c
  	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
--	$(STRIP) -x --strip-unneeded -R .comment -R .note $@
+ 	$(STRIP) -x --strip-unneeded -R .comment -R .note $@
 -	$(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
 -	$(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true
 -	#-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi
@@ -34,17 +43,3 @@ index 99bff82..f373aad 100644
  
  clean:
  	@rm -f *.[ao] *~ core
-diff --git a/wd/Makefile b/wd/Makefile
-index ed8a82c..e41685a 100644
---- a/wd/Makefile
-+++ b/wd/Makefile
-@@ -1,9 +1,3 @@
- OBJS=wdd
- include ../include/rules.make
- CFLAGS+=-fomit-frame-pointer
--
--%:	%.c
--	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
--	$(STRIP) -x --strip-unneeded -R .comment -R .note $@
--	$(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true
--	#$(SSTRIP) $@
diff --git a/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
index 8ac81836..eee82589 100644
--- a/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
+++ b/flx/wdd/files/9999-respect-CFLAGS-LDFLAGS.diff
@@ -1,15 +1,24 @@
+From fec67f5e0511469c50bfdd984ab9f3c5399dacad Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 27 May 2013 22:36:39 +0200
+Subject: [PATCH] MEDIUM: Respect CFLAGS and LDFLAGS
+
+---
+ include/rules.make | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
 diff --git a/include/rules.make b/include/rules.make
-index f373aad..1f95cd1 100644
+index ac19c79..5aecf0a 100644
 --- a/include/rules.make
 +++ b/include/rules.make
-@@ -1,8 +1,8 @@
+@@ -1,8 +1,7 @@
  CC      ?= gcc
  
 -CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
-+CFLAGS	+= $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
- #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
+-#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386
 -LDFLAGS=-Wl,--gc-sections
-+LDFLAGS	+= -Wl,--gc-sections
++CFLAGS  += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL)
++LDFLAGS += -Wl,--gc-sections
  
  all:	$(OBJS)
  
diff --git a/flx/wdd/files/9999-warning-cast.diff b/flx/wdd/files/9999-warning-cast.diff
deleted file mode 100644
index c4a1c7b8..00000000
--- a/flx/wdd/files/9999-warning-cast.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/wd/wdd.c b/wd/wdd.c
-index c48758c..0519eb0 100644
---- a/wd/wdd.c
-+++ b/wd/wdd.c
-@@ -9,6 +9,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/wait.h>
-+#include <unistd.h>
- 
- const char dev_wd_str[] = "/dev/watchdog";	/* standard entry */
- const char dev_misc_str[] = "/dev/misc/watchdog";  /* devfs entry */
-@@ -22,7 +23,7 @@ const char root_str[] = "/";
- static inline void try_malloc() {
-     void *heap;
- 
--    heap = (void*)sbrk(NULL);
-+    heap = sbrk(0);
-     if (brk(heap + 4096))
- 	exit(1);
-     memset(heap, 0, 4096);
-@@ -56,7 +57,7 @@ static inline int try_stat(const char *file, int do_exit) {
-     void *heap;
-     int ret;
- 
--    heap = (void*)sbrk(NULL);
-+    heap = sbrk(0);
-     if (brk(heap + sizeof (struct stat)))
- 	exit(1);
-     memset(heap, 0, sizeof (struct stat));
diff --git a/flx/wdd/files/9999-warning-implicit-declaration.diff b/flx/wdd/files/9999-warning-implicit-declaration.diff
deleted file mode 100644
index 8839d1bc..00000000
--- a/flx/wdd/files/9999-warning-implicit-declaration.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/wd/wdd.c b/wd/wdd.c
-index 4468178..c48758c 100644
---- a/wd/wdd.c
-+++ b/wd/wdd.c
-@@ -6,6 +6,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/wait.h>
- 
- const char dev_wd_str[] = "/dev/watchdog";	/* standard entry */
- const char dev_misc_str[] = "/dev/misc/watchdog";  /* devfs entry */
diff --git a/flx/wdd/wdd-0.1.34-r2.ebuild b/flx/wdd/wdd-0.1.34-r2.ebuild
index 47f25eff..f2ac746d 100644
--- a/flx/wdd/wdd-0.1.34-r2.ebuild
+++ b/flx/wdd/wdd-0.1.34-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit git-r3 eutils
 
 DESCRIPTION="Formilux Tools"
@@ -16,6 +16,8 @@ KEYWORDS="amd64 x86 mips arm"
 IUSE=""
 
 src_prepare () {
+	default
+
 	epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
 	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
 	epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
diff --git a/flx/wdd/wdd-9999.ebuild b/flx/wdd/wdd-9999.ebuild
index 001b0362..ec7df6fa 100644
--- a/flx/wdd/wdd-9999.ebuild
+++ b/flx/wdd/wdd-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit git-r3 eutils
 
 DESCRIPTION="Formilux Tools"
@@ -15,10 +15,10 @@ KEYWORDS=""
 IUSE=""
 
 src_prepare () {
+	default
+
 	epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
 	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
-	epatch "${FILESDIR}/${PV}-warning-cast.diff"
 
 	tc-export CC
 }