Remove java5 flag and make it unconditional.

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

5 files changed, 23 insertions, 22 deletions

diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 7c3516b4ec5c..dc5f4f9d062d 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -2,7 +2,10 @@ AUX 1.7.1-ant-r1 6239 RMD160 f942c93807c332ad348a3e7d4c234940f3e02c5a SHA1 5b1c2
 AUX 1.7.1-jdk4-javadoc.patch 2026 RMD160 4354a94c8af1e139b343711db51c3d9cf49c00d4 SHA1 9ab01272af7e5edd0d57f385334a95ed238d66c4 SHA256 ef26b648797b6da33fa08c5110a2d7e1377c716349a38922e63638ba4cb6e096
 AUX 1.7.1-pkg-info.patch 9325 RMD160 1ea5ce708bbb5dd3815f1eadc7cba3b3d0dc5db4 SHA1 ac8d14e9090a02060f44999673888c1431b203b2 SHA256 43041836e2ed4e883e6878649f4e43f6cc8399f9bae79b8de49c48b773ec7b06
 DIST ant-1.7.1-gentoo.tar.bz2 11836 RMD160 9194996b5b04113d2a6542221890e1ef3f7953d0 SHA1 ef848268ec2b7ecd9aca2f8a3d6705ec8386a621 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5
+DIST ant-1.8.0-gentoo.tar.bz2 13993 RMD160 7cb9e22b7d6a5648e00ba8954fb8ffe61a02f0f4 SHA1 85b3187e80ee8e96aaf3bfb756ce00c2da6eaaba SHA256 12edd6ccfe9f4add90024e82ba1fc6dda141a04d97d800b860347c3d21007acb
 DIST apache-ant-1.7.1-src.tar.bz2 6979386 RMD160 09ff510a9801c734689db23e66ccf353b7361824 SHA1 8a468d3ce1e84739a78f779770416a8bd502eaf5 SHA256 4dc49a7260ef90a6dc6611b7e96b9f047d507589736d4a2ad6efbe3edfc6fba6
+DIST apache-ant-1.8.0-src.tar.bz2 7122981 RMD160 8cabc5302330b5321a33e7da416de1df3627287a SHA1 f7bb4c58967cebd499b250bda0ae862d496260e1 SHA256 b1da647175784c9e0113b8e76643c89123396b5f1d0ad54417390a92e02e6786
 EBUILD ant-core-1.7.1-r4.ebuild 2913 RMD160 943b6fa28c7150d5de626bd586d3bbd32fbdc3c4 SHA1 786659fec0fc58cccfb38e6864efe2fd06ec48db SHA256 3f34a5e546ad31d3c46e349c9a34f30029247bcba01454ec75ab526d53086088
-MISC ChangeLog 28484 RMD160 e24581c7fc4c78af1b35992e4a2e3daa9570171e SHA1 460d728ab5b4e026f8f9d53bb777e4c045860d5b SHA256 e05335bf1c23caf37c829a416cc157b0416d00820cb2661ee25847889515b3b0
+EBUILD ant-core-1.8.0.ebuild 2811 RMD160 fc878251a1d83ef90508a9e0bb0b1e409b04c22a SHA1 f3444cddab3c257bb62df4dd5575bac17d22eaba SHA256 6eeb816d5cf1fd8263e3bd79e9ae1cb72d06a8e148106374dca635e90fadbbfc
+MISC ChangeLog 28620 RMD160 0ba3b420300effb2e073bc553f161b2358182313 SHA1 fe251a00135c7cc283c6a8a7466f47592ee74bc5 SHA256 94bbbcf3940dbc7584ffa518610ffda7199ee0ce934612e2dd6b074ad34bbcbc
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
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() {