Add build-time dependency on sys-apps/texinfo. Make version 23.4 build with makeinfo 5. EAPI bump.

Package-Manager: portage-2.1.11.59/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

10 files changed, 88 insertions, 95 deletions

diff --git a/app-doc/elisp-manual/ChangeLog b/app-doc/elisp-manual/ChangeLog
index 6b2511acf8a0..0de90750ceec 100644
--- a/app-doc/elisp-manual/ChangeLog
+++ b/app-doc/elisp-manual/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-doc/elisp-manual
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.51 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/ChangeLog,v 1.52 2013/04/01 23:27:09 ulm Exp $
+
+  01 Apr 2013; Ulrich Müller <ulm@gentoo.org> elisp-manual-18.1.03.ebuild,
+  elisp-manual-19.2.4.2.ebuild, elisp-manual-20.2.5.ebuild,
+  elisp-manual-21.2.8-r2.ebuild, elisp-manual-22.2.9.ebuild,
+  elisp-manual-23.4.ebuild, -files/elisp-manual-23.4-direntry.patch,
+  elisp-manual-24.3.ebuild:
+  Add build-time dependency on sys-apps/texinfo. Make version 23.4 build with
+  makeinfo 5. EAPI bump.
 
 *elisp-manual-24.3 (12 Mar 2013)
 
diff --git a/app-doc/elisp-manual/Manifest b/app-doc/elisp-manual/Manifest
index cf3b0006be13..d0886d8bb402 100644
--- a/app-doc/elisp-manual/Manifest
+++ b/app-doc/elisp-manual/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA256
 
 AUX elisp-manual-22.2.9-direntry.patch 528 SHA256 99c47ea9a291bf771c22d1d4dc413e3dfd20d3dd22ee087aac52e7d3f049c28d SHA512 e54872caae13a26fb03b59f9e0df4450d7ea53501b4bfec094b24aa05a165b06040d8218834d9626d454e6fe790ae40702c2e0d5c0277dd50520dd5d06f886ad WHIRLPOOL ae6fd0c5938722b82028f91d12a3854c057364f32a2e8d0cafdaaa5ce767f1cca39e94db2c4ce60a6e051ca94e1b9499c666013e091317e608088fb169deaff9
-AUX elisp-manual-23.4-direntry.patch 505 SHA256 8e84d4cdab695d7e7b3f65da27f103e255b8d84922f288f3fdb90ac81d1fe658 SHA512 05b8be1a3cda3f5541c2f7d882cb4736e7aee28f19798aa640951d0f2c9879a42b8f41036ae19c0acbe5af453547f995c56b5b03e6ecac7b55e2a89a4790e4df WHIRLPOOL 9cf96b9e0b6bfac3186fc20717c51d400557e4c037d355b769dd553997beb44f9479d7cd563990f325845805660e1c56528f0cd5222d504219b857d62fd949fb
 AUX elisp-manual-24.2-direntry.patch 507 SHA256 6fee012acc96c6a8e149ef279dac71ec7abcaa50288b0de799c6a0e1aea52168 SHA512 3dd9eededcff2b9c946df48d0ac759e2412028c81eaa5ac726f072c800c80c5ad643a428507e09db8459b004f41a4b277f572f555c659f7abb606b4a9b21a95c WHIRLPOOL 01b65457249d16d898cb6d8c9695940805c148bf717b9925bd07d263b5f0590fc4246bf186d9df9b743cb7a308200505052034c83e4d39765ed00596308d7939
 AUX elisp-manual-24.3-direntry.patch 472 SHA256 e33993e1eead66c3dde8a18a41bf26ac7c90299d874168bf47a5bf0ac96f6ea3 SHA512 bfcad80d9d427bad5a0d7fe730ff64f0415752c402712ccdeb1309391b7876da65e4f9c1f666b36b79c67fe445776384656de2deef000f4076bc34f80689e767 WHIRLPOOL 7a1136c1a181ed4d26803718315ec19bb113c76300b7056ae4e652fd7908767a25334c9232c0b3859661a01d6a55caec718d93b0aadafe1ca4393885b68fa5c9
 DIST elisp-manual-18-1.03.tar.gz 1246385 SHA256 eac2970bdc53d0fe3f20149177b11ac133dd16cb36d8d88de858d24cd9fdac51 SHA512 5ba37650482a34918924beafdf214e8beb9adb5e94976020fb8a231d6d5a2dfb4ceb0659172412b193415634a93929462aba4109ebbbef31feca96397a3b2c30 WHIRLPOOL 50bc683bb6f780b5b68662ac10220103a6eb223074d269a6e1a825888066bb9c6a0f398a7f11f98407229a1c900996f222673ea492d40ece1f2051806e179b6e
