Revbump to ensure everyone has bug #147243 (caused by java-utils-2.eclass) fixed. Also sanitized dolauncher parameters quoting. Thanks to Joel <joel_123@hotmail.com> for reporting.

Package-Manager: portage-2.1.1

4 files changed, 116 insertions, 5 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 07ea18703c40..9176b2f1617f 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.34 2006/09/11 00:08:08 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.35 2006/09/12 08:05:16 caster Exp $
+
+*jython-2.1-r10 (12 Sep 2006)
+
+  12 Sep 2006; Vlastimil Babka <caster@gentoo.org> +jython-2.1-r10.ebuild:
+  Revbump to ensure everyone has bug #147243 (caused by java-utils-2.eclass)
+  fixed. Also sanitized dolauncher parameters quoting. Thanks to Joel
+  <joel_123@hotmail.com> for reporting.
 
   11 Sep 2006; Joshua Nichols <nichoj@gentoo.org> jython-2.1-r9.ebuild:
   Added ~ia64 keywords.
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index b1efe080a4cc..7de01e1378f9 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -15,6 +15,10 @@ MD5 17272ca5f12bd9bb307210c12606d526 files/jythonc 67
 RMD160 190b3f91e7fc27e341bc50514342d1c74521e4ec files/jythonc 67
 SHA256 f2318d7ff7287d9563d2615c2c50833a88c8db64e1f898e9f2429a302074d011 files/jythonc 67
 DIST jython-2.1.tar.bz2 1301528 RMD160 94ae22604c1a816af7d066f2ed88b2abaf5c51d1 SHA1 16fea6f4515bda49d17abd0d3d52e2100eeb7fc0 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2
+EBUILD jython-2.1-r10.ebuild 2681 RMD160 4ae721a245bfb6a80525bd42cec3f893a94a0cb7 SHA1 b694b3c7c9bc20b7ca025d774b8d73141466ffaf SHA256 a5375f024f4f76ebfdec0625edfaeae3c944a56386766ffd468998f4c7951715
+MD5 c2f81176162fd7b879c6b41388e1ee91 jython-2.1-r10.ebuild 2681
+RMD160 4ae721a245bfb6a80525bd42cec3f893a94a0cb7 jython-2.1-r10.ebuild 2681
+SHA256 a5375f024f4f76ebfdec0625edfaeae3c944a56386766ffd468998f4c7951715 jython-2.1-r10.ebuild 2681
 EBUILD jython-2.1-r6.ebuild 2201 RMD160 a00a9766dcbc43f3b464c9c79fa17ae606a6beef SHA1 61ab8cedf4fc067424d1267713d2d7f8101b1f81 SHA256 867632ec5ab5009921a9ab5b42c695dca20de87271701fd43cfe0c3a1874d2ad
 MD5 02c534c759bb9d71a3e9893971e0d9e1 jython-2.1-r6.ebuild 2201
 RMD160 a00a9766dcbc43f3b464c9c79fa17ae606a6beef jython-2.1-r6.ebuild 2201
@@ -31,14 +35,17 @@ EBUILD jython-2.1-r9.ebuild 2682 RMD160 d28e4f1b4f28c449eb6d6f7b0677db08bc60f51d
 MD5 269127ccf967784de95629807d7a3923 jython-2.1-r9.ebuild 2682
 RMD160 d28e4f1b4f28c449eb6d6f7b0677db08bc60f51d jython-2.1-r9.ebuild 2682
 SHA256 d8a6d5c264b45fc5f17f54cc16f13f3dd5863981fc5887c405c2ccb72fe7d97e jython-2.1-r9.ebuild 2682
-MISC ChangeLog 4654 RMD160 d9c0dfd84b1a1a8dde8fa3eaaa068f8dc8b12188 SHA1 f0ddab7fb92cb7561052303764e06fbba5c3ac6a SHA256 db2d50ef527d8a94fa9642288d4205db94b7a0642b92b992cdcb48eb2cc552bd
-MD5 79a517f3cd8b0d9f2cb079fa365452de ChangeLog 4654
-RMD160 d9c0dfd84b1a1a8dde8fa3eaaa068f8dc8b12188 ChangeLog 4654
-SHA256 db2d50ef527d8a94fa9642288d4205db94b7a0642b92b992cdcb48eb2cc552bd ChangeLog 4654
+MISC ChangeLog 4948 RMD160 94da935a820d9d92ae41b72a0f017056838f0809 SHA1 a6551105f7e7eb507c65a0f4f371174ec1fecd2b SHA256 3d9a37071e39c0b8e307e93ea68001a1f619ccd2c08c50ad5cefc2e92672b61b
+MD5 009288f3203204713e33887b05fca4dd ChangeLog 4948
+RMD160 94da935a820d9d92ae41b72a0f017056838f0809 ChangeLog 4948
+SHA256 3d9a37071e39c0b8e307e93ea68001a1f619ccd2c08c50ad5cefc2e92672b61b ChangeLog 4948
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+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-r6 238
 RMD160 6360d3bdd4d25f7a09f95f807b5047f30104c504 files/digest-jython-2.1-r6 238
 SHA256 b97b88c0de79eb3d149576a4873543d3bfa53df57a09105d6d7132bcb6a5e65b files/digest-jython-2.1-r6 238
diff --git a/dev-java/jython/files/digest-jython-2.1-r10 b/dev-java/jython/files/digest-jython-2.1-r10
new file mode 100644
index 000000000000..430b21a5c3b2
--- /dev/null
+++ b/dev-java/jython/files/digest-jython-2.1-r10
@@ -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-r10.ebuild b/dev-java/jython/jython-2.1-r10.ebuild
new file mode 100644
index 000000000000..cef16b781e6f
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r10.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-r10.ebuild,v 1.1 2006/09/12 08:05:16 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 ~sparc ~x86"
+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"
+}