sys-fs/aufs: Drop old and some cosmetics

svn path=/sunrise/; revision=3474

4 files changed, 7 insertions, 137 deletions

diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
index 23f77f991..5c8c8f94b 100644
--- a/sys-fs/aufs/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Apr 2007; Markus Ullmann <jokey@gentoo.org> -aufs-20070212.ebuild,
+  aufs-20070402.ebuild:
+  Drop old and some cosmetics
+
   14 Apr 2007; Torsten Kockler (conbart) <torsten.kockler@fh-kl.de>
   +aufs-20070402.ebuild, +files/aufs-20070402-ksize.patch,
   +files/aufs-20070402-lhash.patch:
diff --git a/sys-fs/aufs/Manifest b/sys-fs/aufs/Manifest
index 5c2107dab..6a98d986d 100644
--- a/sys-fs/aufs/Manifest
+++ b/sys-fs/aufs/Manifest
@@ -2,9 +2,7 @@ AUX aufs-20070212-ksize.patch 215 RMD160 aface602421301ed1e226194e9f8457f4a9dffd
 AUX aufs-20070212-lhash.patch 1707 RMD160 17589fed81c0602db71e8937279200658e3bbc66 SHA1 f9e3d5eb25df9bf0ace036deaf0c1c75be9f514a SHA256 6a963eb4e5fa08357b6ff3d6c02ed0a04c7b5abffdb1c9d9f0435ed988821965
 AUX aufs-20070402-ksize.patch 215 RMD160 aface602421301ed1e226194e9f8457f4a9dffd5 SHA1 d39db4cb4472b3dce1072d96c4f3198939b26bbe SHA256 0b50c428e0a23d825320c4b7960e3e8ead11fdb274ab92e927e0a86663f0a7a2
 AUX aufs-20070402-lhash.patch 1707 RMD160 17589fed81c0602db71e8937279200658e3bbc66 SHA1 f9e3d5eb25df9bf0ace036deaf0c1c75be9f514a SHA256 6a963eb4e5fa08357b6ff3d6c02ed0a04c7b5abffdb1c9d9f0435ed988821965
-DIST aufs-20070212.tar.bz2 104534 RMD160 3c6fedfba3f2bbc2733c758c413994e62aeccf17 SHA1 e35d678d8c4afeb1096c667dbb4db5a0030e1641 SHA256 dfa512bb1f2aaa415c17e15b205fc94e5895f3b178c905341634090267ac80af
 DIST aufs-20070402.tar.bz2 120097 RMD160 13f3a1cc7a581b1b96255262af01d90c3f601a22 SHA1 496b01279214d0a5836498ea233176e3424a3280 SHA256 c11e7c5835196873a60ac3ccae147ba4941239a0bee23beec8747bc95997eb62
-EBUILD aufs-20070212.ebuild 3313 RMD160 59503ceb514c834aa8f86a5ce55c887f53c748f3 SHA1 b235e47d93a9ddcbf11dd5fb58e77cd0c206a95a SHA256 556ad1a09c52688c014ed83be215e50d9673367bd52f226b3d33d0308e02222e
-EBUILD aufs-20070402.ebuild 4154 RMD160 e844b04e0706a30b5233c5ec844013f2ec375628 SHA1 ea9f83a2489c750b627ea3119b51a4769152bbe4 SHA256 d81ee97366e52b9b184c247c6e6627fa79da996aee10f33e3ccc03a056f832be
-MISC ChangeLog 1251 RMD160 4184caac29a2d228a1620f320113086d3ce69fe9 SHA1 ebc5d1857878ce8d5773b13573120846cf8b4c4f SHA256 3bc344ed54787919e7b464da0a49a1dd399a44f49a01f130748b74c726e75b2e
+EBUILD aufs-20070402.ebuild 4152 RMD160 f098cbb222080ec3685d34a713a26253a03b788b SHA1 b4c4b3e4bec9bb65ab53d13ea8f21c5fcd2d6828 SHA256 c959e5544af864a214b148299451ff944a3dccfbcd604c2e759892fcd1ee42bf
+MISC ChangeLog 1378 RMD160 cf108a1687c7e9bcc6771535cad41b40a683a799 SHA1 02e6831d30bb7edc07435582e601acce7c6783a1 SHA256 7559d0ac8ed9db17d9c8e7c265096843bdeefc8bba72e832e68ab30ab0f5f227
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sys-fs/aufs/aufs-20070212.ebuild b/sys-fs/aufs/aufs-20070212.ebuild
deleted file mode 100644
index 77b1f9447..000000000
--- a/sys-fs/aufs/aufs-20070212.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils linux-mod
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs."
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://www.fh-kl.de/~torsten.kockler/gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ksize nfs"
-
-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
-		eerror "${PN} is being developed and tested on linux-2.6.16 and later."
-		eerror "Make sure you have a proper kernel version!"
-		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
-}
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-
-	# Enable ksize Patch in local.mk
-	if use ksize
-	then
-		sed -i -e 's/^#CONFIG_AUFS_KSIZE_PATCH/CONFIG_AUFS_KSIZE_PATCH/g' local.mk || die "Sed failed!"
-	fi
-
-	# Enable lhash Patch in local.mk
-	if use nfs && kernel_is ge 2 6 19
-	then
-		sed -i -e 's/^#CONFIG_AUFS_LHASH_PATCH/CONFIG_AUFS_LHASH_PATCH/g' local.mk || die "Sed failed!"
-	fi
-
-}
-
-src_install() {
-	exeinto /sbin
-	exeopts -m0500
-	doexe mount.aufs umount.aufs auplink aulchown
-	doman aufs.5
-	linux-mod_src_install
-}
-
-pkg_postinst() {
-	elog "To be able to use aufs, you have to load the kernel module by typing:"
-	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
-}
-
-pkg_prerm() {
-	built_with_use -o =${CATEGORY}/${PF} ksize nfs && DO_CHECK="y"
-}
-
-pkg_postrm() {
-	# Tell the user that his kernel has already been patched
-	if [[ DO_CHECK == "y" ]] ; then
-		check_patch
-		if [[ ${APPLY_KSIZE_PATCH} == "n" ]] || [[ ${APPLY_LHASH_PATCH} == "n" ]] ; then
-			ewarn "Your kernel has been patched previously by this ebuild."
-			ewarn "You can undo the patches by executing the following:"
-			echo
-			ewarn "cd ${KV_DIR}; make mrproper, re-emerge and re-compile your kernel - ${KV_FULL}"
-		fi
-	fi
-
-	linux-mod_pkg_postrm
-}
diff --git a/sys-fs/aufs/aufs-20070402.ebuild b/sys-fs/aufs/aufs-20070402.ebuild
index 43ed222d3..e96a85a79 100644
--- a/sys-fs/aufs/aufs-20070402.ebuild
+++ b/sys-fs/aufs/aufs-20070402.ebuild
@@ -24,7 +24,7 @@ check_patch() {
 	if use ksize
 	then
 		APPLY_KSIZE_PATCH="n"
-		# If ksize patch is not applied 
+		# If ksize patch is not applied
 		if ! grep -qs "EXPORT_SYMBOL(ksize);" "${KV_DIR}/mm/slab.c" ; then
 			APPLY_KSIZE_PATCH="y"
 		fi
@@ -144,7 +144,6 @@ pkg_prerm() {
 	built_with_use -o =${CATEGORY}/${PF} ksize nfs && DO_CHECK="y"
 }
 
-
 pkg_postrm() {
 	# Tell the user that his kernel has already been patched
 	if [[ DO_CHECK == "y" ]] ; then