| 1 |
commit: cd027573b02c9480a75ac323558e62e7b4d56a90 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 18 12:33:37 2015 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 6 23:05:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd027573 |
| 7 |
|
| 8 |
dev-java/jaxme: EAPI bump and dependency clean up |
| 9 |
|
| 10 |
Use SLOTs on Java dependencies and use the new split antlr-2. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
...{jaxme-0.5.2-r1.ebuild => jaxme-0.5.2-r2.ebuild} | 21 +++++++++++++-------- |
| 15 |
1 file changed, 13 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild |
| 18 |
similarity index 88% |
| 19 |
rename from dev-java/jaxme/jaxme-0.5.2-r1.ebuild |
| 20 |
rename to dev-java/jaxme/jaxme-0.5.2-r2.ebuild |
| 21 |
index eb1e5ec..63bb8da 100644 |
| 22 |
--- a/dev-java/jaxme/jaxme-0.5.2-r1.ebuild |
| 23 |
+++ b/dev-java/jaxme/jaxme-0.5.2-r2.ebuild |
| 24 |
@@ -2,7 +2,7 @@ |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Id$ |
| 27 |
|
| 28 |
-EAPI="2" |
| 29 |
+EAPI="5" |
| 30 |
|
| 31 |
JAVA_PKG_IUSE="doc source" |
| 32 |
|
| 33 |
@@ -19,14 +19,16 @@ SLOT="0" |
| 34 |
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" |
| 35 |
IUSE="" |
| 36 |
|
| 37 |
-COMMON_DEP="dev-java/antlr:0[java] |
| 38 |
- >=dev-java/xerces-2.7 |
| 39 |
- =dev-java/junit-3.8* |
| 40 |
+COMMON_DEP=">=dev-java/antlr-2.7.7-r7:0 |
| 41 |
>=dev-java/log4j-1.2.8:0 |
| 42 |
+ dev-java/junit:0 |
| 43 |
dev-java/xmldb:0" |
| 44 |
-RDEPEND=">=virtual/jre-1.5 |
| 45 |
+ |
| 46 |
+RDEPEND=">=virtual/jre-1.6 |
| 47 |
+ dev-java/xerces:2 |
| 48 |
${COMMON_DEP}" |
| 49 |
-DEPEND=">=virtual/jdk-1.5 |
| 50 |
+ |
| 51 |
+DEPEND=">=virtual/jdk-1.6 |
| 52 |
dev-db/hsqldb:0 |
| 53 |
${COMMON_DEP}" |
| 54 |
|
| 55 |
@@ -41,7 +43,6 @@ java_prepare() { |
| 56 |
java-pkg_jarfrom antlr |
| 57 |
java-pkg_jarfrom junit |
| 58 |
java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar |
| 59 |
- java-pkg_jarfrom xerces-2 |
| 60 |
java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar |
| 61 |
java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar |
| 62 |
java-pkg_jarfrom --build-only ant-core ant.jar ant-1.5.4.jar |
| 63 |
@@ -76,13 +77,17 @@ src_compile() { |
| 64 |
} |
| 65 |
|
| 66 |
src_install() { |
| 67 |
+ # Not entirely optional but this avoids a warning at build time and |
| 68 |
+ # RDEPEND will enforce its presence anyway. |
| 69 |
+ java-pkg_register-optional-dependency xerces-2 |
| 70 |
+ |
| 71 |
pushd dist > /dev/null |
| 72 |
for jar in *.jar; do |
| 73 |
java-pkg_newjar ${jar} ${jar/-${PV}/} |
| 74 |
done |
| 75 |
popd > /dev/null |
| 76 |
|
| 77 |
- dodoc NOTICE || die |
| 78 |
+ dodoc NOTICE |
| 79 |
|
| 80 |
if use doc; then |
| 81 |
java-pkg_dojavadoc dist/doc/api |
Archives