sys-kernel/aufs-sources: Fix to new genpatch releases

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

4 files changed, 81 insertions, 10 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 0e7f5c5cad31..1065ce7648ca 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/aufs-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.33 2013/05/09 19:32:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.34 2013/05/10 07:12:09 jlec Exp $
+
+*aufs-sources-3.9.1-r1 (10 May 2013)
+
+  10 May 2013; Justin Lecher <jlec@gentoo.org> aufs-sources-3.9.1.ebuild,
+  +aufs-sources-3.9.1-r1.ebuild:
+  Fix to new genpatch releases
 
 *aufs-sources-3.9.1 (09 May 2013)
 
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 72202abab67e..5994d2785954 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -38,8 +38,10 @@ DIST genpatches-3.8-9.base.tar.xz 208468 SHA256 52295de742ba0371afd041e09ba280e2
 DIST genpatches-3.8-9.extras.tar.xz 16568 SHA256 2ea61060a1525c4a8572af0b8258b222e84cc7fdc538b1b71b29784cea0dd424 SHA512 3601f4e2e5f428a18615a7b8f6c6ce00a8cc6476cb7a0d39665e66e2f49b89f091ec28ac01c6c1e288f68da1dedb23c64dec7bc1d93892e84350bdb83039fbc6 WHIRLPOOL 24d54663df1423f3110011d335d1128b55622daa306d70e6a010b42bb1859e5b479c8766f39e3a467096db6fcef08b37885f0d1d6e8fff2c58d5f31dfb593a4e
 DIST genpatches-3.9-1.base.tar.xz 6512 SHA256 a324a42c052693483b2c2c53d4e9a80488ce2edaa7d881e18ac48f4ef6d5caaa SHA512 f59ddabf39296f9559c06c855a436cba4033b1fc1a082c2df48c283632dbbefad3458c065735fe90d8c1220c47fbafa1a803f390b00668cc13e8bd981e126a55 WHIRLPOOL 73e7e3f3e292ac0dca88ccfbce2a12fd8dd7bde08a36ff0c799ac84abe246189041c6415d8e70211dc98ed5f6bacd9ba421bd6d85726a35728fafaf7e47959de
 DIST genpatches-3.9-1.extras.tar.xz 16572 SHA256 6a93041aba5cfa6a45a348b654e129b4ba3659c87437217bbd65eb7a0a841827 SHA512 53c94f50f63d866a66869cfa0b2692c8b71ceb17a703424948d5a92c5390942667651e30fb4a662ba02147b70849cd7fb6bf71f0a4940f19ee1b392e684eb7a4 WHIRLPOOL cc2b332caffd5411c55ed9f7ddcde4c3275e6a68ec765f579e682e1e957b48a1c8601f9d607b4b4b3137af40ae0bcc091390ce733b2fdfaf95db00d77ce57370
