Remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

9 files changed, 17 insertions, 606 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index a54a9cdf6c2d..c77e81d97f78 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.93 2014/07/25 17:55:38 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.94 2014/08/03 16:30:14 sera Exp $
+
+  03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -jython-2.5.1-r2.ebuild,
+  -jython-2.5.2-r2.ebuild, -jython-2.5.3-r2.ebuild,
+  -files/jython-2.5.1-build.patch,
+  -files/jython-2.5.1-distutils_byte_compilation.patch,
+  -files/jython-2.5.1-distutils_scripts_location.patch,
+  -files/jython-2.5.1-respect_PYTHONPATH.patch:
+  Remove old
 
 *jython-2.7_beta2-r1 (25 Jul 2014)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index c0acd0ed6f6e..32c09e9ed836 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -5,10 +5,6 @@ AUX 2.1-assert-SimpleCompiler.py.patch 504 SHA256 bc7c86f2e0355c33cf3dee92be54b8
 AUX 2.1-assert.patch 2052 SHA256 b7f491be967853107f47a7b7da489a66ae7c8acedc9d51261b3999ba4f877567 SHA512 56c1bb7cc6785a51951eb34923670a59d621998605fddcdd42f136055b094c5c42d9287370eccc2c39dfa3b3414d7f345b47daefa533a017cdb01d7d1364a47d WHIRLPOOL ac2bcb5057e53d9ee38bd371cb937fddb15753549a6572ad080d914c08158332d0063e86711f61ceb60e4bdc984866f1d7d49f57ac6969a684de681b657c0955
 AUX jython-2.2.1-build.patch 3285 SHA256 3078b381ac9a4ef0edf03b6c3253cbe436497b9f843aa45e43194e8b36f2d7e4 SHA512 e0936cd6fdca71f4df7c77959c343bcf74af496b048bbd2d285eb961700d0dd875c386d4efd85a61f89dcb67e55bfcff5f9e480e1e85bdfcbcd26aebefcb0397 WHIRLPOOL 2b3997555b38d3f5b8c7f75955a25eba66ef5a1a870a10e86ac6426e38bb9d28b0b3129437a13325290ea6bd943dc16cbd624b5cb6e4849ec8e756e58a8cc299
 AUX jython-2.2.1-build.xml.patch 3746 SHA256 547b74711c87fabef33f352e6f61b8fbc4cce9f19fc15c65790cca2302757a73 SHA512 4bcf88c19ba2fbffa221f6d4e6ecc043e75dfb6a6da30ab01a719d5abdff77f2ce5e38140560a23289f0325cf14153f514c7f642efcaca02832a5dd8566fd6fb WHIRLPOOL 685d9b8735ee29bcaa21eb8d554636022a9b443a94161ae352c32366cff362ebdab04ce91dab3e375a500623c6cca6511f6a53a99a4e74f19f9bd5cede47993b
-AUX jython-2.5.1-build.patch 1821 SHA256 284fa97ba5e44a0a0d9945dfc52a5b897d7e58ac010870b83a86fde46f2dca95 SHA512 9d7ecbd1753ce76e3229d2a254b38d5662702667247b54d16f905a65db43353cedaeb3ee393061bd1cb34f5ee3d133ee25420e582f4fc66a78eac9905af8f4f6 WHIRLPOOL 8d04756e7a64909b68e2472a94fb1cacb3df6989d434988348364c1145978fd565c0e4c8cafcfd95ac99a1b6a5363bcb652a9808ba392abc528f24d01cf56304
-AUX jython-2.5.1-distutils_byte_compilation.patch 1746 SHA256 e478fdb1d62e5c656399e3b4b1dc2d9dfe3f4f5dc8efca8634770f7e5fb68a5c SHA512 832aed8bb5e56bf4953b9d46337896e9f183692b12ba94cbe36b6a1bb960eb46aea5fdc7737ea42f0f617e032d4ea87c4a08c77a5b79dcd8fd560c3173de878d WHIRLPOOL f181635632e1bae07f811e3b4ce126afb35dc81aba7d0cd99c9961e338012bfad964e87a18db1240e097fcd7870f5622c46d8e043f5c73f0795c8b6b4358ee1d
-AUX jython-2.5.1-distutils_scripts_location.patch 346 SHA256 240cc2c51aa23738f559a874cc65d9c7de4a4c1d786edece3e865d7922fd6f90 SHA512 e3c96d614f16ab4d0fd3b8c6ce7f1ec7478fc36069f4b4d78f5bc4fe586e6dfd41c2afaf1092abd74bf0a61c352ce6e5328dee1c308493bd8d38fa6452705808 WHIRLPOOL 0c6cdf265094ce4a13d59edd5b5e2d74c91d08cc69514fcf7915b6e11ca8c85188c1d29440a3103348303dce9afb55d9531544b546554666b0e7725d2b25613a
-AUX jython-2.5.1-respect_PYTHONPATH.patch 547 SHA256 23d5008763e4abb6bd3b491b74a7428ae29f629b4c87f1a65659a3c46d51620c SHA512 516943ee4f5a2774695e5eb49d1cebbacb1a55ff0ba3e59a36033f1612f6c73f1ce1e45895fbda1deaec756efcfed9a4de5bc3cadf57ceeffa8990de0a58a0f5 WHIRLPOOL 54e38f603bf2e628bd56aaef8629ed2e6320b9d25519663e1991defc733c4326c08fde576287061183c1bc2f6b225821cdefe3e2b111b17ab5f940ca04a4e398
 AUX jython-2.5.2-build.xml.patch 1079 SHA256 52de2b89ff7a6e9e6f8df13a855c5791f50b4c8d97066006c5c98b1b50b3217e SHA512 983a61f8c01d2bb7b67e06b2933db850033c1e49c125890fb998b71909282a549fb035c223a540ba94c170390924e078cec643c1f38a29802348ea289314eed9 WHIRLPOOL c53f6774a0e64d003d7ea237761f897757441431c33b7ace8a7fffb60576944ede29e51066e76c2683d8696279f1fd459ea487c339bb925858a70d5c321087b1
 AUX jython-2.5.2-distutils_byte_compilation.patch 2954 SHA256 f2f2cbc01a138eccdcb38e07fdf4b45ee97393a740d778a69e6900a1e8567c04 SHA512 8706425ae61852c02ed5aa35d0e22f81e8768472f4096d42a4d15238a7d828c8a66764125270e37634999805135d0dff1a18a62c7036f16f0d39c9daa116f6c6 WHIRLPOOL 5a0aa0447ddd1689325b225e29645bbd87d0249f526f076626ab0615132a085a5a20f4ec0c141bbea54d20c9849b145e36da2ebefaafc2ff97f222516ac395fb
 AUX jython-2.5.2-distutils_scripts_location.patch 346 SHA256 240cc2c51aa23738f559a874cc65d9c7de4a4c1d786edece3e865d7922fd6f90 SHA512 e3c96d614f16ab4d0fd3b8c6ce7f1ec7478fc36069f4b4d78f5bc4fe586e6dfd41c2afaf1092abd74bf0a61c352ce6e5328dee1c308493bd8d38fa6452705808 WHIRLPOOL 0c6cdf265094ce4a13d59edd5b5e2d74c91d08cc69514fcf7915b6e11ca8c85188c1d29440a3103348303dce9afb55d9531544b546554666b0e7725d2b25613a
@@ -20,40 +16,28 @@ AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 SHA256 323b52653b51
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 SHA256 0840c1039c0e5821d0ceeb44bdfe1bda52fc2b9da00330c52c2056def2e09a24 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 WHIRLPOOL dc685f8cd5d684a9ea72f3315d9d74b1e51712fb6ef46fb2dec24ec1cb1a1d0094d28c06e32a0089ff659b7a0c402e35b77725e7c971db46bd90767d0eaff3ad
 AUX python-2.5.5-distutils_byte_compilation.patch 1208 SHA256 b520641c4b4117a231b4798c82a60ac458081cca71c56e9838dd8a9c51116fc8 SHA512 5e82e7d1c683a035105403282d61dab9af0f4fe4400fbdecaee5e676924e77ea57cd2b4d589c6e91b16a20fafcd4988b4d0127c3b2c3238228c706198001a306 WHIRLPOOL 13d1c5d88f12dbfd1b4574e38658062df2320e6a4c9ef233b234522c8cc45208009d9311ad54a58a20de643ddbcd799da69ef06fd408d64f81bf1cfb44b126f5
 DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188 SHA512 2e2c881f8819ed3d91b3e98e7087b23ced9715c80eb9e5fe4144cca5b82220e035d0f50ac4a098b3bbdca3c588f70b8021f68a5d52f653c013470579342943e4 WHIRLPOOL dbef6f9f0545f4f4ddf6e4535b67bb936a2ef596f17a1ff6acca89755729420588d845bc291eed0d19b433b3eff017166c7d68a1a352a5612b00da2f8f0c20d7
-DIST Python-2.5.5.tgz 11606370 SHA256 03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392 SHA512 787b3e99386e3b52bca63c3191ccb90418e8c5eb5eef3f4c4d8bda76cc5dd558aa28d8146a610ee66e58c1e3967516d073986b073df326685170143f191c152c WHIRLPOOL ac504a4afe70b706b5f3bf19314d97f1ecdb49067feb0137455dfc02c010cb99a145fd4afeef230bb9e2991309499b68e81a91b4e6da588af3fe40bfdb29a60c
 DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061
