dep/style fixes

Package-Manager: portage-2.0.51.22-r1

4 files changed, 19 insertions, 15 deletions

diff --git a/dev-java/jdbc3-postgresql/Manifest b/dev-java/jdbc3-postgresql/Manifest
index e1d55b0d65ef..c7b4ab91b71f 100644
--- a/dev-java/jdbc3-postgresql/Manifest
+++ b/dev-java/jdbc3-postgresql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 98cb328066999b594230b6e544816bae jdbc3-postgresql-8.0_p311.ebuild 1212
 MD5 c0e70fd65659f997858c599af06372e2 jdbc3-postgresql-7.4.5.ebuild 1115
 MD5 3d80aae0ac6bc38c96a1eb2756a7d62b jdbc3-postgresql-7.3.ebuild 577
@@ -6,3 +9,10 @@ MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 68212c0fc3f178e7dcd29a128bc6dbb5 files/digest-jdbc3-postgresql-8.0_p311 79
 MD5 927470f50a83ea9bf353f3d3e8c68c4f files/digest-jdbc3-postgresql-7.3 58
 MD5 e71acb8b196dc2466141bfe8dabe0eee files/digest-jdbc3-postgresql-7.4.5 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC28/T/rLF9B432nYRAg9mAKDAln0NpLqui8ojHb9KNyWQlw6N7QCgul9Y
+adirrgZMfNmplO61ARUM6JA=
+=nC9R
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild b/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild
index e832bd42def3..f15b703920c6 100644
--- a/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild
+++ b/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.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-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild,v 1.11 2005/04/12 20:03:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild,v 1.12 2005/07/18 15:50:19 axxo Exp $
 
 inherit java-pkg
 
@@ -14,11 +14,7 @@ IUSE=""
 LICENSE="POSTGRESQL"
 SLOT="1"
 DEPEND=""
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
+RDEPEND=">=virtual/jre-1.4"
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.4.5.ebuild b/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.4.5.ebuild
index 546b1f8ab6eb..2d90c8386e33 100644
--- a/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.4.5.ebuild
+++ b/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.4.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-java/jdbc3-postgresql/jdbc3-postgresql-7.4.5.ebuild,v 1.3 2005/04/12 20:03:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.4.5.ebuild,v 1.4 2005/07/18 15:50:19 axxo Exp $
 
 inherit java-pkg eutils versionator
 
@@ -12,10 +12,10 @@ IUSE=""
 LICENSE="POSTGRESQL"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.3
+	dev-java/ant-core
 	dev-java/java-config"
 
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 
 S=${WORKDIR}/postgresql-${PV}/src/interfaces/jdbc
 
@@ -38,6 +38,5 @@ src_compile() {
 }
 
 src_install() {
-	mv jars/postgresql.jar jars/${PN}.jar
-	java-pkg_dojar jars/${PN}.jar
+	java-pkg_newjar jars/postgresql.jar ${PN}.jar
 }
diff --git a/dev-java/jdbc3-postgresql/jdbc3-postgresql-8.0_p311.ebuild b/dev-java/jdbc3-postgresql/jdbc3-postgresql-8.0_p311.ebuild
index 366b001b82e2..b3c2e51d186f 100644
--- a/dev-java/jdbc3-postgresql/jdbc3-postgresql-8.0_p311.ebuild
+++ b/dev-java/jdbc3-postgresql/jdbc3-postgresql-8.0_p311.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-java/jdbc3-postgresql/jdbc3-postgresql-8.0_p311.ebuild,v 1.1 2005/04/12 20:03:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-postgresql/jdbc3-postgresql-8.0_p311.ebuild,v 1.2 2005/07/18 15:50:19 axxo Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-core-1.6
 	jikes? ( dev-java/jikes )
 	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
 
 S=${WORKDIR}/postgresql-jdbc-${PV/_p/-}.src
 
@@ -29,8 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	mv jars/postgresql.jar jars/${PN}.jar
-	java-pkg_dojar jars/${PN}.jar
+	java-pkg_dojar jars/postgresql.jar ${PN}.jar
 
 	use doc && java-pkg_dohtml -r ${S}/build/publicapi/*
 	if use examples; then