Cleaned up ebuilds per bug #186323

Package-Manager: portage-2.1.3.5

5 files changed, 57 insertions, 62 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/Manifest b/dev-java/jdbc-jaybird/Manifest
index d7ea5d3b30d5..3e09460bbdca 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX archive-xml-2.0.1.patch 387 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 SHA1 b53eec1c235b34d178e8851ab3e37d39e118c382 SHA256 6cfe878c1244d9201c5ed996abb70d0de76e21b27fa4899259a82da91dcc9de5
 MD5 4f432a684ef56a2acdbf3544104fff5c files/archive-xml-2.0.1.patch 387
 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497 files/archive-xml-2.0.1.patch 387
@@ -23,22 +20,22 @@ RMD160 8b385d472e126a5994a7862a5dbe304cf304932b files/dist-xml-2.0.1.patch 377
 SHA256 dad962de758f785af7e0b4731a70ca2f32dc74acd5028572f93b4aa957d4a1dd files/dist-xml-2.0.1.patch 377
 DIST JayBird-2.0.1-src.zip 4899770 RMD160 50e3fb99668ca08116fec3838892e1e6ff4b8e7d SHA1 21adf4a88660c10f7afb2daddec2c4826d068fd7 SHA256 ad3d6ad4199419752281c0e11f445fd109542499d162b5356e98e6eceb25a914
 DIST Jaybird-2.1.0-src.zip 5004088 RMD160 1066f39a393ff14812c907c38aeb094c407114da SHA1 a99c4b0ed90ff1252d6f5b076bfad8087eda6faf SHA256 a96cff648af0ef01b48e3471525d2447a76015e609bbf81a54c372d2963e0214
