Updated digest file since pg-hier patch was updated in upstream.

4 files changed, 38 insertions, 21 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 4730ff90c7d3..ad5c56889374 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.71 2003/12/06 18:42:05 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.72 2003/12/15 03:18:50 nakano Exp $
+
+*postgresql-7.4-r1 (25 Nov 2003)
+  15 Dec 2003; Masatomo Nakano <nakano@gentoo.org> files/digest-postgresql-7.4-r1:
+  Updated digest file since pg-hier patch was updated in upstream.
 
   06 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild,
   postgresql-7.3.3.ebuild, postgresql-7.3.4.ebuild, postgresql-7.3.ebuild,
@@ -8,8 +12,6 @@
   files/postmaster-wrapper, files/7.3/postgresql, files/7.3.2/postgresql:
   Removed old ebuilds/files.
 
-*postgresql-7.4-r1 (25 Nov 2003)
-
   25 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4-r1.ebuild,
   files/postgresql.init-7.4:
   Added hier patch(#34163). 
@@ -34,6 +36,8 @@
   Version bump as unstable.
 
 *postgresql-7.3.4-r1 (06 Nov 2003)
+  15 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild:
+  Fixed DEPEND/RDEPEND in amd64/hppa.
 
   17 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild:
   Marked as stable.
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 9593c828df1f..f6b1b0b6eec2 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,6 @@
-MD5 e382cdf6c0ff48e8062ebed417ddb8c5 ChangeLog 11719
+MD5 8c1167d7c3bc67b456fe631d81c9ecb1 ChangeLog 11986
+MD5 5d57330e363db2f7b4d6499f32d9320e postgresql-7.3.4-r1.ebuild 8020
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 cd19ab56b3c8e79135cb5dd43689d470 postgresql-7.3.4-r1.ebuild 7605
 MD5 4bd54cd63c2390a22a3825357c965134 postgresql-7.4-r1.ebuild 7797
 MD5 b0b26f2f466f14fcab3085e2ce726413 files/postgresql.init-7.3.4 1138
 MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
@@ -9,4 +9,4 @@ MD5 de93df43e2bc632828c53eac67680692 files/digest-postgresql-7.3.4-r1 135
 MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4 390
 MD5 b325603c1adc7c6734e48976c2b604c0 files/postgresql.init-7.4 1137
 MD5 fb171f76854a5249b2be2773b4336a4a files/postgresql-7.4-gentoo.patch 623
-MD5 596e1f84497ad704dc893af524c97ce6 files/digest-postgresql-7.4-r1 282
+MD5 819dc2dce7f1371731ac23b5792054ba files/digest-postgresql-7.4-r1 282
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4-r1 b/dev-db/postgresql/files/digest-postgresql-7.4-r1
index 181019903064..51122b5502f7 100644
--- a/dev-db/postgresql/files/digest-postgresql-7.4-r1
+++ b/dev-db/postgresql/files/digest-postgresql-7.4-r1
@@ -1,4 +1,4 @@
 MD5 a1af58384f506ed63c1d960ab43a2b3b postgresql-base-7.4.tar.bz2 6386681
 MD5 df425a08172b1e6ca41e7720b65a6b15 postgresql-opt-7.4.tar.bz2 326740
 MD5 b8f1d43dc64b6813b3239f36425c8cb8 postgresql-docs-7.4.tar.bz2 2361172
-MD5 a9d68b8e15764ce75734b805407c1a66 hier-Pg7.4-0.3.tar.gz 28382
+MD5 d9f4cf61cd53ca84e9163f986bfbf2a9 hier-Pg7.4-0.3.tar.gz 28392
diff --git a/dev-db/postgresql/postgresql-7.3.4-r1.ebuild b/dev-db/postgresql/postgresql-7.3.4-r1.ebuild
index 05ada6499454..dc954c0ab021 100644
--- a/dev-db/postgresql/postgresql-7.3.4-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.4-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.4-r1.ebuild,v 1.3 2003/11/20 02:23:21 vapier Exp $
-
-inherit flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.4-r1.ebuild,v 1.4 2003/12/15 03:18:58 nakano Exp $
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
+
+RESTRICT="nomirror"
+P_HIERPG="hier-Pg7.3-0.3"
 HOMEPAGE="http://www.postgresql.org/ http://gppl.terminal.ru/index.eng.html"
 SRC_URI="mirror://postgresql/v${PV}/${P}.tar.gz
-	pg-hier? ( http://gppl.terminal.ru/hier-Pg7.3-0.3.tar.gz )"
+	pg-hier? ( http://gppl.terminal.ru/${P_HIERPG}.tar.gz )"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
@@ -22,8 +23,8 @@ 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? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 )
+	python? ( !ppc? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) )
+	java? ( !amd64? ( !hppa? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3 ) ) )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )"
 # java dep workaround for portage bug
@@ -32,8 +33,8 @@ RDEPEND="virtual/glibc
 	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* )
+	python? ( !ppc? ( >=dev-lang/python-2.2 ) )
+	java? ( !amd64? ( !hppa? ( >=virtual/jdk-1.3* ) ) )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -51,6 +52,18 @@ pkg_setup() {
 			die
 		fi
 	fi
+
+	if [ "`use java`" ]; then
+		if [ "`use amd64`" -o "`use hppa`" ]; then
+			ewarn "Ignore USE=\"java\" in amd64/hppa"
+		fi
+	fi
+
+	if [ "`use python`" ]; then
+		if [ "`use ppc`" ]; then
+			ewarn "Ignore USE=\"python\" in ppc"
+		fi
+	fi
 }
 
 check_java_config() {
@@ -66,7 +79,7 @@ src_unpack() {
 	unpack ${A} || die
 	if [ "`use pg-hier`" ]; then
 		cd ${WORKDIR} || die
-		mv readme.html README-hier-Pg7.3-0.3.html || die
+		mv readme.html README-${P_HIERPG}.html || die
 		cd ${S} || die
 		epatch ${WORKDIR}/hier-Pg7.3.1-0.3.diff || die
 	fi
@@ -76,13 +89,13 @@ src_unpack() {
 src_compile() {
 	filter-flags -ffast-math
 
-	use java && check_java_config
+	use java && use amd64 || use hppa || check_java_config
 
 	local myconf
 	use tcltk && myconf="--with-tcl"
-	use python && myconf="$myconf --with-python"
+	use python && use ppc || myconf="$myconf --with-python"
 	use perl && myconf="$myconf --with-perl"
-	use java && myconf="$myconf --with-java"
+	use java && use amd64 || use hppa || myconf="$myconf --with-java"
 	use ssl && myconf="$myconf --with-openssl"
 	use nls && myconf="$myconf --enable-nls"
 	use libg++ && myconf="$myconf --with-CXX"
@@ -129,7 +142,7 @@ src_install() {
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	cd ${S}
 	if [ "`use pg-hier`" ]; then
-		dodoc ${WORKDIR}/README-hier-Pg7.3-0.3.html
+		dodoc ${WORKDIR}/README-${P_HIERPG}.html
 	fi
 	dodoc COPYRIGHT HISTORY INSTALL README register.txt
 	dodoc contrib/adddepend/*
@@ -145,7 +158,7 @@ src_install() {
 	rm -rf ${D}/usr/doc ${D}/mnt
 	exeinto /usr/bin
 
-	if [ `use java` ]; then
+	if [ "`use java`" -a ! "`use amd64`" -a ! "`use hppa`" ]; then
 		dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi