More assert fixes to fix bug #146868. Thanks to Joel <joel_123@hotmail.com> for the patch.

Package-Manager: portage-2.1.1

5 files changed, 135 insertions, 9 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 58e582a0c4e6..f61eb1774d73 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.32 2006/07/29 21:29:58 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.33 2006/09/09 21:44:59 betelgeuse Exp $
+
+*jython-2.1-r9 (09 Sep 2006)
+
+  09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/2.1-assert-SimpleCompiler.py.patch, +jython-2.1-r9.ebuild:
+  More assert fixes to fix bug #146868. Thanks to Joel <joel_123@hotmail.com>
+  for the patch.
 
 *jython-2.1-r8 (29 Jul 2006)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index bddce3398e64..16017184ea1e 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,6 +1,10 @@
 -----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
+SHA256 bc7c86f2e0355c33cf3dee92be54b8174c3c69a468c59766d6706980ba9ad00f files/2.1-assert-SimpleCompiler.py.patch 504
 AUX 2.1-assert.patch 2052 RMD160 6d9696543b015511c3e041e02fd7cd68eec70c99 SHA1 dbedce9e606a8c4daf0455a8d6b18ca056e1f8b3 SHA256 b7f491be967853107f47a7b7da489a66ae7c8acedc9d51261b3999ba4f877567
 MD5 7692e4db4ba06e6547d2c7d3bd491935 files/2.1-assert.patch 2052
 RMD160 6d9696543b015511c3e041e02fd7cd68eec70c99 files/2.1-assert.patch 2052
@@ -26,10 +30,14 @@ EBUILD jython-2.1-r8.ebuild 2630 RMD160 3dc16d1202dfa98fd81cf15dedcc4fd09f4c6dc9
 MD5 1af517b7d205c23a5676ea536433d9c5 jython-2.1-r8.ebuild 2630
 RMD160 3dc16d1202dfa98fd81cf15dedcc4fd09f4c6dc9 jython-2.1-r8.ebuild 2630
 SHA256 c3817e8dd09c79d174731b16f1ff099f5feb1c1d3a86337d4bc47cf4c0c4e90a jython-2.1-r8.ebuild 2630
-MISC ChangeLog 4314 RMD160 24a1078abe5d4f969e0a1ddc4b90389f9c259f16 SHA1 f9e4e3f81bfcfb10022bf7934eed272b0791f207 SHA256 32b6cb6aaae4408a2beeebbfeb537a12fc93e9c3fc30f3d04f98695be120b64a
-MD5 f9913bae541d054d29576fdcba8b500f ChangeLog 4314
-RMD160 24a1078abe5d4f969e0a1ddc4b90389f9c259f16 ChangeLog 4314
-SHA256 32b6cb6aaae4408a2beeebbfeb537a12fc93e9c3fc30f3d04f98695be120b64a ChangeLog 4314
+EBUILD jython-2.1-r9.ebuild 2680 RMD160 e0cd63e06a5dc786dfabbe412f9474f1f6b2388e SHA1 06d9eae5da395fa8a2e03d2a47f8c2f0c47beffd SHA256 7ba74422a8f7dd0f152aeef4e34324888dcb9ef36f3d1bdccb357d2e2cb9bde7
+MD5 e84030302addba5e601123b0093aa491 jython-2.1-r9.ebuild 2680
+RMD160 e0cd63e06a5dc786dfabbe412f9474f1f6b2388e jython-2.1-r9.ebuild 2680
+SHA256 7ba74422a8f7dd0f152aeef4e34324888dcb9ef36f3d1bdccb357d2e2cb9bde7 jython-2.1-r9.ebuild 2680
+MISC ChangeLog 4561 RMD160 ccb81f30f6697f78ed0fd34fabeb72db8fc3b3d9 SHA1 92e52d5394652f10ed2978e4798b59b0069e9542 SHA256 4db4e13ff71ba4511d377a37914ddccfdb946300561c4e049d942b3fd8e03895
+MD5 b61d06c66d3b41f112e0038ee09ae82b ChangeLog 4561
+RMD160 ccb81f30f6697f78ed0fd34fabeb72db8fc3b3d9 ChangeLog 4561
+SHA256 4db4e13ff71ba4511d377a37914ddccfdb946300561c4e049d942b3fd8e03895 ChangeLog 4561
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -43,10 +51,13 @@ SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/di
 MD5 6c329bf5dc5b1d3088b648a4ad8ba70a files/digest-jython-2.1-r8 238
 RMD160 6360d3bdd4d25f7a09f95f807b5047f30104c504 files/digest-jython-2.1-r8 238
 SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/digest-jython-2.1-r8 238
+MD5 6c329bf5dc5b1d3088b648a4ad8ba70a files/digest-jython-2.1-r9 238
+RMD160 6360d3bdd4d25f7a09f95f807b5047f30104c504 files/digest-jython-2.1-r9 238
+SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/digest-jython-2.1-r9 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEy9NmcxLzpIGCsLQRAkI/AJ41f2Dewt/mHOhTauOgjIL8NbcbZQCdEDPw
-iQUlorAOj08/HwrVOoYfZu8=
-=/Bd6
+iD8DBQFFAzX0cxLzpIGCsLQRAjTyAKCBGRLXxxeMVNsAkCkHmj5cAz3eLACfRdVm
+uQex7AK6+dgiuVd++qtsEzY=
+=zkQw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch b/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch
new file mode 100644
index 000000000000..55e154999195
--- /dev/null
+++ b/dev-java/jython/files/2.1-assert-SimpleCompiler.py.patch
@@ -0,0 +1,11 @@
+--- jython-2.1/Tools/jythonc/SimpleCompiler.py.orig	2006-09-08 13:21:29.000000000 -0600
++++ jython-2.1/Tools/jythonc/SimpleCompiler.py	2006-09-08 13:22:15.000000000 -0600
+@@ -577,7 +577,7 @@
+             args.append(message.asAny())
+ 
+         return jast.If(self.frame.getglobal("__debug__").nonzero(),
+-                       jast.InvokeStatic("Py", "assert", args))
++                       jast.InvokeStatic("Py", "assert_", args))
+ 
+     def return_stmt(self, value=None):
+         if value is None:
diff --git a/dev-java/jython/files/digest-jython-2.1-r9 b/dev-java/jython/files/digest-jython-2.1-r9
new file mode 100644
index 000000000000..430b21a5c3b2
--- /dev/null
+++ b/dev-java/jython/files/digest-jython-2.1-r9
@@ -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-r9.ebuild b/dev-java/jython/jython-2.1-r9.ebuild
new file mode 100644
index 000000000000..0080186d538d
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r9.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r9.ebuild,v 1.1 2006/09/09 21:44:59 betelgeuse 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="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+IUSE="readline source doc"
+# servlet
+
+RDEPEND=">=virtual/jre-1.2
+	readline? ( >=dev-java/libreadline-java-0.8.0 )"
+#	servlet? ( >=net-www/tomcat-5.0 )
+DEPEND=">=virtual/jdk-1.2
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+PATCHES="${FILESDIR}/${PV}-assert.patch
+	${FILESDIR}/${PV}-assert-SimpleCompiler.py.patch"
+
+src_compile() {
+	local cp="."
+	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
+}
+
+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
+		einfo "To use readline you need to add the following to your registery"
+		einfo
+		einfo "python.console=org.python.util.ReadlineConsole"
+		einfo "python.console.readlinelib=GnuReadline"
+		einfo
+		einfo "The global registry can be found in /usr/share/${PN}/registry"
+		einfo "User registry in \$HOME/.jython"
+		einfo "See http://www.jython.org/docs/registry.html for more information"
+		einfo ""
+	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"
+}