Update xerces dep for upcoming 2.6 slotmove.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index c3bf63f170c48afab19760b2ca3835c589660835..39b62a3dc7fec703a0961dcdd8f01c33b0599177 100644 (file)
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -7,22 +7,18 @@ MD5 8039a2f19bcc273d417ec48d00bbe87a files/jaxme-0.3.1-gentoo.patch 1771
 RMD160 2c4d51b162bb87599e7c50b28bfd99dee37e5d96 files/jaxme-0.3.1-gentoo.patch 1771
 SHA256 833974df6973940936e74919c9629bc17138805bf4dd54d53916334bb01c91fa files/jaxme-0.3.1-gentoo.patch 1771
 DIST ws-jaxme-0.3.1-src.tar.gz 3058903 RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 SHA1 4ba5fd76cbda407c0b32af2e3235dab66a8b0a00 SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c
-EBUILD jaxme-0.3.1-r2.ebuild 2016 RMD160 4f17a222b1b7a1f7bf24f3faa606ff5658c950d6 SHA1 370f8955210e921d15f38c61052a2176f686d6e9 SHA256 4170983844751f499f3d2b2695b099be079c480b13a36356dc15544d8660f47e
-MD5 9c1a3a88408866ed6ed36c71b1769fd8 jaxme-0.3.1-r2.ebuild 2016
-RMD160 4f17a222b1b7a1f7bf24f3faa606ff5658c950d6 jaxme-0.3.1-r2.ebuild 2016
-SHA256 4170983844751f499f3d2b2695b099be079c480b13a36356dc15544d8660f47e jaxme-0.3.1-r2.ebuild 2016
-EBUILD jaxme-0.3.1-r3.ebuild 2163 RMD160 41fa70cf4ff5fde03d3cfc3e18043ad4e9533555 SHA1 4647bca855ea4ab9500547d6e5d8485c1d2a845a SHA256 3c674284267b9e0403802f66596b0aa5720a97eaf58832871aa46fbc0e447527
-MD5 6bb85beeeb4a5bdcfc7496b0f0c5048c jaxme-0.3.1-r3.ebuild 2163
-RMD160 41fa70cf4ff5fde03d3cfc3e18043ad4e9533555 jaxme-0.3.1-r3.ebuild 2163
-SHA256 3c674284267b9e0403802f66596b0aa5720a97eaf58832871aa46fbc0e447527 jaxme-0.3.1-r3.ebuild 2163
-EBUILD jaxme-0.3.1.ebuild 1634 RMD160 a8c5130d275fc4345f73f5f7a7789561ff5d9acb SHA1 0e037a3253b304c6dec03b93ad9d0d1565a7fd5e SHA256 3d889735b474f7d07a1b5f0495ef12fdcdc924c4856c08a3211de587fd08dff4
-MD5 dd79eeaa71196821af81c46194d397bf jaxme-0.3.1.ebuild 1634
-RMD160 a8c5130d275fc4345f73f5f7a7789561ff5d9acb jaxme-0.3.1.ebuild 1634
-SHA256 3d889735b474f7d07a1b5f0495ef12fdcdc924c4856c08a3211de587fd08dff4 jaxme-0.3.1.ebuild 1634
-MISC ChangeLog 2030 RMD160 9da696c15cf69a95e61dc337e7013b7fd4fdca8f SHA1 91eb833c134601d6c6c99a4b040a5229a1bcb65a SHA256 bce96339f2ef7ce2d72d0e5e7a3d6f646c5847cc994496af675617396d75c423
-MD5 7cf61dbbf65712d4fb7694b5c824b5fc ChangeLog 2030
-RMD160 9da696c15cf69a95e61dc337e7013b7fd4fdca8f ChangeLog 2030
-SHA256 bce96339f2ef7ce2d72d0e5e7a3d6f646c5847cc994496af675617396d75c423 ChangeLog 2030
+EBUILD jaxme-0.3.1-r3.ebuild 2163 RMD160 0f5cb9e8293934827d208156e84a8246fc4806e5 SHA1 c087c5bfb3d2f0ea89be6573a8b525e7c68a2e32 SHA256 e52c4e5bf7c7033b9756fa61af28f587095e5873c84a6fb387cbb6fbf973ae25
+MD5 9c3ea962a17abe194198a80a5dbdaecd jaxme-0.3.1-r3.ebuild 2163
+RMD160 0f5cb9e8293934827d208156e84a8246fc4806e5 jaxme-0.3.1-r3.ebuild 2163
+SHA256 e52c4e5bf7c7033b9756fa61af28f587095e5873c84a6fb387cbb6fbf973ae25 jaxme-0.3.1-r3.ebuild 2163
+EBUILD jaxme-0.3.1.ebuild 1634 RMD160 a1eb8a3b8527b5ea17fd4e4729120d8228ec0b28 SHA1 27fd0a3ea70925799cbf3a4d19381eb0c47fdd3e SHA256 bc2a5a095bd0e77778bd5bca11b46fe7605889862d16e63e1aa01d42292a22ba
+MD5 185b5191247d683a5ed490c6e157e220 jaxme-0.3.1.ebuild 1634
+RMD160 a1eb8a3b8527b5ea17fd4e4729120d8228ec0b28 jaxme-0.3.1.ebuild 1634
+SHA256 bc2a5a095bd0e77778bd5bca11b46fe7605889862d16e63e1aa01d42292a22ba jaxme-0.3.1.ebuild 1634
+MISC ChangeLog 2198 RMD160 ef3981f6d2dff74c3068708a34421c3f211b968c SHA1 f3cb8ce1335341e47ac78aada3a8d1ae0ae5428a SHA256 efcd922a1ddd70479cd6a35da5273234bbd187f1bcac39574cbf06d9f3202e0f
+MD5 81a7b96d5b3d4dfc7bd7fd63b2746ebc ChangeLog 2198
+RMD160 ef3981f6d2dff74c3068708a34421c3f211b968c ChangeLog 2198
+SHA256 efcd922a1ddd70479cd6a35da5273234bbd187f1bcac39574cbf06d9f3202e0f ChangeLog 2198
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -30,9 +26,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 180aace1ee8992c766d8f39693fd74e1 files/digest-jaxme-0.3.1 259
 RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1 259
 SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1 259
