Drop old.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

8 files changed, 24 insertions, 221 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index d86945923601..6fd841ef0907 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/agda
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.25 2013/12/10 11:25:16 gienah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.26 2014/02/25 15:40:58 slyfox Exp $
+
+  25 Feb 2014; Sergei Trofimovich <slyfox@gentoo.org> -agda-1.0.2-r2.ebuild,
+  -agda-2.2.6-r1.ebuild, -files/50agda-gentoo.el,
+  -files/agda-1.0.2-upstream-fixes.patch, -files/agda-2.2.6-emacs.patch,
+  agda-2.3.2.2-r1.ebuild:
+  Drop old.
 
 *agda-2.3.2.2-r1 (10 Dec 2013)
 
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 5e7e786ec6cb..272588e134c6 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,10 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 50agda-gentoo.el 318 SHA256 64f767d1fb3bef2e0b31f13f8ed5764dd3c5ede563c543694946a26ef16e22ee SHA512 b8055da7dce64c0355792fddad022710938f2d6731e2bc40d177030a9228970f1797de34d1f13efae19325d2de6e3420acfa56f2683ecd7f06513597b7e7eb22 WHIRLPOOL 939a080b280aa8bd86ae38011b98962cfef1c1a0ae4f038e73d9b95f98a1a374b06cfcb7115d1fa860c7252dcf01d207599c9ea64c4f60996202dca345775cdc
 AUX 50agda2-gentoo.el 317 SHA256 043797b8766a610c08a5aa10b4ea46b955f208b851f0baea4ba4dbff74fb3417 SHA512 55b7438896cb66b4b32b0ba0d9468bb2496df1f63a78f3f4b4e19cc038018605c9cbd7880d2be1b40d6d1509ac6df20304cdc8c2ccde69e89777acfc65a1ce8e WHIRLPOOL cba0b37c78d2e409081f90d7d68a2b5c21ad8cb79f51ff364c8ee9107c9f42a229d60b195a984acfcc45a9638b04bac0371e9eea4ef2bde1680983a85832329a
-AUX agda-1.0.2-upstream-fixes.patch 2011 SHA256 634253f00a400f4e4e2c2714287ff6a7ebd1b5623d60770a6963e42d3a9f8cac SHA512 23449c13d4bd41d8fd5c6ea454f9c4a4572da071a3314f4143f1b9369a73bc4dce16d55660cf9c01689430f3d622ffd90ddadca9cbfe0e77c31e3cd5e080c623 WHIRLPOOL d99ae8e2300301f7554254fb04d76809bd0cab92c46b44e7fc4775f89d63bacba01d798de685f9770ae9c8151b287a964e8df2ac8da23560ad132e836065dfee
-AUX agda-2.2.6-emacs.patch 945 SHA256 aa3e0fc6164cb0d722fc5dc31e23b2372320c2f2a4a45c1e722df2dd3de8f5a5 SHA512 be239c0f43427ddb4be3e3a338b9cd73d2c7821ba10f849ff526ec1978525c44b6a9989c385a42a3ce0e0615be572105aa4a807a56b1eb84e0dfdcb43784d955 WHIRLPOOL 5f7898af7bcee52986a60e914cf3a34a5be0a5317feaae3f398ddd8a9fc2b23146a94cd70fa50ef67fd2f8719fb99b7dc9ee37243d51baadcb9ddac5fdc1cecb
 AUX agda-2.3.0-emacs.patch 949 SHA256 1449803290440d01d792254edb68f4a3692394f6ea1fdc8128d993dadc66e5a0 SHA512 1a01c463516d79b1027d99e8409ef5ddc11b83029229946b3c2b234633dd443848ea0fb3589b647510b70cca1fb83953030ca3afede9877541a32d87df980913 WHIRLPOOL 476ce1ba07d864b6914984c1f9ebb0d2a6f99fe4c3ebce4b1f7d1b6e22389546b8b1fadccd8e3ded2257e619f093aad2889a55822225236cd2c4e0d6e270c936
 AUX agda-2.3.0.1-emacs.patch 955 SHA256 8a124f71c4580923a2d8ecd39064a999da313bf7f7085e322d8259421f17496b SHA512 7be137365383c7781c4b24811dba65618e5c30c3b4694241f9034682aea4d7ae641165165e9572c274843d7c5328afd3e0bf85d8e080f9029c94d11262d4294a WHIRLPOOL ce7c4562f7893bae1a377b868a746d04f8b551912aad41836b28f41db0ef9e8cf75bafc714017b6d035750a18018e69b6d788959093f51aad21ae6cf1eb66cd6
 AUX agda-2.3.0.1-haskell-src-exts-1.13.patch 1077 SHA256 d88f7e113b701d6d67bbbd1965f878886bfb08483e238172b721e4f61f106585 SHA512 2cc83a61aad7410dc90fa283cc4ad0e243fba2b335f9c84ef1f7faa96c717179da96d96bbb2507bde69deab315dba8ce4ae1bfb3b21b2851b87c4e4930d30003 WHIRLPOOL 6e9b84ca3830dc4d2dcd119d08c0b056805c09beb0fd88588c53f04d76286cc9d695963bda8a82985b8887f8a5595809407e03fe41925a95b30aba3a85e93c8e
@@ -13,27 +10,23 @@ AUX agda-2.3.0.1-quickcheck-2.5.patch 1308 SHA256 a07adba140a81eb76042a7f985b2cb
 AUX agda-2.3.2-hashable-1.2.patch 2010 SHA256 8ed826fb6c7420274d1e31d2abc680d2d6419c7ef9a474cec0b79a12d4feae5e SHA512 b35bc500c94708241d46f5c9bcd78008d8de83a6d5d59784eac27fb4a0426a7a2c623dce1dfc1209b80bc73ff92c07a462d36e403826033c7c87ea828c1efda2 WHIRLPOOL beaab8e5301baa4bb222166998e92ca4cb7acd11b75d6656f0b22707b4c0e4f6b98217a7ff43aaa41aed75ee2719a4a64338a360f461ff1580d3954d4e0cd518
 AUX agda-2.3.2.1-haskell-src-exts-1.14.patch 1402 SHA256 9574b8ab4428770347743f67caad84549171efcbf772fad2d368fb8f0bcc972b SHA512 4049478b97cb330766107055bb0f47f7b46b5587f66393a0e0045eb2f8822945b4c32b56a4563903004c37299ab8067f1cff5ccbc801aadf2f347739b6409446 WHIRLPOOL 6ddd946b130bb9a1ba87730d5916c7fdc5875d7248bab839cff4062a392a971fb33a0d1b3fe0171cf13f7e7d604c3d86f84efb6196272743139a1dd3256d0c0c
 AUX agda-make_install.patch 549 SHA256 f23e6fa062ca5ef3c6b1e6b7e9133a19bcf3846e12fdd1659d23d44d252946fc SHA512 28ca830797ecfddf50fa0f3cedd8eebd5a0c1f974749440bb793d597736da2bbb42217b80e25230b941814bca233469b5909471cfa70c4b7fc659a46d7c43d1c WHIRLPOOL 40a5f18241e4b9df5a1997f342eae5f292019a14e222d8ad792f632b3f33c0c2929959ed705514ef94968e022cc3eadf109c24c891bbfdc9b33568318838f472
