--- /usr/portage/dev-db/postgresql/postgresql-7.4.6.ebuild	2004-12-28 11:12:21.000000000 -0500
+++ postgresql-7.4.6.ebuild	2004-12-29 16:43:12.127658592 -0500
@@ -7,18 +7,21 @@
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
 P_HIERPG="hier-Pg7.4-0.5.3"
+POSTGIS="postgis-0.9.1"
 SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 	mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2
 	doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 )
-	pg-hier? ( ftp://gborg.postgresql.org/pub/hierpg/stable/${P_HIERPG}.tar.gz )"
+	pg-hier? ( ftp://gborg.postgresql.org/pub/hierpg/stable/${P_HIERPG}.tar.gz )
+	postgis? ( http://postgis.refractions.net/${POSTGIS}.tar.gz )"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~mips alpha ~arm hppa amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads postgis"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
+	app-admin/sudo
 	>=sys-libs/ncurses-5.2
 	>=sys-devel/bison-1.875
 	zlib? ( >=sys-libs/zlib-1.1.3 )
@@ -29,7 +32,10 @@
 	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 )"
+	nls? ( sys-devel/gettext )
+	postgis? ( >=sci-libs/proj-4.4.7 )
+	postgis? ( >=sci-libs/geos-2.0.0 )"
+
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -37,7 +43,7 @@
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3* )
+	java? ( !amd64? ( >=virtual/jdk-1.3* ) )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -72,6 +78,8 @@
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
 	if use pg-hier; then
+		cd ${WORKDIR} || die
+		mv readme.html README-${P_HIERPG}.html || die
 		cd ${S} || die
 		epatch ${WORKDIR}/${P_HIERPG}.diff
 	fi
@@ -86,6 +94,15 @@
 		cd ${S}
 		epatch ${FILESDIR}/${P}-hppa-testandset.patch
 	fi
+
+	if use postgis; then
+		cd ${S}
+		mv ../${POSTGIS} contrib/postgis
+		cd contrib/postgis
+		sed -i -e "s:PROJ_DIR=/usr/local:PROJ_DIR=/usr:g" \
+			-e "s:GEOS_DIR=/usr/local:GEOS_DIR=/usr:g" \
+			Makefile
+	fi
 }
 
 src_compile() {
@@ -107,7 +124,6 @@
 	use readline || myconf="$myconf --without-readline"
 	use zlib || myconf="$myconf --without-zlib"
 	use pg-intdatetime && myconf="$myconf --enable-integer-datetimes"
-	use threads && myconf="$myconf --enable-thread-safety"
 
 	# these are the only working CFLAGS I could get on ppc, so locking them
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
@@ -117,7 +133,7 @@
 	# Detect mips systems properly
 	gnuconfig_update
 
-	./configure --prefix=/usr \
+	LDFLAGS=-lstdc++ ./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--host=${CHOST} \
 		--docdir=/usr/share/doc/${PF} \
@@ -131,6 +147,10 @@
 	make || die
 	cd contrib
 	make || die
+	if use postgis; then
+		cd postgis
+		make || die
+	fi
 }
 
 src_install() {
@@ -194,6 +214,18 @@
 	insinto /etc/conf.d/
 	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
 	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
+
+	if use postgis; then
+		cd ${S}/contrib/postgis
+		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
 }
 
 pkg_postinst() {