| 1 |
sera 12/06/05 13:44:14 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: dom4j-1.6.1-r4.ebuild |
| 5 |
Log: |
| 6 |
Rev and EAPI bump. Make better use of eclasses. Cleanup. |
| 7 |
Drop deps on xalan, xerces, msv and xml-commons-external. Also solves slot |
| 8 |
conflict with xml-commons-external. #419603 |
| 9 |
Replace jsr173 with virtual stax-api. |
| 10 |
Don't let jre rdep leak into DEPEND, confuses vm switching code. |
| 11 |
Disable one additionl test failing with jdk 7. |
| 12 |
|
| 13 |
(Portage version: 2.1.10.62/cvs/Linux x86_64) |
| 14 |
|
| 15 |
Revision Changes Path |
| 16 |
1.57 dev-java/dom4j/ChangeLog |
| 17 |
|
| 18 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/ChangeLog?rev=1.57&view=markup |
| 19 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/ChangeLog?rev=1.57&content-type=text/plain |
| 20 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/ChangeLog?r1=1.56&r2=1.57 |
| 21 |
|
| 22 |
Index: ChangeLog |
| 23 |
=================================================================== |
| 24 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v |
| 25 |
retrieving revision 1.56 |
| 26 |
retrieving revision 1.57 |
| 27 |
diff -u -r1.56 -r1.57 |
| 28 |
--- ChangeLog 15 Apr 2012 18:47:52 -0000 1.56 |
| 29 |
+++ ChangeLog 5 Jun 2012 13:44:14 -0000 1.57 |
| 30 |
@@ -1,6 +1,16 @@ |
| 31 |
# ChangeLog for dev-java/dom4j |
| 32 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 33 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.56 2012/04/15 18:47:52 vapier Exp $ |
| 34 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.57 2012/06/05 13:44:14 sera Exp $ |
| 35 |
+ |
| 36 |
+*dom4j-1.6.1-r4 (05 Jun 2012) |
| 37 |
+ |
| 38 |
+ 05 Jun 2012; Ralph Sennhauser <sera@g.o> +dom4j-1.6.1-r4.ebuild: |
| 39 |
+ Rev and EAPI bump. Make better use of eclasses. Cleanup. |
| 40 |
+ Drop deps on xalan, xerces, msv and xml-commons-external. Also solves slot |
| 41 |
+ conflict with xml-commons-external. #419603 |
| 42 |
+ Replace jsr173 with virtual stax-api. |
| 43 |
+ Don't let jre rdep leak into DEPEND, confuses vm switching code. |
| 44 |
+ Disable one additionl test failing with jdk 7. |
| 45 |
|
| 46 |
15 Apr 2012; Mike Frysinger <vapier@g.o> dom4j-1.6.1-r3.ebuild: |
| 47 |
Add back ia64 love #349020 by Dennis Schridde. |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 dev-java/dom4j/dom4j-1.6.1-r4.ebuild |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r4.ebuild?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r4.ebuild?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: dom4j-1.6.1-r4.ebuild |
| 57 |
=================================================================== |
| 58 |
# Copyright 1999-2012 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r4.ebuild,v 1.1 2012/06/05 13:44:14 sera Exp $ |
| 61 |
|
| 62 |
EAPI=4 |
| 63 |
|
| 64 |
JAVA_PKG_IUSE="doc source test" |
| 65 |
|
| 66 |
inherit java-pkg-2 java-ant-2 |
| 67 |
|
| 68 |
DESCRIPTION="Java library for working with XML" |
| 69 |
HOMEPAGE="http://dom4j.sourceforge.net/" |
| 70 |
SRC_URI=" |
| 71 |
mirror://sourceforge/dom4j/${P}.tar.gz |
| 72 |
mirror://gentoo/${P}-java5.patch.bz2" |
| 73 |
|
| 74 |
LICENSE="dom4j" |
| 75 |
SLOT="1" |
| 76 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 77 |
IUSE="" |
| 78 |
|
| 79 |
COMMON_DEP=" |
| 80 |
dev-java/jaxme:0 |
| 81 |
dev-java/relaxng-datatype:0 |
| 82 |
dev-java/xpp2:0 |
| 83 |
dev-java/xpp3:0 |
| 84 |
dev-java/xsdlib:0 |
| 85 |
java-virtuals/stax-api:0" |
| 86 |
RDEPEND="${COMMON_DEP} |
| 87 |
>=virtual/jre-1.5" |
| 88 |
DEPEND="${COMMON_DEP} |
| 89 |
>=virtual/jdk-1.5 |
| 90 |
test? ( |
| 91 |
dev-java/ant-junit:0 |
| 92 |
dev-java/junitperf:0 |
| 93 |
)" |
| 94 |
|
| 95 |
java_prepare() { |
| 96 |
# Circular deps with jaxen #212993 |
| 97 |
find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die |
| 98 |
|
| 99 |
# Add missing methods to compile on Java 5 #137970 |
| 100 |
epatch "${WORKDIR}/${P}-java5.patch" |
| 101 |
} |
| 102 |
|
| 103 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
| 104 |
JAVA_ANT_CLASSPATH_TAGS+=" javadoc" |
| 105 |
|
| 106 |
EANT_BUILD_TARGET="clean package" |
| 107 |
EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,stax-api,xpp2,xpp3,xsdlib" |
| 108 |
EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar" |
| 109 |
EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api" |
| 110 |
|
| 111 |
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf" |
| 112 |
|
| 113 |
src_test() { |
| 114 |
# Needs X11 |
| 115 |
rm -v src/test/org/dom4j/bean/BeansTest.java || die |
| 116 |
# Fails with a 1.6 JDK for some reason |
| 117 |
rm -v src/test/org/dom4j/io/StaxTest.java || die |
| 118 |
# Fails with a 1.7 JDK for some reason |
| 119 |
rm -v src/test/org/dom4j/rule/RuleTest.java || die |
| 120 |
|
| 121 |
java-pkg-2_src_test |
| 122 |
} |
| 123 |
|
| 124 |
src_install() { |
| 125 |
java-pkg_dojar build/${PN}.jar |
| 126 |
use doc && java-pkg_dojavadoc build/doc/api |
| 127 |
use source && java-pkg_dosrc src/java/* |
| 128 |
} |
Archives