Copy info page SLOT logic from automake #543730 by Tupone Alfredo. Unify duplicated logic into eblits. Migrate to EAPI=5 for non-default SLOTs.

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

17 files changed, 319 insertions, 264 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index a36be0d79038..eb218d31f486 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-devel/autoconf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.194 2014/12/03 05:52:22 heroxbd Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.195 2015/03/19 23:49:17 vapier Exp $
+
+*autoconf-2.69-r1 (19 Mar 2015)
+
+  19 Mar 2015; Mike Frysinger <vapier@gentoo.org> +autoconf-2.69-r1.ebuild,
+  +files/eblits/main.eblit, +files/eblits/src_configure.eblit,
+  +files/eblits/src_install.eblit, +files/eblits/src_prepare.eblit,
+  autoconf-2.13.ebuild, autoconf-2.59-r7.ebuild, autoconf-2.61-r2.ebuild,
+  autoconf-2.62-r1.ebuild, autoconf-2.63-r1.ebuild, autoconf-2.64.ebuild,
+  autoconf-2.65-r1.ebuild, autoconf-2.67.ebuild, autoconf-2.68.ebuild,
+  autoconf-9999.ebuild:
+  Copy info page SLOT logic from automake #543730 by Tupone Alfredo. Unify
+  duplicated logic into eblits. Migrate to EAPI=5 for non-default SLOTs.
 
   03 Dec 2014; Benda Xu <heroxbd@gentoo.org> autoconf-2.59-r7.ebuild,
   autoconf-2.61-r2.ebuild, autoconf-2.62-r1.ebuild, autoconf-2.63-r1.ebuild,
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 29a5b213305e..0b1611e51047 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX autoconf-2.13-destdir.patch 677 SHA256 67c3eaf2f8aaf3acbcff387bc3fc6d46688b56a6b51043344e301bfaf16186a0 SHA512 eeb9619bdc365fb3877b816e30192fb235b8c7fed9e810da0382363141abd9b5df217cda31a7dd1eb51d6310714412709fc830fdaac55a6ccfcfd8335f752c54 WHIRLPOOL eb39bea4db9e92a1f4329502777051cc1ba31e3c70e93c7482cd8b266674996307b71e09677fa3f0763b91b70c69b66a2a3a06b0f3fe182a87a6d864d877b26a
 AUX autoconf-2.13-gentoo.patch 898 SHA256 5d6a4b9d8d789684b44addf565200a90ee92140d58bebf087373ae82c4d89ea8 SHA512 8195ea24bd1fbcba20cd09de12dc90879a3d6e2877179d43830abdca6c68148c2bd611b1d3919777304945a08e0d939aa868bb689558515af6b0b10524f16e5c WHIRLPOOL aaba69e3f2450309abd27e578f7ae26986bf288f623a821219a78ddddd68504fc880624bbb911adb55c15cd7673daa3fe35fb840729495f23a1960d41edcea0f
 AUX autoconf-2.13-test-fixes.patch 547 SHA256 43929d95e6050642385530df91084d4c073cec5cca727918d5ff84bc1e3059f5 SHA512 085e7525c66e710b42dcb068c8aeda89488d1e926e493bcab74e1a1440f53f67630d6998a2a9eff6dc65cf8f71cad19127d541422b51a2519163b51ba78ae592 WHIRLPOOL 8d4865e93cca21cfb6735996cd6e7e920bb3131ea45c63398cefe7c8aca40d6611f1a8142f8c4bdc153c5894200637e4c2a705a26535d3214067a487969b17d4
@@ -9,6 +12,10 @@ AUX autoconf-2.62-fix-multiline-string.patch 1040 SHA256 853bf209c69610d5a9f95dc
 AUX autoconf-2.62-revert-AC_C_BIGENDIAN.patch 7040 SHA256 5dcd1437891ad33ce81219b27429f94ff56ad7216b7b707427ae028bdc60f610 SHA512 3ded7bbdd4ca3443457f0aad7aa8324f1825f155cf43a3bffb3a018653aeeb30404884e42d0abeaf6c3456e1c6aeb19add87d192237111beefed796063461f51 WHIRLPOOL 5b2ceb97d35218e1698f74a0d72cfe13d8365c01cb3f98b4378ab5f0a757e8456bedfae17d00b53a8c03e5693b9660aa3d9f8a56957ae81530859b082e1e6502
 AUX autoconf-2.63-sh.patch 1224 SHA256 1b236cd09c14f5f74eddcb12b001db9c51c624e57f13fe627085d02ed67c0809 SHA512 c82a75c5f04f86f05254150f31c001152feeaf56f5aa662d8df05e6efc1ab751b5d353aa0e4b56ca0de8034cb4bee8283e9ab68977094e04225f06985d3bd539 WHIRLPOOL 4a63c1604883531764c9cf844ea285e7846914409f1b5fb61c83d7fbda73c12d0e69d6ff1ffe5a655e7876eb719235dff5e71dafa4619d35554578901392c084
 AUX autoconf-2.65-AC_TYPE_INT_T.patch 1760 SHA256 b9007a68db2b791ccea64b5f9984b11a38bc7a86c41ae2961293aebf18865bfc SHA512 30bd03debaf74c21f435da00f399a7e1bdcd6e661a7565d240793353507f949cc60b9a31bd2a5f53ba3a909d0171f4afa407f20888e4ff23e5962a5ddbb612c7 WHIRLPOOL 1bd8f1b7cdb892978d898f55d8fb079706719db58d8e7cd67cfbb8741ade271377a8b04a5027d4f0d37759501f467984743f267ee2d7332304f3be60e5c298bc
+AUX eblits/main.eblit 1470 SHA256 0559042e0859ec585573eb0cc5e6d4ca4c4eabb7cb5d5729baf9f3b60175b0e9 SHA512 6bcdcd6b9c9b986c12c380ef0f55553fbf03cd8db030a3aaeeaf8847370d3f8341f7de2dae3239e5bb7a09adaaa818dcb00e55852d3e82a84995cf5000dd85e0 WHIRLPOOL 4032da3a2cb599fc392abaca010bf5ef004347f2a58543e3ccd96081dcfdea09bc805aaac38dc0567e7c72ecea0f5694b9e93000dfed5f05d836fcffce1e0006
+AUX eblits/src_configure.eblit 529 SHA256 82fa2761bfd293df339029d29420c4e5cd2550f656e1af1906b9116bb428888f SHA512 f2a7bc0eeba487069a51b22b39fdf5026e0498a1fb1ee429c86e1827cc60370771752efc5c38ef5142c543b95b8653b57ae181bf840e54041f38fbe317cc7bfe WHIRLPOOL 0f4d828f2d664208ff6bd660836e21d6fd08885abca4f5680034b13906bf5410245870f9f50570641efa0c4741c74e46fb1442ff8f26848228d97db903097c61
+AUX eblits/src_install.eblit 1211 SHA256 7d5d399c015390bdc796a080d4d51f6f04d8e81775c2ab9d7f36a48a9af720a4 SHA512 582303de876cf3a334b915a389b01e241bdaceddea1e0ce0a39ccde7d8f5dedafc08ea164ed5c2fb913b160b0ec3f3423c1e886468d50a3118fdbd0e0c2306c5 WHIRLPOOL e1594206b92303e1f13f0de0597851281b1580f72a3d7463c7a9a4dba94a33a9e024575db44769c9a95ccca722b655195f9f00a5c2677b5fe3f7e323ccae22b2
+AUX eblits/src_prepare.eblit 393 SHA256 43ce1a51f15561d0d95d2d70c4cf65b0492bf3707d1dbeebb3cf1a7b9417af8c SHA512 0b33d2b361f5e7ddc5a8c6cf4af52fe90d06ee07b123fb0b6503f3604c905e5bb69dfbb9ac1cddc25c229e9698262bb87dcb718bec15e2f7fede7d2b89da5a5d WHIRLPOOL 01fe60d63d8dd7144597fbe5011e151d4d3a35b251dbb1bd78ed72353dce659b31804002d2eae035ebe152eab85d83abbdc764693bd6630d41e5452623e33719
 DIST autoconf-2.13.tar.gz 443844 SHA256 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad WHIRLPOOL 918e5e4679f0a2ae84299f190904be05f2c69e8cddf97c6b1a6e82ba20768f4c97ac451b0b6159800bad6635633f9d772a403be8c724ea782bf7725d2905f180
 DIST autoconf-2.59.tar.bz2 925073 SHA256 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7 SHA512 0f57e57b94ef78d59e68476746e78de9c8d0c07bcfdbdb850c2e68b59cdbef7e6256a073d1ae8965abd30611f22c1dc451ecdf67aff43102f73ec118c51ab4d6 WHIRLPOOL 4330fe3d19c26759e7babd2470cf3fb3cc8c6632fee6014ca33c2f8339ddb3114f4376b14cad4126a4dd496aecfc3f68d623061752836094c893894ede693a8b
 DIST autoconf-2.61.tar.bz2 1042439 SHA256 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1 SHA512 f534c7dbc10fc871cc99b1cb68bd7f19d888677d9e2af47e904e91fe90420c20e7a270da2681da82e249ffb46c92165202cc73e125a9b14abd604458731b0026 WHIRLPOOL fd608032198954f05f83e65cd118eb91dc74b0e3b2831594cc2a88f90a5120f56381863913cf661927baeb3aae5b99406a904ccbfb48fe4bf5757e17d455de67
