From a143d46678ce9a56bec04ab58874e310625896cf Mon Sep 17 00:00:00 2001
From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Wed, 14 Apr 2021 10:39:44 +0200
Subject: dev-java/wsdl4j: min java 1.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild | 61 ++++++++++++++++++++++++++++++++++
 dev-java/wsdl4j/wsdl4j-1.6.2.ebuild    | 61 ----------------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
 delete mode 100644 dev-java/wsdl4j/wsdl4j-1.6.2.ebuild

(limited to 'dev-java/wsdl4j')

diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..2543074e32b0
--- /dev/null
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
+HOMEPAGE="http://wsdl4j.sourceforge.net"
+
+TCK="jwsdltck"
+TCK_V="1.2"
+
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
+	test? ( mirror://sourceforge/${TCK}/${TCK}-bin-${TCK_V}.zip )"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+# tests fail with encoding errors
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/junit:0 )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${P//./_}"
+TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
+
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_prepare() {
+	default
+	if use test; then
+		rm -v "${TCK_S}"/lib/*.jar || die
+		eapply "${FILESDIR}/1.6.2-tests-sandbox.patch"
+	fi
+}
+
+src_test() {
+	ln -s "${TCK_S}" test || die
+	cd "${TCK_S}" || die
+	java-ant_rewrite-classpath
+	local junit="$(java-pkg_getjars junit)"
+	eant -Dbuild.lib="${S}/test/lib" compile \
+		-Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
+	cd "${S}" || die
+	mkdir "${T}/lib" || die
+	ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/*.jar
+
+	use doc && java-pkg_dojavadoc build/javadocs/
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
deleted file mode 100644
index 671b3781782a..000000000000
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
-HOMEPAGE="http://wsdl4j.sourceforge.net"
-
-TCK="jwsdltck"
-TCK_V="1.2"
-
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
-	test? ( mirror://sourceforge/${TCK}/${TCK}-bin-${TCK_V}.zip )"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-# tests fail with encoding errors
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit:0 )
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P//./_}"
-TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
-
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
-src_prepare() {
-	default
-	if use test; then
-		rm -v "${TCK_S}"/lib/*.jar || die
-		eapply "${FILESDIR}/1.6.2-tests-sandbox.patch"
-	fi
-}
-
-src_test() {
-	ln -s "${TCK_S}" test || die
-	cd "${TCK_S}" || die
-	java-ant_rewrite-classpath
-	local junit="$(java-pkg_getjars junit)"
-	eant -Dbuild.lib="${S}/test/lib" compile \
-		-Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
-	cd "${S}" || die
-	mkdir "${T}/lib" || die
-	ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/*.jar
-
-	use doc && java-pkg_dojavadoc build/javadocs/
-	use source && java-pkg_dosrc src/*
-}
-- 
cgit v1.2.3-65-gdbad