-DIST jython-2.5.1.tar.bz2 14470421 SHA256 23bc356ac6e1037cc305dc9791a247f4cfffe7b9e3ceb5b2a97449529cf4aa1d SHA512 c56aecf57ff8fc0872c2b10216f19f9f9456cf05e8b09486e5826007f92d99b95c74416f3272556aca3dcc964f411b116f5011122a5be7cd815f54b447f53f1d WHIRLPOOL e2910a0b97b0bc2080a9a7d32c83f22630f11d51b1a8dc9d495a51a2972fc2f5066860e9eb0ae0be89a99b8327ff106d645d773e6dedb65ddf0dd76e15c6f86a
 DIST jython-2.7-b1-sources.jar 10972175 SHA256 969fd3b26975a1bb9c16f36173bff61f40b7104378a5a12dea391ed3801e4ca7 SHA512 661732242a5195cbb4c9d4635d9a5dd7c09ba270b8c6b88200badb0b4987fefe1ce322ed23995e6723e571584e4e63c8d7f603fff450ed9cb5ad0b2cac73f5ad WHIRLPOOL 7dd78af2dd3e8958a23d07b6c96c1f240dcccd3fc04b4edb322108c7d12bdde95e96a6ec477f71c390179615df92209a2de5717aa3988722f537ec524c7571ed
 DIST jython-2.7-b2-sources.jar 10867556 SHA256 aab612ab3fedd5fff32c4444a94e5a3b0884e08cb394d47ff5c1c3d88e899139 SHA512 3ecd87d595d3436fb65888c59a387b725b1768f4dd5551d440da3c6ae38000d7298d92cc149b3a72491138e4f4fd78aa1c3f8db1aaa0cf75a5122887777359e1 WHIRLPOOL 1c472e823abcd614ebafc04a31330bee16c0113350a5c42123d604c813c9d9a466ae83fc1749f04201a83e849ac3a3590a9cd03febabd22426c4c65751068974
 DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768
 DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
-DIST jython_installer-2.5.2.jar 18435770 SHA256 1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29 SHA512 ea9d1573f1f86aba13554292418be65579e55d695c9ab625402cc9478a1fed56654eb7ef5e750c9ebdcfe388c7f007016d88dedd6e6652d2a61f7681963118c4 WHIRLPOOL 3621162d9cffa2d0312b775af6cd342fdb17a25b965b2b736b1d03fe70512f05a645eb336a5d01135555fb843f6d4498e43530675e306373f98c8184a375e96b
 EBUILD jython-2.1-r11.ebuild 2934 SHA256 9ce1e028309ecc0d8f804fad81ce80f9ed81ef9f089aa01c26c17a47b79baf3f SHA512 73056839842a49593083e5d22babe1fd4aaa2ed64305208129e5b7c981f3f6a5782627ac7ab819fa1305250b3bd23e7da3fb7c3bac262bb3dd8e5692b5c24a62 WHIRLPOOL 11e1f46dbbbb80058ae1a059782c5e0fa9cef25d39b5320742c5eff220e209b11b818d7429a7af8a83f8726e58e83c17cc85518cf9e949b930d09cffbb37e102
 EBUILD jython-2.2.1-r1.ebuild 3769 SHA256 936d381297b273398a608fc879331f147f555ea19174ff12722003c4ec90cd9f SHA512 61d10d83cc2e56818d069ba3d0e0262cb21082b96fdb89e5704912fee4457048c8e390a6eaba55664bf15fe581321da517e7fe70260143cf62e3129a40eacf7f WHIRLPOOL 49705b431243688cac0558fcf87b7b492ceb4d90100d7ff80608b4faeb4d53801a8055bacb6b62f4ddfb5b82279eb9e1973d6ae1d9c21bb716d389add06688bd
 EBUILD jython-2.2.1-r2.ebuild 3736 SHA256 1a983a6318274e200dc285e96dcbd01c4f228cbe3eb0008a777a5d8af233ca73 SHA512 fde96fe337bce260afd5485c03a99db1d7f407233ebbbe832ba01c8e2de605b8a9389c0e2ec9a27ad7a1d267e282c24f97839b35d0b886e2ffc1a9bd8f71e23c WHIRLPOOL 118b6d1e56b2181d3fd1c92b0a4391075fc772504d9ab762aeb2b14b5ac6dbba2eeb648ae4841faeb2348e66f895a20f7a6e387b2571c888c19d0dcf91bb756b