@@ -14,30 +13,31 @@ DIST elisp-manual-20.2.5-patches.tar.gz 1837 SHA256 f6bc03d402fc46ac7b01e36b7bdf
 DIST elisp-manual-21-2.8.tar.gz 2455995 SHA256 f17d3bfce8f9e8426b40e0a686e50809c6806157667a032c280bd70533ffd450 SHA512 904007f879410f11c2728c55cae497521316aa9148bd2e2455e9e84a0c7e1017969cdd8bb6b36c899d82b06ec5596295c5b2fa19912691e5677cece29d5f5baa WHIRLPOOL 8c4970b2890197e1f15123b490d2393e54108368dd4343299e8a38126bb57746d77483e74e895e6f60c86f4da8c9ed6a124a559a8113f2044b34ca8756718d13
 DIST elisp-manual-21.2.8-patches.tar.gz 1736 SHA256 e9d78d341c365e6ee8b2e716415ca82ddece1af76c8ede8e6a7d49b09e67b27f SHA512 d06d80c1a1dcddefc434aa3690a7e05ace7c031189cccf43b0eb939236e61d9c10a8da3bf46798e08d7ff204b83fc108f953f248405944457f9f9596269e3fcd WHIRLPOOL 06c911791c9ea3bf0a0d8b6bf6d358b3119da1ba377f432f9b9048f3d7f985a8eae544ba5357650df89d0d6c8d71f825ac064a618c8500c9d55c187d081921ee
 DIST elisp-manual-22-2.9.tar.bz2 669809 SHA256 2e2b830af263c7313072d181af47aef2ee4d5cddb98d49793e0aa498c23e77a6 SHA512 386020d0ba1f26985c5a31597a96c64eef358a35f409ec7ec6616ac70b661220c692e2b7c2dae47525e7389d058659c6a4fb0a6d44fea12cb5dd5c877049d56e WHIRLPOOL 237513530156bf43821ce6394fed10cba95cf30614c9fd755bbc5a2af657d615fbfca0a096655a9558a982264a97ce2480f0794259f372b9286af8350b34046b
+DIST elisp-manual-23.4-patches-1.tar.xz 1140 SHA256 3368876054ddc104fb0fbb2abcac295a75308723b2fa688f871abe216ee9e7f0 SHA512 d72455ee50505411a04752ab0fef44dee13fe90163ab1dfb9b74f46de741fd2730205d33d1f8cd912647eb537bb01fe6252d6717bf0068600dd08efdb0363dc3 WHIRLPOOL 129da795a4005e83d9a48798dfed1309f0da2b2a654c7b9d0b6a33049963db37ca43bc3e4b245feded25b88e7c8dd2434dc337d442f6788773cb67bb0df59f33
 DIST elisp-manual-23.4.tar.xz 686868 SHA256 cb129eb4e026147d5a19d071dd0960467874a0e97ecfae2a3988421c37ea5c70 SHA512 bf71dd18cdce1dce8880b9e67276d9cb71ef54023b5ef2f6555c85c1ffe9b9b8f0d7434227643564c9403fe484bfaeac10ea8911f9c53a9acb3d502eddc1d62d WHIRLPOOL 276b7249e3535af4208d8671e81e5ceb522d1b0c66a261c315ea0c8024c80d58f1c2677b54d8a9c29807273812c841fcc9f70085af9c9e53b0998854dbbbc3f7
 DIST elisp-manual-24.2.tar.xz 726116 SHA256 e6688d44388fad2df5b15dee8c5971611e9ecc2373370fb41df58095674d87ad SHA512 204527671c2bc9108e8ea7692479db8d128612f09d5450402bc1ac1ea6e41e28bc395a46971ebcef639b7dd8651ad10a0ab78adbc6e50e0329160f1f38dbaec6 WHIRLPOOL a10722d6142f65e82b42817746c3e27cdfed04a75a72517539e157fcd5b7ed4590409a06219acfad8d88a982eea3f36c03f2ac031337387a2aa752241aff122d
 DIST elisp-manual-24.3.tar.xz 739784 SHA256 7d58eecad819cf11f6cdc7763e680b526d02d6e17ba4b21a5d405dc8d581a9cc SHA512 432245cfc93d9c82e728d8ed62e288bd135b1da1c65b1fa0ab5b265b2dbd4b644c54cb2f63af53db983025da2838b4d40bb418e80d33eb524a7d6ccdaf48e217 WHIRLPOOL 2298179901069a219bad536827c9ef024741c38aa3a6cbc2172715807056757022a8cbe570712da269d370f544314c73cd42f35011e41b29e0eb5538b684b812