@@ -19,16 +26,34 @@ DIST autoconf-2.65.tar.xz 1132092 SHA256 3e07179feb2ba724ae557872d0cb5878655c58b
 DIST autoconf-2.67.tar.xz 1158000 SHA256 80c6bda1dd6ab04510d42f594c69a06f98dc5e589683b03c11abd89270502ac1 SHA512 b9021a137da42512f6c4ce907b560ad54e27491083ce686039c32dca2602f3cb354d9e7d7493d6d531a0aa5766ff25e0d86aea6e8f61a79d93acf3ff6b56de80 WHIRLPOOL 810c763bbd1cde8eb4b7aeba32d6f9d0189b09b630a92f496eb499b466e19db6a4b9f8e291cf51e690103d8f885b37029f744aac3ca197f6e5a25645f30f1a74
 DIST autoconf-2.68.tar.xz 1167804 SHA256 c994778716e6223cf65e898e06c15ed498fe81424838adf67007282b661055ba SHA512 fd41b2d75a89bcc67f2cb0a3b335ca0d5e8f6d3f4ae844fea21c80c5ff7234efe8c299491e89d1d1124b0d4ec3072a21cf707e14b5ef186f1ab2d09f0fefa979 WHIRLPOOL 607d9bb0469633a1938d92e600073c4fa860415d339e0a8b0239265980eb9a967d79bf4c06ce96bb5f61e4504b52a6b4f90d39fd082f15ad969c1a9d24b0cedf
 DIST autoconf-2.69.tar.xz 1214744 SHA256 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b WHIRLPOOL 9d806d685b9951acb15ab837b08437a6632f0907f105057e84ba3e0d99539371c32153333f459f04fb537cbb96a80e4418937e937381aec677b319ad667f7918
