Stable on amd64 for bug #175360; Revbump without change to remove the hsqldb depedency from everyone's package.env, workarounds bug #178953. Remove old versions.

Package-Manager: portage-2.1.2.7

6 files changed, 22 insertions, 86 deletions

diff --git a/dev-java/jaxme/ChangeLog b/dev-java/jaxme/ChangeLog
index b0fc76109f0f..ba9d85353476 100644
--- a/dev-java/jaxme/ChangeLog
+++ b/dev-java/jaxme/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jaxme
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.24 2007/05/09 15:09:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/ChangeLog,v 1.25 2007/05/18 01:53:28 caster Exp $
+
+*jaxme-0.3.1-r4 (18 May 2007)
+
+  18 May 2007; Vlastimil Babka <caster@gentoo.org> -jaxme-0.3.1.ebuild,
+  -jaxme-0.3.1-r3.ebuild, +jaxme-0.3.1-r4.ebuild:
+  Stable on amd64 for bug #175360; Revbump without change to remove the hsqldb
+  depedency from everyone's package.env, workarounds bug #178953. Remove old
+  versions.
 
   09 May 2007; Raúl Porcel <armin76@gentoo.org> jaxme-0.3.1-r3.ebuild:
   Add ~ia64 wrt #160813
diff --git a/dev-java/jaxme/Manifest b/dev-java/jaxme/Manifest
index 87da500634cd..d4017f25a920 100644
--- a/dev-java/jaxme/Manifest
+++ b/dev-java/jaxme/Manifest
@@ -7,25 +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-r3.ebuild 2199 RMD160 70b080bbda017ad933d4a0bf30f15ae0c98dd06e SHA1 0d3b30a1481ce20ccc60e3892273a4aae2ee91de SHA256 f906891a2a8199f8d9991e5546bfdac3faf6e2005d22640c673cf921ffdaaa50
-MD5 6a52e2ab8fa04defda28ca66d968694f jaxme-0.3.1-r3.ebuild 2199
-RMD160 70b080bbda017ad933d4a0bf30f15ae0c98dd06e jaxme-0.3.1-r3.ebuild 2199
-SHA256 f906891a2a8199f8d9991e5546bfdac3faf6e2005d22640c673cf921ffdaaa50 jaxme-0.3.1-r3.ebuild 2199
-EBUILD jaxme-0.3.1.ebuild 1640 RMD160 e778a994c34befa27971d81e4e0ac21dd634b00a SHA1 fceed87b77634da590cd261b0042cf3631ce2cb9 SHA256 e57f8fec2ab685e715bc9d2a5bfc9e378eb99b25069357fd8623cae85bf4882e
-MD5 a27f1952629b11eac70c224ada458129 jaxme-0.3.1.ebuild 1640
-RMD160 e778a994c34befa27971d81e4e0ac21dd634b00a jaxme-0.3.1.ebuild 1640
-SHA256 e57f8fec2ab685e715bc9d2a5bfc9e378eb99b25069357fd8623cae85bf4882e jaxme-0.3.1.ebuild 1640
-MISC ChangeLog 3212 RMD160 266ba87a8c77c339523ea2427588c3ea11b6ca93 SHA1 1807dc485197cd86306e3de237135ad57929959a SHA256 c1cc5e9099907dae72543b9d52a53c96ea92d8aa3525dcec3f6d83a0918f06d4
-MD5 bac161728bb7f6fdd0a770af11a8d760 ChangeLog 3212
-RMD160 266ba87a8c77c339523ea2427588c3ea11b6ca93 ChangeLog 3212
-SHA256 c1cc5e9099907dae72543b9d52a53c96ea92d8aa3525dcec3f6d83a0918f06d4 ChangeLog 3212
+EBUILD jaxme-0.3.1-r4.ebuild 2196 RMD160 95c3fa074165107f7f3f300b7531460d6b2a83d2 SHA1 fab202ab560d4fa0e796293b3d3cc79ec80ea190 SHA256 4247293b110e4201dff8a656e755303a445048940ab6f86384d41d3948384216
+MD5 7fe5fbb5d426c786e85ba9a55712d789 jaxme-0.3.1-r4.ebuild 2196
+RMD160 95c3fa074165107f7f3f300b7531460d6b2a83d2 jaxme-0.3.1-r4.ebuild 2196
+SHA256 4247293b110e4201dff8a656e755303a445048940ab6f86384d41d3948384216 jaxme-0.3.1-r4.ebuild 2196
+MISC ChangeLog 3533 RMD160 eef00f2075483682f9b62073d258cfc866c4f4a8 SHA1 a3066e0f1b7eb25ad144759a896ccf148842022f SHA256 749327acacc24a99b8e5b743853082ace20fbb1e43fad2f2b40fec0597362f8e
+MD5 c223d86a5b8ad2629fa8bacfec3a9050 ChangeLog 3533
+RMD160 eef00f2075483682f9b62073d258cfc866c4f4a8 ChangeLog 3533
+SHA256 749327acacc24a99b8e5b743853082ace20fbb1e43fad2f2b40fec0597362f8e ChangeLog 3533
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-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-r3 259
-RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1-r3 259
-SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1-r3 259
+MD5 180aace1ee8992c766d8f39693fd74e1 files/digest-jaxme-0.3.1-r4 259
+RMD160 e549ab8391bb8016eec864b90f26967e95affc95 files/digest-jaxme-0.3.1-r4 259
+SHA256 0f7eb759824895c7f8af0a9f3e9f270b9849fb68689cc8f0b3eda15670eb8a5b files/digest-jaxme-0.3.1-r4 259
diff --git a/dev-java/jaxme/files/digest-jaxme-0.3.1-r3 b/dev-java/jaxme/files/digest-jaxme-0.3.1-r3
deleted file mode 100644
index 7b109d57d1e2..000000000000
--- a/dev-java/jaxme/files/digest-jaxme-0.3.1-r3
+++ /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/files/digest-jaxme-0.3.1 b/dev-java/jaxme/files/digest-jaxme-0.3.1-r4
index 7b109d57d1e2..7b109d57d1e2 100644
--- a/dev-java/jaxme/files/digest-jaxme-0.3.1
+++ b/dev-java/jaxme/files/digest-jaxme-0.3.1-r4
diff --git a/dev-java/jaxme/jaxme-0.3.1-r3.ebuild b/dev-java/jaxme/jaxme-0.3.1-r4.ebuild
index 18436476e3ca..6c0e93673c02 100644
--- a/dev-java/jaxme/jaxme-0.3.1-r3.ebuild
+++ b/dev-java/jaxme/jaxme-0.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r3.ebuild,v 1.10 2007/05/09 15:09:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxme/jaxme-0.3.1-r4.ebuild,v 1.1 2007/05/18 01:53:28 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.combose.com/apache/ws/jaxme/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 COMMON_DEP="
diff --git a/dev-java/jaxme/jaxme-0.3.1.ebuild b/dev-java/jaxme/jaxme-0.3.1.ebuild
deleted file mode 100644
index 249da2223c9a..000000000000
--- a/dev-java/jaxme/jaxme-0.3.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.10 2007/01/04 05:44:48 tgall Exp $
-
-inherit java-pkg 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"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-db/hsqldb
-	>=dev-java/xerces-2.7
-	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}"
-
-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
-}
-
-src_compile() {
-	local antflags="jar"
-#	use jikes && antflags="-Dbuild.compiler=jikes ${antflags}"
-	use doc && antflags="${antflags} -Dbuild.apidocs=dist/doc/api javadoc"
-
-	ant ${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/*/*
-}