From d3bfff49c51444eb229edb5a47c77d23d7f65e18 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sun, 17 May 2009 20:25:26 +0000
Subject: [PATCH] add tux3progs

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1215 6952d904-891a-0410-993b-d76249ca496b
---
 sys-fs/tux3progs/Manifest                     |  3 +
 .../files/tux3-dist-packager-1.patch          | 71 +++++++++++++++++++
 sys-fs/tux3progs/files/tux3-gcc44-1.patch     | 19 +++++
 sys-fs/tux3progs/tux3progs-9999.ebuild        | 34 +++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 sys-fs/tux3progs/Manifest
 create mode 100644 sys-fs/tux3progs/files/tux3-dist-packager-1.patch
 create mode 100644 sys-fs/tux3progs/files/tux3-gcc44-1.patch
 create mode 100644 sys-fs/tux3progs/tux3progs-9999.ebuild

diff --git a/sys-fs/tux3progs/Manifest b/sys-fs/tux3progs/Manifest
new file mode 100644
index 00000000..1bc92ac6
--- /dev/null
+++ b/sys-fs/tux3progs/Manifest
@@ -0,0 +1,3 @@
+AUX tux3-dist-packager-1.patch 2136 RMD160 19cdf75b888b2b4f843538742b770d7293576eb2 SHA1 4d4ccbba9aa3fd994472cfa2973f6980714a3060 SHA256 f86d2b17d7769136f212dd2479c1d978967deb88caac848a7da861beccccb8e5
+AUX tux3-gcc44-1.patch 682 RMD160 af7b4650f9dcdafb621cc7ae7195200e5bd540c5 SHA1 55af40c2b27340336d542bc4b36d565695ad3e62 SHA256 db6d43c0b6ddcbaf1792b99b2fed728651c263c8f0f12f20b081e5b37095c23e
+EBUILD tux3progs-9999.ebuild 734 RMD160 bcb53c928fe7ad5f2fbb492116ea9a3b58b42644 SHA1 eafe1312806316efbd96f73d08fa3a52355e63b2 SHA256 8a9c8216c1f2057d8bc54c40d05b92d831151dcb7f1b3905ff76ea3235b47916
diff --git a/sys-fs/tux3progs/files/tux3-dist-packager-1.patch b/sys-fs/tux3progs/files/tux3-dist-packager-1.patch
new file mode 100644
index 00000000..0e3d07b1
--- /dev/null
+++ b/sys-fs/tux3progs/files/tux3-dist-packager-1.patch
@@ -0,0 +1,71 @@
+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-gcc44-1.patch b/sys-fs/tux3progs/files/tux3-gcc44-1.patch
new file mode 100644
index 00000000..190488a1
--- /dev/null
+++ b/sys-fs/tux3progs/files/tux3-gcc44-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2009-05-17
+Initial Package Version: changeset cb5655728089
+Origin: hirofumi
+Upstream Status: accepted
+Description: correct gcc 4.4 compile error
+ 
+diff -Naur tux3.orig/user/buffer.c tux3/user/buffer.c
+--- tux3.orig/user/buffer.c	2009-05-17 20:13:43.440868934 +0000
++++ tux3/user/buffer.c	2009-05-17 19:19:25.410186739 +0000
+@@ -475,7 +475,7 @@
+ 
+ data_allocation_failure:
+ 	warn("Error: %s unable to allocate space for buffer data", strerror(err));
+-	free(buffers);
++	free(prealloc_heads);
+ buffers_allocation_failure:
+ 	warn("Unable to pre-allocate buffers. Using on demand allocation for buffers");
+ 	return err;
diff --git a/sys-fs/tux3progs/tux3progs-9999.ebuild b/sys-fs/tux3progs/tux3progs-9999.ebuild
new file mode 100644
index 00000000..70be605a
--- /dev/null
+++ b/sys-fs/tux3progs/tux3progs-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit flag-o-matic eutils mercurial
+
+DESCRIPTION="Standard tux3 filesystem utilities"
+HOMEPAGE="http://tux3.org/"
+EHG_REPO_URI="http://hg.tux3.org/tux3/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/tux3/user"
+
+src_prepare() {
+	epatch "${FILESDIR}"/tux3-dist-packager-1.patch
+	epatch "${FILESDIR}"/tux3-gcc44-1.patch
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" UCLFAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "build failed"
+}
+
+src_install() {
+	emake DISTDIR="${D}" SBINDIR="/usr/sbin" LIBEXECDIR="/usr/libexec/tux3" install || die "install failed"
+}
\ No newline at end of file