fix deps, and source useflag support, small cleanup

(Portage version: 2.0.51.22-r1)

4 files changed, 22 insertions, 17 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 23dcc508d954..d1436b866641 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.28 2005/02/01 13:01:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.29 2005/07/09 16:07:21 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> rhino-1.5.5-r1.ebuild,
+  rhino-1.6.1-r1.ebuild:
+  fix deps, and source useflag support, small cleanup
 
   01 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> files/1.5.5_jdk15.patch:
   modified the recently added patch
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index 6ddb9f4f3668..de6bf1062847 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1,6 +1,6 @@
-MD5 1b9c3e4ae0426269156ee02c9459cb16 rhino-1.5.5-r1.ebuild 1335
-MD5 5eeeee81ebba44cbb1dfd00df9f064ca rhino-1.6.1-r1.ebuild 1362
-MD5 847ebd6191cf5acf0e7d85f767338e1a ChangeLog 3661
+MD5 cfdb5e3626d885ce0fce686020fa11dc rhino-1.5.5-r1.ebuild 1416
+MD5 92bc74b12ce4863869d5f3bbaf1f2544 rhino-1.6.1-r1.ebuild 1431
+MD5 c1cef1ecb1a7c34f20ed9ea1f66e2a1f ChangeLog 3813
 MD5 4622606981d4aa0930c917b65cf2f202 metadata.xml 350
 MD5 c663f3b82777d7ee2506dc0a03955198 files/jsscript 123
 MD5 6d48e39fc85ff462180102a36f8fc589 files/digest-rhino-1.5.5-r1 126
diff --git a/dev-java/rhino/rhino-1.5.5-r1.ebuild b/dev-java/rhino/rhino-1.5.5-r1.ebuild
index ec3f75d806dc..09db40fc66d3 100644
--- a/dev-java/rhino/rhino-1.5.5-r1.ebuild
+++ b/dev-java/rhino/rhino-1.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r1.ebuild,v 1.3 2005/01/31 22:44:55 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5.5-r1.ebuild,v 1.4 2005/07/09 16:07:21 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -11,11 +11,12 @@ HOMEPAGE="http://www.mozilla.org/rhino/"
 LICENSE="NPL-1.1"
 SLOT="1.5"
 KEYWORDS="x86 ppc amd64 sparc ppc64"
-IUSE="jikes doc"
+IUSE="jikes doc source"
 S="${WORKDIR}/${MY_P}"
 DEPEND="dev-java/ant-core
 	>=virtual/jdk-1.3
 	app-arch/unzip
+	source? ( app-arch/zip )
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3"
 
@@ -38,5 +39,6 @@ src_compile() {
 src_install() {
 	dobin ${FILESDIR}/jsscript
 	java-pkg_dojar build/*/js.jar
+	use source && java-pkg_dosrc {src,toolsrc}/org
 	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/rhino/rhino-1.6.1-r1.ebuild b/dev-java/rhino/rhino-1.6.1-r1.ebuild
index cbfe7d00e1d6..f08bd0b65a9b 100644
--- a/dev-java/rhino/rhino-1.6.1-r1.ebuild
+++ b/dev-java/rhino/rhino-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.6.1-r1.ebuild,v 1.1 2005/01/29 21:16:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.6.1-r1.ebuild,v 1.2 2005/07/09 16:07:21 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -11,14 +11,16 @@ HOMEPAGE="http://www.mozilla.org/rhino/"
 LICENSE="NPL-1.1"
 SLOT="1.6"
 KEYWORDS="~x86 ~amd64"
-IUSE="jikes doc"
+IUSE="jikes doc source"
 S="${WORKDIR}/${MY_P}"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/xml-xmlbeans-20041217"
 DEPEND="dev-java/ant-core
 	>=virtual/jdk-1.4
 	app-arch/unzip
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/xml-xmlbeans-20041217"
+	source? ( app-arch/zip )
+	jikes? ( dev-java/jikes )
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${MY_P}.zip
@@ -34,16 +36,13 @@ src_unpack() {
 
 src_compile() {
 	local antflags="jar"
-	if use jikes; then
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compilation error"
 }
 
 src_install() {
 	dobin ${FILESDIR}/jsscript
 	java-pkg_dojar build/*/js.jar
-	if use doc; then
-		java-pkg_dohtml -r docs/*
-	fi
+	use source && java-pkg_dosrc {src,toolsrc}/org
+	use doc && java-pkg_dohtml -r docs/*
 }