-DIST Agda-1.0.2.tar.gz 505642 SHA256 2ab56783a26e84f64422316daf0ce160f983667357361e2986baa13fb17e7ea1 SHA512 8c70f33af4734c51318412117a3fdc0fedd3f613fe4c778ef85553c67fcf8358d7491afccf745bc695ad5f0d53d468fec611ffd0524ac984bdfa4fdb29035eee WHIRLPOOL da995cbe0b713311cc2a8566f01a4f194c4042e8caf73e1074280d45e94dc9acc3ade8c4e44059977a6d9074448c71754c3fc3f34391c7928e6bd5d5a3735836
-DIST Agda-2.2.6.tar.gz 1376824 SHA256 3ea0f18d475e9a27ab4a6362e0888aa173f8eb9630085124aaf79df336168ca6 SHA512 b91bf28e7c0e41b83afab98e4552ded960e0b3a9ae0710b63491b5898d87809ce386e706e0d232b09d5745f779954731d64657cf58508a5fcd5b336eda4d08e9 WHIRLPOOL 98814bea70636feeee975569af9ce57183bb1877e0521fb3c09444298ba6ce125996348f9455d66091bf107a469d66d1987348ce96325d392133dfe39e47ca26
 DIST Agda-2.3.0.1.tar.gz 612342 SHA256 5cc016a6cf113979d92af05c10b1e92dead4bf87861086177a017ce1d7605338 SHA512 c9e51b20d74cc5c6b8b9a9d7574478f552d0ae9c1133f017727b2f2f0646e04de0fca79918027ef0664bba708763c909e8eaaec2964a7a2f031ba21235b5c9dc WHIRLPOOL ec0e402caed8aa28e928ef20e2707547d9aeab53b9630fc1cb13136423debe89e0826b161895230dba99479049cf42cbb5edde55c584fe0a0ef2d41f9bed4f8f
 DIST Agda-2.3.2.1.tar.gz 730010 SHA256 790e02ed9af8b9b65ea704b765fd9937444ec1351da9bc2547aa8e9034038eb6 SHA512 d6aa7728d428a66b638f36d7d086be43f4956fa086c5e7dba47520c6b4e2294f149491c8b099c3402c93f9e6d559396573e0f2b72044f6d9c58ef29987c40113 WHIRLPOOL b7fa249ab8a3d11c9f9a00a44b2c3c560953e07d2c4db1eedd411fcfccd62e425a9d2b53c56c96a0002a9878bf21de1f736249751a91cdd795e7289af776c34c
 DIST Agda-2.3.2.2.tar.gz 2034934 SHA256 0c8310f4067e4daac42d7233e8f245d216763186071a96ccc3d7e0edc5cb227f SHA512 5dfc156dfaa510cfce5f745a8f4a1998cfe144bdd67df2bd96ffc4a53301a33b540b76f67bd02434c52de788a284ae351ce7659731b5d0081d707e120131cd25 WHIRLPOOL 71b1c6b6eb483aa7aa76884b609f0d60b4016f86cd267e48dd0df438a91662ac702656639801204ee414932d57526790b3122933272b07d8ae11ef64cea978ac
 DIST Agda-2.3.2.tar.gz 726462 SHA256 d47a0b2a0806ea5c109b59280211a47b980b47a8f6ac0ab9fca673f3d4c6e0f6 SHA512 6bf4775517db41795303a4d1a4611856f599ea7595784a37cb5bb7c4608e948807549632d633a731e38502e61a528a0274b5bf8a6eaa0b9d86a9f558726d18cc WHIRLPOOL 7a0c95a72445b66ee297cdb07b5994deafe8b2f608a238226b0a241ad70b2d4f5e2834011fedc90018bfc692ff1aa4eea57143c01f9b1f496ebb4dc189d6353c
