Version bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 235 insertions, 2 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 3f455fd20ee7..0a427ecf07b5 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.85 2013/01/30 18:09:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.86 2013/03/07 20:42:45 radhermit Exp $
+
+*jython-2.7_beta1 (07 Mar 2013)
+
+  07 Mar 2013; Tim Harder <radhermit@gentoo.org> +jython-2.7_beta1.ebuild,
+  +files/jython-2.7_beta1-ant.patch,
+  +files/jython-2.7_beta1-dont-always-recompile-classes.patch:
+  Version bump.
 
   30 Jan 2013; Agostino Sarubbo <ago@gentoo.org> jython-2.5.3-r2.ebuild:
   Stable for x86, wrt bug #451630
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 4728942216f4..912259fe0b2c 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.1-assert-SimpleCompiler.py.patch 504 SHA256 bc7c86f2e0355c33cf3dee92be54b8174c3c69a468c59766d6706980ba9ad00f SHA512 340c91c27b148c9f9d005f944ecfbb07293d7ccc80398e803d910ce6dfa5aa044db54ca72ae2ed5f3714a6208de65d5209746bdc5caf0e534461a3d6b314df5d WHIRLPOOL eb638436908a84aa062c06eca96aeb46921fc43fbdaf14ecbac9f732252f15e275201a856908d1d130d6599cc55cac3631402e302a12ebcf14a9cd95a5393dee
 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
@@ -12,11 +15,14 @@ AUX jython-2.5.2-distutils_scripts_location.patch 346 SHA256 240cc2c51aa23738f55
 AUX jython-2.5.2-respect_PYTHONPATH.patch 547 SHA256 23d5008763e4abb6bd3b491b74a7428ae29f629b4c87f1a65659a3c46d51620c SHA512 516943ee4f5a2774695e5eb49d1cebbacb1a55ff0ba3e59a36033f1612f6c73f1ce1e45895fbda1deaec756efcfed9a4de5bc3cadf57ceeffa8990de0a58a0f5 WHIRLPOOL 54e38f603bf2e628bd56aaef8629ed2e6320b9d25519663e1991defc733c4326c08fde576287061183c1bc2f6b225821cdefe3e2b111b17ab5f940ca04a4e398
 AUX jython-2.5.2-sax-parser-class-not-found.patch 1431 SHA256 a6d63dd169dd40376cebce4d61d9b31c0cc4b8d4330d19e465b8b0f310763bd7 SHA512 d541e900cc878f394fc9c3bdbdd949950110be09ef6b00834895f567f6369e02af87eb683e1e96b4c962e03e2ae0255d415feaf09114f391381b7557a513c911 WHIRLPOOL 9befabddc53119655e2b211df59d2856ff3785f308c9079a1002dcd5d1c59d51e2d509740bf70f3fa3d312cc8f3a53313f67fdb9383d4bb9a6e0282b19ffed9f
 AUX jython-2.5.2-sax-parser-fix.patch 3865 SHA256 ad7ceca1bc974432220c7ec699e768657ca39da2f3a4aad0fcff25da454bc0f4 SHA512 b56a539c4b63aca1305aca07aa5ebcabcd479687a5a991cf19a26574c06ef6664d0390c0b82e1c1aadaec23c0b7c44913ca8a816af7a8358ab6b4071c668f092 WHIRLPOOL e771ffcac7f9d59f87b97ae699a0b8cd91c0ec26a877131649c8dfdf920d1a3f08b84256b785605075e833c4aeb1bc7a498a8f00d298fc0344df902913904f12
+AUX jython-2.7_beta1-ant.patch 996 SHA256 4162eb543c70071cac05c4220047296809733f2b6ade731ac995e7e0764260d7 SHA512 9d6888c0af9b0ca39f7e70c3aad868c17b65d2f703b1fcd05fb71fe0cc8a289ca055fadd878afdc7fd509e16099abb2ddf0de9053994010d09757f275d243c70 WHIRLPOOL 51da00d838e92acb2353d75b32450d02afb11e6cd27e7c05e7f73d67397eadf9871f527a138353513597980b564c69a2e6e959a30ca5eff3cdebaacf55b348cd
+AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 SHA256 323b52653b511d3d4a299d0414716aa3d6e7bfa21094b6090363878f244d7af2 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 WHIRLPOOL 76300b03adaad2d979e4a5a705088ef3410d93643fac0c87b333f88181d4f93c8185630467a272d7fd5f2439784e907814084f5a18f11715d9bc4ce102d03bc5
 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-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
