Redo how we slot the info pages to avoid regenerating them from source #464146 by Denys Dmytriyenko.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

18 files changed, 391 insertions, 529 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 28f527c0e626..62f42d5bdc45 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.181 2013/01/14 17:37:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.182 2013/04/04 22:15:06 vapier Exp $
+
+  04 Apr 2013; Mike Frysinger <vapier@gentoo.org> -automake-1.11.1.ebuild,
+  -automake-1.12.2.ebuild, -automake-1.12.3.ebuild, -automake-1.12.4.ebuild,
+  -automake-1.12.5.ebuild, automake-1.10.3.ebuild, automake-1.11.6.ebuild,
+  automake-1.12.6.ebuild, automake-1.13.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:
+  Redo how we slot the info pages to avoid regenerating them from source #464146
+  by Denys Dmytriyenko.
 
   14 Jan 2013; Mike Frysinger <vapier@gentoo.org>
   +files/automake-1.13-dyn-ithreads.patch, automake-1.13.1.ebuild:
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 9e49227c2d45..e2492ba2179a 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -27,12 +27,7 @@ AUX automake-1.9.6-include-dir-prefix.patch 1106 SHA256 01d85d830875aa05eec4ad20
 AUX automake-1.9.6-infopage-namechange.patch 1156 SHA256 32fcbef369731846abb28181cc924c4d8261eafd3b86d3c506976de622b76737 SHA512 a4f969db72a38b3f93462670ddaead5147fe3a2065d2fd33a403e7cf89585fafa73b85771490a02144a524e811dde2c36857253b2ed1ad8e7c4d4027a352032b WHIRLPOOL 0b256273e48635bdcef4f293f9cb59343e1ec076a7951a0e1a23e427e1ebc6c29108a486fd9556837bfb27cd42dcadf3e7240f04d391b589954fb7ea03b541a4
 AUX automake-1.9.6-subst-test.patch 1332 SHA256 3e793187719a3149f24eec1c4d4a3603ae02625f31c82056300d4e37248bd359 SHA512 f5e8106e96f5976d8f958665b53cdf1088d0620f7d4da3b9f5a73766ddc32c4eff13d39f245a8a01b90567c364949a94bc7ecdcc4b8214b43d2f7f6b1740a891 WHIRLPOOL ddb526ae2935790c53057f31869e6b8931f9009079a69a492bc2e5df96a52394b3ea1df132cc6950d683a1581f128dbfccd8a9df5b1b5d39d36ccb1d5be82b90
 DIST automake-1.10.3.tar.bz2 957505 SHA256 e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc SHA512 4f4172c53f31103a93baa794bb498c8b42c1a06e5e0c909063863cdfee3f768016bdecf46e64417a8e362d4c524907b48c0c1b24f510d26aa66bcfd85d0b2598 WHIRLPOOL 6c1b915b87012fab9c7323843ff69a33cc3bdc71d5bcb4ec743b8e8ab34be46dc8a8b72fd41b805f4ad2c723640c9d2b74cdf39355295022219a1138e28794b2
-DIST automake-1.11.1.tar.bz2 1066685 SHA256 5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae SHA512 7a47bc64597027cc84bc60e33aa1887f19797abdb4434b60d372409a69dc9dac07c5d4c6bbe389083b8ee9d063e181273d55c12d409524915ffa553b1ecad464 WHIRLPOOL 5fd1a90eda701eaf0b9965636c61e37a9e8bf471afeaebfad19514a8b0566cb2044274bc36d20cfc8ba8b547eb752917f950981917ab6504c2e668e16bd80f19
 DIST automake-1.11.6.tar.xz 1092908 SHA256 1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba WHIRLPOOL 79b45d6e1dbdb5df5d17fef318bf38d83896fc91d532c8814fa96144409c53f976ca26c6fcb9baab215b289afcdd177a8ada455af99926d27861950a993438c2
