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

Package-Manager: portage-2.1.12.3

9 files changed, 16 insertions, 138 deletions

diff --git a/flx/init/ChangeLog b/flx/init/ChangeLog
index be25e108..333d3c32 100644
--- a/flx/init/ChangeLog
+++ b/flx/init/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  -files/0.1.31-error-struct-stat.diff, -files/0.1.31-remove-strip-diet.diff,
+  -files/0.1.31-respect-CFLAGS-LDFLAGS.diff, -init-0.1.31.ebuild,
+  init-0.1.34.ebuild:
+  flx/init: Remove old, move to EAPI 5, fix quotes
+
   28 May 2013; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml:
   Add missing metadata.xml
 
@@ -17,4 +23,3 @@
   +files/0.1.34-respect-CFLAGS-LDFLAGS.diff, +init-0.1.31.ebuild,
   +init-0.1.34.ebuild:
   Add formilux tools/init-scripts
-
diff --git a/flx/init/Manifest b/flx/init/Manifest
index c5beb2c6..c0836a75 100644
--- a/flx/init/Manifest
+++ b/flx/init/Manifest
@@ -1,11 +1,7 @@
-AUX 0.1.31-error-struct-stat.diff 240 SHA256 4555439fdbd221a30314a368e16ad53d6bf9cf723b84ddec766eafbd125f023a WHIRLPOOL f9471e4aca1106d2bc4fe184bbdc147efefdc41e96617901f4e328479995ebc270aec055e8d353d7154f0d3c94194e241520883581d0b216b9fc7fc6b0c3e21f
-AUX 0.1.31-remove-strip-diet.diff 1164 SHA256 57ef00faf22631861d14478f3cc8fb54a4fcd483768b54f24b495feadd5b3bdd WHIRLPOOL 5c7268d672b93ff28cc78f4284d79d59af8c26ead631104b8f7c950e4cdda3344f366f6e2ea7fd020469c62911f0fa36941625e2742c673f87481d0e421b06dc
-AUX 0.1.31-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2
 AUX 0.1.34-error-struct-stat.diff 240 SHA256 4555439fdbd221a30314a368e16ad53d6bf9cf723b84ddec766eafbd125f023a WHIRLPOOL f9471e4aca1106d2bc4fe184bbdc147efefdc41e96617901f4e328479995ebc270aec055e8d353d7154f0d3c94194e241520883581d0b216b9fc7fc6b0c3e21f
 AUX 0.1.34-no-no-omit-leaf-frame-pointer.diff 302 SHA256 28d16f01d4f5523da10db9472b4476f083d73a1dbf10c7e4dcae635beae9e6f3 WHIRLPOOL a7b7956c126d9bbd5666e535552cbab731365f944a10002851a972c276238b24c1bb948f328b89664534db6b24bf3c66aaaa2bc87a9d032b133717cf28a5dd83
 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
-EBUILD init-0.1.31.ebuild 955 SHA256 d44f3d5d94f5de78704804fe6f920bbf4ee9af034b8239fdb54bd5d9291dd6b9 WHIRLPOOL 6117640f2a95ce50e983d541d3b7ea0933dcaf2ca652c2b412a3119c316d700ba3781c21fe68085c2d0da70f3ec04654e922ee2dbdd7bb64db7326d008aac05b
-EBUILD init-0.1.34.ebuild 1023 SHA256 e9559547d6dfaa512996d5ed1dd51b9dfae58734fc0045ed2e0aff640565e1c0 WHIRLPOOL 9b838ace35e70102225c458b4934b0c27e25ff776e961f38e9ea1fed80f8342cf7fa4bdb3d436ba4eeba0ac77ab8c5b1153f41bde325b4daa73d285b3bc3dc8d
-MISC ChangeLog 692 SHA256 f34626aae812974e8df694fa77cd27ed9fa0611be1053e2137166994e4d259b8 WHIRLPOOL 68dcc94416f95324a66c9a6fc92830d573c6559dc35156de787f81c3733c6d5bed0b2af8e7193d10312340686bd53ef44d98286fba7f7bd7345eb302ab4f5f4a
+EBUILD init-0.1.34.ebuild 1032 SHA256 9b01307214c97eb13032064136dda4d3966d71c65c5050f9d52d958a082d57b4 WHIRLPOOL 34bc25e6990897a5b7c52ce2612441818e53fa237e7b667dc50a8401b2afbea71eaded751c8379f76d9acfbd201a4b563aaf3b2a9b05fb52839c45ef068ab2bb
+MISC ChangeLog 962 SHA256 5b8f8a92981b504f0a955af8025a77b24be6450b27276d3c1d1ee648199979df WHIRLPOOL c467ec253f141fe79fb43fc6ae20b58f8a72bfc5726a0f9abcc8982e7667d471e9e2aab5e585aaa38199cab6fd0edb28d54fcbf0ea7e469cd7c4c3a47c57e1c8
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/flx/init/files/0.1.31-error-struct-stat.diff b/flx/init/files/0.1.31-error-struct-stat.diff
deleted file mode 100644
index 9d21b1ae..00000000
--- a/flx/init/files/0.1.31-error-struct-stat.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/init/mkdev.c b/init/mkdev.c
-index 47e4aa0..78a8c8d 100644
---- a/init/mkdev.c
-+++ b/init/mkdev.c
-@@ -49,6 +49,7 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>
- #include <linux/loop.h>
-+#include <sys/stat.h>
- 
- 
- //#ifdef DEBUG
diff --git a/flx/init/files/0.1.31-remove-strip-diet.diff b/flx/init/files/0.1.31-remove-strip-diet.diff
deleted file mode 100644
index 023e85eb..00000000
--- a/flx/init/files/0.1.31-remove-strip-diet.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/include/rules.make b/include/rules.make
-index 58d0af1..f373aad 100644
---- a/include/rules.make
-+++ b/include/rules.make
-@@ -1,30 +1,16 @@
- CC      ?= gcc
--STRIP   ?= strip
--OBJDUMP ?= objdump
--SSTRIP  ?= sstrip
--DIET	?= diet
--
--CC_ORIG := $(CC)
--override CC := $(DIET) $(CC)
- 
- 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
--LDFLAGS=-s -Wl,--gc-sections
-+LDFLAGS=-Wl,--gc-sections
- 
- all:	$(OBJS)
- 
- %:	%.c
- 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
--	$(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
- 
- %-debug:	%.c
- 	$(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $<
--	$(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
- 
- clean:
- 	@rm -f *.[ao] *~ core
diff --git a/flx/init/files/0.1.31-respect-CFLAGS-LDFLAGS.diff b/flx/init/files/0.1.31-respect-CFLAGS-LDFLAGS.diff
deleted file mode 100644
index 8ac81836..00000000
--- a/flx/init/files/0.1.31-respect-CFLAGS-LDFLAGS.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/rules.make b/include/rules.make
-index f373aad..1f95cd1 100644
---- a/include/rules.make
-+++ b/include/rules.make
-@@ -1,8 +1,8 @@
- 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
--LDFLAGS=-Wl,--gc-sections
-+LDFLAGS	+= -Wl,--gc-sections
- 
- all:	$(OBJS)
- 
diff --git a/flx/init/init-0.1.31.ebuild b/flx/init/init-0.1.31.ebuild
deleted file mode 100644
index e2698407..00000000
--- a/flx/init/init-0.1.31.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit git-2 flag-o-matic 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="debug static symlink"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare ()
-{
-	epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff
-
-	tc-export CC
-}
-
-src_compile ()
-{
-	use debug  && append-cflags -DDEBUG -DI_AM_REALLY_DEBUGGING
-	use static && append-ldflags -static
-
-	append-cflags -D_GNU_SOURCE
-
-	emake -C init
-	mv init/init init/flx-init
-}
-
-src_install ()
-{
-	into /
-	dosbin init/flx-init
-	use symlink \
-	  && dosym /sbin/flx-init /init
-
-	dodoc init/README{,.2} init/test.cfg
-	dodoc -r init/examples
-}
diff --git a/flx/init/init-0.1.34.ebuild b/flx/init/init-0.1.34.ebuild
index 441f9b0e..31930652 100644
--- a/flx/init/init-0.1.34.ebuild
+++ b/flx/init/init-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 flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
@@ -16,13 +16,13 @@ KEYWORDS="amd64 x86 mips"
 IUSE="debug static symlink"
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 src_prepare ()
 {
-	epatch "${FILESDIR}"/${PV}-remove-strip-diet.diff
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-LDFLAGS.diff
-	epatch "${FILESDIR}"/${PV}-no-no-omit-leaf-frame-pointer.diff
+	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
 }
diff --git a/metadata/md5-cache/flx/init-0.1.31 b/metadata/md5-cache/flx/init-0.1.31
deleted file mode 100644
index 02b12f97..00000000
--- a/metadata/md5-cache/flx/init-0.1.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=Formilux Tools
-EAPI=4
-HOMEPAGE=http://master.formilux.org/git/dist/src/flxutils.git
-IUSE=debug static symlink
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ab2af7e4bf247e21902912c42b36b668
diff --git a/metadata/md5-cache/flx/init-0.1.34 b/metadata/md5-cache/flx/init-0.1.34
index d0d182b7..4f76be6c 100644
--- a/metadata/md5-cache/flx/init-0.1.34
+++ b/metadata/md5-cache/flx/init-0.1.34
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=dev-vcs/git
 DESCRIPTION=Formilux Tools
-EAPI=4
+EAPI=5
 HOMEPAGE=http://master.formilux.org/git/dist/src/flxutils.git
 IUSE=debug static symlink
 KEYWORDS=amd64 x86 mips
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3f72d5efdb270d2f8e488cded75c894b
+_md5_=04649262b1c23846b5551d04465443e7