@@ -27,5 +33,17 @@ EBUILD jython-2.5.1-r2.ebuild 5606 SHA256 a6c0b84a70d266616ffe73062986615502e60e
 EBUILD jython-2.5.2-r2.ebuild 4232 SHA256 5e84cee35324d5d1740b2afd5f7d2dfbbe1c77da97373c6eb9a66a89088a419d SHA512 00cd44609a84ee5bcabba6b9d34bb9ce40424ea0874be5a42ac911ecaa0c5786b5807158eded99ad1c9996992429fa04023571b7038135c5de01151a2d643203 WHIRLPOOL 890c00fb89a4e5dca81c06dd2c7d2ff71b428ac74902cbc7e7537126a8a3d23bff96cda151ff7cf7f8ceebe1f7650177e73e96ec50c8335e6d95532caa180fe4
 EBUILD jython-2.5.3-r1.ebuild 4166 SHA256 41495f88447e8b292d51407b2692208330bb3958684538cac3bc501bfc340d9f SHA512 f558c5098cde10e5149e82398949d9e98a183549657d55b6f52ed509b7fa9172cb4621233f515860b08a67bf8ad437ba82b86d4e7a3bcc42c0bf18c1b8012f9f WHIRLPOOL 616e4112494145ab5fafa9418578fef5f45f785c5fd80a6bd0c193e2e8f4bdd1b5245f7345531f6a890b538e15bdcf0f08718b05d855dd368c97f6980148405b
 EBUILD jython-2.5.3-r2.ebuild 4538 SHA256 9d80344c0ab202bfea7345ec3db54b2d80f5e73161c2107fdbad5ad5ee7458de SHA512 3f3b32523bf04ed893ea1ebd5d2ce16a1e80fa013906454540b4a788aedd488e685fad2f216c342d493d4e04addee2d8c3be7aa7c130a4c8ff0cfcf6efd6dd5b WHIRLPOOL 0060962283e581fafed63862f850e10cd22c332e50305ec9ac26f7c9685aa4c94c2ab895cf5bdc07e9e562662a263719e8b8c68abd23ef127bd373c599940619
