* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass
@ 2013-08-28 21:28 Tom Wijsman (tomwij)
0 siblings, 0 replies; 6+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-08-28 21:28 UTC (permalink / raw
To: gentoo-commits
tomwij 13/08/28 21:28:33
Modified: ChangeLog ant-tasks.eclass
Log:
Made ant-tasks.eclass support newer versions of the 1.9 branch.
Revision Changes Path
1.940 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.940&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.940&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.939&r2=1.940
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -r1.939 -r1.940
--- ChangeLog 27 Aug 2013 18:47:33 -0000 1.939
+++ ChangeLog 28 Aug 2013 21:28:33 -0000 1.940
@@ -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.939 2013/08/27 18:47:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.940 2013/08/28 21:28:33 tomwij Exp $
+
+ 28 Aug 2013; Tom Wijsman <TomWij@gentoo.org> ant-tasks.eclass:
+ Made ant-tasks.eclass support newer versions of the 1.9 branch.
27 Aug 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Enable EAPI=4 on python-r1.
1.15 eclass/ant-tasks.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.14&r2=1.15
Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ant-tasks.eclass 5 Jul 2013 10:44:47 -0000 1.14
+++ ant-tasks.eclass 28 Aug 2013 21:28:33 -0000 1.15
@@ -1,9 +1,9 @@
# Eclass for building dev-java/ant-* packages
#
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.14 2013/07/05 10:44:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.15 2013/08/28 21:28:33 tomwij Exp $
# we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -90,7 +90,7 @@
MY_PV=${PV}
UPSTREAM_PREFIX="mirror://apache/ant/source"
case ${PV} in
- 1.9.1)
+ 1.9.*)
GENTOO_PREFIX="http://dev.gentoo.org/~tomwij/files/dist"
;;
1.8.4)
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass
@ 2013-10-05 12:07 Vlastimil Babka (caster)
0 siblings, 0 replies; 6+ messages in thread
From: Vlastimil Babka (caster) @ 2013-10-05 12:07 UTC (permalink / raw
To: gentoo-commits
caster 13/10/05 12:07:01
Modified: ChangeLog ant-tasks.eclass
Log:
Convert comments for eclass manpages. Almost completely based on work from 'mren <bugs@rennings.net>' in bug #210723 and ercpe from bug #476946.
Revision Changes Path
1.1007 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1007&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1007&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1006&r2=1.1007
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -r1.1006 -r1.1007
--- ChangeLog 4 Oct 2013 22:11:54 -0000 1.1006
+++ ChangeLog 5 Oct 2013 12:07:01 -0000 1.1007
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1006 2013/10/04 22:11:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1007 2013/10/05 12:07:01 caster Exp $
+
+ 05 Oct 2013; Vlastimil Babka <caster@gentoo.org> ant-tasks.eclass:
+ Convert comments for eclass manpages. Almost completely based on work from
+ 'mren <bugs@rennings.net>' in bug #210723 and ercpe from bug #476946.
04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> vala.eclass:
Prepare for vala-0.22
1.16 eclass/ant-tasks.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.15&r2=1.16
Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ant-tasks.eclass 28 Aug 2013 21:28:33 -0000 1.15
+++ ant-tasks.eclass 5 Oct 2013 12:07:01 -0000 1.16
@@ -3,7 +3,18 @@
# Copyright 1999-2013 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.15 2013/08/28 21:28:33 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.16 2013/10/05 12:07:01 caster Exp $
+
+# @ECLASS: ant-tasks.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Vlastimil Babka <caster@gentoo.org>
+# @BLURB: Eclass for building dev-java/ant-* packages
+# @DESCRIPTION:
+# This eclass provides functionality and default ebuild variables for building
+# dev-java/ant-* packages easily.
+
# we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -13,65 +24,39 @@
EXPORT_FUNCTIONS src_unpack src_compile src_install
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-shortdesc Eclass for building dev-java/ant-* packages
-# @eclass-maintainer java@gentoo.org
-#
-# This eclass provides functionality and default ebuild variables for building
-# dev-java/ant-* packages easily.
-#
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# @variable-preinherit ANT_TASK_JDKVER
-# @variable-default 1.5
-#
+# @ECLASS-VARIABLE: ANT_TASK_JDKVER
+# @DESCRIPTION:
# 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.5}
-# -----------------------------------------------------------------------------
-# @variable-preinherit ANT_TASK_JREVER
-# @variable-default 1.5
-#
+# @ECLASS-VARIABLE: ANT_TASK_JREVER
+# @DESCRIPTION:
# 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.5}
-# -----------------------------------------------------------------------------
-# @variable-internal ANT_TASK_NAME
-# @variable-default the rest of $PN after "ant-"
-#
-# The name of this ant task as recognized by ant's build.xml, derived from $PN.
-# -----------------------------------------------------------------------------
+# @ECLASS-VARIABLE: ANT_TASK_NAME
+# @DESCRIPTION:
+# The name of this ant task as recognized by ant's build.xml, derived from $PN
+# by removing the ant- prefix. Read-only.
ANT_TASK_NAME="${PN#ant-}"
-# -----------------------------------------------------------------------------
-# @variable-preinherit ANT_TASK_DEPNAME
-# @variable-default $ANT_TASK_NAME
-#
+# @ECLASS-VARIABLE: ANT_TASK_DEPNAME
+# @DESCRIPTION:
# Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package
# that this one depends on. Defaults to the name of ant task, ebuild can
# override it before inheriting this eclass.
-# -----------------------------------------------------------------------------
ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
-# -----------------------------------------------------------------------------
-# @variable-preinherit ANT_TASK_DISABLE_VM_DEPS
-# @variable-default unset
-#
+# @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
# If set, no JDK/JRE deps are added.
-# -----------------------------------------------------------------------------
-# -----------------------------------------------------------------------------
-# @variable-internal ANT_TASK_PV
-# @variable-default Just the number in $PV without any beta/RC suffixes
-#
+# @VARIABLE: ANT_TASK_PV
+# @INTERNAL
# Version of ant-core this task is intended to register and thus load with.
-# -----------------------------------------------------------------------------
ANT_TASK_PV="${PV}"
# special care for beta/RC releases
@@ -105,9 +90,7 @@
# source/workdir name
MY_P="apache-ant-${MY_PV}"
-# -----------------------------------------------------------------------------
# Default values for standard ebuild variables, can be overriden from ebuild.
-# -----------------------------------------------------------------------------
DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}"
HOMEPAGE="http://ant.apache.org/"
SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2
@@ -133,14 +116,15 @@
S="${WORKDIR}/${MY_P}"
-# ------------------------------------------------------------------------------
-# @eclass-src_unpack
+# @FUNCTION: ant-tasks_src_unpack
+# @USAGE: [ base ] [ jar-dep ] [ all ]
+# @DESCRIPTION:
+# The function Is split into two parts, defaults to both of them ('all').
#
-# Is split into two parts, defaults to both of them ('all').
# base: performs the unpack, build.xml replacement and symlinks ant.jar from
# ant-core
+#
# jar-dep: symlinks the jar file(s) from dependency package
-# ------------------------------------------------------------------------------
ant-tasks_src_unpack() {
[[ -z "${1}" ]] && ant-tasks_src_unpack all
@@ -172,22 +156,18 @@
}
-# ------------------------------------------------------------------------------
-# @eclass-src_compile
-#
+# @FUNCTION: ant-tasks_src_compile
+# @DESCRIPTION:
# Compiles the jar with installed ant-core.
-# ------------------------------------------------------------------------------
ant-tasks_src_compile() {
ANT_TASKS="none" eant -Dbuild.dep=${ANT_TASK_NAME} jar-dep
}
-# ------------------------------------------------------------------------------
-# @eclass-src_install
-#
+# @FUNCTION: ant-tasks_src_install
+# @DESCRIPTION:
# Installs the jar and registers its presence for the ant launcher script.
# Version param ensures it won't get loaded (thus break) when ant-core is
# updated to newer version.
-# ------------------------------------------------------------------------------
ant-tasks_src_install() {
java-pkg_dojar build/lib/${PN}.jar
java-pkg_register-ant-task --version "${ANT_TASK_PV}"
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass
@ 2013-07-05 10:44 Tom Wijsman (tomwij)
0 siblings, 0 replies; 6+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-07-05 10:44 UTC (permalink / raw
To: gentoo-commits
tomwij 13/07/05 10:44:47
Modified: ChangeLog ant-tasks.eclass
Log:
Update ant-tasks for 1.9.1 version bump, needs 1.5 as minimal JDK / JRE version.
Revision Changes Path
1.871 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.871&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.871&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.870&r2=1.871
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -r1.870 -r1.871
--- ChangeLog 3 Jul 2013 09:22:39 -0000 1.870
+++ ChangeLog 5 Jul 2013 10:44:47 -0000 1.871
@@ -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.
1.14 eclass/ant-tasks.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.13&r2=1.14
Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ant-tasks.eclass 1 Jun 2012 12:19:42 -0000 1.13
+++ ant-tasks.eclass 5 Jul 2013 10:44:47 -0000 1.14
@@ -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 @@
# -----------------------------------------------------------------------------
# @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 @@
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 @@
${GENTOO_PREFIX}/ant-${PV}-gentoo.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE=""
RDEPEND="~dev-java/ant-core-${PV}"
DEPEND="${RDEPEND}"
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass
@ 2012-06-01 12:19 Ralph Sennhauser (sera)
0 siblings, 0 replies; 6+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-06-01 12:19 UTC (permalink / raw
To: gentoo-commits
sera 12/06/01 12:19:42
Modified: ChangeLog ant-tasks.eclass
Log:
Don't assinging RDEPEND to DEPEND and vise versa. JRE in DEPEND confuses VM switching code.
Revision Changes Path
1.281 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.281&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.281&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.280&r2=1.281
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- ChangeLog 30 May 2012 15:25:08 -0000 1.280
+++ ChangeLog 1 Jun 2012 12:19:42 -0000 1.281
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.280 2012/05/30 15:25:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.281 2012/06/01 12:19:42 sera Exp $
+
+ 01 Jun 2012; Ralph Sennhauser <sera@gentoo.org> ant-tasks.eclass:
+ Don't assinging RDEPEND to DEPEND and vise versa. JRE in DEPEND confuses VM
+ switching code.
30 May 2012; Sergei Trofimovich <slyfox@gentoo.org> darcs.eclass:
Use 'darcs get --lazy' instead of 'darcs get --partial' (gone in darcs-2.8).
1.13 eclass/ant-tasks.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.12&r2=1.13
Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ant-tasks.eclass 30 May 2012 08:21:18 -0000 1.12
+++ ant-tasks.eclass 1 Jun 2012 12:19:42 -0000 1.13
@@ -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.12 2012/05/30 08:21:18 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.13 2012/06/01 12:19:42 sera Exp $
# we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -117,16 +117,13 @@
DEPEND="${RDEPEND}"
if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
- RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
- ${DEPEND}"
- DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
- ${RDEPEND}"
+ RDEPEND+=" >=virtual/jre-${ANT_TASK_JREVER}"
+ DEPEND+=" >=virtual/jdk-${ANT_TASK_JDKVER}"
fi
# we need direct blockers with old ant-tasks for file collisions - bug #252324
if version_is_at_least 1.7.1 ; then
- DEPEND="${DEPEND}
- !dev-java/ant-tasks"
+ DEPEND+=" !dev-java/ant-tasks"
fi
# Would run the full ant test suite for every ant task
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass
@ 2012-05-30 8:21 Ralph Sennhauser (sera)
0 siblings, 0 replies; 6+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-05-30 8:21 UTC (permalink / raw
To: gentoo-commits
sera 12/05/30 08:21:18
Modified: ChangeLog ant-tasks.eclass
Log:
Set prefix for ant-1.8.4
Revision Changes Path
1.279 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.279&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.279&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.278&r2=1.279
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- ChangeLog 30 May 2012 07:59:51 -0000 1.278
+++ ChangeLog 30 May 2012 08:21:18 -0000 1.279
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.278 2012/05/30 07:59:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.279 2012/05/30 08:21:18 sera Exp $
+
+ 30 May 2012; Ralph Sennhauser <sera@gentoo.org> ant-tasks.eclass:
+ Set prefix for ant-1.8.4
30 May 2012; Justin Lecher <jlec@gentoo.org> flag-o-matic.eclass:
Sort ldflags handling functions to logic place
1.12 eclass/ant-tasks.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.11&r2=1.12
Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ant-tasks.eclass 3 Mar 2012 22:39:14 -0000 1.11
+++ ant-tasks.eclass 30 May 2012 08:21:18 -0000 1.12
@@ -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.11 2012/03/03 22:39:14 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.12 2012/05/30 08:21:18 sera Exp $
# we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -89,7 +89,14 @@
# default for final releases
MY_PV=${PV}
UPSTREAM_PREFIX="mirror://apache/ant/source"
- GENTOO_PREFIX="http://dev.gentoo.org/~caster/distfiles"
+ case ${PV} in
+ 1.8.4)
+ GENTOO_PREFIX="http://dev.gentoo.org/~sera/distfiles"
+ ;;
+ *)
+ GENTOO_PREFIX="http://dev.gentoo.org/~caster/distfiles"
+ ;;
+ esac
fi
# source/workdir name
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass
@ 2012-03-03 22:39 Vlastimil Babka (caster)
0 siblings, 0 replies; 6+ messages in thread
From: Vlastimil Babka (caster) @ 2012-03-03 22:39 UTC (permalink / raw
To: gentoo-commits
caster 12/03/03 22:39:14
Modified: ChangeLog ant-tasks.eclass
Log:
Add support for ANT_TASK_DISABLE_VM_DEPS variable - when enabled, the jdk/jre deps are not added by eclass.
Revision Changes Path
1.153 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.152&r2=1.153
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog 3 Mar 2012 02:29:41 -0000 1.152
+++ ChangeLog 3 Mar 2012 22:39:14 -0000 1.153
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.152 2012/03/03 02:29:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.153 2012/03/03 22:39:14 caster Exp $
+
+ 03 Mar 2012; Vlastimil Babka <caster@gentoo.org> ant-tasks.eclass:
+ Add support for ANT_TASK_DISABLE_VM_DEPS variable - when enabled, the jdk/jre
+ deps are not added by eclass.
03 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Prevent bundled libffi from being installed with gcj or gccgo (bug #354903 by
1.11 eclass/ant-tasks.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ant-tasks.eclass?r1=1.10&r2=1.11
Index: ant-tasks.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ant-tasks.eclass 16 Feb 2012 22:25:20 -0000 1.10
+++ ant-tasks.eclass 3 Mar 2012 22:39:14 -0000 1.11
@@ -1,9 +1,9 @@
# Eclass for building dev-java/ant-* packages
#
-# Copyright 1999-2011 Gentoo Foundation
+# 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.10 2012/02/16 22:25:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.11 2012/03/03 22:39:14 caster Exp $
# we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -60,6 +60,13 @@
ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
# -----------------------------------------------------------------------------
+# @variable-preinherit ANT_TASK_DISABLE_VM_DEPS
+# @variable-default unset
+#
+# If set, no JDK/JRE deps are added.
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
# @variable-internal ANT_TASK_PV
# @variable-default Just the number in $PV without any beta/RC suffixes
#
@@ -99,10 +106,15 @@
SLOT="0"
IUSE=""
-RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
- ~dev-java/ant-core-${PV}"
-DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
- ${RDEPEND}"
+RDEPEND="~dev-java/ant-core-${PV}"
+DEPEND="${RDEPEND}"
+
+if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
+ RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
+ ${DEPEND}"
+ DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
+ ${RDEPEND}"
+fi
# we need direct blockers with old ant-tasks for file collisions - bug #252324
if version_is_at_least 1.7.1 ; then
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-05 12:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-28 21:28 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ant-tasks.eclass Tom Wijsman (tomwij)
-- strict thread matches above, loose matches on Subject: below --
2013-10-05 12:07 Vlastimil Babka (caster)
2013-07-05 10:44 Tom Wijsman (tomwij)
2012-06-01 12:19 Ralph Sennhauser (sera)
2012-05-30 8:21 Ralph Sennhauser (sera)
2012-03-03 22:39 Vlastimil Babka (caster)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox