Bump aufs, aufs-util. Fix martian for grsecurity breakage

19 files changed, 310 insertions, 29 deletions

diff --git a/net-dialup/martian/ChangeLog b/net-dialup/martian/ChangeLog
index 76e7b117..38d32d3e 100644
--- a/net-dialup/martian/ChangeLog
+++ b/net-dialup/martian/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  26 Aug 2011; Martin Väth <martin@mvath.de>
+  Force sublevel to fix broken version number test for >=linux-3.0
+  Fix breakage of grsecurity
+
   03 Jan 2011; Martin Väth <martin@mvath.de>
   Bump to EAPI=4.
 
diff --git a/net-dialup/martian/Manifest b/net-dialup/martian/Manifest
index 916bb7f0..0c5189ea 100644
--- a/net-dialup/martian/Manifest
+++ b/net-dialup/martian/Manifest
@@ -1,4 +1,5 @@
+AUX grsecurity.patch 239 RMD160 161fdb67c7d50e8670802617e8a608b8661f3fa1 SHA1 1af0afabd9dcb0dbe6e577fcc2de2e3ecb7244a8 SHA256 bdee550ba3bb0782532fa0a8cf079f62c735dd1ee4f5c29f7995152dc3aa2a54
 DIST martian-full-20080625.tar.gz 274510 RMD160 8110832e140d21e58ee5a6149f8143f8bf063821 SHA1 bc3bae2fe5a7519e37645be787ec45b313044150 SHA256 66761d2735bc59252e26535f08f9c7f4fa9bc5475d799fa06fc1781ab115cd91
-EBUILD martian-20080625.ebuild 1638 RMD160 826fb68665e41c3221ab4dc5b6464c830d352a95 SHA1 7bd8c85014294e2b88b9950423fb6e90fcfdc6da SHA256 61f5ed67f3d1e6e9f73b8f9694932be346b4b443236e09aa9f519576203746e0
-MISC ChangeLog 362 RMD160 4fef4801bc6058a216329c4fc41502d86a996e42 SHA1 5af4d108f2f1b6f2564ab599753d20ef26e9a473 SHA256 3a5836601d949a38ef76422a250126662f1e4691b9d157d65053ba9410b31585
+EBUILD martian-20080625.ebuild 1687 RMD160 10c9d78759876f6d11a4e4e4af75639fa097e0cc SHA1 1aea54cceeab1a5227274c07b32b96866dfabdae SHA256 f7d97c2f2262151be483780bc44f9ddafeaaf92467f5ef19815fe1d918f0b921
+MISC ChangeLog 523 RMD160 7a4aafeb9cd2facb67f207083396cd70463e34bf SHA1 5fa090132559e6bf70589d352205f7a4513d950d SHA256 69c0ba53b26ac5a24aeb465d5c2c56a5a2e5ce6c5534e6e20050cc39c054262b
 MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d