-DIST genpatches-3.9-2.base.tar.xz 60804 SHA256 2de26738706d1a2119472fd9d29a5e93da39125c7ecb900926d3b393e2436fc9 SHA512 73e5c80f06ef361a65cf3c55952910a05d25c300b3a6075759acbbd7cccf1d7c70513ac49cbe79042156ded02abd53b75bbcfa45c37cddcece17edead75cfc8c WHIRLPOOL 1c1c42ee92260305d06bb80a74680f65235aae14b51480a7218604430c39dafcfa83e81b7fbaf2c1743881a9fbb4bb2b270bb4bc80fc89dffaee0d23ad5bd3b0
-DIST genpatches-3.9-2.extras.tar.xz 16572 SHA256 6a93041aba5cfa6a45a348b654e129b4ba3659c87437217bbd65eb7a0a841827 SHA512 53c94f50f63d866a66869cfa0b2692c8b71ceb17a703424948d5a92c5390942667651e30fb4a662ba02147b70849cd7fb6bf71f0a4940f19ee1b392e684eb7a4 WHIRLPOOL cc2b332caffd5411c55ed9f7ddcde4c3275e6a68ec765f579e682e1e957b48a1c8601f9d607b4b4b3137af40ae0bcc091390ce733b2fdfaf95db00d77ce57370
+DIST genpatches-3.9-3.base.tar.xz 52860 SHA256 4e62a7aeaffdead3b1a8dde17d50893869ff7c595f5669023fa5a63c3dd59618 SHA512 888574eb58badfafbdfc88397961c86fe720ace53f381764a8d70a148ee55315255d784b69407894249d76e8e169c1e739c757953a947892eb0eea228dc10c74 WHIRLPOOL fda32b187bff42b79dca79da96490b6a04de6e3c9d86d7680b7c9f8f6d58c23594d61e597b5b18f828d08050dcf19f671d0473cf39656ed2c9a78132c3d28126
+DIST genpatches-3.9-3.extras.tar.xz 16572 SHA256 6a93041aba5cfa6a45a348b654e129b4ba3659c87437217bbd65eb7a0a841827 SHA512 53c94f50f63d866a66869cfa0b2692c8b71ceb17a703424948d5a92c5390942667651e30fb4a662ba02147b70849cd7fb6bf71f0a4940f19ee1b392e684eb7a4 WHIRLPOOL cc2b332caffd5411c55ed9f7ddcde4c3275e6a68ec765f579e682e1e957b48a1c8601f9d607b4b4b3137af40ae0bcc091390ce733b2fdfaf95db00d77ce57370
+DIST genpatches-3.9-4.base.tar.xz 56576 SHA256 bc2f6d38e77134ef27f21cffa8b67933e513b6f04a79357a0f1c16927ee6eae6 SHA512 3ea4061ed0ebf7370d6c4594fd1ee2cec57f9df514fa7e1e197eb335faece5290b8cda01d1ccd4e19ad8681754de45a5d2eec2bf24adfc56ec9ea3c6dfddb074 WHIRLPOOL d015a2ea8ac6b63d52cd48830882b9af411f6d0437c05b900a88e26d36549a64db03793080aa09551a6246379f834917951d10b136b198832d1276487266a1ca
+DIST genpatches-3.9-4.extras.tar.xz 16572 SHA256 6a93041aba5cfa6a45a348b654e129b4ba3659c87437217bbd65eb7a0a841827 SHA512 53c94f50f63d866a66869cfa0b2692c8b71ceb17a703424948d5a92c5390942667651e30fb4a662ba02147b70849cd7fb6bf71f0a4940f19ee1b392e684eb7a4 WHIRLPOOL cc2b332caffd5411c55ed9f7ddcde4c3275e6a68ec765f579e682e1e957b48a1c8601f9d607b4b4b3137af40ae0bcc091390ce733b2fdfaf95db00d77ce57370
 DIST linux-3.6.tar.xz 68667080 SHA256 4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f SHA512 6e3354184d1799228a2d33b92e4a6b743cc24352b8ccc1fd487fab07ab97be2aa03ba87b8406a177581692db1fd40674fbd4e213a782cbe0a6a969b10c4c17a1 WHIRLPOOL 50b16de4f099e411cfc1f920f3bec57a624b3b336bb3970dcd8fffc0ba8d6ad749a36d2f6609eeca264c137e196885dcb35ab5fdeeb9b576ef216bebdc2ad028
 DIST linux-3.7.tar.xz 69736096 SHA256 60a64d0bf76eeec3355f115c577935757b84629c8c129ce5b8bb02075f6b9458 SHA512 91d65d658e9b6d0c0f03533e631ef1cc46c79ec5c1425a0914e1fe97ac4069230ee2f7d947df5cf76dd8865eb78f149d46140a3ec6509de21094ef70f27f6f61 WHIRLPOOL db9d25f5a479fef45808e85fdac9e72e5508cb94358e012f522ad5dce4b4777811ce57fd33649704400f54592c4dc3306b0099eb85fca60dd9544b8fd918ca1d
 DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
