Remove java5 flag and make it unconditional.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 19 insertions, 21 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/Manifest b/dev-java/aspectwerkz/Manifest
index 6bde96cb1eb6..683e4bccf9ec 100644
--- a/dev-java/aspectwerkz/Manifest
+++ b/dev-java/aspectwerkz/Manifest
@@ -3,7 +3,7 @@ AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 RMD160 5f103ae10c843b0ebcf5f3e92f9a733
 AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 RMD160 ced2ad2d092e45c3671a1ddba8cf2868c90128c6 SHA1 d38a973cafca86a1b4c5794b1c4d53c3d52c1f56 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de
 DIST aspectwerkz-2.0.RC2.zip 9758873 RMD160 75fce715072b274432d8dee8b751675399f9e96b SHA1 fcbc31d1ee7073b7f561c3a84d0d327fe35a6cb6 SHA256 ca3786ee34d7b339bee93944a1c136dcb2aaf783fd60ea88948c3bf19894e1a8
 DIST aspectwerkz-2.0.zip 14166266 RMD160 f4ec7306a3d8054dc5e4f639e84d856999b06d48 SHA1 b7ec22eda02610b63fa1842080b0326b138d77dc SHA256 6d0f94338539dd0cbb0837337f65a64f65495a4194647e93fa96b27829ba9b46
-EBUILD aspectwerkz-2.0.ebuild 1786 RMD160 523e4af65e6497c5cad29f5af074ac511c5e619c SHA1 4259a27e8d6ecfa3af57cdd459a8375d24e1b283 SHA256 7358efacd84b9a9731e522a19a31fee5ff0d191d0a27d28ee279df603552d6ab
-EBUILD aspectwerkz-2.0_rc2-r3.ebuild 1637 RMD160 a668732ede8c7c18f47a8d2ea48b8766858d0963 SHA1 7795ee631c1f7256f1f445d9c970d69acd879358 SHA256 8f6462855d5de1e686ca7d405fd9ec59b0faacb5ce57cc850de0e19cb4f4df2b
-MISC ChangeLog 4670 RMD160 4359f87d9db639184bcddb732f20d1ced1294a1f SHA1 d6008d4f4ce9e85e92fd1cebe9799a8851434ada SHA256 24afdc7fb3dee3533a3f08325758128207a7e12f342ccc37babce00483f0c34d
+EBUILD aspectwerkz-2.0.ebuild 1640 RMD160 e4ca93a954817e20314cb9dc04d06fa87bd7922f SHA1 9dc0421a2a3e4e5b5c067717cbe5938e14212500 SHA256 f4d1c0e710f110c29bed8b980956d08e05287bb3185f9173f73e282d721eb94f
+EBUILD aspectwerkz-2.0_rc2-r3.ebuild 1518 RMD160 1c41a40e52ab8dcec6888403e45dff30b45ca4c2 SHA1 c771b956bfe5b5ddc35f4e3f7c332cb4496e2305 SHA256 e143586b79a9038eaa19be24042b8daf7b619834cda7b701172576359288d738
+MISC ChangeLog 4826 RMD160 cce824bdf8059c1e53ced94f892ebece2e7e595c SHA1 bfc1a4885634a48a2d58922bbe10669920664f49 SHA256 757bf2fbc19489c460eaa02920a3849290429d150aa90120acc5f36707dc48da
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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() {