-EBUILD elisp-manual-18.1.03.ebuild 859 SHA256 c04d991f2c02f4b37990887440ad4810ddaaecad0b7a2d2a2ff37ebac6edfe89 SHA512 cf76719a3ef6978da43650d5a2d898450342a2399a52045a712bf7482c8a57f24f0cf8210f7615914e069c8106f80062120340bf4b6434e0ebd5b6a76ab24b20 WHIRLPOOL 6964a691d89fbfcd9c75a56eb1589e3a6b62d3db9eb4f9bf8c98bef40a3f2d10ccd706596549c7dd4a61fd543c3e066e78caf0b70ce59f7b9a21129a6439a47a
-EBUILD elisp-manual-19.2.4.2.ebuild 863 SHA256 7026383ce6bd34e5a048eb0979fa368e66007f849c45385d0388345a99c0094a SHA512 dc009260de378e107cb4eb4d2f5eef30f7689cf315edf70c61f7733a75daeed257bfdea2f283f371bbf00ebc5414411e8727cc46b5b50693bdd7af8c8a3d1816 WHIRLPOOL f024b026eedfe636fa5890ba59d64d620edf4fed85c01c052f9971e35612dd8f8258e959fa7434d7c30db07be8a3bef6f8b87a9ae6f55bdbe3630030c4a60a80
-EBUILD elisp-manual-20.2.5.ebuild 861 SHA256 3ddf7aaad7223b4b440ced037dde4eaab902f3dccde82c33bea871d3d603d59b SHA512 9b90e670def3193a15ef380527a00d6ecfb69bf053bc1458ccd27fff3a2c9ac877147b3c6ee4c50a8ed7d961623f82eae6dad44542114513d1c9d350b3a6cb08 WHIRLPOOL 00e17b3afa963c5dacea6a6350712fcbb7ff00ac376147ce000671bb69054a481e8f8c1a677d1d25561bacb723890ee29943e8b683317b157c2e3d2e7bcacc02
-EBUILD elisp-manual-21.2.8-r2.ebuild 839 SHA256 f13df967933a1a8a3cfb9d1f770583fab80f433d563364c0cd9baa3e4c1732ae SHA512 6158dcc2f0b7edb7290d8d1b55c752848e4bf7d44d90eaef0da3b7bf9038ae4526dae8c5780db51ead0b891493a7ceae1577d398c60d0958dc66d56f886da853 WHIRLPOOL 52a2284870b5e8321f696cfa0412057f3293525df375a39f186c4b11395e0d7c315a45f41381d2b4f9f07339904725e65582e9a23677c7d24eed5149fabdf7d4
-EBUILD elisp-manual-22.2.9.ebuild 769 SHA256 0c0b9df8bc557e95c2a4526a2c2f61196593aed36d5ee78f02f6d29496005ec8 SHA512 5750616911b5dc6ba5b2ed63f6607e906e9915cc7835bf221bde8c9ba5e7f473072f108bfd87fda563c41c1be478f28e02c21158379463274d09416c091c02ec WHIRLPOOL f5bb9238c6c1687b96d707e9b433d166315b8840879afa81847a20f3a7e2493497ac5790c63a083498f81cd005435dce9720c05d9fab823818c4dbb8692e2581
-EBUILD elisp-manual-23.4.ebuild 747 SHA256 354ebd99fd1f3340d0fff2017b1332008a07280a88d566d1991669851dc79755 SHA512 6f5bdc59a018e90af6de0d71d5841ab566ce842c825c251a9cbbdec97a832e2e161a0c9f2dc75436a435e67325cf17e7cd5bc53d8d1ffa6a1c5f517ec1f24a3f WHIRLPOOL 4fc231fae82cec9f45814f2a3772fdbfb8ce02ce28667bd10acae03c93d2e9552e384cfa2045268b42c4d7ae1016ae033a0f6c09bd75eb1c8fe7c495b01cd4e4
+EBUILD elisp-manual-18.1.03.ebuild 825 SHA256 505a42a512e6865fa48944141a0089a270ca872a480982fea062cd5ccdc84ac4 SHA512 f8127a0f089685c32a8547e1cc4b52a23dacb327bd544cfaa264ddc6576e8b448500298741819302d7af23b82404d5b2925e9f85005f169f3b53fbbaa5e71556 WHIRLPOOL a78b410c57f13ac1bc3647405bdf14f5594c2d9804ceac88a35c97dc3abc0ca336e0aef1f9b21acc7f5585b18aefd0098fc401fa04f45e0b4d0bccee91c18e09
+EBUILD elisp-manual-19.2.4.2.ebuild 829 SHA256 844df74bfc75e0c41cddc69c8f978d3a1c703784080384dbdcf6e1c52bdf4975 SHA512 5061212f642cd0df1f4c83d72c1953e5b2b5a665b3f428b39a4f54b163ce95ea2663be5f7ced21844c547ab486dffc0f148088372f8cb516ed730d57b8f08796 WHIRLPOOL 05bd29f301fd088ed8023c6acc154f243d6e177c313ccb924b6bb9364a89ab96243ae862387f056ba2ca03084ff20c3b57934da82c0735d6b465525728e8fc5d
+EBUILD elisp-manual-20.2.5.ebuild 827 SHA256 6458d029b95209a6ca9c444f2e33f9df12442ea7280631494523b15728ea1afd SHA512 35051377ef7871e173fffc80aae1baa96ac45728ee01d9cec527cd11edb667997bea40639ae06754e566bc64bd7629053b1666ce36db5d8d69d121c377360e52 WHIRLPOOL 911f71f1d2a04a1651e30906abe19255d925404162a3de1b39d3470d682d8609489d9c6290a300277ca0a65e141d5d7b004f36b9a0161f26d9031b489dfcaceb
+EBUILD elisp-manual-21.2.8-r2.ebuild 809 SHA256 06367110253b76b8823320cf2efe834cee8b315d94fb860226be1d4db8a38b6e SHA512 c366faea0c417fe651023be8091c546de4986638c7b3670074bca9815725c68f10e0c90692c6eed72d2e4b8be35d0dc1b1cae16fd5b63cc23bd88de61074688c WHIRLPOOL 7ef75df9635770d3e48be9ca04518058e317149a954d6aab7090d0425b4577b463f222eb66cadb7335859c09f4ef2460edf4bc99c096f2a38c930a063df5a669
+EBUILD elisp-manual-22.2.9.ebuild 732 SHA256 dff7af48c03b1779e4f0e7fce1860efd1f436a82bc6a614eef80a768878fd6a2 SHA512 da02efb2b2e6e5cf2dc302cf2327748ad02570c1a986fa5dc41636233a8e5aef7b978bb16d954e6463f9d46fcfa52f9953a934bec9477991dfee1aa4d77975ba WHIRLPOOL 095ddec38b15ac1cce45c09f8205a4cf8875562f939d5903655cf15699081c5e112a5d090724871cdc75c9352d772581860991df826987bce2f55eef1ebc4d90
+EBUILD elisp-manual-23.4.ebuild 769 SHA256 00f5c911fc586bbafcbad7cc9b3e97133f101ca59132c6ca8121c30fccaadcbb SHA512 1d2dd4506510b6f800f52a9867ba9ed5a50de31cd34c6e1654063b83461b7025f4555f2c30b1aecef6078b0ef8df15d0546685a844ec5920e811d234e690dc5c WHIRLPOOL a574a0c11f0263f3e9a082d18023535af504c780dd3546ac9a2f6347773a793191b614f5cbe465d3e58c7c71c93b197f7e46402e9f7f5e8be016cefcab03c667
 EBUILD elisp-manual-24.2.ebuild 801 SHA256 d4faff161c5d34f0593a1494367bbf236a0f125d6d6efac6636d664595ac5e38 SHA512 f11b05b1bbce7e432019d1179616b626fdc327b058ec49c8d0f0bc86d0324b19c64e904ee2a172417889d4bd4a9684cbc775f69f2cf4b0be73e4733ecf6a3fb6 WHIRLPOOL 38f8bf6f3eedb74ea2f09b734c87f8ea676d3ae36f78657f44e23aa397ed173d7bfc6a2a73f7f8a331b4b8ef9c4901d42968353186250c751d4bb2a57c6ee25e
