flx/remount: Move to EAPI 6

Package-Manager: portage-2.2.28

6 files changed, 40 insertions, 56 deletions

diff --git a/flx/remount/Manifest b/flx/remount/Manifest
index d1b298d9..c228ba2d 100644
--- a/flx/remount/Manifest
+++ b/flx/remount/Manifest
@@ -2,10 +2,9 @@ AUX 0.1.34-remove-strip-diet.diff 1924 SHA256 b870b2d12347d2ec27bd060d72c997b3ab
 AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
 AUX 0.1.34-warning-cast.diff 550 SHA256 49050466db1280ad8a3e9c3c0c56e0ac8623d5fd3f8e00577ce9341f49e6992f WHIRLPOOL fd383522d153d24edf224ae129683a463c187603b924c571c609dd069fb600cf93d593429d855b2ef5ebf6fc2f53e287d332a7de63c2d4124b5667fe9403c709
 AUX 0.1.34-warning-implicit-declaration.diff 292 SHA256 db1cd3f07b6a0bad1a197d231832d01fab49f2237384feea076e7fc613254d59 WHIRLPOOL c76157034e00854d26bda86684c167677cad9a04f09d84112079ceac946359329ee89c04dab04cfc6569204509e85b2f810b7c4d435a9d110ce55716a0177037
-AUX 9999-remove-strip-diet.diff 1924 SHA256 b870b2d12347d2ec27bd060d72c997b3abe67fc47b5c27cd597510c69b92ffaa WHIRLPOOL cd6eda3b5770fc3cc585372ada7ce0c0d57ebbcfbc69f72fa0d218cc16cc021438ea11ac444464290308b73dd0c1648ec16fbce5f736c0ea1374304a894e18ea
-AUX 9999-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
+AUX 9999-remove-strip-diet.diff 1475 SHA256 90dfb592c73c7f1b0e8608418af5bcd829577c7b50cf676c4816990d77ef26c5 WHIRLPOOL 26b41d73386121f0c6273bd5d05da73814a0678e899137126f4c696dd0faf319fed81b7e50acd30ea2a0d4d90028482fa61ac2b4225282d9650693113286406a
+AUX 9999-respect-CFLAGS-LDFLAGS.diff 768 SHA256 0ae2ca40da7bedf0d2d64e05ae7d5ad0aa2e970a3334d842e8ff9fe4d172fd2a WHIRLPOOL 1c0e3236aee5ce3eb92b0f4c389ec97c167c73aeab4fe3c3b853a0009ce376fa58aedb372224054f41af04b33748f15f00e11da70f5a08e6ba5d5523ae318064
 AUX 9999-warning-cast.diff 550 SHA256 49050466db1280ad8a3e9c3c0c56e0ac8623d5fd3f8e00577ce9341f49e6992f WHIRLPOOL fd383522d153d24edf224ae129683a463c187603b924c571c609dd069fb600cf93d593429d855b2ef5ebf6fc2f53e287d332a7de63c2d4124b5667fe9403c709
-AUX 9999-warning-implicit-declaration.diff 292 SHA256 db1cd3f07b6a0bad1a197d231832d01fab49f2237384feea076e7fc613254d59 WHIRLPOOL c76157034e00854d26bda86684c167677cad9a04f09d84112079ceac946359329ee89c04dab04cfc6569204509e85b2f810b7c4d435a9d110ce55716a0177037
-EBUILD remount-0.1.34.ebuild 751 SHA256 819318fb7cc06a599874a7d2fe446819a14e07be22af9fe9b38b55ec1507ded9 WHIRLPOOL 363cb08d08424ad314368cc8731255bae041120c2424a8c4253cf805a31398f29ad5ac5fd6e58c01f1820577eda8f6e7809f99a7e1e1e5687924066715bbb030
-EBUILD remount-9999.ebuild 721 SHA256 642261c5d75d2c038563d9aeb18ff3de7a8d1dc121d3575bb76f2929c9c10e43 WHIRLPOOL 1d25bc408c4d545cc3ff9099967952a0050308d964e8b1c0391057f61f764bc0056d826b225b56307838c663e05847bcd74787118bce676416bb173c0741fbd8
+EBUILD remount-0.1.34.ebuild 761 SHA256 fd7c38a793812a9a8579ab738bb4a6ea77937b17d71d5bf8bc6154af024cbabc WHIRLPOOL 53ab89001ade0ff7b8df7d65575f75c095ff12235913485df30b52fc3240d8d02bf4113748f0f7901c8136a6dd79944ebeeeddb1f63b082bb1e6bca683af2ba4
+EBUILD remount-9999.ebuild 669 SHA256 a5a56f6595ffc6240733ca6d0fe1942c983f556cc57a663a3010a6df59721e78 WHIRLPOOL e985b6f3c48eeacb62c498528696f7d9b5be701dad8517ff629b63f752c2bd652375f34119a687790ad8afd563cd9674b3c8e405bf79d31e3147eb33182d9975
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/remount/files/9999-remove-strip-diet.diff b/flx/remount/files/9999-remove-strip-diet.diff
index 414295d0..ffbbb0f5 100644
--- a/flx/remount/files/9999-remove-strip-diet.diff
+++ b/flx/remount/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,28 +43,3 @@ index 99bff82..f373aad 100644
  
  clean:
  	@rm -f *.[ao] *~ core
-diff --git a/wd/Makefile b/wd/Makefile
-index ed8a82c..8350b33 100644
---- a/wd/Makefile
-+++ b/wd/Makefile
-@@ -4,6 +4,3 @@ 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/remount/Makefile b/remount/Makefile
-index 740f38f..3887b5f 100644
---- a/remount/Makefile
-+++ b/remount/Makefile
-@@ -4,9 +4,3 @@ CFLAGS+=-fomit-frame-pointer
- 
- remountw : remountr
- 	ln -s $^ $@
--
--%:	%.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/remount/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff
index 8ac81836..eee82589 100644
--- a/flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff
+++ b/flx/remount/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/remount/files/9999-warning-implicit-declaration.diff b/flx/remount/files/9999-warning-implicit-declaration.diff
deleted file mode 100644
index ac469e99..00000000
--- a/flx/remount/files/9999-warning-implicit-declaration.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/remount/remountr.c b/remount/remountr.c
-index f45c39a..2a38f22 100644
---- a/remount/remountr.c
-+++ b/remount/remountr.c
-@@ -1,4 +1,6 @@
- #include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
- 
- const char mount_str[] = "/bin/mount";
- const char remount_str[] = "remount";
diff --git a/flx/remount/remount-0.1.34.ebuild b/flx/remount/remount-0.1.34.ebuild
index b96bdaa0..4fe5b21d 100644
--- a/flx/remount/remount-0.1.34.ebuild
+++ b/flx/remount/remount-0.1.34.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 toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -16,6 +16,8 @@ KEYWORDS="amd64 x86"
 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/remount/remount-9999.ebuild b/flx/remount/remount-9999.ebuild
index 161aaee4..7ed8e034 100644
--- a/flx/remount/remount-9999.ebuild
+++ b/flx/remount/remount-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 toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -15,9 +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