-EBUILD agda-1.0.2-r2.ebuild 1234 SHA256 f5e5b1f82c4197d1fd820a54e9273c48074229bf0dd75a78f1ac11d2c744c48b SHA512 0f75e6abdca50c639063a713980d99c65290458e1d12b12772529f2731afd4c45401839d993e92c02b2ff171253252f3dafd1652cd4fc93bdfdf404afcdd0900 WHIRLPOOL eea378424156d044b610e9ac1cd8713caf1dc31afd6c4c8dce0a437a861f326a1703d19e8255400bbc6119c36e36341142cf47b027ae97d31039a418b349796b
-EBUILD agda-2.2.6-r1.ebuild 1350 SHA256 3d17da7d37b43cfe8f3fb3391d226bb33e9323330d52091027a89b2e1be0922c SHA512 9f4116d09e97f24e18d59e780fd620069490e9cef23b8b3653f204edcfb146a8598b8c77e9d2bd84c5862b67bd0a4b2b2e8aac0de5a2d84fed930da9b483b619 WHIRLPOOL 780e2a3d067d69f99fafb4d27fdeefba7d3331e102f37833b8ea022d9d83228874748b3903cfc52c241b89cb1e302be9d7db824c9254f56796eb8763bdc59961
 EBUILD agda-2.3.0.1-r1.ebuild 2682 SHA256 de467510990469f26662ab8167bd02dd7540d560d3e0b325c77a2a2f993cd38e SHA512 8a2cb0cd6a9e488275bb6c5cfa4448b2c1aa21ed45ea92b2551383663090f783fbf0184b82510b0b4338cb9b133d2a2e1f5f37d69425d8722f9c03c7434f39c2 WHIRLPOOL a4deae1af391f40b51478b1541f9c5fdbf38341af287c4d4fac11fa53369d6823444c875ee6a5d978b93c08abea217993f5f80b6198fbb4c0b0ae63877a07a65
 EBUILD agda-2.3.0.1.ebuild 2139 SHA256 7bc93ef47608329e0abbdada68be30b976865eddd144866e1b714d1da210f62f SHA512 f5509f8bc9c87c12fd001e95504bf56d6fea038d8cbe7f53a3e31a44d77035693f4f60e86845b30b4d8f376eb6029f7c3d6b2ccb61fb0192fcbc5c99f58619ed WHIRLPOOL f1b9daac6cdd9429a6bfca5c570e1290d5e4021de580e466ff97a6a4044e16cd6cb1eb03cc976ad78aac7fece57bdd1c8b8a9bcc2515b911c88dbbac6fb361b1
 EBUILD agda-2.3.2-r2.ebuild 3076 SHA256 746dabf68f238bd41f4ae9f89b830c043215be9cd93a466c0e96fa8511da84b3 SHA512 51c3ca59a4101ac5b4b7f0cff1b862b875416a49ad3893c79b6352c8a7a007f5880408548373ae8be067e01cd242d715eeae483a53f7de7a630c29f980ed02bf WHIRLPOOL 9973949924cd994a25d934865d6f5444c3efe91c027786d13917fcf7186f192189e65e4db1cbbbdc549eb05bf5c46006a4e5f7e17183b54c3a0428295f03b601
 EBUILD agda-2.3.2-r5.ebuild 3237 SHA256 aee04a11ef26500050c81e08df1843c6fd20114a3b42f4688d226e53fc81ec39 SHA512 c3b099da5caa4188692c9df4441f16aad6e5a6976fdf881f02e35f4966e8b7e8bd784b608832d228f364e091fb8ba34e68643f3f25b47048e7579f8a26d91e68 WHIRLPOOL 7bf515475508e702a5afe69cdf39f83d8418f652adb7b7735f877da65ca27cea9341f76639aad7542a83036f75f28d791b5c73f2470a5019dd68d33417d2921e
 EBUILD agda-2.3.2.1-r1.ebuild 3542 SHA256 9a23522d71b6b626ecf5db668da05b1f9be8efb6ebec286c9450db02b095f6c3 SHA512 cc9fad306e9ce4cb56b52885d680283c3741442612e373ecf059f5ef574c69c6dc1cc65969e4ade7fb073919872682f13639f4b417cc06ed58fb28e5f03e0f9e WHIRLPOOL 529b37ef254e50fd9ba99b25993794f30fab2610474bda8232246f3eea21a913c267a43577b016de2c476afa756553bfb3403f1247964fe74147c693be2d636e
-EBUILD agda-2.3.2.2-r1.ebuild 3851 SHA256 e945a96349b03a851536e672188d477969f7a964128e175b143516cd8608c5f7 SHA512 b5cf7b9faa5f88739af9614e3f39a2f6009ef1ab3a9264be7586b9a001da3f66231c1aa4571999b4af3bf140a26779d3b38f0460413de479afa0177e71f06ce7 WHIRLPOOL 42ecc7a304f6289dcdb5a7c7c95b2b6122266d4b548297b9e05062e43dc7f51283eb1ab0435e16d4ba62444e2f2f67ccc2589dd1be5368d00c58c6f9234e6f4e
+EBUILD agda-2.3.2.2-r1.ebuild 4077 SHA256 4b790f003834b263fad07cd465b34683176bfff71fbbe70d029d1793d44c17e2 SHA512 a2a90795a135d8f816ebf43852dfcabbf784724b7299a82015c12cfae75c667b38447982bb4c658547af66d43226d50a2ee8e8a83525ff512ce94f85d9712087 WHIRLPOOL 9f5836713c9f8e5382d0a85e5194c15695a03373adc2c377c07d1c95192f88e10de6f11ce98a55ffa8836f0a2884cd1431273b2a15bfe13fe2cb1745a3b3d910
 EBUILD agda-2.3.2.ebuild 2856 SHA256 77a5282ce1dd12925eeee78d18bfb9ee6e20b5382aa8c239579eac34f688f46e SHA512 51eb52b98785ad93ff64b6b33e882c3970b46c99db6c57df053a858c20b260fb16068dc7be085743b45bd694252b0dcc5f5902213377504dd943ffc08f878ab5 WHIRLPOOL 03f712b15fe561c71d78fc991389e78a8f43b9c8fdbf84c0ae5953041a49ce8ecefeb2bb6297f6a2bc5f90592434f0e525803f79e824b3533be943c8947313d8
