Version bump, bug #166273. As usual dropped keywords because of new deps. Currently bundles antlr3beta5 jar because it makes no sense to have it in tree yet - newer beta7 is already incompatible and nothing else needs it yet.

Package-Manager: portage-2.1.2.4

5 files changed, 123 insertions, 5 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 1b72651cb91c..2abdd9ad2f87 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,14 @@
 # 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.44 2007/03/02 19:52:29 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.45 2007/04/25 00:41:35 caster Exp $
+
+*jabref-2.2 (25 Apr 2007)
+
+  25 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/jabref-2.2-build.xml.patch, +jabref-2.2.ebuild:
+  Version bump, bug #166273. As usual dropped keywords because of new deps.
+  Currently bundles antlr3beta5 jar because it makes no sense to have it in
+  tree yet - newer beta7 is already incompatible and nothing else needs it.
 
   02 Mar 2007; Vlastimil Babka <caster@gentoo.org>
   -files/jabref-1.7.1-nojarbundler.patch,
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 51732e88eb2c..3b3c62f30f0a 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -6,15 +6,24 @@ 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
+AUX jabref-2.2-build.xml.patch 1034 RMD160 9821c42b83d8d181bb90478671ddbf05336991c4 SHA1 b42a04ba198e621b599e9fc86137efe4cb2f893d SHA256 4e7d5ab982989c0b824c8795c709fb6ffb25f1c9c414a231bbd228b1fde12435
+MD5 f02bc0280631c71ca769fa561ceaaea5 files/jabref-2.2-build.xml.patch 1034
+RMD160 9821c42b83d8d181bb90478671ddbf05336991c4 files/jabref-2.2-build.xml.patch 1034
+SHA256 4e7d5ab982989c0b824c8795c709fb6ffb25f1c9c414a231bbd228b1fde12435 files/jabref-2.2-build.xml.patch 1034
 DIST JabRef-2.1-src.tar.bz2 2574390 RMD160 1d18c37b93731f10025550d0450d626f1eb76471 SHA1 d33362588071214976cc5fe6fc90b2e5776d4af2 SHA256 e23e8414ebd898952b7478cecafb3d5af7c223e558defd1876bea4e8f6b00843
+DIST JabRef-2.2-src.tar.bz2 4150837 RMD160 0b087c1d5de65223f055822469a448e5e60129eb SHA1 9f44729b9e3f97ca6dec7b5416f620e4ec09b43e SHA256 96d6da2ce9893f5a117b4e3a748a6710b3b5dbf742382be9391d0867e11b0b38
 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
+EBUILD jabref-2.2.ebuild 1679 RMD160 ade44f4d29edea0a611e21ca4498356408addb48 SHA1 222f215246cf1a035c284515e946aca27f974a94 SHA256 31a483058c3f8fda81afeda0b999dcc8f438777f061b52e40c200cb41bf8d06b
+MD5 cf37f8e993dd3530994cf4100de6af73 jabref-2.2.ebuild 1679
+RMD160 ade44f4d29edea0a611e21ca4498356408addb48 jabref-2.2.ebuild 1679
+SHA256 31a483058c3f8fda81afeda0b999dcc8f438777f061b52e40c200cb41bf8d06b jabref-2.2.ebuild 1679
+MISC ChangeLog 6431 RMD160 3a3696b952c5ed6b1ad9d23fa2b8302b55db90a2 SHA1 574f0285510b45a6e4d2a575ed8fd01d97791bb7 SHA256 6eeb800730bfbc4aa9309e7fad943310886eae2d25adca5b85755b44ad716f3e
+MD5 e5ba4891ce8a0c610cc599abe48961a4 ChangeLog 6431
+RMD160 3a3696b952c5ed6b1ad9d23fa2b8302b55db90a2 ChangeLog 6431
+SHA256 6eeb800730bfbc4aa9309e7fad943310886eae2d25adca5b85755b44ad716f3e ChangeLog 6431
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -22,3 +31,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 566ffac10246c7c018401ef35e2949c4 files/digest-jabref-2.1 250
 RMD160 02a67d1f6dbd66f47263872e59657ca3bb184e56 files/digest-jabref-2.1 250
 SHA256 6b8c595de4bc9bc40ab633eb7e76b4690e004be20402213ecd82afe6406de619 files/digest-jabref-2.1 250