diff --git a/net-dialup/martian/files/grsecurity.patch b/net-dialup/martian/files/grsecurity.patch
new file mode 100644
index 00000000..332680d9
--- /dev/null
+++ b/net-dialup/martian/files/grsecurity.patch
@@ -0,0 +1,15 @@
+--- kmodule/mfifo.h
++++ kmodule/mfifo.h
+@@ -20,7 +20,11 @@
+ 
+ 	void (*wrap) (mfifo_t *fifo, int *ending);
+ 	int  (*space) (mfifo_t *fifo);
+-};
++}
++#ifdef __no_const
++__no_const
++#endif
++;
+ 
+ struct _mfifo {
+ 	/* struct circ_buf header; */
diff --git a/net-dialup/martian/martian-20080625.ebuild b/net-dialup/martian/martian-20080625.ebuild
index d660c238..9621cfe7 100644
--- a/net-dialup/martian/martian-20080625.ebuild
+++ b/net-dialup/martian/martian-20080625.ebuild
@@ -34,7 +34,11 @@ pkg_setup() {
 	fi
 
 	BUILD_TARGETS="all"
-	BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='${KV_PATCH}'"
+	BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='21'"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/grsecurity.patch"
 }
 
 src_install() {
diff --git a/sys-fs/aufs2-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
index 50ed8a1c..c57041d5 100644
--- a/sys-fs/aufs2-util/ChangeLog
+++ b/sys-fs/aufs-util/ChangeLog
@@ -1,7 +1,11 @@
-# ChangeLog for sys-fs/aufs2
+# ChangeLog for sys-fs/aufs-util
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  26 Aug 2011; Martin Väth <martin@mvath.de>
+  Rename aufs2-util-99999999->aufs-util-99999999.2
+  Add aufs-util-99999999.3 for linux3.0/aufs3
+
   20 Jun 2011; Martin Väth <martin@mvath.de>
   Improve/fix git handling
 
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
new file mode 100644
index 00000000..85addb64
--- /dev/null
+++ b/sys-fs/aufs-util/Manifest
@@ -0,0 +1,4 @@
+EBUILD aufs-util-99999999.2.ebuild 1216 RMD160 b51c925fe250ac1771e43d652655a0bc7891db84 SHA1 431c8107f7d84fba4185e855742941179900271c SHA256 337e87fb6ae0c64469604512a3b013ee101a7107ca3d7baee26bd604f43b74f5
+EBUILD aufs-util-99999999.3.ebuild 1221 RMD160 a37125af21ddffa2e5fb6798df2b0ae4c4bc3d71 SHA1 1bed1d79f438ef67875160939bc6efb677a5a27b SHA256 26345da99806541c6bee9aa21634ed6444838d77b75eada8f8bad184585875d8
+MISC ChangeLog 563 RMD160 759ebe799d6170d794dba47b8c5a8c061f34146b SHA1 d893a430911d9cdb6f354d94a167b921b1236c5f SHA256 b661078547b0dc8956dc38c7fc9b9f8124ce81504f723d013c17a8b0fab54af9
+MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d
diff --git a/sys-fs/aufs2-util/aufs2-util-99999999.ebuild b/sys-fs/aufs-util/aufs-util-99999999.2.ebuild
index 2751c422..4ff4aae7 100644
--- a/sys-fs/aufs2-util/aufs2-util-99999999.ebuild
+++ b/sys-fs/aufs-util/aufs-util-99999999.2.ebuild
@@ -11,7 +11,7 @@ EGIT_COMMIT="${EGIT_BRANCH}"
 EGIT_HAS_SUBMODULES=true
 inherit git linux-info multilib
 
-DESCRIPTION="Userspace tools for aufs2"
+DESCRIPTION="Userspace tools for aufs"
 HOMEPAGE="http://aufs.sourceforge.net/"
 
 LICENSE="GPL-2"
@@ -30,8 +30,8 @@ src_prepare() {
 	ln -s "${KERNEL_DIR}"/include local_kernel
 	set -- local_kernel/linux/aufs*.h
 	test -e "${1}" || {
-		eerror "It seems you do not have installed aufs2 into your kernel tree."
-		die "You might need to emerge =sys-fs/aufs2-99999999::mv"
+		eerror "It seems you do not have installed aufs into your kernel tree."
+		die "You might need to emerge >=sys-fs/aufs-99999999::mv"
 	}
 	l="s|/usr/lib|$(get_libdir)|"
 	sed -i -e "1iCFLAGS += -I./local_kernel" -e "${l}" Makefile || \
diff --git a/sys-fs/aufs-util/aufs-util-99999999.3.ebuild b/sys-fs/aufs-util/aufs-util-99999999.3.ebuild
new file mode 100644
index 00000000..bddc41c5
--- /dev/null
+++ b/sys-fs/aufs-util/aufs-util-99999999.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="4"
+EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git"
+EGIT_PROJECT="aufs-util"
+EGIT_BRANCH="aufs3.0"
+EGIT_COMMIT="${EGIT_BRANCH}"
+[ -n "${EGIT_OFFLINE:-${ESCM_OFFLINE}}" ] || EGIT_PRUNE=true
+EGIT_HAS_SUBMODULES=true
+inherit git linux-info multilib
+
+DESCRIPTION="Userspace tools for aufs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Since this is a live ebuild, we require ACCEPT_KEYWORDS='**'
+#KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
+IUSE=""
+PROPERTIES="live"
+
+RDEPEND=""
+DEPEND="dev-vcs/git[curl]"
+
+src_prepare() {
+	local i l
+	ln -s "${KERNEL_DIR}"/include local_kernel
+	set -- local_kernel/linux/aufs*.h
+	test -e "${1}" || {
+		eerror "It seems you do not have installed aufs into your kernel tree."
+		die "You might need to emerge >=sys-fs/aufs-99999999::mv"
+	}
+	l="s|/usr/lib|$(get_libdir)|"
+	sed -i -e "1iCFLAGS += -I./local_kernel" -e "${l}" Makefile || \
+		die "Patching Makefile failed"
+	for i in lib*/Makefile
+	do	test -e "${i}" || continue
+		sed -i -e "1iCFLAGS += -I../local_kernel" -e "${l}" "${i}" || \
+			die "Patching ${i} failed"
+	done
+}
diff --git a/sys-fs/aufs2-util/metadata.xml b/sys-fs/aufs-util/metadata.xml
index 0c91bdcd..0c91bdcd 100644
--- a/sys-fs/aufs2-util/metadata.xml
+++ b/sys-fs/aufs-util/metadata.xml
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs/ChangeLog
index 6ea8da39..e121423e 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs/ChangeLog
@@ -1,7 +1,12 @@
-# ChangeLog for sys-fs/aufs2
+# ChangeLog for sys-fs/aufs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  26 Aug 2011; Martin Väth <martin@mvath.de>
+  Rename aufs2-99999999->aufs-99999999.2, default to aufs2.2,
+  and treat GRSECURITYPATCHVER better.
+  Add aufs-99999999.3 for linux3.0 and aufs3.0
+
   09 Aug 2011; Martin Väth <martin@mvath.de>
   Update patches for grsecurity.
   Skip patches not named aufs* (unless USE=all-patches is set).
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs/Manifest
index ea6a75cb..24d825b0 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs/Manifest
@@ -2,6 +2,7 @@ AUX grsecurity-2.2.0.patch 2848 RMD160 61142a27036467d48a66d4b590171c5fb72192c3
 AUX grsecurity-2.2.1.patch 2925 RMD160 52e4ab7239584b1e9d2fd46d0e6c577c3d1033ef SHA1 bf2da73972f4b30bf5a256495470481f60c25fc2 SHA256 57aa9ec3bb8e7907f0fc3c060d7c4cee938a8f55770927138ba891a04877a321
 AUX grsecurity-2.2.2.patch 2900 RMD160 e1db89f795c55c8a672e05381df8ce4ca0e3c331 SHA1 61facafac814f5b4f64a7a4011ec56207a8340ca SHA256 d4d7b8e1db85f57f77218d705a1f2e9de77da1e3c5b991da2704a1a405a40cf8
 AUX grsecurity-2.2.2.r1.patch 316 RMD160 d580bf8eb45c1d00885094d19a69236f515422fd SHA1 95c8837f1482088d1e63d2dedea652e815f1f5b9 SHA256 c1d0d05b999d709702dbc20afffb818881f7dd8c6a4f6b7e286ff88cd742728e
-EBUILD aufs2-99999999.ebuild 5184 RMD160 60e2b09dac8c3cafe51e8ca45b568825dc2e3d26 SHA1 404b7af880695d0e8ad23ada45ce737212aa8c02 SHA256 861b476c46427d5dcee46ee17adeb8b5951894733568be374a0e68f7fedd41df
-MISC ChangeLog 1940 RMD160 c278b39885b6002dbfc2e9ede08a6f3cd6da0368 SHA1 577bdafa5c2d5d0d7b8e528c36784eba1d80474b SHA256 01bd67aa81ac5cd15a9968ebbe4d4adfd73e8806db11f0c98b7ef27dfbc46117
+EBUILD aufs-99999999.2.ebuild 5253 RMD160 c663287733a274e12a9568715ef00b46c57844f7 SHA1 b2aaa9d747ac50df609713c11ea27b2573dd616f SHA256 fa9f6ea422b31fddcd4b336e43ebf0370802304489f453eb9b954a91eefc68c3
+EBUILD aufs-99999999.3.ebuild 5141 RMD160 beb1d3e47d427fad441fad9379fcc6425d886e18 SHA1 31daf8a3535495767e33e2c8b5a7142d305cc764 SHA256 89056108040bcd3587d5a81c0da48d8ceadab417b0b637a0363a47c8e38f4143
+MISC ChangeLog 2152 RMD160 61a1698818600f19688e4ba05f935d1381a3ca29 SHA1 1389678790fd0a928219fa67cc6b222fd3acfd41 SHA256 7d7b54520f11418da598455ad118d2d1519bd84c9e800858e5c3789a63816aa8
 MISC metadata.xml 464 RMD160 c246d8bfe5ee95703e61a5d5a764205aba8178ab SHA1 55b3b6c2ae1f41fe2f20493a3db6bb634b431336 SHA256 4e8e84f03c714b651854a39ffb5b6b487bed1d5dab7d32837e955675a40063a9
diff --git a/sys-fs/aufs2/aufs2-99999999.ebuild b/sys-fs/aufs/aufs-99999999.2.ebuild
index 63b271f5..f31f53ef 100644
--- a/sys-fs/aufs2/aufs2-99999999.ebuild
+++ b/sys-fs/aufs/aufs-99999999.2.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"
 EGIT_PROJECT="aufs2"
 # BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version)
-EGIT_BRANCH="aufs2.1"
+EGIT_BRANCH="aufs2.2"
 EGIT_COMMIT="${EGIT_BRANCH}"
 [ -n "${EGIT_OFFLINE:-${ESCM_OFFLINE}}" ] || EGIT_PRUNE=true
 EGIT_HAS_SUBMODULES=true
@@ -92,24 +92,26 @@ pkg_setup() {
 		die "Wrong kernel version"
 	fi
 
-	if [ -n "${AUFS2BRANCH}" ]
-	then	EGIT_BRANCH="${AUFS2BRANCH}"
-	else	[ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2.1-${KV_PATCH}"
+	if [ -n "${AUFSBRANCH}" ]
+	then	EGIT_BRANCH="${AUFSBRANCH}"
+	else	if kernel_is lt 3 0
+		then	[ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2.2-${KV_PATCH}"
+		else	[ -n "${KV_MINOR}" ] && EGIT_BRANCH="aufs2.2-${KV_MAJOR}.${KV_MINOR}"
+		fi
 	fi
 	elog
-	elog "Using aufs2 branch: ${EGIT_BRANCH}"
-	elog "If this guess for the branch is wrong, set AUFS2BRANCH."
-	elog "For example, to use the aufs2.1 branch for kernel version 2.6.36, use:"
-	elog "	AUFS2BRANCH=aufs2.1-36 emerge -1 aufs2"
-	elog "For the most current kernel it might be necessary to use one of"
-	elog "	AUFS2BRANCH=aufs2.1 emerge -1 aufs2"
-	elog "	AUFS2BRANCH=aufs2 emerge -1 aufs2"
+	elog "Using aufs branch: ${EGIT_BRANCH}"
+	elog "If this guess for the branch is wrong, set AUFSBRANCH."
+	elog "For example, to use the aufs2.2 branch for kernel version 3.0, use:"
+	elog "	AUFSBRANCH=aufs2.2-3.0 emerge -1 aufs"
+	elog "To use the aufs2.1 branch for kernel version 2.6.39 use:"
+	elog "	AUFSBRANCH=aufs2.1-39 emerge -1 aufs"
 	msg=''
 	[ -n "${ESCM_OFFLINE}" ] && msg="${msg} ESCM_OFFLINE=''"
 	[ -n "${EGIT_OFFLINE}" ] && msg="${msg} EGIT_OFFLINE=''"
 	if [ -n "${msg}" ]
 	then
-		elog "Note that it might be necessary in addition to fetch the newest aufs2:"
+		elog "Note that it might be necessary in addition to fetch the newest aufs:"
 		elog "Set ${msg# } and be sure to be online during emerge."
 	fi
 	elog
@@ -133,11 +135,14 @@ src_prepare() {
 		'+')	j="${newest}";;
 		'*')	j="${all}";;
 		*)	w=:
-			for j in ${newest}
+			for j in ${all}
 			do	[ "${i}" = "${j}" ] && w=false && continue
 			done
-			${w} && ewarn "GRSECURITYPATCHVER contains bad version ${i}"
-			j="${i}";;
+			if ${w}
+			then	warn "GRSECURITYPATCHVER contains bad version ${i}"
+			else	j="${i}"
+			fi
+			;;
 		esac
 		v="${v} ${j}"
 	done
@@ -151,7 +156,7 @@ src_prepare() {
 	elog
 	for i in ${v}
 	do	j="grsecurity-${i}.patch"
-		cp -p -- "${FILESDIR}/${j}" "aufs2-${j}" || die "copying ${j} failed"
+		cp -p -- "${FILESDIR}/${j}" "aufs-${j}" || die "copying ${j} failed"
 	done
 }
 
diff --git a/sys-fs/aufs/aufs-99999999.3.ebuild b/sys-fs/aufs/aufs-99999999.3.ebuild
new file mode 100644
index 00000000..4d6b8122
--- /dev/null
+++ b/sys-fs/aufs/aufs-99999999.3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="4"
+EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
+EGIT_PROJECT="aufs3"
+# BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version)
+EGIT_BRANCH="aufs3.0"
+EGIT_COMMIT="${EGIT_BRANCH}"
+[ -n "${EGIT_OFFLINE:-${ESCM_OFFLINE}}" ] || EGIT_PRUNE=true
+EGIT_HAS_SUBMODULES=true
+inherit git linux-info eutils
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Since this is a live ebuild with unstable versions in portage we require
+# that the user unmasks this ebuild with ACCEPT_KEYWORDS='**'
+#KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
+IUSE="kernel-patch all-patches"
+PROPERTIES="live"
+
+RDEPEND=""
+DEPEND="dev-vcs/git[curl]"
+
+declare -a my_patchlist
+
+fill_my_patchlist() {
+	local i
+	my_patchlist=()
+	for i
+	do	case "${i}" in
+		*.patch|*.diff)	test -f "${i}" && my_patchlist+=("${i}")
+		;;
+		esac
+	done
+	:
+}
+
+apply_my_patch() {
+	local r
+	r=''
+	if [ ${#} -gt 1 ]
+	then	shift
+		r='-R'
+	fi
+	patch ${r} -p1 --dry-run --force <"${1}" >/dev/null || return
+	einfo "Applying kernel patch ${1}${r:+ reversely}"
+	patch ${r} -p1 --force --no-backup-if-mismatch <"${1}" >/dev/null || {
+		eerror "applying kernel patch ${1}${r:+ reversely} failed."
+		eerror "Since dry run succeeded this is probably a problem with write permissions."
+		die "With USE=-kernel-patch you avoid automatic patching attempts."
+	}
+}
+
+apply_my_patchlist() {
+	local r i
+	r=''
+	if [ "${#}" -gt 0 ]
+	then	shift
+		r='-R'
+	fi
+	set --
+	for i in "${my_patchlist[@]}"
+	do	if use all-patches || case "${i}" in
+		aufs*)	:;;
+		*)	false;;
+		esac
+		then	apply_my_patch ${r} "${i}" || set -- "${@}" "${i}"
+		else	einfo "Kernel patch ${i} - skipping as all-patches is not set"
+		fi
+	done
+	for i
+	do	apply_my_patch ${r} "${i}" || \
+		ewarn "Kernel patch ${i} cannot be${r:+ reverse} applied - skipping."
+	done
+}
+
+pkg_setup() {
+	local msg
+	linux-info_pkg_setup
+
+	# kernel version check
+	if kernel_is lt 2 6 26
+	then
+		eerror "${PN} is being developed and tested on linux-2.6.26 and later."
+		eerror "Make sure you have a proper kernel version!"
+		die "Wrong kernel version"
+	fi
+
+	if [ -n "${AUFSBRANCH}" ]
+	then	EGIT_BRANCH="${AUFSBRANCH}"
+	else	if kernel_is lt 3 0
+		then	[ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2.2-${KV_PATCH}"
+		else	[ -n "${KV_MINOR}" ] && EGIT_BRANCH="aufs${KV_MAJOR}.${KV_MINOR}"
+		fi
+	fi
+	elog
+	elog "Using aufs branch: ${EGIT_BRANCH}"
+	elog "If this guess for the branch is wrong, set AUFSBRANCH."
+	elog "For example, to use the aufs3.0 branch for kernel version 3.0, use:"
+	elog "	AUFSBRANCH=aufs3.0 emerge -1 aufs"
+	msg=''
+	[ -n "${ESCM_OFFLINE}" ] && msg="${msg} ESCM_OFFLINE=''"
+	[ -n "${EGIT_OFFLINE}" ] && msg="${msg} EGIT_OFFLINE=''"
+	if [ -n "${msg}" ]
+	then
+		elog "Note that it might be necessary in addition to fetch the newest aufs:"
+		elog "Set ${msg# } and be sure to be online during emerge."
+	fi
+	elog
+	EGIT_COMMIT="${EGIT_BRANCH}"
+
+	use kernel-patch || return 0
+	(
+		set --
+		cd -- "${KV_DIR}" >/dev/null 2>&1 && \
+		fill_my_patchlist *.patch *.diff && apply_my_patchlist -R
+	)
+}
+
+src_prepare() {
+	local i j w v newest all
+	all="2.2.0  2.2.1  2.2.2  2.2.2.r1"
+	newest="${all##* }"
+	v=''
+	for i in ${GRSECURITYPATCHVER-+}
+	do	case "${i}" in
+		'+')	j="${newest}";;
+		'*')	j="${all}";;
+		*)	w=:
+			for j in ${all}
+			do	[ "${i}" = "${j}" ] && w=false && continue
+			done
+			if ${w}
+			then	warn "GRSECURITYPATCHVER contains bad version ${i}"
+			else	j="${i}"
+			fi
+			;;
+		esac
+		v="${v} ${j}"
+	done
+	v="${v# }"
+	elog
+	elog "Using GRSECURITYPATCHVER: ${v}"
+	elog "If you want other patches, set GRSECURITYPATCHVER to some or more of:"
+	elog "${all}  +"
+	elog "The special value + means the newest version (${newest}) and is default."
+	elog "The special value * means all versions."
+	elog
+	for i in ${v}
+	do	j="grsecurity-${i}.patch"
+		cp -p -- "${FILESDIR}/${j}" "aufs-${j}" || die "copying ${j} failed"
+	done
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local i k dk
+	i="Documentation/filesystems/aufs/aufs.5"
+	test -e "${i}" && doman "${i}"
+	k="$(readlink -f -- "${KV_DIR}")" && [ -n "${k}" ] || k="${KV_DIR}"
+	dk="${D}/${k}"
+	dodir "${k}/fs/aufs"
+	cp -pPR -- fs/aufs/* "${dk}/fs/aufs"
+	cp -pPR -- include "${dk}"
+	find "${dk}"/include -name Kbuild -type f -exec rm -v -- '{}' ';'
+	fill_my_patchlist *.patch *.diff
+	cp -pPR -- "${my_patchlist[@]}" "${dk}"
+}
+
+pkg_postinst() {
+	[ "${#my_patchlist[@]}" -eq 0 ] && {
+		cd -- "${KV_DIR}" >/dev/null 2>&1 && fill_my_patchlist *.patch *.diff
+	}
+	if use kernel-patch
+	then	cd -- "${KV_DIR}" >/dev/null 2>&1 || die "cannot cd to ${KV_DIR}"
+		apply_my_patchlist
+		elog "Your kernel has been patched. Cleanup and recompile it, selecting"
+	else	elog "You will have to apply the following patch to your kernel:"
+		elog "	cd ${KV_DIR} && cat ${my_patchlist[*]} | patch -p1 --no-backup-if-mismatch"
+		elog "Then cleanup and recompile your kernel, selecting"
+	fi
+	elog "	Filesystems/Miscellaneous Filesystems/aufs"
+	elog "in the configuration phase."
+}
diff --git a/sys-fs/aufs2/files/grsecurity-2.2.0.patch b/sys-fs/aufs/files/grsecurity-2.2.0.patch
index 5c805ba7..5c805ba7 100644
--- a/sys-fs/aufs2/files/grsecurity-2.2.0.patch
+++ b/sys-fs/aufs/files/grsecurity-2.2.0.patch
diff --git a/sys-fs/aufs2/files/grsecurity-2.2.1.patch b/sys-fs/aufs/files/grsecurity-2.2.1.patch
index 8396dfd1..8396dfd1 100644
--- a/sys-fs/aufs2/files/grsecurity-2.2.1.patch
+++ b/sys-fs/aufs/files/grsecurity-2.2.1.patch
diff --git a/sys-fs/aufs2/files/grsecurity-2.2.2.patch b/sys-fs/aufs/files/grsecurity-2.2.2.patch
index 9a38594d..9a38594d 100644
--- a/sys-fs/aufs2/files/grsecurity-2.2.2.patch
+++ b/sys-fs/aufs/files/grsecurity-2.2.2.patch
diff --git a/sys-fs/aufs2/files/grsecurity-2.2.2.r1.patch b/sys-fs/aufs/files/grsecurity-2.2.2.r1.patch
index 25e9a1ed..25e9a1ed 100644
--- a/sys-fs/aufs2/files/grsecurity-2.2.2.r1.patch
+++ b/sys-fs/aufs/files/grsecurity-2.2.2.r1.patch
diff --git a/sys-fs/aufs2/metadata.xml b/sys-fs/aufs/metadata.xml
index ff0d3bf7..ff0d3bf7 100644
--- a/sys-fs/aufs2/metadata.xml
+++ b/sys-fs/aufs/metadata.xml
diff --git a/sys-fs/aufs2-util/Manifest b/sys-fs/aufs2-util/Manifest
deleted file mode 100644
index d7ace3d8..00000000
--- a/sys-fs/aufs2-util/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD aufs2-util-99999999.ebuild 1218 RMD160 bcb3d38f84e4b1ae0a284717b9ecf539cb47c09a SHA1 54311aacf63fe9acd1a3dddbc9b1cfa438293c4f SHA256 cfcfa10cff420b0f9ee57839a8f142073176876f7788ae98ea444b5f86db4f2b
-MISC ChangeLog 397 RMD160 b60993f6b9cf906d375d23f432e9ff229337941a SHA1 bd660025736d2c1e0fcab33fc2245ed9c35a2b63 SHA256 3419cb32ed08d652096fc512916037d20a5e7a22b78d291e589667cdaf6673db
-MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d