-EBUILD autoconf-2.13.ebuild 1958 SHA256 8e74d25458f11012de8b671f20572c2f866e035ff87f1c6c24c4ff529478cbe0 SHA512 7b627d7c7cb91683c3ec0cfdb21d4e99de2779621ace0640dd7bced92fdd62ed39ad56ee26059c4eb852eb059fc883a8479f0d02ed4876a9e4b05f71bf570e59 WHIRLPOOL f60d9a9330b74bea6755c295e727956a6f07ea3ebfabd2538934f8d25d2bb0818ad38e5848969c3b5304f8b7cd862e6945dcd57f06867f7e5721b0eb042ff896
-EBUILD autoconf-2.59-r7.ebuild 1223 SHA256 99fa2f961ce63330f98bcfbebf39ba8fe4a2b920de9959740e7439a5a6ce5f2f SHA512 88dc829134eefd8b9632fc5687c9563f4560def021cbb41811f6ab3794575719e88bef54cb16163cc0bacb911252e6a5d7d755d76070a2a4218c670eac74626c WHIRLPOOL be69668b1cce8167c1e72ae93541ac9d5143dcdfff883fb5b368837c8d31aa216797118fb1c6e8f900c77f843900c5c5a91ada7a8535e7aaa3b7ae420bc8db5b
-EBUILD autoconf-2.61-r2.ebuild 1319 SHA256 c79f52c3e73be92550572ef4b71d0ba921b262e74594d26d5779880dbc717eeb SHA512 9eea94fe3d3d68ef0179df9ccd40e497ab3c24f7460da76818de9ed0dcf7445cf8fa6bf6dbc052d14e2eeb560413e4d330a646d272c4b09b20b6a31adac40042 WHIRLPOOL 2c17cc79cb1d12ec55ba1c6a2c28437435f630dcabeb0bd8fd753786ffb6a26b5f2a4109de13266872edf08344839f2820e8f44bc06302fed99d2cda3ef032b4
-EBUILD autoconf-2.62-r1.ebuild 1342 SHA256 bb843b469647cb17bcd243ea7eaa90c7201a1d4fe1b4c0cb693e6742f6607a81 SHA512 ae9fbc9b42e72b19ccf661429e52534f3dc8bdabea208af0be3f6d6299cb24493d6ec3796057c663f34ab5c56a0ba5886313143b3b4ccd23b09df48d1aefbb7c WHIRLPOOL cf7049e66f9e115b4174b463db9ed5fdbf9eda11f6432cc6c7aac5fedf9e114bbee6c13210bc12d9137e29a0f7cf44a486e299a52cfb56b6bb71338cd7d4e65c
-EBUILD autoconf-2.63-r1.ebuild 1216 SHA256 cd594bd9a76f89cf2046cca84b9dfc5096d40abb739e02f33af7a2439f71fe7d SHA512 b3a48181a6290c29eb7035a408676f028482c97326254c5b0a82ffd70c724ea984dac8407820f73faee6dc20fd2e76ef8199a14b92513706ef3e7b1fcdf33163 WHIRLPOOL 551a43c6c37c94e584759aba0835671cc32450224397e69b52b14fa5c989f4bad12f9abe9defb2cf6ae6d11c7ed0949b101f95349b907bed7c99be089932fe5b
-EBUILD autoconf-2.64.ebuild 1168 SHA256 afacfeeecf29ee573e54bc30dcfc052010c771d313b877fad48328bbe5accdb2 SHA512 5c6c628455b9630763a4a1c24ed946002abc1b282b5fd99d56f81a7e714a58df908a23fe76f5ecb35c5b77a4d41d72f08953b58948a11c6637668584f3185d60 WHIRLPOOL 49a7bb83e8dba9666943cc682bc74c09be8b0858d12cab1733f57293ce8ff7cb8a109b189eff5c09f30a7a99f2d8212e890b4a26f11ff53e4b00cb22cc57ab44
-EBUILD autoconf-2.65-r1.ebuild 1227 SHA256 923a4b60d97674c5ee03628552522405b00937c32df551a067e0ab1758bd5335 SHA512 4baeac5be934a8c02836dda33167e65ca15cc77a86734f83ab56751299df9f88e5ca7d6f6cb8b58cd46c5df40f4454cfbc00dc9033bc7f000dd45046d1868381 WHIRLPOOL f47817ca036b3b14b4ee587a85a6ce87c03b1f858cb3135b8efb3c9df88c7561f059373883bf1c3f75f05f6f151721c34a22c7d08bceeb78c79a2cad70c6bd3c
-EBUILD autoconf-2.67.ebuild 1153 SHA256 b84beda707cbb9340bcd030769cea9146975146a9eff8ce466531fa2f3a9d2ee SHA512 915d5a6a93c3dfc36886aaa310d700208f9c96a1051ea63e3fa04dd7bf50d77c3efac4677f780a0e0bcb24c8069827738a68331eae415444f5cbef1e6109d339 WHIRLPOOL dcf74578b884f3201a30bcf19c9a5962dc33811ac9f8c34ac9f25e9ac1014b2fe60086f371d94a91ef48d5094607889fdc1d6787731b5d523cdc15af4a301a46
-EBUILD autoconf-2.68.ebuild 1153 SHA256 5f038e4855ee5acd0f2656dfcbdf41ff18653f77b59df153da5fdf8f8c62b35b SHA512 8705989d575946eb0b32e6d2a0e204d78273f562e764034af0fc92ffca95a80d7950b53af856b37a9b583f1a5b1455de0efcb52df2b3f39e6c5fe477b29e833a WHIRLPOOL 1f47818e53192a02ed57efbc5b4016a3d2efe00f0475e37041c7d48df3518240a74e3ce195e15dcd0f30dc338cd31a8165c311a2d6c142a6b4e6af766e47e1c3
+EBUILD autoconf-2.13.ebuild 1686 SHA256 d190e7f38fdaa8f75e802bf9e1442fbb1c2b2d65cb747ec52796d401a49066f1 SHA512 76a6c9d71c8713b81599ed5aff042b5cf6ee78ed5aae0a33c86e29fb3596871d13daebd68b63516feaa948c50320438614181cf2a4e8b2c80fafb96154ae16d9 WHIRLPOOL 590a0addf8ff84c5a1420735af5ab393688703836c20bea2df3c37c848f762506eaf3c62b9102e803c5a98d32287285095cccb3db6dc445e6c15c36f88ee593c
+EBUILD autoconf-2.59-r7.ebuild 959 SHA256 5cbb8abbae82c0e08ef7203b68a45818051fa58aa74e2398429b12bf68e454aa SHA512 4c9e4662062384bbeed173ade002cd2196a26e1092fbe2198c47938b75bbbf8c64c8e9b34f1bf82f8c4b583a1174cf2993f93b7898973f02f0dd82af1714db87 WHIRLPOOL 8274bccfeb5ae2304da9b8d267b031596a94770cfaf6aa96081b52351ad79ae716c86252034d73846d6b8638b2caf6ea8d3fc95e959a2cbfa3d5ea1c61766ee4
+EBUILD autoconf-2.61-r2.ebuild 1062 SHA256 24318017096c250b7b55c8a1ab173de7c76e496ec85e614d43791b07e9b18799 SHA512 483f4ea257605a874222a4beedd60aa5c3a13c2526cb2be598ad04faf853bfe8a3da7d4afd3cf697015486028f0f7289f316ebaf1ace9c303ea5e7bde703de05 WHIRLPOOL 2c689a7e96c0b3f09ebe1abcfde56506c2b176d21b98be1634108f6593cafa498ee197d9fc833fea82e587d57f3f3d8ccd610c167fe86cb4235044cedb6ccd84
+EBUILD autoconf-2.62-r1.ebuild 1071 SHA256 c86ed746de07d61f04f1832cce854b37e0d12380834ce44cdd777136c897179e SHA512 4de81f4e6d8b570bd338c7612d833215a1b1f5231c09dc488f7ee49d5a776487382d42b7cbcfda4a7a188735e25f41b1c190b55debafec9a68d2bb87a0dff35d WHIRLPOOL 9866bdaa30a21ab2033f383d668232de5aa1fb89fe62a6351db6de2bf500e2794e567772ea5fd3172f0397407b53f750d3d8c863b3d7f0b5484f17018644330d
+EBUILD autoconf-2.63-r1.ebuild 959 SHA256 1c32153a7049f15cb930b045549173384ea16215e7ca6bc826d093d14fd63f4a SHA512 b002a699d1870932afeca5cff244dd0d6bc84580787bd6a0ed9460f3554de0e31592d52e38dc31d0f6db40f44eedcde4f356b9cc547adfdb157b7f14942a91ff WHIRLPOOL f978d01547d8f1e965886b2dd1809713f365f79c05dfe62aa6b10a36004dc288f67f8f2df41b59c71617846363c96fe882fe3ddbc23fd8569d58544fe373beac
+EBUILD autoconf-2.64.ebuild 890 SHA256 750c610e24e1aa2cfe418c5baa76c3fb33f12f6bcfe5f30e2cf1483a6ff17f10 SHA512 fc11a366f16b705c604e93a9d109a12b7ba4b49fe9454db3ff3cc7725167162cb723174fa1d1d4b6b5a2044bc5962a823350abd3eb474026353a06c08182d049 WHIRLPOOL 721b78b357023269ef0339cfbb79f93fc5af637d33f726cd915af164a7106abc69632451b5565bab02f4fc6b00d93fddc324c865dc60a637c4a5498b2da7da97
+EBUILD autoconf-2.65-r1.ebuild 970 SHA256 1323349827e9d3acd2e0bfd336f19c399b9ebfd07c776af907809a90796bfbf3 SHA512 90042fa3c5402f6723377a4ee298175d0141847b82af538bb9a62df8237b10a20fe54cab6514d578857f0b8628eb22983d4a72fe4f2910db7a2f63711e23668d WHIRLPOOL c47332ac1e48d0b4e52b090eba6190273516a71fdaaa8f52471d067426022b1037beaecae39b65057d31276c8e85edeb250ed01a1b2f820b2375516ce2486472
+EBUILD autoconf-2.67.ebuild 890 SHA256 259f068251d2f8554182197d792d99b840eb7436d5c6699606c66dc2fdfcff3e SHA512 5974eeee29a530078b2c956b1a536f066e24438769814d77c9ab29293ba779f7028187a188fe1bd4933a3127815b982b3186729a8acba7d213bf9d57e5a38b62 WHIRLPOOL 58f064dbe8a7f7e0110e1aea72777def6378cae76c0772ad920c668a1fe2c3dd25af506ad48044945b5ce404138729cb32391a207ea693b4c2f3c87ea6a714a1
+EBUILD autoconf-2.68.ebuild 890 SHA256 90bcd31389b1ec07ad0ad0ecf31817534377f50f2b16b1915fe48ed4dc2c080f SHA512 0be8dccbbba0a87b3a3278b93e5aa991dc92024a348abeffca3b6c09c623b7eb0daaa523caa3feb9b21a493c2973b96b31ba9b519d8c0e1b2fb9c622d5772ed3 WHIRLPOOL d4fa4632071b4c73a5836672812a4fe6af5d66daa3dc08814454973c08fb8fa1c163709bd7b0c77589e95a726df3292f6d00b46882d1a6e2dc6ee90628bc3563
+EBUILD autoconf-2.69-r1.ebuild 1275 SHA256 ac7ac21ba94b90af373c3f93aed84306411841e56a7cc4b799f6340e83046f1e SHA512 fa660f6648a81bf0082b2ddc10aae3a7516818c47290316da43e486026495328cd74ba702c4de74109a0b815c4787446c72440dcc14eee728fd88ab05a894314 WHIRLPOOL 9e6ab4e718d2a42a79fc052f2ca5d7711d2b857a682a7e36485cec6367bbe8b32a7fd683c0937200c88eb1da4d85d9d6edcd9c618fdf123d2c67eef1a37d31a9
 EBUILD autoconf-2.69.ebuild 1703 SHA256 62bfb8c7d31b1039e50ba76fd9b588a2085df82812370ea7ca3a07c5e71359d7 SHA512 d90e3651aa1ab37c15cc4d3fb942cf88eefe802194ec48d66ecbcab4a0060644637d0299daf6ab8fc8236e4ac8ad0025042c17c135b0d2d065350876b2d88898 WHIRLPOOL 042f06a17a3bdb805236257be57d584a7075ba64ae1afd8943746c5022f231dc9f771df7d3d7eb935cebeeee87f174917c3daa81d32f5c841c4e979d1895001e
-EBUILD autoconf-9999.ebuild 1736 SHA256 c0eef95cd2cb91181fa759545e12f9ddce31a12d175c3f270b5ba63c958b5f8e SHA512 2a08d620195f4d0d43ff1ed715e8661d62a405ad449bd39160f5a5c41a15c437c629303df2061d52ed499782c00d30a33410f4ef72b3205527566da71bc38b32 WHIRLPOOL 557214a95c5cbe13bdea2a69e7f6af3ee90c2e0e2a42b72d1b9481b3528b57a51904e3adc871d02509e393d8a9bca242191d9a3c3cfc3ecb95c40566e67ebda0
-MISC ChangeLog 27552 SHA256 351024114785a442a3919ac8b56db4f74391280b2ccbeb45bf9d61594bf488c8 SHA512 0c0be43f31328d7f2277c98179151afe31d487d9143446e50438491fedfb9471a784f67db70152d9fa3576c9a5d875640c9386056d235ef9910c2246f7f6d004 WHIRLPOOL 24d6be3ed26340157d9d2a5025628818da01cd6b4db699a98d45dcb15617427c79b2f2fb755f8f9318dd08145a288f3235c0b3fbb9a2806e2d5c9b87961f6c71
+EBUILD autoconf-9999.ebuild 1662 SHA256 1c8a7d8dcb10b651ce7530a4307b4ff64530dd7fe16dde9014f83eed4b4ef143 SHA512 3e66760519a563331f9ef5a47e1d9cb7700b1d6d19494c5125c077036cad5f82639d3a53c9c233a08695c0e9413fe80d625c26e12e9af6ba5467903b090b5a34 WHIRLPOOL de4225027e7d5a947dc254907d65528c4ca4a397e0ca6165ef514ceafc85b51aec12155672db29f012c15e0030cf6780ed6cb61cbab1f23d2b55d10046e9d485
+MISC ChangeLog 28183 SHA256 a754034e01a44104390758815bbb9845ef2ead4da0c78d17bc1f72eab6c8f818 SHA512 37784b586c0e196d833b88498e01a6213fa595de51d4e91d33304fadb0bd4eceae085aeab45f924672aca5a0f8ad80f08ac7a8e14d558a61f9c050e21f64dcda WHIRLPOOL 973df92c54f220f1450243ce4b880a24209aebc08195ab7e7ca31e932cf8190373248d460d2811ffd8db7f24509f7036f998cd035767089cf2e4e95771ed0fe7
 MISC metadata.xml 259 SHA256 117bfd466a62137b822e206f192aae9654b6e25f57eb2fdec3574184fa44b3fb SHA512 d1a946823a672af327a3b4d860263e3899c90b826463bf9fb85273b06edd6ef0cc74818455e629c49ebd46c4614f96cd3edacef07893a764f99426253a30c916 WHIRLPOOL c71bcf5c5caf6e62d7a34dea22ceeb899e3b379ab454299bc7afd50235b9febe5d75da44c27fe4ed87861c4540af0061d8e11cf4656f63a3065033c5e4607af6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVC2B/AAoJEPGu1DbS6WIAZUMP/AnPwnuPtuFfvdtYNDaOla4G
+ipCtrZqqLYJ7x2vlIukizJpgqkJBekCkiwnJxjQaVfxhejCFw2+6VZCsgHh7T0gH
+rBGi3D1Z1gHFe38QhCxK0hAU0KtrSU8Kh+OhWHfEEIbyN/YYW9ChFsQO7mfyCZno
+Af7LGg5/RiXpELalks9ypVx4UK2XavxbGZsyhdZMXtbLNFkItrBaX1mKSQi0SunW
+04RyG504+3sTvICUD437CtTVDp1XwpOveZJU4psT8T15FYM8XRWzP7/6owaSH5kn
+Lk+HI9Hrud+wDu4X7rgkFa5VKI4wFs+jJEdEXTQQE+1lT3JCnBboVA5c/MD+Tyrv
+/B4AHTYhyjmCoQBFALeQXRaZCPEAtfmnInQHefUmULOLa+IsWSYaaCEFfSjUQuay
+E8k0RWOom2WpbSiWaD2wzmCPZoCXtk5/0SEKwtPtKZ0/94lFYeLB5yQFtH+HLIrh
+Igp6bOGFXPEaqfF84+01MkRtrWGjaRdknKw6rniIbFqdadQzn4xhLZH4aGZS8+/L
+LzSv7BayaqRyBAl6nVxC9UfyhxouWBjDYPLXTfgi74C+l0PqFOzLr2YJyjuUMHyj
+GlmaSWZz8abUMbvwP3XzPBxGaLgxuCtetehmexKbAvdVdnjSK6MCzP6s1OhdUOiT
+WiJ0lVmmcGPXTaARfLtL
+=ryQD
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index 12ffbb07c1b4..276261263b43 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.24 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13.ebuild,v 1.25 2015/03/19 23:49:17 vapier Exp $
+
+EAPI="5"
 
 inherit eutils
 
