[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxr/
commit: c6ee70d0dd76aa6d191068b7cffebd7302f3b923
Author: Patrice Clement gentoo org>
AuthorDate: Mon Nov 2 19:47:02 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Nov 2 19:48:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ee70d0
dev-java/jaxr: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jaxr/jaxr-1.0.6-r1.ebuild | 68 --
1 file changed, 68 deletions(-)
diff --git a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
b/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
deleted file mode 100644
index 90a19b0..000
--- a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,68 +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 source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java API for XML Registries"
-HOMEPAGE="https://glassfish.dev.java.net/;
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-CDEPEND="dev-java/jaxb:2
- dev-java/jsr173:0
- dev-java/jsr67:0
- dev-java/jsr93:0
- dev-java/sun-jaf:0"
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}-ri"
-
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadoc-build"
-
-EANT_GENTOO_CLASSPATH="
- jaxb-2
- jsr67
- jsr173
- jsr93
- sun-jaf
-"
-
-java_prepare() {
- mkdir "${S}"/lib || die
-
- java-pkg_jar-from --into lib jaxb-2
- java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar
- java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar
- java-pkg_jar-from --into lib jsr93 jsr93-api.jar jaxr-api.jar
- java-pkg_jar-from --into lib sun-jaf
-
- epatch "${FILESDIR}/${P}-javadoc.patch"
-
- if use doc; then
- java-ant_xml-rewrite \
- -f "${S}"/build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
- fi
-}
-
-src_install() {
- java-pkg_dojar lib/${PN}-impl.jar
-
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/java/*
-
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxr/
commit: 877a9d40945c67d98dcebc60b333545fb2a32dd4
Author: Patrice Clement gentoo org>
AuthorDate: Mon Nov 2 19:45:36 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Nov 2 19:48:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877a9d40
dev-java/jaxr: Call java-pkg_jar-from with the correct jar name. Fixes bug
564708.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jaxr/jaxr-1.0.6-r2.ebuild | 71 ++
1 file changed, 71 insertions(+)
diff --git a/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
new file mode 100644
index 000..aadbcad
--- /dev/null
+++ b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java API for XML Registries"
+HOMEPAGE="https://glassfish.dev.java.net/;
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="
+ dev-java/jaxb:2
+ dev-java/jsr67:0
+ dev-java/jsr93:0
+ dev-java/jsr173:0"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-ri"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadoc-build"
+
+EANT_GENTOO_CLASSPATH="
+ jaxb-2
+ jsr67
+ jsr173
+ jsr93
+"
+
+java_prepare() {
+ mkdir "${S}"/lib || die
+
+ java-pkg_jar-from --into lib jaxb-2
+ java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar
+ java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar
+ java-pkg_jar-from --into lib jsr93
+
+ epatch "${FILESDIR}/${P}-javadoc.patch"
+
+ if use doc; then
+ java-ant_xml-rewrite \
+ -f "${S}"/build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+ fi
+}
+
+src_install() {
+ java-pkg_dojar lib/${PN}-impl.jar
+
+ use doc && java-pkg_dojavadoc javadoc
+ use source && java-pkg_dosrc src/java/*
+
+}
