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
