fix 94099: unpackable class. 97665: use doc useflag for javadocs

(Portage version: 2.0.51.22-r1)

4 files changed, 13 insertions, 25 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 1dde73f65523..cfbaa17e4a67 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.25 2005/06/29 17:27:46 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.26 2005/07/01 23:03:46 axxo Exp $
+
+  01 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jython-2.1-r6.ebuild:
+  fix 94099: unpackable class. 97665: use doc useflag for javadocs
 
 *jython-2.1-r6 (29 Jun 2005)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 243bb3195236..e2dca2647993 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 119f0e9195221d578a4640a313efb2e4 jython-2.1-r6.ebuild 2301
+MD5 950a5dd11318823225514b2af24b9911 jython-2.1-r6.ebuild 2183
 MD5 95f7fe3b0f66486371ace15a528eea9a ChangeLog 3247
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 17272ca5f12bd9bb307210c12606d526 files/jythonc 67
 MD5 b271f5441bb93491ead9f78332393451 files/jython 363
-MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r6 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwtor/rLF9B432nYRAmCoAKCm+aBHN6tGUmgkaYYXvh1nuqn2kwCgtsNQ
-FySHv7LcSWYxXvMlU0VxKU8=
-=n16P
------END PGP SIGNATURE-----
+MD5 d38ea464f1cad146456318d7ee87319a files/digest-jython-2.1-r6 64
diff --git a/dev-java/jython/files/digest-jython-2.1-r6 b/dev-java/jython/files/digest-jython-2.1-r6
index de8e46ef8258..7f3b7891320b 100644
--- a/dev-java/jython/files/digest-jython-2.1-r6
+++ b/dev-java/jython/files/digest-jython-2.1-r6
@@ -1 +1 @@
-MD5 e3e6be56646fb7cd6d19a6a69bd76e2f jython-21.class 2780547
+MD5 74f21a0185135396c71453bc279c179f jython-2.1.tar.bz2 1301528
diff --git a/dev-java/jython/jython-2.1-r6.ebuild b/dev-java/jython/jython-2.1-r6.ebuild
index 3e7c47217ddf..ea0c3fb73b48 100644
--- a/dev-java/jython/jython-2.1-r6.ebuild
+++ b/dev-java/jython/jython-2.1-r6.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r6.ebuild,v 1.1 2005/06/29 17:27:46 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r6.ebuild,v 1.2 2005/07/01 23:03:46 axxo Exp $
 
 inherit java-pkg
 
 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://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 jikes"
+IUSE="readline jikes doc"
 # servlet
 
 DEPEND=">=virtual/jdk-1.2
@@ -19,12 +20,6 @@ DEPEND=">=virtual/jdk-1.2
 	jikes? ( >=dev-java/jikes-1.18 )"
 #	servlet? ( >=net-www/tomcat-5.0 )
 
-src_unpack() {
-	cp ${DISTDIR}/${A} ${WORKDIR}
-	cd ${WORKDIR}
-	`java-config -J` -classpath . ${PN}-${MY_PV} -o ${S}/ demo lib source || die "unpack failed"
-}
-
 src_compile() {
 	javac=$(java-config -c)
 	if use jikes ; then
@@ -54,8 +49,8 @@ src_compile() {
 src_install() {
 	java-pkg_newjar jython-${PV}.jar ${PN}.jar || die "install failed"
 
-	dodoc {README,LICENSE}.txt NEWS ACKNOWLEDGMENTS
-	java-pkg_dohtml -A .css .jpg .gif -r Doc
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && java-pkg_dohtml -A .css .jpg .gif -r Doc/*
 	newbin ${FILESDIR}/jython jython
 	newbin ${FILESDIR}/jythonc jythonc