Drop old mail config settings.

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

4 files changed, 21 insertions, 41 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8d6faf5bc801..8e304d987bcd 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.423 2014/10/19 20:32:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.424 2014/10/20 05:02:36 vapier Exp $
+
+  20 Oct 2014; Mike Frysinger <vapier@gentoo.org> -files/bash-3.0-configs.patch,
+  bash-3.0_p22.ebuild:
+  Drop old mail config settings.
 
   19 Oct 2014; Mike Frysinger <vapier@gentoo.org> bash-4.3_p30.ebuild:
   Move bash-4.3 into ~arch.
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index de9e5da75c13..d7d34dec7faa 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -11,7 +11,6 @@ AUX bash-2.05b-parallel-build.patch 426 SHA256 74244a0b736396213bb2b9d7dcbc99d21
 AUX bash-2.05b-protos.patch 692 SHA256 1df3b05232723d00ba0f76bb18233dec2943da63cd72e1161a6ac82592ba5837 SHA512 77a5d48d629cd127db6f7163fd9ee4e67c22b92007cb5e9fc9f51c83427f809dd74f176a521a7d8e342127419c872c01e29b921f48cea5cb8e788ff5f51faaa1 WHIRLPOOL fa54af517ecd99398b81a46996b18f05c7a13191606a0780b01ff56f312ca44590feaaf3ae410773454d28d00fd112213d8780114fa69a51dc78f36cdb825a5a
 AUX bash-2.05b-rbash.patch 616 SHA256 52c6515e8333d7461c5d4b13cd45645a072c5c0258f34f3e03262952589cd60a SHA512 bc4a6132a36b65794843930e34abd199d9c5df7838c49ec3edf47f92e0f09877a31df051689a8267eaadfbb743934c2f4f25ab8a2ca07d1561dd6ec8c337a53f WHIRLPOOL 9cfd3fc03fc4c1adf5b03962aaa346ce831ffaba8aac8206bec9e97a2b500c72fbf81d20de698677a64ff1db1198adf965b66dab81141e75e0a126dc4cf16942
 AUX bash-3.0-afs.patch 633 SHA256 4c4453a7cf5d26099d41a4c473d9f727e6347c693cdace009bcde0fe5aea27c4 SHA512 833515f5b4040ffb7e65b410aa860da73a2bf1d9b4da7ea74ec41581fcb27b0ebafdcbb041abf4c1cebaa3d7b43ee6ea11f7c7ecec5759530ce0184ac6029f3f WHIRLPOOL 6b1e5b03c700183187bc4496296b2938d9c18e5df66e31e8440bdbd49bd2090485b5d966726b157348384e74a8d2a73228da8424332b132be2d76dd2e99e113b
-AUX bash-3.0-configs.patch 708 SHA256 dd7ce29ef530b038cf7bdd7be7a44c45cf84aae5498da2639afc95033d53016d SHA512 edf2b6991d17d8883742b3ea1d2541abf30395c4cc13b4ca811e756eecfd57f69c77d600de7cb7c9874528ff9a7304e1e170c4475bed7ed68e8a1d1eb83d23f6 WHIRLPOOL b98efe743552fb64e6d6f70f91a0b20a2e9c2fb4e2868cfbcdfe635e103b6c32c22efff564ce483cd8f425c73fe3b701c093830ffcba1f6926db5b0b2e840260
 AUX bash-3.0-crash.patch 1191 SHA256 b082ac3e1ede7327a9147cedcfe3c0dbaa1b05ee6e9eee3ac838216ba7838eb3 SHA512 e9fa172d76e1a3924c4795b7bb26a0487ab50f2d0714178076b6b9f85d7712ffeb4165bd591cac97c4c2288e39fa2bdf3794f29a7f2fd28e2d971041d16ff0a5 WHIRLPOOL f026c11a5fcf72f776207e91dbb48f2c87fc791d36eb83c6e79dbf9fda9aaba0dcfe072d0e7c51a6298b580ffd87006943d96785750a90236ad314de06e78eab
 AUX bash-3.0-darwin-conn.patch 969 SHA256 a99c26c8b6d741e5c042fb4d3e230fb3bf0c88979e806fb1cbea720f0ff0915d SHA512 cc85dbf39df3289e40ba33626d2a0ad511145ea3cc8dcbed136ad128181022bd70c3a4f7f8e3146bcd027d7999deefefe8496d5eb70ff1a70235950a01f9376f WHIRLPOOL 62e6bdd6b9fc6b3b77af2ec605669982bd0ba156a42c910531b3bb7978c4a9cde5d73242a277949bacdd12c89dc5ccdcc45546fec8ed4e07eafdd3e0dee354f6
 AUX bash-3.0-histtimeformat.patch 1784 SHA256 d02e10e0406d2f219903de71e08eb3ce2234f0621b6b5cb977f89e710be4e236 SHA512 36ce1afa92707a4c43f212119fb2562fee0f1283bee94d892869611de1f34869b1dcf737746ac1887c1ee8165079bdb4ae6cb353a3cbefdf1cbbffb8b43a23e6 WHIRLPOOL ccacdd0534b57a83462cc76b55cf24cffa5a768ab5bec2daaf8b7ab89fd5f33fbfe7849fab379509672c95d981f0af94d2daf81f11da2bf45b83793f75484548
