From 88807f981d81cab78fb998617a537b1d0cca05f3 Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 18 May 2009 16:58:28 +0000 Subject: [PATCH] sys-fs/tux3progs: delete old patches git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1230 6952d904-891a-0410-993b-d76249ca496b --- sys-fs/tux3progs/ChangeLog | 4 + sys-fs/tux3progs/Manifest | 4 +- .../files/tux3-dist-packager-1.patch | 71 --------------- .../files/tux3-dist-packager-2.patch | 87 ------------------- 4 files changed, 5 insertions(+), 161 deletions(-) delete mode 100644 sys-fs/tux3progs/files/tux3-dist-packager-1.patch delete mode 100644 sys-fs/tux3progs/files/tux3-dist-packager-2.patch diff --git a/sys-fs/tux3progs/ChangeLog b/sys-fs/tux3progs/ChangeLog index 739da2b3..0ad0d829 100644 --- a/sys-fs/tux3progs/ChangeLog +++ b/sys-fs/tux3progs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 18 May 2009; Mario Fetka + -files/tux3-dist-packager-1.patch, -files/tux3-dist-packager-2.patch: + delete old patches + 18 May 2009; Mario Fetka files/tux3-dist-packager-3.patch: makefile patch correction diff --git a/sys-fs/tux3progs/Manifest b/sys-fs/tux3progs/Manifest index 907ec4d9..e6d61a40 100644 --- a/sys-fs/tux3progs/Manifest +++ b/sys-fs/tux3progs/Manifest @@ -1,7 +1,5 @@ -AUX tux3-dist-packager-1.patch 2136 RMD160 19cdf75b888b2b4f843538742b770d7293576eb2 SHA1 4d4ccbba9aa3fd994472cfa2973f6980714a3060 SHA256 f86d2b17d7769136f212dd2479c1d978967deb88caac848a7da861beccccb8e5 -AUX tux3-dist-packager-2.patch 2643 RMD160 02a7f5c6ebfa06c904e657cd5f548895825526f4 SHA1 efc06bbf4558f47ced7fc0a54df1aa7ac5b9a3a3 SHA256 fdefb843be5f16836143cf49f3e6a5bf6e4e39d1d09b917fad256b67a645846a AUX tux3-dist-packager-3.patch 2737 RMD160 26857ae4c26666b08287783c361aa32d2b002afa SHA1 7221cd22d6bab6d39977a4f8714c837582fdab47 SHA256 c1ddb7445ac1ad595765f0565c8c3ce3e83ab241c61d4c6d97e9bf91741179f2 AUX tux3-gcc44-1.patch 2569 RMD160 98b8df81f5a9809eefb04fad5d29aca000159d56 SHA1 a9d1d38af5bd1516426de2f3c6a902930851bcae SHA256 057783f2b3224f6307c4239d40654d9abe34986dd5527f282da9fdad61cd791c EBUILD tux3progs-9999.ebuild 944 RMD160 108b293640c63e60ff88985f32ef98030e78084a SHA1 621e132a4d96ed9f94a91e6c9b88c7073c122251 SHA256 8c6b87187a3b8961de0cb9c77ee95b5e63d34c8518ecd147abfe307a772d3714 -MISC ChangeLog 1295 RMD160 ed93c0a182a11a49f13e6181e76eadf5d3f8a07c SHA1 1bf7425e08186f575b241cf31ac1a094e348c60a SHA256 361e9c4b33e49c066f726a2c1de93cc13dfb3658b42fd9d2067c2f3672da0125 +MISC ChangeLog 1440 RMD160 45603d2295ea16e65ba8ecb20495ced185d830af SHA1 4314332f9bc56f19ede93735912cbbef05c50242 SHA256 7feb176e0eda207d6266c7d28c9f2d2aa253273ff8c7a79bbc1ea9ad7eaaff28 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/sys-fs/tux3progs/files/tux3-dist-packager-1.patch b/sys-fs/tux3progs/files/tux3-dist-packager-1.patch deleted file mode 100644 index 0e3d07b1..00000000 --- a/sys-fs/tux3progs/files/tux3-dist-packager-1.patch +++ /dev/null @@ -1,71 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2009-05-17 -Initial Package Version: changeset cb5655728089 -Origin: me -Upstream Status: unknown -Description: add an install target to the makefile - -diff -Naur tux3.orig/user/Makefile tux3/user/Makefile ---- tux3.orig/user/Makefile 2009-05-17 20:08:53.677661329 +0000 -+++ tux3/user/Makefile 2009-05-17 20:07:07.466473583 +0000 -@@ -11,20 +11,29 @@ - CFLAGS += -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers - CFLAGS += $(UCFLAGS) - -+LDFLAGS = -+ - CHECKER = sparse - CHECKFLAGS = -D__CHECKER__ -D__CHECK_ENDIAN__ -Wbitwise -Wno-transparent-union - CHECKFLAGS += -Wno-decl -Wno-declaration-after-statement - - VG=valgrind --error-exitcode=200 --leak-check=full -+INSTALL = install - - TESTDIR = . -+OWNER = root -+GROUP = root -+ -+DISTDIR = -+SBINDIR = /usr/local/sbin -+LIBEXECDIR = /usr/local/libexec/tux3 - - testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit - tux3bin = tux3 tux3graph --binaries = $(testbin) $(tux3bin) tux3fuse -+binaries = $(testbin) $(tux3bin) - - ifeq ($(shell pkg-config fuse && echo found), found) -- binaries += tux3fuse -+ tux3bin += tux3fuse - endif - - tuxdeps = Makefile trace.h kernel/trace.h -@@ -94,7 +103,7 @@ - endif - - $(testbin) $(tux3bin): -- $(CC) $(CFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) - - test_buffer: buffer - $(VG) ./buffer -@@ -130,7 +139,7 @@ - $(VG) ./commit foodev - - tux3fuse: utility.o tux3fuse.o -- $(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse -+ $(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse $(LDFLAGS) - ifeq ($(CHECK),1) - $(CHECKER) $(CFLAGS) $(CHECKFLAGS) $$(pkg-config --cflags fuse) tux3fuse.c - endif -@@ -160,3 +169,10 @@ - - distclean: clean - rm -f *.orig kernel/*.orig -+ -+install: all -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(SBINDIR) -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(LIBEXECDIR) -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(tux3bin) $(DISTDIR)$(SBINDIR) -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(testbin) $(DISTDIR)$(LIBEXECDIR) -+ diff --git a/sys-fs/tux3progs/files/tux3-dist-packager-2.patch b/sys-fs/tux3progs/files/tux3-dist-packager-2.patch deleted file mode 100644 index a474a657..00000000 --- a/sys-fs/tux3progs/files/tux3-dist-packager-2.patch +++ /dev/null @@ -1,87 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2009-05-18 -Initial Package Version: changeset cb5655728089 -Origin: me -Upstream Status: unknown -Description: add new targets bin: testbin: install: install-bin: install-test: and add LDFLAGS - -diff -Naur tux3.orig/user/Makefile tux3/user/Makefile ---- tux3.orig/user/Makefile 2009-05-17 20:13:43.438558904 +0000 -+++ tux3/user/Makefile 2009-05-18 05:06:31.057509039 +0000 -@@ -11,20 +11,30 @@ - CFLAGS += -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers - CFLAGS += $(UCFLAGS) - -+LDFLAGS = -+ - CHECKER = sparse - CHECKFLAGS = -D__CHECKER__ -D__CHECK_ENDIAN__ -Wbitwise -Wno-transparent-union - CHECKFLAGS += -Wno-decl -Wno-declaration-after-statement - - VG=valgrind --error-exitcode=200 --leak-check=full -+INSTALL = install - - TESTDIR = . -+OWNER = root -+GROUP = root -+ -+DISTDIR = -+PREFIX=/usr/local -+SBINDIR = $(PREFIX)/sbin -+LIBEXECDIR = $(PREFIX)/libexec/tux3 - - testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit - tux3bin = tux3 tux3graph --binaries = $(testbin) $(tux3bin) tux3fuse -+binaries = $(testbin) $(tux3bin) - - ifeq ($(shell pkg-config fuse && echo found), found) -- binaries += tux3fuse -+ tux3bin += tux3fuse - endif - - tuxdeps = Makefile trace.h kernel/trace.h -@@ -53,6 +63,9 @@ - tests: test_buffer test_balloc test_commit test_dleaf test_ileaf \ - test_btree test_dir test_iattr test_xattr test_filemap test_inode - -+bin: $(tux3bin) -+testbin: $(testbin) -+ - # standalone and library - buffer.o: $(tuxdeps) $(bufferdeps) - diskio.o: $(tuxdeps) $(diskiodeps) -@@ -93,8 +106,8 @@ - $(CHECKER) $(CFLAGS) -Dbuild_$(<:.c=) $(CHECKFLAGS) -c $< - endif - --$(testbin) $(tux3bin): -- $(CC) $(CFLAGS) $^ -o $@ -+$(testbin) tux3 tux3grath: -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ - - test_buffer: buffer - $(VG) ./buffer -@@ -130,7 +143,7 @@ - $(VG) ./commit foodev - - tux3fuse: utility.o tux3fuse.o -- $(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse -+ $(CC) $(CFLAGS) $(LDFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse - ifeq ($(CHECK),1) - $(CHECKER) $(CFLAGS) $(CHECKFLAGS) $$(pkg-config --cflags fuse) tux3fuse.c - endif -@@ -160,3 +173,13 @@ - - distclean: clean - rm -f *.orig kernel/*.orig -+ -+install: install-bin install-test -+ -+install-bin: -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(SBINDIR) -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(tux3bin) $(DISTDIR)$(SBINDIR) -+ -+install-test: install-bin -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(LIBEXECDIR) -+ $(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(testbin) $(DISTDIR)$(LIBEXECDIR)