public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2017-01-29 15:41 Fabian Groffen
  0 siblings, 0 replies; 14+ messages in thread
From: Fabian Groffen @ 2017-01-29 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     f40e81533d0e04051d678b551ae6688067df68a1
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 15:38:05 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 15:38:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40e8153

dev-java/ant-contrib: dropped ~x86-freebsd

Package-Manager: portage-2.3.3

 dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
index a8da547..70b3f09 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
 RDEPEND=">=virtual/jre-1.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2017-03-26 22:06 James Le Cuirot
  0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2017-03-26 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     638f8fb4a88559a06973c3e38dac0e919fe8e9fb
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 22:04:07 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 22:04:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=638f8fb4

dev-java/ant-contrib: EAPI bump to 6, fix deps (bug #581938)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../ant-contrib/ant-contrib-1.0_beta3-r2.ebuild    | 80 ++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
new file mode 100644
index 00000000000..973516ec43c
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-ivy"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A collection of tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+CP_DEPEND="
+	>=dev-java/ant-core-1.7.0:0
+	dev-java/ant-ivy:0
+	>=dev-java/bcel-5.1:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.4"
+
+# javatoolkit for cElementTree
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.4
+	>=dev-java/javatoolkit-0.3.0-r2"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/tests-visibility.patch )
+
+rewrite_build_xml() {
+	python <<EOF
+import xml.etree.cElementTree as et
+tree = et.ElementTree(file='build.xml')
+root = tree.getroot()
+root.append(et.Element('path',id='test.classpath'))
+root.append(et.Element('path',id='compile.classpath'))
+skip=['resolve','classpath']
+for target in tree.getiterator("target"):
+	if target.attrib['name'] in skip:
+		target.attrib['if'] = 'false'
+
+tree.write('build.xml')
+EOF
+	[[ $? != 0 ]] && die "Removing taskdefs failed"
+}
+
+src_prepare() {
+	default
+	rewrite_build_xml
+	java-pkg_clean
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
+
+# Can't load bcel for some reason
+RESTRICT="test"
+# for tests
+EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc target/docs/api
+	use source && java-pkg_dosrc src/java/net
+
+	java-pkg_dohtml -r docs/manual
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2017-03-26 22:06 James Le Cuirot
  0 siblings, 0 replies; 14+ messages in thread
From: James Le Cuirot @ 2017-03-26 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f1eb2d1bf79a062717957e8ef6578327c7d96d57
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 22:06:09 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 22:06:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1eb2d1b

dev-java/ant-contrib: Remove old 1.0_beta3-r1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../ant-contrib/ant-contrib-1.0_beta3-r1.ebuild    | 77 ----------------------
 1 file changed, 77 deletions(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
deleted file mode 100644
index e4d590a7e84..00000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-ivy"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-#	test? ( dev-java/ant-junit dev-java/ant-testutil )
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/bcel-5.1:0
-	dev-java/commons-httpclient:3
-	dev-java/xerces:2
-	dev-java/ant-ivy:0
-	>=dev-java/ant-core-1.7.0"
-
-# javatoolkit for cElementTree
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/javatoolkit-0.3.0-r2
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-rewrite_build_xml() {
-	python <<EOF
-import xml.etree.cElementTree as et
-tree = et.ElementTree(file='build.xml')
-root = tree.getroot()
-root.append(et.Element('path',id='test.classpath'))
-root.append(et.Element('path',id='compile.classpath'))
-skip=['resolve','classpath']
-for target in tree.getiterator("target"):
-	if target.attrib['name'] in skip:
-		target.attrib['if'] = 'false'
-
-tree.write('build.xml')
-EOF
-	[[ $? != 0 ]] && die "Removing taskdefs failed"
-}
-
-java_prepare() {
-	epatch "${FILESDIR}/tests-visibility.patch"
-
-	find . -name "*.jar" -print -delete || die
-
-	rewrite_build_xml
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="ant-core,bcel,commons-httpclient-3,xerces-2,ant-ivy"
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-
-# Can't load bcel for some reason
-RESTRICT="test"
-# for tests
-EANT_GENTOO_CLASSPATH_EXTRA="target/${PN}.jar"
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc target/docs/api
-	use source && java-pkg_dosrc src/java/net
-
-	java-pkg_dohtml -r docs/manual
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2019-10-07  9:52 Agostino Sarubbo
  0 siblings, 0 replies; 14+ messages in thread
From: Agostino Sarubbo @ 2019-10-07  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     4439ae617834351f913b0811e3781508b0e7e040
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 09:52:03 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 09:52:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4439ae61

dev-java/ant-contrib: 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-contrib/ant-contrib-1.0_beta3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
index 7b66b2a41e2..8bab213a6bd 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 
 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"
 
 #	test? ( dev-java/ant-junit dev-java/ant-testutil )
 CP_DEPEND="


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2019-10-07 13:53 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-10-07 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     cd2b0ca1a97d0f27a637e8b7ccaacfd3c31f79d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 13:15:50 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 13:53:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2b0ca1

dev-java/ant-contrib: Drop old (EAPI=0)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/ant-contrib/Manifest                      |  1 -
 .../ant-contrib/ant-contrib-1.0_beta2-r2.ebuild    | 62 ----------------------
 2 files changed, 63 deletions(-)

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 00cbebe0371..8290b6b58b9 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,2 +1 @@
-DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
deleted file mode 100644
index 8b10e01db51..00000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ /dev/null
@@ -1,62 +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
-
-DESCRIPTION="A collection of tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-#	test? ( dev-java/ant-junit dev-java/ant-testutil )
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/bcel-5.1
-	>=dev-java/xerces-2.7
-	>=dev-java/ant-core-1.7.0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/tests-visibility.patch"
-	cd "${S}/lib"
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
-	java-pkg_jar-from xerces-2
-}
-
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-EANT_DOC_TARGET="docs"
-
-# The tests fail to find bcel and fail
-RESTRICT="test"
-
-src_test() {
-	cd test/lib || die
-	java-pkg_jar-from junit junit.jar junit-3.8.1.jar
-	java-pkg_jar-from ant-testutil
-	cd "${S}"
-	local testutil=$(java-pkg_getjars ant-testutil)
-	EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_register-ant-task
-	dodoc README.txt || die
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/net
-	java-pkg_dohtml -r manual
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2019-10-07 14:39 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-10-07 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     072554496d348720f94caca7bf0a571813a21122
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  7 14:38:44 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct  7 14:39:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07255449

dev-java/ant-contrib: Revert "Drop old (EAPI=0)"

Needed by net-im/openfire.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/ant-contrib/Manifest                      |  1 +
 .../ant-contrib/ant-contrib-1.0_beta2-r2.ebuild    | 62 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 8290b6b58b9..00cbebe0371 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1 +1,2 @@
+DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
new file mode 100644
index 00000000000..8b10e01db51
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -0,0 +1,62 @@
+# 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
+
+DESCRIPTION="A collection of tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
+#	test? ( dev-java/ant-junit dev-java/ant-testutil )
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1
+	>=dev-java/xerces-2.7
+	>=dev-java/ant-core-1.7.0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/tests-visibility.patch"
+	cd "${S}/lib"
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
+	java-pkg_jar-from xerces-2
+}
+
+EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
+EANT_DOC_TARGET="docs"
+
+# The tests fail to find bcel and fail
+RESTRICT="test"
+
+src_test() {
+	cd test/lib || die
+	java-pkg_jar-from junit junit.jar junit-3.8.1.jar
+	java-pkg_jar-from ant-testutil
+	cd "${S}"
+	local testutil=$(java-pkg_getjars ant-testutil)
+	EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_register-ant-task
+	dodoc README.txt || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/net
+	java-pkg_dohtml -r manual
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2019-11-10 13:03 Michał Górny
  0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2019-11-10 13:03 UTC (permalink / raw
  To: gentoo-commits

commit:     0daa2a38e53fe9eeb6c92f1417eafe1f06b38e62
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 13:02:56 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 13:03:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0daa2a38

dev-java/ant-contrib: Remove old (EAPI 0)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/ant-contrib/Manifest                      |  1 -
 .../ant-contrib/ant-contrib-1.0_beta2-r2.ebuild    | 62 ----------------------
 2 files changed, 63 deletions(-)

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 00cbebe0371..8290b6b58b9 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,2 +1 @@
-DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
deleted file mode 100644
index 8b10e01db51..00000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ /dev/null
@@ -1,62 +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
-
-DESCRIPTION="A collection of tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-#	test? ( dev-java/ant-junit dev-java/ant-testutil )
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/bcel-5.1
-	>=dev-java/xerces-2.7
-	>=dev-java/ant-core-1.7.0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/tests-visibility.patch"
-	cd "${S}/lib"
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
-	java-pkg_jar-from xerces-2
-}
-
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-EANT_DOC_TARGET="docs"
-
-# The tests fail to find bcel and fail
-RESTRICT="test"
-
-src_test() {
-	cd test/lib || die
-	java-pkg_jar-from junit junit.jar junit-3.8.1.jar
-	java-pkg_jar-from ant-testutil
-	cd "${S}"
-	local testutil=$(java-pkg_getjars ant-testutil)
-	EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_register-ant-task
-	dodoc README.txt || die
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/net
-	java-pkg_dohtml -r manual
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2021-04-16 12:54 Miroslav Šulc
  0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2021-04-16 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7e31a384e1c2247c748dd778dac0acc786320409
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 15 17:28:35 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 12:54:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e31a384

dev-java/ant-contrib: bump to 1.0_beta6_pre20201123

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20398
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/ant-contrib/Manifest                      |  1 +
 .../ant-contrib-1.0_beta6_pre20201123.ebuild       | 75 ++++++++++++++++++++++
 dev-java/ant-contrib/metadata.xml                  |  1 +
 3 files changed, 77 insertions(+)

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 8290b6b58b9..8b26c2ae497 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1 +1,2 @@
+DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
new file mode 100644
index 00000000000..f652e7eadd7
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
+DESCRIPTION="Ant-contrib tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net:80"
+SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
+# org.apache.ant:ant:1.9.15 -> >=dev-java/ant-core-1.10.9:0
+# org.apache.bcel:bcel:5.1 -> >=dev-java/bcel-6.5.0:0
+# org.apache.ivy:ivy:2.5.0 -> >=dev-java/ant-ivy-2.5.0:2
+# org.jvnet.hudson:ivy:1.4.1 -> !!!groupId-not-found!!!
+# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
+
+CDEPEND="
+	>=dev-java/ant-core-1.10.9:0
+	>=dev-java/ant-ivy-2.3.0:2
+	>=dev-java/bcel-6.5.0:0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/xerces-2.12.0:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/ant-core-1.10.9:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
+
+#	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_SRC_DIR="test/src"
+JAVA_TEST_RESOURCE_DIRS="test/resources"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^import/s/fr.jayasoft.ivy.ant/org.apache.ivy.ant/' \
+		src/main/java/net/sf/antcontrib/net/Ivy14Adapter.java || die
+}

diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
index 5c1224a74c6..b0770934cd3 100644
--- a/dev-java/ant-contrib/metadata.xml
+++ b/dev-java/ant-contrib/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ant-contrib</remote-id>
+		<remote-id type="github">cniweb/ant-contrib</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2021-12-07  7:52 Miroslav Šulc
  0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2021-12-07  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     da844b711a74f680e4dda0e293fdb8047a1ac256
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Dec  5 21:53:02 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 07:52:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da844b71

dev-java/ant-contrib: remove obsolete version

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23192/commits/a150e5b7231089dab223f485ccbdfb381bf208d3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../ant-contrib-1.0_beta6_pre20201123.ebuild       | 75 ----------------------
 1 file changed, 75 deletions(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
deleted file mode 100644
index f652e7eadd71..000000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
-DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net:80"
-SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
-# org.apache.ant:ant:1.9.15 -> >=dev-java/ant-core-1.10.9:0
-# org.apache.bcel:bcel:5.1 -> >=dev-java/bcel-6.5.0:0
-# org.apache.ivy:ivy:2.5.0 -> >=dev-java/ant-ivy-2.5.0:2
-# org.jvnet.hudson:ivy:1.4.1 -> !!!groupId-not-found!!!
-# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
-
-CDEPEND="
-	>=dev-java/ant-core-1.10.9:0
-	>=dev-java/ant-ivy-2.3.0:2
-	>=dev-java/bcel-6.5.0:0
-	>=dev-java/commons-httpclient-3.1:3
-	>=dev-java/xerces-2.12.0:2
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
-# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		>=dev-java/ant-core-1.10.9:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
-
-#	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
-JAVA_TEST_SRC_DIR="test/src"
-JAVA_TEST_RESOURCE_DIRS="test/resources"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^import/s/fr.jayasoft.ivy.ant/org.apache.ivy.ant/' \
-		src/main/java/net/sf/antcontrib/net/Ivy14Adapter.java || die
-}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2021-12-07  7:52 Miroslav Šulc
  0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2021-12-07  7:52 UTC (permalink / raw
  To: gentoo-commits

commit:     5b0f62ad73551bcd1d113ccfc46d3296fd612c21
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Nov 11 11:09:47 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 07:52:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0f62ad

dev-java/ant-contrib: EAPI 8, restrict test

Bug: https://bugs.gentoo.org/784803
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23192/commits/3ac55bdf57671654e35edc0ac74f5ba4b7b5f807
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../ant-contrib-1.0_beta6_pre20201123-r1.ebuild    | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
new file mode 100644
index 000000000000..9c12dd37e55a
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
+DESCRIPTION="Ant-contrib tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net"
+SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Too many tests fail
+RESTRICT="test"
+
+# Common dependencies
+# POM: pom.xml
+# commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
+# org.apache.ant:ant:1.9.15 -> >=dev-java/ant-core-1.10.9:0
+# org.apache.bcel:bcel:5.1 -> >=dev-java/bcel-6.5.0:0
+# org.apache.ivy:ivy:2.5.0 -> >=dev-java/ant-ivy-2.5.0:2
+# org.jvnet.hudson:ivy:1.4.1 -> !!!groupId-not-found!!!
+# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/ant-ivy:2
+	dev-java/bcel:0
+	dev-java/commons-httpclient:3
+	dev-java/xerces:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
+
+#	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_SRC_DIR="test/src"
+JAVA_TEST_RESOURCE_DIRS="test/resources"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^import/s/fr.jayasoft.ivy.ant/org.apache.ivy.ant/' \
+		src/main/java/net/sf/antcontrib/net/Ivy14Adapter.java || die
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2021-12-07 23:49 Sam James
  0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-12-07 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     6a82283d8af00a981b9cca23f724b8382158eef7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  7 23:49:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  7 23:49:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a82283d

dev-java/ant-contrib: Stabilize 1.0_beta6_pre20201123-r1 x86, #783891

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
index 9c12dd37e55a..3300bc721d90 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 # Too many tests fail
 RESTRICT="test"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2021-12-09 16:22 Agostino Sarubbo
  0 siblings, 0 replies; 14+ messages in thread
From: Agostino Sarubbo @ 2021-12-09 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     3029556ab3492bf2c82432087641c5f6ae37026b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 16:21:27 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 16:21:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3029556a

dev-java/ant-contrib: amd64 stable wrt bug #783891

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
index 3300bc721d90..e66e9ff2ddd9 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Too many tests fail
 RESTRICT="test"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2021-12-09 16:23 Agostino Sarubbo
  0 siblings, 0 replies; 14+ messages in thread
From: Agostino Sarubbo @ 2021-12-09 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     ce04e26defa1da276b09726b2feb3686e73cd919
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 16:23:15 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 16:23:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce04e26d

dev-java/ant-contrib: ppc64 stable wrt bug #783891

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
index e66e9ff2ddd9..38db7e73b27e 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Too many tests fail
 RESTRICT="test"


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/
@ 2024-04-16  7:48 Miroslav Šulc
  0 siblings, 0 replies; 14+ messages in thread
From: Miroslav Šulc @ 2024-04-16  7:48 UTC (permalink / raw
  To: gentoo-commits

commit:     3d1925ec6763f68571ad8ebafd5712ded2102d2a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 12 21:21:03 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 07:48:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1925ec

dev-java/ant-contrib: switch to dev-java/ant

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/5bd77e9d5ae28d7598f1cda12969f7d8962999cb
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...ild => ant-contrib-1.0_beta6_pre20201123-r2.ebuild} | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
similarity index 76%
rename from dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
rename to dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
index 38db7e73b27e..172467ec6ed4 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -14,8 +11,9 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
 DESCRIPTION="Ant-contrib tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net"
+HOMEPAGE="https://ant-contrib.sourceforge.net/"
 SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -34,7 +32,7 @@ RESTRICT="test"
 # xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
 
 CDEPEND="
-	dev-java/ant-core:0
+	>=dev-java/ant-1.10.14-r3:0
 	dev-java/ant-ivy:2
 	dev-java/bcel:0
 	dev-java/commons-httpclient:3
@@ -49,20 +47,18 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	>=virtual/jdk-1.8:*
 	test? (
-		dev-java/ant-core:0
+		>=dev-java/ant-1.10.14-r3:0[junit4]
 	)"
 
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.8:*"
 
-S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
-
 #	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy-2,xerces-2"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant"
 JAVA_TEST_SRC_DIR="test/src"
 JAVA_TEST_RESOURCE_DIRS="test/resources"
 


^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-04-16  7:48 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-26 22:06 [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-contrib/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2024-04-16  7:48 Miroslav Šulc
2021-12-09 16:23 Agostino Sarubbo
2021-12-09 16:22 Agostino Sarubbo
2021-12-07 23:49 Sam James
2021-12-07  7:52 Miroslav Šulc
2021-12-07  7:52 Miroslav Šulc
2021-04-16 12:54 Miroslav Šulc
2019-11-10 13:03 Michał Górny
2019-10-07 14:39 Michał Górny
2019-10-07 13:53 Michał Górny
2019-10-07  9:52 Agostino Sarubbo
2017-03-26 22:06 James Le Cuirot
2017-01-29 15:41 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox