flx/init: Update HOMEPAGE, add a live ebuild

Package-Manager: portage-2.2.8

8 files changed, 141 insertions, 12 deletions

diff --git a/flx/init/ChangeLog b/flx/init/ChangeLog
index 7bc33e38..acccc0da 100644
--- a/flx/init/ChangeLog
+++ b/flx/init/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for flx/init
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*init-9999 (10 Jan 2014)
+
+  10 Jan 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/9999-error-struct-stat.diff,
+  +files/9999-no-no-omit-leaf-frame-pointer.diff,
+  +files/9999-remove-strip-diet.diff, +files/9999-respect-CFLAGS-LDFLAGS.diff,
+  +init-9999.ebuild, init-0.1.34.ebuild:
+  flx/init: Update HOMEPAGE, add a live ebuild
+
   10 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
   Fix manifest
 
diff --git a/flx/init/Manifest b/flx/init/Manifest
index 66608bf5..d305aefc 100644
--- a/flx/init/Manifest
+++ b/flx/init/Manifest
@@ -2,6 +2,11 @@ AUX 0.1.34-error-struct-stat.diff 240 SHA256 4555439fdbd221a30314a368e16ad53d6bf
 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.34.ebuild 1032 SHA256 9b01307214c97eb13032064136dda4d3966d71c65c5050f9d52d958a082d57b4 WHIRLPOOL 34bc25e6990897a5b7c52ce2612441818e53fa237e7b667dc50a8401b2afbea71eaded751c8379f76d9acfbd201a4b563aaf3b2a9b05fb52839c45ef068ab2bb
-MISC ChangeLog 1045 SHA256 8e51153cc03af2bbc23fde7eadf06d83d536f6d5cd68b95850a98252f8f0d2a6 WHIRLPOOL 4e1ac12553ef2d29c916e3b7bc7e75ccc0d7ecc16b9689b9970a409c877eab927a492bf28ca22c8724f5690762623afa42d0be53c6e08dd2511464c9fa295b79
+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 1028 SHA256 eab7125e17863110390fdc380371eaca76ea1374088fb3ebd928158dea835b87 WHIRLPOOL 604fd59001382b251354c0b7afcec572a9a290ef1eb12264638eff5a495bab2f2c0b692d7c0205fe6897769ba403bd96880ed5fe72c0d82d32f40503c7b96cd1
+EBUILD init-9999.ebuild 993 SHA256 9dd192d55aa20fe35ed550896b08cd70b1cfb41c14c2acc914337b55ee6d3f1c WHIRLPOOL 08dd77f0217a6d43fa8364bb478f119f030660b3d44fa8a05b39eae29fd6f023d3089920c597a8daa0f6803a1dd55b26d66d04b4b83dc0d6c5c5993cd75f3d0b
+MISC ChangeLog 1380 SHA256 1e2eac3a5cf45fdd04f784d5b036182893f6aa1b800d1911ba50080ef75d0963 WHIRLPOOL 6dfff1d64b37d63ff780b838bbee2e29f6d29e354cc15beb8abf5b401f5f6977822ae620b0d1c4a072818e3072d991b9c60efbd918b760f30293f160a0240980
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/flx/init/files/9999-error-struct-stat.diff b/flx/init/files/9999-error-struct-stat.diff
new file mode 100644
index 00000000..9d21b1ae
--- /dev/null
+++ b/flx/init/files/9999-error-struct-stat.diff
@@ -0,0 +1,12 @@
+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/9999-no-no-omit-leaf-frame-pointer.diff b/flx/init/files/9999-no-no-omit-leaf-frame-pointer.diff
new file mode 100644
index 00000000..e7706737
--- /dev/null
+++ b/flx/init/files/9999-no-no-omit-leaf-frame-pointer.diff
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000..d377de8a
--- /dev/null
+++ b/flx/init/files/9999-remove-strip-diet.diff
@@ -0,0 +1,36 @@
+diff --git a/include/rules.make b/include/rules.make
+index 99bff82..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/9999-respect-CFLAGS-LDFLAGS.diff b/flx/init/files/9999-respect-CFLAGS-LDFLAGS.diff
new file mode 100644
index 00000000..8ac81836
--- /dev/null
+++ b/flx/init/files/9999-respect-CFLAGS-LDFLAGS.diff
@@ -0,0 +1,15 @@
+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.34.ebuild b/flx/init/init-0.1.34.ebuild
index 31930652..15646e19 100644
--- a/flx/init/init-0.1.34.ebuild
+++ b/flx/init/init-0.1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,20 +6,19 @@ EAPI=5
 inherit git-2 flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="Formilux Tools"
-HOMEPAGE="http://master.formilux.org/git/dist/src/flxutils.git"
+HOMEPAGE="http://git.formilux.org/?p=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 mips"
+KEYWORDS="amd64 mips x86"
 IUSE="debug static symlink"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_prepare ()
-{
+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"
@@ -27,8 +26,7 @@ src_prepare ()
 	tc-export CC
 }
 
-src_compile ()
-{
+src_compile () {
 	use debug  && append-cflags -DDEBUG -DI_AM_REALLY_DEBUGGING
 	use static && append-ldflags -static
 
@@ -38,8 +36,7 @@ src_compile ()
 	mv init/init init/flx-init
 }
 
-src_install ()
-{
+src_install () {
 	into /
 	dosbin init/flx-init
 	use symlink \
diff --git a/flx/init/init-9999.ebuild b/flx/init/init-9999.ebuild
new file mode 100644
index 00000000..2dfed49b
--- /dev/null
+++ b/flx/init/init-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit git-2 flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="Formilux Tools"
+HOMEPAGE="http://git.formilux.org/?p=dist/src/flxutils.git"
+EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug static symlink"
+
+DEPEND=""
+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"
+
+	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
+}