sys-kernel/aufs-sources: Allow aufs support being build as module; install header outside linux-header dir

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 19 insertions, 13 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index aa40a251fe37..22a4dbe331c9 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,11 @@
 # 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.2 2012/11/27 10:39:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.3 2012/11/29 22:04:44 jlec Exp $
+
+  29 Nov 2012; Justin Lecher <jlec@gentoo.org> aufs-sources-3.6.8.ebuild,
+  metadata.xml:
+  Allow aufs support being build as module; install header outside linux-header
+  dir
 
 *aufs-sources-3.6.8 (27 Nov 2012)
 
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index b64bee05fb3d..54620a8944d8 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST aufs-sources-3.6.6.tar.xz 142428 SHA256 06858480e67b59206d4a1b7c4cfea56eb7c0faaa9b8fd7aebc2ca318087647c6 SHA512 405199f53f8f5ae61ff6d0a86937254a51b76b9b0f827ee927bb76b3fbcfd550f67954d152735306e2023179dd5a268e420457885d81c1fe8960784d1a71b598 WHIRLPOOL bbca21c15bbde1149b881c0a0396d2abc5e0b3bc77db53d02d7ed1015b5396ebfeccce6c09678217eb250dcc6964038f5d0651e4cf209e29f2b8a32d00c9b3f8
 DIST aufs-sources-3.6.8.tar.xz 142476 SHA256 a758a7b81813c882bfb58fd08be35dd18a9f609dd7d1c1c07b5e043592afa4e7 SHA512 b13192a51443a6620fe0c571b34055ae6a706946a9011547d636b70c3fb226f1fd13304c291e8cf4db149b41eda745300bb767fa804f44b04792e0f467d0668a WHIRLPOOL 27c96a860a64580eb11b7a72991be4c56493981e4c1b3fc23ddedb79bef2339801316d0cc7c51911d8f5a3b39215cc282381dbff272536f979e3785b9d0c1a78
@@ -11,13 +11,13 @@ DIST genpatches-3.6-9.base.tar.bz2 202356 SHA256 a84f9595721860cb57309fb540560e7
 DIST genpatches-3.6-9.extras.tar.bz2 17029 SHA256 7e22574a6618fbb2eade0610fd130a06a322891f109d5ad79b1b8674da5321c8 SHA512 243ac5d7b78e0e308cfb5536439eb6da01f46bebc1a549c61eb9cb0b1199ccabfad2a7d6186a3b1387417dc40082fc931d37d07ed31bb0e78a0e9afc0e4bf655 WHIRLPOOL 71f32176b12b1b08450854afc52e603ba687628a21d18b1ffb83063cd5db159e53b729901085b57dd969fcf731f3ebdb191a1015c6c98bb1a6015f965d23e543
 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
 EBUILD aufs-sources-3.6.6.ebuild 1594 SHA256 e8db721817760d660648e5bd2b6fcf9395aba283e72604722e07edbbcb664552 SHA512 fc7959e8c7498a298a5f6fc5bb3d9d92f4b32b88fcbcd2327d3eeb22f15b10c3d0ed6804bc9bd465f5646a5691f1bbc0d83aa2f79272023d17d2d819b1190511 WHIRLPOOL ee5a2768289856e07db7e5502b52fccfb4a71333d40808d6b70e0fdcca7a657cf363ed56c874a76dbb2392c67d83ffc775b53c8a10587ed9221db23ebb6c5ccf
