Cleanup.

(Portage version: 2.1.2-r12)

9 files changed, 21 insertions, 360 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index e2cf7f7c0f0b..1b72651cb91c 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.43 2007/03/02 19:19:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.44 2007/03/02 19:52:29 caster Exp $
+
+  02 Mar 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/jabref-1.7.1-nojarbundler.patch,
+  -files/jabref-1.8-classpath_cleanup.patch,
+  -files/jabref-1.8-fix_jarbundler.patch, -jabref-1.7.1-r1.ebuild,
+  -jabref-1.8.1.ebuild, jabref-2.1.ebuild:
+  Cleanup.
 
   02 Mar 2007; nixnut <nixnut@gentoo.org> jabref-2.1.ebuild:
   Stable on ppc wrt bug 154366
diff --git a/app-text/jabref/files/digest-jabref-1.7.1-r1 b/app-text/jabref/files/digest-jabref-1.7.1-r1
deleted file mode 100644
index 71e5467117df..000000000000
--- a/app-text/jabref/files/digest-jabref-1.7.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6c0ec7a9e57a5e12cb3b4d5a6465fe57 JabRef-1.7.1.src.tar.bz2 1730995
-RMD160 53e3a36c8ceab9368e7fcbaf60cc256f09543669 JabRef-1.7.1.src.tar.bz2 1730995
-SHA256 60c07d79be89fcb7cbb5248156d6a26c68769f38daed6c5bdd3e9a14875df383 JabRef-1.7.1.src.tar.bz2 1730995
diff --git a/app-text/jabref/files/digest-jabref-1.8.1 b/app-text/jabref/files/digest-jabref-1.8.1
deleted file mode 100644
index e40e979742b7..000000000000
--- a/app-text/jabref/files/digest-jabref-1.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 75d6f2fd443253ebcc3f6c41e5065155 JabRef-1.8.1-src.tar.bz2 1509155
-RMD160 6d7f154a93802b94cf443f7f5ae578a1e48dc7e2 JabRef-1.8.1-src.tar.bz2 1509155
-SHA256 cd1a46e9640465e5918773c5afca5f41f38069f836ab39dd1868e258210c2764 JabRef-1.8.1-src.tar.bz2 1509155
diff --git a/app-text/jabref/files/jabref-1.7.1-nojarbundler.patch b/app-text/jabref/files/jabref-1.7.1-nojarbundler.patch
deleted file mode 100644
index e23f7fcf756c..000000000000
--- a/app-text/jabref/files/jabref-1.7.1-nojarbundler.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- build.xml.orig	2005-04-11 20:54:08.000000000 +0200
-+++ build.xml	2005-04-11 20:55:04.000000000 +0200
-@@ -62,9 +62,6 @@
- 	<!-- Set the properties for library directories -->
- 	<property name="library.directory" value="lib" />
- 
--      <taskdef name="jarbundler"
--                  classpath="${library.directory}/jarbundler-1.4.jar"
--                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
- 
- 
- 
-@@ -73,6 +70,7 @@
- 		<pathelement path="${build.classes}" />
- 		<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
- 		<pathelement location="${library.directory}/commons-logging.jar" />
-+		<pathelement location="${library.directory}/forms.jar" />
- 		<fileset dir="${library.directory}">
- 			<include name="*.jar" />
- 		</fileset>
-@@ -92,11 +90,11 @@
- 			<exclude name="tests/**"/>
- 			<classpath>
- 				<pathelement path="${build.classes}" />
--				<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
-+				<pathelement location="${library.directory}/commons-httpclient.jar" />
- 				<pathelement location="${library.directory}/commons-logging.jar" />
- 				<pathelement location="${library.directory}/antlr.jar" />
--				<pathelement location="${library.directory}/looks-1.2.2.jar" />
--				<pathelement location="${library.directory}/forms-1.0.4.jar" />
-+				<pathelement location="${library.directory}/looks.jar" />
-+				<pathelement location="${library.directory}/forms.jar" />
- 				<pathelement location="${library.directory}/spin.jar" />
- 			</classpath>
- 		</javac>
-@@ -150,12 +148,6 @@
-                         <fileset dir="${library.directory}">
-                             <include name="EndNote.zip" />
-                         </fileset>
--			<fileset dir="${txt.dir}">
--				<include name="gpl.txt" />
--				<include name="lesser.txt" />
--				<include name="apache-license.txt" />
--				<include name="README" />
--			</fileset>
- 			<manifest>
- 				<attribute name="Main-Class" value="net.sf.jabref.JabRef" />
- 			</manifest>
-@@ -225,12 +217,12 @@
- 	<!-- Unpacks jar needed jar files from lib directory into temp directory. -->
- 	<target name="unjarlib" description="Unpacks jars from library">
- 		<mkdir dir="${build.tmp}"/>
--		<unjar src="${library.directory}/commons-httpclient-2.0.jar" dest="${build.tmp}" />
-+		<unjar src="${library.directory}/commons-httpclient.jar" dest="${build.tmp}" />
- 		<unjar src="${library.directory}/commons-logging.jar" dest="${build.tmp}" />
- 		<unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
- 		<!--                <unjar src="${library.directory}/plastic-1.2.1.jar" dest="${build.classes}" />-->
--		<unjar src="${library.directory}/looks-1.2.2.jar" dest="${build.tmp}" />
--		<unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
-+		<unjar src="${library.directory}/looks.jar" dest="${build.tmp}" />
-+		<unjar src="${library.directory}/forms.jar" dest="${build.tmp}" />
- 		<unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />
- 		<delete dir="${build.tmp}/META-INF"/>
- 	</target>
-@@ -360,8 +352,8 @@
- 				<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
- 				<pathelement location="${library.directory}/commons-logging.jar" />
- 				<pathelement location="${library.directory}/antlr.jar" />
--				<pathelement location="${library.directory}/looks-1.2.2.jar" />
--				<pathelement location="${library.directory}/looks-1.2.2.jar" />
-+				<pathelement location="${library.directory}/looks.jar" />
-+				<pathelement location="${library.directory}/looks.jar" />
- 				<pathelement location="${library.directory}/spin.jar" />
- 			</classpath>
- 
diff --git a/app-text/jabref/files/jabref-1.8-classpath_cleanup.patch b/app-text/jabref/files/jabref-1.8-classpath_cleanup.patch
deleted file mode 100644
index 873612407cc0..000000000000
--- a/app-text/jabref/files/jabref-1.8-classpath_cleanup.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -ru jabref-1.8/build.xml jabref-1.8-patched/build.xml
---- jabref-1.8/build.xml	2005-07-26 19:53:09.000000000 -0400
-+++ jabref-1.8-patched/build.xml	2005-08-10 08:27:04.000000000 -0400
-@@ -117,15 +117,7 @@
-                 <javac debug="on" deprecation="on" destdir="${build.classes}" source="1.4" target="1.4">
-                         <src path="${java.dir}"/>
-                         <exclude name="tests/**"/>
--                        <classpath>
--                                <pathelement path="${build.classes}" />
--                                <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
--                                <pathelement location="${library.directory}/commons-logging.jar" />-->
--                                <pathelement location="${library.directory}/antlr.jar" />
--                                <pathelement location="${library.directory}/looks-1.2.2.jar" />
--                                <pathelement location="${library.directory}/forms-1.0.4.jar" />
--                                <pathelement location="${library.directory}/spin.jar" />
--                        </classpath>
-+                        <classpath refid="classpath"/>
-                 </javac>
-         </target>
- 
-@@ -134,14 +126,7 @@
-                 <mkdir dir="${build.classes}" />
-                 <!--deprecation="on"-->
-                 <javac srcdir="${java.dir}/tests" debug="off" destdir="${build.classes}" source="1.4" target="1.4">
--                        <classpath>
--                                <pathelement path="${build.classes}" />
--                                <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
--                                <pathelement location="${library.directory}/commons-logging.jar" />-->
--                                <pathelement location="${library.directory}/antlr.jar" />
--                                <pathelement location="${library.directory}/looks-1.2.2.jar" />
--                                <pathelement location="${library.directory}/spin.jar" />
--                        </classpath>
-+                        <classpath refid="classpath"/>
-                 </javac>
- 
-         </target>
-@@ -309,12 +294,7 @@
-         <target name="pmd" description="SOFTWAREDESIGN: Project Mess Detector !;-)">
-                 <echo>Checking Project Mess Detection (PMD) rulesets.</echo>
-                 <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
--                        <classpath>
--                                <pathelement path="${classpath}" />
--                                <fileset dir="${library.directory}">
--                                        <include name="*.jar" />
--                                </fileset>
--                        </classpath>
-+                        <classpath refid="classpath"/>
-                 </taskdef>
-                 <!-- allowed Pretty Much Done rulsets -->
-                 <!-- rulesets/basic.xml -->
-@@ -345,12 +325,7 @@
-                 <echo>WARNING: use environment variable: ANT_OPTS=-Xmx512m or this task will fail.</echo>
-                 <echo>Checking for duplicated code using the Copy/Paste Detector (CPD).</echo>
-                 <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask">
--                        <classpath>
--                                <pathelement path="${classpath}" />
--                                <fileset dir="${library.directory}">
--                                        <include name="*.jar" />
--                                </fileset>
--                        </classpath>
-+                        <classpath refid="classpath"/>
-                 </taskdef>
-                 <cpd format="text" minimumTokenCount="100" outputFile="${build.dir}/duplicated_code_report.txt">
-                         <fileset dir="${src.dir}">
-@@ -362,12 +337,7 @@
- 
-         <target name="javancss" description="SOFTWAREDESIGN: Determining the NCSS and CCN code metrics for JOELib.">
-                 <taskdef name="javancss" classname="javancss.JavancssAntTask">
--                        <classpath>
--                                <pathelement path="${classpath}" />
--                                <fileset dir="${library.directory}">
--                                        <include name="*.jar" />
--                                </fileset>
--                        </classpath>
-+                        <classpath refid="classpath"/>
-                 </taskdef>
-                 <echo>Cyclomatic
- Complexity             Ease of       Risk
-@@ -385,12 +355,7 @@
- 
-         <target name="jalopy" description="SOFTWAREDESIGN: source code formatter using the JOELib convention.">
-                 <taskdef name="jalopy" classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
--                        <classpath>
--                                <pathelement path="${classpath}" />
--                                <fileset dir="${library.directory}">
--                                        <include name="*.jar" />
--                                </fileset>
--                        </classpath>
-+                        <classpath refid="classpath"/>
-                 </taskdef>
-                 <jalopy fileformat="unix" convention="${src.dir}/java/jalopy.format.convention.xml" history="file" historymethod="adler32" loglevel="error" threads="2" classpathref="classpath" backup="bak">
-                         <fileset dir="${src.dir}">
-@@ -408,15 +373,7 @@
-                                 </fileset>
-                         </batchtest>
- 
--                        <classpath>
--                                <pathelement location="${build.lib}/jabref.jar" />
--                                <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" />
--                                <pathelement location="${library.directory}/commons-logging.jar" />-->
--                                <pathelement location="${library.directory}/antlr.jar" />
--                                <pathelement location="${library.directory}/looks-1.2.2.jar" />
--                                <pathelement location="${library.directory}/looks-1.2.2.jar" />
--                                <pathelement location="${library.directory}/spin.jar" />
--                        </classpath>
-+                        <classpath refid="classpath"/>
- 
-                         <!--<test name="tests.net.sf.jabref.export.layout.format.AuthorLastFirstAbbreviatorTester"/>-->
-                 </junit>
diff --git a/app-text/jabref/files/jabref-1.8-fix_jarbundler.patch b/app-text/jabref/files/jabref-1.8-fix_jarbundler.patch
deleted file mode 100644
index 6272dca9e0e0..000000000000
--- a/app-text/jabref/files/jabref-1.8-fix_jarbundler.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru jabref-1.8/build.xml jabref-1.8-patched/build.xml
---- jabref-1.8/build.xml	2005-07-26 19:53:09.000000000 -0400
-+++ jabref-1.8-patched/build.xml	2005-08-10 00:15:41.000000000 -0400
-@@ -78,9 +78,6 @@
-         <property name="library.directory" value="lib" />
- 
- 
--    <taskdef name="jarbundler"
--                  classpath="${library.directory}/jarbundler-1.4.jar"
--                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
- 
- 
- 
-@@ -290,7 +287,10 @@
- 
- 
-         <target name="osxjar">
--        <jarbundler dir="${build.lib}"
-+		    <taskdef name="jarbundler"
-+                  classpath="${library.directory}/jarbundler-1.4.jar"
-+                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
-+	        <jarbundler dir="${build.lib}"
-                     name="JabRef"
-                     mainclass="net.sf.jabref.JabRef"
-                     jars="${build.lib}/${jabref.bin}.jar"
diff --git a/app-text/jabref/jabref-1.7.1-r1.ebuild b/app-text/jabref/jabref-1.7.1-r1.ebuild
deleted file mode 100644
index 49dbd4c168d1..000000000000
--- a/app-text/jabref/jabref-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-1.7.1-r1.ebuild,v 1.4 2005/09/12 22:36:31 hansmi Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="GUI frontend for BibTeX, written in Java"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${PV}.src.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="jikes"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/spin
-	>=dev-java/antlr-2.7.3
-	=dev-java/jgoodies-forms-1*
-	=dev-java/jgoodies-looks-1.2*
-	>=dev-java/commons-logging-1.0.4
-	=dev-java/commons-httpclient-2*"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	dev-java/junit"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-nojarbundler.patch
-
-	cd ${S}/lib && rm -f *.jar
-	java-pkg_jar-from antlr
-	java-pkg_jar-from spin
-	java-pkg_jar-from jgoodies-looks-1.2
-	java-pkg_jar-from jgoodies-forms
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from commons-httpclient commons-httpclient.jar
-}
-
-
-src_compile() {
-	local antflags="jars"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	echo "#!/bin/bash" > ${PN}
-	echo '$(java-config -J) -classpath $(java-config -p commons-httpclient,commons-logging,antlr,jgoodies-forms,jgoodies-looks-1.2,spin,jabref) net.sf.jabref.JabRef "$@"' >> ${PN}
-
-	dobin ${PN}
-
-	newicon src/images/JabRef-icon.png JabRef-icon.png
-	make_desktop_entry jabref JabRef JabRef-icon.png Office
-}
diff --git a/app-text/jabref/jabref-1.8.1.ebuild b/app-text/jabref/jabref-1.8.1.ebuild
deleted file mode 100644
index a4bc7e9e313c..000000000000
--- a/app-text/jabref/jabref-1.8.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-1.8.1.ebuild,v 1.1 2005/12/11 22:42:06 nichoj Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="GUI frontend for BibTeX, written in Java"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jabref/JabRef-${PV/_beta/b}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="jikes doc"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/spin
-	>=dev-java/antlr-2.7.3
-	=dev-java/jgoodies-forms-1*
-	=dev-java/jgoodies-looks-1.2*"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-core-1.4.1
-	jikes? ( dev-java/jikes )
-	dev-java/junit"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# TODO submit upstream
-	epatch ${FILESDIR}/${PN}-1.8-fix_jarbundler.patch
-	# cleans up the way the classpath is setup in build.xml.
-	# in particular, it makes it use *.jar instead of particular files
-	epatch ${FILESDIR}/${PN}-1.8-classpath_cleanup.patch
-
-	cd ${S}/lib && rm -f *.{zip,jar,class}
-	java-pkg_jar-from antlr
-	java-pkg_jar-from spin
-	java-pkg_jar-from jgoodies-looks-1.2
-	java-pkg_jar-from jgoodies-forms
-}
-
-
-src_compile() {
-	local antflags="jars"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} -Dbuild.javadocs=build/docs/api javadocs"
-	ant ${antflags} || die "Ant failed"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	use doc && java-pkg_dohtml -r build/docs/api
-	dodoc src/txt/README
-
-	echo "#!/bin/bash" > ${PN}
-	echo '$(java-config -J) -classpath $(java-config -p antlr,jgoodies-looks-1.2,jgoodies-forms,spin,jabref) net.sf.jabref.JabRef "$@"' >> ${PN}
-
-	dobin ${PN}
-
-	newicon src/images/JabRef-icon.png JabRef-icon.png
-	make_desktop_entry jabref JabRef JabRef-icon.png Office
-}
diff --git a/app-text/jabref/jabref-2.1.ebuild b/app-text/jabref/jabref-2.1.ebuild
index 34d53c648d0e..98df4bf08712 100644
--- a/app-text/jabref/jabref-2.1.ebuild
+++ b/app-text/jabref/jabref-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.1.ebuild,v 1.6 2007/03/02 19:19:39 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-2.1.ebuild,v 1.7 2007/03/02 19:52:29 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -13,30 +13,28 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
-RDEPEND=">=virtual/jre-1.4
-	dev-java/spin
+CDEPEND="dev-java/spin
 	>=dev-java/glazedlists-1.5.0
 	>=dev-java/antlr-2.7.3
 	dev-java/jgoodies-forms
 	=dev-java/jgoodies-looks-2.0*
 	>=dev-java/microba-0.4.3"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4.1"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.4"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
 
 src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	# TODO submit upstream
