fixed merging bug because of missing jdbc driver.

4 files changed, 62 insertions, 95 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 466409068c28..cb66952b47ab 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,83 +1,73 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 17f9a2f7267fcaf2e168370e61bb3340 ChangeLog 18029
-MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
-MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851
-MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
 MD5 2193bc621b968832d3ae0c9766ca69e0 mysql-3.23.57-r1.ebuild 6492
-MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
-MD5 74194a77362fc74a238f1e05a3506f5f mysql-4.0.12.ebuild 6751
-MD5 c3b780e828243fa381f1e68ecf92bb08 mysql-4.0.13-r4.ebuild 7278
-MD5 80b3d6453732fccb5dd15a9f900aeede mysql-4.0.14-r1.ebuild 7401
+MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
+MD5 a07f1a9242afd520e843c82af6de63dc mysql-4.0.18-r2.ebuild 7830
 MD5 4ef3ef3898ba2d07e8bde1f8bc4a9e2b mysql-4.0.14-r2.ebuild 7555
-MD5 7edf29c2f472ff1f418526e6be2d7abb mysql-4.0.14.ebuild 6903
+MD5 d17e99dea8deb7f23510ab224f09f7a9 mysql-4.0.17.ebuild 7939
+MD5 74194a77362fc74a238f1e05a3506f5f mysql-4.0.12.ebuild 6751
 MD5 6204372a85124c9a0eaba94b47e3dd40 mysql-4.0.15-r1.ebuild 7678
-MD5 a089b3a2de50fb17b2932f02d3a5a684 mysql-4.0.15.ebuild 7561
+MD5 ce8a0d4193521f961ce1c48670000b32 mysql-3.23.58.ebuild 6491
+MD5 fa83fdcb6761b293a7f658f0807cac0c mysql-4.0.19.ebuild 7917
+MD5 7edf29c2f472ff1f418526e6be2d7abb mysql-4.0.14.ebuild 6903
+MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851
+MD5 545dec29c7f8d97252a2421dca787687 mysql-4.0.18-r1.ebuild 7823
+MD5 80b3d6453732fccb5dd15a9f900aeede mysql-4.0.14-r1.ebuild 7401
+MD5 052bacfd0fbf50c077201d79fb15ecef mysql-4.0.20.ebuild 7872
 MD5 2f313db0bb87efbe5a7354053b2ab6cc mysql-4.0.16.ebuild 7503
-MD5 d17e99dea8deb7f23510ab224f09f7a9 mysql-4.0.17.ebuild 7939
+MD5 c3b780e828243fa381f1e68ecf92bb08 mysql-4.0.13-r4.ebuild 7278
+MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
 MD5 15e6382efa5d15584a5a36df4ac3b14d mysql-4.0.18.ebuild 7652
-MD5 545dec29c7f8d97252a2421dca787687 mysql-4.0.18-r1.ebuild 7823
-MD5 a07f1a9242afd520e843c82af6de63dc mysql-4.0.18-r2.ebuild 7830
-MD5 fa83fdcb6761b293a7f658f0807cac0c mysql-4.0.19.ebuild 7917
-MD5 e21921db60dc3fe9dd8a4dfb2c4aa56e mysql-4.0.20.ebuild 7845
-MD5 ce8a0d4193521f961ce1c48670000b32 mysql-3.23.58.ebuild 6491
+MD5 715879ceb09e51943120a5f5afaa3216 ChangeLog 18132
+MD5 a089b3a2de50fb17b2932f02d3a5a684 mysql-4.0.15.ebuild 7561
+MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
+MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
+MD5 a0c6a17e87c4bd9353f68851ec473ed9 files/mysql-4.0.15.rc6 946
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
 MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57-r1 67
+MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
+MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
 MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
 MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
 MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15 66
-MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15-r1 66
 MD5 b3d105fcbd2750964387bfcc010c145e files/digest-mysql-4.0.16 66
 MD5 02c1c39a55937905f61ff17dcdb2ec0a files/digest-mysql-4.0.17 66
-MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
-MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
+MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18 66
+MD5 b776101113ddfd5cda3cdc0ccf2f08c1 files/digest-mysql-4.0.19 66
+MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20 66
 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
-MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
-MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
-MD5 a0c6a17e87c4bd9353f68851ec473ed9 files/mysql-4.0.15.rc6 946
 MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
-MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
-MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
+MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
+MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
+MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
-MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18 66
-MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
+MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
 MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473
-MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
+MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
+MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
+MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
 MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
-MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r1 66
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
 MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
+MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15-r1 66
+MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r1 66
 MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r2 66
-MD5 b776101113ddfd5cda3cdc0ccf2f08c1 files/digest-mysql-4.0.19 66
+MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
 MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
-MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20 66
-MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+eaTmdTrptrqvGERAm1lAJ9Gws+/yyd8rD68Ke1NdiIKCIeEwACgkVK0
-evd7YjXdwkKMHcJB9zQedns=
-=LVeR
------END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index a802737f0ab5..6a4ee289828a 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.118 2004/08/21 16:12:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.119 2004/08/22 01:12:43 nakano Exp $
+
+  22 Aug 2004; Masatomo Nakano <nakano@gentoo.org> :
+  Fixed merging bug which happens with USE="java" because jdbc driver
+  has been removed from PostgreSQL core distribution since version 8.0.0.
+  This closes bug #61178.
 
 *postgresql-7.4.5 (21 Aug 2004)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 224c9874159c..f5497c2f18ff 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,11 +1,11 @@
 MD5 52a786d752a82349212155903662c276 postgresql-7.3.6-r1.ebuild 7488
-MD5 ff438a93666755e8b5354018ac3f62b3 postgresql-8.0.0_beta1.ebuild 7665
+MD5 bd66c22362dd54ec0a7e3c193ca66fbf postgresql-8.0.0_beta1.ebuild 6784
 MD5 17942ea4c77da827d9f3f6b96e4f1445 postgresql-7.4.3-r1.ebuild 10028
 MD5 0cfe4ea1b66826088bff446a34518c0c postgresql-7.4.3.ebuild 9736
 MD5 25cdc6493960f34b6474fb7ca13e32ae postgresql-7.3.7.ebuild 7867
 MD5 4eb0e3a42e9f38fe581a072678c8d9db postgresql-7.4.5.ebuild 10048
 MD5 a0bd9b22d88162dd7790f01b91d647d0 postgresql-7.3.6-r2.ebuild 7869
-MD5 343a61563e2391af1e73b47a2676bcdd ChangeLog 21790
+MD5 c8fca8423f47848c1aa843853b72fe07 ChangeLog 22014
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 b953b7e3784ac0d01467f1e740a96a8a files/postgresql-7.4.5-gentoo.patch 631
 MD5 fe8563fd37bfee794b28728f0842b888 files/postgresql.init-7.3.6 1281
diff --git a/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild b/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild
index c8d0af747f8f..e211f1657da0 100644
--- a/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild,v 1.1 2004/08/10 16:01:30 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.0_beta1.ebuild,v 1.2 2004/08/22 01:12:43 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v8.0.0beta/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc"
+IUSE="ssl nls python tcltk perl libg++ pam readline zlib doc"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -29,19 +29,14 @@ DEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
-		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )"
-# java dep workaround for portage bug
-# x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
 	app-admin/sudo
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3* )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -62,15 +57,6 @@ pkg_setup() {
 	fi
 }
 
-check_java_config() {
-	JDKHOME="`java-config --jdk-home`"
-	if [[ -z ${JDKHOME} && ! -d ${JDKHOME} ]]; then
-		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
-		eerror "${NOJDKERROR}"
-		die "${NOJDKERROR}"
-	fi
-}
-
 src_unpack() {
 	unpack ${A} || die
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -80,15 +66,10 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	if use java; then
-		check_java_config
-	fi
-
 	local myconf
 	use tcltk && myconf="--with-tcl"
 	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
-	use java && myconf="$myconf --with-java"
 	use ssl && myconf="$myconf --with-openssl"
 	use nls && myconf="$myconf --enable-nls"
 	use libg++ && myconf="$myconf --with-CXX"
@@ -143,15 +124,6 @@ src_install() {
 
 	exeinto /usr/bin
 
-	if use java; then
-		# we need to remove jar file after dojar; otherwise two same jar
-		# file are installed.
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
-		dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
-	fi
-
 	dodir /usr/include/postgresql/pgsql
 	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql