Only run eautoreconf when user patches are applied #496526 by vonabarak.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 25 insertions, 22 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index b5ca68a3f288..aa57c17ead9a 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.191 2014/11/01 01:05:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.192 2014/11/01 01:08:12 vapier Exp $
+
+  01 Nov 2014; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.6.5.ebuild,
+  cryptsetup-1.6.6.ebuild:
+  Only run eautoreconf when user patches are applied #496526 by vonabarak.
 
   01 Nov 2014; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.6.5.ebuild:
   Mark alpha/s390/sh stable #510342.
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 1f2e4ed092b9..af8364a8ddb7 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -8,24 +8,24 @@ DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2
 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1
 DIST cryptsetup-1.6.6.tar.xz 1145940 SHA256 2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f SHA512 6ee6b4e8fe4f721bb97d1cf47c5e2d1c96001dd3ac48154d414f64d23620ac3ec3eeea2ad584a1a3111e07a086c8a4fdbfabdf4859cda58ba2bd6765b1f009a8 WHIRLPOOL 07bb6b7f5153cfcd3a585f111733a05926d1f6f0ec190e0b0dc1777591bd0fec3c8782dc79f43bafd3829da28efbdd2d8f97daef8186392787c22c7f5e454376
 EBUILD cryptsetup-1.6.2.ebuild 4328 SHA256 aa742eb9697b7e8550483250c344ccc9b421e40e2105b99f282b7357da6f961e SHA512 5522cd0b7544b5b94002778ec9b8007a2167ec5985d8098e73c55c47db5966020be3b53a3996e22a9034fe11139d3af3bd8cc34cff877c6fe90d363469d224cc WHIRLPOOL 5a860f9f82fad880e7d026685ca24c44afe4ecf81c5a1da07f5f14c4f770617157e94133594876a51c90a5d7d4d67f79acb641fe4f69b41b994e562b11752adc
