Remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 6 insertions, 129 deletions

diff --git a/dev-java/jtds/ChangeLog b/dev-java/jtds/ChangeLog
index df435976aa28..acf15f4168de 100644
--- a/dev-java/jtds/ChangeLog
+++ b/dev-java/jtds/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jtds
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.24 2010/02/09 14:32:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/ChangeLog,v 1.25 2010/04/05 23:04:41 caster Exp $
+
+  05 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -files/1.0.3-buildxml.patch, -jtds-1.2-r2.ebuild,
+  -files/1.2-com.sun.patch:
+  Remove old.
 
   09 Feb 2010; Joseph Jezak <josejx@gentoo.org> jtds-1.2.4.ebuild:
   Marked ppc stable for bug #296053.
diff --git a/dev-java/jtds/files/1.0.3-buildxml.patch b/dev-java/jtds/files/1.0.3-buildxml.patch
deleted file mode 100644
index 0c026ddf3434..000000000000
--- a/dev-java/jtds/files/1.0.3-buildxml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- build.xml.orig	2005-04-24 21:16:37.000000000 +0200
-+++ build.xml	2005-04-24 21:19:55.000000000 +0200
-@@ -75,13 +75,13 @@
-     </junit>
-   </target>
- 
--  <target name="dist" depends="clean,compile,javadoc">
-+  <target name="jar" depends="compile">
-     <mkdir dir="${dist}"/>
-     <!-- Runtime jar -->
-     <jar basedir="${build}/classes"
-          excludes="net/sourceforge/jtds/test/*.class"
-          includes="**/*"
--         jarfile="${build}/${ant.project.name}-${version}.jar">
-+         jarfile="${build}/${ant.project.name}.jar">
-         <manifest>
-             <attribute name="Implementation-Title" value="jTDS JDBC Driver"/>
-             <attribute name="Implementation-Version" value="${version}"/>
-@@ -92,7 +92,9 @@
-             <attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>
-         </manifest>
-     </jar>
--
-+  </target>
-+    
-+  <target name="dist" depends="jar,clean,compile">
-     <!-- Source package -->
-     <copy todir="${dist}/tmp/doc">
-       <fileset dir="${build}/doc" includes="**/*"/>
diff --git a/dev-java/jtds/files/1.2-com.sun.patch b/dev-java/jtds/files/1.2-com.sun.patch
deleted file mode 100644
index b6b3437aceaa..000000000000
--- a/dev-java/jtds/files/1.2-com.sun.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: src/main/net/sourceforge/jtds/ssl/SocketFactories.java
-===================================================================
-RCS file: /cvsroot/jtds/jtds/src/main/net/sourceforge/jtds/ssl/SocketFactories.java,v
-retrieving revision 1.7
-diff -u -r1.7 SocketFactories.java
---- src/main/net/sourceforge/jtds/ssl/SocketFactories.java	28 Apr 2005 14:29:30 -0000	1.7
-+++ src/main/net/sourceforge/jtds/ssl/SocketFactories.java	7 May 2007 18:36:12 -0000
-@@ -29,9 +29,9 @@
- import javax.net.ssl.SSLSocket;
- import javax.net.ssl.SSLSocketFactory;
- 
--import com.sun.net.ssl.SSLContext;
--import com.sun.net.ssl.TrustManager;
--import com.sun.net.ssl.X509TrustManager;
-+import javax.net.ssl.SSLContext;
-+import javax.net.ssl.TrustManager;
-+import javax.net.ssl.X509TrustManager;
- 
- import net.sourceforge.jtds.util.Logger;
- 
-@@ -184,17 +184,13 @@
-                     return new X509Certificate[0];
-                 }
- 
--                public boolean isClientTrusted(X509Certificate[] chain) {
--                    return true;
--                }
-+                public void checkClientTrusted(X509Certificate[] chain, String authType) {}
- 
--                public boolean isServerTrusted(X509Certificate[] chain) {
--                    return true;
--                }
-+                public void checkServerTrusted(X509Certificate[] chain, String authType) {}
-             };
- 
-             return new X509TrustManager[]{tm};
-         }
- 
-     }
--}
-\ No newline at end of file
-+}
diff --git a/dev-java/jtds/jtds-1.2-r2.ebuild b/dev-java/jtds/jtds-1.2-r2.ebuild
deleted file mode 100644
index 069cca609a2c..000000000000
--- a/dev-java/jtds/jtds-1.2-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2-r2.ebuild,v 1.8 2008/03/22 02:45:18 betelgeuse Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://jtds.sourceforge.net"
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-COMMON_DEPEND="
-	=dev-java/jcifs-1*
-	dev-java/junit:0"
-# does not like javax.sql in >=1.6
-DEPEND="
-	|| (
-		=virtual/jdk-1.5*
-		=virtual/jdk-1.4*
-	)
-	${COMMON_DEPEND}
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-S=${WORKDIR}
-
-# Would need a running server
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/1.0.3-buildxml.patch"
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1714497&group_id=33291&atid=407764
-	epatch "${FILESDIR}/1.2-com.sun.patch"
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-
-	java-pkg_jar-from jcifs-1.1
-	#TODO: don't always build tests
-	java-pkg_jar-from junit
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	dodoc CHANGELOG README* || die "Failed to install docs."
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc "${S}"/src/main/*
-}