sys-fs/aufs3: Turned around patch combining, #491554

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 27 insertions, 23 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 2f9ba8796a3c..e903b4df887c 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.77 2013/11/19 07:22:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.78 2013/11/19 09:29:28 jlec Exp $
+
+  19 Nov 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131104.ebuild,
+  aufs3-3_p20131111.ebuild:
+  Turned around patch combining, #491554
 
   19 Nov 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20131111.ebuild:
   Add min supported version check
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index f77ec237b846..1c4f71900972 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -9,24 +9,24 @@ DIST aufs3-standalone-3_p20131104.tar.xz 2073160 SHA256 2a55ece940e4f949482879b7
 DIST aufs3-standalone-3_p20131111.tar.xz 1610788 SHA256 5ea5b080fa8b68f4921fc9fc9247e456c3740321445e5d455ac1eb00454a6d7f SHA512 bf3b35a30164a4f5856db7a66c898e7e3491a5dab05252207fc402b9ef9a946be4cd6fe71370c52c1bc5168653c7323f3ce039f062d9da7f01a84a1ef33c7475 WHIRLPOOL 364b732719d24139eb450275ef9819b58dd8e3fa8bbbc0cd4e4ca5cee5d9beb622931233022f70621887c245dde2d4b879067c68ba8910fdfd8c4fc2f43c1037
 EBUILD aufs3-3_p20131007.ebuild 4698 SHA256 9f443498a9de7e6c238aebc2bd9be4353686c11878f1ffe46c53f7c1f082b710 SHA512 0f38101a85be0724f599e357ca1a9721fa127b5523acb0a2a704a665adb7118cc6eb13f55a89f39ab1e30713e85afab0fe5b5f3b5186e80282eab08d74776889 WHIRLPOOL 23c597f3dc1cc736a77792906b64fcaed150b998fa2c7c93ef8190615a9ff7711738ca7b2cdf8e749265ba467dd6af6d9bf6c810ac43123afa770d0e2452bef3
 EBUILD aufs3-3_p20131014.ebuild 4698 SHA256 ffcd8421f15e90df7e79f0a799b594b2a6e4d1f843ad4f571091077931972dd0 SHA512 acfb8d87f742da0418b43ffaa79390a1d374b64da3ed31652a67a57cddb94d63df6a144fe13cbdfbb9e4f08f02f1c318f44b07bee3faa936d5699f871b7567fb WHIRLPOOL 3bee56dee7da38fd55af4493a7400e336e0521e9780dd2bf791b22bbeec66870243102e718d7cde4689f25a00ce461c9ed1318a80e810680c9fcd33580805e5d