-EBUILD jython-2.5.1-r2.ebuild 5606 SHA256 a6c0b84a70d266616ffe73062986615502e60ed39426d517f6089640fdc689ec SHA512 5eaa7bb9c03e947945be8248c1db5e1024654c1d11e61471a1b7686845719da21544369d40cabf31240f6beecab6e9eae169f29c05dcf9846ecec51b8f269356 WHIRLPOOL 55d0bceda9d789ceba4ab54b63bc976e319e8a30307f53e0754b4d6b8bae93845368012bb8b06033ea1ebdfc4ce6831ad0552457c8d6d535ef5e10c7b74823ad
-EBUILD jython-2.5.2-r2.ebuild 4232 SHA256 5e84cee35324d5d1740b2afd5f7d2dfbbe1c77da97373c6eb9a66a89088a419d SHA512 00cd44609a84ee5bcabba6b9d34bb9ce40424ea0874be5a42ac911ecaa0c5786b5807158eded99ad1c9996992429fa04023571b7038135c5de01151a2d643203 WHIRLPOOL 890c00fb89a4e5dca81c06dd2c7d2ff71b428ac74902cbc7e7537126a8a3d23bff96cda151ff7cf7f8ceebe1f7650177e73e96ec50c8335e6d95532caa180fe4
-EBUILD jython-2.5.3-r2.ebuild 4538 SHA256 9d80344c0ab202bfea7345ec3db54b2d80f5e73161c2107fdbad5ad5ee7458de SHA512 3f3b32523bf04ed893ea1ebd5d2ce16a1e80fa013906454540b4a788aedd488e685fad2f216c342d493d4e04addee2d8c3be7aa7c130a4c8ff0cfcf6efd6dd5b WHIRLPOOL 0060962283e581fafed63862f850e10cd22c332e50305ec9ac26f7c9685aa4c94c2ab895cf5bdc07e9e562662a263719e8b8c68abd23ef127bd373c599940619
 EBUILD jython-2.5.3-r3.ebuild 4575 SHA256 9099c7c2f772afc632c5427cf794256d17ac50efe724176d8dff608e57478f0a SHA512 629c2e8dbcca5ce6e031db3ed9ef26a248f486062fbcfed72e75447fb2082205d7e55dffcefa97b0aa12d1ff72cae0c50c26707c2c00f4df7d683fb3e16e5ce7 WHIRLPOOL a6419959c28e9a6048de7658413a4e8aa25ac7266aafb8703e4753eb7942c0b69aa25ab64d3cca98bc1c9821f4360778b3c1f321b0dae644aeeaed8c77826e60
 EBUILD jython-2.7_beta1.ebuild 5159 SHA256 35bc6560ddac6a382ffa883b191dcc3c38aa5ab1f7905d62068402531d1438d0 SHA512 b148c200b562d566545e14071631da1d91a3151d76cb9a9d18bed5ed1395bccfd96d9bd14bde3bad3fd62eab3787b17421d7d4f6b33cddab688162beafacfd8e WHIRLPOOL 85562296640a43ef85c5d94cf4b6f97c28188f525ec29ec1d28ceebd2f7f5b7281ac708174f34b362c3bc6139d3281fb19790194a06b68f4df4b75a4a99cefa3
 EBUILD jython-2.7_beta2-r1.ebuild 5377 SHA256 3a65ff78fe931f58f23ffdb220dac8a9b486e697043c5036614c82b3496abec6 SHA512 704918304eb142f277cbc5339fd6c3ec1c39bf282acf2d8c0c37a9bf59ba079fe2d59a6542bdf1c2f7d30328b8c46ede5d64bbff86e7edb90c4a54358ca54b02 WHIRLPOOL abfa9ed30a5ff2f99dbf63baac317b1d453badb59e4db2416a09e548277a7fca92a960f63341770ed25e0e4870a469b6c5d049db21c33d6c05eb786f2b3c3de8
 EBUILD jython-2.7_beta2.ebuild 5322 SHA256 97635d6a44c9c48405a566e1164db89e9413b79ce9bb2881853f9289969160ef SHA512 fd0bed41bcb36cc538e48578d449bfbd36918e33dc4ab4f86f13cf61d8ce8ab01b3447ffd3c961a1b6913ee4a043f22527e6961cc6702b8a33bdc7b00328a22b WHIRLPOOL f4bc4d04047598743d80e0563569178892fe9fc1d5c17a6d1d478a602f0e48fee6282677703f93634941f8798f86bb27d995276ca78bcfe81b32ca3551145981