@@ -331,29 +330,29 @@ DIST bash43-028 69606 SHA256 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8
 DIST bash43-029 1824 SHA256 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07 WHIRLPOOL 857275184a8a449461b5aebba12d8231e1e33a2119693fa2c865ead18d4c462dea8151cfc3e0d121c2e5569d9984856ba69820aaa54399ddc77bb849ea9de890
 DIST bash43-030 63206 SHA256 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4 WHIRLPOOL 2184fa715fb90de89f18ba2b27dca612b684a85e9228d58ccf2d62a96a2e575929b3e1a47fbb5809e4c231a6657084be4a076271cfdd5b8b7dde493f2cb40a01
 EBUILD bash-2.05b_p13.ebuild 4466 SHA256 4386278a0cfa0a193a532a40438548f869ac709428cd980532a5431abcdc78a9 SHA512 eebc85a8c2ab1dc644d7e6493bac3733f9014d84ba8dfdac2edb305f8a32e61071a5827610792fe7dcb78535f32d7320be5af2aeec0675ef256abfc88fa4e005 WHIRLPOOL 5b244caeb45963c515930f3feff4d354c9568b7d3b5f51411455cde2c87acde9d8c1c0dda994533c1fa10020f75ea7a10b31fc4840d11d8cd65411e1e5f0b4a5
