dep/style fixes

Package-Manager: portage-2.0.51.22-r1

10 files changed, 6 insertions, 118 deletions

diff --git a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-6.5.2 b/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-6.5.2
deleted file mode 100644
index 44155f5beecd..000000000000
--- a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-6.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1467c8a9efb6190f7d763d919fb6f13 jdbc6.5-1.2.jar 184184
diff --git a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.0 b/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.0
deleted file mode 100644
index 5625c3aa6bad..000000000000
--- a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32307b8cb548f836c2cd2a8866ff91ea jdbc7.0-1.2.jar 193431
diff --git a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.1 b/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.1
deleted file mode 100644
index f0f0600798b9..000000000000
--- a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ffaea9c874fd42d4d2b899e81596790 jdbc7.1-1.2.jar 93011
diff --git a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.2 b/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.2
deleted file mode 100644
index 2b90608fd9ac..000000000000
--- a/dev-java/jdbc2-postgresql/files/digest-jdbc2-postgresql-7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4ed2deaa88e16e79ccfa1c5b1f5ca22 pg72jdbc2.jar 116204
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild
deleted file mode 100644
index 055c65074c84..000000000000
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild,v 1.9 2005/03/13 19:29:47 corsair Exp $
-
-inherit java-pkg
-
-At="jdbc6.5-1.2.jar"
-S=${WORKDIR}
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${At}"
-HOMEPAGE="http://jdbc.postgresql.org/"
-KEYWORDS="x86 ppc sparc ~amd64"
-IUSE=""
-LICENSE="POSTGRESQL"
-SLOT="1"
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
-
-src_install() {
-	java-pkg_dojar ${DISTDIR}/${At}
-}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild
deleted file mode 100644
index b1adf84b3b11..000000000000
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild,v 1.9 2005/03/13 19:29:47 corsair Exp $
-
-inherit java-pkg
-
-At="jdbc7.0-1.2.jar"
-S=${WORKDIR}
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${At}"
-HOMEPAGE="http://jdbc.postgresql.org/"
-KEYWORDS="x86 ppc sparc ~amd64"
-IUSE=""
-LICENSE="POSTGRESQL"
-SLOT="2"
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
-
-src_install() {
-	java-pkg_dojar ${DISTDIR}/${At}
-}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild
deleted file mode 100644
index 4a5fd82fc083..000000000000
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild,v 1.9 2005/03/13 19:29:47 corsair Exp $
-
-inherit java-pkg
-
-At="jdbc7.1-1.2.jar"
-S=${WORKDIR}
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${At}"
-HOMEPAGE="http://jdbc.postgresql.org/"
-KEYWORDS="x86 ppc sparc ~amd64"
-IUSE=""
-LICENSE="POSTGRESQL"
-SLOT="3"
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
-
-src_install() {
-	java-pkg_dojar ${DISTDIR}/${At}
-}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild
deleted file mode 100644
index 0009583cd653..000000000000
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild,v 1.9 2005/03/13 19:29:47 corsair Exp $
-
-inherit java-pkg
-
-At="pg72jdbc2.jar"
-S=${WORKDIR}
-DESCRIPTION="JDBC Driver for PostgreSQL"
-SRC_URI="http://jdbc.postgresql.org/download/${At}"
-HOMEPAGE="http://jdbc.postgresql.org/"
-KEYWORDS="x86 ppc sparc ~amd64"
-IUSE=""
-LICENSE="POSTGRESQL"
-SLOT="4"
-DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
-
-src_install() {
-	java-pkg_dojar ${DISTDIR}/${At}
-}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild
index 6fefdde1eb7a..04f93aa02584 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-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/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild,v 1.9 2005/03/13 19:29:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild,v 1.10 2005/07/18 15:39:32 axxo Exp $
 
 inherit java-pkg
 
@@ -9,16 +9,12 @@ S=${WORKDIR}
 DESCRIPTION="JDBC Driver for PostgreSQL"
 SRC_URI="http://jdbc.postgresql.org/download/${At}"
 HOMEPAGE="http://jdbc.postgresql.org/"
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 LICENSE="POSTGRESQL"
 SLOT="5"
 DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
+RDEPEND=">=virtual/jre-1.2"
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.4.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.4.ebuild
index 4ca7a976c9e7..aa35a03385b1 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.4.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.4.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/jdbc2-postgresql/jdbc2-postgresql-7.4.ebuild,v 1.3 2005/05/18 11:20:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.4.ebuild,v 1.4 2005/07/18 15:39:32 axxo Exp $
 
 inherit java-pkg
 
@@ -9,16 +9,12 @@ S=${WORKDIR}
 DESCRIPTION="JDBC Driver for PostgreSQL"
 SRC_URI="http://jdbc.postgresql.org/download/${At}"
 HOMEPAGE="http://jdbc.postgresql.org/"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ppc64"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 IUSE=""
 LICENSE="POSTGRESQL"
 SLOT="6"
 DEPEND=""
-RDEPEND=">=virtual/jdk-1.2"
-
-src_compile() {
-	einfo "This is a binary-only ebuild (for now)."
-}
+RDEPEND=">=virtual/jre-1.2"
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}