-EBUILD aufs3-3_p20131104.ebuild 4809 SHA256 26cd5aeda7a48f4a18c45d95123af3df0faacd5ca46b1da551805d9a068c64d0 SHA512 69a736539db14d39d61c890303604f3ff599b1cb47ef8c3080e487851078d4d94544b2ee072f30c2a518f318f28b6a62281a4a37a7f28d5d850a251c1806d755 WHIRLPOOL 3c7a380d0bdffb0f5b478cf505b42c75b4902cde4cc88fbe2517b8a4399cc92f7ef2cea074f8d47cad0ce2d782a87e8c2d9e59aab3a6f51e4b5fd7ed5ff67dc9
-EBUILD aufs3-3_p20131111.ebuild 4897 SHA256 67f23da4f77e221710efd8b98e27db6c3892d9ae7cb9599b2d88cbe4d360a66c SHA512 8bc372e093a81f00b72ee71cb3a571357c48897cf114d7ceceb95d2da7243a1b3240741ba2ee6b73f885938c78c8fa00449095ec079a534a8be74ae1a8642524 WHIRLPOOL 1f8c73049f6d01e2c28182ddc5f77c16f1df2df7fd52341b8400783fd096436eefff123422f3f2fdc13dce257ca9a5492cf9dd86fd82f3e0aa3056b0d1db86e6
-MISC ChangeLog 21085 SHA256 78ac02cde464d6b1f6b5e89edb8215acd428573258c58fbb9d2095a1ccbb5f2b SHA512 181c39d14bfc3e43c2e21ccf91819737f75f2180bf9f374a390e4674943e6765b7545c2185f48154ab198b133eb5328acfb51c28115818fa2bfd24bc618b45f9 WHIRLPOOL 1648ffda8a635e250293671e52eb2fe22710562b9a941014ae0d64ea9b30bff4ece5a6614e903cdb905ce9b51eb93e7e58d367cf50b731f8cc6abe6d7d684bd1
+EBUILD aufs3-3_p20131104.ebuild 4809 SHA256 cb0c01aed81754338336927ff35284ac2cff0ce8b5272a94cf295ee0b8c74b8d SHA512 509f89b70a0368668b2018db5d4a92007d14f03422ca073b1ddddf69522a70ad6b44739f97d0734fb66c33bc5a45358988793a1ccc3d686fa0bac4c86ced13f1 WHIRLPOOL 8e91beacedb3a5426cfde66ca459b5bb7d9c146befc35afa613c030ccf8bdc79027790b300ca663432f5f123a64a4f4311f6d1af2599404862dbbf98b1044f0a
+EBUILD aufs3-3_p20131111.ebuild 4897 SHA256 571a63e08679984676f314825d312eec4fa37fe068ec5d92af335abe0a39dfd2 SHA512 5d8fe51cfe405187a67b73ef9ba4c64c2eb83e8b2029312be7087f4554fa0338d379538db9a89c5bc33fe096ae1d07a41ab42a10a42765261b527f12b78f917c WHIRLPOOL 8ab503532cbc292b962939970aebb196d728a2e1afd1819e61872bf5bd818596d42eaaa2288ff1a4fd3efb9fb9ed9793244402600bc70289b3d15c09c37e7c35
+MISC ChangeLog 21228 SHA256 fe7e17f906b91a8bc999254a1e8fc657cca7066749587ed32d3969f640b20791 SHA512 60386f6e200b39ccdfcca6c38df59419249c195c3987fd5ea3005d13d98d9ac312ecf2c38c2b9b32c4253212ac84cc6fff9d88ef0f524a98c565d48568f3388d WHIRLPOOL f436d8a09f31808d75709b405b4e42b574a06a9b81de8271763fcb509a69da471358fc20dcf14952c972b3b0fde786ce76920915ae3d226144c27041d11646ee
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSixHOAAoJELnU8jG9FVirGJUP/2hXzMtNpNzVz3O2Fiiquv4q
-wo1/GtEucga4TpmovllcZt2eD5fAmGICXamt4Cy20n6aYIonArVSMUhfWzqWa2WE
-R/WQj6GCgJd0xzTlb3S2ECoaXt4Sf6y66kOt5dYY6i/YYR/UkwnTuvW/KhkyQ3Ih
-PmrBWcFyvemO28+AnP9hyB73xkK/Gr0Tltly9O+Ita7D0PqLGK3QLPhD7RvihG8j
-2IZMmEpsXDYpsb8fpiixAfBs5D4eKugMmKgiJ94ePDr1hsyfLOBbwyCVyCWvMjt7
-56RJicPV93UWy+MUddrcQHOWHhS1iVpGDUC7Pbhc5KmUXF8bvJxFbem4fZvJe4Ld
-0zDa5o3kgQH3YsY0UF98Fq9fBnb2efYWUN46Md7ST1pYWZBavGNT+D/PpykOx2S4
-yrRTNL6IRxqft2UmtS8k/O5v2gRVFYmC7anvOdk/k1iFm+PrshYCVo4c89kjWfwX
-SGzLZSA6PTCz+6SKDfoaBUHIpUxn6RNqjJep7a2B8y71dFRV9vlEWwcvA3Fhoso3
-PHnEw5/+TFSDjZIZyWrudtKfoh3eB6tcC0c6ZXgKeQvstILa8dp4VGEL9fnAqB3f
-AqwDbAnQF5K2i7LcQowmcPiw7eFE8ACAcT9ofOMixdhW9nGV1bM0BjinpqFy9VIE
-/LYRKAyMt9v1tJRFBfoZ
-=+hLS
+iQIcBAEBCgAGBQJSiy96AAoJELnU8jG9FVir97UQAJt/I6nSffxAc8ffT5CP6Mf+
+supUuohHkKQLYaAL00iGfXlkLxYfgpCIhKehBsM+7cKlHuOh7wzq/e2pDD3nTgcT
+U/gl6tYdEp7h39wuKIAgYD4T+yQr7YZPtj/akVyNvzizFOUEK1NuXzxgF2yUsw3/
+I7ZhMTvho6KapLb+Ap9J1X4yHsDW0xrwX6rXOZUo02qcFo22wpAdT3sHwJz8P6CX
+C0ZBjvGGyYXr/ivjo1eEgTlmfVsaQDV09isXSekiivdrFN1hEj/63z+BpxYwZY6e
+JKazWlGXJOAt8982bBfhHLpeayS9MjEFtC+qCzDJmiccfy3hjBNxeVlgmJLrlIU/
+85qgkynW8FYUYWTgwXdcmCV7vp+EEHJ/4I6Gm+ox2bOq6abAXsEErVG3ZZ4G5YnJ
+QATeCPVCucd5FdpGygvjcfTsFOKMHNRgGNBEbjdp0QK0JNoCUkFLxs0F7tEIxoH1
+SvukBunPN/Jq7m7fYLxbLdAVBikw9rRfOJ8/SBFiracLUbv89+HBhNHORV7XHToy
+qhuw4IAJCVeB8rie32ppMEYvk+T4ZUQLWuljNdW3hEBy5aqySszUV81paYVPtHbE
+WzsuoMONrlFz4aqq09TMF7kTYEVSn+vU3UmSTmjlx09a60UBii4j3M63lBlGWNpS
+RxtQ1f3otanMtwmmarvv
+=BN7N
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20131104.ebuild b/sys-fs/aufs3/aufs3-3_p20131104.ebuild
index 6379464cde10..fdea4cd6e884 100644
--- a/sys-fs/aufs3/aufs3-3_p20131104.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20131104.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131104.ebuild,v 1.2 2013/11/11 15:45:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131104.ebuild,v 1.3 2013/11/19 09:29:28 jlec Exp $
 
 EAPI=5
 
