make option -DUNIONFS_UNSUPPORTED for kernel>=2.6.16 (bug #129744)

Package-Manager: portage-2.1_pre7-r5

4 files changed, 74 insertions, 4 deletions

diff --git a/sys-fs/unionfs/ChangeLog b/sys-fs/unionfs/ChangeLog
index 26daa503dc53..6f5a1c8d1205 100644
--- a/sys-fs/unionfs/ChangeLog
+++ b/sys-fs/unionfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/unionfs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.21 2006/04/13 08:27:53 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/ChangeLog,v 1.22 2006/04/27 14:01:35 satya Exp $
+
+*unionfs-1.1.4-r2 (27 Apr 2006)
+
+  27 Apr 2006; Christian Andreetta <satya@gentoo.org>
+  +unionfs-1.1.4-r2.ebuild:
+  make option -DUNIONFS_UNSUPPORTED for kernel>=2.6.16 (bug #129744)
 
 *unionfs-1.1.4-r1 (13 Apr 2006)
 
diff --git a/sys-fs/unionfs/Manifest b/sys-fs/unionfs/Manifest
index d973e71d5a08..83758d5aa125 100644
--- a/sys-fs/unionfs/Manifest
+++ b/sys-fs/unionfs/Manifest
@@ -1,6 +1,6 @@
-MD5 a66114ab5365d4722b198a3cdd0e7db3 ChangeLog 4583
-RMD160 aa83629dd3dab34c9ec295523a62e00a1bb9b792 ChangeLog 4583
-SHA256 8adf7f4e52a7eb365c5bff25685d809ee0bd8daeacfdd49a5d4743148be1b3fe ChangeLog 4583
+MD5 16e4d9bc568f56af222d6e5a8033f66c ChangeLog 4768
+RMD160 edd060da9a5b97bfcefbff31bd20ffc04f91dc44 ChangeLog 4768
+SHA256 2415876b705b83e945712b1a7bfce662c6dc883b0746489d3f7f8edc529401f9 ChangeLog 4768
 MD5 a8d7fc6d22b85ab4bf8a36a7a1462ca7 files/digest-unionfs-1.0.14 66
 RMD160 a36bfb55d7d93874f483a6664a7284e7792c5ca1 files/digest-unionfs-1.0.14 66
 SHA256 0b16689d9c44105e47f90d13802c59a55c29b3558085271ca557482f12224153 files/digest-unionfs-1.0.14 66
@@ -19,6 +19,9 @@ SHA256 7b94072dad16fbc0ca2e20cc43db1263654361a5b62d1fc5922992bf44529f12 files/di
 MD5 64f7fb1086d25c1e69c7e4b7e1d673f4 files/digest-unionfs-1.1.4-r1 241
 RMD160 77df086202a359b571b9359fd2f711cda52cfa4c files/digest-unionfs-1.1.4-r1 241
 SHA256 7b94072dad16fbc0ca2e20cc43db1263654361a5b62d1fc5922992bf44529f12 files/digest-unionfs-1.1.4-r1 241
+MD5 64f7fb1086d25c1e69c7e4b7e1d673f4 files/digest-unionfs-1.1.4-r2 241
+RMD160 77df086202a359b571b9359fd2f711cda52cfa4c files/digest-unionfs-1.1.4-r2 241
+SHA256 7b94072dad16fbc0ca2e20cc43db1263654361a5b62d1fc5922992bf44529f12 files/digest-unionfs-1.1.4-r2 241
 MD5 733bc242378499ba766283fa6441f5cb files/unionfs-1.0.13-amd64.patch 685
 RMD160 33a1b89f870138018ccd7a03d75b3d9a12abeda0 files/unionfs-1.0.13-amd64.patch 685
 SHA256 3dbfb59db79dc6f759acab6cfc7d23f13b6c2240676fcb1d7e27657f37b9e256 files/unionfs-1.0.13-amd64.patch 685
@@ -46,6 +49,9 @@ SHA256 6f84f0e1012f2086a50ff4144a737ab7bc906279a25bef1960e1170959ce1a2a unionfs-
 MD5 3f30c0ebc71e00704ac42ed09fbb6579 unionfs-1.1.4-r1.ebuild 1413
 RMD160 8a524cfabcc8dbae66da3c29350dbae08421181a unionfs-1.1.4-r1.ebuild 1413
 SHA256 41350d8e185b27ad2e67d353265c5189d2adf5a4bb57a1cc511f36af0979a319 unionfs-1.1.4-r1.ebuild 1413
+MD5 2cc1b1783060fdef482e81a59d8390e7 unionfs-1.1.4-r2.ebuild 1575
+RMD160 f573e0cac12b99859c93324819fe131aaff7e794 unionfs-1.1.4-r2.ebuild 1575
+SHA256 f6c8d2b3529997dc81d23968505ef40c811c8fcba1989ca615ddd97f949863fb unionfs-1.1.4-r2.ebuild 1575
 MD5 daabd424702baf3d45aaf0705baabadd unionfs-1.1.4.ebuild 1354
 RMD160 eea34a71a08931e28aaf7d2de0e2c77c05e35e5a unionfs-1.1.4.ebuild 1354
 SHA256 6bfd2a74adf6eba06499d51d51a0f78d6fd11a7aa9b867d24d10a6f303028f3a unionfs-1.1.4.ebuild 1354
diff --git a/sys-fs/unionfs/files/digest-unionfs-1.1.4-r2 b/sys-fs/unionfs/files/digest-unionfs-1.1.4-r2
new file mode 100644
index 000000000000..52a7af20ae76
--- /dev/null
+++ b/sys-fs/unionfs/files/digest-unionfs-1.1.4-r2
@@ -0,0 +1,3 @@
+MD5 4b0a5393f6a41a24555c2cd30a689b2c unionfs-1.1.4.tar.gz 152081
+RMD160 cb1e94ee12839fed619c33253c1b24d0da5c7fbb unionfs-1.1.4.tar.gz 152081
+SHA256 bd6111ff6757cf53860f09ddbce7a87dd7f495541e4e1aada4576970687e0af9 unionfs-1.1.4.tar.gz 152081
diff --git a/sys-fs/unionfs/unionfs-1.1.4-r2.ebuild b/sys-fs/unionfs/unionfs-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..ddf8dec80539
--- /dev/null
+++ b/sys-fs/unionfs/unionfs-1.1.4-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs/unionfs-1.1.4-r2.ebuild,v 1.1 2006/04/27 14:01:35 satya 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 nfs"
+
+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}/unionfs-1.1.3-15-kernel_mutex.patch
+
+	if ! use debug; then
+		echo "UNIONFS_DEBUG_CFLAG=" >> ${user_Makefile}
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_NDEBUG"
+	fi
+
+	if use acl; then
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_XATTR" # -DFIST_SETXATTR_CONSTVOID"
+	elif use nfs; then
+		EXTRACFLAGS="${EXTRACFLAGS} -DNFS_SECURITY_HOLE"
+	fi
+
+	[[ ${KV_MAJOR} -ge 2 && ${KV_MINOR} -ge 6 && ${KV_PATCH} -ge 16 ]] && \
+		EXTRACFLAGS="${EXTRACFLAGS} -DUNIONFS_UNSUPPORTED"
+
+	echo "EXTRACFLAGS=${EXTRACFLAGS}" >> ${user_Makefile}
+	einfo EXTRACFLAGS: ${EXTRACFLAGS}
+}
+
+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
+}
+