Remove java5 flag and make it unconditional.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 16 insertions, 18 deletions

diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog
index 5f6d9c7621cf..3cae2fcb48be 100644
--- a/dev-java/aspectwerkz/ChangeLog
+++ b/dev-java/aspectwerkz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/aspectwerkz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.30 2010/01/20 02:42:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.31 2010/02/21 00:33:17 caster Exp $
+
+  21 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  aspectwerkz-2.0_rc2-r3.ebuild, aspectwerkz-2.0.ebuild:
+  Remove java5 flag and make it unconditional.
 
   20 Jan 2010; Brent Baude <ranger@gentoo.org> aspectwerkz-2.0.ebuild:
   Marking aspectwerkz-2.0 ppc64 for bug 281006
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
index 6dafbdb95238..18213b143b0a 100644
--- a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild,v 1.5 2010/01/20 02:42:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild,v 1.6 2010/02/21 00:33:17 caster Exp $
 
 EAPI=2
 
-JAVA_PKG_IUSE="doc java5 source"
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -27,12 +27,10 @@ COMMON_DEP="
 	dev-java/qdox:1.6
 	dev-java/junit:0"
 RDEPEND="
-	!java5? ( >=virtual/jre-1.4 )
-	java5? ( >=virtual/jre-1.5 )
+	>=virtual/jre-1.5
 	${COMMON_DEP}"
 DEPEND="
-	!java5? ( >=virtual/jdk-1.4 )
-	java5? ( >=virtual/jdk-1.5 )
+	>=virtual/jdk-1.5
 	${COMMON_DEP}
 	app-arch/unzip"
 
@@ -54,8 +52,7 @@ java_prepare() {
 }
 
 _eant() {
-	local antflags
-	use java5 && antflags="-Djava.version=1.5" || antflags="-Djava.version=1.4"
+	local antflags="-Djava.version=1.5"
 	eant ${antflags} "${@}"
 
 }
diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild
index 110b2da4b04b..800da009795d 100644
--- a/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild
+++ b/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild,v 1.4 2008/10/25 17:23:14 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0_rc2-r3.ebuild,v 1.5 2010/02/21 00:33:17 caster Exp $
 
 EAPI=1
 # no rewriting required since we patch build.xml to contain target/source
 JAVA_PKG_BSFIX="off"
-JAVA_PKG_IUSE="java5 source"
+JAVA_PKG_IUSE="source"
 
 inherit java-pkg-2 eutils java-ant-2
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://aspectwerkz.codehaus.org"
 LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="amd64 ppc ~ppc64 x86"
-RDEPEND=">=virtual/jre-1.3
+RDEPEND=">=virtual/jre-1.5
 	dev-java/asm:1.5
 	dev-java/concurrent-util:0
 	dev-java/dom4j:1
@@ -23,8 +23,7 @@ RDEPEND=">=virtual/jre-1.3
 	dev-java/junit:0
 	dev-java/trove:0
 	dev-java/qdox:1.6"
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( >=virtual/jdk-1.3 )
+DEPEND=">=virtual/jdk-1.5
 	${RDEPEND}
 	app-arch/unzip"
 IUSE=""
@@ -54,9 +53,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local antflags
-	use "!java5" && antflags="-Dnojdk15=true"
-	eant ${antflags} dist || die "eant failed"
+	eant dist || die "eant failed"
 }
 
 src_install() {