-	epatch "${FILESDIR}/${PN}-2.1-fix_jarbundler.patch"
+	# TODO submit upstream (was mailed after 2.2 release)
+	epatch "${FILESDIR}/${P}-fix_jarbundler.patch"
 	# cleans up the way the classpath is setup in build.xml.
 	# in particular, it makes it use *.jar instead of particular files
-	epatch "${FILESDIR}/${PN}-2.1-classpath_cleanup.patch"
+	epatch "${FILESDIR}/${P}-classpath_cleanup.patch"
 
-	rm lib/*
-	cd lib
+	rm lib/* &&	cd lib
 
 	java-pkg_jar-from antlr
 	java-pkg_jar-from spin
@@ -44,18 +42,15 @@ src_unpack() {
 	java-pkg_jar-from jgoodies-looks-2.0
 	java-pkg_jar-from jgoodies-forms
 	java-pkg_jar-from microba
-
 }
 
-
-src_compile() {
-	eant jars $(use_doc -Dbuild.javadocs=build/docs/api javadocs)
-}
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="-Dbuild.javadocs=build/docs/api javadocs"
 
 src_install() {
 	java-pkg_dojar build/lib/${PN}.jar
 
-	use doc && java-pkg_dohtml -r build/docs/api
+	use doc && java-pkg_dojavadoc build/docs/api
 	dodoc src/txt/README
 
 	java-pkg_dolauncher ${PN} \