sys-kernel/aufs-sources: Bump to latest aufs3, genpatches and linux release; drop old

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

4 files changed, 15 insertions, 92 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index a8b9e5503b5c..f60df1618f91 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/aufs-sources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.161 2014/12/10 09:39:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.162 2014/12/11 09:04:23 jlec Exp $
+
+*aufs-sources-3.14.26 (11 Dec 2014)
+*aufs-sources-3.10.62 (11 Dec 2014)
+
+  11 Dec 2014; Justin Lecher <jlec@gentoo.org> +aufs-sources-3.10.62.ebuild,
+  -aufs-sources-3.12.33.ebuild, -aufs-sources-3.14.25.ebuild,
+  +aufs-sources-3.14.26.ebuild, -aufs-sources-3.17.5.ebuild:
+  Bump to latest aufs3, genpatches and linux release; drop old
 
 *aufs-sources-3.17.6 (10 Dec 2014)
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.17.5.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.62.ebuild
index 2eb2efd716e1..bc2b4b6eef44 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.17.5.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.10.62.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 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.17.5.ebuild,v 1.1 2014/12/08 07:52:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.62.ebuild,v 1.1 2014/12/11 09:04:23 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="8"
+K_GENPATCHES_VER="69"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.17_p20141208
+AUFS_VERSION=3.10.x_p20141208
 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}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.14.25.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.25.ebuild
deleted file mode 100644
index 14d4e6ead8e3..000000000000
--- a/sys-kernel/aufs-sources/aufs-sources-3.14.25.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 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.25.ebuild,v 1.1 2014/11/23 09:28:32 jlec Exp $
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="30"
-K_DEBLOB_AVAILABLE="1"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo
-detect_version
-detect_arch
-
-AUFS_VERSION=3.14.21+_p20141110
-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.9"
-
-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.12.33.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.14.26.ebuild
index 8518843dfc77..87f757990103 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.33.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.14.26.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2014 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.12.33.ebuild,v 1.1 2014/12/08 07:52:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.14.26.ebuild,v 1.1 2014/12/11 09:04:23 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="35"
+K_GENPATCHES_VER="31"
 K_DEBLOB_AVAILABLE="1"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo
 detect_version
 detect_arch
 
-AUFS_VERSION=3.12.31+_p20141208
+AUFS_VERSION=3.14.21+_p20141208
 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}"