-MISC ChangeLog 4973 SHA256 03ce2a3c2ed722c92ec87998f660565f08a9839e44f6556cc1d058cf273c35dd SHA512 3c7a0cb5aeceb1da4d060189b343439cf0a964e360c06e3cf33e01204fc578e2858820aaa0845a9829b1bc18cd1fceb0222b59dfbc76b9eaca3d61afd20d6d76 WHIRLPOOL 69ed6ea26affff8e0597485b5deef7b4be4c7c195bdb5bb22e2f77afd86dbd2219d99447836615d4c21eaee4915c9d080fd7bdb2c683e8562a0cf3c75564ad6d
+MISC ChangeLog 5212 SHA256 fe2133f40ae54b2eae47301063ac2066964dfd93318c97aaf522be7d4cc81d6c SHA512 d3659564beafecade7a31fbaf1c68fc86df798af574fb5dc28b65dc0049dddda3c02a9c22919cae8cf80b6c1c058785f8e27b086661458b3a77bb855f7b5dcc1 WHIRLPOOL 6d386d065f74a05a7793ce0bb802ea9317e2ea83cf1b50ea4c636ec3efe54b74a52e7e6d4fb481a9f40991a24653aee66ba86677f71e0667aac8659049b51b2d
 MISC metadata.xml 668 SHA256 165c4a13bd018ab925d952bbcc5bfbb90fc3e52a48c0826d15002a0b4f5857d8 SHA512 fffd98368697b3975d1d7dee5947f01195ec3706b511aa5a3ed38aea167d1cd87cb278ca62d9fcf0afce28d8da13dc831d9fe0b0c02c4fc31ced44485e272237 WHIRLPOOL a20fc3187a93fe6e5d8f6639d27faa3632746e81e46a7f40be2bcc3f7e47008c0d2a3978e8eb0f90bd692d166aa3208ca482182d451f781a3fc124dd79d6b9e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKm+NQACgkQoBEVQmGOlx+4vAD+K44UIamxsGmS+6CurW0t/vpi
