Update to EAPI=4 and unify behavior across versions.

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

14 files changed, 166 insertions, 188 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index f84c4092f7d8..da9d2d3da3e7 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.213 2014/11/15 04:27:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.214 2014/11/15 06:07:49 vapier Exp $
+
+  15 Nov 2014; Mike Frysinger <vapier@gentoo.org> automake-1.10.3.ebuild,
+  automake-1.11.6.ebuild, automake-1.12.6.ebuild, automake-1.13.4.ebuild,
+  automake-1.14.1.ebuild, automake-1.4_p6-r1.ebuild, automake-1.5-r1.ebuild,
+  automake-1.6.3-r1.ebuild, automake-1.7.9-r2.ebuild, automake-1.8.5-r4.ebuild,
+  automake-1.9.6-r3.ebuild, automake-9999.ebuild:
+  Update to EAPI=4 and unify behavior across versions.
 
   15 Nov 2014; Mike Frysinger <vapier@gentoo.org> -automake-1.13.1.ebuild,
   -automake-1.13.2.ebuild, -automake-1.13.3.ebuild, -automake-1.14.ebuild:
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index e40de3a82d98..277685ff1b48 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -37,34 +37,34 @@ DIST automake-1.6.3.tar.bz2 476275 SHA256 0dbafacaf21e135cab35d357a14bdcd981d2f2
 DIST automake-1.7.9.tar.bz2 577705 SHA256 32c13b6ad38ed5e7bfd1756cbc19cf5efd67b7ade2d06000a4c99b0ce94bd46d SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2 WHIRLPOOL 0536bec58cc4fa2ed739ba473443099f1f4a33b5cb61f9fb04c4901baa694643debd3028c8acd764b1609f439b67c02c6b4ed6e1e8b34a5f09d2280d896345a7
 DIST automake-1.8.5.tar.bz2 663182 SHA256 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0 WHIRLPOOL 6328e298a4af1bbe2ca360f380064b6a1b43c9cf9c361c3dc4078297c3bf77c0bfe3690b1d9f2713ad2f28970f033880b40f4b077d5734c0e03bd35aa4bb18e3
 DIST automake-1.9.6.tar.bz2 765505 SHA256 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e WHIRLPOOL 76d59f947a2dfad4ca70c888d58b15f86670f0df6156b9f1e9f2ed03ad92468ad880ab47b505b31577b35b376a799b6de0ebab46f17516440772a1d3eb6b7479
