--- /usr/portage/dev-db/postgresql/postgresql-8.0.1-r4.ebuild	2005-05-16 03:05:25.000000000 -0400
+++ postgresql-8.0.1-r4.ebuild	2005-05-17 21:36:05.000000000 -0400
@@ -1,23 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.5 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.4 2005/05/09 21:55:20 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
 P_HIERPG="hier-Pg8.0.1-0.5.4"
+POSTGIS="postgis-1.0.0"
 MY_PV=${PV/_/}
 MY_P=${PN}-${MY_PV}
 SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 	mirror://postgresql/source/v${PV}/${PN}-opt-${MY_PV}.tar.bz2
 	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${MY_PV}.tar.bz2 )
+	postgis? ( http://postgis.refractions.net/${POSTGIS}.tar.gz )
 	pg-hier? ( http://gppl.moonbone.ru/${P_HIERPG}.diff.gz )"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux
+kerberos pg-intdatetime pg-hier postgis"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -40,6 +43,8 @@
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
+	postgis? ( >=sci-libs/proj-4.4.8 )
+	postgis? ( >=sci-libs/geos-2.1.1 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
@@ -69,10 +74,15 @@
 	epatch ${FILESDIR}/${P}-securityfix.patch
 	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
 
+	if use postgis; then
+		cd ${S}
+		mv ../${POSTGIS} contrib/postgis
+	fi
+
 	# Bug 91231
-	epatch ${FILESDIR}/CAN-2005-1409.patch
-	epatch ${FILESDIR}/CAN-2005-1410.patch
-	use doc && epatch ${FILESDIR}/CAN-2005-1409-doc.patch
+	# epatch ${FILESDIR}/CAN-2005-1409.patch
+	# epatch ${FILESDIR}/CAN-2005-1410.patch
+	# use doc && epatch ${FILESDIR}/CAN-2005-1409-doc.patch
 }
 
 src_compile() {
@@ -96,6 +106,9 @@
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
 
+	# geos (postgis dependency) is written in C++
+	use postgis && LDFLAGS="-lstdc++"
+
 	# Detect mips systems properly
 	gnuconfig_update
 
@@ -115,6 +128,11 @@
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
+
+	if use postgis; then
+		cd postgis
+		PROJ_DIR=/usr GEOS_DIR=/usr USE_PROJ=1 USE_GEOS=1 make || die
+	fi
 }
 
 src_install() {
@@ -135,6 +153,19 @@
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
+
+	if use postgis; then
+		cd ${S}/contrib/postgis
+		PROJ_DIR=/usr GEOS_DIR=/usr USE_PROJ=1 USE_GEOS=1 make \
+			prefix=${D}/usr \
+			mandir=${D}/usr/share/man \
+			infodir=${D}/usr/share/info \
+			libdir=${D}/usr/lib/postgresql \
+			docdir=${D}/usr/share/doc/${PN}-${PV} \
+			install || die
+		cp *.sql ${D}/usr/share/${PN}/contrib
+	fi
+	
 	cd ${S}
 	dodoc README HISTORY COPYRIGHT INSTALL
 	dodoc contrib/adddepend/*