Version bump, based on contributed ebuild from Christian Faulhammer <opfer@gentoo.org> in bug #122085. Dropping ~amd64 and ~ppc until new dependencies are keyworded and jabref rekeyworded.

Package-Manager: portage-2.1.2_pre3-r9

6 files changed, 252 insertions, 10 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 9e7e0d42aa35..59dd18d9945f 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.37 2006/03/12 16:53:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.38 2006/10/28 23:58:41 caster Exp $
+
+*jabref-2.1 (28 Oct 2006)
+
+  28 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/jabref-2.1-classpath_cleanup.patch,
+  +files/jabref-2.1-fix_jarbundler.patch, +jabref-2.1.ebuild:
+  Version bump, based on contributed ebuild from Christian Faulhammer
+  <opfer@gentoo.org> in bug #122085. Dropping ~amd64 and ~ppc until new
+  dependencies are keyworded and jabref rekeyworded.
 
   12 Mar 2006; <nichoj@gentoo.org> -files/jabref-1.7-nojarbundler.patch,
   -files/jabref-1.8_beta-nojarbundler.patch, -jabref-1.7.ebuild,
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index f18283fbd35f..27185bbedb7b 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,27 +1,52 @@
-MD5 9481e2898c1eb870f9b1510b2bbbf1c9 ChangeLog 4964
-RMD160 39ad82f4cb120b62972a0ad067df7dc86f1e4c66 ChangeLog 4964
-SHA256 22198a4cc0d40f2e913833708d483ae96cfb5c8f9866b0f732840a4a0c8b2705 ChangeLog 4964
-MD5 5b3028166c382f310e75f818ad5a744e files/digest-jabref-1.7.1-r1 70
-RMD160 9718bcea4ac7289d59b9178032e719749b298a28 files/digest-jabref-1.7.1-r1 70
-SHA256 861c8954781e4976ce6dbc7b6d6bfb43264f95dd80bdddb3457a4ddc33c2fa09 files/digest-jabref-1.7.1-r1 70
-MD5 2a972e285243ea508854929f17e46851 files/digest-jabref-1.8.1 70
-RMD160 3e6793ad19e0aca7d13053bceeed7a65d2c9a979 files/digest-jabref-1.8.1 70
-SHA256 7e16347d41d9fbbfaa641b2b8d35368b63414849c1c1535e413c18cc79e8ada7 files/digest-jabref-1.8.1 70
+AUX jabref-1.7.1-nojarbundler.patch 3616 RMD160 ea6dc5b450f29b43acc09b93b14bb452cceed0c6 SHA1 4cc264e601e7eea9164a0219a56c946a8c6ac1f3 SHA256 9fb170efa84a3347d3c19a4ef556664e76e41db6e0c53d1493fd9e435d14ec56
 MD5 95ffcffd70b173a4f8956d0afdc47da4 files/jabref-1.7.1-nojarbundler.patch 3616
 RMD160 ea6dc5b450f29b43acc09b93b14bb452cceed0c6 files/jabref-1.7.1-nojarbundler.patch 3616
 SHA256 9fb170efa84a3347d3c19a4ef556664e76e41db6e0c53d1493fd9e435d14ec56 files/jabref-1.7.1-nojarbundler.patch 3616
+AUX jabref-1.8-classpath_cleanup.patch 6558 RMD160 ecaf87d8a146443ed0cb936048de75b4d7157e4b SHA1 69a8b3c9357d12f2630775a89d022e8ad9d5b48c SHA256 ca9118b9a8deab4ea593b6de19dd93750b9ffc2d62c24b6f4b49421393559e30
 MD5 cfa957ae95e31719e0deeef0139b4fef files/jabref-1.8-classpath_cleanup.patch 6558
 RMD160 ecaf87d8a146443ed0cb936048de75b4d7157e4b files/jabref-1.8-classpath_cleanup.patch 6558
 SHA256 ca9118b9a8deab4ea593b6de19dd93750b9ffc2d62c24b6f4b49421393559e30 files/jabref-1.8-classpath_cleanup.patch 6558
+AUX jabref-1.8-fix_jarbundler.patch 926 RMD160 7da5ca8cd89d88453c529d379864edc0e5be181d SHA1 22190192d4b544de6cda665ec0c1a3b0ee26ed58 SHA256 0d1994b48c99c59022e164e0e31734eb17a0377fe5e1fdd398786f18ea0649b6
 MD5 ecd0980ac0a8147eddf0141cb6735623 files/jabref-1.8-fix_jarbundler.patch 926
 RMD160 7da5ca8cd89d88453c529d379864edc0e5be181d files/jabref-1.8-fix_jarbundler.patch 926
 SHA256 0d1994b48c99c59022e164e0e31734eb17a0377fe5e1fdd398786f18ea0649b6 files/jabref-1.8-fix_jarbundler.patch 926
