Bump to latest aufs, genpatches and linux release

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

6 files changed, 40 insertions, 199 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 64deae7ede57..63c9e95f3231 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/aufs-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.194 2015/06/29 07:26:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.195 2015/07/03 12:45:22 jlec Exp $
+
+*aufs-sources-3.14.46 (03 Jul 2015)
+*aufs-sources-4.0.7 (03 Jul 2015)
+*aufs-sources-4.1.1 (03 Jul 2015)
+
+  03 Jul 2015; Justin Lecher <jlec@gentoo.org> +aufs-sources-3.14.46.ebuild,
+  +aufs-sources-4.0.7.ebuild, +aufs-sources-4.1.1.ebuild,
+  -aufs-sources-3.14.41.ebuild, -aufs-sources-3.14.42.ebuild,
+  -aufs-sources-3.14.43.ebuild, -aufs-sources-3.14.44.ebuild,
+  -aufs-sources-3.14.45.ebuild:
+  Bump to latest aufs, genpatches and linux release
 
 *aufs-sources-3.14.45 (29 Jun 2015)
 *aufs-sources-4.0.6 (29 Jun 2015)
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.43.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.43.ebuild
deleted file mode 100644
index be6bb3254b1d..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.43.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 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.14.43.ebuild,v 1.1 2015/05/23 06:19:57 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="49"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=3.14.40+_p20150518
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-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 experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.44.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.44.ebuild
deleted file mode 100644
index 2c763f45432b..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.44.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 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.14.44.ebuild,v 1.1 2015/06/07 08:04:49 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="50"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=3.14.40+_p20150518
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-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 experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-3*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.45.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.46.ebuild
index 7b0a4cfee6bf..c2ae6f8224c3 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.45.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.46.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 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.14.45.ebuild,v 1.1 2015/06/29 07:26:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.46.ebuild,v 1.1 2015/07/03 12:45:22 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="51"
+K_GENPATCHES_VER="52"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.41.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.0.7.ebuild
index 8aaeecef7763..5f0f0933a1b8 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.41.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.0.7.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2015 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.14.41.ebuild,v 1.1 2015/05/10 11:10:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-4.0.7.ebuild,v 1.1 2015/07/03 12:45:22 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="47"
+K_GENPATCHES_VER="9"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.14.40+_p20150504
+AUFS_VERSION=4.0_p20150629
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 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 experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND="=sys-fs/aufs-util-3*"
+PDEPEND="=sys-fs/aufs-util-4*"
 
 README_GENTOO_SUFFIX="-r1"
 
@@ -42,15 +42,15 @@ src_unpack() {
 	fi
 
 	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
 
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
 
 	unpack ${AUFS_TARBALL}
 
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
 
 	kernel-2_src_unpack
 }
@@ -65,8 +65,8 @@ src_prepare() {
 
 src_install() {
 	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.42.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.1.ebuild
index 75d5f3838ccc..0c0d7c3379c9 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.42.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.1.1.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2015 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.14.42.ebuild,v 1.1 2015/05/15 06:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-4.1.1.ebuild,v 1.1 2015/07/03 12:45:22 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="48"
+K_GENPATCHES_VER="5"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.14.40+_p20150511
+AUFS_VERSION=4.1_p20150629
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 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 experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND="=sys-fs/aufs-util-3*"
+PDEPEND="=sys-fs/aufs-util-4*"
 
 README_GENTOO_SUFFIX="-r1"
 
@@ -42,15 +42,15 @@ src_unpack() {
 	fi
 
 	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs3-kbuild.patch
-		"${WORKDIR}"/aufs3-base.patch
-		"${WORKDIR}"/aufs3-mmap.patch"
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
 
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
 
 	unpack ${AUFS_TARBALL}
 
-	einfo "Using aufs3 version: ${AUFS_VERSION}"
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
 
 	kernel-2_src_unpack
 }
@@ -65,8 +65,8 @@ src_prepare() {
 
 src_install() {
 	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
 	readme.gentoo_create_doc
 }