Added a patch which should fix issues with running tests. Made junit be only a build time dependency.

Package-Manager: portage-2.1.2-r12

5 files changed, 108 insertions, 15 deletions

diff --git a/dev-java/jvyaml/ChangeLog b/dev-java/jvyaml/ChangeLog
index 7bcb6a4fbb3a..83a1745c4f8a 100644
--- a/dev-java/jvyaml/ChangeLog
+++ b/dev-java/jvyaml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jvyaml
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/ChangeLog,v 1.5 2007/02/18 19:19:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/ChangeLog,v 1.6 2007/03/08 05:54:25 nichoj Exp $
+
+*jvyaml-0.2.1-r1 (08 Mar 2007)
+
+  08 Mar 2007; Joshua Nichols <nichoj@gentoo.org>
+  +files/jvyaml-0.2.1-tests.patch, +jvyaml-0.2.1-r1.ebuild:
+  Added a patch which should fix issues with running tests. Made junit be
+  only a build time dependency.
 
   18 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> -jvyaml-0.1.ebuild,
   -jvyaml-0.2.ebuild:
diff --git a/dev-java/jvyaml/Manifest b/dev-java/jvyaml/Manifest
index 4d44885e23ec..d6cb73b33bff 100644
--- a/dev-java/jvyaml/Manifest
+++ b/dev-java/jvyaml/Manifest
@@ -1,19 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jvyaml-0.2-tests.patch 747 RMD160 163a08abf8b7477bdbe13cb8c340fb964812e737 SHA1 8cc4120b4a4dd7b299de9bdb1bb5f642d261285a SHA256 62be871c80556271cfee3fa2e28cd39c0d0143a8fc99b97360c6af320ac91095
 MD5 db647417d6ed80598130573ac245a32c files/jvyaml-0.2-tests.patch 747
 RMD160 163a08abf8b7477bdbe13cb8c340fb964812e737 files/jvyaml-0.2-tests.patch 747
 SHA256 62be871c80556271cfee3fa2e28cd39c0d0143a8fc99b97360c6af320ac91095 files/jvyaml-0.2-tests.patch 747
+AUX jvyaml-0.2.1-tests.patch 1731 RMD160 39ba2bba31820a6077f5216f790f133d46811d0b SHA1 bc8fec98a010c4de7d29a73221d47ed8377fb6ca SHA256 a519817ab3062298e2e6bc8b45124fa9beb8aa26abfbc150723c3fbc825ecdb2
+MD5 61a872812befaea58167cfaada8ddfad files/jvyaml-0.2.1-tests.patch 1731
+RMD160 39ba2bba31820a6077f5216f790f133d46811d0b files/jvyaml-0.2.1-tests.patch 1731
+SHA256 a519817ab3062298e2e6bc8b45124fa9beb8aa26abfbc150723c3fbc825ecdb2 files/jvyaml-0.2.1-tests.patch 1731
 DIST jvyaml-src-0.2.1.tar.gz 202550 RMD160 92b11e208f194365e669f0923294fa5a37e60723 SHA1 d42dcd43d47cb74edb19339ed22a4829c58a2223 SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382
+EBUILD jvyaml-0.2.1-r1.ebuild 1099 RMD160 7b2aa5f160ca103a07e276f09484650421b87870 SHA1 8ce44d5e7932263de953d0f0548cc883011d9ab0 SHA256 5b4f10d6fa3325961905d82002e4153f56407eb45c39808930658a2e50174633
+MD5 8ae2b2b6216f663682f033b76855cc38 jvyaml-0.2.1-r1.ebuild 1099
+RMD160 7b2aa5f160ca103a07e276f09484650421b87870 jvyaml-0.2.1-r1.ebuild 1099
+SHA256 5b4f10d6fa3325961905d82002e4153f56407eb45c39808930658a2e50174633 jvyaml-0.2.1-r1.ebuild 1099
 EBUILD jvyaml-0.2.1.ebuild 1051 RMD160 974dd58a48a5c0b1127f53ee1dae5f2cd34304bb SHA1 e636466a74a6d2c5c2f2beef64497504a80a5175 SHA256 68a1a6ceb76f39f41785f754dbbbbe1bd2f5923a1e854cb56b26772250b650db
 MD5 97fc8c2fb877bd268fd2061d61fd0a79 jvyaml-0.2.1.ebuild 1051
 RMD160 974dd58a48a5c0b1127f53ee1dae5f2cd34304bb jvyaml-0.2.1.ebuild 1051
 SHA256 68a1a6ceb76f39f41785f754dbbbbe1bd2f5923a1e854cb56b26772250b650db jvyaml-0.2.1.ebuild 1051
-MISC ChangeLog 1022 RMD160 dfabfc5296dd45119a3656513b3757d7702c4a60 SHA1 234502e9092a265ccd85f1f9ad6f8b7c88394a0a SHA256 6b08bd6909a97b34556100ba86eb6d4c14a97d3dfd7dfd7b99d2b84f8e7059b9
-MD5 e7cb24c911977c21d2d85e6781291383 ChangeLog 1022
-RMD160 dfabfc5296dd45119a3656513b3757d7702c4a60 ChangeLog 1022
-SHA256 6b08bd6909a97b34556100ba86eb6d4c14a97d3dfd7dfd7b99d2b84f8e7059b9 ChangeLog 1022
+MISC ChangeLog 1267 RMD160 23e33de16c3c15a429c6f1f517884beab7315f16 SHA1 09e9d8e4af9f07b2c2cc1b7df92275b44c839dce SHA256 97484b0931f80450f9f077de086caf621cd5b2ac7584c90994bb869b1654aeaf
+MD5 6481b1ac11e402f568ba369a82e042a3 ChangeLog 1267
+RMD160 23e33de16c3c15a429c6f1f517884beab7315f16 ChangeLog 1267
+SHA256 97484b0931f80450f9f077de086caf621cd5b2ac7584c90994bb869b1654aeaf ChangeLog 1267
 MISC metadata.xml 252 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 SHA1 7a38c8eea607b775e3b67757b0deda944aa27c65 SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a
 MD5 04e248f270fb5cf8193c02ebd018d503 metadata.xml 252
 RMD160 668af83772a7008b999bfe22da86e6d763c58d05 metadata.xml 252
@@ -21,10 +26,6 @@ SHA256 530d1e67c69f08b473ce1a5e7bbab5682e6deee068b27dbb57d459ca61c1290a metadata
 MD5 06738cdf044183df3d88222d2b294dfe files/digest-jvyaml-0.2.1 250
 RMD160 476830a0f3cbc20655b319387a1e6e4e0eb9617b files/digest-jvyaml-0.2.1 250
 SHA256 a15e3363aec05e63f55ffa2ae037eb9e465db16c5b5d92f34e491ea34b42ff1a files/digest-jvyaml-0.2.1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF2KYRcxLzpIGCsLQRAn6mAJ9Cc5dUKcV1IuzqgxKRPEF2QY8vlACgg700