-EBUILD cryptsetup-1.6.5.ebuild 4378 SHA256 aa51fe50b70f03f1d90edf98acbc52b8b7ffba351258c49df6cb2f83e45e38f7 SHA512 1541a5aea9c835f7a30f475644d8da2253b2734163d9765ed0f782b0faf2d02fb7fc55282fedeaabcf8d809e1b070ad98495c48f6b0380624a7d5c53eb2ccd99 WHIRLPOOL 470c67a5f467d663566829fbfab9b62662f9ae55dae7e1bcb020d014b77630471f3280a00fdde15b14ed87cac0a9bd73ee8f9d4247d48de82f66e75650fc57b9
-EBUILD cryptsetup-1.6.6.ebuild 4721 SHA256 fcd65b3385187ddc98c222ed143b904719da918dae9a76662c2ed67b9ece4cc3 SHA512 c506d896045720a44a0a0fa83672adcec6e9389bca2051f839cd315fbe0dff0b0e2a1452d5d161403129920aa6983f94cb74b0e78f4beee2984606485045a516 WHIRLPOOL 79f97421ce46f9030609fc44a40f01efda64a45e908beb4a9e2a89158305a4c9ae6724822d3a2b644309cd84160b51db4988b376fbee3600cab3896332e95de5
-MISC ChangeLog 29530 SHA256 342f7824485a2e860d0a31df785b133497ac280ecbbcfc7d04ccced02fcbef81 SHA512 1fff0874b64bbb98f8e1f159889b64298f7e8321de3ded5aa270a3890e8de22032d89f4148b2e232886675ddee0dcd70c222ebab34cb29ae4e913c4392a6f3da WHIRLPOOL 0d4c535feb1c411e559946345794c47c347b98f37b32b82dc40f2a7223cd55adf0598d43a94e4793f5e9990c74d67ed916a469c6aeda364fb44b5ce64e032e02
+EBUILD cryptsetup-1.6.5.ebuild 4393 SHA256 e26470ac83e8a10d66796e55ad198ab8c3f7b909d90190d2810153685e0583b9 SHA512 7f46a004fe0dca8aff34d725c181ab6efd861a952cd4ffb2e8096275aa932f52d08da4703b6aa9612aefb814b3c737140cbebee7f18ca8a90802ce23375ca61a WHIRLPOOL 7c84f69244d481e70164ff5177c317bcb34767f1c7f4c9d077dc912c9d2947be7f9c18c9a91f7b03a4be349e37395474d6b8cabb0e2237a105cd0b2731e658a9
+EBUILD cryptsetup-1.6.6.ebuild 4723 SHA256 3afa61657bf06bdaf4d6a25cf8566babb368bbffe830b635ae837ccee2b2dc06 SHA512 2175326d90d60809c007c191bdb967ad484aa7f95780a567cda23e74c2b365409dbdf25a1e422d9a76112e81d97d4971dbb6f83654dfebe67288ed847f390df6 WHIRLPOOL f7c285f3245e13db8e4c2ed1078c3e74427b2b379117312a29bebcc80292763895d240462d9de29e672e92ff76149164aa219b8064e7d1d06dd9adc66234dc9b
+MISC ChangeLog 29708 SHA256 6ce2fa523e54e059fe740656ac2e2c7efd362562f93a316a5e35884db190294e SHA512 be6e178e3e12f77a6c5769dd2d820fde03b665e37d870259a79cac5bd9ef171f962500eebdb72ae4de879e7d3a37c765b65b2996cf3c7451324bbcc77ca5c592 WHIRLPOOL 86e6de8ec777ecb99ada6d71418b09ddcb0d15a8b8ea9e0f901ebd6925b7cd3ae27a4df7f92eb6a03b07c59b5ad183d43617b0c0844bbd3d041aa0d77b5a1251
 MISC metadata.xml 704 SHA256 a6a68f12d487945078323f4ecf95cecafe2dc79d59955ac05cfac6b2eb57dc95 SHA512 e9fbca1861a9b07416322b475fdc400ba619bfb05a2d81b2620c6e14acaf7946da9a9427b1d361566a130e839818381aaf6025569745a0eedadae1b7a74a298d WHIRLPOOL 48f60ffe6590eba6f3ed94ebfe019dd2c811c059f0a2f0002cdf2dc0ae5e733469437ef2df595f1bd2e9f1729c1585555cd36bdfba4d8e7dfa62611535dbd898
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVDHBAAoJEPGu1DbS6WIAhJIP/1+KkIfp//55pdnuinyIAz+p
-8P904m4++/mBh8Iek1k8PirCsq6sByMgbdNJOM4uYY66RKLPuTn6TGXd9rx0EUg0
-vlcUsN9JbGsnFledmCtBIGv1VDuKizH9eZwOB99baXzeiFhq8kCcp2uhuZEc4qug
-zPLxLJJATIl01L8HMI3iW5eL6Xx484gOe1FtSq7GB8Vc63+obo8mqTnta3aP5z+t
-seBPYDvr56tYKxTBmvIAAjiLROMkOxOhcKZaujyGQsqzWOyoq6Ck3UCap9GskE5r
-3vNQhXuehwWnphzHk921NqoB9NSOKIrXzSnq6wxql2jRbMWLXe7TVOpe9B6hb6PX
-N2NN0pRxQKrdjRZMsLWDQq8AcjGQBafqWgNxlDHtuvT9Ab/v+u+ePbItulYxjV/U
-GsR3Lu2ewPUecR/HK1K6BIimT8K651v0YRTGD70mu4oxzf/aDixyrEjUNBsvfDtV
-/77A9TxpBdWKEk/XjAGld7aVHlLt5vuOFzX24FykIZLAZP4q/ce9UNyvztcOtOAJ
-glbYVY58J42eaBCgG0HNfZgkTzj4fvs564fybJeWtcYJgI3ALt0misrPRFv5PQDf
-+hQgCjtAMGIz1t6Fddgu1ZZQYQojUMsQVuGr9K7B829hbEzYEzINhG9u406GU+8W
-gJujRi1SHQBFPSKQOzfA
-=KQuP
+iQIcBAEBCAAGBQJUVDJ+AAoJEPGu1DbS6WIAkiAP/jOdIKOpMUuUsjg8K6ZnMv/m
+H919eE2nbgZRhjmsNP2FE4SZ39wq6D9CrAeSVaXdAB4qb9F7ERgbz4yiZgkEJB4l
+NMbVb5R7VEb0KubuKPR4bxT3TKcPI487XDWoFi8Qe81FUo4OjzRQyNIfgxRi3m9H
+CmQ7i0B2eCQJULJpCjeCe5FfqcFGh9ZfU5QSIHqPJ2CCR32wRKNXFtE078kXxiy9
+HlNus/rPUl3RkZRj29/OAqWklkP3ELot1J9dSxhGSA2rOSvtPJ4nF1dZlZGzTh25
+OxmBuufupUA0o90jZw2Q/vMMdM2AYmw4J2Ip/6e2k5LQrfAyuPNvblPbXTknujxt
+0X/ynb1nxSq2ASlCJSxPyZJLheML+nSPk157ft9DyMfXdCyNHgsCYmDq7ii/GGNV
+Gt112bLTrRo1PduHYhvsxzRAOPviMIpLktD1ztgDLLyxVrEi0oYkfco/CDIOr7Le
+fqHL7XorYOwjtX47BnngbyPSi4ghsYFQ6a/PuB7EahT2dwlJah9Q/Lt/y6pbbZ34
+7aVPcK/r5NZMiAS4NfDPH3KjHUZpLIjKT271gilDny7s01Qwax0OW4Fj00GcTAB7
+uDr37Kskp2JICEuZdYPHO7xtX2fmMjgwVvUClib6jHSx+teaQ5qMw2Do7hbHGOgC
+gb+KH09iEQmXk7gCtdJx
+=FTyE
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild
index 6154364f212f..db6e3a9a83d9 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild,v 1.15 2014/11/01 01:05:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild,v 1.16 2014/11/01 01:08:12 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -53,7 +53,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	eautoreconf
+	epatch_user && eautoreconf
 }
 
 src_configure() {
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
index 741d775cdee1..15873d0f1203 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild,v 1.7 2014/11/01 01:03:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild,v 1.8 2014/11/01 01:08:12 vapier Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -53,8 +53,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	epatch_user
-	eautoreconf
+	epatch_user && eautoreconf
 }
 
 src_configure() {