7 files changed, 76 insertions, 25 deletions
diff --git a/sys-fs/unionfs/ChangeLog b/sys-fs/unionfs/ChangeLog
index 305da90cb6bd..dd982f3e6bb2 100644
--- a/sys-fs/unionfs/ChangeLog
+++ b/sys-fs/unionfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/unionfs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.13 2005/05/18 10:53:22 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.14 2005/08/11 08:59:26 genstef Exp $
+
+*unionfs-1.0.13 (11 Aug 2005)
+
+  11 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/unionfs-1.0.12a-amd64.patch,
+  +files/unionfs-1.0.13-delbranch-fix.patch, unionfs-1.0.12a.ebuild,
+  +unionfs-1.0.13.ebuild:
+  Version bump thanks to Hakan Tandogan <hakan@gurkensalat.com> in bug 101324
 
 *unionfs-1.0.12a (18 May 2005)
 
diff --git a/sys-fs/unionfs/Manifest b/sys-fs/unionfs/Manifest
index 363e9c6b7764..80da4800edf7 100644
--- a/sys-fs/unionfs/Manifest
+++ b/sys-fs/unionfs/Manifest
@@ -1,8 +1,10 @@
-MD5 5c607fded98441a11155a69c89f51a87 unionfs-1.0.12a.ebuild 1346
+MD5 38b1d593bfdc5f7a1b3a82981f9bbdfe unionfs-1.0.12a.ebuild 1356
 MD5 376c326368cd6cadf7e6b0ded8e03eb8 unionfs-1.0.11.ebuild 1341
+MD5 d05a7fd11bdeccb7b13c93a2148ee3f4 unionfs-1.0.13.ebuild 1376
 MD5 9969c1663b68965fc428a0ea063f684a ChangeLog 2529
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
-MD5 f9a155123bfab53c81cb6c454492b797 files/unionfs-1.0.12a-amd64.patch 586
 MD5 a437f2bf3da231ea3a2a2835949d3a37 files/digest-unionfs-1.0.12a 67
+MD5 f0868138a13d17e35615d074edc5f5d3 files/unionfs-1.0.13-delbranch-fix.patch 356
 MD5 2410ef6f38ddf9737cbb13bfe0325c9a files/digest-unionfs-1.0.11 66
+MD5 c2f37c6131dd9b96868aa3762fa444be files/digest-unionfs-1.0.13 66
 MD5 f9a155123bfab53c81cb6c454492b797 files/unionfs-1.0.11-amd64.patch 586
diff --git a/sys-fs/unionfs/files/digest-unionfs-1.0.13 b/sys-fs/unionfs/files/digest-unionfs-1.0.13
new file mode 100644
index 000000000000..d7407e115654
--- /dev/null
+++ b/sys-fs/unionfs/files/digest-unionfs-1.0.13
@@ -0,0 +1 @@
+MD5 1dca48ff260dacf890b8040a3cea55b3 unionfs-1.0.13.tar.gz 136808
diff --git a/sys-fs/unionfs/files/unionfs-1.0.12a-amd64.patch b/sys-fs/unionfs/files/unionfs-1.0.12a-amd64.patch
deleted file mode 100644
index ae1564d546ca..000000000000
--- a/sys-fs/unionfs/files/unionfs-1.0.12a-amd64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- unionfs-1.0.11/file.c	2005-03-24 03:25:47.000000000 +0000
-+++ unionfs-1.0.11_malc/file.c	2005-03-26 21:32:16.000000000 +0000
-@@ -22,6 +22,7 @@
- #include "fist.h"
- #include "unionfs.h"
- #include <linux/dcache.h>
-+#include <linux/compat.h>
- 
- /*******************
-  * File Operations *
---- unionfs-1.0.11/locks.c	2005-03-24 03:25:47.000000000 +0000
-+++ unionfs-1.0.11_malc/locks.c	2005-03-26 21:33:10.000000000 +0000
-@@ -22,6 +22,7 @@
- #endif /* HAVE_CONFIG_H */
- #include "fist.h"
- #include "unionfs.h"
-+#include <linux/compat.h>
- 
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
diff --git a/sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch b/sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch
new file mode 100644
index 000000000000..c354a56b8302
--- /dev/null
+++ b/sys-fs/unionfs/files/unionfs-1.0.13-delbranch-fix.patch
@@ -0,0 +1,10 @@
+--- /var/tmp/portage/unionfs-1.0.13/work/unionfs-1.0.13/xattr.c	2005-07-22 19:16:48.000000000 +0200
++++ ../xattr.c	2005-08-04 15:24:16.543918797 +0200
+@@ -133,7 +133,6 @@
+ 				/* Call the ioctl function */
+ 				err =
+ 				    unionfs_ioctl_delbranch(dentry->d_inode,
+-							    NULL,
+ 							    UNIONFS_IOCTL_DELBRANCH,
+ 							    ival);
+ 				goto out;
diff --git a/sys-fs/unionfs/unionfs-1.0.12a.ebuild b/sys-fs/unionfs/unionfs-1.0.12a.ebuild
index d82722deece1..2db473fe81d4 100644
--- a/sys-fs/unionfs/unionfs-1.0.12a.ebuild
+++ b/sys-fs/unionfs/unionfs-1.0.12a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.12a.ebuild,v 1.1 2005/05/18 10:53:22 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.12a.ebuild,v 1.2 2005/08/11 08:59:26 genstef Exp $
 
 inherit eutils linux-mod
 
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	useq amd64 && epatch ${FILESDIR}/${P}-amd64.patch
+	useq amd64 && epatch ${FILESDIR}/unionfs-1.0.11-amd64.patch
 
 	if ! useq debug; then
 		echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile}
diff --git a/sys-fs/unionfs/unionfs-1.0.13.ebuild b/sys-fs/unionfs/unionfs-1.0.13.ebuild
new file mode 100644
index 000000000000..7eeca81e07a7
--- /dev/null
+++ b/sys-fs/unionfs/unionfs-1.0.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.0.13.ebuild,v 1.1 2005/08/11 08:59:26 genstef Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="Stackable unification file system, which can appear to merge the contents of several directories"
+HOMEPAGE="http://www.fsl.cs.sunysb.edu/project-unionfs.html"
+SRC_URI="ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="acl debug"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="unionfs(fs:)"
+	BUILD_TARGETS="all"
+	BUILD_PARAMS="LINUXSRC=${KV_DIR} KERNELVERSION=${KV_MAJOR}.${KV_MINOR}"
+}
+
+src_unpack() {
+	local user_Makefile=fistdev.mk EXTRACFLAGS=""
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-delbranch-fix.patch
+
+	use amd64 && epatch ${FILESDIR}/unionfs-1.0.11-amd64.patch
+
+	if ! use debug; then
+		echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile}
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_NDEBUG"
+	fi
+
+	use acl && EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR" # -DFIST_SETXATTR_CONSTVOID"
+
+	echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile}
+}
+
+src_install() {
+	dosbin unionctl uniondbg unionimap snapmerge
+	doman man/unionfs.4 man/unionctl.8 man/uniondbg.8 man/unionimap.8
+
+	linux-mod_src_install
+
+	dodoc INSTALL NEWS README ChangeLog patch-kernel.sh
+}
+