summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2002-04-10 12:01:33 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2002-04-10 12:01:33 +0000
commit062602ea2b5f0497afa692412cd8283f2d2b7260 (patch)
tree18c457f5352162d7ff078ef2d4d13c7a47bbb00e /dev-db/postgresql
parentinitial ebuild (diff)
downloadhistorical-062602ea2b5f0497afa692412cd8283f2d2b7260.tar.gz
historical-062602ea2b5f0497afa692412cd8283f2d2b7260.tar.bz2
historical-062602ea2b5f0497afa692412cd8283f2d2b7260.zip
Fixed #713
Diffstat (limited to 'dev-db/postgresql')
-rw-r--r--dev-db/postgresql/ChangeLog10
-rw-r--r--dev-db/postgresql/files/digest-postgresql-7.2-r2 (renamed from dev-db/postgresql/files/digest-postgresql-7.2-r1)0
-rw-r--r--dev-db/postgresql/postgresql-7.2-r2.ebuild (renamed from dev-db/postgresql/postgresql-7.2-r1.ebuild)10
3 files changed, 18 insertions, 2 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index aa980d9c0070..abe85061a5aa 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for dev-db/postgresql
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.5 2002/02/18 21:10:08 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.6 2002/04/10 12:01:33 karltk Exp $
+*postgresql-7.2-r2 (10 Apr 2002)
+
+ 10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> postgresql-7.2-r2.ebuild files/digest-postgresql-7.2-r2:
+
+ Added proper code in pkg_setup() so that it will refuse to compile if the
+ user has JDK 1.4.0 as his system VM.
+
+ Removed postgresql-7.2-r1.ebuild files/digest-postgresql-7.2-r1
*postgresql-7.2-r1 (18 Feb 2002)
diff --git a/dev-db/postgresql/files/digest-postgresql-7.2-r1 b/dev-db/postgresql/files/digest-postgresql-7.2-r2
index c0daa65f8ba7..c0daa65f8ba7 100644
--- a/dev-db/postgresql/files/digest-postgresql-7.2-r1
+++ b/dev-db/postgresql/files/digest-postgresql-7.2-r2
diff --git a/dev-db/postgresql/postgresql-7.2-r1.ebuild b/dev-db/postgresql/postgresql-7.2-r2.ebuild
index a0395e43d918..06a41561d090 100644
--- a/dev-db/postgresql/postgresql-7.2-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.2-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Geert Bevin <gbevin@theleaf.be>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2-r1.ebuild,v 1.1 2002/02/18 21:10:08 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.2-r2.ebuild,v 1.1 2002/04/10 12:01:33 karltk Exp $
S=${WORKDIR}/${P}
DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
@@ -30,6 +30,14 @@ RDEPEND="virtual/glibc
SLOT="0"
+pkg_setup() {
+ local foo
+ foo=`java-config --java-version 2>&1 | grep "1.4.0"`
+ if [ ! -z "$foo" ] ; then
+ einfo "Cannot build with Sun JDK 1.4.0, use an 1.3.x JDK instead."
+ exit 1
+ fi
+}
src_unpack() {
unpack postgresql-${PV}.tar.gz