-EBUILD elisp-manual-24.3.ebuild 797 SHA256 cacca2bcd4fda9cc1682e9c936a126fa090da9d36643ac5ab6b6cdb52c97ff07 SHA512 dbfbab8089de283bcc67238527aed47842793284c78149e3644761fb31172289020c72eb59d82ab47c8095f4701c439fa2b9e4fe31b899ca1b90f5db64961b31 WHIRLPOOL 6577d61bf66ec5fc7794a0b48810d952bc48ace1bdf7870bd4b27ca4ee2b9b0c66a816329d2bb01b267554da0ba9ec27c6ba3a4990e9f598dd8be50bd769cd1b
-MISC ChangeLog 9813 SHA256 a8cee6758ffb68c5648a441e88a41f862ad13621993d30e9ffcf52f24d963248 SHA512 014019eace0d4db380cceeddcfdfe5fd9b771885e2fd23f81a39c395da96c0f537f026837222d212fc58f74a925cb1bbec34c9794a7fa0a2e12cd79f72a9259b WHIRLPOOL 0a70d641f3d50a95999dbb978eb83f7563084614c473a0bdc80620878e91e14ecc3d97e50b11667266d5616b8703185263dbc9d92648b60480bf720c9e7006ab
+EBUILD elisp-manual-24.3.ebuild 797 SHA256 8889a13c53eaa99b140030b684bd7477039badaf64f8791f92bce594b8399aac SHA512 10d8d57358ac2b8a141ff3eca5f353cf017b2f8d33efac050203cb8be46882237708472c24f48a798ab8a55b874b5560f8a138c498ec11aa40d7d6655ac5b2a8 WHIRLPOOL 0ac80cff129ad31d2bdcc3a4928e579035d5cd81aee3256cc159b0969ed8ad4e76504c27ce4c5e77665a5df6beed02274e25f477feda597df1b4cad0a74c3aac
+MISC ChangeLog 10211 SHA256 b0e68e4917040c07d0691e70cf435b819b0806739fc150ed36b164fc26015405 SHA512 3d704b13359e29c6f5eeaa1e35ca505a07f6282cabae123fdce359f6bc0a8fb6028acd8016c75d90c1b344d936e56ad5efb54cb94203e2ea97dc4780f94e3491 WHIRLPOOL a67faafc347bbce449621fcca472c3b4ebae3cd697be1c2a2c5009af967680c327bfe235ea45d875dde41d6040a652faf4ce4e453b1ea1c32b36a1f612d69965
 MISC metadata.xml 1348 SHA256 d3a76777e927836d3ab86e6f07a97eea4eb5eb178c761bfaa2375c1076f34ddf SHA512 6c43da63d5c8df3ee93557c60dffe563bc8978ee330a37b57e7f09e811041791cae5b619b934b66b4f1f6896aa6f5ce602449f7c0bb11f63e02a7d918cc52633 WHIRLPOOL 1e150d4a0d03956f3dca3ef8ce257e34d1cbfdc772c842ab788ecb85d6180c51aff622dd761b17b9396746d2b86e3a18581129095e6dac458a04ac27cfe6a3c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRQt6+AAoJEJQzkH1pP7W4rf8L/2cgwuJrsp5xO7XIwvQexg+9
-zT/giowMBpAow33R4/bDC/PnLassC9MIEh6pgoyALKwG129mc80aGut9PO7HW219
-cqi3zZLdkOu6erVNvr6B5C9fhuxgrw8p5qv122h0ScruQNCSFhwYfAeb4FJ7J45C
-N6oJp8QqwUjkGJHbg81isQC3L0l6muVCJLHMXR5+A0OZiQXQ3f8M/bF5pC7oD0hD
-JtAwrnAFnuMfe1EqxVNDx6vHmDJkQa27oqSGeB/LR8Dp17lAQy/jWRixN5Itcf4K
-6LcHASklApeF+3ipyuUd+meft5okKsO/JFbAqltOcqXyiRkBFcDde+AcY9LaqddK
-rAqC7mSUGRzKx01aRL29pW2BU8/40Bc9XUCNvNkgDNo+GfIPXcx0JxqozdxlnWu/
-Fr8Uv+Pt3iLfSf8pXlhPGINYFz/Kbl8DRretcpu5ZdOnQTPLxhE2IGu8tGuMf4oZ
-ZRiZG+Ng/hAQrxpcvdIks5nraQg9n8cVZQ5VWaT0GA==
-=4+Rs
+iQGcBAEBCAAGBQJRWhfyAAoJEJQzkH1pP7W4MuIL/29OymRtYUB0Zbgr1rvVzCGO
+1rvAwzHxvbC4f9CLig/cOjoB52ruDLHlbnu5ltNqBk+N+6Sw6YYV6N6qbKIwG/M5
+MswDep1DYjCmTw6ioCOmQ4owVvvaaXRSZ83rfVGNOZHkAdBq+Ss3tYOptR+BABU3
+bNuvH0bwMXAJ7+RN/RTAHeZTcjtDbvo9J7pNtOSfQ556PpTkURSWGOMJJ3xjquYf
+HJywhdIsbr6jaOSajmScRFHsbA/lfVJpxU23OFaBhelDxLHBC0Em/LA1cxpLLELq
+cuvobPqGH8RJdWeLF5evxdsza93D+RiZnSNONXKLYu28CwTwUum+i1ueuoCKR8T2
+PcWS0kFy+e5FR0DiR9SAoOFsp52bRh0TFhjEbUCQVBJGWLmko1s1njEMF7Uv/+vw
+DqRZvNfCySt7EGDLyQLiP7u14DO91hXrRN+zFEUiZxcHiaETGOY7MJc2oHe55FLF
+TVnSi4YOcFyAX/VVn3jq0KvUoW81BGo7T6x+FRjLxw==
+=rBLY
 -----END PGP SIGNATURE-----