-lSrUGo9OxvVmdV0y+57A5No=
-=2VuQ
------END PGP SIGNATURE-----
+MD5 06738cdf044183df3d88222d2b294dfe files/digest-jvyaml-0.2.1-r1 250
+RMD160 476830a0f3cbc20655b319387a1e6e4e0eb9617b files/digest-jvyaml-0.2.1-r1 250
+SHA256 a15e3363aec05e63f55ffa2ae037eb9e465db16c5b5d92f34e491ea34b42ff1a files/digest-jvyaml-0.2.1-r1 250
diff --git a/dev-java/jvyaml/files/digest-jvyaml-0.2.1-r1 b/dev-java/jvyaml/files/digest-jvyaml-0.2.1-r1
new file mode 100644
index 000000000000..1e2c86f6afcf
--- /dev/null
+++ b/dev-java/jvyaml/files/digest-jvyaml-0.2.1-r1
@@ -0,0 +1,3 @@
+MD5 9936e39850a2fc778e8bd36697a094f6 jvyaml-src-0.2.1.tar.gz 202550
+RMD160 92b11e208f194365e669f0923294fa5a37e60723 jvyaml-src-0.2.1.tar.gz 202550
+SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382 jvyaml-src-0.2.1.tar.gz 202550
diff --git a/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch b/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch
new file mode 100644
index 000000000000..5dac1832afee
--- /dev/null
+++ b/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch
@@ -0,0 +1,34 @@
+Only in jvyaml-0.2.1-patched/: build
+Files jvyaml-0.2.1/lib/jvyaml.jar and jvyaml-0.2.1-patched/lib/jvyaml.jar differ
+diff -ru jvyaml-0.2.1/src/test/org/jvyaml/YAMLDumpTest.java jvyaml-0.2.1-patched/src/test/org/jvyaml/YAMLDumpTest.java
+--- jvyaml-0.2.1/src/test/org/jvyaml/YAMLDumpTest.java	2006-09-24 13:07:19.000000000 -0400
++++ jvyaml-0.2.1-patched/src/test/org/jvyaml/YAMLDumpTest.java	2007-03-08 00:39:04.000000000 -0500
+@@ -28,6 +28,8 @@
+ import java.util.List;
+ import java.util.HashMap;
+ import java.util.ArrayList;
++import java.util.TimeZone;
++import java.text.DecimalFormat;
+ 
+ import junit.framework.TestCase;
+ 
+@@ -71,9 +73,18 @@
+         final java.util.Calendar cal = java.util.Calendar.getInstance();
+         cal.clear();
+         cal.set(1982,5-1,3); // Java's months are zero-based...
++
++		// Nasty hack to figure out timezone so we can figure out what to
++		// expect when we do YAML#dump
++		TimeZone tz = cal.getTimeZone();
++		int offset = tz.getOffset(cal.getTimeInMillis()) / 3600000;
++		DecimalFormat format = new DecimalFormat("00");
++		String offsetString = format.format(offset);
++		offsetString = ( offset >= 0 ? "+" : "") + offsetString;
+         
+         final TestBean toDump = new TestBean("Ola Bini", 24, cal.getTime());
+-        assertEquals("--- !java/object:org.jvyaml.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03 00:00:00 +02:00\n", YAML.dump(toDump));
++//		assertEquals("--- !java/object:org.jvyaml.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03 00:00:00 +02:00\n", YAML.dump(toDump));
++        assertEquals("--- !java/object:org.jvyaml.TestBean\nname: Ola Bini\nage: 24\nborn: 1982-05-03 00:00:00 " + offsetString + ":00\n", YAML.dump(toDump));
+        
+     }
+ }// YAMLDumpTest
diff --git a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..09deaf74efdc
--- /dev/null
+++ b/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild,v 1.1 2007/03/08 05:54:25 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java YAML parser and emitter"
+HOMEPAGE="https://jvyaml.dev.java.net/"
+SRC_URI="https://${PN}.dev.java.net/files/documents/5215/41455/${PN}-src-${PV}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="source test"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/ant
+		dev-java/junit
+	)
+	!test? (
+		dev-java/ant-core
+	)
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# https://jvyaml.dev.java.net/issues/show_bug.cgi?id=6
+	epatch ${FILESDIR}/${PN}-0.2-tests.patch
+
+	# https://jvyaml.dev.java.net/issues/show_bug.cgi?id=5
+	epatch ${FILESDIR}/${P}-tests.patch
+
+	cd lib
+	rm *.jar
+	use test && java-pkg_jar-from --build-only junit
+}
+
+src_install() {
+	java-pkg_dojar lib/${PN}.jar
+	dodoc README
+	dodoc CREDITS
+	use source && java-pkg_dosrc src/*
+}
+
+src_test() {
+	eant test
+}