Prepare for generic src_test.

Package-Manager: portage-2.1.4.4

4 files changed, 110 insertions, 7 deletions

diff --git a/dev-java/commons-codec/ChangeLog b/dev-java/commons-codec/ChangeLog
index 3ce4dfeb37e5..c0056ea2779a 100644
--- a/dev-java/commons-codec/ChangeLog
+++ b/dev-java/commons-codec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-codec
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.28 2007/07/29 19:22:17 tgall Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.29 2008/03/22 02:24:52 betelgeuse Exp $
+
+  22 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.3-tests-fix.patch, commons-codec-1.3-r1.ebuild:
+  Prepare for generic src_test.
 
   29 Jul 2007; Tom Gall <tgall@gentoo.org> commons-codec-1.3-r1.ebuild:
   stable on ppc64
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index 97f90ae32736..826097c99863 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.3-tests-fix.patch 3248 RMD160 073cf3858d3431a3947c948abb8f711bc4f7f8cb SHA1 1aeb3faa3b48edb4bccd1b89e1e51e7b3907d053 SHA256 5dacf10c2553955cc6c2f81f00debaeedd8137f5a7954cc7a7138af609ccba2e
 DIST commons-codec-1.3-src.tar.gz 88242 RMD160 84cfc6f02d991b5a7013902637aec5caaa29c823 SHA1 d9e37750866e4f7b090b0f95ada080c92e796505 SHA256 47e485a942e1f6f3f2a2b526e77667cbccbf507aeb63e129f54dfc77b5b645f4
-EBUILD commons-codec-1.3-r1.ebuild 1291 RMD160 98142f08abe9fe1b8dd7f4c42e03aa7712a9ff3f SHA1 4cbb741e7c5011cae3e0f9b75bfafdfb7c854d92 SHA256 76126ce21628879a0555f8ebbb11be7db300284b45f73e9ac4bbf30feeb7bfae
-MISC ChangeLog 3438 RMD160 834524d94e2e21a88f48643c7185bfff96f3a4da SHA1 f5614809bc112422d58d1abb18b527709605571b SHA256 21b519a21747385b9af4b16c864d747717ce0796687689c0e4ce0c27e61cbe89
+EBUILD commons-codec-1.3-r1.ebuild 1454 RMD160 d02840c658998448de6b875dc9c1686b67ffcc45 SHA1 67e393643e5ad25c36bc7a02012a98521a14f345 SHA256 ba313351a40a84898f2a6a821b1044ececedfacb40a39dfb38bcd2431123b82d
+MISC ChangeLog 3588 RMD160 a5d3b6de621b8dc90e4a68614778abfb52d9ba9a SHA1 33267293c54b1dcdca134dd0b80a16d7ee48c755 SHA256 897c93e867be61516609d63fbdd3dcc57da07e30317be863ad0f071f4286cbb4
 MISC metadata.xml 1286 RMD160 9555083aefde1408d9956d4234fa3c91ae69c1e8 SHA1 8ce48a9af4e680bc06a17bfa6ef65b164f4bf0aa SHA256 fbcbff87a5928376062a3dc3ca1b83adbdcc5a6f7eea47bc61a4b55ca1beeb19
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH5G31cxLzpIGCsLQRAssGAJ0b8NucR3hbemTvoZnUMuxMR5P/JgCfZH7H
+qWiiicBKttb7OpcCLToHG2c=
+=ydkN
+-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-codec/commons-codec-1.3-r1.ebuild b/dev-java/commons-codec/commons-codec-1.3-r1.ebuild
index 7d7692c3977f..69a86074dc01 100644
--- a/dev-java/commons-codec/commons-codec-1.3-r1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3-r1.ebuild,v 1.11 2007/07/29 19:22:17 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3-r1.ebuild,v 1.12 2008/03/22 02:24:52 betelgeuse Exp $
 
-JAVA_PKG_IUSE="doc source"
+EAPI=1
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
@@ -20,6 +21,7 @@ RDEPEND=">=virtual/jre-1.3
 	dev-java/log4j"
 
 DEPEND=">=virtual/jdk-1.3
