sys-kernel/aufs-sources: Version BUmp; drop unsupported

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 19 insertions, 66 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 634365a171fa..58d282dbe6f8 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/aufs-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.13 2013/01/24 20:09:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.14 2013/02/07 08:08:48 jlec Exp $
+
+*aufs-sources-3.7.6 (07 Feb 2013)
+
+  07 Feb 2013; Justin Lecher <jlec@gentoo.org> -aufs-sources-3.6.10.ebuild,
+  -aufs-sources-3.7.1.ebuild, +aufs-sources-3.7.6.ebuild:
+  Version BUmp; drop unsupported
 
 *aufs-sources-3.7.4 (24 Jan 2013)
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild
deleted file mode 100644
index 4311a5ab6986..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild,v 1.5 2013/01/16 20:07:32 jlec Exp $
-
-EAPI=5
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-K_DEBLOB_AVAILABLE="1"
-inherit kernel-2 eutils
-detect_version
-detect_arch
-
-AUFS_TARBALL="${P}.tar.xz"
-
-# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.6 > ${AUFS_TARBALL}
-AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob module"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}"
-
-UNIPATCH_LIST="
-	"${WORKDIR}"/aufs3-kbuild.patch
-	"${WORKDIR}"/aufs3-base.patch"
-#	${WORKDIR}/aufs3-proc_map.patch"
-
-src_unpack() {
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-	unpack ${AUFS_TARBALL}
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die
-	cp -ri "${WORKDIR}"/{Documentation,fs} . || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	if ! has_version sys-fs/aufs-util; then
-		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
-	fi
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.7.6.ebuild
index 098a1b183a68..d4f697cb4390 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.7.6.ebuild
@@ -1,25 +1,25 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild,v 1.4 2013/01/18 12:06:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.7.6.ebuild,v 1.1 2013/02/07 08:08:48 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="2"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="8"
 K_DEBLOB_AVAILABLE="1"
 inherit kernel-2 eutils
 detect_version
 detect_arch
 
-AUFS_TARBALL="${P}.tar.xz"
-
-# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.6 > ${AUFS_TARBALL}
+AUFS_VERSION=3.7.6
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.7 > ${AUFS_TARBALL}
 AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
 
 KEYWORDS="~amd64 ~x86"
 HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob module"
+IUSE="deblob module proc"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}"
@@ -28,10 +28,11 @@ UNIPATCH_LIST="
 	"${WORKDIR}"/aufs3-kbuild.patch
 	"${WORKDIR}"/aufs3-base.patch"
 
-PDEPEND="sys-fs/aufs-util"
+PDEPEND=">=sys-fs/aufs-util-3.7"
 
 src_unpack() {
 	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc.patch"
 	unpack ${AUFS_TARBALL}
 	kernel-2_src_unpack
 }
@@ -40,6 +41,9 @@ src_prepare() {
 	if ! use module; then
 		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
 	fi
+	if ! use proc; then
+		sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
 	cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die
 	cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
 	cp -ri "${WORKDIR}"/{Documentation,fs} . || die