@@ -75,8 +75,8 @@ pkg_setup() {
 	cd ${PN}-standalone || die
 	local module_branch=origin/${PN}.${PATCH_BRANCH}
 	git checkout -q -b local-gentoo ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-mmap.patch > "${T}"/combined-1.patch
-	combinediff ${PN}-standalone.patch  "${T}"/combined-1.patch > ${PN}-standalone-base-mmap-combined.patch
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
 		if use kernel-patch; then
 			cd ${KV_DIR}
diff --git a/sys-fs/aufs3/aufs3-3_p20131111.ebuild b/sys-fs/aufs3/aufs3-3_p20131111.ebuild
index d51386f3a66b..6e71488ce90d 100644
--- a/sys-fs/aufs3/aufs3-3_p20131111.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20131111.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131111.ebuild,v 1.2 2013/11/19 07:22:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131111.ebuild,v 1.3 2013/11/19 09:29:28 jlec Exp $
 
 EAPI=5
 
@@ -77,8 +77,8 @@ pkg_setup() {
 	cd ${PN}-standalone || die
 	local module_branch=origin/${PN}.${PATCH_BRANCH}
 	git checkout -q -b local-gentoo ${module_branch} || die
-	combinediff ${PN}-base.patch ${PN}-mmap.patch > "${T}"/combined-1.patch
-	combinediff ${PN}-standalone.patch  "${T}"/combined-1.patch > ${PN}-standalone-base-mmap-combined.patch
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
 		if use kernel-patch; then
 			cd ${KV_DIR}