flx/init: Move to EAPI 6

Package-Manager: portage-2.2.28

6 files changed, 40 insertions, 29 deletions

diff --git a/flx/init/Manifest b/flx/init/Manifest
index 4df109c6..a080ce2f 100644
--- a/flx/init/Manifest
+++ b/flx/init/Manifest
@@ -3,9 +3,8 @@ AUX 0.1.34-no-no-omit-leaf-frame-pointer.diff 302 SHA256 28d16f01d4f5523da10db94
 AUX 0.1.34-remove-strip-diet.diff 1165 SHA256 7e3a01385ab120ec2f0630d081aa2ce7cc324e5e9f3b9687dab62e09e5bc2fea WHIRLPOOL d507478c38bab5ceffe9afded94f08134ddfcf41355786dfbee4c105d9cac5689682e6cd3bd37c39ed25d02ef6a7325509fa6f9638563875efc1b101789c71cc
 AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
 AUX 9999-error-struct-stat.diff 240 SHA256 4555439fdbd221a30314a368e16ad53d6bf9cf723b84ddec766eafbd125f023a WHIRLPOOL f9471e4aca1106d2bc4fe184bbdc147efefdc41e96617901f4e328479995ebc270aec055e8d353d7154f0d3c94194e241520883581d0b216b9fc7fc6b0c3e21f
-AUX 9999-no-no-omit-leaf-frame-pointer.diff 302 SHA256 28d16f01d4f5523da10db9472b4476f083d73a1dbf10c7e4dcae635beae9e6f3 WHIRLPOOL a7b7956c126d9bbd5666e535552cbab731365f944a10002851a972c276238b24c1bb948f328b89664534db6b24bf3c66aaaa2bc87a9d032b133717cf28a5dd83
-AUX 9999-remove-strip-diet.diff 1165 SHA256 7e3a01385ab120ec2f0630d081aa2ce7cc324e5e9f3b9687dab62e09e5bc2fea WHIRLPOOL d507478c38bab5ceffe9afded94f08134ddfcf41355786dfbee4c105d9cac5689682e6cd3bd37c39ed25d02ef6a7325509fa6f9638563875efc1b101789c71cc
-AUX 9999-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
-EBUILD init-0.1.34.ebuild 1023 SHA256 5907616275e6b37a4c2274030431a7fd64ca9df384783b3b0d04681386128d2c WHIRLPOOL 249c6503112c8ce8456b99a5b9928209e2716cc8ddc3018a4c748a5e7d186183ce78237abdcea3fc45ca49058fbab0be83f2365f9e1228ae6af719f05cfe2589
-EBUILD init-9999.ebuild 988 SHA256 f3bf66863b4d372d30a124c8e873989078857947e86813d369e5361c52175a52 WHIRLPOOL 5f9183842fac88818efd55e00e2f39c0a1a524565f1cc4cfb9849904a4daa73f99d9043e428721357098934ad8815bcc9eabed4f723dea3ddd0b60b94ef6cbfe
+AUX 9999-remove-strip-diet.diff 1475 SHA256 90dfb592c73c7f1b0e8608418af5bcd829577c7b50cf676c4816990d77ef26c5 WHIRLPOOL 26b41d73386121f0c6273bd5d05da73814a0678e899137126f4c696dd0faf319fed81b7e50acd30ea2a0d4d90028482fa61ac2b4225282d9650693113286406a
+AUX 9999-respect-CFLAGS-LDFLAGS.diff 768 SHA256 0ae2ca40da7bedf0d2d64e05ae7d5ad0aa2e970a3334d842e8ff9fe4d172fd2a WHIRLPOOL 1c0e3236aee5ce3eb92b0f4c389ec97c167c73aeab4fe3c3b853a0009ce376fa58aedb372224054f41af04b33748f15f00e11da70f5a08e6ba5d5523ae318064
+EBUILD init-0.1.34.ebuild 1033 SHA256 7a8d43c898ef83ec47d515f9bd9d089c805f946ffd6bb83263a0dcb0fc2c78b4 WHIRLPOOL 5ecbfa0bb20bae494c682f6136a9c99b3fa54af22d50b5d9bc7d1287a59f6897af58b023499327a73d565463fbf3ec7b364fe66c882de7ff0c8fa587a06a1301
+EBUILD init-9999.ebuild 935 SHA256 77d8a066e3d9d9a93cad8d69fa3c189d5d15e258f65135ab49ec0dadb70851b1 WHIRLPOOL a961aaca907a84df334889303f88940e722416cf67c1eb011510ff14ca033a8e2207c5266ce74337d79b2c4fa99bd6c6b159891bd8ec4e167f84b3881696f589
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init/files/9999-no-no-omit-leaf-frame-pointer.diff b/flx/init/files/9999-no-no-omit-leaf-frame-pointer.diff
deleted file mode 100644
index e7706737..00000000
--- a/flx/init/files/9999-no-no-omit-leaf-frame-pointer.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/init/Makefile b/init/Makefile
-index 9bcbcde..8b95b06 100644
---- a/init/Makefile
-+++ b/init/Makefile
-@@ -1,3 +1,3 @@
- OBJS=init mkdev
- include ../include/rules.make
--CFLAGS+=-fomit-frame-pointer -mno-omit-leaf-frame-pointer -Wl,--gc-sections
-+CFLAGS+=-fomit-frame-pointer -Wl,--gc-sections
diff --git a/flx/init/files/9999-remove-strip-diet.diff b/flx/init/files/9999-remove-strip-diet.diff
index d377de8a..ffbbb0f5 100644
--- a/flx/init/files/9999-remove-strip-diet.diff
+++ b/flx/init/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
diff --git a/flx/init/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/init/files/9999-respect-CFLAGS-LDFLAGS.diff
index 8ac81836..eee82589 100644
--- a/flx/init/files/9999-respect-CFLAGS-LDFLAGS.diff
+++ b/flx/init/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/init/init-0.1.34.ebuild b/flx/init/init-0.1.34.ebuild
index 0041784b..faf506eb 100644
--- a/flx/init/init-0.1.34.ebuild
+++ b/flx/init/init-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 flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -19,6 +19,8 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare () {
+	default
+
 	epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
 	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
 	epatch "${FILESDIR}/${PV}-no-no-omit-leaf-frame-pointer.diff"
diff --git a/flx/init/init-9999.ebuild b/flx/init/init-9999.ebuild
index 74fe4a62..8daafbf2 100644
--- a/flx/init/init-9999.ebuild
+++ b/flx/init/init-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 flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -18,9 +18,10 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare () {
+	default
+
 	epatch "${FILESDIR}/${PV}-remove-strip-diet.diff"
 	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PV}-no-no-omit-leaf-frame-pointer.diff"
 
 	tc-export CC
 }