Version bump, bug #198101. Only minimal version with java5 support for now, to allow bumping jabref. Some extensions supported by ebuild in java-experimental overlay. Thanks to Bernhard Frauendienst <gentoo@obeliks.de>.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1-perfctr x86_64

4 files changed, 192 insertions, 13 deletions

diff --git a/dev-java/glazedlists/ChangeLog b/dev-java/glazedlists/ChangeLog
index 1621acd2b59d..f86feacbcee1 100644
--- a/dev-java/glazedlists/ChangeLog
+++ b/dev-java/glazedlists/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/glazedlists
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.12 2008/02/26 13:31:37 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/glazedlists/ChangeLog,v 1.13 2008/10/11 22:01:18 caster Exp $
+
+*glazedlists-1.7.0 (11 Oct 2008)
+
+  11 Oct 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/glazedlists-1.7.0-build.xml.patch, +glazedlists-1.7.0.ebuild:
+  Version bump, bug #198101. Only minimal version with java5 support for
+  now, to allow bumping jabref. Some extensions supported by ebuild in
+  java-experimental overlay. Thanks to Bernhard Frauendienst
+  <gentoo@obeliks.de>.
 
   03 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
   glazedlists-1.5.0.ebuild:
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
index 6b38d674d952..39efd1367fe6 100644
--- a/dev-java/glazedlists/Manifest
+++ b/dev-java/glazedlists/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX glazedlists-1.5.0-build.xml.patch 3122 RMD160 a149cfbc8ae1ca0276765034b1431e9228fc0433 SHA1 d1cf9a7cd862db1a4a99d0f32081defd8fb730c2 SHA256 159592d2d18c7204d5ef1ad04eb3b6d2d6040f0a5501b61cce775aaad378997a
 AUX glazedlists-1.5.0-tests.patch 430 RMD160 cbbab60dc3a933fef5833eca0e8b46779c0dd69d SHA1 552c21c9d544891d09812298896128153936d50a SHA256 62b36a37c19539d313b5a1653cfc7907df3483483c1d475e3dfab30c97f260eb
+AUX glazedlists-1.7.0-build.xml.patch 6224 RMD160 fcdf63f29b495071d8233fd41f2f14a4d46b1106 SHA1 7073242015811907f5ce0206633833f4db6dc32f SHA256 6dfaab0647aca7ab97845ee9ecad5435fb37d151585daab1f637b5f5e769c905
 DIST glazedlists-1.5.0-source_java14.zip 466926 RMD160 136cdb9c4275ab5b59f3581bff2434bb10209c4c SHA1 5d03247d7c51caf726f04c01ed012fc87b8de9eb SHA256 de9867224252fac85833d6ad7c2452160208a89386345a628f84e38d27bee445
+DIST glazedlists-1.7.0-source_java14.zip 638735 RMD160 45719403cf5bdd1ddbcc50e051098e3bbacac4e0 SHA1 2e40b7275e713ee7c65bd9e079bcf8419a3b8ab1 SHA256 bed004955f4fc0b2cd561698ec690ba4405040239416f6244943fbee4f87544c
+DIST glazedlists-1.7.0-source_java15.zip 879565 RMD160 64008cf55d6ec526b052420448deca3e7cdf77d1 SHA1 6f1629ef5fafb853ec13f0bfe19bd97a92026ad7 SHA256 e3f2370ed80fce8c104f2ac1e820c10b2c691390783e163ec02b2db5e6ab3d36
 EBUILD glazedlists-1.5.0.ebuild 1408 RMD160 61e83de813754b1cda7ab5ff18dca55200e72ebd SHA1 81a08615884c568e6368d8a440ce2340b1c4eda5 SHA256 239d77544675b5fbcd184dbf9cda509cb942614ae589ccf3b9e698c11576834c
