summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-05-23 22:48:44 +0000
committerJames Le Cuirot <chewi@gentoo.org>2015-05-23 22:48:44 +0000
commit49a55f23ad78917cfbb722872749be52c8f3dd9a (patch)
tree4883dfd1faa94f95c756b1388d810a4693158f9b /dev-java/ant-core
parentRemove dev-python/pyudev entry. Signed off by floppym. (diff)
downloadgentoo-2-49a55f23ad78917cfbb722872749be52c8f3dd9a.tar.gz
gentoo-2-49a55f23ad78917cfbb722872749be52c8f3dd9a.tar.bz2
gentoo-2-49a55f23ad78917cfbb722872749be52c8f3dd9a.zip
Allow building with gcj-jdk for bootstrapping icedtea. This used to be
implied by >=virtual/jdk-1.5 but the 1.5 virtual went away long ago. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'dev-java/ant-core')
-rw-r--r--dev-java/ant-core/ChangeLog8
-rw-r--r--dev-java/ant-core/ant-core-1.9.2.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index a323763b2b2d..4bc18a1ad1e2 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ant-core
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.134 2014/08/10 20:07:23 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.135 2015/05/23 22:48:44 chewi Exp $
+
+ 23 May 2015; James Le Cuirot <chewi@gentoo.org> ant-core-1.9.2.ebuild:
+ Allow building with gcj-jdk for bootstrapping icedtea. This used to be implied
+ by >=virtual/jdk-1.5 but the 1.5 virtual went away long ago.
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ant-core-1.7.1-r4.ebuild,
ant-core-1.7.1-r5.ebuild, ant-core-1.8.0-r1.ebuild, ant-core-1.8.0-r2.ebuild,
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 48294ae3687b..17c0d20d5ee5 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.8 2014/08/10 20:07:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.9 2015/05/23 22:48:44 chewi Exp $
EAPI="5"
@@ -24,7 +24,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND=">=virtual/jdk-1.5
+DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
!dev-java/ant-tasks
!dev-java/ant-optional"
RDEPEND="${DEPEND}"