Cleanup.
authorVlastimil Babka <caster@gentoo.org>
Fri, 2 Mar 2007 19:52:29 +0000 (19:52 +0000)
committerVlastimil Babka <caster@gentoo.org>
Fri, 2 Mar 2007 19:52:29 +0000 (19:52 +0000)
Package-Manager: portage-2.1.2-r12

app-text/jabref/ChangeLog
app-text/jabref/Manifest
app-text/jabref/files/digest-jabref-1.7.1-r1 [deleted file]
app-text/jabref/files/digest-jabref-1.8.1 [deleted file]
app-text/jabref/files/jabref-1.7.1-nojarbundler.patch [deleted file]
app-text/jabref/files/jabref-1.8-classpath_cleanup.patch [deleted file]
app-text/jabref/files/jabref-1.8-fix_jarbundler.patch [deleted file]
app-text/jabref/jabref-1.7.1-r1.ebuild [deleted file]
app-text/jabref/jabref-1.8.1.ebuild [deleted file]
app-text/jabref/jabref-2.1.ebuild

index e2cf7f7c0f0be1446ee5c5a8b74bf988f398913a..1b72651cb91c0d24083ac77d7342ca3b6e75c438 100644 (file)
@@ -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
index 7961750baa226fe8b41b0bf17057e9740743192d..51732e88eb2c5a8209e4142333f1b98acd9f294c 100644 (file)
@@ -1,15 +1,3 @@
-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
@@ -18,35 +6,19 @@ AUX jabref-2.1-fix_jarbundler.patch 1042 RMD160 3817c809e98a1d538d07fb2c1914d5c2
 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 RMD160 53e3a36c8ceab9368e7fcbaf60cc256f09543669 SHA1 e95c694a1b4d8571bc7d0aa9915c2114329755af SHA256 60c07d79be89fcb7cbb5248156d6a26c68769f38daed6c5bdd3e9a14875df383
-DIST JabRef-1.8.1-src.tar.bz2 1509155 RMD160 6d7f154a93802b94cf443f7f5ae578a1e48dc7e2 SHA1 01e43192db4376bb4192fa25e4582c7fa093d2e2 SHA256 cd1a46e9640465e5918773c5afca5f41f38069f836ab39dd1868e258210c2764
 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 1600 RMD160 decaaa3d98d84c1db353f3a4213a5869be5fa099 SHA1 851d6437bb466296a4c4c2ed3abf4742276373ec SHA256 6772a4e2e25d81aa7a55e24549c5693c8a4eb1be8352dfaeaba8d94d0e58d5fa
-MD5 8872093c6166c287150d380338b42228 jabref-2.1.ebuild 1600
-RMD160 decaaa3d98d84c1db353f3a4213a5869be5fa099 jabref-2.1.ebuild 1600
-SHA256 6772a4e2e25d81aa7a55e24549c5693c8a4eb1be8352dfaeaba8d94d0e58d5fa jabref-2.1.ebuild 1600
-MISC ChangeLog 5807 RMD160 d6487a064512af019834548d6e1838d72ce81cae SHA1 2b048a92da4fb47cf69366c78010c6caa5f17940 SHA256 3429beb0169829a1acd872ed7031f413170838891b8359f62d13b97d6c68af01
-MD5 ae93e21d061b737041844d0b7e75095b ChangeLog 5807
-RMD160 d6487a064512af019834548d6e1838d72ce81cae ChangeLog 5807
-SHA256 3429beb0169829a1acd872ed7031f413170838891b8359f62d13b97d6c68af01 ChangeLog 5807
+EBUILD jabref-2.1.ebuild 1617 RMD160 747e366ddefacc62730b4172ce923781a8668f99 SHA1 902a7fc278cde9fc1c2abc273c9b654d5d1209f8 SHA256 39ed5d765db2c1bca5d08acca8ed0df586dac6506df80db9168e2d99cfef65d4
+MD5 c3aadb6f30f252cc19b54f16a2e15dc7 jabref-2.1.ebuild 1617
+RMD160 747e366ddefacc62730b4172ce923781a8668f99 jabref-2.1.ebuild 1617
+SHA256 39ed5d765db2c1bca5d08acca8ed0df586dac6506df80db9168e2d99cfef65d4 jabref-2.1.ebuild 1617
+MISC ChangeLog 6067 RMD160 89688511dd69fe4e0b1f6155c2cd387e53ff537e SHA1 482f36a76a68e463d002c46f800bd0910d060735 SHA256 20c79278cab0c34558f232370e111044221f144170c06dc75cde924ba7ff4975
+MD5 20078621724deae7d1cf76d1eafed9f0 ChangeLog 6067
+RMD160 89688511dd69fe4e0b1f6155c2cd387e53ff537e ChangeLog 6067
+SHA256 20c79278cab0c34558f232370e111044221f144170c06dc75cde924ba7ff4975 ChangeLog 6067
 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 ec2e7052049a9705b271c039324f00e7 files/digest-jabref-1.7.1-r1 256
-RMD160 64586a9d7cbcd87fa3c83fcc09a1cf2df357caec files/digest-jabref-1.7.1-r1 256
-SHA256 08ce554e6ab057da07478dc4c85cf056035deaf91c880509d94d244f90a14e72 files/digest-jabref-1.7.1-r1 256
-MD5 0d980222f61215ad305f4b1426d7ec6a files/digest-jabref-1.8.1 256
-RMD160 3804fec2ec733b8ea03f0b89e66c28389c09135e files/digest-jabref-1.8.1 256
-SHA256 4d8d3ccb59363393ca39c410c30a2621c14cc902454df3682038b9bc8a30812a files/digest-jabref-1.8.1 256
 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-1.7.1-r1 b/app-text/jabref/files/digest-jabref-1.7.1-r1
deleted file mode 100644 (file)
index 71e5467..0000000
+++ /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 (file)
index e40e979..0000000
+++ /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 (file)
index e23f7fc..0000000
+++ /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 (file)
index 8736124..0000000
+++ /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 (file)
index 6272dca..0000000
+++ /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 (file)
index 49dbd4c..0000000
+++ /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 (file)
index a4bc7e9..0000000
+++ /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
-}
index 34d53c648d0e036ce8c724c141ef1a9a5e1227bf..98df4bf08712581321940aaf2f961be065ee51e5 100644 (file)
@@ -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} \