-MISC ChangeLog 13803 SHA256 3df18489df0d23dccb186f59c5d8839bfd30fcebf6fe20ad12a60f1d3fdaf807 SHA512 d1be195db5daadbc12d475058c6ad600eb82e83818cfa5baa2d9c46fb965fb930d9b545ad6b45d0047f8d47b19d19a647ca541bae2630d260b43a41ca7048a9b WHIRLPOOL c65862be7a1b01ea9bd52dff8ee129ffac8f0bd23613e686415878f9ce753a3495bd9edf9a03c7f4a53c3ef540047699921efa8327a90923ecf2b082b83e2d47
+EBUILD jython-2.7_beta1.ebuild 5152 SHA256 9c38e076c75e147f138e7736b7c81cf12ba1fa810b344b67a447b7d336aa50a3 SHA512 6e3c4c547537e61bcf5e01feb86d90c7c5cfd341d4137695ab726f928156a22f5ee8d78eb4a52ce9db0901ca98a4ecc219683805ede55e37a44bfe383c62f56f WHIRLPOOL dcd0f859d12faed522605b9e4f4faeca2f68548a524d8ecc23ad2376795e23b23900193f135bb2762bc55dd30f0a790781b2f4a8591db6ab838460a6f9c2c133
+MISC ChangeLog 14034 SHA256 ea34329c35c2579e602da36533003e4702eb991adbd22b47370c1d2d5c87b2c4 SHA512 504d1903edbc58e6cf12bbd891674b62691673e516214217f8a3ecb19b52c9ae41d761f5a4824f0d74e59856ddd27197e5ab2ef01dd6572ee4530503ba719000 WHIRLPOOL e4142b89299cecdfc0b6a9ba89c8fcb3f8f74caddf2e44898c1d335966d26e65398567383fbed192d735e5bbb68eae5e42d5aa779ebb9a9bb1d6ad9d9293a025
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJROPvJAAoJEEqz6FtPBkyjgkEIALarm/PptPWRcGMhgttAluwJ
+alwcaaAsFuq+6+phTwo4fA1itHQdmzpyaFQ5oRN7Wt+9PVUv57tWuRO+hsTohG8i
+Ea4R1iKeK3IooZphS4Uxz4iPbc6r2lYzAQLuF01+65QUx4Bazq4T8iPa8Ww1thqk
+w6AmF8A5ocyTyca1akRbYHt/Mog0QMiszhILS318M6VdbKJfpTLqQvmGyDh+t+io
+KEfWWJT1CaXk/jyhAb5Vj8JmwOo381GrP0cvhtFl0trGOu1u6Oz1fxmjijKLbdyW
+QeUm0Nls47uFTZNmtxg4pYOfc9dDvQk/WtfYQAI7xP93TqIjAwXdsLP34Kt/i9Q=
+=f5Bq
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jython/files/jython-2.7_beta1-ant.patch b/dev-java/jython/files/jython-2.7_beta1-ant.patch
new file mode 100644
index 000000000000..c86cae894a92
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7_beta1-ant.patch
@@ -0,0 +1,28 @@
+--- jython-2.7-b1-sources/build.xml
++++ jython-2.7-b1-sources/build.xml
+@@ -508,6 +509,7 @@
+         </javac>
+ 
+         <!-- java files used by tests -->
++<!--
+         <javac srcdir="${test.source.dir}"
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+@@ -529,6 +531,7 @@
+             <compilerarg line="${javac.Xlint}"/>
+             <classpath refid="test.classpath" />
+         </javac>
++-->
+         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
+               todir="${compile.dir}/org/python/modules"
+               preservelastmodified="true" />
+@@ -826,9 +829,6 @@
+ 
+     <target name="copy-javalib" unless="full-build">
+         <copy todir="${dist.dir}/javalib">
+-            <fileset dir="${jython.base.dir}/extlibs">
+-                <exclude name="profile.properties"/>
+-            </fileset>
+             <fileset dir="${work.dir}/build">
+                 <include name="*.jar"/>
+                 <include name="*.properties"/>
diff --git a/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch b/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch
new file mode 100644
index 000000000000..326ef7f62afa
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7_beta1-dont-always-recompile-classes.patch
@@ -0,0 +1,11 @@
+--- a/src/org/python/core/imp.java
++++ b/src/org/python/core/imp.java
+@@ -228,7 +228,7 @@
+         }
+         if (testing && mtime != NO_MTIME) {
+             long time = ar.getMTime();
+-            if (mtime != time) {
++            if (mtime < time) {
+                 return null;
+             }
+         }
diff --git a/dev-java/jython/jython-2.7_beta1.ebuild b/dev-java/jython/jython-2.7_beta1.ebuild
new file mode 100644
index 000000000000..c44fcf78997a
--- /dev/null
+++ b/dev-java/jython/jython-2.7_beta1.ebuild
@@ -0,0 +1,169 @@
+# 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.7_beta1.ebuild,v 1.1 2013/03/07 20:42:45 radhermit Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2 python-utils-r1
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="+readline test"
+REQUIRED_USE="test? ( readline )"
+
+COMMON_DEP="
+	dev-java/antlr:3
+	dev-java/asm:4
+	dev-java/commons-compress:0
+	dev-java/guava:13
+	>=dev-java/java-config-2.1.11-r3
+	dev-java/jffi:1.2
+	dev-java/jline:0
+	dev-java/jnr-constants:0
+	dev-java/jnr-posix:2.1
+	dev-java/stringtemplate:0
+	dev-java/xerces:2
+	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
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4
+	)"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline,jnr-constants,script-api,servlet-api-2.5,stringtemplate,xerces-2"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+# 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"
+
+java_prepare() {
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	epatch "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
+	epatch "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
+	epatch "${FILESDIR}"/${P}-ant.patch
+	epatch "${FILESDIR}"/${P}-dont-always-recompile-classes.patch
+
+	if ! use readline; then
+		rm -v src/org/python/util/ReadlineConsole.java || die
+	fi
+
+	# needed for launchertest
+	chmod +x tests/shell/test-jython.sh || die
+}
+
+src_compile() {
+	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-2.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}\"" \
+		src/shell/jython || die
+
+	java-pkg-2_src_compile
+}
+
+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 \
+			-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
+	fi
+
+	# we need a wrapper to help python_optimize
+	cat <<-EOF > "${T}"/jython
+		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
+
+	# some of the class files end up with newer timestamps than the files they
+	# were generated from, make sure this doesn't happen
+	find "${ED}"/usr/share/jython-${SLOT}/Lib/ -name '*.class' | xargs touch
+}
+
+pkg_postinst() {
+	if ! has_version dev-java/jython ; then
+		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
+	fi
+}