Cleaned up ebuilds per bug #186323

(Portage version: 2.1.3.5)

4 files changed, 41 insertions, 36 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index d2fd9be62b66..486abd02e864 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.19 2007/08/18 10:56:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.20 2007/08/22 06:32:44 wltjr Exp $
+
+  22 Aug 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  jdbc-jaybird-2.0.1.ebuild, jdbc-jaybird-2.1.0.ebuild,
+  jdbc-jaybird-2.1.0-r1.ebuild:
+  Cleaned up ebuilds per bug #186323
 
   18 Aug 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jdbc-jaybird-2.0.1-r1.ebuild:
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
index 484f53c1f798..75d59c5678f8 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.11 2007/01/26 16:19:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.12 2007/08/22 06:32:44 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -14,18 +14,18 @@ KEYWORDS="amd64 x86"
 IUSE="doc examples source test"
 
 COMMON_DEPEND="dev-java/log4j"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
-		${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
-		app-arch/unzip
-		dev-java/cpptasks
-		test? (
-			dev-java/junit
-			dev-java/ant
-		)
-		!test? ( dev-java/ant-core )
-		source? ( app-arch/zip )
-		${COMMON_DEPEND}"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/cpptasks
+	test? (
+		dev-java/junit
+		dev-java/ant
+	)
+	!test? ( dev-java/ant-core )
+	source? ( app-arch/zip )
+	${COMMON_DEPEND}"
 
 S="${WORKDIR}/client-java"
 
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
index 2f0e27802044..8ba7fc33ba4b 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.6 2007/08/17 21:29:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.7 2007/08/22 06:32:44 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source examples test"
 
@@ -16,15 +16,15 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="jni"
 
 RDEPEND=">=virtual/jre-1.4
-		dev-java/log4j"
+	dev-java/log4j"
 DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-		app-arch/unzip
-		dev-java/log4j
-		jni? ( dev-java/cpptasks )
-		test? (
-			dev-java/junit
-			dev-java/ant-junit
-		)"
+	app-arch/unzip
+	dev-java/log4j
+	jni? ( dev-java/cpptasks )
+	test? (
+		dev-java/junit
+		dev-java/ant-junit
+	)"
 
 S="${WORKDIR}/client-java"
 
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
index 62c3deb5f548..30fa76b9b5bd 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.9 2007/01/26 16:19:38 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.10 2007/08/22 06:32:44 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -14,18 +14,18 @@ KEYWORDS="~amd64 x86"
 IUSE="doc examples source test"
 
 COMMON_DEPEND="dev-java/log4j"
-RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5 )
-		${COMMON_DEPEND}"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5 )
-		app-arch/unzip
-		dev-java/cpptasks
-		test? (
-			dev-java/junit
-			dev-java/ant
-		)
-		!test? ( dev-java/ant-core )
-		source? ( app-arch/zip )
-		${COMMON_DEPEND}"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/cpptasks
+	test? (
+		dev-java/junit
+		dev-java/ant
+	)
+	!test? ( dev-java/ant-core )
+	source? ( app-arch/zip )
+	${COMMON_DEPEND}"
 
 S="${WORKDIR}/client-java"