sys-kernel/aufs-sources: Version Bump; Stop installing files oputside kernel dir in order to prevent file collisions

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

5 files changed, 66 insertions, 22 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 7848143e26ee..0f664001ef07 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.5 2012/12/17 11:57:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.6 2012/12/19 09:44:25 jlec Exp $
+
+*aufs-sources-3.6.11 (19 Dec 2012)
+
+  19 Dec 2012; Justin Lecher <jlec@gentoo.org> aufs-sources-3.6.6.ebuild,
+  aufs-sources-3.6.8.ebuild, aufs-sources-3.6.10.ebuild,
+  +aufs-sources-3.6.11.ebuild:
+  Version Bump; Stop installing files oputside kernel dir in order to prevent
+  file collisions
 
 *aufs-sources-3.6.10 (17 Dec 2012)
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild
index 7b5241670769..e1075f8c9a5e 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1 2012/12/17 11:57:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild,v 1.2 2012/12/19 09:44:25 jlec Exp $
 
 EAPI=5
 ETYPE="sources"
@@ -43,12 +43,6 @@ src_prepare() {
 	sed -i "s:__user::g" include/linux/aufs_type.h || die
 }
 
-src_install() {
-	insinto /usr/include/linux
-	doins include/linux/aufs_type.h
-	kernel-2_src_install
-}
-
 pkg_postinst() {
 	kernel-2_pkg_postinst
 	einfo "For more info on this patchset, and how to report problems, see:"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild
new file mode 100644
index 000000000000..04b05fd3dd23
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 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.11.ebuild,v 1.1 2012/12/19 09:44:25 jlec Exp $
+
+EAPI=5
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="11"
+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"
+
+RDEPEND="sys-fs/aufs-util"
+DEPEND=""
+
+src_unpack() {
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	unpack ${AUFS_TARBALL}
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	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}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild
index 32ea9794a733..579bb1793947 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.6.ebuild,v 1.1 2012/11/26 20:46:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild,v 1.2 2012/12/19 09:44:25 jlec Exp $
 
 EAPI=5
 ETYPE="sources"
@@ -42,12 +42,6 @@ src_prepare() {
 	sed -i "s:__user::g" include/linux/aufs_type.h || die
 }
 
-src_install() {
-	insinto /usr/include/linux
-	doins include/linux/aufs_type.h
-	kernel-2_src_install
-}
-
 pkg_postinst() {
 	kernel-2_pkg_postinst
 	einfo "For more info on this patchset, and how to report problems, see:"
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild
index bbd9255ce6b6..df39cdb4155d 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.ebuild,v 1.3 2012/11/29 22:17:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild,v 1.4 2012/12/19 09:44:25 jlec Exp $
 
 EAPI=5
 ETYPE="sources"
@@ -43,12 +43,6 @@ src_prepare() {
 	sed -i "s:__user::g" include/linux/aufs_type.h || die
 }
 
-src_install() {
-	insinto /usr/include/linux
-	doins include/linux/aufs_type.h
-	kernel-2_src_install
-}
-
 pkg_postinst() {
 	kernel-2_pkg_postinst
 	einfo "For more info on this patchset, and how to report problems, see:"