Fixed a reference to pg_autovacuum document(#51723). Fixed Java problem on

5 files changed, 36 insertions, 30 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index d3614a29653b..0683354eaa01 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.97 2004/05/14 14:56:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.98 2004/05/25 15:57:26 nakano Exp $
+
+  25 May 2004; Masatomo Nakano <nakano@gentoo.org>
+  files/pg_autovacuum.init-7.4.2, postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild:
+  Fixed a reference to pg_autovacuum document(#51723). Fixed Java problem on
+  amd64.
 
   14 May 2004; Guy Martin <gmsoft@gentoo.org> postgresql-7.4.2-r2.ebuild,
   files/postgresql-7.4.1-hppa-testandset.patch:
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 368e68898a8a..a021badf46b7 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,18 +1,18 @@
-MD5 aeda2cbbf07a32a6836f4efafb176248 ChangeLog 17874
-MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 44233b7b49763b0b590c247a4cfd8b53 postgresql-7.4.2-r1.ebuild 9559
-MD5 813987a3225e90812f32b05f5c5727fc postgresql-7.4.2-r2.ebuild 9601
+MD5 aff6e0e60640227705ef0d9983e8deec postgresql-7.4.2-r2.ebuild 9550
 MD5 9baaa754e37557aad88bb06ca9824145 postgresql-7.3.6.ebuild 7912
-MD5 4d8aca42d50fc04376009d650a3d8f60 files/digest-postgresql-7.4.2-r1 290
-MD5 90e39b59c8f3ef721cea92787012e87e files/digest-postgresql-7.4.2-r2 290
+MD5 0b7723349832c1638a4df2c598aa0286 postgresql-7.4.2-r1.ebuild 9631
+MD5 81714b902f70f536152450469f42dfbd ChangeLog 18104
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 89b3a541ee6728d8934977b81ca112c2 files/postgresql-7.4.2-gentoo.patch 631
 MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
-MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6 223
 MD5 e1a50f45f1b53450b915836a975d96cc files/postgresql.init-7.3.6 1288
-MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.2 302
-MD5 7ef2de54b21230964a767dcd5982e150 files/pg_autovacuum.init-7.4.2 1090
-MD5 89b3a541ee6728d8934977b81ca112c2 files/postgresql-7.4.2-gentoo.patch 631
-MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.2-hppa-testandset.patch 1596
-MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.2-vacuum-delay.patch 8918
-MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.2 390
 MD5 87d6c19e0b4bc95f392b11a565608540 files/postgresql.init-7.4.2 1288
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.2 390
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.2-vacuum-delay.patch 8918
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.2-hppa-testandset.patch 1596
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6 223
+MD5 f078d955da38fc1ac35a5085285bfce1 files/pg_autovacuum.init-7.4.2 1071
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.2 302
+MD5 4d8aca42d50fc04376009d650a3d8f60 files/digest-postgresql-7.4.2-r1 290
+MD5 90e39b59c8f3ef721cea92787012e87e files/digest-postgresql-7.4.2-r2 290
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.2 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.2
index e1d1677adef5..a2e8445a26be 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.2
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.2,v 1.1 2004/03/11 20:11:28 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.2,v 1.2 2004/05/25 15:57:26 nakano Exp $
 
 depend() {
 	need postgresql logger
@@ -20,7 +20,7 @@ start() {
 		eerror " stats_start_collector = true"
 		eerror " stats_row_level = true"
 
-		eerror "Please read /usr/share/doc/postgresql-7.4.1/contrib/README.pg_autovacuum for details."
+		eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
 		eend 1
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-7.4.2-r1.ebuild b/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
index 6b74786e9077..08c4a19298ea 100644
--- a/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r1.ebuild,v 1.3 2004/05/04 09:34:34 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r1.ebuild,v 1.4 2004/05/25 15:57:26 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -181,6 +181,7 @@ src_install() {
 	exeinto /etc/init.d/
 	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
 	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
+	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
 
 	insinto /etc/conf.d/
 	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
diff --git a/dev-db/postgresql/postgresql-7.4.2-r2.ebuild b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
index fa5b76e5ee04..aaae0e898664 100644
--- a/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.4 2004/05/14 14:56:58 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.5 2004/05/25 15:57:26 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -29,9 +29,9 @@ DEPEND="virtual/glibc
 	readline? ( >=sys-libs/readline-4.1 )
 	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
-	python? ( !mips? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
-	java? ( !amd64? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
-		dev-java/java-config ) )
+	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
@@ -41,7 +41,7 @@ RDEPEND="virtual/glibc
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
-	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
+	java? ( >=virtual/jdk-1.3* )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -94,17 +94,15 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if [ "`use java`" ]; then
 		check_java_config
 	fi
 
 	local myconf
 	use tcltk && myconf="--with-tcl"
-	use python && use mips || myconf="$myconf --with-python"
+	use python && myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
-	if [ "`use java`" -a ! "`use amd64`" ]; then
-		myconf="$myconf --with-java"
-	fi
+	use jave && myconf="$myconf --with-java"
 	use ssl && myconf="$myconf --with-openssl"
 	use nls && myconf="$myconf --enable-nls"
 	use libg++ && myconf="$myconf --with-CXX"
@@ -159,9 +157,9 @@ src_install() {
 
 	exeinto /usr/bin
 
-	if [ "`use java`" -a ! "`use amd64`" ]; then
+	if [ "`use java`" ]; then
 		dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-		rm ${D}/usr/share/postgresql/java/postgresql.jar
+#		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
 
 	dodir /usr/include/postgresql/pgsql
@@ -185,6 +183,7 @@ src_install() {
 	exeinto /etc/init.d/
 	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
 	newexe ${FILESDIR}/pg_autovacuum.init-${PV} pg_autovacuum || die
+	dosed "s:___DOCDIR___:/usr/share/doc/${PF}:" /etc/init.d/pg_autovacuum
 
 	insinto /etc/conf.d/
 	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die