-MISC ChangeLog 15180 SHA256 22d8400500da26191ab3b305fbed408d95cb69b34a70fb5705fedf3d7f988066 SHA512 3b438d57f66ded04d58f517b0e08c238d88a7d4bbd4f2379c37868bf3b49bcc881fa145199e57f4c9247639792d652775594f1862e7f3661e46e96619043455b WHIRLPOOL a7d50b5d26e73cdfb0139441136acd241507c600a9b081aeba3fe3949363a2f0a7c611dfad0098abb87c2d82eff1302dc69128fc1b1b1c0a101bba7f774ea595
+MISC ChangeLog 15512 SHA256 c1825a99f12a13eea1500ba0d20745b2d032bd28fdeefb35dd8b6a744e53ce4d SHA512 6f5673f39d4bdbc91fa473de104341544c86ba19f6d84aa3b81db227d8d2d6d58a2368b7e8427875a901678901a33123f206a84c4cb4d5ca927a79e0298c5531 WHIRLPOOL 4fdfa6af036b2172d2f85a98902ec1e3680fa5cc64780860ca17778b5be2d82ba48d0782b57415a7393cd9572286680f8f6ecd976e27b7c6e972263dba8f508d
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT0powAAoJEHy/RO9cNQiDatIP/1h9ZviOdmlGSovjHrgQIkOJ
-Sx/JI2wSlLly42pUoaGrUrUqmAebyqsT+r28J1FWw1geUpfqSMfN8mgByRx4O7Cr
-ju9nm6eZt78rJ6/iuQ011uYn5F4WApEXtcQPLjjjrnjHRiaL4bJ7jCsfF6cARm9x
-JJwDNsjJ/L/RLjpbQ8cwm52eTN0B5gb1sJb+3jTcLD0JLQ2ztjHgB7F5OirTXs6E
-BY/2RVA44JSW5kpL4zmcIlu5WzoWLo469RRk9aOkVxoCCTxxxUNfaKLFzFPMY6Kr
-oNwlAejzBmEC3JapicxRcf3aLNeHOoljwxofHjErqtdVDFBSW9V/4ryfIRMKL5Vj
-glCbakQsZ2mKXSkh5w61HyQH1ws5Avyq23AXuibfsT9UOfUSoh5kq8cYMhFaj+FG
-CbMVH0bU9AdZDL0nkKd6Gq7dSoaswLgvT+vAHgKyiPPhjediL7QUOQWJMh7vPyyo
-NSnKafQzPz8ojUDy74c4Drwj7Zh72N72CPhm2VfXysnFkxxuyP6DNwABvRNDroXC
-N1JA4jBHle+S3ZvifQFuuHUe9PQHEFOZDs+x+RPbF+7t6iO1GF5WDgHYvkOpbDyO
-YmhKNQafecwXk0aqyxoOhvxxJykmbXFrH3rSDrHLmoQES36WTho+cgWBt6dxn04E
-tPFsl/bz0hDJIP7OH03e
-=bkhQ
+iQEcBAEBCAAGBQJT3mOjAAoJELjwI6Q8XPdahwIH/082m5FUPNCNPa5MPwpxN/uh
+dPN9hhxqjcUQCoAN50850zfH5bvph/sp995Y6cLeeO4U9beSK45K7tfACScLpTg2
+lj69PrtQO0Ukr5CAyxiXr8FHs8aX+8eXgX09FJ2VuPWmpZ+AaWbS5wAWeoTU3rip
+Z3L2OJEkwPg0Lv87JqtOT3dpezloJNV8xuftZQ2fXgHfnlA5LJ58yHFnPKNLSmaV
+ZC5TJIsgUldo0F6hCJBN+D7gfLkNG29cJdTWz6sZlR3U4SN+mUWFKYrRF0KMWl9T
+CtcayvHkw1lsfAUTzErpniwJRQc9BYy2KTIsZf5YPlDs5r1H3UShBA69dR/HpkA=
+=Cl5k
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jython/files/jython-2.5.1-build.patch b/dev-java/jython/files/jython-2.5.1-build.patch
deleted file mode 100644
index e3c40f1c0f42..000000000000
--- a/dev-java/jython/files/jython-2.5.1-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- build.xml.old	2010-03-06 07:34:18.000000000 +1300
-+++ build.xml	2010-03-06 07:38:24.000000000 +1300
-@@ -191,7 +191,8 @@
-             <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
-             <pathelement path="${extlibs.dir}/constantine-0.4.jar" />
-             <pathelement path="${extlibs.dir}/jna.jar"/>
--            <pathelement path="${extlibs.dir}/jna-posix.jar"/>
-+	    <pathelement path="${extlibs.dir}/jna-posix.jar"/>
-+	    <pathelement path="${extlibs.dir}/ant.jar" />
-         </path>
- 
-         <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" />
-@@ -200,7 +201,8 @@
-         <path id="test.classpath">
-             <path refid="main.classpath"/>
-             <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" />
--            <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
-+	    <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
-+	    <pathelement path="${extlibs.dir}/xercesImpl.jar" />
-             <pathelement path="${exposed.dir}" />
-             <pathelement path="${compile.dir}" />
-             <pathelement path="${cpptasks.jar.dir}" />
-@@ -236,15 +238,6 @@
-             <istrue value="${has.repositories.connection}" />
-         </condition>
- 
--        <!-- classpath for svn ant task -->
--        <path id="svn.classpath">
--            <pathelement path="${java.class.path}" />
--            <fileset dir="${svnant.jar.dir}">
--              <include name="*.jar"/>
--            </fileset>
--        </path>
--    	<!-- taskdef for svn ant task -->
--    	<taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" />
-     </target>
-     <target name="full-check" depends="full-preinit, init, dump-env">
-         <!-- Require all of the optional jars for a full build -->
diff --git a/dev-java/jython/files/jython-2.5.1-distutils_byte_compilation.patch b/dev-java/jython/files/jython-2.5.1-distutils_byte_compilation.patch
deleted file mode 100644
index 9ba2cc51924c..000000000000
--- a/dev-java/jython/files/jython-2.5.1-distutils_byte_compilation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- Lib/distutils/tests/test_build_py.py
-+++ Lib/distutils/tests/test_build_py.py
-@@ -92,6 +92,25 @@
-             os.chdir(cwd)
-             sys.stdout = sys.__stdout__
- 
-+    def test_dont_write_bytecode(self):
-+        # makes sure byte_compile is not used
-+        pkg_dir, dist = self.create_dist()
-+        cmd = build_py(dist)
-+        cmd.compile = 1
-+        cmd.optimize = 1
-+
-+        old_dont_write_bytecode = os.environ.get("PYTHONDONTWRITEBYTECODE")
-+        os.environ["PYTHONDONTWRITEBYTECODE"] = "1"
-+        try:
-+            cmd.byte_compile([])
-+        finally:
-+            if old_dont_write_bytecode is None:
-+                del os.environ["PYTHONDONTWRITEBYTECODE"]
-+            else:
-+                os.environ["PYTHONDONTWRITEBYTECODE"] = old_dont_write_bytecode
-+
-+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
-+
- def test_suite():
-     return unittest.makeSuite(BuildPyTestCase)
- 
---- Lib/distutils/util.py
-+++ Lib/distutils/util.py
-@@ -11,6 +11,7 @@
- from distutils.dep_util import newer
- from distutils.spawn import spawn
- from distutils import log
-+from distutils.errors import DistutilsByteCompileError
- 
- def get_platform ():
-     """Return a string that identifies the current platform.  This is used
-@@ -397,6 +398,9 @@
-     generated in indirect mode; unless you know what you're doing, leave
-     it set to None.
-     """
-+    # nothing is done if PYTHONDONTWRITEBYTECODE environment variable is set
-+    if os.environ.get("PYTHONDONTWRITEBYTECODE") is not None:
-+        raise DistutilsByteCompileError('byte-compiling is disabled.')
- 
-     # First, if the caller didn't force us into direct or indirect mode,
-     # figure out which mode we should be in.  We take a conservative
diff --git a/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch b/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch
deleted file mode 100644
index 150d463f1db1..000000000000
--- a/dev-java/jython/files/jython-2.5.1-distutils_scripts_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Lib/distutils/command/install.py
-+++ Lib/distutils/command/install.py
-@@ -70,7 +70,7 @@
-         'purelib': '$base/Lib/site-packages',
-         'platlib': '$base/Lib/site-packages',
-         'headers': '$base/Include/$dist_name',
--        'scripts': '$base/bin',
-+        'scripts': '/usr/bin',
-         'data'   : '$base',
-         }
-     }
diff --git a/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch b/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch
deleted file mode 100644
index 8d028d01b567..000000000000
--- a/dev-java/jython/files/jython-2.5.1-respect_PYTHONPATH.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/org/python/core/PySystemState.java
-+++ src/org/python/core/PySystemState.java
-@@ -646,6 +646,12 @@
-             if (jythonpath != null) {
-                 registry.setProperty("python.path", jythonpath);
-             }
-+            else {
-+                jythonpath = System.getenv("PYTHONPATH");
-+                if (jythonpath != null) {
-+                    registry.setProperty("python.path", jythonpath);
-+                }
-+            }
-         } catch (SecurityException e) {
-         }
-         registry.putAll(postProperties);
diff --git a/dev-java/jython/jython-2.5.1-r2.ebuild b/dev-java/jython/jython-2.5.1-r2.ebuild
deleted file mode 100644
index c55dbcde8007..000000000000
--- a/dev-java/jython/jython-2.5.1-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.1-r2.ebuild,v 1.3 2012/04/13 18:47:54 ulm Exp $
-
-EAPI="3"
-
-JAVA_PKG_IUSE="source doc examples oracle"
-#informix missing.  This is a jdbc driver, similar to oracle use flag
-#functionality.
-
-inherit base java-pkg-2 java-ant-2 python
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-
-PYVER="2.5.5"
-
-SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="2.5"
-PYTHON_ABI="${SLOT}-jython"
-KEYWORDS="~amd64 ~x86"
-IUSE="+readline +ssl +threads +xml"
-
-#>=dev-java/jdbc-mysql-3.1
-#dev-java/jdbc-postgresql
-CDEPEND="=dev-java/jakarta-oro-2.0*
-	>=dev-java/libreadline-java-0.8.0
-	dev-java/asm:3
-	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-	java-virtuals/servlet-api:2.5
-	!<=dev-java/freemarker-2.3.10
-	dev-java/constantine:0
-	dev-java/jline:0
-	dev-java/jna-posix:0
-	dev-java/jna:0
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	dev-java/jsr223:0
-	>=dev-java/java-config-2.1.11-r3"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	dev-java/ant-core:0
-	dev-java/junit:0
-	${CDEPEND}"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	python_pkg_setup
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-distutils_byte_compilation.patch"
-	epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
-	epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch"
-
-	rm -Rfv org || die "Unable to remove class files."
-	find extlibs -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
-	find "${WORKDIR}" -iname '*.pyc' | xargs rm -fv
-	java-pkg_jar-from --into extlibs libreadline-java libreadline-java.jar \
-		libreadline-java-0.8.jar
-	java-pkg_jar-from --into extlibs antlr-3 antlr3.jar antlr-3.1.3.jar
-	java-pkg_jar-from --into extlibs antlr antlr.jar antlr-2.7.7.jar
-	java-pkg_jar-from --into extlibs stringtemplate stringtemplate.jar \
-		stringtemplate-3.2.jar
-	java-pkg_jar-from --into extlibs servlet-api-2.5 servlet-api.jar \
-		servlet-api-2.5.jar
-	java-pkg_jar-from --into extlibs asm-3 asm.jar asm-3.1.jar
-	java-pkg_jar-from --into extlibs asm-3 asm-commons.jar \
-		asm-commons-3.1.jar
-	java-pkg_jar-from --into extlibs constantine constantine.jar \
-		constantine-0.4.jar
-	java-pkg_jar-from --into extlibs jline jline.jar \
-		jline-0.9.95-SNAPSHOT.jar
-	java-pkg_jar-from --into extlibs jna jna.jar
-	java-pkg_jar-from --into extlibs jna-posix jna-posix.jar
-	java-pkg_jar-from --build-only --into extlibs ant-core ant.jar
-	java-pkg_jar-from --build-only --into extlibs junit junit.jar \
-		junit-3.8.2.jar
-	java-pkg_jar-from --into extlibs xerces-2 xercesImpl.jar
-	java-pkg_jar-from --into extlibs jsr223 script-api.jar \
-		livetribe-jsr223-2.0.5.jar
-
-	echo "has.repositories.connection=false" > ant.properties
-
-	if use oracle; then
-		echo \
-		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
-		>> ant.properties
-	fi
-
-	pushd "${WORKDIR}/Python-${PYVER}" > /dev/null
-	epatch "${FILESDIR}/python-${PYVER}-distutils_byte_compilation.patch"
-	popd > /dev/null
-}
-
-src_compile() {
-	local antflags=""
-	local pylib="../Python-${PYVER}/Lib"
-	antflags="${antflags} -Dpython.lib=${pylib}"
-	eant ${antflags} developer-build $(use_doc javadoc)
-}
-
-# Restrict tests as some dont compile and others (a couple) are broken.
-RESTRICT="test"
-src_test() {
-#[exec] 311 tests OK.
-#[exec] 3 tests skipped:
-#[exec]     test_subprocess test_urllib2net test_urllibnet
-#[exec] 2 tests failed:
-#[exec]     test_pbcvm test_pkgimport
-#[exec] 2 fails unexpected:
-#[exec]     test_pbcvm test_pkgimport
-	local antflags=""
-	antflags+=" -Dgentoo.library.path=$(java-config -di jna-posix)"
-	antflags+=" -Dpython.home=dist"
-	local pylib="../Python-${PYVER}/Lib"
-	antflags+=" -Dpython.lib=${pylib}"
-	ANT_TASKS="ant-junit" eant ${antflags} test
-}
-
-src_install() {
-	dodoc README.txt NEWS ACKNOWLEDGMENTS README.txt
-	cd dist || die
-	java-pkg_newjar "${PN}-dev.jar"
-
-	local java_args="-Dpython.home=/usr/share/${PN}-${SLOT}"
-	java_args+=" -Dpython.cachedir=\$([[ -n \"\${JYTHON_SYSTEM_CACHEDIR}\" ]] && echo ${EPREFIX}/var/cache/${PN}/${SLOT}-\${EUID} || echo \${HOME}/.jythoncachedir)"
-	java_args+=" -Dpython.executable=${EPREFIX}/usr/bin/jython${SLOT}"
-
-	java-pkg_dolauncher jython${SLOT} \
-						--main "org.python.util.jython" \
-						--pkg_args "${java_args}"
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto /usr/share/${PN}-${SLOT}
-	doins -r Lib registry
-	python_clean_installation_image -q
-
-	use doc && java-pkg_dojavadoc Doc/javadoc
-	use source && java-pkg_dosrc ../src
-	cd "${S}"
-	use examples && java-pkg_doexamples Demo/*
-
-	if use readline; then
-		sed \
-			-e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
-			-e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
-			-i "${ED}usr/share/${PN}-${SLOT}/registry" || die "sed failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-
-	elog
-	elog "readline can be configured in the registry:"
-	elog
-	elog "python.console=org.python.util.ReadlineConsole"
-	elog "python.console.readlinelib=GnuReadline"
-	elog
-	elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
-	elog "User registry: '~/.jython'"
-	elog "See http://www.jython.org/docs/registry.html for more information."
-	elog
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-java/jython/jython-2.5.2-r2.ebuild b/dev-java/jython/jython-2.5.2-r2.ebuild
deleted file mode 100644
index 85c5f21abe5f..000000000000
--- a/dev-java/jython/jython-2.5.2-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.2-r2.ebuild,v 1.1 2012/08/26 16:16:22 thev00d00 Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2 python
-
-PYTHON_ABI="${SLOT}-jython"
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${PN}_installer-${PV}.jar"
-
-LICENSE="PSF-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="readline"
-
-# Missing in installer jar.
-RESTRICT="test"
-
-COMMON_DEP="
-	!<=dev-java/freemarker-2.3.10
-	dev-java/antlr:3
-	dev-java/asm:3
-	dev-java/guava:0
-	>=dev-java/java-config-2.1.11-r3
-	dev-java/jffi:1.0
-	dev-java/jline:0
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:1.1
-	java-virtuals/script-api:0
-	java-virtuals/servlet-api:2.5
-	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	python_pkg_setup
-}
-
-java_prepare() {
-	# src/META-INF/services missing - taking from prebuilt jar
-	pushd src > /dev/null || die
-		jar -xf ../${PN}.jar META-INF/services || die
-	popd > /dev/null
-
-	find \( -name '*.jar' -o -name '*.class' -o -name '*.pyc' -o -name '*.exe' \) -exec rm -v {} + || die
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	epatch "${FILESDIR}/${P}-sax-parser-fix.patch"
-
-	# 431754
-	epatch "${FILESDIR}/${P}-sax-parser-class-not-found.patch"
-
-	epatch "${FILESDIR}/${P}-distutils_byte_compilation.patch"
-	epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
-	epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch"
-
-	use readline || rm -v src/org/python/util/ReadlineConsole.java || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_GENTOO_CLASSPATH="asm-3,guava,jffi-1.0,jline,jnr-constants,script-api,servlet-api-2.5"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to COMMON_DEP if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-src_compile() {
-	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-1.1)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-
-	sed -i -e "1 a\
-		CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
-		bin/jython || die
-
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto /usr/share/${PN}-${SLOT}
-	doins -r dist/{Lib,registry}
-	python_clean_installation_image -q
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dojavadoc dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	if use readline; then
-		sed -i -e "/#python.console.readlinelib=JavaReadline/a \
-			python.console=org.python.util.ReadlineConsole\npython.console.readlinelib=GnuReadline" \
-			"${ED}"/usr/share/${PN}-${SLOT}/registry || die
-	fi
-
-	# the jvm opens classfiles rw ...
-	dodir /etc/sandbox.d
-	echo "SANDBOX_PREDICT=/usr/share/${PN}-${SLOT}" > "${ED}/etc/sandbox.d/20${P}-${SLOT}"
-
-	# compile aot
-	java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-		-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
-		-Dpython.cachedir="${T}/.jythoncachedir" \
-		org.python.util.jython -m compileall -f -q -x "/test/" "${ED}" || die
-}
diff --git a/dev-java/jython/jython-2.5.3-r2.ebuild b/dev-java/jython/jython-2.5.3-r2.ebuild
deleted file mode 100644
index 46c7aa825e39..000000000000
--- a/dev-java/jython/jython-2.5.3-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.3-r2.ebuild,v 1.3 2013/01/30 18:09:06 ago Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2 python-utils-r1
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-SRC_URI="http://central.maven.org/maven2/org/python/${PN}-installer/${PV}/${PN}-installer-${PV}.jar"
-
-LICENSE="PSF-2"
-SLOT="2.5"
-KEYWORDS="amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="readline"
-
-# Missing in installer jar.
-RESTRICT="test"
-
-COMMON_DEP="
-	!<=dev-java/freemarker-2.3.10
-	dev-java/antlr:3
-	dev-java/asm:3
-	dev-java/guava:0
-	>=dev-java/java-config-2.1.11-r3
-	dev-java/jffi:1.0
-	dev-java/jline:0
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:1.1
-	java-virtuals/script-api:0
-	java-virtuals/servlet-api:2.5
-	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	# src/META-INF/services missing - taking from prebuilt jar
-	pushd src > /dev/null || die
-		jar -xf ../${PN}.jar META-INF/services || die
-	popd > /dev/null
-
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	epatch "${FILESDIR}/${PN}-2.5.2-build.xml.patch"
-
-	epatch "${FILESDIR}/${PN}-2.5.2-distutils_byte_compilation.patch"
-	epatch "${FILESDIR}/${PN}-2.5.2-distutils_scripts_location.patch"
-	epatch "${FILESDIR}/${PN}-2.5.2-respect_PYTHONPATH.patch"
-
-	if ! use readline; then
-		rm -v src/org/python/util/ReadlineConsole.java || die
-	fi
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_GENTOO_CLASSPATH="asm-3,guava,jffi-1.0,jline,jnr-constants,script-api,servlet-api-2.5"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to COMMON_DEP if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-src_compile() {
-	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-1.1)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-
-	sed -i -e "1 a\
-		CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
-		bin/jython || die
-
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto /usr/share/${PN}-${SLOT}
-	doins -r dist/{Lib,registry}
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dojavadoc dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	if use readline; then
-		sed -i -e "/#python.console.readlinelib=JavaReadline/a \
-			python.console=org.python.util.ReadlineConsole\npython.console.readlinelib=GnuReadline" \
-			"${ED}"/usr/share/${PN}-${SLOT}/registry || die
-	fi
-
-	# the jvm opens classfiles rw ...
-	dodir /etc/sandbox.d
-	echo "SANDBOX_PREDICT=/usr/share/${PN}-${SLOT}" > "${ED}/etc/sandbox.d/20${P}-${SLOT}"
-
-	# we need a wrapper to help python_optimize
-	cat > "${T}"/jython <<_EOF_ || die
-exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-	-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
-	-Dpython.cachedir="${T}/.jythoncachedir" \
-	org.python.util.jython "\${@}"
-_EOF_
-	chmod +x "${T}"/jython || die
-
-	python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
-	local PYTHON="${T}"/jython
-
-	# compile tests (everything else is compiled already)
-	# we're keeping it quiet since jython reports errors verbosely
-	# and some of the tests are supposed to trigger compile errors
-	python_optimize "${ED}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
-
-	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}