[gentoo-commits] repo/gentoo:master commit in: dev-java/saaj/

[gentoo-commits] repo/gentoo:master commit in: dev-java/saaj/

[Patrice Clement]

commit:     dd5eddf0e6792db5ca1b56b0a07a34f451c013ca
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 20:49:20 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 09:50:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5eddf0

dev-java/saaj: clean up old.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-java/saaj/saaj-1.3.19-r1.ebuild | 67 -------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/dev-java/saaj/saaj-1.3.19-r1.ebuild b/dev-java/saaj/saaj-1.3.19-r1.ebuild
deleted file mode 100644
index 9ab5db100c4..00000000000
--- a/dev-java/saaj/saaj-1.3.19-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="SOAP with Attachments API for Java"
-HOMEPAGE="https://saaj.dev.java.net/"
-# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19
-# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-# jaf and saaj-api only for java 5
-COMMON_DEP="
-	dev-java/mimepull:0
-	dev-java/xerces:2
-	dev-java/xml-commons-external:1.4
-	java-virtuals/jaf:0
-	java-virtuals/saaj-api:0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
-# servlet-api 2.5 for java 5. 3.0 is java 6.
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit:0
-		dev-java/xalan:0
-		java-virtuals/servlet-api:2.5
-	)"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-
-	epatch "${FILESDIR}"/${P}-java-5-bootclasspath.patch
-
-	# YES! There's nothing like using com.sun...internal ! YAY!
-	find src -name '*.java' -exec sed -i \
-		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
-		-e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \
-		{} + || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="mimepull,jaf,saaj-api,xerces-2,xml-commons-external-1.4"
-
-EANT_TEST_TARGET="test-all"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar
-	dohtml -r docs/*
-
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/java/*
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/saaj/

[Patrice Clement]

commit:     a0189f4f88f9650efbec5b10f617877e7d3d6202
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 20:48:49 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 09:50:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0189f4f

dev-java/saaj: remove java-virtuals/jav dependency.

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --force

 dev-java/saaj/saaj-1.3.19-r2.ebuild | 74 +++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/dev-java/saaj/saaj-1.3.19-r2.ebuild b/dev-java/saaj/saaj-1.3.19-r2.ebuild
new file mode 100644
index 00000000000..e5ce1011c0e
--- /dev/null
+++ b/dev-java/saaj/saaj-1.3.19-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="SOAP with Attachments API for Java"
+HOMEPAGE="https://saaj.dev.java.net/"
+
+# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19
+# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+# saaj-api only for java 5
+CDEPEND="
+	dev-java/mimepull:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.4
+	java-virtuals/saaj-api:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+# servlet-api 2.5 for java 5. 3.0 is java 6.
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+		dev-java/xalan:0
+		java-virtuals/servlet-api:2.5
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-java-5-bootclasspath.patch )
+
+HTML_DOCS=( docs )
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	# YES! There's nothing like using com.sun...internal ! YAY!
+	find src -name '*.java' -exec sed -i \
+		-e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
+		-e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \
+		{} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="mimepull,saaj-api,xerces-2,xml-commons-external-1.4"
+
+EANT_TEST_TARGET="test-all"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/*
+	einstalldocs
+}