From 72b54e7bde385cf390613bc5ce99acb2b9b02736 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 10 Jan 2014 23:32:16 +0100 Subject: flx/remount: Update HOMEPAGE, add live ebuild Package-Manager: portage-2.2.8 --- flx/remount/ChangeLog | 10 +++- flx/remount/Manifest | 9 +++- flx/remount/files/9999-remove-strip-diet.diff | 61 ++++++++++++++++++++++ flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff | 15 ++++++ flx/remount/files/9999-warning-cast.diff | 23 ++++++++ .../files/9999-warning-implicit-declaration.diff | 11 ++++ flx/remount/remount-0.1.34.ebuild | 13 ++--- flx/remount/remount-9999.ebuild | 33 ++++++++++++ 8 files changed, 164 insertions(+), 11 deletions(-) create mode 100644 flx/remount/files/9999-remove-strip-diet.diff create mode 100644 flx/remount/files/9999-respect-CFLAGS-LDFLAGS.diff create mode 100644 flx/remount/files/9999-warning-cast.diff create mode 100644 flx/remount/files/9999-warning-implicit-declaration.diff create mode 100644 flx/remount/remount-9999.ebuild (limited to 'flx') diff --git a/flx/remount/ChangeLog b/flx/remount/ChangeLog index 297d27b8..77974362 100644 --- a/flx/remount/ChangeLog +++ b/flx/remount/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for flx/remount -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*remount-9999 (10 Jan 2014) + + 10 Jan 2014; Bertrand Jacquin + +files/9999-remove-strip-diet.diff, +files/9999-respect-CFLAGS-LDFLAGS.diff, + +files/9999-warning-cast.diff, +files/9999-warning-implicit-declaration.diff, + +remount-9999.ebuild, remount-0.1.34.ebuild: + flx/remount: Update HOMEPAGE, add live ebuild + 12 Jun 2013; Bertrand Jacquin remount-0.1.34.ebuild: flx/remount: move to EAPI 5 diff --git a/flx/remount/Manifest b/flx/remount/Manifest index 8d1d33aa..9c3bcb2a 100644 --- a/flx/remount/Manifest +++ b/flx/remount/Manifest @@ -2,6 +2,11 @@ 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 -EBUILD remount-0.1.34.ebuild 760 SHA256 0a813c03289eb5bbe2cb8992c4c496fbd7444e49b2ae5109d187b5d39f2d6a78 WHIRLPOOL c0576c56d0e8980b48408ae4e2d5650b5b71ac884fd351f3ec029718064a29fbda4eda42f769283623f5e8f8fd3535482b4cf8cbcbdeed8505af5785287b31d9 -MISC ChangeLog 1207 SHA256 f51db79d1c6c0c799895efa1afe73c459f87b79e6b87bb13f617dcaf3255a031 WHIRLPOOL 9bbbabd4a240bc75b41a32bce7bf18d2f794853835f69c43a6b9eacd41607d4f5557aa0b4b68acc5458b58e9a9bf7fa25a95cc59861c281587daacc92094d076 +AUX 9999-remove-strip-diet.diff 1924 SHA256 b870b2d12347d2ec27bd060d72c997b3abe67fc47b5c27cd597510c69b92ffaa WHIRLPOOL cd6eda3b5770fc3cc585372ada7ce0c0d57ebbcfbc69f72fa0d218cc16cc021438ea11ac444464290308b73dd0c1648ec16fbce5f736c0ea1374304a894e18ea +AUX 9999-respect-CFLAGS-LDFLAGS.diff 475 SHA256 920e0fc923f915a3bb0a59ae401cd4f6f4c7b2aca57786c821e61cec4248873e WHIRLPOOL 90715a0de2e926f729a630178cffcaf1d24f4dd1483d54d8297e14b980203d927a3364f6357048ef8b9b3032af023c219f7371679895c1c218c78b7ead2e88c2 +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 756 SHA256 fcac91491d548b8bfa3a308501dde2e5a33426abd1d8748871b62c8a35acd15b WHIRLPOOL 30c43b6e849fcd853924aed73feca532dafc2694627934f97152822c48e97f31e8f6f064987553251e484d11b7462861f478b92bc4798d170c619639b1dbc6b4 +EBUILD remount-9999.ebuild 726 SHA256 be48d90654e04e8e79f59bd7740ade082a44da7d9c2cdfb4399420a74f89c697 WHIRLPOOL b1fc53296ad8047cb7fa6f5a8106a47fe001114991e6be74b52b7b35f2e1869582f3cbe9a2264af43cad20ea65f1aebaf0841262da50ab0120d54899e23491da +MISC ChangeLog 1544 SHA256 5d1569c444b0ebe16aea8d17f41a14c4414d8a034dddd30fdc7fd92fb1151be4 WHIRLPOOL b87e80aee3c48e6287276f7dda3f9c26fa44e776ec3f88b05231cec22dae782430d040c27c3ebaef615ee94d746e2d9220e562c0023392595407ec321fcf659b MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/flx/remount/files/9999-remove-strip-diet.diff b/flx/remount/files/9999-remove-strip-diet.diff new file mode 100644 index 00000000..414295d0 --- /dev/null +++ b/flx/remount/files/9999-remove-strip-diet.diff @@ -0,0 +1,61 @@ +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/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 new file mode 100644 index 00000000..8ac81836 --- /dev/null +++ b/flx/remount/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/remount/files/9999-warning-cast.diff b/flx/remount/files/9999-warning-cast.diff new file mode 100644 index 00000000..97e86393 --- /dev/null +++ b/flx/remount/files/9999-warning-cast.diff @@ -0,0 +1,23 @@ +diff --git a/remount/remountr.c b/remount/remountr.c +index 2a38f22..13c270d 100644 +--- a/remount/remountr.c ++++ b/remount/remountr.c +@@ -12,15 +12,15 @@ int main (int argc, char **argv) { + char *flag, *mntpnt; + + if (argv[0][strlen(argv[0])-1] == 'w') +- flag = wo_str; ++ flag = (char *)wo_str; + else +- flag = ro_str; ++ flag = (char *)ro_str; + + setreuid(0, 0); + if (argc > 1) + mntpnt = argv[1]; + else +- mntpnt = slash_str; ++ mntpnt = (char *)slash_str; + + return execl(mount_str, mount_str, flag, remount_str, mntpnt, NULL); + } diff --git a/flx/remount/files/9999-warning-implicit-declaration.diff b/flx/remount/files/9999-warning-implicit-declaration.diff new file mode 100644 index 00000000..ac469e99 --- /dev/null +++ b/flx/remount/files/9999-warning-implicit-declaration.diff @@ -0,0 +1,11 @@ +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 ++#include ++#include + + 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 0f461cff..735b1f39 100644 --- a/flx/remount/remount-0.1.34.ebuild +++ b/flx/remount/remount-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,7 +6,7 @@ EAPI=5 inherit git-2 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}" @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -src_prepare () -{ +src_prepare () { epatch "${FILESDIR}/${PV}-remove-strip-diet.diff" epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff" epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff" @@ -25,13 +24,11 @@ src_prepare () tc-export CC } -src_compile () -{ +src_compile () { emake -C remount } -src_install () -{ +src_install () { dobin remount/remountr dobin remount/remountw } diff --git a/flx/remount/remount-9999.ebuild b/flx/remount/remount-9999.ebuild new file mode 100644 index 00000000..783a09f4 --- /dev/null +++ b/flx/remount/remount-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit git-2 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="" + +src_prepare () { + 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 +} + +src_compile () { + emake -C remount +} + +src_install () { + dobin remount/remountr + dobin remount/remountw +} -- cgit v1.2.3