* [gentoo-commits] repo/gentoo:master commit in: dev-java/jaxme/
@ 2015-12-06 23:06 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2015-12-06 23:06 UTC (permalink / raw
To: gentoo-commits
commit: cd027573b02c9480a75ac323558e62e7b4d56a90
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 12:33:37 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 23:05:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd027573
dev-java/jaxme: EAPI bump and dependency clean up
Use SLOTs on Java dependencies and use the new split antlr-2.
Package-Manager: portage-2.2.20.1
...{jaxme-0.5.2-r1.ebuild => jaxme-0.5.2-r2.ebuild} | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
similarity index 88%
rename from dev-java/jaxme/jaxme-0.5.2-r1.ebuild
rename to dev-java/jaxme/jaxme-0.5.2-r2.ebuild
index eb1e5ec..63bb8da 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="2"
+EAPI="5"
JAVA_PKG_IUSE="doc source"
@@ -19,14 +19,16 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-COMMON_DEP="dev-java/antlr:0[java]
- >=dev-java/xerces-2.7
- =dev-java/junit-3.8*
+COMMON_DEP=">=dev-java/antlr-2.7.7-r7:0
>=dev-java/log4j-1.2.8:0
+ dev-java/junit:0
dev-java/xmldb:0"
-RDEPEND=">=virtual/jre-1.5
+
+RDEPEND=">=virtual/jre-1.6
+ dev-java/xerces:2
${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+
+DEPEND=">=virtual/jdk-1.6
dev-db/hsqldb:0
${COMMON_DEP}"
@@ -41,7 +43,6 @@ java_prepare() {
java-pkg_jarfrom antlr
java-pkg_jarfrom junit
java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
- java-pkg_jarfrom xerces-2
java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
@@ -76,13 +77,17 @@ src_compile() {
}
src_install() {
+ # Not entirely optional but this avoids a warning at build time and
+ # RDEPEND will enforce its presence anyway.
+ java-pkg_register-optional-dependency xerces-2
+
pushd dist > /dev/null
for jar in *.jar; do
java-pkg_newjar ${jar} ${jar/-${PV}/}
done
popd > /dev/null
- dodoc NOTICE || die
+ dodoc NOTICE
if use doc; then
java-pkg_dojavadoc dist/doc/api
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jaxme/
@ 2016-01-14 21:44 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-01-14 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 208533381971609ab4cd4ede86b1684dc2be2588
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 20:44:07 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20853338
dev-java/jaxme: Mark 0.5.2-r2 stable using ALLARCHES policy
Package-Manager: portage-2.2.26
dev-java/jaxme/jaxme-0.5.2-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
index 63bb8da..c7a12df 100644
--- a/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,13 +10,13 @@ inherit java-pkg-2 java-ant-2 eutils
MY_PN=ws-${PN}
MY_P=${MY_PN}-${PV}
-DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding"
+DESCRIPTION="An open source implementation of JAXB, the specification for Java/XML binding"
HOMEPAGE="http://ws.apache.org/jaxme/index.html"
SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEP=">=dev-java/antlr-2.7.7-r7:0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jaxme/
@ 2016-01-14 21:44 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-01-14 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 3fad2ba585d774ec8c065cedf65c3505ceaba7ff
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 2 20:44:53 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fad2ba5
dev-java/jaxme: Remove old
Package-Manager: portage-2.2.26
dev-java/jaxme/jaxme-0.5.2.ebuild | 92 ---------------------------------------
1 file changed, 92 deletions(-)
diff --git a/dev-java/jaxme/jaxme-0.5.2.ebuild b/dev-java/jaxme/jaxme-0.5.2.ebuild
deleted file mode 100644
index c6f0acc..0000000
--- a/dev-java/jaxme/jaxme-0.5.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN=ws-${PN}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding"
-HOMEPAGE="http://ws.apache.org/jaxme/index.html"
-SRC_URI="mirror://apache/ws/${PN}/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="dev-java/antlr:0[java]
- >=dev-java/xerces-2.7
- =dev-java/junit-3.8*
- >=dev-java/log4j-1.2.8
- dev-java/xmldb:0"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- dev-db/hsqldb:0
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-# We do it later
-JAVA_PKG_BSFIX="off"
-
-java_prepare() {
- cd "${S}/prerequisites"
- rm *.jar
- java-pkg_jarfrom antlr
- java-pkg_jarfrom junit
- java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
- java-pkg_jarfrom xerces-2
- java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
- java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
- java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar
- java-pkg_jarfrom --build-only ant-core ant.jar ant.jar
- # no linking to it, should be used for tests only but used to generate stuff during build anyway
- java-pkg_jarfrom --build-only hsqldb hsqldb.jar hsqldb-1.7.1.jar
-
- # Special case: jaxme uses ant/*.xml files, so rewriting them by hand
- # is better:
- cd "${S}"
- for i in build.xml ant/*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
- java-ant_bsfix_one "${i}"
- done
-
- # Patch marshal classes to be abstract for build to succeed
- epatch "${FILESDIR}/${P}-fix_marshallers.patch"
-}
-
-EANT_TEST_ANT_TASKS="hsqldb"
-
-src_compile() {
- local ant_target="all"
- local ant_args=""
- if use doc; then
- ant_args="-Dbuild.apidocs=dist/doc/api"
- # The javadoc target depends on all so it is enough. Passing both results in two builds,
- # where the second pass fails due to hsqldb lock - bug #310311.
- ant_target="javadoc"
- fi
-
- eant ${ant_args} ${ant_target}
-}
-
-src_install() {
- pushd dist > /dev/null
- for jar in *.jar; do
- java-pkg_newjar ${jar} ${jar/-${PV}/}
- done
- popd > /dev/null
-
- dodoc NOTICE || die
-
- if use doc; then
- java-pkg_dojavadoc dist/doc/api
- dohtml -r src/documentation/manual
- fi
- use source && java-pkg_dosrc src/{pm,jaxme,js,api,webapp,xs}/*
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-14 21:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-06 23:06 [gentoo-commits] repo/gentoo:master commit in: dev-java/jaxme/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2016-01-14 21:44 James Le Cuirot
2016-01-14 21:44 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox