Upgrade old ebuilds to EAPI=4 and enable SLOTing all the time.

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

11 files changed, 173 insertions, 226 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index a3904f29ad35..676e79627272 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,12 @@
 # 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.191 2014/10/24 19:23:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.192 2014/10/24 21:14:20 vapier Exp $
+
+  24 Oct 2014; Mike Frysinger <vapier@gentoo.org> 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-2.69.ebuild:
+  Upgrade old ebuilds to EAPI=4 and enable SLOTing all the time.
 
   24 Oct 2014; Mike Frysinger <vapier@gentoo.org> autoconf-2.67.ebuild,
   autoconf-2.68.ebuild, autoconf-2.69.ebuild, autoconf-9999.ebuild:
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 6c87d83d731e..17f70762d1c2 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -14,41 +14,41 @@ AUX autoconf-2.63-sh.patch 1224 SHA256 1b236cd09c14f5f74eddcb12b001db9c51c624e57
 AUX autoconf-2.65-AC_TYPE_INT_T.patch 1760 SHA256 b9007a68db2b791ccea64b5f9984b11a38bc7a86c41ae2961293aebf18865bfc SHA512 30bd03debaf74c21f435da00f399a7e1bdcd6e661a7565d240793353507f949cc60b9a31bd2a5f53ba3a909d0171f4afa407f20888e4ff23e5962a5ddbb612c7 WHIRLPOOL 1bd8f1b7cdb892978d898f55d8fb079706719db58d8e7cd67cfbb8741ade271377a8b04a5027d4f0d37759501f467984743f267ee2d7332304f3be60e5c298bc
 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.gz 1396855 SHA256 9d14f2ed0d1b6f8180498a66517f511c7c49c870d6873219a3ff4b8b3082a68b SHA512 ac46787707aa5fb421babecacb48936f3997a2371e4d2b7575ce922c0c04b994977ba12113bb19fda84cd4104479090fd7c9ebceb8c20a98fdd9beac4661a91b WHIRLPOOL 243589e47337c1344ba399c9c4c28b41188239f97cdb109b6a4f6bede12c184036247f70db83da41cc36a46e5d45227e34dbb83544699787484a0d994b9ffa4b
-DIST autoconf-2.62.tar.gz 1518427 SHA256 83aa747e6443def0ebd1882509c53f5a2133f502ddefa21b3de141c433914bdd SHA512 7d51ac8ff598660b65f0d90f4558af3d61e21545f589ab42202527ddc5c7937bc111199a20662c2a680154ac73bd9a44a64726f63ff7058ade16455deb2b61f5 WHIRLPOOL 7ed2c5908959933b8df627b44118cecbc9b64089970de2d04afa62baa53daca7997d92bc6573c5e3198f6cf595dec389fd9fcb86d522faa5bbffe517a1372ba1
-DIST autoconf-2.63.tar.gz 1562665 SHA256 b05a6cee81657dd2db86194a6232b895b8b2606a30a399c3a566d9259366744b SHA512 429dba7221fc668de3c9a7dca2b43ba182c82ac14cb70f8cd8d12b80538e2a9638f1c23f7421f38418ab25d9c9f51ad2646aaf61aa45a4e300f2061dc8c418a9 WHIRLPOOL f361d28f1992014fea83e5b0be6c451f5805044d2f40b5c854e40c1d015dfc0271fdb43bb5c0ab9092864d10feecb969493610fbd01f07b6b0553681c06b9ed9
-DIST autoconf-2.64.tar.bz2 1313833 SHA256 872f4cadf12e7e7c8a2414e047fdff26b517c7f1a977d72433c124d0d3acaa85 SHA512 ae226d517e875a4e58006c3879c305a9a72316040a9e7908331cd84764d28de399ff082fe9c0cb18485c028ae7b91f8458318ec4960fbfb2e58b1270dc3daf18 WHIRLPOOL 2b02c78bfe86af7b4f46ee31d1462a843cc6baa374e9fa69f92b8fe8bc7ff15c66126d233ca89dd217c46a7a818f2f9040f10c5d24f3f5716542451784a67118
-DIST autoconf-2.65.tar.bz2 1332522 SHA256 db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b SHA512 1d96a5ba8c63d54a59e2739c9f4df16c14e8cd72f27c8565f4f1c8dbe4fdc8ab98a0a75929d4f1039fb225666d7ebbb9030f185978ff72de99d421edf70fe045 WHIRLPOOL bdb9017390ef1a00b0bef6303421fef27c4443512703f04fe4ff33807796e4065d41813486a8d6ca72a90aef579ebf69aed3f54325ffc1bfb1816efc8aaa2671
-DIST autoconf-2.67.tar.bz2 1369605 SHA256 00ded92074999d26a7137d15bd1d51b8a8ae233a6cd165a38f34ccf7b1a78aef SHA512 366f39e23a49a4f76ce901278286f00473d838dc3730b29dd29707276362aa5566fe1890856a221fa1c494c1304756a82924ec1b6ee0bce0e80ddd657386dd5a WHIRLPOOL 2fae4ade453f2e3b77766d03d36bcf3c727aa08d40b7fafe939aa03040f6965f92ca1d39888957d55744cd84db3c910967471f862149847f0008f851133beb30
-DIST autoconf-2.68.tar.bz2 1381988 SHA256 c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8 SHA512 77f42d7a3825a398531ab52bf05936720788167f7d04f884a2acb7745edb60a706799451ff983f1048bc929cd38972ab29530a5e4ed6f686ff1700e0281a7e84 WHIRLPOOL 9edc133292a40e024f9f18e40942717342b540056f2fe4b361c4a514ec908d8e04210e714cf6cdb5752673f6fb5cc4ba6e9d624b96f9ef12b4b9e9838e1498a6
+DIST autoconf-2.61.tar.bz2 1042439 SHA256 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1 SHA512 f534c7dbc10fc871cc99b1cb68bd7f19d888677d9e2af47e904e91fe90420c20e7a270da2681da82e249ffb46c92165202cc73e125a9b14abd604458731b0026 WHIRLPOOL fd608032198954f05f83e65cd118eb91dc74b0e3b2831594cc2a88f90a5120f56381863913cf661927baeb3aae5b99406a904ccbfb48fe4bf5757e17d455de67
+DIST autoconf-2.62.tar.bz2 1165951 SHA256 42be7628e32fd3bebe07d684b11fb6e7e7920ef698fc4ccb3da6d77f91cefb96 SHA512 98a2d903e8c43088ac60b880f58d7c35c547824c277dbeb14c48f846e40f29546c20e942f99127ffdc6f6607c334a6054328f20a9a2962972cc80570665ee7d7 WHIRLPOOL bfef8abab1a6776859369d5ffce960a17ae25208312b5a78ddcac97adb0a4464c25043a2bbf8461a8fcb528dc878a8bbc04debe67701ade47eae8a67b1ef25ff
+DIST autoconf-2.63.tar.bz2 1195259 SHA256 264d7c1c0e268bc77fbe0f308e085545535edfe73f33e27c80219cc0c9c71246 SHA512 bd47527a1f6558953d21ac1d7a36d490d057a78cd612f82b6f31aa73f9c42f4a2d736a7d4e49d91df268bffa5a418d222c53e741bffc2c8843fe3b7ed37e09d6 WHIRLPOOL 595eefe099ad7f8ad17290b5f042186567915164d2f0ae3cabed0ee13f54ca714e82ff440f84a4458fb42ce4b4f9fb5eecbcf79e61405a5a833b04d55f5a8713
+DIST autoconf-2.64.tar.xz 1113892 SHA256 32d977213320b8ae76c71175305301197f2b0e04e72d70694bc3d3e2ae6c7248 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3 WHIRLPOOL 791d3f9ed37833b13880a1bb7f75b2f73ae73fd6c9a9f4bb0ddbc33e29a617fa7f82fe43556c33effc417ac584f711f325245c3379af97f22600d54546ef9a79
+DIST autoconf-2.65.tar.xz 1132092 SHA256 3e07179feb2ba724ae557872d0cb5878655c58b49b6eaea068210c0bf22661f5 SHA512 23473cde36ad02a9474286a144c751b222d7aecf8b271b49e6dae25706c96d5533c8d840d522ecf11df8c437961a2ac00aa050c929d5e06b381acf1bc34f2c4c WHIRLPOOL 8a4bbaf7c9593d27ab9245dedc236d4addf38633f0fcc95ccfc35a1d503c447674940790407e49dab3b9fdb679eea8c9b04b132ca87c5a3c820a7f6834bfec98
+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 1482 SHA256 f29c051db5feb954598eea9fb7895705c2ecac36991c07cde4e3a92dfbec9af7 SHA512 a96ec25fe85509a96998a1563119c0d0a609890c40dc4690981a04329c93bab973b7774928e2d4017418b5d590428cf605f36e8fa29d3ab35c5d1b95567faca8 WHIRLPOOL 8723d342bb11c0fb94662941d2e01c40894040f68cb4f5311879cd15d0644bd96417ba55f9f3361a975ecd169b4d7960ab3f4c333d9a982e8a006251f4038974
-EBUILD autoconf-2.61-r2.ebuild 1558 SHA256 9a3a081c91202da5555cf3962bf10b414d893de0f81042bb0ff656f626cce1aa SHA512 f384cbe4f983d8169ddc673a8e653b63b9d4e611d9eb97f8f7d64cef3fc1031230475dd39edb952f265c956d96441ed50992c2dbcc33a29aa4586994c807292d WHIRLPOOL efb34521f0d3baf5ba18fb9521183a4be71f7234ae8d0508c8b43819190b51ac497338cb2157f707dc91bef931e5ae6a1d5819915ab6262f69bf58868880c3d5
-EBUILD autoconf-2.62-r1.ebuild 1607 SHA256 f19f9ef0a73849851ac73850ad4daec0b67e9138fd0067036d6e92cb0b8b7be9 SHA512 6e9c16151469ed905a3fcc0ca70bd55e92a09caf8b1bb76f3c65a4110c02c826c3511b6d5807e3f1cb9e1364017b366d19b73748f80355922dbf079d1903e8f2 WHIRLPOOL 64e4b7e93a0e0315ee5878fc4d518d0bc1ed39b332719e19d65f06fdb3b4cd17a3dcaca8138c55b671e24dfe9978367d706b322ec381295576c8757ebd943b4b
-EBUILD autoconf-2.63-r1.ebuild 1481 SHA256 3554af838ed213d582d0d0f03e5581ef767adf2a310d7aeecae05633b14c42bb SHA512 72e05c8835721db111703a73096c050f20a4df05ebb0f27fd70d7c45c3f82bda259ee47f7689d1f0c1026dd48d05639a1e683c4d33fbcae09b5d78f4f9939329 WHIRLPOOL e6e508ce7d28f5e1b63d28664a4a49ef36d09516996471fd5e7dc2855e8e52d54da5e21d13f37007dd8ebca9f9c347efb7a5a61bb1cc63fdf0c6ba0a542c3883
-EBUILD autoconf-2.64.ebuild 1483 SHA256 02a8d145a55b3ede4f6676e39d63023d501e5d72714639c9bb6c77670d295865 SHA512 ecd10abdc0522c3aad2b98e031000b039e6281ae184f739c7f35bd30702a84ca2e9dd5141c98af0aa1460d425ae4a8df295104fe02792182a92160d8f7ff135c WHIRLPOOL 3e78f93552b2106b9e571e9281adaf4d676e3bb57a4f6df8356db4f065c43dac98c46bde6fdf372346a609e1efb948c2691bf752affc7990d9b7097faaa65fab
-EBUILD autoconf-2.65-r1.ebuild 1542 SHA256 7a48b908196e2485c84972a44c9397a331704c05cf157e218e42574f6edad939 SHA512 b7cc3d6158a1d3842896accee08f69e29098d535abc83ed9438ab2aa17623307a9b57075e0279090b9a7fdffc9e15d0fc2cd7e51963bc8b8af5a4a13ed8239ba WHIRLPOOL 6349a49bb67e7090e83b726ed2649ae237115acd8709357b431e0ed7bccde5d769b219a92a4ed95586179dd49eab0607037e4775ebd940792b057bad12df8759
-EBUILD autoconf-2.67.ebuild 1638 SHA256 190112f2a684bfa144218cc634fd92bf0f8279bcd3371848c73eefa745235ad7 SHA512 3adcbb7e21eb8a975a5cb8128515ceda64a52369bf23cd211f9ed808789840f89a82784a290aa83fcbc7b687e5a17b83a17f149f5ca72cee4fd0e6873dd437e0 WHIRLPOOL 3ca982a4052d2399f6a40b2e06a765e9559e94dec5aa9d610bcf10ba2d068a5188689c824d7d96aaa0b18b3ad983fb00878e5f4af4b26d0a39192b54829c27a0
-EBUILD autoconf-2.68.ebuild 1638 SHA256 e3fb271b264f7a70f6ba4e8ba340ced752043e4498754d3405dea36ae4f6e3a4 SHA512 61bd85de2be593ad5ee1739efc0be3014e9ec820dc59d9ffab3d893ffbc967249b5728a2ba07bda2511f03f60fd2c3b87409d00a4eed89a397347a14dc962634 WHIRLPOOL 21c78008df0e00130fd83b12e54ba8e0fce02c7c0e48ce3bb66b5a9aa2d7a246784961841467877c2b6bc3fef8e475150c3bb177c9a771dee39e73ef576558a5
-EBUILD autoconf-2.69.ebuild 1716 SHA256 f00fa8708a9e618ab7e4909e63fbfd3e4d4f1687566420802dd3f0002856d378 SHA512 33a5875184d3cb02b99cef9f6f5011209ff6a9936efafc7ee7bf911c66f86e1cbe22a39e901a31ac30f5aff89a6cf2bef3eb9b407aa0620ec460258b9cb50bc9 WHIRLPOOL 954adc9cf27bdb76be76a04f7e1ab380dbfe4174587b4f0bb0ae4341fa9bab88c58d83d941be2f4d9b6581c15fece0a1e4683730bf1fbe40319eb75f2a452d92
+EBUILD autoconf-2.59-r7.ebuild 1221 SHA256 db780190db46dc722e22275e20e785af13fa192a06b55cd41b60ed51a67034d0 SHA512 9acc9e63ce07433bf889ac667ec404ec261d9d1651ae646bb47680cdc5d4d5d499f2fa08ff6bbc92701ef8c3467b26601e6e2737d644e0580b824042e8c03305 WHIRLPOOL 0eeed9432d94ee05a377b05033bebf4ec41d741159ce4c8a9ccbde106c62b18e74d944e88a8da788c989fe9b64c87470554ae1e7152ad211274946ef6f32b86c
+EBUILD autoconf-2.61-r2.ebuild 1317 SHA256 6be1195624eed6cfabea5660a4f10e6cbfb36fc7bad327a343bd2975a2c4a33f SHA512 7a3e4b5c408facaae01af6c11f217fb94ec5acb083ccb212755f0b1d6b486e6d3fcde239288f556825db827a2360683222e1b1156cbba7498df709417c8d3da8 WHIRLPOOL 2a0bc94a3121a9eb23fb1b4be2fe022be9d867dc6b361ec620aeda6c7fa426ccaadfa520d9335dc57037a5302e9dd97d6d706f5a62ecef728cdb45d1ab3102f3
+EBUILD autoconf-2.62-r1.ebuild 1340 SHA256 414c8f5866d824984a15ea386d445574c86d9efc552c3abe6d4bf51a25c167b9 SHA512 b324a1a2587b5aaab2f124bca8cd4ae233bb1b7bdb9262c1f1384efb5df7e98b1f662a8bfbfd303b87cbd4135f26f61ef602b3682e5420af3826d2eb4e6fef3a WHIRLPOOL cda4e6e867cd278db3c7ef1bdfd97178a18f155f50dfa6f7539cbb0c9e02c3ddb04cfd15197d93fbb50f487510d58ff57fa93d566b6c2c67b55dc43fa4af6dee
+EBUILD autoconf-2.63-r1.ebuild 1214 SHA256 10c5f55920fd9ce40df0b31f38d10f37fc52487fe3c569c099b5221c0f9b4c75 SHA512 163df51a005f7d12f487c1283de810e6662d4a670dbc5067ada6f39ff2ac02ce58806f603e5bae405f51ca369f670637865856ce5293f430985d7157b47cf807 WHIRLPOOL 30b63346cc33984f53d3eb75ebc0e0b237f1cea2c8ff0a96944fb594b32465ea3524dfefb94d41c2f800c464f146f0543209586755cf911a65c8c9770e5bb4e1
+EBUILD autoconf-2.64.ebuild 1166 SHA256 a8e3345f4a7d00eddb428a69e97a8531f07f0c5382b167a5955c668120a04e10 SHA512 bbdb512600f61eeded2497c327b6d64284b88a95de84f1aa2dcb35073741cbc8e77d687cd51ca7641789846aac08c3b78fe7911713a66532e0a99ca16e0f22e1 WHIRLPOOL 4c7f4967638e881b2fa1cdc26cd601299bd47262b470bd1260935f626f9cf8ceaeeb36be55d251028975c62f0a369c82343f1b65f0ed7d299b3fcd103de917e9
+EBUILD autoconf-2.65-r1.ebuild 1225 SHA256 c8e396c7d6a89de91dd5b07eb67acf22336fd0476ddc49618d056193c6bdfc5b SHA512 7a91f929c88778b92b58eafbebb55078693d2f2366764bba9deba2a227ce9df245bc9a0791a7792319d7966c7f431c8dbf68d3ef63abfdb3c6c746cd857019d3 WHIRLPOOL e489330b5c0314550869005b31417b1de026e7251a829a599c57209de9d57d25c7b032eb97ac1dbc44f8723f372c1b38044a46051fa2d19dfb56d142c871d6a2
+EBUILD autoconf-2.67.ebuild 1151 SHA256 76209d474d7a656091e9096df1ac359af3a5ebc3d88036553ff7b028db890276 SHA512 fc957f33621ab32be65f956f0b6925430cbf088ad9da82e1cad6e2af82d7c49c8aa6d2c3fb3d55bd4712b48d22bddfc4a573fe3a01df736e12d059763e62f30e WHIRLPOOL 593bf39df17d9793c5ae3cf6d08375ba3ac805f8b0d51fb36f3b127a9f32213cd267f52ace817188453c3e7339d37dca187a4604ddf236dd8caf9a8c5a95e2a1
+EBUILD autoconf-2.68.ebuild 1151 SHA256 259fd6b16a476016b07c1fdc1c10cb449c76ea3e6adebc2baa602ba879c4b93a SHA512 8981e9813c97c1b25299408eac558a4764e6cd618d47160d7146b0d3a6abdce974826461170326dc4575b55f09807e0c3dc5b60372e4e766168d852c2b688e44 WHIRLPOOL a00f5d6e2eddde0954cae555ea2df43222a8e58daeda63abe7823887472c513c5fd562414e8020d21ae5c4e44f6fde4f55514a05acccbebc591cce9b61e9ecce
+EBUILD autoconf-2.69.ebuild 1751 SHA256 933c193680395a968552d245900cbe068a8e13626ef430068db396b802784e18 SHA512 47fdabca1265ee4bfbe896dbcbe67645ede1fd66c6e64e590f749854374c5de6c0462d74f974a748866507e89d2906c73f778c9e8d3f5e7cea089ea5ef32d574 WHIRLPOOL a78474c4f128bfbd2b6dc193e463b1d59fc0be9f77e745eb0deb0edc0d59f8fef489fe325e3dc73fb872704e915736a4c628a5e865b326666ba6256794612404
 EBUILD autoconf-9999.ebuild 1798 SHA256 eda03c2e4d103775305d0d4e7adac35fe7b46e9486f2aec70cc6c69d4b1118a7 SHA512 efa20cf131968039b4ca1631cb53c6e8a0a0fb6bb789a20c945b5a9063111aa2d71f80fd77ec67f4d8a0749155890d5df4026e312e24b2c3962d84efc958a2a2 WHIRLPOOL 81fbf5e1738545ab28a57c556d88cddcc57690b19ea339bbcb35875d557b206a361beee07aa782a590b3f7202b7d46ffb2df4372dc93e53be90e0ec6eacfd473
-MISC ChangeLog 26841 SHA256 2cb1e194490359d75b4a4da2f945601520ee32eb68259e78129b59845e39aec4 SHA512 f00196e4c066625618b7b958285065cd9e4f344741c7fa5335f540f18990a78a229ae4149b8eea02e64004b5431fd55d11304e51df1b6c12a259a067020a5b64 WHIRLPOOL 164e2f6b283d978e270d4e3a4287c7f97d12df07ad9f5ae5bef550b408d164d2cd53816f7e2b7bf5599e96a6994dadf4f366372012289ea332c733d97730992a
+MISC ChangeLog 27176 SHA256 69c4cf5b28255ed888f492f8beea53bbc01e7ceb0d839d605106f4aa493d1c9d SHA512 04d12d2fca0eef45334a3b275cfe9d775f0cfcabc87f4a0c3458c5a47f7bed881bf45d23bd42aa7ee895ef4438ca7eaa5ac56ab8c7e4e931b9e87c1393e21ec4 WHIRLPOOL 5f6e59705a704e29c49f92857f36930f90243460afd7d6dc30e80b4839a77c22c53c97be4477d9fa9a269dcc1c40b83eecbb161fbb50d28793acbd7216ae09ee
 MISC metadata.xml 259 SHA256 117bfd466a62137b822e206f192aae9654b6e25f57eb2fdec3574184fa44b3fb SHA512 d1a946823a672af327a3b4d860263e3899c90b826463bf9fb85273b06edd6ef0cc74818455e629c49ebd46c4614f96cd3edacef07893a764f99426253a30c916 WHIRLPOOL c71bcf5c5caf6e62d7a34dea22ceeb899e3b379ab454299bc7afd50235b9febe5d75da44c27fe4ed87861c4540af0061d8e11cf4656f63a3065033c5e4607af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUSqdRAAoJEPGu1DbS6WIAXhEP/0dN5v/rstei2fwft/efMtlu
-iF39/2ferG1hc3fhP17kP00spSuIUcWv54jE0o44c6frg7wqtXfeviWliI5j20Bb
-JJr4KGm0an2ZPNqPlIbZaW39Wuw2ZQdyWU6ngHwkcJduKKLqmgC236fV80ETLmX1
-lvjUobhA7H7fPuorYGgKm84oeab1nkB3TblTo8Lq3mn2oqK0LIZvKmCkD+rRjAVY
-ZDgIESySFvGj8VqidsMl/+DzOY/kLkCdiu4MQS8K9InxvjytSaU0kr/J4+gewhsc
-GfLlrikx0evFfR/H0Zlk5whD35MThxu3gxBn1kW03NIYkAE/ZEkHvX4nZ/4aqtp9
-Kdxy37hMtkV7Gv69gWIpf0Hep5qC8Nsd25OkbfX6epM2E7b2nIruW3v8CqQltl3V
-3n6sJmfc8e8SHvMeczYeSdTjjfDJh5rzw2Xyr+id4BnUz3zYgCtpe+daykNiAwWu
-8QV5vDVToQIVmK5XEB0QQwkTAMU3zSr3Xin4ysfmrsK+I8Xcc0OcRL1I4mBPuXDr
-uB+P8Y4Pfra6NPebHTf3o7aAr/OnhQkE/MGaolP15PgrmYLL3dg7LB6GDVVpeQWs
-vjtPbET6HMnPtsFOmJypyEgllJ8jAtCuN6LxFQChf+cK7AkAfDgH/nLCZd77KDlk
-sr7s6i+4SRGqW+uiEbQZ
-=6FaM
+iQIcBAEBCAAGBQJUSsEuAAoJEPGu1DbS6WIAjFwP/jsn0PclH0nGO3ke1CeM6q6A
+MkS4Wpotmim8cM3fB7NOKyaRaH5PfDGdhHETVG67MNiWVWlMwUhcxi61LdeSzw7b
+YUl3Bx1XCe1erwCozryTYZEmKr4nmXxXAW2weB0hXG1sfXYUnZVKTnHGGHUf3dPq
+01JYMNmasEvG8ld5XSpHMAQYWeH52SEpKiIGLU4Th4yJpA1dbAhNlS120OlSjqA2
+G3ppFbELTrXiidURHDEsqLbfltXFSy1v52QANt+GXusJxaNtbOTolkeIFngwv6ol
+6hHgMrgEJeEXERYBfhZP9DuM4gdnyx8WgJe3kkPt5KkOBRbOayFi51g5g7jWlDfC
+V9Sk4Dh8qCUSG/Q4pwZAPqPHvHU4JRlcZEOWsN0/9/3dokBPqMs8iwKrPgfIMVTs
+8L8HVZA/7wwkA0KWxPUUQtTCsxL+FCKgDuWmAHu8weFkUQLkbh3wu44nVOzhPTWC
+9HL8ajy0tuC+j5TSA6ouVfYu8j5/cgzTODtTEXtjUhlg04viUBcmHiqfTPve/I/2
+HrHNypElI/c7s32NWSyhI88mPRKx0rK8+eaLPKwBQHasnYikURCXDjk6s3siI0re
+/1OI7AV2xB4lcUp6TOSiv0yloIRcVFGjkLkZB+moa6E1YZOdeqRR5vfgNSqmcIav
+ku96iZEN34KN+AjYKRJ9
+=4ABs
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.59-r7.ebuild b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
index c17f41deab50..66836296241e 100644
--- a/sys-devel/autoconf/autoconf-2.59-r7.ebuild
+++ b/sys-devel/autoconf/autoconf-2.59-r7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.20 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.59-r7.ebuild,v 1.21 2014/10/24 21:14:20 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,42 +11,35 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT=$(usex multislot "${PV}" "2.5")
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="emacs multislot"
+IUSE=""
 
 DEPEND="=sys-devel/m4-1.4*
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+src_prepare() {
+	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
 	epatch "${FILESDIR}"/${P}-more-quotes.patch
 }
 
-src_compile() {
+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
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.61-r2.ebuild b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
index 6f3b32a5902a..4996fa8724c4 100644
--- a/sys-devel/autoconf/autoconf-2.61-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.61-r2.ebuild
@@ -1,52 +1,51 @@
 # Copyright 1999-2014 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.12 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.61-r2.ebuild,v 1.13 2014/10/24 21:14:20 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT=$(usex multislot "${PV}" "2.5")
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="emacs multislot"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+src_prepare() {
+	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
 	epatch "${FILESDIR}"/${P}-GETMNTENT.patch
 }
 
-src_compile() {
+src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
-	econf --program-suffix="-${PV}" || die
+	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_compile() {
 	# From configure output:
 	# Parallel builds via `make -jN' do not work.
-	emake -j1 || die
+	emake -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/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 a8a01d20ac81..09cf88fee89e 100644
--- a/sys-devel/autoconf/autoconf-2.62-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.62-r1.ebuild
@@ -1,52 +1,47 @@
 # Copyright 1999-2014 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.6 2014/08/16 05:06:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.62-r1.ebuild,v 1.7 2014/10/24 21:14:20 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT=$(usex multislot "${PV}" "2.5")
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="emacs multislot"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+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_compile() {
+src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
-	econf --program-suffix="-${PV}" || die
+	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
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.63-r1.ebuild b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
index e35d62c2e08f..9a8da4ded474 100644
--- a/sys-devel/autoconf/autoconf-2.63-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.63-r1.ebuild
@@ -1,50 +1,45 @@
 # Copyright 1999-2014 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.6 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.63-r1.ebuild,v 1.7 2014/10/24 21:14:20 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT=$(usex multislot "${PV}" "2.5")
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="emacs multislot"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+src_prepare() {
+	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
 	epatch "${FILESDIR}"/${P}-sh.patch #264303
 }
 
-src_compile() {
+src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
-	econf --program-suffix="-${PV}" || die
+	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
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.64.ebuild b/sys-devel/autoconf/autoconf-2.64.ebuild
index d21c44d31424..da6b1c1ee532 100644
--- a/sys-devel/autoconf/autoconf-2.64.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64.ebuild
@@ -1,50 +1,44 @@
 # Copyright 1999-2014 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.7 2014/08/16 05:06:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.64.ebuild,v 1.8 2014/10/24 21:14:20 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT=$(usex multislot "${PV}" "2.5")
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="emacs multislot"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+src_prepare() {
+	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
 }
 
-src_compile() {
+src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
-	econf --program-suffix="-${PV}" || die
+	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
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
index becfeb07fbc7..63a6a16e5067 100644
--- a/sys-devel/autoconf/autoconf-2.65-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
@@ -1,51 +1,45 @@
 # Copyright 1999-2014 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.11 2014/01/17 04:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.12 2014/10/24 21:14:20 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT=$(usex multislot "${PV}" "2.5")
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="emacs multislot"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+src_prepare() {
+	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
 	epatch "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649
 }
 
-src_compile() {
+src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
-	econf --program-suffix="-${PV}" || die
+	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
-	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild
index 0773e390bea0..98e0261ca3e3 100644
--- a/sys-devel/autoconf/autoconf-2.67.ebuild
+++ b/sys-devel/autoconf/autoconf-2.67.ebuild
@@ -1,58 +1,42 @@
 # Copyright 1999-2014 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.16 2014/10/24 19:23:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.17 2014/10/24 21:14:20 vapier Exp $
 
-EAPI="2"
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git"
-	inherit git-2
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-fi
+EAPI="4"
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT=$(usex multislot "${PV}" "2.5")
-IUSE="emacs multislot"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autoreconf -f -i || die
-	fi
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+	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 --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() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild
index c944b070bdf7..9448aedcc3cd 100644
--- a/sys-devel/autoconf/autoconf-2.68.ebuild
+++ b/sys-devel/autoconf/autoconf-2.68.ebuild
@@ -1,58 +1,42 @@
 # Copyright 1999-2014 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.14 2014/10/24 19:23:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.68.ebuild,v 1.15 2014/10/24 21:14:20 vapier Exp $
 
-EAPI="2"
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git"
-	inherit git-2
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-fi
+EAPI="4"
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT=$(usex multislot "${PV}" "2.5")
-IUSE="emacs multislot"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
+	!~sys-devel/${P}:0
 	>=sys-devel/autoconf-wrapper-13"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		autoreconf -f -i || die
-	fi
-	use multislot && find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
+	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 --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() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README TODO THANKS \
-		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
-
-	if use multislot ; then
-		local f
-		for f in "${D}"/usr/share/info/*.info* ; do
-			mv "${f}" "${f/.info/-${SLOT}.info}" || die
-		done
-	fi
+	default
+
+	local f
+	for f in "${D}"/usr/share/info/*.info* ; do
+		mv "${f}" "${f/.info/-${SLOT}.info}" || die
+	done
 }
diff --git a/sys-devel/autoconf/autoconf-2.69.ebuild b/sys-devel/autoconf/autoconf-2.69.ebuild
index 14bbab313c7d..26f4235cee73 100644
--- a/sys-devel/autoconf/autoconf-2.69.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.19 2014/10/24 19:23:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.69.ebuild,v 1.20 2014/10/24 21:14:20 vapier Exp $
 
 EAPI="3"
 
@@ -26,6 +26,7 @@ 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 )"