-DIST automake-1.12.2.tar.xz 1367980 SHA256 5fb56e918189b377a22368e19baaf70252bd85a9969ed5f8a8373f49e8faf07f SHA512 34497dd5fa088cbddc789e4df772aa7ffd608919544cb040c5c9c70fd16d4f8c1d4a1822647cd3f22df8003715e582118a41c5eefeccf5c5c6d356e8ef29e8ac WHIRLPOOL 8cb27ab44dac1b14cbcf713542736f31cab4f40d89bc21570d10879edade2e93b322bf0bea797daeb124eec916a67d9379e73396eb85ab5a01cc26a5500a83e8
-DIST automake-1.12.3.tar.xz 1378784 SHA256 c4207b057b97ab771be61b73b8f848c31fb9f0c3bb204a7f1aca5bbeff41eb5a SHA512 d8e68a11c66ce133262a942e9e5581c576c4ba111d8e63a874ddcf50729891e747a1c2190b2103afd403d3385eacaedced4b787967f34b802972bddaf97ea973 WHIRLPOOL 46c83772d4f9516673829eef9c8bfe3c543e3b91e113b1c5a0fad03ccfe9b1c89812b2fd32cf63953bc55c88d77c5ba14bc1eb1ed223aaf908b751d59587ae78
-DIST automake-1.12.4.tar.xz 1381908 SHA256 516f218ce5fb0e79005987cec67d1bc35e012b7b71521eab35fa47c7416df772 SHA512 095d8c841d74ea74d63c40b3bb75337f37802eac2715a2d6aa1e8f8f189ef061fdcb793cfc26698fe441752f3658cacdaf5a662c4c66b4e0aa57420f3e630632 WHIRLPOOL b371aebd3136e519d783fc8ac3f174e3f8a64aaedf398fecc6c06282cc1b6138905583284cb4a7b7fa227405a35fab9238d319cec9e116f607f69ba444667a14
-DIST automake-1.12.5.tar.xz 1388492 SHA256 35dac82775f100de4699818cf62dda341cd6020189e5345ab1461859f35097cc SHA512 dfaa6a081073b89ef078d6dbd85b42ad36a1b14be0e41deecfd6890a63547b105fd5f64256cafa542eb3c5217fe443b8a1c6fbb2be3ba3bd2ebca2702448852c WHIRLPOOL f2d27f45cd3a02cb4234a79cd41c357099f16c1da2a74b67aa6f02973d8362b3d02fa3d664910b879cea34d1921cf4d2c46adeb7b904a5e7055a8a81b4589675
 DIST automake-1.12.6.tar.xz 1400336 SHA256 f834ab2145b1ee24bd85387950044f5cb418dd0af2b84c52e60c2bf29162dbfa SHA512 ddcd664ef8f52a44c0adbe908e3a5a2844d8768932211d75dedf262827ffa411b5c3599f93a212f1c979108122cd14bbea5e672218596dd7c934a25d805aae5c WHIRLPOOL 025be98b482fdaa5453b55c00a061cb92bde0ec794599c9e4fa615706e853e26c912b569e364e853437d2494b86a78e30229e868e889685791aead8f38ebe56b
 DIST automake-1.13.1.tar.xz 1425080 SHA256 6ecd6cf682e78e833361264263f0f9496949bfbae7f8366bc327de38ff0ad18b SHA512 5ab31cc9f68248f4d95bc2f8b7d4704f62b9dbe3b5c2e002caacdd2874bc31b55adad4372f9157bd918040840ce5ce4a56907a610506598aee90700d2b0ec32e WHIRLPOOL 3e898ed431392724dd3f0031c21fdf368302b5756a73b91547e587ea3d624d1b58d9355c6ad4c757356f73707c9b501929598d9642c7b53554cdf3790e38a445
 DIST automake-1.4-p6.tar.gz 375060 SHA256 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e WHIRLPOOL 2f685ec2f0952d58f313c80c3d7d272734e58c10dfc5dde32331281b55ac4e3b06b820e188239c98ec8703229414f9621f1ce7f241fe17ff4e564b84f21e5b2e
