diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-07-05 10:44:47 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-07-05 10:44:47 +0000 |
| commit | 9c542a18b2b3fd25e6ba8a70f969ad8f9d670936 (patch) | |
| tree | 0ee2d62868c0d208192938df47c3048e52ad489a /eclass | |
| parent | Added new ebuild for dev-java/bcpg, a dependency of =dev-java/ant-ivy-2.3.0. (diff) | |
| download | gentoo-2-9c542a18b2b3fd25e6ba8a70f969ad8f9d670936.tar.gz gentoo-2-9c542a18b2b3fd25e6ba8a70f969ad8f9d670936.tar.bz2 gentoo-2-9c542a18b2b3fd25e6ba8a70f969ad8f9d670936.zip | |
Update ant-tasks for 1.9.1 version bump, needs 1.5 as minimal JDK / JRE version.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/ant-tasks.eclass | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 72fa1353614d..5bc021983a41 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.870 2013/07/03 09:22:39 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.871 2013/07/05 10:44:47 tomwij Exp $ + + 05 Jul 2013; Tom Wijsman <TomWij@gentoo.org> ant-tasks.eclass: + Update ant-tasks for 1.9.1 version bump, needs 1.5 as minimal JDK / JRE version. 03 Jul 2013; Michael Palimaka <kensington@gentoo.org> kde4-functions.eclass: Deprecate EAPI 3. diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass index 7155cddd23de..3a2a95cd3e58 100644 --- a/eclass/ant-tasks.eclass +++ b/eclass/ant-tasks.eclass @@ -3,7 +3,7 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later # Author Vlastimil Babka <caster@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.13 2012/06/01 12:19:42 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.14 2013/07/05 10:44:47 tomwij Exp $ # we set ant-core dep ourselves, restricted JAVA_ANT_DISABLE_ANT_CORE_DEP=true @@ -25,21 +25,21 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install # ----------------------------------------------------------------------------- # @variable-preinherit ANT_TASK_JDKVER -# @variable-default 1.4 +# @variable-default 1.5 # -# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.4, can +# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can # be overriden from ebuild BEFORE inheriting this eclass. # ----------------------------------------------------------------------------- -ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.4} +ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5} # ----------------------------------------------------------------------------- # @variable-preinherit ANT_TASK_JREVER -# @variable-default 1.4 +# @variable-default 1.5 # -# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.4, can +# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can # be overriden from ebuild BEFORE inheriting this eclass. # ----------------------------------------------------------------------------- -ANT_TASK_JREVER=${ANT_TASK_JREVER-1.4} +ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5} # ----------------------------------------------------------------------------- # @variable-internal ANT_TASK_NAME @@ -90,6 +90,9 @@ else MY_PV=${PV} UPSTREAM_PREFIX="mirror://apache/ant/source" case ${PV} in + 1.9.1) + GENTOO_PREFIX="http://dev.gentoo.org/~tomwij/files/dist" + ;; 1.8.4) GENTOO_PREFIX="http://dev.gentoo.org/~sera/distfiles" ;; @@ -111,7 +114,6 @@ SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 ${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -IUSE="" RDEPEND="~dev-java/ant-core-${PV}" DEPEND="${RDEPEND}" |