dep/style fixes

Package-Manager: portage-2.0.51.22-r1

3 files changed, 22 insertions, 23 deletions

diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index 44d90de55729..6bfe25425e28 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 596eaacd8e8f59aed9b9c1db83500b36 jxtray-0.5.ebuild 2329
+MD5 4cd645107524554dbc8b864bcb242612 jxtray-0.5.ebuild 2360
 MD5 46914670b7c0631788ce983a7828b51b ChangeLog 1052
 MD5 f5ddd2d4a1069f3b3c4876d2be95eaff metadata.xml 581
-MD5 f22e8babdfdaf992bc35e20ab66ce9f5 files/default.properties 217
+MD5 63dce73e99d8ec22a695238f0928b003 files/default.properties 109
 MD5 97bb388f459c454b06a8276c62609259 files/build.xml 1599
 MD5 f84f96f0c025c480d3404ee1ad22e3fc files/digest-jxtray-0.5 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCrHox06ebR+OMO78RAvOhAJ9IbwA6H4586hVhiofCYWAep+N1CQCfQPIj
-CzEg/uiGVHF2fkRY0dgMVdo=
-=0mxw
+iD8DBQFC2Tb7/rLF9B432nYRAlg6AKCGeoyMgrh+qd+aCKOQyOFNwWsubgCgwCSa
+OGQ8KnxjCaDkJL49vvdJKnE=
+=t5kR
 -----END PGP SIGNATURE-----
diff --git a/dev-db/jxtray/files/default.properties b/dev-db/jxtray/files/default.properties
index 2c2418d0adf2..fbcf7c235c99 100644
--- a/dev-db/jxtray/files/default.properties
+++ b/dev-db/jxtray/files/default.properties
@@ -7,5 +7,3 @@ packages=jxtray.*
 
 srcdir=${basedir}/src
 
-classpath=${basedir}/lib/jdom.jar:${basedir}/lib/xerces.jar:${basedir}/poi.jar:${basedir}/lib/xml-apis.jar
-
diff --git a/dev-db/jxtray/jxtray-0.5.ebuild b/dev-db/jxtray/jxtray-0.5.ebuild
index 5a2bc39b59db..5c6a0ccb4593 100644
--- a/dev-db/jxtray/jxtray-0.5.ebuild
+++ b/dev-db/jxtray/jxtray-0.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/dev-db/jxtray/jxtray-0.5.ebuild,v 1.7 2005/06/12 18:08:19 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5.ebuild,v 1.8 2005/07/16 16:33:34 axxo Exp $
 
 inherit java-pkg
 
@@ -12,9 +12,6 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 IUSE="doc jikes firebird mssql mysql postgres"
 
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3
 	~dev-java/jdom-1.0_beta9
 	>=dev-java/kunststoff-2.0.2
@@ -27,6 +24,10 @@ RDEPEND=">=virtual/jre-1.3
 	mysql? ( dev-java/jdbc-mysql )
 	postgres? ( dev-java/jdbc3-postgresql )
 	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
@@ -37,22 +38,22 @@ src_unpack() {
 
 	cd ${S}/lib
 	rm *.jar
-	cp="${cp}:$(java-config -p jdom-1.0_beta9)"
-	cp="${cp}:$(java-config -p xerces-2)"
-	cp="${cp}:$(java-config -p xml-commons)"
-	cp="${cp}:$(java-config -p sax)"
-	cp="${cp}:$(java-config -p poi)"
+	cp="${cp}:$(java-pkg_getjars jdom-1.0_beta9)"
+	cp="${cp}:$(java-pkg_getjars xerces-2)"
+	cp="${cp}:$(java-pkg_getjars xml-commons)"
+	cp="${cp}:$(java-pkg_getjars sax)"
+	cp="${cp}:$(java-pkg_getjars poi)"
 
 	cd ${S}/lib/lookandfeel
 	rm *.jar
-	cp="${cp}:$(java-config -p kunststoff-2.0)"
+	cp="${cp}:$(java-pkg_getjars kunststoff-2.0)"
 
 	cd ${S}/lib/drivers
 	rm *.jar
-	use firebird && cp="${cp}:$(java-config -p jdbc3-firebird)"
-	use mssql && cp="${cp}:$(java-config -p jtds-0.9)"
-	use mysql && cp="${cp}:$(java-config -p jdbc-mysql)"
-	use postgres && cp="${cp}:$(java-config -p jdbc3-postgresql)"
+	use firebird && cp="${cp}:$(java-pkg_getjars jdbc3-firebird)"
+	use mssql && cp="${cp}:$(java-pkg_getjars jtds-0.9)"
+	use mysql && cp="${cp}:$(java-pkg_getjars jdbc-mysql)"
+	use postgres && cp="${cp}:$(java-pkg_getjars jdbc3-postgresql)"
 
 	echo "classpath=${cp}" > ${S}/build.properties
 }
@@ -72,7 +73,7 @@ src_install() {
 	use mysql && cp="${cp},jdbc-mysql"
 	use postgres && cp="${cp},jdbc3-postgresql"
 
-	java-pkg_dojar ${S}/dist/${PN}-${PV}.jar
+	java-pkg_newjar ${S}/dist/${P}.jar ${PN}.jar
 
 	echo "#!/bin/sh" > ${PN}
 	echo "java -cp \$(${cp}) jxtray.Jxtray" >> ${PN}