Removed virtual/jdk-1.3 and made it virtual/jdk -- portage doesn't

support former currently, only latter.

3 files changed, 161 insertions, 1 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index abe85061a5aa..f10460f29755 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,7 +1,14 @@
 # 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.6 2002/04/10 12:01:33 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.7 2002/04/11 03:00:14 jhhudso Exp $
 
+*postgresql-7.2-r3 (10 Apr 2002)
+
+  10 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> postgresql-7.2-r3.ebuild files/digest-postgresql-7.2-r3:
+
+  Removed dependency of virtual/jdk-1.3. Portage doesn't currently support
+  virtual/package-X.X only virtual/package.
+	
 *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:
diff --git a/dev-db/postgresql/files/digest-postgresql-7.2-r3 b/dev-db/postgresql/files/digest-postgresql-7.2-r3
new file mode 100644
index 000000000000..c0daa65f8ba7
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.2-r3
@@ -0,0 +1 @@
+MD5 4174777cd91f3cc96f91efb2e4e1bc7c postgresql-7.2.tar.gz 9180168
diff --git a/dev-db/postgresql/postgresql-7.2-r3.ebuild b/dev-db/postgresql/postgresql-7.2-r3.ebuild
new file mode 100644
index 000000000000..141f2febfc09
--- /dev/null
+++ b/dev-db/postgresql/postgresql-7.2-r3.ebuild
@@ -0,0 +1,152 @@
+# 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-r3.ebuild,v 1.1 2002/04/11 03:00:15 jhhudso Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
+SRC_URI="ftp://ftp.easynet.be/postgresql/v${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.postgresql.org"
+
+DEPEND="virtual/glibc
+		sys-devel/autoconf
+		>=sys-libs/readline-4.1
+		>=sys-libs/ncurses-5.2
+		>=sys-libs/zlib-1.1.3
+		tcltk? ( >=dev-lang/tcl-8 )
+		perl? ( >=sys-devel/perl-5.6.1-r2 )
+		python? ( >=dev-lang/python-2.2 )
+		java? ( =virtual/jdk >=dev-java/ant-1.3 )
+		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		nls? ( sys-devel/gettext )"
+
+RDEPEND="virtual/glibc
+		>=sys-libs/zlib-1.1.3
+		tcltk? ( >=dev-lang/tcl-8 )
+		perl? ( >=sys-devel/perl-5.6.1-r2 )
+		python? ( >=dev-lang/python-2.2 )
+		java? ( <virtual/jdk-1.4 )
+		ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
+
+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
+
+	cd ${S}
+
+	# we know that a shared libperl is present, the default perl
+	# config is however set to the static libperl.a
+	# just remove the check
+	patch -p1 < ${FILESDIR}/${P}-dyn-libperl-gentoo.diff || die
+}
+
+src_compile() {
+
+	local myconf
+	if [ "`use tcltk`" ]
+	then
+		myconf="--with-tcl"
+	fi
+	if [ "`use python`" ]
+	then
+		myconf="$myconf --with-python"
+	fi
+	if [ "`use perl`" ]
+	then
+		myconf="$myconf --with-perl"
+	fi
+	if [ "`use java`" ]
+	then
+		myconf="$myconf --with-java"
+	fi
+	if [ "`use ssl`" ]
+	then
+		myconf="$myconf --with-openssl=/usr"
+	fi
+	if [ "`use nls`" ]
+	then
+		myconf="$myconf --enable-locale"
+	fi
+	if [ "`use libg++`" ]
+	then
+	myconf="$myconf --with-CXX"
+	fi
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--docdir=/usr/share/doc/${P} \
+		--libdir=/usr/lib \
+		--enable-syslog \
+		$myconf || die
+
+	emake || die
+
+}
+
+src_install () {
+
+	if [ "`use perl`" ]
+	then
+		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
+		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
+			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
+		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
+	fi
+
+	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} install-all-headers || die
+	dodoc COPYRIGHT HISTORY INSTALL README register.txt
+	cd ${S}/doc
+	dodoc FAQ* KNOWN_BUGS MISSING_FEATURES README*
+	dodoc TODO internals.ps bug.template
+	dodoc *.tar.gz
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+	docinto sgml/graphics
+	dodoc src/graphics/*
+	rm -rf ${D}/usr/doc ${D}/mnt
+	exeinto /usr/bin
+	
+	dojar ${D}/usr/share/postgresql/java/postgresql.jar
+	rm ${D}/usr/share/postgresql/java/postgresql.jar
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/${PV}/${PN}
+
+	einfo ">>> Execute the following command"
+	einfo ">>> ebuild  /var/db/pkg/dev-db/${P}/${P}.ebuild config"
+	einfo ">>> to setup the initial database environment."
+}
+
+
+pkg_config() {
+
+	einfo ">>> Creating data directory ..."
+	mkdir -p /var/lib/postgresql/data
+	chown -Rf postgres.postgres /var/lib/postgresql
+	chmod 700 /var/lib/postgresql/data
+
+	einfo ">>> Initializing the database ..."
+	if [ -f /var/lib/postgresql/data/PG_VERSION ] ; then
+		echo -n "A postgres data directory already exists from version "; cat /var/lib/postgresql/data/PG_VERSION
+		echo "Read the documentation to check how to upgrade to version ${PV}."
+	else
+		su - postgres -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"
+	fi
+
+}