Revision bump to apply previous fix.

Package-Manager: portage-2.1.1_pre3-r5

3 files changed, 14 insertions, 88 deletions

diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index aa8bf58c2c05..c3bfcfaa1be3 100644
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -6,18 +6,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-r1.ebuild 1838 RMD160 0eb81097f71f73b96aca5795625dde2c3d4f6fac SHA1 2b081d7722faf360b63a9e9bb3d6ed74979d5556 SHA256 183543c52708eff26e4d403fcd4b56f3b7fc0e4f8ed28d1b8764b4ec78f8e284
-MD5 b05992d11fe32a7e315db6bb91a197eb jaxme-0.3.1-r1.ebuild 1838
-RMD160 0eb81097f71f73b96aca5795625dde2c3d4f6fac jaxme-0.3.1-r1.ebuild 1838
-SHA256 183543c52708eff26e4d403fcd4b56f3b7fc0e4f8ed28d1b8764b4ec78f8e284 jaxme-0.3.1-r1.ebuild 1838
+EBUILD jaxme-0.3.1-r2.ebuild 1838 RMD160 0982013280e433225c7203d5c479934e01e3e46e SHA1 b851eb06b5928d54d274cfe7aed6af5ab9264d88 SHA256 b685847362ba0d856f41e755d52ed4408a9f6dfc8c1c2aee53d9d5f35b726a17
+MD5 a2be028a32a719f3ce3782ac37c63e26 jaxme-0.3.1-r2.ebuild 1838
+RMD160 0982013280e433225c7203d5c479934e01e3e46e jaxme-0.3.1-r2.ebuild 1838
+SHA256 b685847362ba0d856f41e755d52ed4408a9f6dfc8c1c2aee53d9d5f35b726a17 jaxme-0.3.1-r2.ebuild 1838
 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 1274 RMD160 4d5a0fa609d80c29adc82cbb610e36774331dba5 SHA1 de53bac6a93008ba3d45d86de221206a9ff12637 SHA256 e0d77a285ae2b17d6cbcf6208bb1c021cd998b940e456d2321394ea27737a32f
-MD5 a1fcae8dc0e49e3d131b29dca3a1de11 ChangeLog 1274
-RMD160 4d5a0fa609d80c29adc82cbb610e36774331dba5 ChangeLog 1274
-SHA256 e0d77a285ae2b17d6cbcf6208bb1c021cd998b940e456d2321394ea27737a32f ChangeLog 1274
+MISC ChangeLog 1449 RMD160 576376f653aecdcaf28c9bd07f2730c63e7d5d5e SHA1 0cc09fd57253767ec641ace4a4ea38b9aa4f88a2 SHA256 37ae184ae5944d5c4ca8245bffaac1466f68235ff9712b6d59a364b94bc2cdae
+MD5 221013d29142a819285403deef56a4e5 ChangeLog 1449
+RMD160 576376f653aecdcaf28c9bd07f2730c63e7d5d5e ChangeLog 1449
+SHA256 37ae184ae5944d5c4ca8245bffaac1466f68235ff9712b6d59a364b94bc2cdae ChangeLog 1449
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -25,13 +25,13 @@ 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-r1 259
-RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1-r1 259
-SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1-r1 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEycirgo/w9rxVVVERAlemAJ4rmA69Ua6JIar2dIeJVqQtYPyG7wCeKdMo
-u8p+mYAJ/dBXlgx235aDNSo=
-=llJI
+iD8DBQFEyfErgo/w9rxVVVERAhGmAJ92mAIBsTGmRQ3/q2UYWQGwwWPuCQCgnpy1
+8vBIZ6C5viVfm5sLtcMGSMc=
+=tDUY
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jaxme/files/digest-jaxme-0.3.1-r1 b/dev-java/jaxme/files/digest-jaxme-0.3.1-r1
deleted file mode 100644
index 7b109d57d1e2..000000000000
--- a/dev-java/jaxme/files/digest-jaxme-0.3.1-r1
+++ /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-r1.ebuild b/dev-java/jaxme/jaxme-0.3.1-r1.ebuild
deleted file mode 100644
index 394176d35171..000000000000
--- a/dev-java/jaxme/jaxme-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,71 +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-r1.ebuild,v 1.2 2006/07/28 08:19:32 nelchael 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 ~x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-db/hsqldb
-	>=dev-java/xerces-2.6
-	dev-java/junit
-	>=dev-java/log4j-1.2.8
-	dev-java/xmldb"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	${RDEPEND}"
-
-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
-
-	# 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() {
-	local antflags="jar"
-	use doc && antflags="${antflags} -Dbuild.apidocs=dist/doc/api javadoc"
-
-	eant ${antflags} || die "Compilation failed"
-}
-
-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/*/*
-}