-MISC ChangeLog 1963 RMD160 f5f1af3095a4e0984d741af297663d0baa393e23 SHA1 ac66c2b2189a6284958cc9620ad38d63297e7be3 SHA256 5cc3b6043b2d435c673aa7acfe3757fdbc23dfaf8393bd462692df88a60827e8
+EBUILD glazedlists-1.7.0.ebuild 1657 RMD160 eef03c5c533003702e962729c2e6485e0ee52294 SHA1 3eca62fefeb66dfbf185b00e7036c8b94143eaa5 SHA256 f1393f90f90f02c0d01891db1ca7c34baaacf3bb6141247c1185fb948a684a89
+MISC ChangeLog 2349 RMD160 d9d6a6910c05b36098dd7d251fb1bcef9ea2125b SHA1 0e840e63ccd410f3db3125a945e6984d975c4b03 SHA256 9941caa10b6c6aaedc0485e6bdc14a0cc66d4f361517e62985019180071b50a9
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHxBS+NQqtfCuFneMRAkDgAJ93K4De4Hc7L0aAkSgfRIalG8W/zQCeJaEC
-TwDC1P8tBv72N0XfgaYCtHo=
-=0arT
------END PGP SIGNATURE-----
diff --git a/dev-java/glazedlists/files/glazedlists-1.7.0-build.xml.patch b/dev-java/glazedlists/files/glazedlists-1.7.0-build.xml.patch
new file mode 100644
index 000000000000..a4e715bf8125
--- /dev/null
+++ b/dev-java/glazedlists/files/glazedlists-1.7.0-build.xml.patch
@@ -0,0 +1,116 @@
+--- build.xml.orig	2007-11-04 23:22:54.000000000 +0100
++++ build.xml	2007-11-04 23:23:58.000000000 +0100
+@@ -84,7 +84,7 @@
+             <link href="http://help.eclipse.org/help31/nftopic/org.eclipse.platform.doc.isv/reference/api/"/>
+             <link href="http://www.jdocs.com/formlayout/1.0.4/api/" packagelistloc="extensions/jgoodiesforms/lib"/>
+             <link href="http://nachocalendar.sourceforge.net/doc/"/>
+-            <link href="http://www.jfree.org/jfreechart/javadoc/"/>
++            <link href="http://www.jfree.org/jfreechart/api/javadoc/"/>
+             <link href="http://download.java.net/javadesktop/swinglabs/releases/0.8/docs/api/"/>
+ 
+             <doctitle><![CDATA[<h1>Glazed Lists 1.7.0</h1>]]></doctitle>
+@@ -130,7 +130,7 @@
+ 		description="Compile the default components of the source.">
+ 	</target>
+ 
+-	<target name="compileall" depends="core,migrationkit,swing,io,swt,ktable,jfreechart,issuesbrowser,swinglabs,treetable"
++	<target name="compileall" depends="core,migrationkit,swing,io,treetable"
+ 		description="Compile all components of the source.">
+ 	</target>
+ 
+@@ -178,11 +178,13 @@
+ 
+     <target name="swt" depends="core">
+         <mkdir dir="extensions/swt/lib"/>
++	<!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <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.dir}" srcdir="extensions/swt/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/swt/lib/" includes="*.jar"/>
+@@ -207,11 +209,13 @@
+ 
+     <target name="jgoodiesforms" depends="core,swing">
+         <mkdir dir="extensions/jgoodiesforms/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/27334/forms.jar"/>
+             <arg value="extensions/jgoodiesforms/lib/forms.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/jgoodiesforms/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/jgoodiesforms/lib/" includes="*.jar"/>
+@@ -223,11 +227,13 @@
+         <!-- the swinglabs .jar is Java 1.5+ only, so we do not bother to run
+              this code through our Java 1.5 to Java 1.4 source code translator -->
+         <mkdir dir="extensions/swinglabs/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/32966/swingx.jar"/>
+             <arg value="extensions/swinglabs/lib/swingx.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/swinglabs/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/swinglabs/lib/" includes="*.jar"/>
+@@ -237,11 +243,13 @@
+ 
+     <target name="nachocalendar" depends="core,swing">
+         <mkdir dir="extensions/nachocalendar/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/29958/nachocalendar.jar"/>
+             <arg value="extensions/nachocalendar/lib/nachocalendar.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/nachocalendar/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/nachocalendar/lib/" includes="*.jar"/>
+@@ -255,6 +263,7 @@
+ 
+     <target name="jfreechart" depends="swing">
+         <mkdir dir="extensions/jfreechart/lib"/>
++        <!--
+         <java classname="ca.odell.glazedlists.impl.HttpClient">
+             <classpath path="${classes.dir}"/>
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/26197/jcommon.jar"/>
+@@ -265,6 +274,7 @@
+             <arg value="https://glazedlists.dev.java.net/files/documents/1073/26198/jfreechart.jar"/>
+             <arg value="extensions/jfreechart/lib/jfreechart.jar"/>
+         </java>
++        -->
+         <javac destdir="${classes.dir}" srcdir="extensions/jfreechart/source" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <fileset dir="extensions/jfreechart/lib/" includes="*.jar"/>
+@@ -535,7 +545,6 @@
+                         <pathelement location="${classes.dir}"/>
+                         <pathelement location="${testclasses.dir}"/>
+                         <fileset dir="extensions" includes="**/*.jar"/>
+-                        <fileset file="${ant.home}/lib/junit.jar"/>
+                     </classpath>
+                     <formatter type="brief" usefile="false"/>
+                     <batchtest>
+@@ -546,15 +555,11 @@
+     </target>
+ 
+     <target name="compiletests" depends="compileall">
+-        <!-- 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"/>
+ 		<mkdir dir="${testclasses.dir}"/>
+ 	    <javac destdir="${testclasses.dir}" srcdir="test" debug="on" source="${java.target.version}" target="${java.target.version}" deprecation="on">
+             <classpath>
+                 <pathelement location="${classes.dir}"/>
+                 <fileset dir="extensions" includes="**/*.jar"/>
+-                <fileset file="${ant.home}/lib/junit.jar"/>
+             </classpath>
+         </javac>
+     </target>
diff --git a/dev-java/glazedlists/glazedlists-1.7.0.ebuild b/dev-java/glazedlists/glazedlists-1.7.0.ebuild
new file mode 100644
index 000000000000..b6c0fab00757
--- /dev/null
+++ b/dev-java/glazedlists/glazedlists-1.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 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.1 2008/10/11 22:01:18 caster Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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
+}