Bump to latest aufs, genpatches and linux release; fix aufs-util version

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

9 files changed, 193 insertions, 13 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index deb61523d345..e9e33e04a15c 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,16 @@
 # 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.183 2015/04/20 08:49:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.184 2015/04/22 06:28:22 jlec Exp $
+
+*aufs-sources-3.19.5 (22 Apr 2015)
+*aufs-sources-3.14.39 (22 Apr 2015)
+
+  22 Apr 2015; Justin Lecher <jlec@gentoo.org> +aufs-sources-3.14.39.ebuild,
+  +aufs-sources-3.19.5.ebuild, aufs-sources-3.14.37.ebuild,
+  aufs-sources-3.14.38.ebuild, aufs-sources-3.18.10.ebuild,
+  aufs-sources-3.18.11.ebuild, aufs-sources-3.18.9.ebuild,
+  aufs-sources-3.19.3.ebuild:
+  Bump to latest aufs, genpatches and linux release; fix aufs-util version
 
 *aufs-sources-4.0.0 (20 Apr 2015)
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.37.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.37.ebuild
index bb3b00cb9ad2..22e18fc4951f 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.37.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.37.ebuild
@@ -1,6 +1,6 @@
 # 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.37.ebuild,v 1.1 2015/03/27 08:03:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.37.ebuild,v 1.2 2015/04/22 06:28:22 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND=">=sys-fs/aufs-util-3.9"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.38.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.38.ebuild
index 1f14efe9ba8a..d4ad1e58d8cb 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.38.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.38.ebuild
@@ -1,6 +1,6 @@
 # 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.38.ebuild,v 1.1 2015/04/14 10:35:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.38.ebuild,v 1.2 2015/04/22 06:28:22 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND=">=sys-fs/aufs-util-3.9"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.39.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.39.ebuild
new file mode 100644
index 000000000000..ff3488442086
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.39.ebuild
@@ -0,0 +1,85 @@
+# 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.39.ebuild,v 1.1 2015/04/22 06:28:22 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="44"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.14.21+_p20150420
+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.18.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.10.ebuild
index 8415a939922f..8026a23066bd 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.10.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.10.ebuild
@@ -1,6 +1,6 @@
 # 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.18.10.ebuild,v 1.1 2015/03/27 08:03:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.10.ebuild,v 1.2 2015/04/22 06:28:22 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND=">=sys-fs/aufs-util-3.9"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.11.ebuild
index 0a29b9a94219..93ac2383bd01 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.11.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.11.ebuild
@@ -1,6 +1,6 @@
 # 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.18.11.ebuild,v 1.1 2015/04/07 06:27:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.11.ebuild,v 1.2 2015/04/22 06:28:22 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND=">=sys-fs/aufs-util-3.9"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild
index 133d026b4f85..56c2b0ee0180 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild
@@ -1,6 +1,6 @@
 # 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.18.9.ebuild,v 1.1 2015/03/09 08:07:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.18.9.ebuild,v 1.2 2015/04/22 06:28:22 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND=">=sys-fs/aufs-util-3.9"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.19.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.19.3.ebuild
index 4d5d5d08f696..a004a74b8ad9 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.19.3.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.19.3.ebuild
@@ -1,6 +1,6 @@
 # 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.19.3.ebuild,v 1.1 2015/03/27 08:03:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.19.3.ebuild,v 1.2 2015/04/22 06:28:22 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ SRC_URI="
 	!vanilla? ( ${GENPATCHES_URI} )
 	"
 
-PDEPEND=">=sys-fs/aufs-util-3.9"
+PDEPEND="=sys-fs/aufs-util-3*"
 
 README_GENTOO_SUFFIX="-r1"
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.19.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.19.5.ebuild
new file mode 100644
index 000000000000..fb1fa848c203
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.19.5.ebuild
@@ -0,0 +1,85 @@
+# 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.19.5.ebuild,v 1.1 2015/04/22 06:28:22 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=3.19_p20150420
+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
+}