sys-fs/aufs: Drop ksize and lhash patch

svn path=/sunrise/; revision=5263

3 files changed, 6 insertions, 62 deletions

diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
index 704f36dc5..a42f97cef 100644
--- a/sys-fs/aufs/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Dec 2007; (Tommy[D]) tommy100@gmx.de aufs-20071125.ebuild:
+  Drop ksize and lhash patch
+
   26 Nov 2007; (Tommy[D]) tommy100@gmx.de -files/aufs-20070212-ksize.patch,
   -files/aufs-20070212-lhash.patch, -files/aufs-20070402-ksize.patch,
   -files/aufs-20070402-lhash.patch, +aufs-20070402.ebuild:
diff --git a/sys-fs/aufs/Manifest b/sys-fs/aufs/Manifest
index ac835dbb1..82397d56b 100644
--- a/sys-fs/aufs/Manifest
+++ b/sys-fs/aufs/Manifest
@@ -3,6 +3,6 @@ AUX aufs-20070402-lhash.patch 1707 RMD160 17589fed81c0602db71e8937279200658e3bbc
 DIST aufs-20070402.tar.bz2 120097 RMD160 13f3a1cc7a581b1b96255262af01d90c3f601a22 SHA1 496b01279214d0a5836498ea233176e3424a3280 SHA256 c11e7c5835196873a60ac3ccae147ba4941239a0bee23beec8747bc95997eb62
 DIST aufs-20071125.tar.bz2 174584 RMD160 bac7b997a13979d1ada38654bdafe2084335c3aa SHA1 749d51a15703fc60bb913b435eec850eb060bc30 SHA256 f3422fd5861d1f6027f2cffaa36707b3bb22ec7c3484f10e833e51a5e11a56ce
 EBUILD aufs-20070402.ebuild 4164 RMD160 363ba107e92d07a02bf76a412c64d5846231c1bb SHA1 923e37e45f6f9182bb615d96d42734b0f496e5b5 SHA256 0c9869ef548e954824d80ec1c790c3c0448d2b7df2cc507ac02fe19898f8fac1
-EBUILD aufs-20071125.ebuild 4161 RMD160 16baddabd05ff60fd06919aeb41e63231b00e879 SHA1 7b32cd87e6313ecbbc12059ab9d454f5d46b252f SHA256 1bd27dd15c2b636c86c1b34708e64b46b7d4487fe3975f7af41f1ab053f38220
-MISC ChangeLog 1852 RMD160 5a50e846a99c2895154973f261212215e2aef1d3 SHA1 7da657c14969455547eb8e86cc1de094f656d23f SHA256 71663599aa9814cc1925656c322254efa5fb20bf4fe2b599fa9ba31f38e1e398
+EBUILD aufs-20071125.ebuild 2500 RMD160 d74f0370d4e3b8aeb993832d718a33151d1edcab SHA1 428946954a7bfcc8023e01a624807a5009c88287 SHA256 c2b7f63ac14cb3cf3184ff300c317ce61ebcf9014cdb7735ae30411e854593ea
+MISC ChangeLog 1946 RMD160 d4729dddc53a2b502b4918ab62ca1473848f0b93 SHA1 b00525edf7919a465ccae6ba87fb5b9a59d9bc92 SHA256 5987a8ccef68067029d4842becb0dd215fff7ee65c1631a9da90b1a3a4789673
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sys-fs/aufs/aufs-20071125.ebuild b/sys-fs/aufs/aufs-20071125.ebuild
index 140eb79d3..82b984523 100644
--- a/sys-fs/aufs/aufs-20071125.ebuild
+++ b/sys-fs/aufs/aufs-20071125.ebuild
@@ -11,36 +11,12 @@ SRC_URI="http://dev.gentooexperimental.org/~tommy/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="hinotify ksize nfs nfsexport"
+IUSE="hinotify nfsexport"
 
 MODULE_NAMES="aufs(addon/fs/${PN}:)"
 BUILD_PARAMS="KDIR=${KV_DIR} -f local.mk"
 BUILD_TARGETS="all"
 
-check_patch() {
-	get_version
-
-	# Check if ksize Patch has to be applied
-	if use ksize ; then
-		APPLY_KSIZE_PATCH="n"
-		# If ksize patch is not applied
-		if ! grep -qs "EXPORT_SYMBOL(ksize);" "${KV_DIR}/mm/slab.c" ; then
-			APPLY_KSIZE_PATCH="y"
-		fi
-	fi
-
-	# Check if lhash Patch has to be applied
-	if use nfs && kernel_is ge 2 6 19 ; then
-		APPLY_LHASH_PATCH="n"
-		# If lhash patch is not applied
-		if ! grep -qs "EXPORT_SYMBOL(__lookup_hash);" "${KV_DIR}/fs/namei.c" \
-		&& ! grep -qs "struct dentry * __lookup_hash(struct qstr *name, struct dentry
-		* base, struct nameidata *nd);" "${KV_DIR}/fs/namei.h" ; then
-			APPLY_LHASH_PATCH="y"
-		fi
-	fi
-}
-
 pkg_setup() {
 	# kernel version check
 	if kernel_is lt 2 6 16 ; then
@@ -49,24 +25,6 @@ pkg_setup() {
 		die "Wrong kernel version"
 	fi
 
-	check_patch
-
-	# If a patch has to be applied
-	if [[ ${APPLY_KSIZE_PATCH} == "y" ]] || [[ ${APPLY_LHASH_PATCH} == "y" ]] ; then
-		ewarn "Patching your kernel..."
-		cd ${KV_DIR}
-	fi
-
-	# If the ksize patch has to be applied
-	if [[ ${APPLY_KSIZE_PATCH} == "y" ]] ; then
-		epatch "${FILESDIR}"/${P}-ksize.patch
-	fi
-
-	# If the lhash patch has to be applied
-	if [[ ${APPLY_LHASH_PATCH} == "y" ]] ; then
-		epatch "${FILESDIR}"/${P}-lhash.patch
-	fi
-
 	linux-mod_pkg_setup
 }
 
@@ -74,16 +32,6 @@ src_unpack(){
 	unpack ${A}
 	cd "${S}"
 
-	# Enable ksize Patch in priv_def.mk
-	if use ksize ; then
-		echo "CONFIG_AUFS_KSIZE_PATCH = y" >> priv_def.mk || die "setting ksize in priv_def.mk failed!"
-	fi
-
-	# Enable lhash Patch in priv_def.mk
-	if use nfs && kernel_is ge 2 6 19 ; then
-		echo "CONFIG_AUFS_LHASH_PATCH = y" >> priv_def.mk || die "setting lhash in priv_def.mk failed!"
-	fi
-
 	# Enable hinotify in priv_def.mk
 	if use hinotify && kernel_is ge 2 6 18 ; then
 		echo "CONFIG_AUFS_HINOTIFY = y" >> priv_def.mk || die "setting hinotify in priv_def.mk failed!"
@@ -120,13 +68,6 @@ pkg_postinst() {
 	elog "modprobe aufs"
 	elog "For further information refer to the aufs man page"
 
-	# Tell the user to recompile his kernel
-	if [[ ${APPLY_KSIZE_PATCH} == "y" ]] || [[ ${APPLY_LHASH_PATCH} == "y" ]] ; then
-		echo
-		ewarn "Remember to re-compile your kernel to make the patch(es) work"
-		ewarn
-	fi
-
 	linux-mod_pkg_postinst
 }