* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2015-08-10 18:39 Patrice Clement
0 siblings, 0 replies; 22+ messages in thread
From: Patrice Clement @ 2015-08-10 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 059149a639be81e76e69906680314f1f32c1bd47
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 19:37:01 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 19:39:50 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059149a6
dev-java/ant-ivy: Also update dev-java/bcpg dependency to match with new SLOT
number. Fixes bug 557166.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild | 14 +++--
dev-java/ant-ivy/ant-ivy-2.3.0.ebuild | 87 --------------------------------
2 files changed, 6 insertions(+), 95 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
index 11c6fbd..71ceba2 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,18 +29,16 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
RESTRICT="test"
# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="
- dev-java/jsch:0
- dev-java/bcpg:0
+CDEPEND="dev-java/jsch:0
dev-java/bcpkix:0
- dev-java/bcprov:1.50
+ dev-java/bcpg:1.50
dev-java/ant-core:0
+ dev-java/bcprov:1.50
dev-java/commons-vfs:0
dev-java/jakarta-oro:2.0
dev-java/commons-httpclient:3"
-DEPEND="
- >=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.6
test? (
dev-java/ant-junit:0
)
@@ -72,9 +70,9 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="
jsch
- bcpg
bcpkix
ant-core
+ bcpg-1.50
commons-vfs
bcprov-1.50
jakarta-oro-2.0
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0.ebuild
deleted file mode 100644
index 643bdd6..0000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://ant.apache.org/ivy"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-COMMON_DEP="
- dev-java/ant-core:0
- dev-java/bcpg:0
- dev-java/bcpkix:0
- dev-java/bcprov:0
- dev-java/jakarta-oro:2.0
- dev-java/jsch:0
- dev-java/commons-httpclient:3
- dev-java/commons-vfs:0"
-
-DEPEND="
- >=virtual/jdk-1.4
- test? ( dev-java/ant-junit )
- ${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- rm -rf test/repositories
- rm -rf test/triggers
- rm -rf src/example/chained-resolvers/settings/repository/test-1.0.jar
- rm -rf test/java/org/apache/ivy/core/settings/custom-resolver.jar
-
- # Removing obsolete documentation.
- rm -rf doc/reports
- rm -rf doc/configuration
-
- java-ant_rewrite-classpath
- mkdir lib
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="ant-core,bcpg,bcpkix,bcprov,commons-vfs,jakarta-oro-2.0,jsch,commons-httpclient-3"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
- java-pkg_dojar "build/artifact/jars/ivy.jar"
-
- use doc && java-pkg_dojavadoc "build/doc/reports/api"
- use doc && dohtml -r "doc"
- use examples && java-pkg_doexamples "src/example"
- use source && java-pkg_dosrc src/java/*
-
- java-pkg_register-ant-task
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2015-08-10 18:39 Patrice Clement
0 siblings, 0 replies; 22+ messages in thread
From: Patrice Clement @ 2015-08-10 18:39 UTC (permalink / raw
To: gentoo-commits
commit: c44303a8bd07d4a8d76b38733e6bafc840f6a795
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 19:08:46 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 19:39:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c44303a8
dev-java/ant-ivy: Update dev-java/bcprov dependency to match with new SLOT
number. Fixes bug 557166.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild | 104 +++++++++++++++++++++++++++++++
1 file changed, 104 insertions(+)
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
new file mode 100644
index 0000000..11c6fbd
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+# Register this as a split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Don't rewrite examples, that's bad.
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="apache-ivy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="http://ant.apache.org/ivy"
+SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
+RESTRICT="test"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="
+ dev-java/jsch:0
+ dev-java/bcpg:0
+ dev-java/bcpkix:0
+ dev-java/bcprov:1.50
+ dev-java/ant-core:0
+ dev-java/commons-vfs:0
+ dev-java/jakarta-oro:2.0
+ dev-java/commons-httpclient:3"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ )
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+ # This stuff needs removing.
+ local CLEANUP=(
+ doc/reports
+ test/triggers
+ doc/configuration
+ test/repositories
+ test/java/org/apache/ivy/core/settings/custom-resolver.jar
+ src/example/chained-resolvers/settings/repository/test-1.0.jar
+ )
+
+ rm -rf "${CLEANUP[@]}" || die
+
+ java-ant_rewrite-classpath
+ mkdir lib || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+ jsch
+ bcpg
+ bcpkix
+ ant-core
+ commons-vfs
+ bcprov-1.50
+ jakarta-oro-2.0
+ commons-httpclient-3
+"
+
+EANT_BUILD_TARGET="/offline jar"
+
+EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
+
+src_test() {
+ java-pkg_jar-from --into lib junit
+ ANT_TASKS="ant-junit" eant "/offline test"
+}
+
+src_install() {
+ java-pkg_dojar build/artifact/jars/ivy.jar
+ java-pkg_register-ant-task
+
+ if use doc; then
+ java-pkg_dojavadoc build/doc/reports/api
+ java-pkg_dohtml -r doc
+ fi
+
+ use examples && java-pkg_doexamples src/example
+ use source && java-pkg_dosrc src/java/*
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2015-10-17 16:59 Patrice Clement
0 siblings, 0 replies; 22+ messages in thread
From: Patrice Clement @ 2015-10-17 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 65d8ebafebf8cceaae8ae1a468f2bb24ffeafef4
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 16:55:13 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 16:57:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d8ebaf
dev-java/ant-ivy: Correct SLOTting for all bc dependencies.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild | 105 +++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
new file mode 100644
index 0000000..438e049
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+# Register this as a split-ant task.
+WANT_SPLIT_ANT="true"
+
+# Don't rewrite examples, that's bad.
+JAVA_PKG_BSFIX_ALL="no"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="apache-ivy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="http://ant.apache.org/ivy"
+SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
+RESTRICT="test"
+
+# SLOT to use for all bc dependencies.
+BC_SLOT="1.50"
+
+# There may be additional optional dependencies (commons-logging, commons-lang...)
+CDEPEND="dev-java/jsch:0
+ dev-java/bcpg:${BC_SLOT}
+ dev-java/ant-core:0
+ dev-java/bcpkix:${BC_SLOT}
+ dev-java/bcprov:${BC_SLOT}
+ dev-java/commons-vfs:0
+ dev-java/jakarta-oro:2.0
+ dev-java/commons-httpclient:3"
+
+DEPEND=">=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ )
+ ${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+ # This stuff needs removing.
+ local CLEANUP=(
+ doc/reports
+ test/triggers
+ doc/configuration
+ test/repositories
+ test/java/org/apache/ivy/core/settings/custom-resolver.jar
+ src/example/chained-resolvers/settings/repository/test-1.0.jar
+ )
+
+ rm -rf "${CLEANUP[@]}" || die
+
+ java-ant_rewrite-classpath
+ mkdir lib || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_GENTOO_CLASSPATH="
+ jsch
+ bcpkix-${BC_SLOT}
+ ant-core
+ bcpg-${BC_SLOT}
+ commons-vfs
+ bcprov-${BC_SLOT}
+ jakarta-oro-2.0
+ commons-httpclient-3
+"
+
+EANT_BUILD_TARGET="/offline jar"
+
+EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
+
+src_test() {
+ java-pkg_jar-from --into lib junit
+ ANT_TASKS="ant-junit" eant "/offline test"
+}
+
+src_install() {
+ java-pkg_dojar build/artifact/jars/ivy.jar
+ java-pkg_register-ant-task
+
+ if use doc; then
+ java-pkg_dojavadoc build/doc/reports/api
+ java-pkg_dohtml -r doc
+ fi
+
+ use examples && java-pkg_doexamples src/example
+ use source && java-pkg_dosrc src/java/*
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2015-10-24 14:16 Patrice Clement
0 siblings, 0 replies; 22+ messages in thread
From: Patrice Clement @ 2015-10-24 14:16 UTC (permalink / raw
To: gentoo-commits
commit: e5d889b765985420d7b22de95fbf43a964b9f05f
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 10:33:05 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 14:14:09 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d889b7
dev-java/ant-ivy: Clean up broken version.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild | 102 -------------------------------
1 file changed, 102 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
deleted file mode 100644
index 71ceba2..0000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://ant.apache.org/ivy"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="dev-java/jsch:0
- dev-java/bcpkix:0
- dev-java/bcpg:1.50
- dev-java/ant-core:0
- dev-java/bcprov:1.50
- dev-java/commons-vfs:0
- dev-java/jakarta-oro:2.0
- dev-java/commons-httpclient:3"
-
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- # This stuff needs removing.
- local CLEANUP=(
- doc/reports
- test/triggers
- doc/configuration
- test/repositories
- test/java/org/apache/ivy/core/settings/custom-resolver.jar
- src/example/chained-resolvers/settings/repository/test-1.0.jar
- )
-
- rm -rf "${CLEANUP[@]}" || die
-
- java-ant_rewrite-classpath
- mkdir lib || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
- jsch
- bcpkix
- ant-core
- bcpg-1.50
- commons-vfs
- bcprov-1.50
- jakarta-oro-2.0
- commons-httpclient-3
-"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
- java-pkg_dojar build/artifact/jars/ivy.jar
- java-pkg_register-ant-task
-
- if use doc; then
- java-pkg_dojavadoc build/doc/reports/api
- java-pkg_dohtml -r doc
- fi
-
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/java/*
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2015-10-24 14:16 Patrice Clement
0 siblings, 0 replies; 22+ messages in thread
From: Patrice Clement @ 2015-10-24 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 0c58b033ed46763a4a64c38e84f21eb177ca9074
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 10:40:19 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 14:14:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c58b033
dev-java/ant-ivy: Stable for amd64. Stable for ppc+ppc64+x86 using the ALLARCHES policy. Fixes bug 563832.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
index 438e049..6ec6cbc 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2018-04-08 18:37 James Le Cuirot
0 siblings, 0 replies; 22+ messages in thread
From: James Le Cuirot @ 2018-04-08 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 555a965546b01b213cc913fb30d042314dd60cc6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 8 17:22:55 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 18:37:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555a9655
dev-java/ant-ivy: use HTTPS
dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild | 4 ++--
dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild | 2 +-
dev-java/ant-ivy/ant-ivy-2.0.0.ebuild | 2 +-
dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
index 02604ee8fdd..87d6dd10577 100644
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
JAVA_PKG_IUSE="doc source"
@@ -9,7 +9,7 @@ MY_PN=${PN##*-}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://jayasoft.org/ivy"
+HOMEPAGE="https://ant.apache.org/ivy/"
SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
LICENSE="BSD"
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
index 9fb36ce5839..11291a26fda 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -17,7 +17,7 @@ MY_PN="${PN##*-}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://ant.apache.org/ivy"
+HOMEPAGE="https://ant.apache.org/ivy/"
SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
LICENSE="Apache-2.0"
diff --git a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
index f40c108edb8..393bd5ad69f 100644
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
@@ -15,7 +15,7 @@ MY_PN="apache-ivy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://ant.apache.org/ivy"
+HOMEPAGE="https://ant.apache.org/ivy/"
SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
index aed77492047..23bf9f5f7c2 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
@@ -17,7 +17,7 @@ MY_PN="apache-ivy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="http://ant.apache.org/ivy"
+HOMEPAGE="https://ant.apache.org/ivy/"
SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2018-05-26 18:16 Aaron Bauman
0 siblings, 0 replies; 22+ messages in thread
From: Aaron Bauman @ 2018-05-26 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 480f28efcacf41905faed7347739832fef24c2d2
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 16:55:04 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 26 18:16:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480f28ef
dev-java/ant-ivy: drop EAPI=2
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-java/ant-ivy/Manifest | 1 -
dev-java/ant-ivy/ant-ivy-2.0.0.ebuild | 85 -----------------------------------
2 files changed, 86 deletions(-)
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 8c348635318..bf62bf6af0b 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,4 +1,3 @@
-DIST apache-ivy-2.0.0-src.tar.gz 2248438 BLAKE2B a06c6716ae72d744e335734da4ca414b1c8fe3c819a1d25edae00d758e0db18e9aecb307d95c9f522f24d29c7249cd52d5729e82ab5cdf97abf977005ace702c SHA512 eb932069c42b42c421afc5b49a94204d5359b8f6f23708d3cbd04fee260c2348eea540bddbee7950cd71c8a5290383f7f2d4044e03fc8b53013fb381e410f1f6
DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
diff --git a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
deleted file mode 100644
index 393bd5ad69f..00000000000
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc examples source test"
-# registers as split-ant task
-WANT_SPLIT_ANT="true"
-# rewrites examples otherwise... bad
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-RESTRICT="test" # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-
-COMMON_DEP="
- dev-java/ant-core:0
- dev-java/jakarta-oro:2.0
- dev-java/jsch:0
- dev-java/commons-httpclient:3
- dev-java/commons-vfs:0"
-
-DEPEND="
- >=virtual/jdk-1.4
- test? ( dev-java/ant-junit )
- ${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -rf test/repositories
- rm -rf test/triggers
- rm -rf src/example/chained-resolvers/settings/repository/test-1.0.jar
- rm -rf test/java/org/apache/ivy/core/settings/custom-resolver.jar
-
- # Removing obsolete documentation
-
- rm -rf doc/reports
- rm -rf doc/configuration
-
- java-ant_rewrite-classpath
- mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="ant-core,commons-vfs,jakarta-oro-2.0,jsch
- commons-httpclient-3"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
- java-pkg_dojar "build/artifact/jars/ivy.jar"
-
- use doc && java-pkg_dojavadoc "build/doc/reports/api"
- use doc && dohtml -r "doc"
- use examples && java-pkg_doexamples "src/example"
- use source && java-pkg_dosrc src/java/*
-
- java-pkg_register-ant-task
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2018-06-04 1:12 Aaron Bauman
0 siblings, 0 replies; 22+ messages in thread
From: Aaron Bauman @ 2018-06-04 1:12 UTC (permalink / raw
To: gentoo-commits
commit: 10358ecd6161e47679ea12ba4b9e990d543dd6f5
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 18:54:10 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 4 01:12:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10358ecd
dev-java/ant-ivy: drop old EAPI
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-java/ant-ivy/Manifest | 1 -
dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild | 66 --------------------------------
2 files changed, 67 deletions(-)
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index bf62bf6af0b..ef80fa17ff6 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,3 +1,2 @@
DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
-DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
deleted file mode 100644
index 58853eef8a6..00000000000
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN=${PN##*-}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEP="
- dev-java/ant-core
- =dev-java/commons-cli-1*
- =dev-java/commons-httpclient-3*
- dev-java/commons-logging
- =dev-java/jakarta-oro-2.0*"
-DEPEND="
- >=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_P}
-
-# Rewrites examples... bad
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}/${MY_P}-noresolve.patch"
- epatch "${FILESDIR}/${MY_P}-tasks.patch"
-
- mkdir "${S}/lib"
- java-pkg_jar-from --into lib commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
-
- java-ant_bsfix_one build.xml
-}
-
-src_install() {
- java-pkg_dojar build/artifact/${MY_PN}.jar
- dodir /usr/share/ant-core/lib
- dosym /usr/share/${PN}/lib/${MY_PN}.jar /usr/share/ant-core/lib/${PN}.jar
- use doc && java-pkg_dojavadoc doc/build/api
- use source && java-pkg_dosrc src/java/*
-}
-
-RESTRICT="test" # fail because of a missing file
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant test || die "Junit tests failed"
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2019-10-07 9:52 Agostino Sarubbo
0 siblings, 0 replies; 22+ messages in thread
From: Agostino Sarubbo @ 2019-10-07 9:52 UTC (permalink / raw
To: gentoo-commits
commit: ddcb4994576874dd40429787535a5c2ea6c5595e
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 09:52:06 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 09:52:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcb4994
dev-java/ant-ivy: ppc64 stable wrt bug #696266
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
index d2925662206..8316de61c4d 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
COMMON_DEP="
dev-java/ant-core:0
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2021-03-12 12:18 Miroslav Šulc
0 siblings, 0 replies; 22+ messages in thread
From: Miroslav Šulc @ 2021-03-12 12:18 UTC (permalink / raw
To: gentoo-commits
commit: 3b38b403d4e581f079fc1e75e74ef7a37e0ad8c9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 10:41:15 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 12:18:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b38b403
dev-java/ant-ivy: eapi7, min jdk/jre 1.8
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...ant-ivy-1.4.1-r1.ebuild => ant-ivy-1.4.1-r2.ebuild} | 18 +++++++++++-------
...ant-ivy-2.3.0-r2.ebuild => ant-ivy-2.3.0-r3.ebuild} | 10 ++++++----
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
similarity index 89%
rename from dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
rename to dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
index 92df6ba8e8b..62198fb29dc 100644
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
JAVA_PKG_IUSE="doc examples source test"
@@ -11,7 +11,7 @@ WANT_SPLIT_ANT="true"
# Rewrites examples otherwise... bad.
JAVA_PKG_BSFIX_ALL="no"
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
MY_PN="${PN##*-}"
MY_P="${MY_PN}-${PV}"
@@ -32,19 +32,23 @@ COMMON_DEP="
dev-java/jakarta-oro:2.0
dev-java/jsch:0"
+BDEPEND="app-arch/unzip"
DEPEND="
- >=virtual/jdk-1.4
- app-arch/unzip
+ >=virtual/jdk-1.8:*
test? ( dev-java/ant-junit:0 )
${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8:*
${COMMON_DEP}"
S="${WORKDIR}/${MY_P}"
-java_prepare() {
- epatch "${FILESDIR}/1.4.1-javadoc.patch"
+PATCHES=(
+ "${FILESDIR}/1.4.1-javadoc.patch"
+)
+
+src_prepare() {
+ default
# init-ivy expects existing ivy.jar, but we don't need actually it
sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
similarity index 95%
rename from dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
rename to dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
index d39bf489081..ef8d904b79d 100644
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
JAVA_PKG_IUSE="doc examples source test"
@@ -40,18 +40,20 @@ CDEPEND="dev-java/jsch:0
dev-java/jakarta-oro:2.0
dev-java/commons-httpclient:3"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.8:*
test? (
dev-java/ant-junit:0
)
${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.8:*
${CDEPEND}"
S="${WORKDIR}/${MY_P}"
-java_prepare() {
+src_prepare() {
+ default
+
# This stuff needs removing.
local CLEANUP=(
doc/reports
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2021-12-04 16:27 Miroslav Šulc
0 siblings, 0 replies; 22+ messages in thread
From: Miroslav Šulc @ 2021-12-04 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 321c4ba7ca22341bd7f108d1403ccd8ee810000f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jun 8 11:25:46 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 16:27:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321c4ba7
dev-java/ant-ivy: bump to 2.5.0
Closes: https://bugs.gentoo.org/794598
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21197
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-ivy/Manifest | 1 +
dev-java/ant-ivy/ant-ivy-2.5.0.ebuild | 182 ++++++++++++++++++++++++++++++++++
dev-java/ant-ivy/metadata.xml | 5 +
3 files changed, 188 insertions(+)
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index ef80fa17ff62..adb78cab36a9 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,2 +1,3 @@
DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
+DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
new file mode 100644
index 000000000000..caa5b3a8f254
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.ivy:ivy:2.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple java-osgi
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/bcpg:0
+ dev-java/bcprov:0
+ dev-java/commons-httpclient:4
+ dev-java/commons-vfs:2
+ dev-java/httpcore:0
+ dev-java/jakarta-oro:2.0
+ dev-java/jsch:0
+ dev-java/jsch-agent-proxy:0
+ test? (
+ dev-java/ant-junit:0
+ dev-java/ant-junit4:0
+ dev-java/ant-junitlauncher:0
+ dev-java/ant-testutil:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/xmlunit:1
+ )"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=( LICENSE NOTICE README.adoc )
+
+S="${WORKDIR}/apache-ivy-${PV}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_MAIN_CLASS="org.apache.ivy.Main"
+JAVA_SRC_DIR="src/java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_SRC_DIR="test-src/java"
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
+
+# according to 57,60 build-release.xml
+# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
+JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
+
+# Several tests require a certain treatment to "generate-bundles":
+# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
+# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
+#
+# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
+# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
+# So the failing tests will be excluded, saved for a later attempt.
+#
+# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
+# Excluding those test classes listed below leads to "OK (812 tests)"
+JAVA_TEST_EXCLUDES=(
+ # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
+ # test.class.pattern = *Test
+ "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
+ "org.apache.ivy.core.TestPerformance" # not in scope
+ "org.apache.ivy.util.TestXmlHelper" # not in scope
+ "org.apache.ivy.TestFixture" # not in scope
+ "org.apache.ivy.TestHelper" # not in scope
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
+ # <exclude name="**/Abstract*Test.java"/>
+ "org.apache.ivy.util.url.AbstractURLHandlerTest"
+ "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
+ "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
+ # following excluded tests cause test failures
+ "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2
+ "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1
+ "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1
+ "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1
+ "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1
+ "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16
+ "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3
+ "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1
+ "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7
+ "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1
+ "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3
+ "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3
+ # following excluded tests can pass if run individually
+ "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests)
+ "org.apache.ivy.IvyTest" # OK (1 test)
+ "org.apache.ivy.MainTest" # OK (12 tests)
+ "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests)
+ "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests)
+ "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests)
+ "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
+ "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests)
+ "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests)
+ "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests)
+ # Without PROPERTIES="test_network", the following test cause additional failures.
+ "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
+# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
+ "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
+# "org.apache.ivy.plugins.resolver.IBiblioResolverTest"
+# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
+ "org.apache.ivy.util.url.ArtifactoryListingTest"
+# "org.apache.ivy.util.url.BasicURLHandlerTest"
+# "org.apache.ivy.util.url.HttpclientURLHandlerTest"
+)
+
+src_prepare() {
+ default
+
+ mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
+ pushd "${JAVA_RESOURCE_DIRS}"
+ cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
+ cp -r "${S}"/src/java/* . || die
+
+ # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
+ # according to 210,221 build.xml and still in the upstream .jar file
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
+
+ find . -type f -name '*.java' -exec rm -rf {} + || die
+ popd || die
+}
+
+src_test() {
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
+ # name="build-custom-resolver-jar"
+ JAVA_SRC_DIR="test/custom-classpath"
+ JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
+ java-pkg-simple_src_compile
+
+ # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318"
+ jar -cf test.jar \
+ -C test/java org/apache/ivy/plugins/parser/xml/license.xml \
+ -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
+
+ # Reduce number of failures to "Tests run: 1109, Failures: 98"
+ jar -uf "test.jar" -C test/java . || die
+
+ # Separate *.java files from test resources
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
+ mkdir test-src || die
+ cp -r test/java test-src/ || die
+ find test -type f -name '*.java' -exec rm -rf {} + || die
+
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
+ # name="prepare-test-jar-repositories"
+ mkdir test/jar-repos || die
+ jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
+# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+ java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
+ use doc && java-pkg_dojavadoc target/api
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 3051d122c6e8..91e2ba1cf10c 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -14,4 +14,9 @@
to a local lib dir, and it does it for you by locating the artifacts of
your dependencies in repositories, such as ibiblio.
</longdescription>
+ <upstream>
+ <remote-id type="github">apache/ant-ivy</remote-id>
+ <doc>https://ant.apache.org/ivy/history/2.5.0</doc>
+ <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-01-03 9:17 Jakov Smolić
0 siblings, 0 replies; 22+ messages in thread
From: Jakov Smolić @ 2022-01-03 9:17 UTC (permalink / raw
To: gentoo-commits
commit: 2ccba6330cbe9941ed3faa38ba425871fc2fc74d
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 3 09:17:19 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Jan 3 09:17:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ccba633
dev-java/ant-ivy: Stabilize 2.5.0 amd64, #828134
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
index caa5b3a8f254..2c7834fbbe62 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
PROPERTIES="test_network"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-01-03 10:22 Jakov Smolić
0 siblings, 0 replies; 22+ messages in thread
From: Jakov Smolić @ 2022-01-03 10:22 UTC (permalink / raw
To: gentoo-commits
commit: 0efe267501d300157a9da641b1e72e0313fcd1d2
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 3 10:22:39 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Jan 3 10:22:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0efe2675
dev-java/ant-ivy: Stabilize 2.5.0 x86, #828134
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
index 2c7834fbbe62..36f2a11d943f 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
PROPERTIES="test_network"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-01-05 18:08 Arthur Zamarin
0 siblings, 0 replies; 22+ messages in thread
From: Arthur Zamarin @ 2022-01-05 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 8908555bc4806bca0312efbd3f7be85370be615e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 18:08:42 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 18:08:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8908555b
dev-java/ant-ivy: Stabilize 2.5.0 ppc64, #828134
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
index 36f2a11d943f..4e3633fe3296 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
PROPERTIES="test_network"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-01-05 20:49 Florian Schmaus
0 siblings, 0 replies; 22+ messages in thread
From: Florian Schmaus @ 2022-01-05 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 8f0c7f0c9203b557853fdb8310fd1310bfc412d3
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jan 3 10:36:42 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 20:49:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0c7f0c
dev-java/ant-ivy: Drop old versions
Closes: https://bugs.gentoo.org/804531
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/ant-ivy/Manifest | 2 -
dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild | 82 ------------------------
dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild | 106 -------------------------------
3 files changed, 190 deletions(-)
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index adb78cab36a9..0d8fb7a2c918 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,3 +1 @@
-DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
deleted file mode 100644
index 62198fb29dc1..000000000000
--- a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Registers as split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Rewrites examples otherwise... bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN##*-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEP="
- dev-java/ant-core:0
- dev-java/commons-cli:1
- dev-java/commons-httpclient:3
- dev-java/commons-vfs:0
- dev-java/jakarta-oro:2.0
- dev-java/jsch:0"
-
-BDEPEND="app-arch/unzip"
-DEPEND="
- >=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )
- ${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/1.4.1-javadoc.patch"
-)
-
-src_prepare() {
- default
-
- # init-ivy expects existing ivy.jar, but we don't need actually it
- sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \
- || die
-
- rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die
- java-ant_rewrite-classpath
- mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="
- ant-core,commons-cli-1,commons-httpclient-3
- commons-vfs,jakarta-oro-2.0,jsch"
-
-EANT_BUILD_TARGET="offline jar"
-
-src_test() {
- # TODO: find out why a couple of these fail
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant offline test
-}
-
-src_install() {
- java-pkg_dojar build/artifact/${MY_PN}.jar
-
- use doc && java-pkg_dojavadoc doc/ivy/api
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/java/*
-
- java-pkg_register-ant-task
-}
diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
deleted file mode 100644
index 17350b9fc443..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source test"
-
-# Register this as a split-ant task.
-WANT_SPLIT_ANT="true"
-
-# Don't rewrite examples, that's bad.
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet.
-RESTRICT="test"
-
-# SLOT to use for all bc dependencies.
-BC_SLOT="1.50"
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-CDEPEND="dev-java/jsch:0
- dev-java/bcpg:${BC_SLOT}
- dev-java/ant-core:0
- dev-java/bcpkix:${BC_SLOT}
- dev-java/bcprov:${BC_SLOT}
- dev-java/commons-vfs:0
- dev-java/jakarta-oro:2.0
- dev-java/commons-httpclient:3"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? (
- dev-java/ant-junit:0
- )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.8:*
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # This stuff needs removing.
- local CLEANUP=(
- doc/reports
- test/triggers
- doc/configuration
- test/repositories
- test/java/org/apache/ivy/core/settings/custom-resolver.jar
- src/example/chained-resolvers/settings/repository/test-1.0.jar
- )
-
- rm -rf "${CLEANUP[@]}" || die
-
- java-ant_rewrite-classpath
- mkdir lib || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
- jsch
- bcpkix-${BC_SLOT}
- ant-core
- bcpg-${BC_SLOT}
- commons-vfs
- bcprov-${BC_SLOT}
- jakarta-oro-2.0
- commons-httpclient-3
-"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
- java-pkg_dojar build/artifact/jars/ivy.jar
- java-pkg_register-ant-task
-
- if use doc; then
- java-pkg_dojavadoc build/doc/reports/api
- java-pkg_dohtml -r doc
- fi
-
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/java/*
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-04-05 9:01 Florian Schmaus
0 siblings, 0 replies; 22+ messages in thread
From: Florian Schmaus @ 2022-04-05 9:01 UTC (permalink / raw
To: gentoo-commits
commit: db3aaa98f9cc425b339f97ba8bc0491f921eefda
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Apr 1 10:10:23 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 09:01:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3aaa98
dev-java/ant-ivy: Switch to httpcomponents-client, restrict to jdk:1.8
dev-java/httpcomponents-client was in
slot 4 of dev-java/commons-httpclient before.
Restrict to jdk:1.8 as it would fail with jdk-17
src/java/org/apache/ivy/util/FileUtil.java:49: error: cannot find symbol
import static java.util.jar.Pack200.newUnpacker;
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24848
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 184 +++++++++++++++++++++++++++++++
1 file changed, 184 insertions(+)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..cb8092656c67
--- /dev/null
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.ivy:ivy:2.5.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple java-osgi
+
+DESCRIPTION="Ivy is a free java based dependency manager"
+HOMEPAGE="https://ant.apache.org/ivy/"
+SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/bcpg:0
+ dev-java/bcprov:0
+ dev-java/httpcomponents-client
+ dev-java/commons-vfs:2
+ dev-java/httpcore:0
+ dev-java/jakarta-oro:2.0
+ dev-java/jsch:0
+ dev-java/jsch-agent-proxy:0
+ test? (
+ dev-java/ant-junit:0
+ dev-java/ant-junit4:0
+ dev-java/ant-junitlauncher:0
+ dev-java/ant-testutil:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/xmlunit:1
+ )"
+
+# Restrict to jdk:1.8 since java.util.jar.Pack200 was removed.
+DEPEND="${CDEPEND}
+ virtual/jdk:1.8"
+RDEPEND="${CDEPEND}
+ virtual/jre:1.8"
+
+DOCS=( LICENSE NOTICE README.adoc )
+
+S="${WORKDIR}/apache-ivy-${PV}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_MAIN_CLASS="org.apache.ivy.Main"
+JAVA_SRC_DIR="src/java"
+JAVA_RESOURCE_DIRS="resources/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_SRC_DIR="test-src/java"
+JAVA_TEST_RESOURCE_DIRS="test"
+JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
+
+# according to 57,60 build-release.xml
+# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
+JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
+
+# Several tests require a certain treatment to "generate-bundles":
+# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
+# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
+#
+# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
+# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
+# So the failing tests will be excluded, saved for a later attempt.
+#
+# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
+# Excluding those test classes listed below leads to "OK (812 tests)"
+JAVA_TEST_EXCLUDES=(
+ # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
+ # test.class.pattern = *Test
+ "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
+ "org.apache.ivy.core.TestPerformance" # not in scope
+ "org.apache.ivy.util.TestXmlHelper" # not in scope
+ "org.apache.ivy.TestFixture" # not in scope
+ "org.apache.ivy.TestHelper" # not in scope
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
+ # <exclude name="**/Abstract*Test.java"/>
+ "org.apache.ivy.util.url.AbstractURLHandlerTest"
+ "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
+ "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
+ # following excluded tests cause test failures
+ "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2
+ "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1
+ "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1
+ "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1
+ "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1
+ "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16
+ "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3
+ "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1
+ "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7
+ "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1
+ "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3
+ "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3
+ # following excluded tests can pass if run individually
+ "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests)
+ "org.apache.ivy.IvyTest" # OK (1 test)
+ "org.apache.ivy.MainTest" # OK (12 tests)
+ "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests)
+ "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests)
+ "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests)
+ "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
+ "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests)
+ "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests)
+ "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests)
+ "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests)
+ # Without PROPERTIES="test_network", the following test cause additional failures.
+ "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
+# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
+ "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
+# "org.apache.ivy.plugins.resolver.IBiblioResolverTest"
+# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
+ "org.apache.ivy.util.url.ArtifactoryListingTest"
+# "org.apache.ivy.util.url.BasicURLHandlerTest"
+# "org.apache.ivy.util.url.HttpclientURLHandlerTest"
+)
+
+src_prepare() {
+ default
+
+ mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
+ pushd "${JAVA_RESOURCE_DIRS}"
+ cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
+ cp -r "${S}"/src/java/* . || die
+
+ # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
+ # according to 210,221 build.xml and still in the upstream .jar file
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
+ cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
+
+ find . -type f -name '*.java' -exec rm -rf {} + || die
+ popd || die
+}
+
+src_test() {
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
+ # name="build-custom-resolver-jar"
+ JAVA_SRC_DIR="test/custom-classpath"
+ JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
+ java-pkg-simple_src_compile
+
+ # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318"
+ jar -cf test.jar \
+ -C test/java org/apache/ivy/plugins/parser/xml/license.xml \
+ -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
+
+ # Reduce number of failures to "Tests run: 1109, Failures: 98"
+ jar -uf "test.jar" -C test/java . || die
+
+ # Separate *.java files from test resources
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
+ mkdir test-src || die
+ cp -r test/java test-src/ || die
+ find test -type f -name '*.java' -exec rm -rf {} + || die
+
+ # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
+ # name="prepare-test-jar-repositories"
+ mkdir test/jar-repos || die
+ jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
+# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
+
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+ java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
+ use doc && java-pkg_dojavadoc target/api
+ use source && java-pkg_dosrc src/*
+}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-05-05 9:54 Jakov Smolić
0 siblings, 0 replies; 22+ messages in thread
From: Jakov Smolić @ 2022-05-05 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 580313acb301dfe608295876a2bc85fa18c3c2e5
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 09:52:46 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu May 5 09:52:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580313ac
dev-java/ant-ivy: Stabilize 2.5.0-r1 amd64, #842708
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index cb8092656c67..179f28f370f6 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
PROPERTIES="test_network"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-05-05 9:54 Jakov Smolić
0 siblings, 0 replies; 22+ messages in thread
From: Jakov Smolić @ 2022-05-05 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 8329efcd749ffef6c8b99ed62f285545f2eea5e3
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 09:53:42 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu May 5 09:53:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8329efcd
dev-java/ant-ivy: Stabilize 2.5.0-r1 x86, #842708
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index 179f28f370f6..9fc18455b438 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
PROPERTIES="test_network"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-05-05 18:04 Arthur Zamarin
0 siblings, 0 replies; 22+ messages in thread
From: Arthur Zamarin @ 2022-05-05 18:04 UTC (permalink / raw
To: gentoo-commits
commit: d06a7a840233c687855ac4ba8b7e7c06cc415a0a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 18:04:05 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 5 18:04:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06a7a84
dev-java/ant-ivy: Stabilize 2.5.0-r1 ppc64, #842708
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index 9fc18455b438..fff42019b905 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
PROPERTIES="test_network"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2022-05-06 6:15 Miroslav Šulc
0 siblings, 0 replies; 22+ messages in thread
From: Miroslav Šulc @ 2022-05-06 6:15 UTC (permalink / raw
To: gentoo-commits
commit: 57dcc8f4528c5745ef59fe3ceaededa8f37537a1
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu May 5 19:13:14 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 6 06:15:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57dcc8f4
dev-java/ant-ivy: drop 2.5.0
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/ant-ivy/ant-ivy-2.5.0.ebuild | 182 ----------------------------------
1 file changed, 182 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
deleted file mode 100644
index 4e3633fe3296..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.ivy:ivy:2.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple java-osgi
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-CDEPEND="
- dev-java/ant-core:0
- dev-java/bcpg:0
- dev-java/bcprov:0
- dev-java/commons-httpclient:4
- dev-java/commons-vfs:2
- dev-java/httpcore:0
- dev-java/jakarta-oro:2.0
- dev-java/jsch:0
- dev-java/jsch-agent-proxy:0
- test? (
- dev-java/ant-junit:0
- dev-java/ant-junit4:0
- dev-java/ant-junitlauncher:0
- dev-java/ant-testutil:0
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/xmlunit:1
- )"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README.adoc )
-
-S="${WORKDIR}/apache-ivy-${PV}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
-JAVA_MAIN_CLASS="org.apache.ivy.Main"
-JAVA_SRC_DIR="src/java"
-JAVA_RESOURCE_DIRS="resources/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
-JAVA_TEST_SRC_DIR="test-src/java"
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
-
-# according to 57,60 build-release.xml
-# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
-JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
-
-# Several tests require a certain treatment to "generate-bundles":
-# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
-# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
-#
-# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
-# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
-# So the failing tests will be excluded, saved for a later attempt.
-#
-# Not excluding any test classes results in "Tests run: 1109, Failures: 98"
-# Excluding those test classes listed below leads to "OK (812 tests)"
-JAVA_TEST_EXCLUDES=(
- # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
- # test.class.pattern = *Test
- "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
- "org.apache.ivy.core.TestPerformance" # not in scope
- "org.apache.ivy.util.TestXmlHelper" # not in scope
- "org.apache.ivy.TestFixture" # not in scope
- "org.apache.ivy.TestHelper" # not in scope
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
- # <exclude name="**/Abstract*Test.java"/>
- "org.apache.ivy.util.url.AbstractURLHandlerTest"
- "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
- "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
- # following excluded tests cause test failures
- "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2
- "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1
- "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1
- "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1
- "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1
- "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16
- "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3
- "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1
- "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7
- "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1
- "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3
- "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3
- # following excluded tests can pass if run individually
- "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests)
- "org.apache.ivy.IvyTest" # OK (1 test)
- "org.apache.ivy.MainTest" # OK (12 tests)
- "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests)
- "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests)
- "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests)
- "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests)
- "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
- "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests)
- "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests)
- "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests)
- "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests)
- "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests)
- # Without PROPERTIES="test_network", the following test cause additional failures.
- "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
-# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
- "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
-# "org.apache.ivy.plugins.resolver.IBiblioResolverTest"
-# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
- "org.apache.ivy.util.url.ArtifactoryListingTest"
-# "org.apache.ivy.util.url.BasicURLHandlerTest"
-# "org.apache.ivy.util.url.HttpclientURLHandlerTest"
-)
-
-src_prepare() {
- default
-
- mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
- pushd "${JAVA_RESOURCE_DIRS}"
- cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
- cp -r "${S}"/src/java/* . || die
-
- # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
- # according to 210,221 build.xml and still in the upstream .jar file
- cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
- cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
-
- find . -type f -name '*.java' -exec rm -rf {} + || die
- popd || die
-}
-
-src_test() {
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
- # name="build-custom-resolver-jar"
- JAVA_SRC_DIR="test/custom-classpath"
- JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
- java-pkg-simple_src_compile
-
- # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318"
- jar -cf test.jar \
- -C test/java org/apache/ivy/plugins/parser/xml/license.xml \
- -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
-
- # Reduce number of failures to "Tests run: 1109, Failures: 98"
- jar -uf "test.jar" -C test/java . || die
-
- # Separate *.java files from test resources
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
- mkdir test-src || die
- cp -r test/java test-src/ || die
- find test -type f -name '*.java' -exec rm -rf {} + || die
-
- # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
- # name="prepare-test-jar-repositories"
- mkdir test/jar-repos || die
- jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
-# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
-
- java-pkg-simple_src_test
-}
-
-src_install() {
- default
- java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
- use doc && java-pkg_dojavadoc target/api
- use source && java-pkg_dosrc src/*
-}
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2024-04-15 10:17 Miroslav Šulc
0 siblings, 0 replies; 22+ messages in thread
From: Miroslav Šulc @ 2024-04-15 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 5cc09eb3ba8239c94e5ab8cb93d81eb966f13e90
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 12 20:40:18 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 10:15:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc09eb3
dev-java/ant-ivy: switch to dev-java/ant
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/8d6551f1f1e71c422722e9353d8b5351772f8979
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...ivy-2.5.0-r1.ebuild => ant-ivy-2.5.0-r2.ebuild} | 31 +++++++++++++++-------
dev-java/ant-ivy/metadata.xml | 4 +--
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
similarity index 94%
rename from dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
rename to dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
index fff42019b905..0158c70768f5 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi
DESCRIPTION="Ivy is a free java based dependency manager"
HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
@@ -21,7 +21,7 @@ PROPERTIES="test_network"
RESTRICT="test"
CDEPEND="
- dev-java/ant-core:0
+ >=dev-java/ant-1.10.14-r3:0
dev-java/bcpg:0
dev-java/bcprov:0
dev-java/httpcomponents-client
@@ -31,10 +31,7 @@ CDEPEND="
dev-java/jsch:0
dev-java/jsch-agent-proxy:0
test? (
- dev-java/ant-junit:0
- dev-java/ant-junit4:0
- dev-java/ant-junitlauncher:0
- dev-java/ant-testutil:0
+ >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil]
dev-java/hamcrest-core:1.3
dev-java/hamcrest-library:1.3
dev-java/xmlunit:1
@@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc )
S="${WORKDIR}/apache-ivy-${PV}"
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy"
+JAVA_GENTOO_CLASSPATH="
+ ant
+ bcpg
+ bcprov
+ httpcomponents-client-4
+ commons-vfs-2
+ httpcore
+ jakarta-oro-2.0
+ jsch
+ jsch-agent-proxy
+"
JAVA_MAIN_CLASS="org.apache.ivy.Main"
JAVA_SRC_DIR="src/java"
JAVA_RESOURCE_DIRS="resources/java"
-JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1"
+JAVA_TEST_GENTOO_CLASSPATH="
+ ant
+ hamcrest-core-1.3
+ hamcrest-library-1.3
+ junit-4
+ xmlunit-1
+"
JAVA_TEST_SRC_DIR="test-src/java"
JAVA_TEST_RESOURCE_DIRS="test"
JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml
index 91e2ba1cf10c..84db44eaed66 100644
--- a/dev-java/ant-ivy/metadata.xml
+++ b/dev-java/ant-ivy/metadata.xml
@@ -16,7 +16,7 @@
</longdescription>
<upstream>
<remote-id type="github">apache/ant-ivy</remote-id>
- <doc>https://ant.apache.org/ivy/history/2.5.0</doc>
- <bugs-to>https://issues.apache.org/jira/browse/IVY </bugs-to>
+ <doc>https://ant.apache.org/ivy/history/2.5.0/</doc>
+ <bugs-to>https://issues.apache.org/jira/browse/IVY</bugs-to>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
@ 2024-08-02 13:16 Miroslav Šulc
0 siblings, 0 replies; 22+ messages in thread
From: Miroslav Šulc @ 2024-08-02 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 93f7b061aad4eb13c7ac57f00466dbdb6c106807
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Aug 2 04:30:24 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 2 13:13:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f7b061
dev-java/ant-ivy: QA Notice, adjust dependency slot
Closes: https://bugs.gentoo.org/937043
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37921/commits/a5a81df44ff0cf97950da06d66f2fb6057e98173
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../ant-ivy/{ant-ivy-2.5.0-r2.ebuild => ant-ivy-2.5.0-r3.ebuild} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r3.ebuild
similarity index 99%
rename from dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
rename to dev-java/ant-ivy/ant-ivy-2.5.0-r3.ebuild
index 0158c70768f5..72671c7f135e 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r3.ebuild
@@ -12,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi
DESCRIPTION="Ivy is a free java based dependency manager"
HOMEPAGE="https://ant.apache.org/ivy/"
SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
+S="${WORKDIR}/apache-ivy-${PV}"
LICENSE="Apache-2.0"
SLOT="2"
@@ -24,7 +25,7 @@ CDEPEND="
>=dev-java/ant-1.10.14-r3:0
dev-java/bcpg:0
dev-java/bcprov:0
- dev-java/httpcomponents-client
+ dev-java/httpcomponents-client:4
dev-java/commons-vfs:2
dev-java/httpcore:0
dev-java/jakarta-oro:2.0
@@ -45,8 +46,6 @@ RDEPEND="${CDEPEND}
DOCS=( LICENSE NOTICE README.adoc )
-S="${WORKDIR}/apache-ivy-${PV}"
-
JAVA_GENTOO_CLASSPATH="
ant
bcpg
^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2024-08-02 13:16 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-12 12:18 [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-08-02 13:16 Miroslav Šulc
2024-04-15 10:17 Miroslav Šulc
2022-05-06 6:15 Miroslav Šulc
2022-05-05 18:04 Arthur Zamarin
2022-05-05 9:54 Jakov Smolić
2022-05-05 9:54 Jakov Smolić
2022-04-05 9:01 Florian Schmaus
2022-01-05 20:49 Florian Schmaus
2022-01-05 18:08 Arthur Zamarin
2022-01-03 10:22 Jakov Smolić
2022-01-03 9:17 Jakov Smolić
2021-12-04 16:27 Miroslav Šulc
2019-10-07 9:52 Agostino Sarubbo
2018-06-04 1:12 Aaron Bauman
2018-05-26 18:16 Aaron Bauman
2018-04-08 18:37 James Le Cuirot
2015-10-24 14:16 Patrice Clement
2015-10-24 14:16 Patrice Clement
2015-10-17 16:59 Patrice Clement
2015-08-10 18:39 Patrice Clement
2015-08-10 18:39 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox