Fixes #25533. Ebuild submitted by Chris Aniszczyk <zx@mea-culpa.net>. Moved 2.1-r1 to stable, Removed 2.1.

6 files changed, 52 insertions, 39 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 8ac2e45b7f59..745fd25e0440 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jython
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.2 2003/05/14 03:41:53 tberman Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.3 2004/01/17 16:03:14 strider Exp $
+
+*jython-2.1-r2 (17 Jan 2004)
+
+  17 Jan 2004; Adrian Almenar <strider@gentoo.org> jython-2.1-r1.ebuild,
+  jython-2.1-r2.ebuild, jython-2.1.ebuild:
+  Fixes #25533. Ebuild submitted by Chris Aniszczyk <zx@mea-culpa.net>. Moved
+  2.1-r1 to stable, Removed 2.1.
 
 *jython-2.1-r1 (13 May 2003)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index c1e528f2e5a6..753550f4f793 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,8 +1,10 @@
-MD5 012d2fb8b3917ed717e572b763613aea ChangeLog 555
-MD5 9e8a9dadec50d443c25736682ea1f536 jython-2.1.ebuild 751
 MD5 daeb10f75706a35ea32bd00acdaac55b jython-2.1-r1.ebuild 935
+MD5 9e8a9dadec50d443c25736682ea1f536 jython-2.1.ebuild 751
+MD5 9ed320f18c2d191f849ec54e8243aaf7 jython-2.1-r2.ebuild 869
+MD5 012d2fb8b3917ed717e572b763613aea ChangeLog 555
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1 61
-MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r1 61
-MD5 bc766076fc74f87782c093215e1fe1af files/jython 296
 MD5 735d15b2adcc2db8fdb6bac62fd847b7 files/jythonc 211
+MD5 bc766076fc74f87782c093215e1fe1af files/jython 296
+MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r1 61
+MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r2 61
+MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1 61
diff --git a/dev-java/jython/files/digest-jython-2.1 b/dev-java/jython/files/digest-jython-2.1-r2
index de8e46ef8258..de8e46ef8258 100644
--- a/dev-java/jython/files/digest-jython-2.1
+++ b/dev-java/jython/files/digest-jython-2.1-r2
diff --git a/dev-java/jython/jython-2.1-r1.ebuild b/dev-java/jython/jython-2.1-r1.ebuild
index acf9ac67902b..a12c6f0054b3 100644
--- a/dev-java/jython/jython-2.1-r1.ebuild
+++ b/dev-java/jython/jython-2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r1.ebuild,v 1.4 2004/01/17 16:03:14 strider Exp $
 
 DESCRIPTION="Java Python implementation"
 
@@ -10,7 +10,7 @@ MY_PV="21"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
 LICENSE="JPython"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 -*"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.2"
diff --git a/dev-java/jython/jython-2.1-r2.ebuild b/dev-java/jython/jython-2.1-r2.ebuild
new file mode 100644
index 000000000000..b9d947025e4b
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r2.ebuild,v 1.1 2004/01/17 16:03:14 strider Exp $
+
+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"
+LICENSE="JPython"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.2"
+
+src_unpack() {
+	addwrite .hotspot
+	cd ${DISTDIR}
+	java ${PN}-${MY_PV} -o ${S}/ demo lib source
+
+}
+
+src_install() {
+	dojar jython.jar
+	dodoc {README,LICENSE}.txt NEWS ACKNOWLEDGMENTS
+	dohtml -A .css .jpg .gif -r Doc
+	dobin ${FILESDIR}/jython
+	dobin ${FILESDIR}/jythonc
+
+	cp -R Lib/* ${D}/usr/share/${PN}/lib/
+	mkdir ${D}/usr/share/${PN}/tools/
+	cp -R Tools/* ${D}/usr/share/${PN}/tools/
+}
diff --git a/dev-java/jython/jython-2.1.ebuild b/dev-java/jython/jython-2.1.ebuild
deleted file mode 100644
index 9f780325ffc4..000000000000
--- a/dev-java/jython/jython-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
-
-DESCRIPTION="Java Python implementation"
-
-# Homepage, not used by Portage directly but handy for developer reference
-HOMEPAGE="http://www.jython.org"
-MY_PV="21"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
-LICENSE="JPython"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.2
-	>=app-arch/unzip-5.50-r1"
-
-src_unpack() {
-
-	unzip ${DISTDIR}/${PN}-${MY_PV}.class -d ${S}/
-
-}
-
-src_install() {
-	dojar jython.jar
-	dodoc README.txt NEWS ACKNOWLEDGMENTS LICENSE.txt
-	dohtml -A .css .jpg .gif -r Doc
-}