-EBUILD jdbc-jaybird-2.0.1.ebuild 2890 RMD160 2a4d1d5a49cccf07c1bcff4e8b1eb22869d83c88 SHA1 1978ed50514756ff0ac10dde2a61dd1eda6a4876 SHA256 92b860cc1d207632299fd92d95430dd1e0e1c3e31b7aa43758d85c4ff6e830b2
-MD5 fe65a0801a54d06dd7e795dda4f1c75c jdbc-jaybird-2.0.1.ebuild 2890
-RMD160 2a4d1d5a49cccf07c1bcff4e8b1eb22869d83c88 jdbc-jaybird-2.0.1.ebuild 2890
-SHA256 92b860cc1d207632299fd92d95430dd1e0e1c3e31b7aa43758d85c4ff6e830b2 jdbc-jaybird-2.0.1.ebuild 2890
-EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2829 RMD160 c66ec8e236594b2dd8b5e35d4eee0f33ec963b35 SHA1 6af474efbe65c3ab3973f6bc72fb3f52d4667636 SHA256 967e843ba98eb35cf90cd39157ba70a3bf9ff0b01b7ac4647ed957d661f04404
-MD5 67fd1922c6aefe322f440301d89861d8 jdbc-jaybird-2.1.0-r1.ebuild 2829
-RMD160 c66ec8e236594b2dd8b5e35d4eee0f33ec963b35 jdbc-jaybird-2.1.0-r1.ebuild 2829
-SHA256 967e843ba98eb35cf90cd39157ba70a3bf9ff0b01b7ac4647ed957d661f04404 jdbc-jaybird-2.1.0-r1.ebuild 2829
-EBUILD jdbc-jaybird-2.1.0.ebuild 2684 RMD160 6ade0aef3215b195ae709b5cb89eed99edb2973a SHA1 0854958376958e2c7b728049f1f33a97a50bc843 SHA256 447ef0cf40d98ec1eebd719433cf6ce7b944b59d2a1a4f962822a825601118a2
-MD5 1dec507c24c5189ec221033e56b58200 jdbc-jaybird-2.1.0.ebuild 2684
-RMD160 6ade0aef3215b195ae709b5cb89eed99edb2973a jdbc-jaybird-2.1.0.ebuild 2684
-SHA256 447ef0cf40d98ec1eebd719433cf6ce7b944b59d2a1a4f962822a825601118a2 jdbc-jaybird-2.1.0.ebuild 2684
-MISC ChangeLog 3931 RMD160 e3cc1aa3f3efe54ec4a7a5192efe94f8c75d2bca SHA1 6539ca379d0bb2617875b8b556ab2cc6cf31e546 SHA256 348d02d078f7df075f5ab7b5b9675b680aa4333d5a854fc85a77db1d971ff12f
-MD5 6755179f1324ddfe44d376152124138c ChangeLog 3931
-RMD160 e3cc1aa3f3efe54ec4a7a5192efe94f8c75d2bca ChangeLog 3931
-SHA256 348d02d078f7df075f5ab7b5b9675b680aa4333d5a854fc85a77db1d971ff12f ChangeLog 3931
+EBUILD jdbc-jaybird-2.0.1.ebuild 2857 RMD160 cd77a29785a604788e6dc10a58245d867ca90b2d SHA1 faff87663217b4c9995367501f82687c3a12d9bd SHA256 978cabb959acc12eafee5b0864772f077e64e32ba61c4ee2f087eb1102117dc5
+MD5 338a6d038e87b00e03ea9513c3017ec3 jdbc-jaybird-2.0.1.ebuild 2857
+RMD160 cd77a29785a604788e6dc10a58245d867ca90b2d jdbc-jaybird-2.0.1.ebuild 2857
+SHA256 978cabb959acc12eafee5b0864772f077e64e32ba61c4ee2f087eb1102117dc5 jdbc-jaybird-2.0.1.ebuild 2857
+EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2816 RMD160 84e2f6b9825edb6a2032e1d7127c9f2e46b89a82 SHA1 fc3e9cb3b4f22039b4219cb11e4590ee51050a86 SHA256 6021b290127e9a0e218055ea036eca983bc07cf93be859b4c3a68dea0534febe
+MD5 40f811259fc70819b8ef22e4ae4e6d7f jdbc-jaybird-2.1.0-r1.ebuild 2816
+RMD160 84e2f6b9825edb6a2032e1d7127c9f2e46b89a82 jdbc-jaybird-2.1.0-r1.ebuild 2816
+SHA256 6021b290127e9a0e218055ea036eca983bc07cf93be859b4c3a68dea0534febe jdbc-jaybird-2.1.0-r1.ebuild 2816
+EBUILD jdbc-jaybird-2.1.0.ebuild 2652 RMD160 8dab1fb311d6fc6562dc8931db2ad7d993b4c2bf SHA1 e3525af5cbeabda5779a2b6bf642ba60ff9dc06b SHA256 5a7d76f65f0e441861f6a25dc51c45dc008dff3c072bda9b7c21a5b0655a9bc0
+MD5 c1dec536125233e6f9fa3cf275f42768 jdbc-jaybird-2.1.0.ebuild 2652
+RMD160 8dab1fb311d6fc6562dc8931db2ad7d993b4c2bf jdbc-jaybird-2.1.0.ebuild 2652
+SHA256 5a7d76f65f0e441861f6a25dc51c45dc008dff3c072bda9b7c21a5b0655a9bc0 jdbc-jaybird-2.1.0.ebuild 2652
+MISC ChangeLog 4109 RMD160 e371c4ff7344613ace96714387be09681c7e9f63 SHA1 0a33af5229f5181fbe531cada659fae78370c029 SHA256 d5c91895590cec8982fc348b7799e5b5fff847c38c73b0bcd3aa20187692f0d9
+MD5 65d1503fa3a43a3173b9647d34182dec ChangeLog 4109
+RMD160 e371c4ff7344613ace96714387be09681c7e9f63 ChangeLog 4109
+SHA256 d5c91895590cec8982fc348b7799e5b5fff847c38c73b0bcd3aa20187692f0d9 ChangeLog 4109
 MISC metadata.xml 428 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 SHA1 76b3cd6dba37cfabeb1ef69314b1e05b8cd7bd12 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091
 MD5 37d8cbe784ce232ec1b6bd1e8cf5cde4 metadata.xml 428
 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 metadata.xml 428
@@ -52,10 +49,3 @@ SHA256 1bde00cf88acb3441873dada2c0efe24051a02bd5b35a0044ee28e169d516638 files/di
 MD5 2d275643a2fddc9000f8d416dd908e6b files/digest-jdbc-jaybird-2.1.0-r1 247
 RMD160 de7d5a5a54a1076bf0dc82ccba145e2843dd2c89 files/digest-jdbc-jaybird-2.1.0-r1 247
 SHA256 1bde00cf88acb3441873dada2c0efe24051a02bd5b35a0044ee28e169d516638 files/digest-jdbc-jaybird-2.1.0-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGxtB9cxLzpIGCsLQRAoqDAKCGg+D5H5U5pE/JwukpOoEEaJdEEwCfW8lf
-QWrsm5KvCuhTe7i4D1rvSjQ=
-=5R4k
------END PGP SIGNATURE-----
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"