-qrc3NDvVDMa6eNfDr5MA/j7LIPSUNSxdl3HLqewE8qgmEHfSl9/1jj8mWLqrdGFS
-=xitP
+iEYEAREIAAYFAlMMuBsACgkQcaHudmEf86oIuQCdGUTMG1FFEref8rPE3UgfRZXo
+GxgAn0c4Z8PbhP52Ny3pNRffq6dh/QNP
+=WbE9
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/agda/agda-1.0.2-r2.ebuild b/sci-mathematics/agda/agda-1.0.2-r2.ebuild
deleted file mode 100644
index 698bf5b369e2..000000000000
--- a/sci-mathematics/agda/agda-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-1.0.2-r2.ebuild,v 1.2 2010/09/14 19:53:51 bicatali Exp $
-
-EAPI=2
-inherit elisp-common eutils
-
-MY_PN="Agda"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="Proof assistant in Haskell"
-HOMEPAGE="http://unit.aist.go.jp/cvs/Agda/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/emacs
-	app-emacs/haskell-mode"
-DEPEND="${RDEPEND}
-	dev-lang/ghc
-	dev-haskell/mtl"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-make_install.patch
-	epatch "${FILESDIR}"/${P}-upstream-fixes.patch
-	sed -e "s:-package lang::" -i src/Makefile.in \
-		|| die "Failed to fix Makfile.in"
-}
-
-src_configure() {
-	econf --enable-newsyntax
-}
-
-src_install() {
-	emake -C src ROOT="${D}" install || die "emake install failed"
-	dosym /usr/lib/EmacsAgda/bin/emacsagda /usr/bin/emacsagda
-	dosym emacsagda /usr/bin/agda
-
-	elisp-install ${PN} elisp/agda-mode.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/sci-mathematics/agda/agda-2.2.6-r1.ebuild b/sci-mathematics/agda/agda-2.2.6-r1.ebuild
deleted file mode 100644
index 86e1f1d944a9..000000000000
--- a/sci-mathematics/agda/agda-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.2.6-r1.ebuild,v 1.1 2010/11/20 13:45:12 kolmodin Exp $
-
-EAPI="2"
-
-CABAL_FEATURES="lib"
-inherit haskell-cabal eutils elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A dependently typed programming language."
-HOMEPAGE="http://appserv.cs.chalmers.se/users/ulfn/wiki/agda.php"
-SRC_URI="http://code.haskell.org/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/emacs
-	app-emacs/haskell-mode"
-DEPEND="${RDEPEND}
-	>=dev-lang/ghc-6.12
-	dev-haskell/mtl
-	=dev-haskell/quickcheck-2*
-	dev-haskell/haskell-src
-	dev-haskell/haskeline
-	>=dev-haskell/binary-0.4.4
-	=dev-haskell/xhtml-3000.2*
-	>=dev-haskell/zlib-0.4
-	>=dev-haskell/alex-2.0
-	>=dev-haskell/happy-1.15"
-
-SITEFILE="50${PN}2-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-emacs.patch
-}
-
-src_install() {
-	haskell-cabal_src_install
-	elisp-install ${PN} src/data/emacs-mode/*.el \
-		|| die "Failed to install emacs mode"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-		|| die "Failed to install elisp site file"
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	ghc-package_pkg_prerm
-	elisp-site-regen
-}
diff --git a/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild b/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild
index fb889d7d05db..1ba6c976b985 100644
--- a/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild
+++ b/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild,v 1.1 2013/12/10 11:25:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild,v 1.2 2014/02/25 15:40:58 slyfox Exp $
 
 EAPI=5
 
@@ -39,6 +39,7 @@ RDEPEND=">=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.8:=[profil
 		( >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] ) )
 	|| ( ( >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.2:=[profile?] )
 		( >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) )
+	virtual/emacs
 "
 PDEPEND="stdlib? ( sci-mathematics/agda-stdlib )"
 DEPEND="${RDEPEND}
@@ -53,12 +54,18 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	CABAL_FILE=${MY_PN}.cabal cabal_chdeps \
 		'binary >= 0.4.4 && < 0.6' 'binary >= 0.4.4 && < 0.8' \
-		'text == 0.11.*' 'text >= 0.11'
+		'text == 0.11.*' 'text >= 0.11' \
+		'base >= 4.2 && < 4.7' 'base >= 4.2 && < 4.8' \
+		'array >= 0.1 && < 0.5' 'array >= 0.1 && < 0.6' \
+		'process >= 1.0.1.0 && < 1.2' 'process >= 1.0.1.0 && < 1.3'
+
 	sed -e '/.*emacs-mode.*$/d' \
 		-e '/^executable agda/,$d' \
 		-i "${S}/${MY_PN}.cabal" \
 		|| die "Could not remove agda and agda-mode from ${MY_PN}.cabal"
+
 	cabal-mksetup
+
 	if use epic && use stdlib; then
 		ewarn "Note that the agda-stdlib README:"
 		ewarn "http://www.cse.chalmers.se/~nad/listings/lib/README.html"
@@ -84,6 +91,7 @@ src_configure() {
 }
 
 src_compile() {
+	BYTECOMPFLAGS="-L ./src/data/emacs-mode"
 	elisp-compile src/data/emacs-mode/*.el \
 		|| die "Failed to compile emacs mode"
 	haskell-cabal_src_compile
diff --git a/sci-mathematics/agda/files/50agda-gentoo.el b/sci-mathematics/agda/files/50agda-gentoo.el
deleted file mode 100644
index dfafe7ed765c..000000000000
--- a/sci-mathematics/agda/files/50agda-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-;;; agda site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'agda-mode "agda-mode.el"
-          "Major mode for Agda files" t)
-(unless (assoc "\\.agda" auto-mode-alist)
-  (setq auto-mode-alist
-        (nconc '(("\\.agda" . agda-mode)
-                 ("\\.alfa" . agda-mode)) auto-mode-alist)))
-
diff --git a/sci-mathematics/agda/files/agda-1.0.2-upstream-fixes.patch b/sci-mathematics/agda/files/agda-1.0.2-upstream-fixes.patch
deleted file mode 100644
index 40eea5bec836..000000000000
--- a/sci-mathematics/agda/files/agda-1.0.2-upstream-fixes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur Agda-1.0.2/src/BasicEngineOps.hs-boot Agda-1.0.2.new/src/BasicEngineOps.hs-boot
---- Agda-1.0.2/src/BasicEngineOps.hs-boot	2006-12-25 18:47:26.000000000 -0500
-+++ Agda-1.0.2.new/src/BasicEngineOps.hs-boot	2008-07-26 06:29:02.000000000 -0400
-@@ -1,4 +1,4 @@
--module BasicEngineOps where
-+module BasicEngineOps (checkAndUpdate, solveCs) where
- import MetaVars(MetaVar)
- import ISynType(Exp)
- import ProofMonad(PCM)
-diff -Naur Agda-1.0.2/src/Id.hs Agda-1.0.2.new/src/Id.hs
---- Agda-1.0.2/src/Id.hs	2006-12-25 18:47:26.000000000 -0500
-+++ Agda-1.0.2.new/src/Id.hs	2008-07-26 06:28:22.000000000 -0400
-@@ -157,7 +157,7 @@
-     "$"   -> FInfixr 0
-     ">>"  -> FInfixl 1
-     ">>=" -> FInfixl 1
--    "×"   -> FInfixr 1
-+    "\xD7"-> FInfixr 1 -- times
-     "||"  -> FInfixr 2
-     "&&"  -> FInfixr 3
-     "=="  -> FInfix  4
-@@ -172,8 +172,8 @@
-     "-"   -> FInfixl 6
-     "*"   -> FInfixl 7
-     "/"   -> FInfixl 7
--    "·"   -> FInfixr 8
--    "°"   -> FInfixr 8
-+    "\xB7"-> FInfixr 8 -- cdot
-+    "\xB0"-> FInfixr 8 -- circ
-     _     -> FInfixl 9
- 
- 
-diff -Naur Agda-1.0.2/src/Lex.hs Agda-1.0.2.new/src/Lex.hs
---- Agda-1.0.2/src/Lex.hs	2006-12-25 18:47:26.000000000 -0500
-+++ Agda-1.0.2.new/src/Lex.hs	2008-07-26 06:35:10.000000000 -0400
-@@ -307,7 +307,7 @@
- isSym '>' = True; isSym '\\' = True; isSym '^' = True
- isSym '|' = True; isSym ':'  = True; isSym '-' = True; isSym '~' = True
- isSym ',' = True
--isSym c | c >= '\x80' = c `elem` "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿×÷"
-+isSym c | c >= '\x80' = ord c `elem` ([161..191] ++ [215,247])
- --isSym c | c >= '\x80' = isSymbol c
- isSym _   = False
- 
-diff -Naur Agda-1.0.2/src/PreStrings.hs Agda-1.0.2.new/src/PreStrings.hs
---- Agda-1.0.2/src/PreStrings.hs	2006-12-25 18:47:26.000000000 -0500
-+++ Agda-1.0.2.new/src/PreStrings.hs	2008-07-26 06:28:36.000000000 -0400
-@@ -46,6 +46,6 @@
-   "Setoid","Elem","Equal","ref","sym",
-   "tran","El","Eq", "_V", "A", 
-   "B", "x", "xs", "m","JMeq", 
--  "same", "a", "b", "×"
-+  "same", "a", "b", "\xD7" -- times
-  ]
- 
diff --git a/sci-mathematics/agda/files/agda-2.2.6-emacs.patch b/sci-mathematics/agda/files/agda-2.2.6-emacs.patch
deleted file mode 100644
index c9d0493f8a80..000000000000
--- a/sci-mathematics/agda/files/agda-2.2.6-emacs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur Agda-2.2.6/Agda.cabal Agda-2.2.6.new/Agda.cabal
---- Agda-2.2.6/Agda.cabal	2009-12-23 10:39:57.000000000 -0500
-+++ Agda-2.2.6.new/Agda.cabal	2010-02-12 10:52:07.000000000 -0500
-@@ -40,7 +40,6 @@
-                     doc/release-notes/*.txt
- data-dir:           src/data
- data-files:         Agda.css
--                    emacs-mode/*.el
- 
- source-repository head
-   type:     darcs
-@@ -274,15 +273,3 @@
-                    -fwarn-warnings-deprecations -fwarn-deprecated-flags
-                    -fwarn-dodgy-foreign-imports
-                    -fwarn-wrong-do-bind -fwarn-dodgy-exports
--
--executable agda-mode
--  hs-source-dirs:  src/agda-mode
--  main-is:         Main.hs
--  other-modules:   Paths_Agda
--  if flag(use-locale)
--    build-depends: base == 4.2.*
--  else
--    build-depends: base == 4.1.*,
--                   utf8-string == 0.3.*
--  build-depends:   filepath >= 1.1 && < 2,
--                   process >= 1.0.1.0 && < 2