change jar-from back

(Portage version: 2.0.51.19)

4 files changed, 15 insertions, 25 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index 00ddf147582e..69054cce7278 100644
--- a/app-text/jabref/ChangeLog
+++ b/app-text/jabref/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/jabref
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.24 2005/04/03 10:18:48 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.25 2005/04/03 10:32:14 axxo Exp $
+
+  03 Apr 2005; Thomas Matthijs <axxo@gentoo.org> jabref-1.5.ebuild,
+  jabref-1.7.ebuild:
+  change jar-from back
 
   03 Apr 2005; <SeJo@gentoo.org> jabref-1.7.ebuild:
   added ~ppc keyword
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 34e61fdaac8e..777142324cd0 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1f20c67b95dd00bf798aa3d3bb1c9dce ChangeLog 2788
-MD5 4aab8751e57136f1a0a2e5ab43dbd93f jabref-1.5.ebuild 1231
+MD5 b35a619edd9fb57db24fdffe811168a5 jabref-1.7.ebuild 1431
 MD5 e8b5277258845685bdde530884df2154 jabref-1.6.ebuild 1353
+MD5 1f20c67b95dd00bf798aa3d3bb1c9dce ChangeLog 2788
+MD5 7718014e9e230a59271aaf0673a333ea jabref-1.5.ebuild 1174
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 938e2577a4d3f32232775793d226f00c jabref-1.7.ebuild 1470
+MD5 3d6ae9f90fac167b5ab3261cb88584d4 files/jabref-1.7-nojarbundler.patch 3153
 MD5 1f8c47f49e81868dd718727defee12fa files/digest-jabref-1.5 68
 MD5 a6ad712fbe4fb345a95ff1a70c128a16 files/digest-jabref-1.6 68
 MD5 d229ae67e003f0be52f27a896f6bdeac files/digest-jabref-1.7 68
-MD5 3d6ae9f90fac167b5ab3261cb88584d4 files/jabref-1.7-nojarbundler.patch 3153
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD4DBQFCT8MMMXMsRNMHhmARArrxAJizx9XEFBcIFBrSRMV8Q6fHPyuBAJ9GL+E2
-0qNZdVnDuzSzvY/1UnK6qQ==
-=/HTs
------END PGP SIGNATURE-----
diff --git a/app-text/jabref/jabref-1.5.ebuild b/app-text/jabref/jabref-1.5.ebuild
index b4959f7fbcbf..66f8bfb81b3e 100644
--- a/app-text/jabref/jabref-1.5.ebuild
+++ b/app-text/jabref/jabref-1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.7 2005/03/31 02:46:44 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-1.5.ebuild,v 1.8 2005/04/03 10:32:14 axxo Exp $
 
 inherit java-pkg
 
@@ -27,11 +27,7 @@ src_unpack() {
 	rm -f antlr.jar looks*.jar
 
 	java-pkg_jar-from antlr
-	java-pkg_jar-from jgoodies-looks-1.2
-
-	cd ${S}
-	sed -i 's:looks-1.2.2.jar:looks.jar:' build.xml \
-		|| die	"sed failed"
+	java-pkg_jar-from jgoodies-looks-1.2 looks.jar looks-1.2.2.jar
 }
 
 
diff --git a/app-text/jabref/jabref-1.7.ebuild b/app-text/jabref/jabref-1.7.ebuild
index 91d4ed25af32..0b877a3b5dc5 100644
--- a/app-text/jabref/jabref-1.7.ebuild
+++ b/app-text/jabref/jabref-1.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.3 2005/04/03 10:18:48 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-1.7.ebuild,v 1.4 2005/04/03 10:32:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.4
 	dev-java/spin
 	>=dev-java/antlr-2.7.3
-	~dev-java/jgoodies-forms-1.0.5
+	=dev-java/jgoodies-forms-1*
 	=dev-java/jgoodies-looks-1.2*
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-httpclient-2"
@@ -33,8 +33,8 @@ src_unpack() {
 	cd ${S}/lib && rm -f *.jar
 	java-pkg_jar-from antlr
 	java-pkg_jar-from spin
-	java-pkg_jar-from jgoodies-looks-1.2 looks.jar
-	java-pkg_jar-from jgoodies-forms forms-1.0.5.jar forms.jar
+	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
 }