Remove old.

(Portage version: 2.2_rc91/cvs/Linux x86_64)

3 files changed, 5 insertions, 118 deletions

diff --git a/dev-java/commons-codec/ChangeLog b/dev-java/commons-codec/ChangeLog
index daea9494e876..187a417533ac 100644
--- a/dev-java/commons-codec/ChangeLog
+++ b/dev-java/commons-codec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-codec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.43 2010/10/14 16:54:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.44 2010/10/17 12:24:03 caster Exp $
+
+  17 Oct 2010; Vlastimil Babka <caster@gentoo.org>
+  -files/1.3-tests-fix.patch, -commons-codec-1.3-r2.ebuild:
+  Remove old.
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> commons-codec-1.4.ebuild:
   stable ppc, bug 316295
diff --git a/dev-java/commons-codec/commons-codec-1.3-r2.ebuild b/dev-java/commons-codec/commons-codec-1.3-r2.ebuild
deleted file mode 100644
index 5844a6b7e9ff..000000000000
--- a/dev-java/commons-codec/commons-codec-1.3-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 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-r2.ebuild,v 1.6 2010/03/20 10:55:52 betelgeuse Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementations of common encoders and decoders in Java."
-HOMEPAGE="http://commons.apache.org/codec"
-SRC_URI="mirror://apache/jakarta/commons/codec/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit:0 )
-	${RDEPEND}"
-
-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
-	echo "build.home=./output" >> build.properties
-	echo "dist.home=./output/dist" >> build.properties
-	echo "test.home=./src/test" >> build.properties
-	echo "final.name=commons-codec" >> build.properties
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar output/dist/${PN}.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	use doc && java-pkg_dojavadoc output/dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-codec/files/1.3-tests-fix.patch b/dev-java/commons-codec/files/1.3-tests-fix.patch
deleted file mode 100644
index d753b8fc961a..000000000000
--- a/dev-java/commons-codec/files/1.3-tests-fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nur commons-codec-1.3-src/src/test/org/apache/commons/codec/language/SoundexTest.java commons-codec-1.3-src_patched/src/test/org/apache/commons/codec/language/SoundexTest.java
---- commons-codec-1.3-src/src/test/org/apache/commons/codec/language/SoundexTest.java	2004-06-02 03:55:38.000000000 +0300
-+++ commons-codec-1.3-src_patched/src/test/org/apache/commons/codec/language/SoundexTest.java	2008-09-26 00:00:42.000000000 +0300
-@@ -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;

-@@ -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("é"));
-     }

-+    }
-+    
- }