-EBUILD bash-3.0_p22.ebuild 4849 SHA256 ac436334f210b8162c5fd30f3f95063373dbc0c2feba9203f26a151d6d274b04 SHA512 8203dddb993155a9af1b5df3763952cf384cd346a5dec08a42e12193ca602f0ceb1b12a89a6fbd835394c5dd18a79a1d09f539042b1b5c9b1a3ac30641bcaa02 WHIRLPOOL cefb978415b916b0c959273348744af095e8220ee14494cb4ba060bf4c9cdf27da8265c2a92f665b1420adab80395bf31510c3d1f7a4d6949618b1172b57c3ee
+EBUILD bash-3.0_p22.ebuild 4803 SHA256 2101d5810499998dd1afcda4c918baaca9493a4e9a43f37e9aab52b1133fc685 SHA512 d7a94c6cdcec72a29d75a40d00e5e5f1422467481c2ade5a15572ee6621bb98360ae0a9bd6138854dffb9490ee9894dec2c934b83a67cb748604a006059f8e19 WHIRLPOOL 65f09b493a2a5be66ca7819e24fe725955977b95c40127a9e092a401b919b25e5b7413975b2fcd9f4bd01c4f908ce72985925357249623e2699c8947c66d8744
 EBUILD bash-3.1_p23.ebuild 4484 SHA256 004881a598cfb29011060c5542ded704c03e2118ccea55387216d7fc4f3595e5 SHA512 0b068b808990d616f9b8faba3c176cd9fa5e5ff29c2853a80b490315541946acd191f668ceb6a6276bdf47a81bdda211b262408464b61996dfc4411b6b9d0736 WHIRLPOOL a2041dab258de6a39e243c6dde025f222f11fad89f04eb8c0701467a2518934d6c3839150088ed59eff21353a94a8452d70cf83ded110693252c9fc6b6716097
 EBUILD bash-3.2_p57.ebuild 4591 SHA256 bdb294f5741c71afa3543643a4a45110fb236b91ad62df9eeda155caa3f5e247 SHA512 6c761a84baaebbe9db2a7778ea36a90cecb91b1a6a4959d065ec64c1997ac7142e8746e0449a0c87d686f467d341beb0db8f0edaec46f4407ba070939089a5eb WHIRLPOOL 0e5882207595197cd51a53cf627a8c2d26b986811b272d7d25e63e3929e0b5f43089880bac3c04a13901dc1add6d06b252c2d9b43b1518443d4582db5323b790
 EBUILD bash-4.0_p44.ebuild 4465 SHA256 27dbd1c269c97b40cd829cfc3e9050acbfe5960c16f51739ea75421c4d9c1e3d SHA512 431771ab2d4d8f6281e65f7bdc91f14474244bd0bfbac4d200a89cef4b032a18df626ab85e19490ba47ae830a50b8d6621738cc06f299fd3f980727c797fbac2 WHIRLPOOL de45d0a3917de3e5879750a70a5be36351f21ace5086923ac36ff73b23fb34845fd577fb3b6e575a217eb30f7a6e2bdcfe9dd60df94752636baa852b2ed5bef9
 EBUILD bash-4.1_p17.ebuild 4200 SHA256 51ef8ecaf92d851c4949c91456a5c0325a328ca3b32afcb2f42a09fde87a025e SHA512 2f55461af1796f5c4dd759b46b9d42cf8cda8fb3d912887460e2d4d36198dd58fbd04b6b60aefc25970442607012bbfa972a43911bba938ef7806e4ce93fc708 WHIRLPOOL 51af146187f894f65f68d8de3e9dd03970817bafe5fa4f9d4efed7da81024af19ff1e78717f7a144091955613818385ee08ed0a5c7e8bbacd523788edbeacd50
 EBUILD bash-4.2_p53.ebuild 6629 SHA256 c6f50d54aebaede7c66c5090b4bd5d8b7ebb8e5a1064dfbd34d0d8b3cc00ccd5 SHA512 87a7b0b0afc63bb7bc60bf1a594368df6db7f0c5451ca9c04e558da5e4d28e673afbbb2186026d51e671ff958a421731af141a75f18a8714067df5eced79b716 WHIRLPOOL b8e488e8bbba07cf0de70720d0d0186eb133fe3ee1325901000cf7900aa8d0531b466cfb4d4c76789d1ee8156c0b14be6e4c60534e435303a361569416809602
 EBUILD bash-4.3_p30.ebuild 7155 SHA256 76a929e8b60b1c25a55bf4d2a9640d3ade6f13440e17d9324b48ab8239f6b9ff SHA512 55c89fcaffe5cb743eaee3f287dcee9e20564b2d13058c43127de75780824581a5647144e9d153dd79c8de192476cc9acc09b4d8f7a070c614d8806472634417 WHIRLPOOL 21fb1f215511ad9830f006ff720868c6fc1cfebc477f85ff53756c9febfa6b75a79ccfcde3833b43cc2f5c5e630ff912c950765dd7a62d3989c82d1af9b9456f
-MISC ChangeLog 72217 SHA256 a589eff9ff533132217b3f4984d83acc746a6424bb8dae2ff7b4dbf9d70c4c75 SHA512 3561a552598902f46790cf65f6d358a8131e7831c7c6c2d59a213daac2fad74685926eba4643fd8f4cfb8246d3c6218d7f8bccf2e7cb5eb0621160d9b30c6494 WHIRLPOOL 93455f27863164e21b60f7452d0c3c6d509db724d1ccba5b0a1bf731e646db4fd46bce3372138abd16de1669aa6150bfdfbf8996a42e9417352325eb8384491f
+MISC ChangeLog 72355 SHA256 c01a3c3589d07c6407a1684e1b8b4e4cb1c132cc8fbd0c203c10926a4838b41b SHA512 4bf14443998335ca2730e4752075eacaa94b3f979756d5be0a51d268dabc79f15c81e5d83623edec4a8eac368d61df0f6b69607e6e99d1aad74077ba336d8aa9 WHIRLPOOL be63fe9b64922fa9cb694f3b0aa079031c127b7e6c791587b50284134ad6b831efb0cfe87dfec790fc9158a31cc872b4dabadfed0a3669df02fd5af206cfc038
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJURB/xAAoJEPGu1DbS6WIAHCcP/ji9OcFrD3UL/sVpxbMMLa4W
-Rzm/BYDBm0t+xLcWuUk60icSjIZVp8KIvMrNvqVhS+xWqNrHOXeQ3UUhEg1wcXJI
-Y2gOtw/YCCwdFFJ+ynrj+p/6UEVGbJkrChVdrTDOvMxnFXlzKMgN6bofiVx6WsX3
-THKJpodeKend2Yq4n8C1SYQgf19c/wo6I1Mw5L7BTYGI9buqqxJxmxgo0GdCYnKJ
-rt26FbYL/GW4bVLPo1Z+bAVTFvbf1DOR8StPSz7yasxrz2iAXNfhflkooOMi3UkB
-6Ezu/vepJIA7rgr5brsKonmvRtOOlJWYA25EvjOvVkYOEOsh687xOLc5Z/XPymjM
-2mAXJlZBLMjeEmDgqtWkM9HQMa15yB0tNLGx7T8yO7r2qjSdvVoyn3J11BQpmUDa
-LX7TrAlSIwTsh3T7Bs0V08fbDlAdbi0X5xnaRemqcNexTLEcm6c0+lxutmHQCYCN
-ZltHfkGuGAU+DNN03ZMRAGQ5lz2eR+mviY8bLBkhFxeK5fu9oL4hWrpFq72lhQx+
-BiKjxt/nELOUBwV7A3Ai9RVFWD4Zf73NhTcR3HTLH3NFpwlfD4YwJAKPdFHUToT6
-NdbprMYDGP53TSUBJFuH+3ML/fteiy5yTVrrra4IrtccMcLT4EftCrQsSDeDEDcE
-mMWT3eyl1LkW622lfzKw
-=7UXN
+iQIcBAEBCAAGBQJURJd3AAoJEPGu1DbS6WIALAgP/3CafMaKQh+Mbpr3I5MBe/G+
+ifBD2SVenP4igGRNMSRTuIAkd9I1Al5bhiMHyZNAkCx5LSu2svSbzoS4jOPrqAsq
+qIJB6ZMBWwSTMZsKPbJY9xBdhc7+/Dji1/xS6lV12V1fsXLr4lp2Qshkxp7DB8if
+7R6XxjdC1llorgwicIGZozNYaaHmbxTYPGzt/SU+yaQa8QDydypuWa/ErDaBcbvN
+3F/V8y6TWl3627gu1Wcewy+L2ZxexO52P3ZPEDxMgfgrb8z4d4DIsRMlOWKeXSuy
+J3f4lGd0Ra18Z+kjMGg9CLtbkKm6DMSf8gHEJzZ4O7FFCHc6tPBGN4vWQH4R18fa
+wHpQ/lWGgIEB7QWc9AyUW5IQGTZgJwejo080uh60jaHjgBg/RJZ7zA06QVzjdeGT
+ja+oPGPan2erJkCRVjvFGaowgA4hwdJx//cF0h4cUi8LO9ovUj/bwOFFpEXLJRAJ
+Mk3jnKpzcsmW/ATnNx9DAI88PDFKdc7AMT+hJhVPe6cnR3F6sjV7CdaIZyxHlpJH
++XQYTbo1LqA9xEEP7uu62Z0Rzg6k/nq1ZHFJSyt4o6LOtCtUw+BYMgMCu+MdxOay
++A73u2q1qyxs2omOBCwEsLAbIsnfJc5iEVqrvc/O3FVFMXhjTxPwOhXuAYLHCDML
+XwAmQDnPlcxEZ29PEfEb
+=HCw0
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index 765314adcb36..cdb98479392e 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.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/app-shells/bash/bash-3.0_p22.ebuild,v 1.1 2014/10/19 20:31:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0_p22.ebuild,v 1.2 2014/10/20 05:02:36 vapier Exp $
 
 EAPI="4"
 
@@ -80,7 +80,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
 	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
 	epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
-	epatch "${FILESDIR}"/${PN}-3.0-configs.patch
 	epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch
 
 	epatch_user
diff --git a/app-shells/bash/files/bash-3.0-configs.patch b/app-shells/bash/files/bash-3.0-configs.patch
deleted file mode 100644
index 956d1dca45b8..000000000000
--- a/app-shells/bash/files/bash-3.0-configs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- bash-3.0/config.h.in
-+++ bash-3.0/config.h.in
-@@ -197,7 +197,7 @@
- 
- /* System paths */
- 
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
- 
- /* Characteristics of the system's header files and libraries that affect
-    the compilation environment. */
---- bash-3.0/config-bot.h
-+++ bash-3.0/config-bot.h
-@@ -178,4 +178,7 @@
- /******************************************************************/
- 
- /* If you don't want bash to provide a default mail file to check. */
--/* #undef DEFAULT_MAIL_DIRECTORY */
-+/* DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it
-+ * DP:   can cause a timeout on NFS mounts.
-+ */
-+#undef DEFAULT_MAIL_DIRECTORY