Remove old.

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

6 files changed, 7 insertions, 194 deletions

diff --git a/dev-java/glazedlists/ChangeLog b/dev-java/glazedlists/ChangeLog
index 0036c78ca3f9..e84fff525a2f 100644
--- a/dev-java/glazedlists/ChangeLog
+++ b/dev-java/glazedlists/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/glazedlists
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.20 2010/05/22 04:55:20 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.21 2010/05/22 12:46:59 caster Exp $
+
+  22 May 2010; Vlastimil Babka <caster@gentoo.org>
+  -glazedlists-1.5.0.ebuild, -files/glazedlists-1.5.0-build.xml.patch,
+  -files/glazedlists-1.5.0-tests.patch, -glazedlists-1.7.0.ebuild,
+  metadata.xml:
+  Remove old.
 
   22 May 2010; Kenneth Prugh <ken69267@gentoo.org>
   glazedlists-1.7.0-r1.ebuild:
diff --git a/dev-java/glazedlists/files/glazedlists-1.5.0-build.xml.patch b/dev-java/glazedlists/files/glazedlists-1.5.0-build.xml.patch
deleted file mode 100644
index ac432f356cc5..000000000000
--- a/dev-java/glazedlists/files/glazedlists-1.5.0-build.xml.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- build.xml.orig	2005-12-21 23:19:00.000000000 +0100
-+++ build.xml	2006-10-29 01:18:44.000000000 +0200
-@@ -144,11 +144,13 @@
- 

-     <target name="swt" depends="core">

-         <mkdir dir="extensions/swt/lib"/>

-+		<!--

-         <java classname="ca.odell.glazedlists.impl.HttpClient">

-             <classpath path="classes"/>

-             <arg value="https://glazedlists.dev.java.net/files/documents/1073/25145/swt-api.jar"/>

-             <arg value="extensions/swt/lib/swt-api.jar"/>

-         </java>

-+		-->

-         <javac destdir="classes" srcdir="extensions/swt/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">

-             <classpath>

-                 <fileset dir="extensions/swt/lib/" includes="*.jar"/>

-@@ -158,11 +160,13 @@
- 

-     <target name="ktable" depends="core,swt,issuesbrowser">

-         <mkdir dir="extensions/ktable/lib"/>

-+		<!--

-         <java classname="ca.odell.glazedlists.impl.HttpClient">

-             <classpath path="classes"/>

-             <arg value="https://glazedlists.dev.java.net/files/documents/1073/24419/ktable.jar"/>

-             <arg value="extensions/ktable/lib/ktable.jar"/>

-         </java>

-+		-->

-         <javac destdir="classes" srcdir="extensions/ktable/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">

-             <classpath>

-                 <fileset dir="extensions/ktable/lib/" includes="*.jar"/>

-@@ -318,16 +322,13 @@
- 

-     <target name="test" depends="compiletests"

-             description="Compile unit tests and run them using JUnit.">

--            <!-- Verify that JUnit is available on the classpath -->

--            <available classname="junit.framework.TestCase" property="junit.present"/>

--            <fail unless="junit.present" message="To run this task, install junit.jar and optional.jar into ${ant.home}/lib/ JUnit is available free at http://www.junit.org"/>

-             <!-- Execute JUnit tests -->

-             <junit printsummary="true" showoutput="false" fork="true"

-                     errorProperty="test.failed" failureProperty="test.failed">

-                     <assertions>

-                             <enable/>

-                     </assertions>

--                    <classpath path="classes:${ant.home}/lib/junit.jar"/>

-+                    <classpath path="classes"/>

-                     <formatter type="brief" usefile="false"/>

-                     <batchtest>

-                             <fileset dir="classes/" includes="**/**Test.class"/>

-@@ -338,11 +339,9 @@
- 

-     <target name="compiletests" depends="compileall">

-         <!-- Compile the test classes from source/ into classes/ -->

--        <echo>${ant.home}</echo>

-         <javac destdir="classes" srcdir="test" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">

-             <classpath>

-                 <fileset dir="extensions" includes="**/*.jar"/>

--                <fileset file="${ant.home}/lib/junit.jar"/>

-             </classpath>

-         </javac>

-     </target>