@@ -56,13 +58,14 @@ EBUILD aufs-sources-3.8.8-r1.ebuild 2057 SHA256 54e4480d4f9d39943e809fdb60a11b1d
 EBUILD aufs-sources-3.8.8.ebuild 2006 SHA256 9be5b7a941db5cc1b78f37b5db50154f5afb14ba42fb42494416addc61bc336a SHA512 124190b293878f6efbdc22c48ad9e4afbd7e91232635f2bdef0612acb6271613bb3dc75a82e16e6efbf5b0cd46572da5f5a947b0efe244ae9704e7a0408f70fe WHIRLPOOL 40e25e86301725d03d544a18fdb6c51a37111cf391c06b8eafc3ee97f505758f6bae299743cf9145af38bcc9d506f507e912374be56b242c84b68eecae5dafcf
 EBUILD aufs-sources-3.9.0-r1.ebuild 1989 SHA256 97d1b46b687b6e795bf273e0fe53c825c1c7b51b42e22eef4dc1fdb5636816e3 SHA512 bc6d5a230de3fe5ede2d8bc5584ace36bca4d0559f0f749aa4fcef80f2129552ebbac91802e2f8b93e4dae9ee84c1f665cb78bcb1e20ca8b559853dca9b58172 WHIRLPOOL 0f65dc256fa5b5f438573fa235fc314aad3ad895e08fb5ba29d7aeae5870abe954e55007e4d426e6a43dbdac72dc981e7c5b2b0f6b22d55c90dc96326dd82dc7
 EBUILD aufs-sources-3.9.0.ebuild 1986 SHA256 b2ed36cd5f7c8618a98b9fa2761a9d244abd745d6e86d35ad66578f4e6037e3b SHA512 422c0ff394c63e70fe667fb156ec6b242bef73c0095d5f84143ddef546e68905e4b0dc69ded43e3f4b5f2cc6ec3d6a66a1173f56102a1cd834ff4ea58d00a0ea WHIRLPOOL 07039307503496970feaa6c1c19a9fb117f4e720005b7fc48266af9e9d6ecf4f9fc9f49d179699beba5a81ac2ff477a41a0a38d9689ef2a60632705eb2f42a5c
-EBUILD aufs-sources-3.9.1.ebuild 1986 SHA256 5783509819ecf618ea36d27220214ca1832803370c0b248d29c80b7e2f1a305e SHA512 5589657ea7e462c4a08ea7399ef52a7272836fb718d6c6b3396bc8cf025daaa25152a6dc869f35e3a22ba751d79234ee676877989b78aefdc090f4de9ec3b5e2 WHIRLPOOL aa625363814feeb366379b8203dc45a826b60a95a64a2e54528921011b0eb00643d512a7794fe57c6e3c9b3295e4569fa4aad68b91d0ceda77e83539456436ba
-MISC ChangeLog 7043 SHA256 116407798622d36fbea17c69a7774d81b3dcab29c5d6548ca7085d8570286f1c SHA512 a7a8587a3d070f299b9fa383abc70e672b3c18169758625b0fa192dc41117945ab302f7d17ac5ae870fe0afc03c1dc121e94fc3aa791435ffff06e4d16eb8948 WHIRLPOOL 3422aa9bb7dc8d280d3734a9f066279aada13dc6419cabc13c0ba7b2db5b2bb2661d23ed338bf158441d4bd0103eafd85dbe76374f2bb8627383abfbbb6c1398
+EBUILD aufs-sources-3.9.1-r1.ebuild 1989 SHA256 842a6a637d51350f2923d043882f4410667d614360f8e5c471d187cc295c835f SHA512 0747573015d2494d85e46df8f677616dcdf45f12f95e98c6b2cf1e71f521c88bb971e841f60dac9e953ee8b71e96d75e4cbfb3f031167bceb2e60e838e58a4fe WHIRLPOOL ad902c15964a91ce30bb76cad88e67c70705557e2c38009050311f213a7336a83a60e947f8c2406d80195d81a752bebda9e71e7a1964b3d5ddba08211fef6f08
+EBUILD aufs-sources-3.9.1.ebuild 1986 SHA256 50f41c7e82c3718a667b3e5c3d702c935f9f816c8123d3165e409c83da3e9c13 SHA512 cc5e90106cb01d3e6e7e7fb56fd47cbab5b318be9c7731562682ff08fd4b3b2f388f3728fbdc2ceb554b17d3c7670eef974ec1fd54f25b85b2209ca04af359c6 WHIRLPOOL f375a31ec9c71f986281a8943ceabddd98b987ab7d3203bc03b7fc6304315fb8330bb61bc92ed3cd3e5f393016be9c7a4b345a1da0fe0ed434b5c9a97281e024
+MISC ChangeLog 7220 SHA256 d305576fa4c7bab6d9c9cf271c1be9457af9ae3d7343bae0b48e6c27f408aabe SHA512 75dedd503f218031c53dd90a1fca7ec039fd2574909856f1816aa69e2bd097ddf5c51d6ef208dcdb26ba85cc927794d0d51dfee97d78d56476c535950875f9b2 WHIRLPOOL 80356a997e2846cc6a09733d99442e1cdd2b32a501655e235be2afe911a9a1c43936cb25677bf00979c4b01912e46ce8831634791bdf93deca63c216101b6510
 MISC metadata.xml 477 SHA256 3d0a6d73ea46cfe76d784ce659973f476d07ce7d8111b16841c1de7800958b5c SHA512 194e887719e7926d8870684b1e5a8fc73def7469d35925c9c8b85b208cffe59bfaa7416d296929e9b8d83e7f786b4abe49be8bb95b1feb93a3b8b3bda9f7f5de WHIRLPOOL bc902ea166c10199da0c46ba18ab9dca7ae541379fe2cf317e4f7de16d2edf91f3f84da3d2e989d82531227f7a140a2d37b96bd788ee0c1d72446f56c8ccf38f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlGL+e0ACgkQgAnW8HDreRZaUACfWXERrUJWMyAJ8XIN3mN7kYRe
-2usAn3niWJOgo+E688biK3c1vEGiiBy5
-=5xxr
+iEYEAREKAAYFAlGMnc4ACgkQgAnW8HDreRb3KwCffFkzHcGMbrVqO2Mn40TQe3x0
+W9IAn2VefAPFC0x9dA1TuI+DUt0FMKqY
+=mw0X
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.9.1-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.9.1-r1.ebuild
new file mode 100644
index 000000000000..b264d7885954
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-3.9.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 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.9.1-r1.ebuild,v 1.1 2013/05/10 07:12:09 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="4"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2 eutils
+detect_version
+detect_arch
+
+AUFS_VERSION=3.9_p20130506
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs3.9 > 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 module proc"
+
+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"
+
+PDEPEND=">=sys-fs/aufs-util-3.8"
+
+src_unpack() {
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+	use proc && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-proc_map.patch"
+	unpack ${AUFS_TARBALL}
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	if ! use proc; then
+		sed '/config AUFS_PROC_MAP/,/^$/d' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die
+	cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -ri "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+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 && \
+		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.9.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.9.1.ebuild
index 8aa646fb7059..60383797ed9c 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.9.1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.9.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 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.9.1.ebuild,v 1.1 2013/05/09 19:32:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.9.1.ebuild,v 1.2 2013/05/10 07:12:09 jlec Exp $
 
 EAPI=5
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
+K_GENPATCHES_VER="3"
 K_DEBLOB_AVAILABLE="1"
 inherit kernel-2 eutils
 detect_version