some cleanup, 1.7 stable on amd64, ppc and x86

Package-Manager: portage-2.0.51.21

7 files changed, 12 insertions, 113 deletions

diff --git a/app-text/jabref/ChangeLog b/app-text/jabref/ChangeLog
index c8a46fad74c6..a0c5062424af 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.29 2005/04/12 14:19:53 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/ChangeLog,v 1.30 2005/05/14 20:40:57 luckyduck Exp $
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -jabref-1.5.ebuild,
+  -jabref-1.6.ebuild, jabref-1.7.ebuild:
+  some cleanup, 1.7 stable on amd64, ppc and x86
 
   12 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> :
   digest recommit, upstream has changed the contents of the distfile, fixes
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 8d26af8f34ef..b20f264ec462 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -2,21 +2,17 @@
 Hash: SHA1
 
 MD5 6642081408f66c248d56cef094457800 jabref-1.7.1.ebuild 1530
-MD5 edca60023f5698ecb5c42fcedbb7335d jabref-1.7.ebuild 1523
-MD5 ab01553b8ff2277c51dab82ee934f2ca jabref-1.6.ebuild 1349
-MD5 5bce038eea3d6501689e2e41aacfb9c5 ChangeLog 3645
-MD5 cc17dbe257be6932f361acfed83e1eb3 jabref-1.5.ebuild 1170
+MD5 302e77b9eade9cbd2d536633152bc435 jabref-1.7.ebuild 1525
+MD5 859a49e090de5cde878ab8f65e5aa3d3 ChangeLog 3808
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 3d6ae9f90fac167b5ab3261cb88584d4 files/jabref-1.7-nojarbundler.patch 3153
 MD5 95ffcffd70b173a4f8956d0afdc47da4 files/jabref-1.7.1-nojarbundler.patch 3616
 MD5 5b3028166c382f310e75f818ad5a744e files/digest-jabref-1.7.1 70
-MD5 1f8c47f49e81868dd718727defee12fa files/digest-jabref-1.5 68
-MD5 a6ad712fbe4fb345a95ff1a70c128a16 files/digest-jabref-1.6 68
 MD5 d229ae67e003f0be52f27a896f6bdeac files/digest-jabref-1.7 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCW9kg06ebR+OMO78RAiO3AJ92gHq55204AOOSjBjUm6UntJNOfACfdDI4
-1hDeQ6qS3vz6pdfhdDNviaA=
-=D/tB
+iD8DBQFChmJw06ebR+OMO78RAtvkAJ0RjxWNq0Que8RR/LGup9NKsIBfmACeMBHi
+rpkbhLYfV0tSdYJKmE+LwAo=
+=dxO9
 -----END PGP SIGNATURE-----
diff --git a/app-text/jabref/files/digest-jabref-1.5 b/app-text/jabref/files/digest-jabref-1.5
deleted file mode 100644
index 9c12d82c1eb2..000000000000
--- a/app-text/jabref/files/digest-jabref-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b68a08677cdba5c4535ec86553854d10 Jabref-1.5-src.tar.bz2 1146853
diff --git a/app-text/jabref/files/digest-jabref-1.6 b/app-text/jabref/files/digest-jabref-1.6
deleted file mode 100644
index 3a0ee0a548c1..000000000000
--- a/app-text/jabref/files/digest-jabref-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 392e1cb7b57d858d8939c7c77b32cba8 JabRef-1.6-src.tar.bz2 1269043
diff --git a/app-text/jabref/jabref-1.5.ebuild b/app-text/jabref/jabref-1.5.ebuild
deleted file mode 100644
index 66f8bfb81b3e..000000000000
--- a/app-text/jabref/jabref-1.5.ebuild
+++ /dev/null
@@ -1,48 +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.5.ebuild,v 1.8 2005/04/03 10:32:14 axxo Exp $
-
-inherit java-pkg
-
-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="~x86 ~ppc ~amd64"
-IUSE="jikes"
-
-DEPEND=">=virtual/jdk-1.4
-	sys-apps/sed
-	>=dev-java/ant-1.4.1
-	>=dev-java/antlr-2.7.3
-	=dev-java/jgoodies-looks-1.2*
-	>=sys-apps/sed-4
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	rm -f antlr.jar looks*.jar
-
-	java-pkg_jar-from antlr
-	java-pkg_jar-from jgoodies-looks-1.2 looks.jar looks-1.2.2.jar
-}
-
-
-src_compile() {
-	local antflags="compile unjarlib jars"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /usr/share/${PN}" >> ${PN}
-	echo '${JAVA_HOME}'/bin/java -jar lib/${PN}.jar '$*' >> ${PN}
-
-	dobin ${PN}
-}
diff --git a/app-text/jabref/jabref-1.6.ebuild b/app-text/jabref/jabref-1.6.ebuild
deleted file mode 100644
index a42e6f3f0edd..000000000000
--- a/app-text/jabref/jabref-1.6.ebuild
+++ /dev/null
@@ -1,51 +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.6.ebuild,v 1.6 2005/04/04 15:00:14 axxo Exp $
-
-inherit java-pkg
-
-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="~x86 ~ppc ~amd64"
-IUSE="jikes"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.4.1
-	jikes? ( dev-java/jikes )
-	dev-java/junit"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/antlr-2.7.3
-	=dev-java/jgoodies-looks-1.2*
-	>=dev-java/commons-logging-1.0.4
-	=dev-java/commons-httpclient-2*"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	rm -f *.jar
-
-	java-pkg_jar-from antlr
-	java-pkg_jar-from jgoodies-looks-1.2 looks.jar looks-1.2.2.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
-	java-pkg_jar-from commons-httpclient commons-httpclient.jar commons-httpclient-2.0.jar
-}
-
-
-src_compile() {
-	local antflags="compile unjarlib jars"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	echo "#!/bin/sh" > ${PN}
-	echo "cd /usr/share/${PN}" >> ${PN}
-	echo '${JAVA_HOME}'/bin/java -jar lib/${PN}.jar '$*' >> ${PN}
-
-	dobin ${PN}
-}
diff --git a/app-text/jabref/jabref-1.7.ebuild b/app-text/jabref/jabref-1.7.ebuild
index cc547a85e836..1576976e4cd5 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.6 2005/04/04 15:00:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jabref/jabref-1.7.ebuild,v 1.7 2005/05/14 20:40:57 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jabref.sourceforge.net/"
 SRC_URI="mirror://sourceforge/jabref/JabRef-${PV}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc"
 IUSE="jikes"
 
 DEPEND=">=virtual/jdk-1.4