+AUX jabref-2.1-classpath_cleanup.patch 6641 RMD160 12cb38928f7afa138931893484eb8905a095d43e SHA1 4e13a75b50a690d495de3a4fb0a691ced5f41eae SHA256 90ea4f0c3a6ecac2943b4ea09fcbd2dd0ad8d709ca3ffdb7ae180ada449b4d27
+MD5 be7486464f6b0b7c963b37fddb6bae72 files/jabref-2.1-classpath_cleanup.patch 6641
+RMD160 12cb38928f7afa138931893484eb8905a095d43e files/jabref-2.1-classpath_cleanup.patch 6641
+SHA256 90ea4f0c3a6ecac2943b4ea09fcbd2dd0ad8d709ca3ffdb7ae180ada449b4d27 files/jabref-2.1-classpath_cleanup.patch 6641
+AUX jabref-2.1-fix_jarbundler.patch 1042 RMD160 3817c809e98a1d538d07fb2c1914d5c2bbc21966 SHA1 3b7dbf2910bb42db4972bb09040ae0406d5fc803 SHA256 378bb13137ba1219d5fac0fee3e41fa3d45a8349ebf6a9df5db75abaf73a9683
+MD5 227f76de4bb656c451da2316ade6d318 files/jabref-2.1-fix_jarbundler.patch 1042
+RMD160 3817c809e98a1d538d07fb2c1914d5c2bbc21966 files/jabref-2.1-fix_jarbundler.patch 1042
+SHA256 378bb13137ba1219d5fac0fee3e41fa3d45a8349ebf6a9df5db75abaf73a9683 files/jabref-2.1-fix_jarbundler.patch 1042
+DIST JabRef-1.7.1.src.tar.bz2 1730995
+DIST JabRef-1.8.1-src.tar.bz2 1509155
+DIST JabRef-2.1-src.tar.bz2 2574390 RMD160 1d18c37b93731f10025550d0450d626f1eb76471 SHA1 d33362588071214976cc5fe6fc90b2e5776d4af2 SHA256 e23e8414ebd898952b7478cecafb3d5af7c223e558defd1876bea4e8f6b00843
+EBUILD jabref-1.7.1-r1.ebuild 1646 RMD160 71744f78a0d20c717882654e3f4028bffda0d33d SHA1 4d58c7d8d02193bfe6dea5704998a1f007688de3 SHA256 e4b18da83aaf4a4b50ac5290185756c9c340759f130b096215ff157f3b2b8159
 MD5 a426d50a86db47b2de3cfc39918e3aca jabref-1.7.1-r1.ebuild 1646
 RMD160 71744f78a0d20c717882654e3f4028bffda0d33d jabref-1.7.1-r1.ebuild 1646
 SHA256 e4b18da83aaf4a4b50ac5290185756c9c340759f130b096215ff157f3b2b8159 jabref-1.7.1-r1.ebuild 1646
+EBUILD jabref-1.8.1.ebuild 1813 RMD160 87d0516ec4724ac7ad30acdda0b94f09e86d1dd2 SHA1 56c91dfa1c3aa89f67b7371425d2f752e86fb55f SHA256 d7a905ef86d8210c8af8709a5381216d6530a794e0f8b85c6fcf46558320c293
 MD5 630e44734099bd9581bba000a16620ae jabref-1.8.1.ebuild 1813
 RMD160 87d0516ec4724ac7ad30acdda0b94f09e86d1dd2 jabref-1.8.1.ebuild 1813
 SHA256 d7a905ef86d8210c8af8709a5381216d6530a794e0f8b85c6fcf46558320c293 jabref-1.8.1.ebuild 1813
