Revbump to fix jreload (bug #115551 by Paul T. Darga <pdarga@umich.edu>) and replace bundled part of jakarta-oro with dependency (bug #160861).

Package-Manager: portage-2.1.2

4 files changed, 131 insertions, 15 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 882b9e5210cd..f3f443e81364 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.44 2007/01/18 06:50:50 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.45 2007/01/18 15:40:20 caster Exp $
+
+*jython-2.1-r11 (18 Jan 2007)
+
+  18 Jan 2007; Vlastimil Babka <caster@gentoo.org> +jython-2.1-r11.ebuild:
+  Revbump to fix jreload (bug #115551 by Paul T. Darga <pdarga@umich.edu>) and
+  replace bundled part of jakarta-oro with dependency (bug #160861).
 
   16 Jan 2007; Stephanie Lockwood-Childs <wormo@gentoo.org>
   jython-2.1-r10.ebuild:
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index ebfcaa18592b..0f7e62e3a6d8 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.1-assert-SimpleCompiler.py.patch 504 RMD160 111d742b9eaf6f5801a01b33627d7e02acbc63ab SHA1 96876d3987c0a9f67e8b0de882516e3079a2de95 SHA256 bc7c86f2e0355c33cf3dee92be54b8174c3c69a468c59766d6706980ba9ad00f
 MD5 1e4744f437d774f1b51c1b96bac4c70d files/2.1-assert-SimpleCompiler.py.patch 504
 RMD160 111d742b9eaf6f5801a01b33627d7e02acbc63ab files/2.1-assert-SimpleCompiler.py.patch 504
@@ -22,14 +19,18 @@ EBUILD jython-2.1-r10.ebuild 2671 RMD160 699ae52cfa9e38ebe1ae14441cfc03fcd8a596e
 MD5 20d58246f2bec79bc6a68bdf923cb103 jython-2.1-r10.ebuild 2671
 RMD160 699ae52cfa9e38ebe1ae14441cfc03fcd8a596e8 jython-2.1-r10.ebuild 2671
 SHA256 ea0f821c1844d0fe34068d896ad7d0bf780186e5b2db22e5728503e8d4816a2a jython-2.1-r10.ebuild 2671
+EBUILD jython-2.1-r11.ebuild 2947 RMD160 823bd362ec5620f1b514b044ee27b3f92f4c598f SHA1 697d8ad53fc4deeeff5b67383ab73ca97baa47f5 SHA256 9efbdf4d2054337fd1c3693a63ca5abd8dca26f4e6597af96ffa4c86e506e789
+MD5 6df0076df6e9e8e363f0d889d8ddb1ab jython-2.1-r11.ebuild 2947
+RMD160 823bd362ec5620f1b514b044ee27b3f92f4c598f jython-2.1-r11.ebuild 2947
+SHA256 9efbdf4d2054337fd1c3693a63ca5abd8dca26f4e6597af96ffa4c86e506e789 jython-2.1-r11.ebuild 2947
 EBUILD jython-2.1-r6.ebuild 2189 RMD160 53ad838262f9f0d6afc70f4c268e962f1d606504 SHA1 8c8f515a497b9fa9a8a7e47793b91b356c06a833 SHA256 1f9eba23f1e61d8684a4e012472d6f6ec4dcfd0cf94ba54f2ca400aa858f8523
 MD5 4674bc206b05cbd6585c5097706c5606 jython-2.1-r6.ebuild 2189
 RMD160 53ad838262f9f0d6afc70f4c268e962f1d606504 jython-2.1-r6.ebuild 2189
 SHA256 1f9eba23f1e61d8684a4e012472d6f6ec4dcfd0cf94ba54f2ca400aa858f8523 jython-2.1-r6.ebuild 2189
-MISC ChangeLog 6150 RMD160 32d2946ab822d04d2b5888298ad50e171f61c44d SHA1 2aaea03d8106f80ba37bed3bf4110cd9cfb5a98e SHA256 6ae89f7e298b31c91f1fd1f3275ee83bb3b005711a7cb980ab34aefa85701a15
-MD5 6f4aa689882619f8ee2a3ab7d0b7a9a2 ChangeLog 6150
-RMD160 32d2946ab822d04d2b5888298ad50e171f61c44d ChangeLog 6150
-SHA256 6ae89f7e298b31c91f1fd1f3275ee83bb3b005711a7cb980ab34aefa85701a15 ChangeLog 6150
+MISC ChangeLog 6406 RMD160 d02e26724cc48c97e5b1e8e5fddf84b053b1bd68 SHA1 4c01879a90d150cd7329fc11a686cd4d8626f2bc SHA256 6f1c38cbce529490a6d00981ce82743273e9838ee265888712512ebec54014eb
+MD5 e936adcf008205405f7370dba1b7061f ChangeLog 6406
+RMD160 d02e26724cc48c97e5b1e8e5fddf84b053b1bd68 ChangeLog 6406
+SHA256 6f1c38cbce529490a6d00981ce82743273e9838ee265888712512ebec54014eb ChangeLog 6406
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -37,13 +38,9 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 6c329bf5dc5b1d3088b648a4ad8ba70a files/digest-jython-2.1-r10 238
 RMD160 6360d3bdd4d25f7a09f95f807b5047f30104c504 files/digest-jython-2.1-r10 238
 SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/digest-jython-2.1-r10 238
+MD5 6c329bf5dc5b1d3088b648a4ad8ba70a files/digest-jython-2.1-r11 238
+RMD160 6360d3bdd4d25f7a09f95f807b5047f30104c504 files/digest-jython-2.1-r11 238
+SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/digest-jython-2.1-r11 238
 MD5 6c329bf5dc5b1d3088b648a4ad8ba70a files/digest-jython-2.1-r6 238
 RMD160 6360d3bdd4d25f7a09f95f807b5047f30104c504 files/digest-jython-2.1-r6 238
 SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/digest-jython-2.1-r6 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFrJY1/NoSW7FuNV8RAubaAJ4xR10rIJ0v+LZvmXHLU4s+IBkmIwCeJQ7S
-lRZ0WJe9NZqsMc9t89RrvI0=
-=o8oD
------END PGP SIGNATURE-----
diff --git a/dev-java/jython/files/digest-jython-2.1-r11 b/dev-java/jython/files/digest-jython-2.1-r11
new file mode 100644
index 000000000000..430b21a5c3b2
--- /dev/null
+++ b/dev-java/jython/files/digest-jython-2.1-r11
@@ -0,0 +1,3 @@
+MD5 74f21a0185135396c71453bc279c179f jython-2.1.tar.bz2 1301528
+RMD160 94ae22604c1a816af7d066f2ed88b2abaf5c51d1 jython-2.1.tar.bz2 1301528
+SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 jython-2.1.tar.bz2 1301528
diff --git a/dev-java/jython/jython-2.1-r11.ebuild b/dev-java/jython/jython-2.1-r11.ebuild
new file mode 100644
index 000000000000..a68607160210
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r11.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r11.ebuild,v 1.1 2007/01/18 15:40:20 caster Exp $
+
+inherit base java-pkg-2
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+MY_PV="21"
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="JPython"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="readline source doc"
+# servlet
+
+CDEPEND="=dev-java/jakarta-oro-2.0*
+	readline? ( >=dev-java/libreadline-java-0.8.0 )"
+#	servlet? ( >=net-www/tomcat-5.0 )
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	source? ( app-arch/zip )
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-assert.patch
+	epatch ${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch
+
+	# bug #160861
+	rm -rf org/apache
+}
+
+
+src_compile() {
+	local cp="$(java-pkg_getjars jakarta-oro-2.0)"
+	local exclude=""
+
+	if use readline ; then
+		cp=${cp}:$(java-pkg_getjars libreadline-java)
+	else
+		exclude="${exclude} ! -name ReadlineConsole.java"
+	fi
+
+	#if use servlet; then
+	#	cp=${cp}:$(java-pkg_getjars servlet)
+	#else
+		exclude="${exclude} ! -name PyServlet.java"
+	#fi
+
+	ejavac -classpath ${cp} -nowarn $(find org -name "*.java" ${exclude})
+
+	find org -name "*.class" | xargs jar cf ${PN}.jar
+
+	# bug 115551
+	cd Lib/jxxload_help
+	ejavac -classpath ${S}/${PN}.jar -nowarn *.java
+	rm -f *.java Makefile
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
+
+	java-pkg_dolauncher jythonc \
+						--main "org.python.util.jython" \
+						--java_args "-Dpython.home=/usr/share/jython" \
+						--pkg_args "/usr/share/jython/tools/jythonc/jythonc.py"
+
+	java-pkg_dolauncher jython \
+						--main "org.python.util.jython" \
+						--java_args "-Dpython.home=/usr/share/jython"
+
+	dodir /usr/share/jython/cachedir
+	chmod a+rw ${D}/usr/share/jython/cachedir
+
+	rm Demo/jreload/example.jar
+	insinto /usr/share/${PN}
+	doins -r Lib Demo registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r Tools/*
+
+	use source && java-pkg_dosrc com org
+}
+
+pkg_postinst() {
+	if use readline; then
+		elog "To use readline you need to add the following to your registery"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "The global registry can be found in /usr/share/${PN}/registry"
+		elog "User registry in \$HOME/.jython"
+		elog "See http://www.jython.org/docs/registry.html for more information"
+		elog ""
+	fi
+
+	elog "This revision renames org.python.core.Py.assert to assert_."
+	elog "This is the solution that upstream will use in the next release."
+	elog "Just note that this revision is not API compatible with vanilla 2.1."
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=142099"
+}