[gentoo-commits] gentoo-x86 commit in dev-java/javacc: ChangeLog javacc-5.0.ebuild

[Miroslav Sulc (fordfrog)]

fordfrog    11/01/29 11:07:07

  Modified:             ChangeLog javacc-5.0.ebuild
  Log:
  dev-java/javacc: some fixes
  
  (Portage version: 2.1.9.35/cvs/Linux x86_64)

Revision  Changes    Path
1.33                 dev-java/javacc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	21 Mar 2010 15:32:57 -0000	1.32
+++ ChangeLog	29 Jan 2011 11:07:07 -0000	1.33
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/javacc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.32 2010/03/21 15:32:57 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.33 2011/01/29 11:07:07 fordfrog Exp $
+
+  29 Jan 2011; Miroslav Šulc <fordfrog@g.o> javacc-5.0.ebuild:
+  Did some fixes with regard to jdk version in the ebuild, but it still fails
+  tests
 
   21 Mar 2010; Pawel Hajdan jr <phajdan.jr@g.o> javacc-4.2.ebuild:
   x86 stable wrt bug #309265



1.2                  dev-java/javacc/javacc-5.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?r1=1.1&r2=1.2

Index: javacc-5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javacc-5.0.ebuild	16 Mar 2010 11:12:41 -0000	1.1
+++ javacc-5.0.ebuild	29 Jan 2011 11:07:07 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.1 2010/03/16 11:12:41 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.2 2011/01/29 11:07:07 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 EAPI="2"
@@ -16,18 +16,10 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 DEPEND=">=virtual/jdk-1.5
 	dev-java/junit:0
-	test? (
-		>=virtual/jdk-1.5
-		dev-java/ant-junit
-	)
-	!test? ( >=virtual/jdk-1.4 )"
-RDEPEND=">=virtual/jre-1.4
+	test? (	dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.5
 	dev-java/junit:0"
 
-# We don't want 1.5 bytecode just because of the testcase
-JAVA_PKG_WANT_TARGET="1.4"
-JAVA_PKG_WANT_SOURCE="1.4"
-
 S="${WORKDIR}/${PN}"
 
 java_prepare() {
@@ -40,12 +32,12 @@
 }
 
 src_compile() {
+	# this testcase wants 1.5 and this seems the easiest way to do it
+	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
 	_eant jar $(use_doc)
 }
 
 src_test() {
-	# this testcase wants 1.5 and this seems the easiest way to do it
-	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
 	ANT_TASKS="ant-junit" _eant test
 }