cosmetic changes

(Portage version: 2.0.51.22-r1)

3 files changed, 22 insertions, 29 deletions

diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index 478df4b42f1b..02e21af3ed13 100644
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/jxtray
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.6 2005/05/14 21:57:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.7 2005/06/12 18:08:19 luckyduck Exp $
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
+  cosmetic changes
 
   14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
   stable on amd64 and x86, added ~ppc to KEYWORDS
diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index 4725148b29fd..f8395519f08b 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 93bddd8148e4ad88325eae63bba7df44 jxtray-0.5.ebuild 2319
-MD5 2977d89506ea23357b6e76d6637bf535 ChangeLog 961
+MD5 f73a6036c5a84e5922ab0b94fa7b2804 jxtray-0.5.ebuild 2331
+MD5 a95f0f6135cfd55b24f6d75a21174077 ChangeLog 1052
 MD5 f5ddd2d4a1069f3b3c4876d2be95eaff metadata.xml 581
 MD5 f22e8babdfdaf992bc35e20ab66ce9f5 files/default.properties 217
 MD5 97bb388f459c454b06a8276c62609259 files/build.xml 1599
 MD5 f84f96f0c025c480d3404ee1ad22e3fc files/digest-jxtray-0.5 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFChnRB06ebR+OMO78RAqGhAKCC1GSuLAlr4oFs19L+ffRTodaG6ACdFoqO
-/PkRP3kfyfEIqLXfYl5AsKA=
-=Na+S
------END PGP SIGNATURE-----
diff --git a/dev-db/jxtray/jxtray-0.5.ebuild b/dev-db/jxtray/jxtray-0.5.ebuild
index b50810c9db2f..5a2bc39b59db 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.6 2005/05/14 21:57:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5.ebuild,v 1.7 2005/06/12 18:08:19 luckyduck Exp $
 
 inherit java-pkg
 
@@ -14,19 +14,19 @@ 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/sax
+	>=dev-java/kunststoff-2.0.2
 	dev-java/poi
-	~dev-java/xerces-2.6.2
+	dev-java/sax
+	=dev-java/xerces-2.6*
 	dev-java/xml-commons
-	>=dev-java/kunststoff-2.0.2
-	jikes? ( >=dev-java/jikes-1.21 )
 	firebird? ( dev-java/jdbc3-firebird )
 	mssql? ( =dev-java/jtds-0.9* )
 	mysql? ( dev-java/jdbc-mysql )
 	postgres? ( dev-java/jdbc3-postgresql )
 	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
-RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
@@ -37,22 +37,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-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)"
 
 	cd ${S}/lib/lookandfeel
 	rm *.jar
-	cp="${cp}:`java-config -p kunststoff-2.0`"
+	cp="${cp}:$(java-config -p 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-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)"
 
 	echo "classpath=${cp}" > ${S}/build.properties
 }