diff --git a/dev-java/glazedlists/files/glazedlists-1.5.0-tests.patch b/dev-java/glazedlists/files/glazedlists-1.5.0-tests.patch
deleted file mode 100644
index f06061794422..000000000000
--- a/dev-java/glazedlists/files/glazedlists-1.5.0-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/ca/odell/glazedlists/ThresholdListTest.java	2005-12-21 23:19:06.000000000 +0100
-+++ test/ca/odell/glazedlists/ThresholdListTest.java	2006-11-29 01:30:15.000000000 +0100
-@@ -944,7 +944,7 @@
-         }

-         

-         public int evaluate(Object object) {

--            return Integer.valueOf((String)(String)object);

-+            return Integer.valueOf((String)(String)object).intValue();

-         }

-     }

-     

diff --git a/dev-java/glazedlists/glazedlists-1.5.0.ebuild b/dev-java/glazedlists/glazedlists-1.5.0.ebuild
deleted file mode 100644
index 7aa094ef8077..000000000000
--- a/dev-java/glazedlists/glazedlists-1.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-1.5.0.ebuild,v 1.9 2007/08/03 15:36:06 betelgeuse Exp $
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://publicobject.com/glazedlists/"
-# there's also 1.5 source available, potential java5 useflag
-SRC_URI="https://${PN}.dev.java.net/files/documents/1073/26115/${P}-source_java14.zip"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	app-arch/unzip"
-S="${WORKDIR}"
-
-# tests need X otherwise fail
-RESTRICT="test"
-
-#Patch takes care of this
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable autodownloading of dependencies
-	# sort out test targets
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	if use test; then
-		# make testcases -source 1.4 friendly
-		epatch "${FILESDIR}/${P}-tests.patch"
-		cd extensions
-		java-pkg_jar-from --build-only junit junit.jar
-	fi
-}
-
-EANT_DOC_TARGET="docs"
-
-src_test() {
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar "${PN}_java14.jar"
-	if use doc; then
-		dohtml readme.html || die
-		java-pkg_dojavadoc docs/api
-	fi
-	use source && java-pkg_dosrc "source/ca"
-}
diff --git a/dev-java/glazedlists/glazedlists-1.7.0.ebuild b/dev-java/glazedlists/glazedlists-1.7.0.ebuild
deleted file mode 100644
index 6870ebf4a7af..000000000000
--- a/dev-java/glazedlists/glazedlists-1.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/glazedlists-1.7.0.ebuild,v 1.3 2009/04/04 19:16:14 maekke Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://publicobject.com/glazedlists/"
-SRC_DOCUMENT_ID_JAVA5="1073/38679"
-SRC_DOCUMENT_ID_JAVA4="1073/38683"
-SRC_URI="java5? ( https://${PN}.dev.java.net/files/documents/${SRC_DOCUMENT_ID_JAVA5}/${P}-source_java15.zip )
-	!java5? ( https://${PN}.dev.java.net/files/documents/${SRC_DOCUMENT_ID_JAVA4}/${P}-source_java14.zip )"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-# TODO: there are extensions, some supported in the java-experimental ebuild
-IUSE="java5"
-
-RDEPEND="java5? ( >=virtual/jre-1.5 )
-	!java5? ( >=virtual/jre-1.4 )"
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( >=virtual/jdk-1.4 )
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-# tests seem to be buggy
-RESTRICT="test"
-
-# build file already has correct target version
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable autodownloading of dependencies
-	# sort out test targets
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-EANT_DOC_TARGET="docs"
-
-src_install() {
-	if use java5; then
-		java-pkg_newjar "target/${PN}_java15.jar"
-	else
-		java-pkg_newjar "target/${PN}_java14.jar"
-	fi
-	if use doc; then
-		dohtml readme.html || die
-		java-pkg_dojavadoc "target/docs/api"
-	fi
-	if use source; then
-		# collect source folders for all the used extensions
-		local source_folders="source/ca extensions/treetable/source/*"
-		java-pkg_dosrc ${source_folders}
-	fi
-}
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
index 00cba9e3095b..838c00a4a448 100644
--- a/dev-java/glazedlists/metadata.xml
+++ b/dev-java/glazedlists/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
-<use>
-   <flag name="java5">Builds a Java 1.5 version (recommended)</flag>
-</use>
 </pkgmetadata>