+EBUILD jabref-2.1.ebuild 1590 RMD160 d52475ba49d0f36958746c89da5540693f732dec SHA1 9c16655e507470d67c9c2de43bb64826d5a4302f SHA256 c768d7fe39012396862c2b7b1b9b7e6734dbe3f8dd25ed4ffcb1ad1d8077d8b0
+MD5 507c752f63bbcbff9606b77343f9dd29 jabref-2.1.ebuild 1590
+RMD160 d52475ba49d0f36958746c89da5540693f732dec jabref-2.1.ebuild 1590
+SHA256 c768d7fe39012396862c2b7b1b9b7e6734dbe3f8dd25ed4ffcb1ad1d8077d8b0 jabref-2.1.ebuild 1590
+MISC ChangeLog 5345 RMD160 e97c654661ea7ef5ab6b3828b6ecfba9e4c37f48 SHA1 aa11761bc5e95dfb624f390269d724f267ddd7a2 SHA256 80b2d50210c1d4ece65eae5d3bbcc8cb122b3581f5445e4ca09f1d8c794176b5
+MD5 bec68c4767f311a13382a96ee00de014 ChangeLog 5345
+RMD160 e97c654661ea7ef5ab6b3828b6ecfba9e4c37f48 ChangeLog 5345
+SHA256 80b2d50210c1d4ece65eae5d3bbcc8cb122b3581f5445e4ca09f1d8c794176b5 ChangeLog 5345
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 5b3028166c382f310e75f818ad5a744e files/digest-jabref-1.7.1-r1 70
+RMD160 9718bcea4ac7289d59b9178032e719749b298a28 files/digest-jabref-1.7.1-r1 70
+SHA256 861c8954781e4976ce6dbc7b6d6bfb43264f95dd80bdddb3457a4ddc33c2fa09 files/digest-jabref-1.7.1-r1 70
+MD5 2a972e285243ea508854929f17e46851 files/digest-jabref-1.8.1 70
+RMD160 3e6793ad19e0aca7d13053bceeed7a65d2c9a979 files/digest-jabref-1.8.1 70
+SHA256 7e16347d41d9fbbfaa641b2b8d35368b63414849c1c1535e413c18cc79e8ada7 files/digest-jabref-1.8.1 70
+MD5 566ffac10246c7c018401ef35e2949c4 files/digest-jabref-2.1 250
+RMD160 02a67d1f6dbd66f47263872e59657ca3bb184e56 files/digest-jabref-2.1 250
+SHA256 6b8c595de4bc9bc40ab633eb7e76b4690e004be20402213ecd82afe6406de619 files/digest-jabref-2.1 250
diff --git a/app-text/jabref/files/digest-jabref-2.1 b/app-text/jabref/files/digest-jabref-2.1
new file mode 100644
index 000000000000..419dca34ec08
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-2.1
@@ -0,0 +1,3 @@
+MD5 6e1e546fc36a1e504ffae4d603a7331d JabRef-2.1-src.tar.bz2 2574390
+RMD160 1d18c37b93731f10025550d0450d626f1eb76471 JabRef-2.1-src.tar.bz2 2574390
+SHA256 e23e8414ebd898952b7478cecafb3d5af7c223e558defd1876bea4e8f6b00843 JabRef-2.1-src.tar.bz2 2574390
diff --git a/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch b/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch
new file mode 100644
index 000000000000..6ca18c41277e
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.1-classpath_cleanup.patch
@@ -0,0 +1,112 @@
+diff -uNr jabref-2.1-orig/build.xml jabref-2.1/build.xml
+--- jabref-2.1-orig/build.xml	2006-08-28 12:21:00.000000000 +1000
++++ jabref-2.1/build.xml	2006-08-28 12:11:50.000000000 +1000
+@@ -166,17 +166,7 @@
+                 <javac debug="off" 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-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/forms-1.0.4.jar" />
+-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+-                                <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" />
+-                                <pathelement location="${library.directory}/microba.jar" />
+-                        </classpath>
++			<classpath refid="classpath"/>
+                 </javac>
+         </target>
+ 
+@@ -185,14 +175,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-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+-                        </classpath>
++			<classpath refid="classpath"/>
+                 </javac>
+ 
+         </target>
+@@ -440,12 +423,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 -->
+@@ -476,12 +454,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}">
+@@ -493,12 +466,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
+@@ -516,12 +484,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}">
+@@ -539,16 +502,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-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/looks-2.0.4.jar" />
+-                                <pathelement location="${library.directory}/spin-1.4.jar" />
+-                        </classpath>
+-
++			<classpath refid="classpath"/>
+                         <!--<test name="tests.net.sf.jabref.export.layout.format.AuthorLastFirstAbbreviatorTester"/>-->
+                 </junit>
+         </target>
diff --git a/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch b/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch
new file mode 100644
index 000000000000..fa37b73d0e97
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.1-fix_jarbundler.patch
@@ -0,0 +1,27 @@
+diff -uNr jabref-2.1-orig/build.xml jabref-2.1/build.xml
+--- jabref-2.1-orig/build.xml	2006-08-28 12:02:36.000000000 +1000
++++ jabref-2.1/build.xml	2006-08-28 12:05:21.000000000 +1000
+@@ -88,11 +88,6 @@
+         <property name="library.directory" value="lib" />
+ 
+ 
+-    <taskdef name="jarbundler"
+-                  classpath="${library.directory}/jarbundler-1.4.jar"
+-                  classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+-
+-
+         <!-- Build classpath -->
+         <path id="classpath">
+                 <pathelement path="${build.classes}" />
+@@ -423,7 +418,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-2.1.ebuild b/app-text/jabref/jabref-2.1.ebuild
new file mode 100644
index 000000000000..e932e1455953
--- /dev/null
+++ b/app-text/jabref/jabref-2.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 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.1 2006/10/28 23:58:41 caster Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="GUI frontend for BibTeX, written in Java"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4
+	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"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# TODO submit upstream
+	epatch "${FILESDIR}/${PN}-2.1-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"
+
+	rm lib/*
+	cd lib
+
+	java-pkg_jar-from antlr
+	java-pkg_jar-from spin
+	java-pkg_jar-from glazedlists
+	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)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	use doc && java-pkg_dohtml -r build/docs/api
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} \
+		--main net.sf.jabref.JabRef
+
+	newicon src/images/JabRef-icon.png JabRef-icon.png
+	make_desktop_entry jabref JabRef JabRef-icon.png Office
+}
\ No newline at end of file