-EBUILD aufs-sources-3.6.8.ebuild 1596 SHA256 a52fe7e802be99a18b7b4d4946a0055a6e3d07678eecb40f7210a3ed44e1e378 SHA512 6cd75633b5a77970bb6c4b03fd113c54d58aa6c6fa710a30f40a86c69842c56246107dc9c9231cd8156511669b961281221db42e0dbf593701564848d3bae98d WHIRLPOOL 757d277b2b3f54b4f31c650a1ec71a34a93dc57b63dd30051aedcb44a5b974faf79485f537d43946c2092d9b890f4220033ce5f902671000f676750859303023
-MISC ChangeLog 726 SHA256 25901aa18328b1cd3131849d608924b168603adab8a6087aef9ec067edcf632f SHA512 9b2b76a5c220871e015df61b7cc08686b9a7827251c56d4891edb601d201fc447313897b665fea186b2ab18c77fa304b7f4f34d4f4fa58ff239be6db1b39cf0f WHIRLPOOL 22560daeffa3a81627f27536d4e25d59a46690d829a62b1a8a7acb4e113c899d950d85f91805ec3daac01fc8d2115a095f060025074074ca04bf08635dcb4049
-MISC metadata.xml 322 SHA256 576a908a4ed2228217d564ba7c2e1b3173ceacfc88258073d9b07698746870dc SHA512 001fce1594b001c9864d86024c45a1560b651e7dda5d81ad8190ea62c88ad48d79867a66cceb2e108e35d6c7d386799d5a3a9d705c8c3beb0c26cdb9b3b94007 WHIRLPOOL 8b233ac46194ab42d98d89be79df6b7f21843923bb9502336a8504a2e5c4de5f3d908de11baf2cf48adf04ab1b16b034707a3d4a1d8746c29bbc9574cd7248cf
+EBUILD aufs-sources-3.6.8.ebuild 1645 SHA256 eefb8d4f8a886ab578b9c3bcb61ec13f4d6a34339f35ef6e5834e6f2808597ce SHA512 ab8d899779515444fc66c8b938643fb07c2e428db644d296e851c7918954ef164c4d4aba0700bb789fd61067826a29708b0c6d38d2c47b37024c2ec2afb827b5 WHIRLPOOL 7dad07f3e81b0a64a684658bde34c93423ef18803d55a3e9e71747d2e9051c44536782ddb72286039cb4836caa3098b62a0678741a29d3c356f3cc983b23ba04
+MISC ChangeLog 903 SHA256 523ad7846c0e76f4ce4db82fda80069eb15a3650ad12ceb29871f9e0b4439648 SHA512 4bab94223ea6a6d4b48866ec2d5f36e1dee6bd4af3232b9d181ce986d10fca4706b722fef3ab294b6ad11a9ef14bae80865cb75888fdaf5bf371d94166583727 WHIRLPOOL ae8a6a0997f3cf47ee4f5b73312b4e6c67e4b681f867129ad996270b956af36a4bfcab3071c37be64719c5ca13b61dd779e653c08d66b363f27113bc5d4024c0
+MISC metadata.xml 403 SHA256 fb148a8f1d8fc6a731a7814bc9fd9fd3f60e879bf290a9499f40c136e185536b SHA512 a04ea4f52178d5ea874b9e0d6b7db6daed35cbc91e0808e1da5bbb02971fb59d3dbdde14010e5d7f30603c6b16da15eac5ce16a9b9b4d78b6c40a9c4d0251fd6 WHIRLPOOL 66b187a0a487f49a06c3deecc6ed9ca00091b7492b7ada1180d37e18c099881170add61a3ba2a4f72f7fc1e954f23566d70c2cbd97ce50be4180a471f5d17a49
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC0mGwACgkQgAnW8HDreRaNDQCdFYVdsAv/O9DabF2GCSpbXB1I
-Jx4AoLoNN3z7EN8s5xzqmNNapfxAFCdh
-=hRz6
+iEYEAREKAAYFAlC32/0ACgkQgAnW8HDreRZWmQCghJmGkNkcml8/UyfpeTBSOxLZ
+bTUAn2hYjZ3YeMwnzo79v5qF9t+TJk4Q
+=2TLd
 -----END PGP SIGNATURE-----
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 54075a377910..8b843f0aec55 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.1 2012/11/27 10:39:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild,v 1.2 2012/11/29 22:04:44 jlec Exp $
 
 EAPI=5
 ETYPE="sources"
@@ -13,12 +13,12 @@ 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}
+# 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"
+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}"
@@ -32,6 +32,7 @@ RDEPEND="sys-fs/aufs-util"
 DEPEND=""
 
 src_unpack() {
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
 	unpack ${AUFS_TARBALL}
 	kernel-2_src_unpack
 }
@@ -43,8 +44,7 @@ src_prepare() {
 }
 
 src_install() {
-	insinto /usr/include/linux
-	doins include/linux/aufs_type.h
+	doheader include/linux/aufs_type.h
 	kernel-2_src_install
 }
 
diff --git a/sys-kernel/aufs-sources/metadata.xml b/sys-kernel/aufs-sources/metadata.xml
index 26b158af26f2..61059d410860 100644
--- a/sys-kernel/aufs-sources/metadata.xml
+++ b/sys-kernel/aufs-sources/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<use>
 		<flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+		<flag name="module">Patch kernel to allow aufs being build as a module.</flag>
 	</use>
 </pkgmetadata>