[gentoo-commits] repo/gentoo:master commit in: dev-java/jvyaml/, dev-java/jvyaml/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/jvyaml/, dev-java/jvyaml/files/

[Patrice Clement]

commit:     00763783f844d02f7372edefe6a59d07c40413b9
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 07:31:56 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 07:49:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00763783

dev-java/jvyaml: Clean up old.

Package-Manager: portage-2.2.26

 dev-java/jvyaml/Manifest                       |  1 -
 dev-java/jvyaml/files/jvyaml-0.2-tests.patch   | 20 -----------
 dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch | 34 -------------------
 dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild         | 47 --------------------------
 4 files changed, 102 deletions(-)

diff --git a/dev-java/jvyaml/Manifest b/dev-java/jvyaml/Manifest
index b2d4aed..d482f0d 100644
--- a/dev-java/jvyaml/Manifest
+++ b/dev-java/jvyaml/Manifest
@@ -1,2 +1 @@
 DIST jvyaml-0.2.1.tar.gz 202550 SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382 SHA512 edac9309c285cf569c453cd63f2cbd5e0a29012936af181616010bebb4eac2c474e2b37463af61b5e66876ffba517040796c596ac2bbcc9dad2af7aedf324221 WHIRLPOOL a30e39f862ed5eefabcb79820f190bffeccffda79ceae1864cb3364fbda1588eb345e7b1fe1264cfd84710e56aadc36e9c816e6371a46e7c1f0225e726065304
-DIST jvyaml-src-0.2.1.tar.gz 202550 SHA256 a21c47679bac174b6185265358c7c8e151ac1ee8c4f9fbceebe9b15a37a10382 SHA512 edac9309c285cf569c453cd63f2cbd5e0a29012936af181616010bebb4eac2c474e2b37463af61b5e66876ffba517040796c596ac2bbcc9dad2af7aedf324221 WHIRLPOOL a30e39f862ed5eefabcb79820f190bffeccffda79ceae1864cb3364fbda1588eb345e7b1fe1264cfd84710e56aadc36e9c816e6371a46e7c1f0225e726065304

diff --git a/dev-java/jvyaml/files/jvyaml-0.2-tests.patch b/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
deleted file mode 100644
index 0f6997e..0000000
--- a/dev-java/jvyaml/files/jvyaml-0.2-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml	2007-01-05 21:30:59.000000000 +0100
-+++ build.xml	2007-01-05 21:31:46.000000000 +0100
-@@ -47,7 +47,7 @@
-   </target>
- 
-   <target name="test" depends="compile-tests" description="Runs all tests">
--    <junit haltonfailure="false">
-+    <junit haltonfailure="true">
-       <classpath>
-       	<pathelement location="${build.dir}/classes/jvyaml"/>
-       	<pathelement location="${build.dir}/test"/>
-@@ -61,7 +61,7 @@
-     </junit>
-   </target>
- 
--  <target name="jar" depends="test" description="Create the jvyaml.jar file">
-+  <target name="jar" depends="compile" description="Create the jvyaml.jar file">
-     <jar destfile="${lib.dir}/jvyaml.jar">
-       <fileset dir="${jvyaml.classes.dir}">
-         <include name="**/*.class"/>

diff --git a/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch b/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch
deleted file mode 100644
index 5dac183..0000000
--- a/dev-java/jvyaml/files/jvyaml-0.2.1-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 35ab532..0000000
--- a/dev-java/jvyaml/jvyaml-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source test"
-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 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-		=dev-java/junit-3*
-	)"
-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 -v *.jar || die
-	use test && java-pkg_jar-from --build-only junit
-}
-
-#no javadoc target
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README CREDITS || die
-	use source && java-pkg_dosrc src/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}