+MD5 25302568908d68b31ec8720cfc5c598d files/digest-jabref-2.2 250
+RMD160 8102e1e88f5b62e080d2b3ac7bbcf608f33a7d15 files/digest-jabref-2.2 250
+SHA256 4c24821b7dafac0fe55d7e9fa5776048b37cbda52ffbe5d7b822b9e193d1ba9a files/digest-jabref-2.2 250
diff --git a/app-text/jabref/files/digest-jabref-2.2 b/app-text/jabref/files/digest-jabref-2.2
new file mode 100644
index 000000000000..ca7b95d44a57
--- /dev/null
+++ b/app-text/jabref/files/digest-jabref-2.2
@@ -0,0 +1,3 @@
+MD5 e530bc2ddc504abc16832fb435d791a9 JabRef-2.2-src.tar.bz2 4150837
+RMD160 0b087c1d5de65223f055822469a448e5e60129eb JabRef-2.2-src.tar.bz2 4150837
+SHA256 96d6da2ce9893f5a117b4e3a748a6710b3b5dbf742382be9391d0867e11b0b38 JabRef-2.2-src.tar.bz2 4150837
diff --git a/app-text/jabref/files/jabref-2.2-build.xml.patch b/app-text/jabref/files/jabref-2.2-build.xml.patch
new file mode 100644
index 000000000000..7a6cfb1a6e7f
--- /dev/null
+++ b/app-text/jabref/files/jabref-2.2-build.xml.patch
@@ -0,0 +1,27 @@
+--- build.xml	2007-02-13 01:40:37.000000000 +0100
++++ build.xml	2007-02-13 01:41:35.000000000 +0100
+@@ -105,7 +105,6 @@
+ 		</and>
+ 	</condition>
+ 
+-	<taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+ 
+ 
+ 	<!-- Build classpath -->
+@@ -188,7 +187,7 @@
+ 	</target>
+ 
+ 	<!-- Jars up project -->
+-	<target name="jars" depends="build, unjarlib">
++	<target name="jars" depends="build">
+ 		<mkdir dir="${build.lib}" />
+ 		<mkdir dir="${build.tmp}" />
+ 		<jar destfile="${build.lib}/${build.jar}">
+@@ -373,6 +372,7 @@
+ 
+ 
+ 	<target name="osxjar">
++		<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}/${build.jar}" icon="${images.dir}/JabRef-Logo.icns" version="${jabref.version}" jvmversion="1.4+" stubfile="${library.directory}/JavaApplicationStub" />
+ 	</target>
+ 
diff --git a/app-text/jabref/jabref-2.2.ebuild b/app-text/jabref/jabref-2.2.ebuild
new file mode 100644
index 000000000000..3ad0741e0805
--- /dev/null
+++ b/app-text/jabref/jabref-2.2.ebuild
@@ -0,0 +1,68 @@
+# 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.2.ebuild,v 1.1 2007/04/25 00:41:35 caster Exp $
+
+JAVA_PKG_IUSE="doc"
+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=""
+
+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
+	dev-java/jempbox
+	dev-java/pdfbox"
+
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# moves jarbundler definition to where it's needed (not by us)
+	# don't call unjarlib, don't want to absorb deps
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	mkdir libs
+	mv lib/antlr-3* libs/antlr3.jar
+	rm -v lib/*
+
+	java-ant_rewrite-classpath
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	local gcp=$(java-pkg_getjars antlr,spin,glazedlists,jgoodies-looks-2.0,jgoodies-forms,microba,jempbox,pdfbox)
+	gcp="${gcp}:libs/antlr3.jar"
+	eant -Dgentoo.classpath="${gcp}" jars \
+		$(use_doc -Dbuild.javadocs=build/docs/api javadocs)
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${PV}.jar
+	java-pkg_dojar libs/antlr3.jar
+
+	use doc && java-pkg_dojavadoc build/docs/api
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} \
+		--main net.sf.jabref.JabRef
+
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png || die
+	make_desktop_entry jabref JabRef JabRef-icon.png Office
+}