Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java:master commit in: dev-java/dom4j/
Date: Sun, 21 Feb 2016 21:20:27
Message-Id: 1456089204.f3289a768b8248c469612202dde0c685b65dbfda.chewi@gentoo
1 commit: f3289a768b8248c469612202dde0c685b65dbfda
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 21 21:13:24 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 21 21:13:24 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=f3289a76
7
8 dev-java/dom4j: Remove because tree version no longer depends on jaxme
9
10 dev-java/dom4j/Manifest | 2 -
11 dev-java/dom4j/dom4j-1.6.1-r4.ebuild | 71 ------------------------------------
12 dev-java/dom4j/metadata.xml | 8 ----
13 3 files changed, 81 deletions(-)
14
15 diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
16 deleted file mode 100644
17 index fed26d1..0000000
18 --- a/dev-java/dom4j/Manifest
19 +++ /dev/null
20 @@ -1,2 +0,0 @@
21 -DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 WHIRLPOOL c3e56098f9a75340243e554f11e8cddbbf3e56cd13f0dc9650151ed5ec2b3914e33921174ad275f089188033f95d33386cd4642196bdc7cc6d9bce980c0251c8
22 -DIST dom4j-1.6.1.tar.gz 9687211 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 WHIRLPOOL 3edd7c8f629465add6fcbb944eadd75b1e8fd84120c1adf2fa24d43ae04856162d18652892697a2605c1006f1e7d3e5837e30a13e01ab7d1a101614b6dc4f8d0
23
24 diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
25 deleted file mode 100644
26 index 94cf2c7..0000000
27 --- a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
28 +++ /dev/null
29 @@ -1,71 +0,0 @@
30 -# Copyright 1999-2015 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -# $Id$
33 -
34 -EAPI=4
35 -
36 -JAVA_PKG_IUSE="doc source test"
37 -
38 -inherit java-pkg-2 java-ant-2
39 -
40 -DESCRIPTION="Java library for working with XML"
41 -HOMEPAGE="http://dom4j.sourceforge.net/"
42 -SRC_URI="
43 - mirror://sourceforge/dom4j/${P}.tar.gz
44 - mirror://gentoo/${P}-java5.patch.bz2"
45 -
46 -LICENSE="dom4j"
47 -SLOT="1"
48 -KEYWORDS="~amd64"
49 -IUSE=""
50 -
51 -COMMON_DEP="
52 - java-virtuals/jaxb-api:2
53 - dev-java/relaxng-datatype:0
54 - dev-java/xpp2:0
55 - dev-java/xpp3:0
56 - dev-java/xsdlib:0
57 - java-virtuals/stax-api:0"
58 -RDEPEND="${COMMON_DEP}
59 - >=virtual/jre-1.5"
60 -DEPEND="${COMMON_DEP}
61 - >=virtual/jdk-1.5
62 - test? (
63 - dev-java/ant-junit:0
64 - dev-java/junitperf:0
65 - )"
66 -
67 -java_prepare() {
68 - # Circular deps with jaxen #212993
69 - find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
70 -
71 - # Add missing methods to compile on Java 5 #137970
72 - epatch "${WORKDIR}/${P}-java5.patch"
73 -}
74 -
75 -JAVA_ANT_REWRITE_CLASSPATH="yes"
76 -JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
77 -
78 -EANT_BUILD_TARGET="clean package"
79 -EANT_GENTOO_CLASSPATH="jaxb-api-2,relaxng-datatype,stax-api,xpp2,xpp3,xsdlib"
80 -EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
81 -EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
82 -
83 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
84 -
85 -src_test() {
86 - # Needs X11
87 - rm -v src/test/org/dom4j/bean/BeansTest.java || die
88 - # Fails with a 1.6 JDK for some reason
89 - rm -v src/test/org/dom4j/io/StaxTest.java || die
90 - # Fails with a 1.7 JDK for some reason
91 - rm -v src/test/org/dom4j/rule/RuleTest.java || die
92 -
93 - java-pkg-2_src_test
94 -}
95 -
96 -src_install() {
97 - java-pkg_dojar build/${PN}.jar
98 - use doc && java-pkg_dojavadoc build/doc/api
99 - use source && java-pkg_dosrc src/java/*
100 -}
101
102 diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
103 deleted file mode 100644
104 index d54f3dd..0000000
105 --- a/dev-java/dom4j/metadata.xml
106 +++ /dev/null
107 @@ -1,8 +0,0 @@
108 -<?xml version="1.0" encoding="UTF-8"?>
109 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
110 -<pkgmetadata>
111 - <herd>java</herd>
112 - <longdescription>
113 - Easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP.
114 - </longdescription>
115 -</pkgmetadata>