-EBUILD automake-1.10.3.ebuild 2256 SHA256 f9ba06a48de47db32cb9024596d3e041e8ffa9255282ea106366ca80b10a5b0e SHA512 1e1312ef3f1c20bbe2807635ec1944c09612cb2c57508de6f36c21ddd0bc32bfb4ede01d3b3bc35b8a020e9a5cac25e4fe05a580781ed750b494df1775a46424 WHIRLPOOL fd6c0908d1c923856216f3b22fd21fccaed0abe3d23ccd9754773af62bead541714c622fbc44a0138885d4354ab54e9c3404f7477a0f73634a706cfc5f4ad84b
-EBUILD automake-1.11.6.ebuild 2842 SHA256 d035481c5969d307916436a039b1ed9c0bad383931c97df72a40c9161a8cabd7 SHA512 d8a06fe7919da41b28f8ef8d208844e6ea6e4f3aa2072718d1102251ee2a07d2a440e36c9c0e48e4931df1b0e95ca6e1db894686b125f0ed5dfdc6a002a113b0 WHIRLPOOL b3fbd02d307394f0ef700efaf27e155c803bbb443740d2855c3e570065af4b308f629b2c82e1b85071999deffa52ec97a08e49f234433088e90a88aaf9407298
-EBUILD automake-1.12.6.ebuild 2803 SHA256 473ee933795eed9e7d475af659fdc23ae49682cc57a9716dceae9a715297e697 SHA512 8d04234f6b806ddb84136f68713d7b550b61b165c8566e6cb77b4dfe52e667aa70f97a159e2900c716c1ed5b430761f944c91e04384fceef7679f8ba523fafcc WHIRLPOOL a0510145ba280dfa6f9c4af4e6acf4747ed15c4e9a4be4deffe20caa1f39830c4f2c928a363b3e42040880ed322404cb089f45b5c57f4663253d325ebac57d4e
-EBUILD automake-1.13.4.ebuild 2891 SHA256 a7f1d4c660f7a5524779e7ebf3dace437801cba1ee8e6aaad6a155a2dee6ac05 SHA512 50582aa10761fb9c0b94bdaa6e3e7bf45d31479e2dadd43e5de6463fb7b892557f467a29b3927300a9958f2de84a4797e9b721c1e32d380d742d658a3c833176 WHIRLPOOL b0aa20e97b5c2e97cab482cba0e2c8b5df9ef4fe88a51954dbd14de99e4b309bba138579a47807dafb5f5665ebdf83845ffe98170fa9cf479899e9042f951b43
-EBUILD automake-1.14.1.ebuild 2851 SHA256 b755d233f2cc0696d746dbe577f06cc661430962fd27bfe1f6e07c0d94fdc3da SHA512 ac1e89b5125f80051140226e4aec96ef5779500210301f9ead921b7e41f55f092ea8a4030a5bdf93e74f9107a9cb5e0bab9e22b86e0ce61a9074d8ce68617f37 WHIRLPOOL 0416c7a3e52aaa6ec52272b734abeeab035293feaf1e68f9cbbc1656ce11cbc425dfacb6781e2c73f3f2ff7bea47ad650f54e6bc729d4647fe4d2927236b86b7
-EBUILD automake-1.4_p6-r1.ebuild 2495 SHA256 067be00ec2cf97a0767c5db28b5f57700a7e52309823d052322b310aef395836 SHA512 f7a06f01754b33633adbc6f2029a8ed12d3961e927d9b670dd6f508059e8e5f2a37dba2b4e9cfaa120d6521f23a06e1a4293997d0a96942edc47c7593f64acb0 WHIRLPOOL ece3331490bd934ed1ec92b4c52910acab623d518f5143ccdf5058c7755f1e357748dd58e8d8ed845b5e09c6442fa580503819964a8a4dd4a309882b16e31023
-EBUILD automake-1.5-r1.ebuild 2453 SHA256 7b8ddeecdec8a56889e6bcc87ff76e0a2d58a40e92478ee9808047d8063f66c6 SHA512 db88bee1aad340926e1efdd57b39cfdf0ec7fcc49c3c1a5d5cf208cf11048a126eb66ef940263f7359fdcbaf39ae9c9e7c8b4a06fab370ccceb8348455d767c0 WHIRLPOOL c67eaddb8377120bc2dffe768288938de0a30f17132e8fc62ae24e38eb3286d11cd0167e27f5b650326ad92c0e0218738c7895485c46c8828e4a63fa59bc12d9
-EBUILD automake-1.6.3-r1.ebuild 2183 SHA256 b14ce70e5a46d53311ac7618e73e5b23ef2ba98ab51cc9bcf2adc48061c72ef0 SHA512 150f211ed17f4c10e8ee26dede3dc16fb9eadf06babcb9c1f6d731c9e4072e69d7e3869f6c04dd2248673b6f2ad02637b0ad97a626c608eeefad6dc2b844f5c4 WHIRLPOOL 97560576d986275121f39d8013b6a2202d46384d322c7b6f7c601332b14c74f6c1f1cf198295ad8860756cdbd5e825960cc2373c6e807a70a94e796790eb6051
-EBUILD automake-1.7.9-r2.ebuild 2338 SHA256 c6ebf1f36742e2ef643107677d8d0c3cf645fbd187517f79c99038c733f3b6dd SHA512 be584e7392ee5383e7578dc948795884042f85715d9de9d868c6d9d4eac83917e961d4189c91fc1a6471c2c836d80555ffcb5f27a51453a4777a054aaba56c4c WHIRLPOOL 5334a4bf7d9fb6abfe1f120331f78b5ebfc6bc4c695e8c8eea632833580d9afa223ae1ad7d61c72609d088ba627cacc22f087294245795694f3919726fbe4b66
-EBUILD automake-1.8.5-r4.ebuild 2365 SHA256 333874ba2fb35c1a2021f41199e3175120bc861aaafb7feeec0702be2a076c35 SHA512 9d8d93ea0a772cac4f430ef7acba470476aadb08edcdb556e38dc43d0f2fc3aaab0ba00e3c28b124fe5c92d8047a78f50a82bcace882b4c12209681c09b5947c WHIRLPOOL e7b574ff596b5b56005059d75329b2fcdaac88fd82183ce7a58cc0a884760b359d9cae911e7ea771a3ba3eb2c7afedf15f775a290a503dcffcac068452e4505f
-EBUILD automake-1.9.6-r3.ebuild 2579 SHA256 7a3764357fd488303d3c59ad35f1dfcf97f0edd8aeebbf9448d71c9437ffc028 SHA512 ea4588db36027fdba6fd2ad901decd9285f73169d7eb1bd103384d9e2f8c0fa7d7dab9a315f2fecec377910436e50297f34f15b806c255a9188a81ca9eebb09f WHIRLPOOL c0f76c4fdd1ce6980a145937d3b76e4fa53440af716cb59db96812085d02f5a697d2a64848f816111d2169ef0d25259bf8dba1670d3bb01c57cba16b291f54f1
-EBUILD automake-9999.ebuild 2324 SHA256 0a741aba0b0e8bf6dccb17cc23f49fa74d3ee78fd40807608222f3c5f1ad7991 SHA512 0d7d52d433ac257826713be06256d5a85463e819c0429aff4fd419846950cead07fca33ae6a64aae85f9e64e23767a52d59fc900620a8e6407812c8fba6c18d3 WHIRLPOOL 00142c58a8f35e47260ead6ac455457ee109763801e7c14e3e06508ac860e4b839440c768e1b1f1f2e7a33ba5218a053eec95a1e74051f3a25734e22149d22eb
-MISC ChangeLog 34277 SHA256 6953d238b7c4d7bcc77124df440924c5081ee10b7658267b004110f3b69014da SHA512 d07ea55b873252733d881489cd0f802ea9216931e69734585a7de2add8de0473074f84eb32fa321554da13e056151f0a31c9d28065a0aa3a0633e08de4c0b6f2 WHIRLPOOL 6be3a5e510296f1a17a627b730499ca429fb4ec63cdd432bb10df5219780948f877cca31511bb1ec25c7ca71aca689a4740eb5faac5b06663c9ef4f49ae7e0f7
+EBUILD automake-1.10.3.ebuild 2185 SHA256 273c25039ac7552b9553cebbe5a7da99903282ebd02580818383ce7a4b907c7e SHA512 12cc0e12bafeab8b7f2bf05e4078df0b2127d98ca9e7fee044265499932af2da569a28c3223bcab33e111c28c0ac2e9b3e24885d514e252f754378922c10d962 WHIRLPOOL e4ba80bef57d89c99a636220481de1b0e5522d95b0def3727186fcd35b8a9c8e030ff5881a8b8a97736934010fcd4198b3c653d0b7bfeb1a7edbf84369a77eee
+EBUILD automake-1.11.6.ebuild 2454 SHA256 1cca19fd3e94067d29bdba90fb9069c03cf7c3ae4f573e344998007d4502631c SHA512 c953e6b63046585f5af311437c1a30e8683aac8d2e058d39bd1883703a2bb7617e1b20d76fa37bda9aa8b8f0c76795d92c8400f313a98d57983e3b5c5c56e7a3 WHIRLPOOL f81cdf2415defc8029a79fbc7107c55a5d846988d001dc9e7072837ca5f6d7c793bfb31f2fdafa0d5aebd6b2c61a09ce7cd01960c1bb44e2eaa9848c9df9446e
+EBUILD automake-1.12.6.ebuild 2409 SHA256 60dfd2b9e32917e4701fcdca48c3c3c55f78173733ead21b89c8e22576889c5a SHA512 93c4f6423a6cee06d433b9255e98cfcdac8a61761b4f0380db2b1f83df1f1d696bbf57dea750476fde97e065b234ca5d8118c463f31b7c617dfd5820d78c9b30 WHIRLPOOL 6a90b12d0997ecc99d7231fb591c746f63bedbea669c66b650769b4559191ecb15b17a28da5adbbd794fcd709efeccd07d1e882017ec8f157241cc5e2e3bec10
+EBUILD automake-1.13.4.ebuild 2490 SHA256 741ac41c84d9ec10189b9442d838c7862e35e8c0d6ece70bef942d33d3e3aa87 SHA512 52f4d65dbcbc7079acac9d23c5024e595301f4fa397afd74f356c430e42b3d59cba53c40855ca2ab9317ae50fd52670f435b5e147ba45f424ace5e35df62cd71 WHIRLPOOL 55ff2f7283cd600b52a7a747f7b95a9e7b0ad471c4fad43203cf60e2eb1a5956295d2ba8b363cd2e722e675301b4405e3a6e42ca1887cab111c987ca99b55887
+EBUILD automake-1.14.1.ebuild 2814 SHA256 24a11e32c79673a1bd08be6a26019f7dc91dc8597d5728f9612d5f4723c7d77f SHA512 3c7d8d8125cfc9627e8a648f51cf8cd2db7d8da65e76d24295a70760d170864c34542d1b8fe8d62b7970221a64cb7d8050cd9e3c8f2d9704d9b0cb7c1b10f6d9 WHIRLPOOL a4ce0d0a5425d367288af452a1c7247452789408e10f41906aa0447fbccd840d6e0c071f7bcbaea4ea908d3f1bb8d21ae39d79b7bd40158c9f003cabf9f7dff6
+EBUILD automake-1.4_p6-r1.ebuild 2509 SHA256 54418392e5c4d4bb6d987f7abef06ebd02e50159cca3f053aa6e4dbebd603149 SHA512 b25873ae38b1f3722addf77fb2d50b49ce2df651645aefe60f255f4712c9e6fd6ee3fa930870a91af9e3d72ff54c1412c50edc29bc4d048c1017c432128230f2 WHIRLPOOL e28537c1a0a0f4ff6fc2c8a86d3d04f356253cafab493994462c75c1aa22c0919f524aad916d3b2a5820777ff91f16ef9d0346f2dc50e276f1f905d9830c97af
+EBUILD automake-1.5-r1.ebuild 2375 SHA256 2acd8416f70cd76c6a1baf2ad32396590113a986a0bffbc9276fa00389cf26e7 SHA512 7fae503fbe1be303bdd4ae37efed98ecd5440265e0ac12c8633325b351409395b26e649d768122be0ea6d828cb87193fb28452b3dc89c5279ec3ca1676f9880b WHIRLPOOL 0209fcaaa4d9b4a68f7aa4425e88f70de20f03564d93326f293c56872c1fd2a9023101697e633f9c83d1b89ad068d17a7bad2455da55b3264578a1c1858a7347
+EBUILD automake-1.6.3-r1.ebuild 2126 SHA256 7a6d06e0d2563789d832c5fdfbeaae2a1ba0f08ffbf40a5bb15cc1b925bc8560 SHA512 3e0b7930358de1c38348c94e33d8cc3cf7c2673d3944d6e260f6409511c8139ad89d5b98ddd1be6d417c2d95c4073a8edfb79933307d9bc227cac261502b3197 WHIRLPOOL d18ed5b2a602606460c84853d92484fcd7ab758a46e0e36e2a88bb7568c83d177d80a2e6d856f1a736542407d0a709b1674664c0120ab14e6d0254bf0b6942f9
+EBUILD automake-1.7.9-r2.ebuild 2281 SHA256 33321574409117ff95f27d9138231d10c13fb3f5329549b16d5313db430df438 SHA512 154c1f1ca8ba5509bea0b006d8f85a3b7e6f903a3406c9e69009f68312ca632a0f24ed152dc6853c9525bc5e641fa645ff223ac99ff971290b0ccce13400d2bc WHIRLPOOL dbc5a914e49048968a3aebc828df5886a85dd561d3d10ee5fc3b99321f06c4166b5afb95af39048b60ccb680a6676b124e6489731d416a1c9417f4157afd18a8
+EBUILD automake-1.8.5-r4.ebuild 2308 SHA256 6c5f668123c9bb93f7cd9f1b21696bd68d91740cf2b85b4230d09aa87efbdc8e SHA512 11ae77605088eeaf4decbd70b9bf739fc0c7bb3c8f0c11212ea76123543efebe34c497a4255c36281bd70344eadc8b6d498d689b378069649a0b3e3666577f4a WHIRLPOOL 9b120935a1cc8f8df72360def0d4d8252d09a8fd659684a666137046f447779b07cbb2d23e0d88ead80277805ce78b97de28b50d48330b4fafeddb458eb63d51
+EBUILD automake-1.9.6-r3.ebuild 2523 SHA256 33b4f7e3fcf9657d30c75243d3cdc6dd8db5f210ba6cbb4f7b44dced82b39552 SHA512 f152bccaf19767f6a9e888752d7593d65d896887473a0bfb58eddbb77092335375a3374fde4e3b5d6b216b58cc596d34efb6b4be40825a084f960a4d33dd4ba1 WHIRLPOOL c7e0f86e70f3f057e988a6943f5ced2873806add2350d6f3ded7562c322b65be74055c3b8bf61cf773b89f733db2799f30cf77ea00955469c222af0d5941a10d
+EBUILD automake-9999.ebuild 2319 SHA256 2d00ad3957f8bf90e9307933123554bb1597d5357412d75d971f8d961ebcc842 SHA512 aff32d1b74c61dd9a2166719791e68f24ebff27c425f57f56b95dfc9b9a66507fa27c118c1a17a2b92245e3f907322c9765c984d15978a0ac57d2cf39bd8b7aa WHIRLPOOL eeab6d04f10f5ca3bae12980f6367a7e96fe919ed49974425c8b1efe9689670e423849ca82c402766aee14420e80a4e63d92c1ff94104fb9b773b3799fcb1228
+MISC ChangeLog 34688 SHA256 6594b885e94d437da2d4f021e289759287fe67d21861783d491c2a9b8a1aa738 SHA512 fc310e84c6bb53057e923f63888670105e103591abbab98c56096a21db01953007f5e4591079eef1c7f4d62c1a68c82e7365d866c9570afeee0558f0b3aee513 WHIRLPOOL d048828efc94c370923c63c6ee443b6026c8f5c6f335121626228f883c2cbac09f37c521ddccc6c240fdf66c0785ab7a23b574f81c088eea39fbb07d6b8b7a8d
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUZtYzAAoJEPGu1DbS6WIArh8P/1WNnCPQy7WCpeB6n/YhXCx3
-Ov0udOnfbZzeYdOa8prWl4uhk1qD7s1EWRVDk7rscSDS0Mz3VN/apZcWfqfS0vNh
-0IRwWdYoAFWaYiZ8gywwrMny8w/SRWl7V8zQ1Ywf0pioQVPuQN3Dyg4xya6sErQA
-G+RcLhQjf1vCat7/3jCnDCmqVL7LaVjU9HyayVSyDmkigHDoV1HNNHaIDfeQ0Y5W
-ytKKX3VN+e23aE4YeRoPny0X1LCkJ7m1EB9RQowgXQKNtof6yriu0y0dNDop4SwV
-OsSq11qES5ymEyagtSbvWxs/+ROuWJ0ej3AbNnZ48tj4V5bW1igKwXDDw65CUIAP
-DbvmzOe9mU/b4isrfJoXUt5YxlHxpMaQUNqRKGunoOjtJAQmf1VmokjYVOCvrd/H
-SmEjFxeiyeYxUsQpnhnKwt8btDYgkNDm+5Pwx7ATtKyIC6irJcI9le2CEa6hWoT3
-2apJyhGZ9toK3uMZstRpzbKb1IvbU++R47LD0xq7TfGpSGO2n+Xy9gCPFkUAX9AH
-CmfLZifOYBSoDy7w2g4ROAATbCmPGb30DFHMKSgNhA8y8u7qpo5uyEivokSQPQQK
-BW3KXfPnGk3ACMe+xhAwO9XJN5E9198n5NS11jUJBqRgTB2fWIhEotw/yEKkR/1G
-MF+fXDW5IO9UMr5eYONx
-=GKGJ
+iQIcBAEBCAAGBQJUZu24AAoJEPGu1DbS6WIA2vQQAJjEa06XBnBuK5vlPkcxXqyc
+aJrPJTWv9Ktfg/HTLgqO5xwkks0GCGWg9cTxxWJM/tBEBr1V470tXGdAwynkVrpt
+WxIwRTiTGZkbNz1iBYe3yCRfCV+y56uQ27zR7AjZ1ourpPqNUk9gsdU4WhVuPNkf
+aUMVYV30gqY/6e29srJAfP1GAraVND3mjz4fv5oaZcZNEywrl7LS4J1HCryy1RdI
+Ppxkht9K5CkAY+UGQ9T7EdA/IwnoA+o+EEFRlPfUWTUhlmNE1sUIJ3txECD4IWoE
+dkcS3sXnJIeLN7HR7p+T58NIdMnKzvFMZHYnqLGwEujGAEnZ2URXtAmiF9Kh2CDX
+rtkrZtMNfsO8iTd87E0sZDUKV6UQ3l0yPRhbierTAqJhfcYRv0bSoFb7WEIEMLOO
+ANrKWn04uKv0LPaSHuEgT83GnRZONOniYmCFCx9gXeCLrt4MOArMT58mwqSf4lkY
+UBDM9sgKIvmFjkHj6VrM2fgmpt3V7OnJplhXPDOCkSi7brt5Tqt9OpqZ0pnctoTu
+CVTxkAUeKhdFZeGnQCt2CX2ikNXokkeC/6I06i2FvQasHRidQf4SQ1HztwvOmOVm
+0U6x45N75QoZFdKBmMlr/qG4/8Jw+CzLvOUcwD4rA8ilSs22U/pswtLCGZpCCJMq
+tQM9JprMV8QcvvAb0LMr
+=60Jc
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.10.3.ebuild b/sys-devel/automake/automake-1.10.3.ebuild
index 20d336f78fb2..de8f875b77f3 100644
--- a/sys-devel/automake/automake-1.10.3.ebuild
+++ b/sys-devel/automake/automake-1.10.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 1.12 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 1.13 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,27 +11,25 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.60
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	chmod a+rx tests/*.test
+src_prepare() {
 	export WANT_AUTOCONF=2.5
+	chmod a+rx tests/*.test
 }
 
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} || die
-	emake || die
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -62,9 +62,8 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	slot_info_pages
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	# SLOT the docs and junk
 	local x
diff --git a/sys-devel/automake/automake-1.11.6.ebuild b/sys-devel/automake/automake-1.11.6.ebuild
index 3b5dd7800aa5..8c5c2b4f6ee1 100644
--- a/sys-devel/automake/automake-1.11.6.ebuild
+++ b/sys-devel/automake/automake-1.11.6.ebuild
@@ -1,50 +1,39 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 1.10 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 1.11 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
 
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-else
-	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-	MY_P="${PN}-${MY_PV}"
-
-	# Alpha/beta releases are not distributed on the usual mirrors.
-	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://www.gnu.org/software/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.62
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	chmod a+rx tests/*.test
+src_prepare() {
 	export WANT_AUTOCONF=2.5
+	chmod a+rx tests/*.test
+}
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
 }
 
 src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 
 	local x
 	for x in aclocal automake; do
@@ -83,13 +72,13 @@ slot_info_pages() {
 
 src_install() {
 	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 	slot_info_pages
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	rm \
 		"${D}"/usr/bin/{aclocal,automake} \
-		"${D}"/usr/share/man/man1/{aclocal,automake}.1
+		"${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
diff --git a/sys-devel/automake/automake-1.12.6.ebuild b/sys-devel/automake/automake-1.12.6.ebuild
index 5433b3ca3d84..7489af149315 100644
--- a/sys-devel/automake/automake-1.12.6.ebuild
+++ b/sys-devel/automake/automake-1.12.6.ebuild
@@ -1,23 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild,v 1.19 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild,v 1.20 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
 
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-else
-	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-	MY_P="${PN}-${MY_PV}"
-
-	# Alpha/beta releases are not distributed on the usual mirrors.
-	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-fi
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://www.gnu.org/software/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
@@ -27,22 +18,21 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.62
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
+src_prepare() {
 	export WANT_AUTOCONF=2.5
 }
 
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+}
+
 src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -76,7 +66,7 @@ slot_info_pages() {
 
 src_install() {
 	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 	slot_info_pages
 	rm "${D}"/usr/share/aclocal/README || die
 	rmdir "${D}"/usr/share/aclocal || die
diff --git a/sys-devel/automake/automake-1.13.4.ebuild b/sys-devel/automake/automake-1.13.4.ebuild
index 2b6697424f9c..0a5dc965f300 100644
--- a/sys-devel/automake/automake-1.13.4.ebuild
+++ b/sys-devel/automake/automake-1.13.4.ebuild
@@ -1,23 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v 1.14 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v 1.15 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
 
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-else
-	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-	MY_P="${PN}-${MY_PV}"
-
-	# Alpha/beta releases are not distributed on the usual mirrors.
-	SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-fi
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://www.gnu.org/software/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
@@ -27,27 +18,26 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.62
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
+src_prepare() {
 	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
 }
 
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+}
+
 src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 }
 
 src_test() {
-	emake check || die
+	emake check
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -81,7 +71,7 @@ slot_info_pages() {
 
 src_install() {
 	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 	slot_info_pages
 	rm "${D}"/usr/share/aclocal/README || die
 	rmdir "${D}"/usr/share/aclocal || die
diff --git a/sys-devel/automake/automake-1.14.1.ebuild b/sys-devel/automake/automake-1.14.1.ebuild
index 56e0fe2c1888..7dce3abfa4d1 100644
--- a/sys-devel/automake/automake-1.14.1.ebuild
+++ b/sys-devel/automake/automake-1.14.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild,v 1.3 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild,v 1.4 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
+
+inherit eutils versionator
 
 if [[ ${PV/_beta} == ${PV} ]]; then
 	MY_P=${P}
@@ -27,26 +29,27 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.62
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
+src_prepare() {
 	export WANT_AUTOCONF=2.5
 }
 
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+}
+
 src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 }
 
 src_test() {
-	emake check || die
+	emake check
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -80,7 +83,7 @@ slot_info_pages() {
 
 src_install() {
 	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 	slot_info_pages
 	rm "${D}"/usr/share/aclocal/README || die
 	rmdir "${D}"/usr/share/aclocal || die
diff --git a/sys-devel/automake/automake-1.4_p6-r1.ebuild b/sys-devel/automake/automake-1.4_p6-r1.ebuild
index 00762e0b0232..0e136a7ca343 100644
--- a/sys-devel/automake/automake-1.4_p6-r1.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.11 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.12 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -10,28 +12,27 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/perl
-	sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.59-r6
+RDEPEND="dev-lang/perl
+	>=sys-devel/automake-wrapper-9
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
 	epatch "${FILESDIR}"/${PN}-1.4-libtoolize.patch
 	epatch "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
 	epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
 	epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
 	sed -i 's:error\.test::' tests/Makefile.in #79529
-	export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -66,8 +67,7 @@ slot_info_pages() {
 src_install() {
 	emake install DESTDIR="${D}" \
 		pkgdatadir=/usr/share/automake-${SLOT} \
-		m4datadir=/usr/share/aclocal-${SLOT} \
-		|| die
+		m4datadir=/usr/share/aclocal-${SLOT}
 	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 	dosym automake-${SLOT} /usr/share/automake
diff --git a/sys-devel/automake/automake-1.5-r1.ebuild b/sys-devel/automake/automake-1.5-r1.ebuild
index 9a7d7ce3ea02..87fa161372b4 100644
--- a/sys-devel/automake/automake-1.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.5-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 1.15 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 1.16 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,26 +11,25 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/perl
+RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.59-r6
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
 	epatch "${FILESDIR}"/${P}-target_hook.patch
 	epatch "${FILESDIR}"/${P}-slot.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
 	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -61,17 +62,15 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
+	default
 	slot_info_pages
 
-	local x=
+	local x
 	for x in aclocal automake ; do
 		mv "${D}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
 		mv "${D}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
 	done
 
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	for x in guess sub ; do
diff --git a/sys-devel/automake/automake-1.6.3-r1.ebuild b/sys-devel/automake/automake-1.6.3-r1.ebuild
index 85176e22a6c9..c657e10f851b 100644
--- a/sys-devel/automake/automake-1.6.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v 1.11 2014/01/17 04:23:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v 1.12 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,23 +11,22 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.59-r6
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
 	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -58,15 +59,13 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
-	local x=
+	local x
 	for x in guess sub ; do
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
diff --git a/sys-devel/automake/automake-1.7.9-r2.ebuild b/sys-devel/automake/automake-1.7.9-r2.ebuild
index 73225320a29d..78a1a453a327 100644
--- a/sys-devel/automake/automake-1.7.9-r2.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v 1.11 2014/01/17 04:23:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v 1.12 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,26 +11,25 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.59-r6
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	epatch "${FILESDIR}"/${P}-libtool-2.patch #257544
 	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -61,15 +62,13 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
-	local x=
+	local x
 	for x in guess sub ; do
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
diff --git a/sys-devel/automake/automake-1.8.5-r4.ebuild b/sys-devel/automake/automake-1.8.5-r4.ebuild
index 32062a8ff9f8..f28dfbf7fc13 100644
--- a/sys-devel/automake/automake-1.8.5-r4.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v 1.12 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v 1.13 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,26 +11,25 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.59-r6
+	>=sys-devel/autoconf-2.69
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
 	epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -61,15 +62,13 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
-	local x=
+	local x
 	for x in guess sub ; do
 		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
 	done
diff --git a/sys-devel/automake/automake-1.9.6-r3.ebuild b/sys-devel/automake/automake-1.9.6-r3.ebuild
index 19481dc10135..b555d73ceeff 100644
--- a/sys-devel/automake/automake-1.9.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v 1.12 2014/01/17 04:23:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v 1.13 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,21 +11,21 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.59-r6
+	>=sys-devel/autoconf-2.69
 	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
 	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
@@ -31,7 +33,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	epatch "${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
-	export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -64,7 +65,7 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	slot_info_pages
 
 	local x
@@ -74,8 +75,6 @@ src_install() {
 		rm -f "${D}"/usr/bin/${x}
 	done
 
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	for x in guess sub ; do
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 5ec30b930d42..86ff26318570 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 1.9 2013/12/24 06:48:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 1.10 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
-EAPI="2"
 EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
 	http://git.savannah.gnu.org/r/${PN}.git"
 
@@ -13,13 +14,14 @@ HOMEPAGE="http://www.gnu.org/software/automake/"
 SRC_URI=""
 
 LICENSE="GPL-3"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-9
-	>=sys-devel/autoconf-2.60
+	>=sys-devel/autoconf-2.69
 	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
@@ -29,13 +31,17 @@ src_prepare() {
 	export WANT_AUTOCONF=2.5
 	# Don't try wrapping the autotools this thing runs as it tends
 	# to be a bit esoteric, and the script does `set -e` itself.
-	./bootstrap
+	./bootstrap.sh
 }
 
 src_configure() {
 	econf --docdir=/usr/share/doc/${PF}
 }
 
+src_test() {
+	emake check
+}
+
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
@@ -66,9 +72,8 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 	slot_info_pages
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	# SLOT the docs and junk
 	local x