Move the large java15 patch to mirrors. Correct licenses.

Package-Manager: portage-2.1.2_rc4-r4

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 9c6b1f6e3e0610df8da953a5798ecc5c48852f36..b09f3ab597dc45fb2b4008cb029dd0a05fc279c2 100644 (file)
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/dom4j
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.36 2006/12/30 23:38:13 ticho Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.37 2007/01/01 10:38:30 caster Exp $
+
+  01 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/dom4j-1.6.1-java5.patch, dom4j-1.4-r1.ebuild, dom4j-1.5.ebuild,
+  dom4j-1.6.1.ebuild, dom4j-1.6.1-r2.ebuild:
+  Move the large java15 patch to mirrors. Correct licenses.
 
   30 Dec 2006; Andrej Kacian <ticho@gentoo.org> dom4j-1.6.1-r2.ebuild:
   Stable on x86, bug #159099.

diff --git a/dev-java/dom4j/dom4j-1.4-r1.ebuild b/dev-java/dom4j/dom4j-1.4-r1.ebuild
index 224b1b73a9274f863c16083bc061ffa7957748ad..b120f4c04fd6f07e0a3bd62ae74a1011965f0e53 100644 (file)
--- a/dev-java/dom4j/dom4j-1.4-r1.ebuild
+++ b/dev-java/dom4j/dom4j-1.4-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.4-r1.ebuild,v 1.11 2006/10/05 15:37:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.4-r1.ebuild,v 1.12 2007/01/01 10:38:30 caster Exp $
 
 inherit java-pkg
 
 DESCRIPTION="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."
 HOMEPAGE="http://dom4j.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-LICENSE="Apache-1.1"
+LICENSE="dom4j"
 SLOT="1"
 KEYWORDS="x86 ppc amd64"
 IUSE="doc"

diff --git a/dev-java/dom4j/dom4j-1.5.ebuild b/dev-java/dom4j/dom4j-1.5.ebuild
index 17a3845fb81c1213677117b09e6d7d9169cb592f..19d746a36acc73abd452a7237d59be5962507bfc 100644 (file)
--- a/dev-java/dom4j/dom4j-1.5.ebuild
+++ b/dev-java/dom4j/dom4j-1.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.5.ebuild,v 1.9 2006/10/05 15:37:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.5.ebuild,v 1.10 2007/01/01 10:38:30 caster Exp $
 
 inherit java-pkg
 
 DESCRIPTION="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."
 HOMEPAGE="http://dom4j.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-LICENSE="Apache-1.1"
+LICENSE="dom4j"
 SLOT="1"
 KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="doc"

diff --git a/dev-java/dom4j/dom4j-1.6.1-r2.ebuild b/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
index 3578d7b6ae3d5c5f518947c6690ed3c36f1c1074..3f24e028fb28e06b9d611d246e1ac607af70d053 100644 (file)
--- a/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r2.ebuild,v 1.5 2006/12/30 23:38:13 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1-r2.ebuild,v 1.6 2007/01/01 10:38:30 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="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."
 HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-LICENSE="Apache-1.1"
+SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz
+       mirror://gentoo/${P}-java5.patch.bz2"
+LICENSE="dom4j"
 SLOT="1"
 KEYWORDS="~amd64 ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="doc source"
@@ -26,10 +27,10 @@ DEPEND=">=virtual/jdk-1.3
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
        # Add missing methods to compile on Java 5
        # see bug #137970
-       epatch ${FILESDIR}/${P}-java5.patch
+       epatch "${WORKDIR}/${P}-java5.patch"
 
        cd ${S}/lib
        #circular deps with jaxen

diff --git a/dev-java/dom4j/dom4j-1.6.1.ebuild b/dev-java/dom4j/dom4j-1.6.1.ebuild
index dfe8cdd97222299809f47debcba9fcb98a55ad52..c47e392d277d8ddb8490ac27ff1deace7ce93314 100644 (file)
--- a/dev-java/dom4j/dom4j-1.6.1.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.9 2006/11/30 15:35:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.10 2007/01/01 10:38:30 caster Exp $
 
 inherit java-pkg
 
 DESCRIPTION="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."
 HOMEPAGE="http://dom4j.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-LICENSE="Apache-1.1"
+LICENSE="dom4j"
 SLOT="1"
 KEYWORDS="amd64 ppc x86"
 # jikes disabled as per bug #123004

diff --git a/dev-java/dom4j/files/digest-dom4j-1.4-r1 b/dev-java/dom4j/files/digest-dom4j-1.4-r1
index 93ca8e53950568ac0e0718c2c56448f679428b9a..6e1898266ef6a381f873eee6a886ff667335198e 100644 (file)
--- a/dev-java/dom4j/files/digest-dom4j-1.4-r1
+++ b/dev-java/dom4j/files/digest-dom4j-1.4-r1
@@ -1 +1,3 @@
 MD5 b76baa335d35c0c968b0c3f56c559f71 dom4j-1.4.tar.gz 12100149
+RMD160 fdadf97585b583e5b4daee4468da391ac989330f dom4j-1.4.tar.gz 12100149
+SHA256 15aa02123c1e9407002ca927bacd0296b4128e112f955552bab392c8c37ea6d7 dom4j-1.4.tar.gz 12100149

diff --git a/dev-java/dom4j/files/digest-dom4j-1.5 b/dev-java/dom4j/files/digest-dom4j-1.5
index 96fb8de701e57044e0ab9bb227141d0e5d6c2805..6c1ab5d1f0d46eee07652d731c2122fe339e3f0d 100644 (file)
--- a/dev-java/dom4j/files/digest-dom4j-1.5
+++ b/dev-java/dom4j/files/digest-dom4j-1.5
@@ -1 +1,3 @@
 MD5 79598c3b2420a178ab19d62b2531feec dom4j-1.5.tar.gz 11571646
+RMD160 3fd62b201dab880db11f87213a2ff62413be1067 dom4j-1.5.tar.gz 11571646
+SHA256 38834379591e1ebc186f7023256c6016fdac47fb7428de3ca055ae0455c1c5ca dom4j-1.5.tar.gz 11571646

diff --git a/dev-java/dom4j/files/digest-dom4j-1.6.1-r2 b/dev-java/dom4j/files/digest-dom4j-1.6.1-r2
index d8185ba880ea75ecf3d9fbadfe648ab0c5fa3bb4..8ec5a18c7e0f33d7357590495382788fb2b2bb67 100644 (file)
--- a/dev-java/dom4j/files/digest-dom4j-1.6.1-r2
+++ b/dev-java/dom4j/files/digest-dom4j-1.6.1-r2
@@ -1,3 +1,6 @@
+MD5 4724443645618552d2041336a40d6a57 dom4j-1.6.1-java5.patch.bz2 2900
+RMD160 cb153194e3b5d13626486d8f376b76f0925448c8 dom4j-1.6.1-java5.patch.bz2 2900
+SHA256 5e7361eac5332c3380420bd88c2d3a2d4dde30984486c6d4f7e4621940abb42d dom4j-1.6.1-java5.patch.bz2 2900
 MD5 1e7ef6d20939315714de4a8502f27b2d dom4j-1.6.1.tar.gz 9687211
 RMD160 d990d712a6b58c799366c526b32eb6c84a81e29c dom4j-1.6.1.tar.gz 9687211
 SHA256 01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f dom4j-1.6.1.tar.gz 9687211