+	test? ( dev-java/ant-junit:0 )
 	${RDEPEND}"
 
 S="${WORKDIR}"
@@ -27,6 +29,7 @@ S="${WORKDIR}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/1.3-tests-fix.patch"
 	sed -i "s_../LICENSE_LICENSE.txt_" build.xml  || die "sed failed"
 	echo "conf.home=./src/conf" >> build.properties
 	echo "source.home=./src/java" >> build.properties
@@ -34,6 +37,7 @@ src_unpack() {
 	echo "dist.home=./output/dist" >> build.properties
 	echo "test.home=./src/test" >> build.properties
 	echo "final.name=commons-codec" >> build.properties
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO8859-1
 }
 
 src_install() {
diff --git a/dev-java/commons-codec/files/1.3-tests-fix.patch b/dev-java/commons-codec/files/1.3-tests-fix.patch
new file mode 100644
index 000000000000..a8632cb371ea
--- /dev/null
+++ b/dev-java/commons-codec/files/1.3-tests-fix.patch
@@ -0,0 +1,84 @@
+--- /var/tmp/portage/dev-java/commons-codec-1.3-r1/work/src/test/org/apache/commons/codec/language/SoundexTest.java	2004-06-02 03:55:38.000000000 +0300
++++ src/test/org/apache/commons/codec/language/SoundexTest.java	2008-03-22 04:22:58.000000000 +0200
+@@ -1,9 +1,10 @@
+ /*

+- * Copyright 2001-2004 The Apache Software Foundation.

+- * 

+- * Licensed under the Apache License, Version 2.0 (the "License");

+- * you may not use this file except in compliance with the License.

+- * You may obtain a copy of the License at

++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
+  * 

+  *      http://www.apache.org/licenses/LICENSE-2.0

+  * 

+@@ -19,6 +20,7 @@
+ 

+ import junit.framework.Test;

+ import junit.framework.TestSuite;

++
+ import org.apache.commons.codec.EncoderException;

+ import org.apache.commons.codec.StringEncoder;

+ import org.apache.commons.codec.StringEncoderAbstractTest;

+@@ -26,13 +28,13 @@
+ /**

+  * Tests {@link Soundex}

+  * 

+- * @version $Id: 1.3-tests-fix.patch,v 1.1 2008/03/22 02:24:52 betelgeuse Exp $

+  * @author Apache Software Foundation

++ * @version $Id: 1.3-tests-fix.patch,v 1.1 2008/03/22 02:24:52 betelgeuse Exp $
+  */

+ public class SoundexTest extends StringEncoderAbstractTest {

+ 

+     public static Test suite() {

+-        return (new TestSuite(SoundexTest.class));

++        return new TestSuite(SoundexTest.class);
+     }

+ 

+     private Soundex encoder = null;

+@@ -340,30 +342,39 @@
+     /**

+      * Fancy characters are not mapped by the default US mapping.

+      * 

+-     * http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080

++     * http://issues.apache.org/bugzilla/show_bug.cgi?id=29080
+      */

+     public void testUsMappingOWithDiaeresis() {

+         assertEquals("O000", this.getEncoder().encode("o"));

++        if ( Character.isLetter('ö') ) {
+         try {

+             assertEquals("Ö000", this.getEncoder().encode("ö"));

+             fail("Expected IllegalArgumentException not thrown");

+         } catch (IllegalArgumentException e) {

+             // expected

+         }

++        } else {
++            assertEquals("", this.getEncoder().encode("ö"));
++        }
+     }

+ 

+     /**

+      * Fancy characters are not mapped by the default US mapping.

+      * 

+-     * http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080

++     * http://issues.apache.org/bugzilla/show_bug.cgi?id=29080
+      */

+     public void testUsMappingEWithAcute() {

+         assertEquals("E000", this.getEncoder().encode("e"));

++        if ( Character.isLetter('é') ) {
+         try {

+             assertEquals("É000", this.getEncoder().encode("é"));

+             fail("Expected IllegalArgumentException not thrown");

+         } catch (IllegalArgumentException e) {

+             // expected

+         }

++        } else {
++            assertEquals("", this.getEncoder().encode("é"));
+     }

++    }
++    
+ }