@@ -19,24 +21,21 @@ DEPEND=">=sys-apps/texinfo-4.3
 RDEPEND="${DEPEND}
 	>=sys-devel/autoconf-wrapper-13"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-destdir.patch
-	epatch "${FILESDIR}"/${P}-test-fixes.patch #146592
-	touch configure # make sure configure is newer than configure.in
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-destdir.patch
+	"${FILESDIR}"/${P}-test-fixes.patch #146592
+)
 
-	rm -f standards.{texi,info} # binutils installs this infopage
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_install()   { eblit-run src_install   ; }
 
-	sed -i \
-		-e 's|\* Autoconf:|\* Autoconf v2.1:|' \
-		-e '/START-INFO-DIR-ENTRY/ i INFO-DIR-SECTION GNU programming tools' \
-		autoconf.texi \
-		|| die "sed failed"
-}
+src_configure() {
+	touch configure # make sure configure is newer than configure.in
 
-src_compile() {
 	# need to include --exec-prefix and --bindir or our
 	# DESTDIR patch will trigger sandbox hate :(
 	#
@@ -54,15 +53,5 @@ src_compile() {
 	econf \
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
-		--program-suffix="-${PV}" \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	dodoc AUTHORS NEWS README TODO ChangeLog ChangeLog.0 ChangeLog.1
-
-	mv "${D}"/usr/share/info/autoconf{,-${PV}}.info
+		--program-suffix="-${PV}"
 }
diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
index df6b6d00c93d..d875d1664291 100644
--- a/sys-devel/autoconf/autoconf-2.59-r7.ebuild
+++ b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.22 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.23 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils
 
@@ -21,25 +21,13 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-	epatch "${FILESDIR}"/${P}-more-quotes.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-more-quotes.patch
+)
 
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}" || die
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.61-r2.ebuild b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
index 30e313f8a838..4722354e566d 100644
--- a/sys-devel/autoconf/autoconf-2.61-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v 1.14 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v 1.15 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils
 
@@ -21,31 +21,19 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-	epatch "${FILESDIR}"/${P}-GETMNTENT.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-GETMNTENT.patch
+)
 
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
 
 src_compile() {
 	# From configure output:
 	# Parallel builds via `make -jN' do not work.
 	emake -j1
 }
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
diff --git a/sys-devel/autoconf/autoconf-2.62-r1.ebuild b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
index 321e50a1a2e7..76246aed2839 100644
--- a/sys-devel/autoconf/autoconf-2.62-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v 1.8 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v 1.9 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils
 
@@ -21,27 +21,15 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-	epatch "${FILESDIR}"/${P}-revert-AC_C_BIGENDIAN.patch #228825
-	epatch "${FILESDIR}"/${P}-at-keywords.patch
-	epatch "${FILESDIR}"/${P}-fix-multiline-string.patch #217976
-}
-
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-revert-AC_C_BIGENDIAN.patch #228825
+	"${FILESDIR}"/${P}-at-keywords.patch
+	"${FILESDIR}"/${P}-fix-multiline-string.patch #217976
+)
+
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.63-r1.ebuild b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
index a5fa802c6124..d64931d8c119 100644
--- a/sys-devel/autoconf/autoconf-2.63-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v 1.8 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v 1.9 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils
 
@@ -21,25 +21,13 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-	epatch "${FILESDIR}"/${P}-sh.patch #264303
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-sh.patch #264303
+)
 
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.64.ebuild b/sys-devel/autoconf/autoconf-2.64.ebuild
index 8026552c8125..c01e08829196 100644
--- a/sys-devel/autoconf/autoconf-2.64.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v 1.9 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v 1.10 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
-
-inherit eutils
+EAPI="5"
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
@@ -21,24 +19,9 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-}
-
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
index 78e8e5e82d0c..b95c75a0597f 100644
--- a/sys-devel/autoconf/autoconf-2.65-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.13 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.14 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils
 
@@ -21,25 +21,13 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-	epatch "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649
+)
 
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild
index a6066bc59881..a93d4e008f1e 100644
--- a/sys-devel/autoconf/autoconf-2.67.ebuild
+++ b/sys-devel/autoconf/autoconf-2.67.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.18 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.19 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
@@ -19,24 +19,9 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-}
-
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild
index 7cbbf662529a..96e8138ce727 100644
--- a/sys-devel/autoconf/autoconf-2.68.ebuild
+++ b/sys-devel/autoconf/autoconf-2.68.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v 1.16 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v 1.17 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
@@ -19,24 +19,9 @@ RDEPEND="${DEPEND}
 	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
 
-src_prepare() {
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-}
-
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}"
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
-
-src_install() {
-	default
-
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-2.69-r1.ebuild b/sys-devel/autoconf/autoconf-2.69-r1.ebuild
new file mode 100644
index 000000000000..f6987a45b9ba
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.69-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69-r1.ebuild,v 1.1 2015/03/19 23:49:17 vapier Exp $
+
+EAPI="4"
+
+# For usex.
+inherit eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+fi
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3"
+SLOT=$(usex multislot "${PV}" "2.5")
+IUSE="emacs multislot"
+
+DEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	multislot? ( !~sys-devel/${P}:0 )
+	>=sys-devel/autoconf-wrapper-13"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index fd6dc6a6dd12..f4c203f4237f 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v 1.16 2014/12/03 05:52:22 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v 1.17 2015/03/19 23:49:17 vapier Exp $
 
-EAPI="4"
-
-inherit eutils
+EAPI="5"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
@@ -33,27 +31,18 @@ RDEPEND="${DEPEND}
 [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autoreconf -f -i || die
-	fi
-	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
-}
-
-src_configure() {
-	# Disable Emacs in the build system since it is in a separate package.
-	export EMACS=no
-	econf --program-suffix="-${PV}" || die
-	# econf updates config.{sub,guess} which forces the manpages
-	# to be regenerated which we dont want to do #146621
-	touch man/*.1
-}
+if [[ -z ${__EBLITS__} && -n ${FILESDIR} ]] ; then
+	source "${FILESDIR}"/eblits/main.eblit || die
+fi
+src_prepare()   { eblit-run src_prepare   ; }
+src_configure() { eblit-run src_configure ; }
+src_install()   { eblit-run src_install   ; }
 
-src_install() {
-	default
+eblit-src_prepare-pre() {
+	# Avoid the "dirty" suffix in the git version by generating it
+	# before we run later stages which might modify source files.
+	local ver=$(./build-aux/git-version-gen .tarball-version)
+	echo "${ver}" > .tarball-version
 
-	local f
-	for f in "${ED}"/usr/share/info/*.info* ; do
-		mv "${f}" "${f/.info/-${SLOT}.info}" || die
-	done
+	autoreconf -f -i || die
 }
diff --git a/sys-devel/autoconf/files/eblits/main.eblit b/sys-devel/autoconf/files/eblits/main.eblit
new file mode 100644
index 000000000000..8b88298fae82
--- /dev/null
+++ b/sys-devel/autoconf/files/eblits/main.eblit
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/files/eblits/main.eblit,v 1.1 2015/03/19 23:49:17 vapier Exp $
+
+__EBLITS__="locked-and-loaded"
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			source "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+# Copy these into the ebuilds.
+#src_unpack()    { eblit-run src_unpack    ; }
+#src_prepare()   { eblit-run src_prepare   ; }
+#src_configure() { eblit-run src_configure ; }
+#src_compile()   { eblit-run src_compile   ; }
+#src_test()      { eblit-run src_test      ; }
+#src_install()   { eblit-run src_install   ; }
diff --git a/sys-devel/autoconf/files/eblits/src_configure.eblit b/sys-devel/autoconf/files/eblits/src_configure.eblit
new file mode 100644
index 000000000000..898e3a6d3ab6
--- /dev/null
+++ b/sys-devel/autoconf/files/eblits/src_configure.eblit
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/files/eblits/src_configure.eblit,v 1.1 2015/03/19 23:49:17 vapier Exp $
+
+eblit-autoconf-src_configure() {
+	# Disable Emacs in the build system since it is in a separate package.
+	export EMACS=no
+	econf --program-suffix="-${PV}" || die
+	# econf updates config.{sub,guess} which forces the manpages
+	# to be regenerated which we dont want to do #146621
+	touch man/*.1
+}
diff --git a/sys-devel/autoconf/files/eblits/src_install.eblit b/sys-devel/autoconf/files/eblits/src_install.eblit
new file mode 100644
index 000000000000..7015bb26d528
--- /dev/null
+++ b/sys-devel/autoconf/files/eblits/src_install.eblit
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/files/eblits/src_install.eblit,v 1.1 2015/03/19 23:49:17 vapier Exp $
+
+# 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() {
+	[[ ${SLOT} == "0" ]] && return
+
+	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
+}
+
+eblit-autoconf-src_install() {
+	default
+	slot_info_pages
+}
diff --git a/sys-devel/autoconf/files/eblits/src_prepare.eblit b/sys-devel/autoconf/files/eblits/src_prepare.eblit
new file mode 100644
index 000000000000..73ce9d7acc26
--- /dev/null
+++ b/sys-devel/autoconf/files/eblits/src_prepare.eblit
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/files/eblits/src_prepare.eblit,v 1.1 2015/03/19 23:49:17 vapier Exp $
+
+eblit-autoconf-src_prepare() {
+	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+
+	[[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}"
+}