-MD5 180aace1ee8992c766d8f39693fd74e1 files/digest-jaxme-0.3.1-r2 259
-RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1-r2 259
-SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1-r2 259
 MD5 180aace1ee8992c766d8f39693fd74e1 files/digest-jaxme-0.3.1-r3 259
 RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1-r3 259
 SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1-r3 259

diff --git a/dev-java/jaxme/files/digest-jaxme-0.3.1-r2 b/dev-java/jaxme/files/digest-jaxme-0.3.1-r2
deleted file mode 100644 (file)
index 7b109d5..0000000
--- a/dev-java/jaxme/files/digest-jaxme-0.3.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d7a595ac138582ff2592e6b7d2e5cade ws-jaxme-0.3.1-src.tar.gz 3058903
-RMD160 cd994b5fd9a15473ed7390b8911601b794f76cd0 ws-jaxme-0.3.1-src.tar.gz 3058903
-SHA256 9f02b233849ec10cda455c51d5bda46929f5fcbed237c5a5a760a19eb59e852c ws-jaxme-0.3.1-src.tar.gz 3058903

diff --git a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild b/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
deleted file mode 100644 (file)
index 977880a..0000000
--- a/dev-java/jaxme/jaxme-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r2.ebuild,v 1.4 2006/09/14 04:14:07 nichoj Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN=ws-${PN}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="JaxMe 2 is an open source implementation of JAXB, the specification for Java/XML binding."
-HOMEPAGE="http://ws.apache.org/jaxme/index.html"
-SRC_URI="http://mirrors.combose.com/apache/ws/jaxme/source/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc source"
-
-COMMON_DEP="
-       dev-db/hsqldb
-       >=dev-java/xerces-2.6
-       dev-java/junit
-       >=dev-java/log4j-1.2.8
-       dev-java/xmldb"
-RDEPEND=">=virtual/jre-1.4
-       ${COMMON_DEP}"
-# FIXME doesn't like to compile with Java 1.6
-DEPEND="|| (
-               =virtual/jdk-1.4*
-               =virtual/jdk-1.5*
-       )
-       dev-java/ant-core
-       ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-# We do it later
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-       # Fix the build.xml so we can build jars and javadoc easily
-       epatch ${FILESDIR}/${P}-gentoo.patch
-
-       cd ${S}/prerequisites
-       rm *.jar
-       java-pkg_jarfrom hsqldb hsqldb.jar hsqldb-1.7.1.jar
-       java-pkg_jarfrom junit
-       java-pkg_jarfrom log4j log4j.jar log4j-1.2.8.jar
-       java-pkg_jarfrom xerces-2
-       java-pkg_jarfrom xmldb xmldb-api.jar xmldb-api-20021118.jar
-       java-pkg_jarfrom xmldb xmldb-api-sdk.jar xmldb-api-sdk-20021118.jar
-
-       # Bad build system, should be fixed to use properties
-       java-pkg_jarfrom ant-core ant.jar ant-1.5.4.jar
-       java-pkg_jarfrom ant-core ant.jar ant.jar
-
-       # Special case: jaxme uses build<foo>.xml files, so rewriting them by hand
-       # is better:
-       cd ${S}
-       for i in build*.xml src/webapp/build.xml src/test/jaxb/build.xml; do
-               java-ant_bsfix_one "${i}"
-       done
-}
-
-src_compile() {
-       eant $(use_doc -Dbuild.apidocs=dist/doc/api javadoc) jar
-}
-
-src_install() {
-       java-pkg_dojar dist/*.jar
-
-       dodoc NOTICE
-
-       use doc && java-pkg_dohtml -r dist/doc/api src/documentation/manual
-       use source && java-pkg_dosrc src/*/*
-}