diff --git a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
index 9b771c533d85..b6d641904c98 100644
--- a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild
@@ -1,6 +1,8 @@
-# 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/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild,v 1.12 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild,v 1.13 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
 LICENSE="Texinfo-manual"
 SLOT="18"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/elisp"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# remove pre-made info files
 	rm -f elisp elisp-[0-9]*
 	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
-	ln -s index.unperm index.texi
-	makeinfo elisp.texi || die "makeinfo failed"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp18.info* || die "doinfo failed"
+	doinfo elisp18.info*
 	dodoc README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
index 398a5f2af23d..3a10e72cb8c7 100644
--- a/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild
@@ -1,6 +1,8 @@
-# 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/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild,v 1.5 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild,v 1.6 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
 LICENSE="Texinfo-manual"
 SLOT="19"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# remove pre-made info files
 	rm -f elisp elisp-[0-9]*
 	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
-	ln -s index.unperm index.texi
-	makeinfo elisp.texi || die "makeinfo failed"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp19.info* || die "doinfo failed"
+	doinfo elisp19.info*
 	dodoc README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
index 721f34c1b4b9..1545b198d3b6 100644
--- a/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild
@@ -1,6 +1,8 @@
-# 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/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild,v 1.5 2012/07/29 17:34:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild,v 1.6 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${MY_P}.tar.gz
 LICENSE="Texinfo-manual"
 SLOT="20"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# remove pre-made info files
 	rm -f elisp elisp-[0-9]*
 	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
-	ln -s index.unperm index.texi
-	makeinfo elisp.texi || die "makeinfo failed"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp20.info* || die "doinfo failed"
+	doinfo elisp20.info*
 	dodoc README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
index 618ca2a2df18..aa694df42a70 100644
--- a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.12 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild,v 1.13 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,24 +15,23 @@ SRC_URI="mirror://gnu/emacs/${MY_P}.tar.gz
 LICENSE="FDL-1.1+"
 SLOT="21"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# remove pre-made info files
 	rm -f elisp elisp-[0-9]*
 	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
-	ln -s index.unperm index.texi
-	makeinfo elisp.texi || die "makeinfo failed"
+	ln -s index.unperm index.texi || die
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp21.info* || die "doinfo failed"
+	doinfo elisp21.info*
 	dodoc README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
index e933b5ad94f3..741f911b86c3 100644
--- a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.8 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild,v 1.9 2013/04/01 23:27:09 ulm Exp $
+
+EAPI=5
 
 inherit eutils
 
@@ -13,21 +15,20 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="FDL-1.2+"
 SLOT="22"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+DEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-direntry.patch"
 }
 
 src_compile() {
-	makeinfo elisp.texi || die "makeinfo failed"
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp22.info* || die "doinfo failed"
+	doinfo elisp22.info*
 	dodoc ChangeLog README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-23.4.ebuild b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
index e61771b31486..c136ddc6f65d 100644
--- a/app-doc/elisp-manual/elisp-manual-23.4.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-23.4.ebuild
@@ -1,34 +1,35 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.7 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-23.4.ebuild,v 1.8 2013/04/01 23:27:09 ulm Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="The GNU Emacs Lisp Reference Manual"
 HOMEPAGE="http://www.gnu.org/software/emacs/manual/"
 # taken from doc/lispref/ of emacs-${PV}
-SRC_URI="mirror://gentoo/${P}.tar.xz"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	mirror://gentoo/${P}-patches-1.tar.xz"
 
 LICENSE="FDL-1.3+"
 SLOT="23"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
 
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo"
 
 S="${WORKDIR}/lispref"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-direntry.patch"
+	EPATCH_SUFFIX=patch epatch
 }
 
 src_compile() {
-	makeinfo elisp.texi || die "makeinfo failed"
+	makeinfo elisp.texi || die
 }
 
 src_install() {
-	doinfo elisp23.info*
+	doinfo elisp${SLOT}.info*
 	dodoc ChangeLog README
 }
diff --git a/app-doc/elisp-manual/elisp-manual-24.3.ebuild b/app-doc/elisp-manual/elisp-manual-24.3.ebuild
index ded97c8f8e8f..0579e48035bd 100644
--- a/app-doc/elisp-manual/elisp-manual-24.3.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-24.3.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/app-doc/elisp-manual/elisp-manual-24.3.ebuild,v 1.1 2013/03/15 08:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/elisp-manual/elisp-manual-24.3.ebuild,v 1.2 2013/04/01 23:27:09 ulm Exp $
 
 EAPI=5
 
@@ -15,7 +15,8 @@ LICENSE="FDL-1.3+"
 SLOT="24"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+	sys-apps/texinfo"
 
 S="${WORKDIR}/lispref"
 
@@ -25,7 +26,7 @@ src_prepare() {
 }
 
 src_compile() {
-	makeinfo elisp.texi || die "makeinfo failed"
+	makeinfo elisp.texi || die
 }
 
 src_install() {
diff --git a/app-doc/elisp-manual/files/elisp-manual-23.4-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-23.4-direntry.patch
deleted file mode 100644
index b0a085f1633b..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-23.4-direntry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lispref-orig/elisp.texi
-+++ lispref/elisp.texi
-@@ -1,6 +1,6 @@
- \input texinfo  @c -*-texinfo-*-
- @c %**start of header
--@setfilename elisp
-+@setfilename elisp23.info
- @settitle GNU Emacs Lisp Reference Manual
- @c %**end of header
- 
-@@ -63,9 +63,9 @@
- @end quotation
- @end copying
- 
--@dircategory GNU Emacs Lisp
-+@dircategory Emacs
- @direntry
--* Elisp: (elisp).       The Emacs Lisp Reference Manual.
-+* Elisp 23: (elisp23).  The Emacs Lisp Reference Manual for Emacs 23.
- @end direntry
- 
- @titlepage