commit: 861b03494f54542d3d13acb3c972abdf9a1d556e Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Aug 6 23:37:44 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Aug 6 23:37:44 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=861b0349
[dev-java/dom4j] Drop old, no rdep Package-Manager: portage-2.2.20 dev-java/dom4j/Manifest | 1 - dev-java/dom4j/dom4j-1.4-r1.ebuild | 61 --------- dev-java/dom4j/files/AbstractNode.java.diff | 11 -- dev-java/dom4j/files/DefaultXPath.java.diff | 26 ---- dev-java/dom4j/files/DocumentFactory.java.diff | 37 ------ dev-java/dom4j/files/DocumentHelper.java.diff | 11 -- .../dom4j/files/ProxyDocumentFactory.java.diff | 11 -- dev-java/dom4j/files/ProxyXmlStartTag.java.diff | 22 --- dev-java/dom4j/files/XPathPattern.java.diff | 22 --- dev-java/dom4j/files/fop.patch | 19 --- dev-java/dom4j/files/makethingscompile.diff | 147 --------------------- 11 files changed, 368 deletions(-) diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest index 98176f0..fed26d1 100644 --- a/dev-java/dom4j/Manifest +++ b/dev-java/dom4j/Manifest @@ -1,3 +1,2 @@ -DIST dom4j-1.4.tar.gz 12100149 SHA256 15aa02123c1e9407002ca927bacd0296b4128e112f955552bab392c8c37ea6d7 DIST dom4j-1.6.1-java5.patch.bz2 2900 SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 WHIRLPOOL c3e56098f9a75340243e554f11e8cddbbf3e56cd13f0dc9650151ed5ec2b3914e33921174ad275f089188033f95d33386cd4642196bdc7cc6d9bce980c0251c8 DIST dom4j-1.6.1.tar.gz 9687211 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 WHIRLPOOL 3edd7c8f629465add6fcbb944eadd75b1e8fd84120c1adf2fa24d43ae04856162d18652892697a2605c1006f1e7d3e5837e30a13e01ab7d1a101614b6dc4f8d0 diff --git a/dev-java/dom4j/dom4j-1.4-r1.ebuild b/dev-java/dom4j/dom4j-1.4-r1.ebuild deleted file mode 100644 index 29177be..0000000 --- a/dev-java/dom4j/dom4j-1.4-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Easy to use, open source library for working with XML, XPath and XSLT." -HOMEPAGE="http://dom4j.sourceforge.net/"; -SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz" -LICENSE="dom4j" -SLOT="1.4" -KEYWORDS="~amd64 ~x86" -IUSE="" -COMMON_DEP="=dev-java/jaxen-1.1* - dev-java/msv - dev-java/xpp2 - dev-java/saxpath - dev-java/relaxng-datatype - dev-java/fop - dev-java/xsdlib" - -DEPEND="=virtual/jdk-1.4* - ${COMMON_DEP}" -RDEPEND=" - >=virtual/jre-1.4 - ${COMMON_DEP}" - -EANT_GENTOO_CLASSPATH="msv,xpp2,jaxen-1.1,relaxng-datatype,saxpath,xsdlib" -EANT_BUILD_TARGET="clean package" -EANT_ANT_TASKS="fop" - -src_unpack() { - unpack ${A} - - #epatch ${FILESDIR}/fop.patch - #epatch ${FILESDIR}/DefaultXPath.java.diff - #epatch ${FILESDIR}/ProxyXmlStartTag.java.diff - #epatch ${FILESDIR}/DocumentFactory.java.diff - #epatch ${FILESDIR}/XPathPattern.java.diff - #epatch ${FILESDIR}/AbstractNode.java.diff - #epatch ${FILESDIR}/DocumentHelper.java.diff - #epatch ${FILESDIR}/ProxyDocumentFactory.java.diff - epatch "${FILESDIR}/makethingscompile.diff" - sed '/<unjar/d' -i "${S}/build.xml" || die - - find "${S}" -name *.jar | xargs rm -rf || die "rm failed" - cd "${S}/lib" || die "cd failed" - #java-pkg_jarfrom ${EANT_GENTOO_CLASSPATH} - - for i in $(find "${S}" -name build.xml);do - java-ant_rewrite-classpath "$i" - done -} - -src_install() { - java-pkg_dojar build/${PN}*.jar - use doc && java-pkg_dohtml -r "${S}/build/doc/api" - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/dom4j/files/AbstractNode.java.diff b/dev-java/dom4j/files/AbstractNode.java.diff deleted file mode 100644 index 6be2c08..0000000 --- a/dev-java/dom4j/files/AbstractNode.java.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/tree/AbstractNode.java 2003-04-07 22:51:33.000000000 +0200 -+++ AbstractNode.java 2007-02-18 01:40:00.442107153 +0100 -@@ -211,7 +211,7 @@ - return getDocumentFactory().createXPathFilter(patternText); - } - -- public Pattern createPattern(String patternText) { -+ public Pattern createPattern(String patternText) throws org.jaxen.JaxenException { - return getDocumentFactory().createPattern(patternText); - } - diff --git a/dev-java/dom4j/files/DefaultXPath.java.diff b/dev-java/dom4j/files/DefaultXPath.java.diff deleted file mode 100644 index 05d8b46..0000000 --- a/dev-java/dom4j/files/DefaultXPath.java.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java 2003-04-07 22:51:33.000000000 +0200 -+++ DefaultXPath.java 2007-02-18 00:45:36.703185856 +0100 -@@ -58,7 +58,7 @@ - - /** Construct an XPath - */ -- public DefaultXPath(String text) throws InvalidXPathException { -+ public DefaultXPath(String text) throws org.jaxen.JaxenException { - this.text = text; - this.xpath = parse( text ); - } -@@ -308,13 +313,10 @@ - return valueOf( node ); - } - -- protected static XPath parse(String text) { -+ protected static XPath parse(String text) throws JaxenException { - try { - return new Dom4jXPath( text ); - } -- catch (SAXPathException e) { -- throw new InvalidXPathException( text, e.getMessage() ); -- } - catch (RuntimeException e) { - } - throw new InvalidXPathException( text ); diff --git a/dev-java/dom4j/files/DocumentFactory.java.diff b/dev-java/dom4j/files/DocumentFactory.java.diff deleted file mode 100644 index 985e1d1..0000000 --- a/dev-java/dom4j/files/DocumentFactory.java.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/DocumentFactory.java 2003-04-07 22:51:31.000000000 +0200 -+++ DocumentFactory.java 2007-02-18 01:10:59.726677451 +0100 -@@ -184,13 +184,20 @@ - * @return a new <code>XPath</code> instance - * @throws InvalidXPathException if the XPath expression is invalid - */ -- public XPath createXPath(String xpathExpression) throws InvalidXPathException { -- DefaultXPath xpath = new DefaultXPath( xpathExpression ); -- if ( xpathNamespaceURIs != null ) { -- xpath.setNamespaceURIs( xpathNamespaceURIs ); -+ public XPath createXPath(String xpathExpression) { -+ try{ -+ DefaultXPath xpath = new DefaultXPath( xpathExpression ); -+ if ( xpathNamespaceURIs != null ) { -+ xpath.setNamespaceURIs( xpathNamespaceURIs ); -+ } -+ return xpath; -+ } -+ catch (org.jaxen.JaxenException e) { -+ System.out.println("error in createXPath(String xpathExpression)"); -+ return null; - } -- return xpath; - } -+ - - /** <p><code>createXPath</code> parses an XPath expression - * and creates a new XPath <code>XPath</code> instance.</p> -@@ -245,7 +252,7 @@ - * to create - * @return a new <code>Pattern</code> instance - */ -- public Pattern createPattern(String xpathPattern) { -+ public Pattern createPattern(String xpathPattern) throws org.jaxen.JaxenException { - return new XPathPattern( xpathPattern ); - } - diff --git a/dev-java/dom4j/files/DocumentHelper.java.diff b/dev-java/dom4j/files/DocumentHelper.java.diff deleted file mode 100644 index 4664ddd..0000000 --- a/dev-java/dom4j/files/DocumentHelper.java.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/DocumentHelper.java 2003-04-07 22:51:30.000000000 +0200 -+++ DocumentHelper.java 2007-02-18 01:41:48.239980207 +0100 -@@ -145,7 +145,7 @@ - * to create - * @return a new <code>Pattern</code> instance - */ -- public static Pattern createPattern(String xpathPattern) { -+ public static Pattern createPattern(String xpathPattern) throws org.jaxen.JaxenException { - return DocumentFactory.getInstance().createPattern(xpathPattern); - } - diff --git a/dev-java/dom4j/files/ProxyDocumentFactory.java.diff b/dev-java/dom4j/files/ProxyDocumentFactory.java.diff deleted file mode 100644 index c850537..0000000 --- a/dev-java/dom4j/files/ProxyDocumentFactory.java.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/util/ProxyDocumentFactory.java 2003-04-07 22:51:34.000000000 +0200 -+++ ProxyDocumentFactory.java 2007-02-18 01:44:12.589200952 +0100 -@@ -147,7 +147,7 @@ - return proxy.createXPathFilter(xpathFilterExpression); - } - -- public Pattern createPattern(String xpathPattern) { -+ public Pattern createPattern(String xpathPattern) throws org.jaxen.JaxenException { - return proxy.createPattern(xpathPattern); - } - diff --git a/dev-java/dom4j/files/ProxyXmlStartTag.java.diff b/dev-java/dom4j/files/ProxyXmlStartTag.java.diff deleted file mode 100644 index 687885c..0000000 --- a/dev-java/dom4j/files/ProxyXmlStartTag.java.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/xpp/ProxyXmlStartTag.java 2003-04-07 22:51:31.000000000 +0200 -+++ ProxyXmlStartTag.java 2007-02-18 00:31:41.034648139 +0100 -@@ -35,7 +35,18 @@ - /** The factory used to create new elements */ - private DocumentFactory factory = DocumentFactory.getInstance(); - -- -+ /* to compile */ -+ public boolean removeAttributeByName(String a,String b){ -+ return true; -+ } -+ -+ public boolean removeAttributeByRawName(String a){ -+ return true; -+ } -+ -+ public void removeAttributes(){} -+ /**/ -+ - public ProxyXmlStartTag() { - } - diff --git a/dev-java/dom4j/files/XPathPattern.java.diff b/dev-java/dom4j/files/XPathPattern.java.diff deleted file mode 100644 index 884bea9..0000000 --- a/dev-java/dom4j/files/XPathPattern.java.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java 2003-04-07 22:51:31.000000000 +0200 -+++ XPathPattern.java 2007-02-18 01:50:07.177677215 +0100 -@@ -57,15 +57,15 @@ - this.context = new Context( getContextSupport() ); - } - -- public XPathPattern(String text) { -+ public XPathPattern(String text) throws org.jaxen.JaxenException { - this.text = text; - this.context = new Context( getContextSupport() ); - try { - this.pattern = PatternParser.parse( text ); - } -- catch (SAXPathException e) { -- throw new InvalidXPathException( text, e.getMessage() ); -- } -+ catch (org.jaxen.saxpath.SAXPathException e) { -+ throw new InvalidXPathException( text, e.getMessage() ); -+ } - catch (RuntimeException e) { - throw new InvalidXPathException( text ); - } diff --git a/dev-java/dom4j/files/fop.patch b/dev-java/dom4j/files/fop.patch deleted file mode 100644 index 306cb1a..0000000 --- a/dev-java/dom4j/files/fop.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /usr/local/tmp/portage/dev-java/dom4j-1.4/work/dom4j-1.4/build.xml 2003-04-07 22:51:41.000000000 +0200 -+++ build.xml 2007-02-17 23:53:15.031444522 +0100 -@@ -64,7 +64,7 @@ - <!-- Activate support for fop in Ant (tradem) / Must be in classpath --> - <!-- Construct classpaths --> - <path id="fop.classpath"> -- <fileset dir="${lib.dir}/fop"> -+ <fileset dir="/usr/share/fop/lib"> - <include name="*.jar"/> - </fileset> - </path> -@@ -77,6 +77,7 @@ - - <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"> - <classpath refid="fop.classpath"/> -+ <classpath path="${gentoo.classpath}"/> - </taskdef> - </target> - diff --git a/dev-java/dom4j/files/makethingscompile.diff b/dev-java/dom4j/files/makethingscompile.diff deleted file mode 100644 index 148a681..0000000 --- a/dev-java/dom4j/files/makethingscompile.diff +++ /dev/null @@ -1,147 +0,0 @@ -diff -uNr dom4j-1.4/src/java/org/dom4j/DocumentFactory.java dom4j-1.4.new/src/java/org/dom4j/DocumentFactory.java ---- dom4j-1.4/src/java/org/dom4j/DocumentFactory.java 2003-04-07 22:51:31.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/DocumentFactory.java 2007-05-25 18:50:27.306129724 +0200 -@@ -184,13 +184,20 @@ - * @return a new <code>XPath</code> instance - * @throws InvalidXPathException if the XPath expression is invalid - */ -- public XPath createXPath(String xpathExpression) throws InvalidXPathException { -- DefaultXPath xpath = new DefaultXPath( xpathExpression ); -- if ( xpathNamespaceURIs != null ) { -- xpath.setNamespaceURIs( xpathNamespaceURIs ); -+ public XPath createXPath(String xpathExpression) { -+ try{ -+ DefaultXPath xpath = new DefaultXPath( xpathExpression ); -+ if ( xpathNamespaceURIs != null ) { -+ xpath.setNamespaceURIs( xpathNamespaceURIs ); -+ } -+ return xpath; -+ } -+ catch (org.jaxen.JaxenException e) { -+ System.out.println("error in createXPath(String xpathExpression)"); -+ return null; - } -- return xpath; - } -+ - - /** <p><code>createXPath</code> parses an XPath expression - * and creates a new XPath <code>XPath</code> instance.</p> -@@ -245,7 +252,7 @@ - * to create - * @return a new <code>Pattern</code> instance - */ -- public Pattern createPattern(String xpathPattern) { -+ public Pattern createPattern(String xpathPattern) throws org.jaxen.JaxenException { - return new XPathPattern( xpathPattern ); - } - -diff -uNr dom4j-1.4/src/java/org/dom4j/DocumentHelper.java dom4j-1.4.new/src/java/org/dom4j/DocumentHelper.java ---- dom4j-1.4/src/java/org/dom4j/DocumentHelper.java 2003-04-07 22:51:30.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/DocumentHelper.java 2007-05-25 18:50:27.306129724 +0200 -@@ -145,7 +145,7 @@ - * to create - * @return a new <code>Pattern</code> instance - */ -- public static Pattern createPattern(String xpathPattern) { -+ public static Pattern createPattern(String xpathPattern) throws org.jaxen.JaxenException { - return DocumentFactory.getInstance().createPattern(xpathPattern); - } - -diff -uNr dom4j-1.4/src/java/org/dom4j/tree/AbstractNode.java dom4j-1.4.new/src/java/org/dom4j/tree/AbstractNode.java ---- dom4j-1.4/src/java/org/dom4j/tree/AbstractNode.java 2003-04-07 22:51:33.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/tree/AbstractNode.java 2007-05-25 18:50:27.302129357 +0200 -@@ -211,7 +211,7 @@ - return getDocumentFactory().createXPathFilter(patternText); - } - -- public Pattern createPattern(String patternText) { -+ public Pattern createPattern(String patternText) throws org.jaxen.JaxenException { - return getDocumentFactory().createPattern(patternText); - } - -diff -uNr dom4j-1.4/src/java/org/dom4j/util/ProxyDocumentFactory.java dom4j-1.4.new/src/java/org/dom4j/util/ProxyDocumentFactory.java ---- dom4j-1.4/src/java/org/dom4j/util/ProxyDocumentFactory.java 2003-04-07 22:51:34.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/util/ProxyDocumentFactory.java 2007-05-25 18:50:27.306129724 +0200 -@@ -147,7 +147,7 @@ - return proxy.createXPathFilter(xpathFilterExpression); - } - -- public Pattern createPattern(String xpathPattern) { -+ public Pattern createPattern(String xpathPattern) throws org.jaxen.JaxenException { - return proxy.createPattern(xpathPattern); - } - -diff -uNr dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java dom4j-1.4.new/src/java/org/dom4j/xpath/DefaultXPath.java ---- dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java 2003-04-07 22:51:33.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/xpath/DefaultXPath.java 2007-05-25 18:50:27.306129724 +0200 -@@ -58,7 +58,7 @@ - - /** Construct an XPath - */ -- public DefaultXPath(String text) throws InvalidXPathException { -+ public DefaultXPath(String text) throws org.jaxen.JaxenException { - this.text = text; - this.xpath = parse( text ); - } -@@ -308,13 +308,10 @@ - return valueOf( node ); - } - -- protected static XPath parse(String text) { -+ protected static XPath parse(String text) throws JaxenException { - try { - return new Dom4jXPath( text ); - } -- catch (SAXPathException e) { -- throw new InvalidXPathException( text, e.getMessage() ); -- } - catch (RuntimeException e) { - } - throw new InvalidXPathException( text ); -diff -uNr dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java dom4j-1.4.new/src/java/org/dom4j/xpath/XPathPattern.java ---- dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java 2003-04-07 22:51:31.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/xpath/XPathPattern.java 2007-05-25 18:50:27.306129724 +0200 -@@ -57,15 +57,15 @@ - this.context = new Context( getContextSupport() ); - } - -- public XPathPattern(String text) { -+ public XPathPattern(String text) throws org.jaxen.JaxenException { - this.text = text; - this.context = new Context( getContextSupport() ); - try { - this.pattern = PatternParser.parse( text ); - } -- catch (SAXPathException e) { -- throw new InvalidXPathException( text, e.getMessage() ); -- } -+ catch (org.jaxen.saxpath.SAXPathException e) { -+ throw new InvalidXPathException( text, e.getMessage() ); -+ } - catch (RuntimeException e) { - throw new InvalidXPathException( text ); - } -diff -uNr dom4j-1.4/src/java/org/dom4j/xpp/ProxyXmlStartTag.java dom4j-1.4.new/src/java/org/dom4j/xpp/ProxyXmlStartTag.java ---- dom4j-1.4/src/java/org/dom4j/xpp/ProxyXmlStartTag.java 2003-04-07 22:51:31.000000000 +0200 -+++ dom4j-1.4.new/src/java/org/dom4j/xpp/ProxyXmlStartTag.java 2007-05-25 18:50:27.306129724 +0200 -@@ -35,7 +35,18 @@ - /** The factory used to create new elements */ - private DocumentFactory factory = DocumentFactory.getInstance(); - -- -+ /* to compile */ -+ public boolean removeAttributeByName(String a,String b){ -+ return true; -+ } -+ -+ public boolean removeAttributeByRawName(String a){ -+ return true; -+ } -+ -+ public void removeAttributes(){} -+ /**/ -+ - public ProxyXmlStartTag() { - } -