@@ -41,38 +36,33 @@ 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 1664 SHA256 603140e4be59fc6a54e9a0a9bc3be30b20b1409e6c6d769c6530422dce0509db SHA512 6c7d64008796e97021d8a40fdb2934ea4d02ed7a021aef6bd92bb3a3ea662820fec853bc93061172718f874b5736710b63332f479e0e5512e691dc965e876c3a WHIRLPOOL 11a45f98193e232465e6a1d8d8b51e513a2635f143ffe87e701a04486748f7ef9d4075ce268a09dfe71b56cf0caa58926605a87551cac3868d5aaddbc37f2940
-EBUILD automake-1.11.1.ebuild 2177 SHA256 571ce77ae85adb851b86881395deb2ca9abe5400163f1d18b1dafaed191421ed SHA512 212dd45d2f4af477aa4033b9905cd6f021611c9a94012ba29a85fee5377d96e8c6a135f45161099fa0ac32cf46df636b42aae954a484a69d0ff045aa747401bc WHIRLPOOL 0f993460564d71b4d6c453a2f38abbb2870b346571abb014b05646ce8fe5b38febff37e36313be5d90b641666a2d7e1f6e19f9e5faba5cec7e4ea4dbd5eb77aa
-EBUILD automake-1.11.6.ebuild 2255 SHA256 cf191d577634f88ea2e2be54181eb28d5f7ace0683fee1f5b8648808e36dae68 SHA512 2caf60e90b62359a730d52ea37df9f58f45e147e0de9b193521bfef9993a25ad0326af972e6ea94b0c3fe7bf79739de3feca27495a637f01243648255e04a48e WHIRLPOOL dc51c5bfb2a47d8e7528e0220523dacfc223f653c48646a1e88997f279cb8eefd80491098909653362c71053af0afa16525809df61e4fc4a651885fa2fb5340a
-EBUILD automake-1.12.2.ebuild 2279 SHA256 3a959cc7597b131474e353c97d85541c903da54817a4189f33a789c77365a21c SHA512 12ed489be5d50b1f5395c35fbd43a3aff93fb48250cd28c44fd5d196930e760a06d722f542a9870ecff0fb193c1c7e12e046bc1502d3da697b4a603b5d2a0ca3 WHIRLPOOL 738eec80aec759c3b38446aa0e9c9dd8fda2fc9fa5d5cd15294d40693cc1ed1294cf2c15595e39550ed5fbf08ccafd3069dbce7cca83f4088d29309a343562ea
-EBUILD automake-1.12.3.ebuild 2279 SHA256 cb9ecacb3a33fc39026295e5091159ad95862df9726fa1fdb65e9c35c8d45b4a SHA512 7d56b5c1b0e4e1f5dac211cb1e917125bcafd668e36cf87565c36e93e67a7b28d8a7ce8ea07c424143320e224108fc073701b3675dc05cc041307f8ebd6b61c1 WHIRLPOOL cffd2bc314deb1fb5edca01b3486fa51e44945289a03324c54490996a8d085a2604b20ffa3dab786f3c278ffa7ff67b503e96b725371873d546934ebebf13fe7
-EBUILD automake-1.12.4.ebuild 2279 SHA256 9c92c49ef0ffb076858077481bfa81e093a9498e59e465d7e03c15a8ba19e13d SHA512 b2bfbec7796989866618e7b96c509557b56d071929e074acc00462360010145b12fa4bf68a717ac9cb4eca3b09b05a4800f6c953fe0ec753669385abd53762f6 WHIRLPOOL 2cfac5b23a38500013370f73c6da249b13fe3790b38a7ab6243f9ea8e4f73e7ba588d360f3466a1f755fd6d3e84e58c58f0004635b5775a7daa12ceb1d21d279
-EBUILD automake-1.12.5.ebuild 2279 SHA256 88ccedc9eb118f962d0977567651e93089a4a706a9d7aa5b16729a90633a1141 SHA512 07aa14e97c227c6d24d202584af03b351de38639a6fbd736fd16bd680e759c9fbf2a758b0bcc793518b4bd250f0a2fc396c38167ef974082c0a7a98cb621badc WHIRLPOOL da8072aabf174276cecbe478e0a53ece09b09fd8b7c69210e2ea24102cfe9e09282d4cc65caceb61607464ddd0f98b0c9a1a26201b90be639c9ce90b6e414d2f
-EBUILD automake-1.12.6.ebuild 2279 SHA256 d51e9e741cf4cd9dbedf4c3c0d99ff3bde399384178267a8c8c3714ca658f4e8 SHA512 702b7226efc981b6f91aeeeb3b98388abdc36e2c20c309e032125c866e9ee9010ce221e0d73efef000f604ff8e0f4effa005e925e690cadbbabe5f4047531f17 WHIRLPOOL 05a099d2710475005a89fab9cad45993de063438657835404435dab04c645e8f5a10ab8c4be8793463b90a02be98d18b9e3e38851dd49efde2c4648cdf73ae72
-EBUILD automake-1.13.1.ebuild 2342 SHA256 3bd69d28ac1629a5942bd2d68881d4b67ba6126efff572a0799e9b8e51a77e53 SHA512 ca27b7dcec0607f058bebd72754803917bf948430582d93b3eab6ecc06068f653e06973aa39a5ff74533238a27390d65080771d770ac9fecd631931906bf7ea7 WHIRLPOOL c275f084bda6f59209408617797b82b17cde02ff948969013062927059e2c0d39110a8b0d6a681844108803955bc20668587fe1bdcba1686eeebcf8dff2a99b1
-EBUILD automake-1.4_p6-r1.ebuild 1813 SHA256 10d728b164429499a47e45cb23f50bb4d264f06917ce37caa43af6c7430bd024 SHA512 d650f390b2f0e1c160868a766e47377dafa5b4b3f272dd30761e723e2a2606b8d1b0b590515a8966447b11a832e68ad5fb552e02ba51de9a5776c644c227d066 WHIRLPOOL 39acef7ffc5aa53afcd762db869d4bb44db1d86dd9279ca9638944e65b1c861fc7c553b802ca527cd7638a3ce244269d293f6184630237cf114d7fa594ad8675
-EBUILD automake-1.5-r1.ebuild 1770 SHA256 77fed57734ee58938de42125104b96d4c97f4eeb4a815ee3f1c21954d3993b4b SHA512 23fdc1cbc829d85ab60f694c5a19fb15066fecbcca5f9e4b1bcb1aafdaaebc31c326bcd41219eff6bb05b68390311317254b154a9622bf0e6ce127624a505dee WHIRLPOOL bbe79d5867f56cf777fcbf01349176cef73e2dda0108c3ff5a5d064a92cd6eb399f6443a26f4a074feea62bb8dd21a05647d8f9b13b38f8bb27ff50c0caf2a01
-EBUILD automake-1.6.3-r1.ebuild 1498 SHA256 5aa8d9a63e5089de12e7b2ee26c9d319f55258c35e4e133b46fafbf40a6047d0 SHA512 754a39116c06f70397b62e819ee6f527c52ad3e4a35083fd13ace03b4f75e4f9c6681f37f304265aa22613a483f830da8388fc8ea2914c2011be831a4ed2f507 WHIRLPOOL d4e2db8c6d93172b8a16fb1533490fb52da9a0e327af81e7a27debf06d9b80d17329bbce074b2c77d3865588e8a74eedfb38c7b1a5ba5f53667d5a8e42768276
-EBUILD automake-1.7.9-r2.ebuild 1672 SHA256 5b37193ad52fd8e6a8e7c3ba986e312a651ba27e8ad0462dc26f17a0b812882e SHA512 1f0de788f326404f15304dbde255de429cd2030bf3baf6ee00da5073b6a79f132891c6ea252b0eda42beb1ef629c2e3d232a43543e61ce826c86777a0cfbdf75 WHIRLPOOL b0ae3efa478521aac9f2443f6b686a169242d372747ab4541207a8444a125e8ff608343c33bb3a43eae230490ce60129d5bb345c2f4fd8b061a60280d991e354
-EBUILD automake-1.8.5-r4.ebuild 1689 SHA256 be13ca556177543788bbfcc4a4ee549a60a00b2ef5b10ea64ad1d2e1fefd224a SHA512 205be44e8c9a35b4521ad41cc48f148d8b643affb3a2e8d44db54727a3c756d53cb4837f33e17fab2fca6e979208da418b39fe565a761b1415ddc5b3c09e0217 WHIRLPOOL 6a7ea635c4f76ab9081b4b96e30867c6d8da36668dffdf395563a115b7a638c656c157691eddc4fb0942d6f5e9b3be640f62f43ccd748a16fd4185fdff550f18
-EBUILD automake-1.9.6-r3.ebuild 1926 SHA256 62ecf66997c7d56c2c3f8cab2ab38874ea675ff27d38578a6f9bda363d2824db SHA512 8b4fb340b2036ea382715133df3e0537373470c1cf7e439ce4d1842e0f58cf1fcc4a9a7610c22d809f92b37af7519aa35209817681284a6e9371299f0baac8ab WHIRLPOOL 09c3ba739bdd14a348c6751ef9b7eaf884f2fb584edfbf93c514679f48bdfd9088a963c9f2e46d6e492de65f893142140c9757f4b8b6262acead3e22d30d5d5b
-EBUILD automake-9999.ebuild 1644 SHA256 2ea8308822e6bd831206961f1f6e77419d68313666dc05522a2a9799f91db129 SHA512 b2ecd2a324235a3c9b9f0d658eb9caa6ed29ea30d940f3b308521af9f5983f69b96ef11d1e849bcdc5feffc2762b8b42859084a71dc01b16b29f32c77427bd8b WHIRLPOOL 45a41e12da47e5a89b0da18e347118399b647d443f2ad4ea167de5e3af7d6c68905eb43982945a1ed2c20dde6c3771921df210ee34aa703f81ddc80f76a5248b
-MISC ChangeLog 29300 SHA256 1624036345080a120e8b0b267ae18254a6d3732ac6a689f445f0294d552b6260 SHA512 bf632c351b07d0fc209dee8990b029104a09df2c2d6efc56dabe24d68b76f6c2495589fce013d9171dbb06767f16b24707c3279dcb87d9e0fa70eadfdb1cfd70 WHIRLPOOL b2381a0c1a351b4f2a849066a5638b085acb1e1bc1ab79b7952200c6f5c49026c2a52c17e02e4a01284fc67e4832ea6f4da9eee4c75226a191d94f342a184ba8
+EBUILD automake-1.10.3.ebuild 2250 SHA256 2349b3ee378f901d74e30d2ba63648983822b59a8afcbfbad8487bb44e48bd56 SHA512 345a4eb5f265e2628f9fd5c939357e9da68c7ffc86d1133e5363a200141c29479a591e3868cf2fa1d74e2c2e50df6b9b154a1df4ac34b837373cca378e3b8582 WHIRLPOOL ab78363a71afb2ce6ee23ef53e6929b11c076d4d5d3dfbe673450c2d872b8223810b3131a054d8976bf53ce19c3e1bc195d78c8613c5e3db64f888486ac457af
+EBUILD automake-1.11.6.ebuild 2838 SHA256 a47327911c8e3024bcd4127c4c0bc90d0f1cd03afdd2de93d6160ea271465596 SHA512 77520b33d19c6b3653cb30261a40de636bffd4da2ab58e825672c1626db0399b93134ce501f941405aee477929d04679d034ae14c22a6ed30e9e313e008170ea WHIRLPOOL 590eaec94c0e5f7e2553ae4a868c4f4ae7a31dce76403070ed9fdf6dd0dad00e5ccc6592dd0426bb35db1517fac1d7dd11961f59adaf58c02c50e002ad0d01c6
+EBUILD automake-1.12.6.ebuild 2796 SHA256 f515671e76886a6d2a9d3fb982ae95d9d87b88ee6981728f9a157476a23ae2b9 SHA512 95a3f606464976c51ba8e67552a2652045e67cc3ffba1e36c43eb2b3847d3245fcc5abeb4ac20bf7237928116f1f6419b676153053dde97981d640c77d23f767 WHIRLPOOL ce4050bd51b19ec0bb60de6f2732ae026f43f2740ad16640740f0a000385568e99161ddbdb00f631296258c27e229d29b98b09c11b2130fdd706358647ab6f82
+EBUILD automake-1.13.1.ebuild 2859 SHA256 125d603d100c951dad31beb0382f4045aa689ab1890c0937f6adf88816da40ee SHA512 971d506e6889eb4083b04f210e9acd6f0102fa270a9cbfec526492139ef122f79c19bbb9f2650919605aac7e0c3241cfb4f4027176150c73188174be3562f836 WHIRLPOOL 4835dc223d98efd84d41fb71de6974ddf77305a7710469d028a1d407de728a8d1685d8a3199f79ee7f058efcf07264b752e0a7c691beb33d04e0892be9f80264
+EBUILD automake-1.4_p6-r1.ebuild 2486 SHA256 138c5273f5511585f72c1d16e1471a4a016a1140d3088d4b49565902ff857150 SHA512 e0be82fcb7207fad090d916c64580d92db8a059739fa8c001d325677376ba66e753b8cc90d66175c5fa515f86578293231d3e631567b39d92622ee0eec7232f2 WHIRLPOOL 4e030e5f8c837fdcf297a2c6ceed0484d32795b8e1a9475859f577e70e7b5b3cab825e58da74ba23a325364df7333396637c4ae242414fd7d66cb80a22ba6b8a
+EBUILD automake-1.5-r1.ebuild 2443 SHA256 a327f92db682f27d022613d6228976ee6e8341daf29dbb7b1f76a235db5282fe SHA512 73dbb8183b6be07c810a192b2ca78a7689fd5516d4584a1d5fe859cfaabe602fe25c047698d16a45f345e7e25516e6b97744514bd6924be721a75fc992100979 WHIRLPOOL 719474d82399970052a3d8a01bd4b4b971e3bf86957bec923829c7d1128d85869116f184ea5cc3d9632455719769c6beaf65375d2ee41ac9e14dd4ae38ee77c3
+EBUILD automake-1.6.3-r1.ebuild 2172 SHA256 75af9796fd7985504c9171ff2713f88167a8cd0986eeaae60eca63bb924b92df SHA512 45f756324b8c091930dccc715b9602781cecfce57e7b0746fc824f342f5a8e93cc2bf43d8f2011a8729ad5ecae11aa6ada2e59a14ca3cbf20ad6a18b2c46b366 WHIRLPOOL ab6c67ee0eeb6723f462262bc7cb779cf79c54e12038182f4b5e874b663b7fb215f4e471139a46551f04a0f98a2aa0250409da14053f31815e831b425624872e
+EBUILD automake-1.7.9-r2.ebuild 2326 SHA256 03933af7fb413b8e01b7d857d2d0c45020b5b6a68c3cabe8a413e0be24f438d8 SHA512 e2e675aceb65f2c3e95fa9c40bda70a4e601603f924039d9fa9765e15ea4eba9ee3aec3cde629b0b92a00d533e1506b0e988e17086a84d1a2e64b09a1cd56dee WHIRLPOOL 6d8c4041b2984b94c79429909c8ecbe9bd1cc315d44ca2996b99b9be92dfc25601a63288e119479719439200522104861cdc373bcee3960605d9c38a8a4d0e7d
+EBUILD automake-1.8.5-r4.ebuild 2354 SHA256 9fca197a29414e5e43fcdfc7a8bc57031a8a297875de750226a53c66845067e8 SHA512 164c7198e07db368ffb76361285675f0324a2f73d1cfd740e0aff501b215bd7110648feca16bc4cfd8b51c34ab8e25cc01b2aa14d2c93e88578c28b25a48435e WHIRLPOOL 6f77a6d71147364b4a5ea10d6ffb12a11e49e4cab6152213eac9d222a2dad4b10702ca367ae7b0a6fe1481b425f8bcbb175e1af0f79e643a1b86342703d4a1c8
+EBUILD automake-1.9.6-r3.ebuild 2569 SHA256 7f5003d8224908887f928c604105c6fea40b34094477a94ec30d6549d04cbbf4 SHA512 675adc97e4f1743c10f33fb8da4db21f054dd40547329a0722e066f6960833e2f9309ca5e7d9563c642ee14693c939236a97a1a045954b352a5a2ea766e733b8 WHIRLPOOL 08d7165a7c6bbd5d3cc3ce17e5700b75ac5ec1a772621b49a911450bf5428017642503b536c7d271f193bb188a0f0ac89b95f947826b559d6afd26819b977884
+EBUILD automake-9999.ebuild 2324 SHA256 96f71e458d829f45ab13493741cec32970749769dac53610069859f5e27b4113 SHA512 734b475eedcf5673d4febaf131783a703e9c449c6d9abf2cc321ec5ee3b0bb0b27f70eaf3ea2230289e8ed2150f5ca52f9560025f83910dbced91412b2cf1b82 WHIRLPOOL 52313a23cc5669eba5bbf6ff770ef718df2e09cac7dd2a4bbb2971c3c062bb81bcf614d61e4b5460aa7b0cbc205c647feabc327171066462d4e1194f82d2396c
+MISC ChangeLog 29864 SHA256 9f759c41c57c933702f1ccc233c433c99d4183bf86b7359e5b1c98720bcbfef7 SHA512 47f03d9c62b4c54aefb6fa4901bb0cadcfa4f68509f848c948704c283f7d52ff353db2d40b5624cab53fd4294dce34909c36ec170528be2cb5bc900fd326d7a8 WHIRLPOOL 3e278df3de55f36a92c89e1a3d7eb11ff10400ddfbfe568ad39c1fe82bd154d881b1420de4f60b9c9bde4200abf9d6ad5ccc88107071bbebf335b3becff6af73
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ9EMPAAoJELEHsLL7fEFWAe0P/jEKTdFAj1BrbnI6TPPXg1ZA
-YXUhWbYEV4v2ZXhLSSQW5hBYwZ6G32Ms9AqPit9XMExji4NgSTGIXTxinH+LykTm
-MLt7Xydd+Akcx1uXHrvy2iwigaKcoOJV8k0YMRvtzO6u6XVwWnx2rV/YVYFsLoAB
-1JnwIESL9xrgNHBeTyagd+u4kAOeZpMqwfiSKcU0qL9rentL4+yVrm0+oqfIEO7G
-6yyhXUkPo0AMw6tcJX84MSWyzqXkd3kFKVfciuF96lJvHeEzOgGZ9NHNiBc49978
-CfEctPgZLaRW6T+BDxj7Ot934daApJwbHR6sPbZNgbW1Jihu7SSqK/wrbfF3jbq2
-iAySNTOPF9H/MrCinw230icHi5PXuAbU5mTbejdxuy2Ilwt9zArvntkoGu8qM/2m
-lLOQEo0UJQAka2YWQ4xvrbLIxVqODtPYNRB36/M7RHTIesbtTxeaL3sKDlGGnOZv
-G6z4cLk9tHxTJ1gWFDY6Jp8PlAqUEpDIzCOeDbuk/aR8UvkYQq4qjPlzG8N1bOEB
-ifUs+AgZwnxmyBaWSKW6WAHtrSbO03VGFsB5JVoXBoMwnt6p4HqX/9WJTD//NaiQ
-vl85E3UNxKYG5TJFs+frInkrCYVN0P7Bgu6/pYT4awG8QgfuZdlphClWsRx4r32X
-0iIMectOCfxt9QVx60q/
-=QaPt
+iQIcBAEBCAAGBQJRXfuQAAoJELEHsLL7fEFW5UIP/2y5oji4K8hjG37ANEvzK1mk
+l8ylPBwTfh4KIDs24NjeQYDb6xJvv5YCeKxvjbrB/RfDl0ZVmZferydnC+oZsd3s
+QB2hlz52bb9rcphXXbV45X8qyUol7T0oF1qZi9VJU6nnYx3BxLFLUPCIx30lBObd
+1zEUaHn9Hmgt8jOUDV7FkQqiYagLNomrITnDjj2K+zwXw3No0iA2oYJrLRNRQchW
+pN3Y9tJovgYDFho2X9uPVArhtDZjneXywHBCXKEObPoG7xbDXIljMYycaNWV7KeL
+msL9SANKbXUz+mXUq30FDbmEapOi21grbmhtSVVrTV+6+a8x+A4XrYoQvom9QZor
++G9SWdM6AF1q1EdOSit2xUF2A9a97A0qKJL0D3tgiehScxy9v7pK0nlJNBvnGgR9
++w68VkjsTG1G8swCM6yjiQjb2xTZahud6BiOfgL9PTHtjNBWLNXPyAoYSd7MF/eQ
+DHIDGOyBCaKQwBSZletqJV7YWhnQfaEaiGrGCmAEy6relgYB0Y/9tGg+eteLH9Yj
+S5qq/h1shEcTwpaeey95BJKyS+8oP+4HZIT8jJ1K3+gWaoA5T4xZ555nsGJ3NOSN
+AogPcTfLzO3vE8IW7FASeRoVF5uWCVBruK/PJCKrcWKp4aSfEYD3lFpjg2vkDih9
+suvPOP30T39CHRlyXqJW
+=WG2Z
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.10.3.ebuild b/sys-devel/automake/automake-1.10.3.ebuild
index b2d4f4a8e08e..cdefdaf4e91b 100644
--- a/sys-devel/automake/automake-1.10.3.ebuild
+++ b/sys-devel/automake/automake-1.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.9 2012/05/09 15:38:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 1.10 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -16,7 +16,6 @@ IUSE=""
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-2
 	>=sys-devel/autoconf-2.60
-	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
@@ -25,14 +24,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	chmod a+rx tests/*.test
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die "sed failed"
-	mv doc/automake{,${SLOT}}.texi
-	sed -i \
-		-e "s:automake.info:automake${SLOT}.info:" \
-		-e "s:automake.texi:automake${SLOT}.texi:" \
-		doc/Makefile.in || die "sed on Makefile.in failed"
 	export WANT_AUTOCONF=2.5
 }
 
@@ -41,8 +32,38 @@ src_compile() {
 	emake || die
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+	slot_info_pages
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	# SLOT the docs and junk
diff --git a/sys-devel/automake/automake-1.11.1.ebuild b/sys-devel/automake/automake-1.11.1.ebuild
deleted file mode 100644
index fc9078dfba94..000000000000
--- a/sys-devel/automake/automake-1.11.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.1.ebuild,v 1.9 2012/01/19 20:55:45 slyfox Exp $
-
-inherit eutils versionator
-
-if [[ ${PV/_beta} == ${PV} ]]; then
-	MY_P=${P}
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-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.bz2"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-3-r2
-	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	chmod a+rx tests/*.test
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die "sed failed"
-	mv doc/automake{,${SLOT}}.texi
-	sed -i \
-		-e "s:automake.info:automake${SLOT}.info:" \
-		-e "s:automake.texi:automake${SLOT}.texi:" \
-		doc/Makefile.in || die "sed on Makefile.in failed"
-	export WANT_AUTOCONF=2.5
-}
-
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-
-	local x
-	for x in aclocal automake; do
-		help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
-	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${D}"/usr/share/man/man1/{aclocal,automake}.1
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	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.11.6.ebuild b/sys-devel/automake/automake-1.11.6.ebuild
index b0de9cce025f..6b2fd9f81508 100644
--- a/sys-devel/automake/automake-1.11.6.ebuild
+++ b/sys-devel/automake/automake-1.11.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.7 2012/09/20 13:20:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 1.8 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils versionator unpacker
 
@@ -31,7 +31,6 @@ IUSE=""
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-3-r2
 	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
@@ -40,14 +39,6 @@ src_unpack() {
 	unpacker_src_unpack
 	cd "${S}"
 	chmod a+rx tests/*.test
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die "sed failed"
-	mv doc/automake{,${SLOT}}.texi
-	sed -i \
-		-e "s:automake.info:automake${SLOT}.info:" \
-		-e "s:automake.texi:automake${SLOT}.texi:" \
-		doc/Makefile.in || die "sed on Makefile.in failed"
 	export WANT_AUTOCONF=2.5
 }
 
@@ -61,9 +52,39 @@ src_compile() {
 	done
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install \
 		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	slot_info_pages
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	rm \
diff --git a/sys-devel/automake/automake-1.12.2.ebuild b/sys-devel/automake/automake-1.12.2.ebuild
deleted file mode 100644
index 2a201d8badde..000000000000
--- a/sys-devel/automake/automake-1.12.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.2.ebuild,v 1.3 2013/01/03 18:45:44 vapier Exp $
-
-inherit eutils versionator unpacker
-
-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
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-7
-	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
-	local f
-	for f in doc/automake{,-history}.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
-	export WANT_AUTOCONF=2.5
-}
-
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-	rm "${D}"/usr/share/aclocal/README || die
-	rmdir "${D}"/usr/share/aclocal || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${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
-	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.12.3.ebuild b/sys-devel/automake/automake-1.12.3.ebuild
deleted file mode 100644
index 52760c5c212b..000000000000
--- a/sys-devel/automake/automake-1.12.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.3.ebuild,v 1.3 2013/01/03 18:45:44 vapier Exp $
-
-inherit eutils versionator unpacker
-
-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
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-7
-	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
-	local f
-	for f in doc/automake{,-history}.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
-	export WANT_AUTOCONF=2.5
-}
-
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-	rm "${D}"/usr/share/aclocal/README || die
-	rmdir "${D}"/usr/share/aclocal || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${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
-	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.12.4.ebuild b/sys-devel/automake/automake-1.12.4.ebuild
deleted file mode 100644
index d9205712cc1c..000000000000
--- a/sys-devel/automake/automake-1.12.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.4.ebuild,v 1.3 2013/01/03 18:45:44 vapier Exp $
-
-inherit eutils versionator unpacker
-
-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
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-7
-	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
-	local f
-	for f in doc/automake{,-history}.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
-	export WANT_AUTOCONF=2.5
-}
-
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-	rm "${D}"/usr/share/aclocal/README || die
-	rmdir "${D}"/usr/share/aclocal || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${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
-	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.12.5.ebuild b/sys-devel/automake/automake-1.12.5.ebuild
deleted file mode 100644
index 52898eb6bf2a..000000000000
--- a/sys-devel/automake/automake-1.12.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.5.ebuild,v 1.3 2013/01/03 18:45:44 vapier Exp $
-
-inherit eutils versionator unpacker
-
-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
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="http://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-7
-	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
-	local f
-	for f in doc/automake{,-history}.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
-	export WANT_AUTOCONF=2.5
-}
-
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
-	rm "${D}"/usr/share/aclocal/README || die
-	rmdir "${D}"/usr/share/aclocal || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${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
-	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.12.6.ebuild b/sys-devel/automake/automake-1.12.6.ebuild
index 66f2c6e34e55..b507d6342808 100644
--- a/sys-devel/automake/automake-1.12.6.ebuild
+++ b/sys-devel/automake/automake-1.12.6.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-devel/automake/automake-1.12.6.ebuild,v 1.3 2013/01/03 18:45:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild,v 1.4 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils versionator unpacker
 
@@ -28,7 +28,6 @@ IUSE=""
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-7
 	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
@@ -38,17 +37,6 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpacker_src_unpack
 	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
-	local f
-	for f in doc/automake{,-history}.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
 	export WANT_AUTOCONF=2.5
 }
 
@@ -57,9 +45,39 @@ src_compile() {
 	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install \
 		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	slot_info_pages
 	rm "${D}"/usr/share/aclocal/README || die
 	rmdir "${D}"/usr/share/aclocal || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS
diff --git a/sys-devel/automake/automake-1.13.1.ebuild b/sys-devel/automake/automake-1.13.1.ebuild
index 34934a64dfab..3aa22d5207fd 100644
--- a/sys-devel/automake/automake-1.13.1.ebuild
+++ b/sys-devel/automake/automake-1.13.1.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-devel/automake/automake-1.13.1.ebuild,v 1.3 2013/01/14 17:37:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.1.ebuild,v 1.4 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils versionator unpacker
 
@@ -29,7 +29,6 @@ IUSE=""
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-8
 	>=sys-devel/autoconf-2.62
-	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
 	sys-apps/help2man"
@@ -39,17 +38,6 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpacker_src_unpack
 	cd "${S}"
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
-	local f
-	for f in doc/automake{,-history}.{texi,info*} ; do
-		mv ${f} ${f%.*}${SLOT}.${f#*.} || die
-	done
-	touch -r configure doc/*.{texi,info}*
-	sed -i -r \
-		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
-		Makefile.in || die
 	export WANT_AUTOCONF=2.5
 	epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
 }
@@ -59,9 +47,39 @@ src_compile() {
 	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install \
 		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+	slot_info_pages
 	rm "${D}"/usr/share/aclocal/README || die
 	rmdir "${D}"/usr/share/aclocal || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS
diff --git a/sys-devel/automake/automake-1.4_p6-r1.ebuild b/sys-devel/automake/automake-1.4_p6-r1.ebuild
index 8531af5ab51d..3aa0ea9f6f96 100644
--- a/sys-devel/automake/automake-1.4_p6-r1.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.8 2012/01/19 20:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.9 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
 	>=sys-devel/autoconf-2.59-r6
 	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -30,24 +31,48 @@ src_unpack() {
 	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
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed failed"
 	export WANT_AUTOCONF=2.5
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake install DESTDIR="${D}" \
 		pkgdatadir=/usr/share/automake-${SLOT} \
 		m4datadir=/usr/share/aclocal-${SLOT} \
 		|| die
+	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 	dosym automake-${SLOT} /usr/share/automake
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo *.info
 
 	# 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.5-r1.ebuild b/sys-devel/automake/automake-1.5-r1.ebuild
index 9e142a373afe..de11759babe5 100644
--- a/sys-devel/automake/automake-1.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.12 2012/01/19 20:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 1.13 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -17,6 +17,7 @@ DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
 	>=sys-devel/autoconf-2.59-r6
 	sys-devel/gnuconfig"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -27,16 +28,41 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
 	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed failed"
 	export WANT_AUTOCONF=2.5
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake install DESTDIR="${D}" || die "make install failed"
+	slot_info_pages
 
 	local x=
 	for x in aclocal automake ; do
@@ -45,7 +71,6 @@ src_install() {
 	done
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo *.info
 
 	# 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.6.3-r1.ebuild b/sys-devel/automake/automake-1.6.3-r1.ebuild
index b97eedb143b9..ef9bb5541c28 100644
--- a/sys-devel/automake/automake-1.6.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.8 2012/01/19 20:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v 1.9 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -13,31 +13,56 @@ SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm 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
 	>=sys-devel/autoconf-2.59-r6
 	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed failed"
 	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
+# to depend on texinfo to regen things.  #464146 (among others)
+slot_info_pages() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo *.info
 
 	# 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.7.9-r2.ebuild b/sys-devel/automake/automake-1.7.9-r2.ebuild
index 77054a2d0223..7bc22055f4cd 100644
--- a/sys-devel/automake/automake-1.7.9-r2.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.8 2012/01/19 20:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v 1.9 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -17,15 +17,11 @@ DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
 	>=sys-devel/autoconf-2.59-r6
 	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		automake.texi || die "sed texi failed"
 	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
@@ -35,12 +31,41 @@ src_unpack() {
 	export WANT_AUTOCONF=2.5
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo automake${SLOT}.info
 
 	# 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.8.5-r4.ebuild b/sys-devel/automake/automake-1.8.5-r4.ebuild
index 1ada326c1043..cd1bc7d8b27b 100644
--- a/sys-devel/automake/automake-1.8.5-r4.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.9 2012/01/19 20:55:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v 1.10 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -17,15 +17,11 @@ DEPEND="dev-lang/perl
 	sys-devel/automake-wrapper
 	>=sys-devel/autoconf-2.59-r6
 	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die "sed failed"
 	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
@@ -35,12 +31,41 @@ src_unpack() {
 	export WANT_AUTOCONF=2.5
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+	slot_info_pages
 	rm -f "${D}"/usr/bin/{aclocal,automake}
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo doc/*.info*
 
 	# 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.9.6-r3.ebuild b/sys-devel/automake/automake-1.9.6-r3.ebuild
index 5124c3d34504..3f9552b9c2c5 100644
--- a/sys-devel/automake/automake-1.9.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.9 2012/04/26 13:42:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v 1.10 2013/04/04 22:15:06 vapier Exp $
 
 inherit eutils
 
@@ -24,11 +24,6 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i \
-		-e "/^@setfilename/s|automake|automake${SLOT}|" \
-		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
-		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi || die "sed failed"
 	epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
 	epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
 	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
@@ -39,8 +34,38 @@ src_unpack() {
 	export WANT_AUTOCONF=2.5
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+	slot_info_pages
 
 	local x
 	for x in aclocal automake ; do
@@ -50,7 +75,6 @@ src_install() {
 	done
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-	doinfo doc/*.info*
 
 	# 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-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 9600faf62d6c..a3076012d6a3 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.7 2013/01/03 18:45:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 1.8 2013/04/04 22:15:06 vapier Exp $
 
 EAPI="2"
 EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
@@ -26,9 +26,6 @@ DEPEND="${RDEPEND}
 	sys-apps/help2man"
 
 src_prepare() {
-	sed -i \
-		-e "s|: (automake)| v${SLOT}: (automake${SLOT})|" \
-		doc/automake.texi doc/automake-history.texi || die
 	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.
@@ -39,8 +36,38 @@ src_configure() {
 	econf --docdir=/usr/share/doc/${PF}
 }
 
+# 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() {
+	pushd "${D}"/usr/share/info >/dev/null
+	rm -f dir
+
+	# Rewrite all the references to other pages.
+	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
+	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
+	local p pages=( *.info ) args=()
+	for p in "${pages[@]/%.info}" ; do
+		args+=(
+			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
+			-e "s:(${p}):(${p}-${SLOT}):g"
+		)
+	done
+	sed -i "${args[@]}" * || die
+
+	# Rewrite all the file references, and rename them in the process.
+	local f d
+	for f in * ; do
+		d=${f/.info/-${SLOT}.info}
+		mv "${f}" "${d}" || die
+		sed -i -e "s:${f}:${d}:g" * || die
+	done
+
+	popd >/dev/null
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
+	slot_info_pages
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	# SLOT the docs and junk
@@ -50,10 +77,6 @@ src_install() {
 		doman ${x}-${SLOT}.1
 		rm -f "${D}"/usr/bin/${x}
 	done
-	cd "${D}"/usr/share/info || die
-	for x in *.info* ; do
-		mv "${x}" "${x/${PN}/${PN}${SLOT}}" || die
-	done
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version