* bump wrt security bug #134168

(Portage version: 2.1_rc3-r3)

14 files changed, 485 insertions, 1 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 7b61e1297191..31dfc1904f7d 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.52 2006/04/17 17:44:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.53 2006/05/31 17:40:39 voxus Exp $
+
+  31 May 2006; Konstantin Arkhipov <voxus@gentoo.org> +libpq-8.1.4.ebuild,
+  +libpq-8.0.8.ebuild, +libpq-7.4.13.ebuild, +libpq-7.3.15.ebuild:
+  Version bump wrt security bug #134168.
 
   17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libpq-8.1.3-r1.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-db/libpq/files/digest-libpq-7.3.15 b/dev-db/libpq/files/digest-libpq-7.3.15
new file mode 100644
index 000000000000..9ad33602e495
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.3.15
@@ -0,0 +1,3 @@
+MD5 dd23ef0e9cbd1a9bca19f8ee66a021db postgresql-base-7.3.15.tar.bz2 5695061
+RMD160 55cc363e1ce26ea0c7f79c5adfd90714988afb46 postgresql-base-7.3.15.tar.bz2 5695061
+SHA256 81da1ab6c3d9e19aef068cc1db81ca696771dfa5c8ff262bcb1bf977ac7429dc postgresql-base-7.3.15.tar.bz2 5695061
diff --git a/dev-db/libpq/files/digest-libpq-7.4.13 b/dev-db/libpq/files/digest-libpq-7.4.13
new file mode 100644
index 000000000000..db0101d90f78
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.4.13
@@ -0,0 +1,3 @@
+MD5 2e4574f84f6312909de87126bd2859f8 postgresql-base-7.4.13.tar.bz2 6576973
+RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef postgresql-base-7.4.13.tar.bz2 6576973
+SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7 postgresql-base-7.4.13.tar.bz2 6576973
diff --git a/dev-db/libpq/files/digest-libpq-8.0.3 b/dev-db/libpq/files/digest-libpq-8.0.3
index e6523151a277..7fab68cb90d0 100644
--- a/dev-db/libpq/files/digest-libpq-8.0.3
+++ b/dev-db/libpq/files/digest-libpq-8.0.3
@@ -1 +1,3 @@
 MD5 35ff2b9a3bc5c65f55b4192a334b0e88 postgresql-base-8.0.3.tar.bz2 7818251
+RMD160 0e91b565876f747f384f71e4ab4f55acbe07dc25 postgresql-base-8.0.3.tar.bz2 7818251
+SHA256 5d818472ffd4b502dbbd08755f2a9d37aa78f33afd3f4dd84ff7c889d055fd82 postgresql-base-8.0.3.tar.bz2 7818251
diff --git a/dev-db/libpq/files/digest-libpq-8.0.3-r1 b/dev-db/libpq/files/digest-libpq-8.0.3-r1
index e6523151a277..7fab68cb90d0 100644
--- a/dev-db/libpq/files/digest-libpq-8.0.3-r1
+++ b/dev-db/libpq/files/digest-libpq-8.0.3-r1
@@ -1 +1,3 @@
 MD5 35ff2b9a3bc5c65f55b4192a334b0e88 postgresql-base-8.0.3.tar.bz2 7818251
+RMD160 0e91b565876f747f384f71e4ab4f55acbe07dc25 postgresql-base-8.0.3.tar.bz2 7818251
+SHA256 5d818472ffd4b502dbbd08755f2a9d37aa78f33afd3f4dd84ff7c889d055fd82 postgresql-base-8.0.3.tar.bz2 7818251
diff --git a/dev-db/libpq/files/digest-libpq-8.0.4 b/dev-db/libpq/files/digest-libpq-8.0.4
index 66cba8173cb4..71b3ea1eb03d 100644
--- a/dev-db/libpq/files/digest-libpq-8.0.4
+++ b/dev-db/libpq/files/digest-libpq-8.0.4
@@ -1 +1,3 @@
 MD5 ece2604b7bc6c4c460d34113b1542725 postgresql-base-8.0.4.tar.bz2 7825300
+RMD160 75de92c8661174cfea03acc5e058d179ef6c3cf8 postgresql-base-8.0.4.tar.bz2 7825300
+SHA256 4295f381760cbec0141d097799563e854de2d4c04ed41aba3f33354ce8144134 postgresql-base-8.0.4.tar.bz2 7825300
diff --git a/dev-db/libpq/files/digest-libpq-8.0.8 b/dev-db/libpq/files/digest-libpq-8.0.8
new file mode 100644
index 000000000000..46675214e170
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.0.8
@@ -0,0 +1,3 @@
+MD5 4d84ff56ae9669b250060f9e2e36f788 postgresql-base-8.0.8.tar.bz2 7823046
+RMD160 2c60dc22f714bc0182051a94c3c1f513b30f574e postgresql-base-8.0.8.tar.bz2 7823046
+SHA256 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183 postgresql-base-8.0.8.tar.bz2 7823046
diff --git a/dev-db/libpq/files/digest-libpq-8.1.2 b/dev-db/libpq/files/digest-libpq-8.1.2
index cbda5aafe409..0804620696f5 100644
--- a/dev-db/libpq/files/digest-libpq-8.1.2
+++ b/dev-db/libpq/files/digest-libpq-8.1.2
@@ -1 +1,3 @@
 MD5 20fa7e49ea3a7f8f4948c6132bbebd9c postgresql-base-8.1.2.tar.bz2 8042367
+RMD160 b08044d5c80a255023ab8f8b31c84cc8e7936050 postgresql-base-8.1.2.tar.bz2 8042367
+SHA256 f21ae59a5aa4fe19379a669bafac3604e00d107e6c2ce71e05ff9f8780dfd8f1 postgresql-base-8.1.2.tar.bz2 8042367
diff --git a/dev-db/libpq/files/digest-libpq-8.1.3 b/dev-db/libpq/files/digest-libpq-8.1.3
index b5f549d62c59..8d3210ac005c 100644
--- a/dev-db/libpq/files/digest-libpq-8.1.3
+++ b/dev-db/libpq/files/digest-libpq-8.1.3
@@ -1 +1,3 @@
 MD5 4b9466e42b7951d7ec7be4455f64b13f postgresql-base-8.1.3.tar.bz2 8044411
+RMD160 539ec857517d01310225fff2e738ccd6698891ab postgresql-base-8.1.3.tar.bz2 8044411
+SHA256 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619 postgresql-base-8.1.3.tar.bz2 8044411
diff --git a/dev-db/libpq/files/digest-libpq-8.1.4 b/dev-db/libpq/files/digest-libpq-8.1.4
new file mode 100644
index 000000000000..eef9f69ebb90
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.1.4
@@ -0,0 +1,6 @@
+MD5 7ba24eaa31237eb8713782508de4dec7 postgresql-base-8.1.4.tar.bz2 8040435
+RMD160 b3389c51a9d3cc89935dd1cc6405a9dd9c07042d postgresql-base-8.1.4.tar.bz2 8040435
+SHA256 3d5e6cf4aa1593730c61676ffc4e3acbed73c0e13fb246035e54e4cf83fa60e1 postgresql-base-8.1.4.tar.bz2 8040435
+MD5 6aad690bd918086cc3fbf673b74e65e6 postgresql-opt-8.1.4.tar.bz2 144696
+RMD160 8f25c6137a8cbd786a647cf4d8ef59c95573012d postgresql-opt-8.1.4.tar.bz2 144696
+SHA256 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c postgresql-opt-8.1.4.tar.bz2 144696
diff --git a/dev-db/libpq/libpq-7.3.15.ebuild b/dev-db/libpq/libpq-7.3.15.ebuild
new file mode 100644
index 000000000000..0137277c9375
--- /dev/null
+++ b/dev-db/libpq/libpq-7.3.15.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.15.ebuild,v 1.1 2006/05/31 17:40:39 voxus Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+DESCRIPTION="Libraries of postgresql"
+HOMEPAGE="http://www.postgresql.org/"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl nls pam readline zlib kerberos"
+#pg-hier"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	kerberos? ( virtual/krb5 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch from 7.3.14 is ok
+	epatch ${FILESDIR}/${P/5/4}-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	local myconf
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use kerberos && myconf="$myconf --with-krb5"
+
+	# these are the only working CFLAGS I could get on ppc, so locking them
+	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--include=/usr/include/postgresql/libpq-${SLOT} \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		$myconf || die
+
+	cd ${S}/src/interfaces/libpq
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+}
+
+src_install() {
+	cd ${S}/src/interfaces/libpq
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+
+	cd ${S}/src/include
+	make DESTDIR=${D} install || die
+
+	cd ${S}
+	dodoc README HISTORY COPYRIGHT INSTALL
+
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
+
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	do
+		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
+	done
+
+	dodir /usr/include/libpq
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	do
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
+	done
+
+	cd ${D}/usr/include/postgresql/libpq-${SLOT}
+	for f in $(find * -name '*.h' -print) ; do
+		destdir=$(dirname $f)
+		if [ ! -d "${D}/usr/include/postgresql/${destdir}" ]; then
+			dodir /usr/include/postgresql/${destdir}
+		fi
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} /usr/include/postgresql/${destdir}/
+	done
+}
diff --git a/dev-db/libpq/libpq-7.4.13.ebuild b/dev-db/libpq/libpq-7.4.13.ebuild
new file mode 100644
index 000000000000..48bb69214b4e
--- /dev/null
+++ b/dev-db/libpq/libpq-7.4.13.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.13.ebuild,v 1.1 2006/05/31 17:40:39 voxus Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+DESCRIPTION="Libraries of postgresql"
+HOMEPAGE="http://www.postgresql.org/"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl nls pam readline zlib kerberos"
+#pg-hier"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	kerberos? ( virtual/krb5 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch from 7.4.12 is ok
+	epatch ${FILESDIR}/${P/3/2}-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	local myconf
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use kerberos && myconf="$myconf --with-krb5"
+
+	# these are the only working CFLAGS I could get on ppc, so locking them
+	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--include=/usr/include/postgresql/libpq-${SLOT} \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		$myconf || die
+
+	cd ${S}/src/interfaces/libpq
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+}
+
+src_install() {
+	cd ${S}/src/interfaces/libpq
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+
+	cd ${S}/src/include
+	make DESTDIR=${D} install || die
+
+	cd ${S}
+	dodoc README HISTORY COPYRIGHT INSTALL
+
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
+
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	do
+		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
+	done
+
+	dodir /usr/include/libpq
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	do
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
+	done
+
+	cd ${D}/usr/include/postgresql/libpq-${SLOT}
+	for f in $(find * -name '*.h' -print) ; do
+		destdir=$(dirname $f)
+		if [ ! -d "${D}/usr/include/postgresql/${destdir}" ]; then
+			dodir /usr/include/postgresql/${destdir}
+		fi
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} /usr/include/postgresql/${destdir}/
+	done
+}
diff --git a/dev-db/libpq/libpq-8.0.8.ebuild b/dev-db/libpq/libpq-8.0.8.ebuild
new file mode 100644
index 000000000000..8fdf5d41cd01
--- /dev/null
+++ b/dev-db/libpq/libpq-8.0.8.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.8.ebuild,v 1.1 2006/05/31 17:40:39 voxus Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+DESCRIPTION="Libraries of postgresql"
+HOMEPAGE="http://www.postgresql.org/"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl nls pam readline zlib kerberos"
+#pg-hier"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	kerberos? ( virtual/krb5 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# misc files
+FILES_VER="8.0.7"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L /usr/include/libpq ]; then
+		rm /usr/include/libpq
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-${FILES_VER}-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	local myconf
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use kerberos && myconf="$myconf --with-krb5"
+
+	# these are the only working CFLAGS I could get on ppc, so locking them
+	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--include=/usr/include/postgresql/libpq-${SLOT} \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		$myconf || die
+
+	cd ${S}/src/interfaces/libpq
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+}
+
+src_install() {
+	cd ${S}/src/interfaces/libpq
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+
+	cd ${S}/src/include
+	make DESTDIR=${D} install || die
+
+	cd ${S}
+	dodoc README HISTORY COPYRIGHT INSTALL
+
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
+
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	do
+		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
+	done
+
+	dodir /usr/include/libpq
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	do
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
+	done
+
+	cd ${D}/usr/include/postgresql/libpq-${SLOT}
+	for f in $(find * -name '*.h' -print) ; do
+		destdir=$(dirname $f)
+		if [ ! -d "${D}/usr/include/postgresql/${destdir}" ]; then
+			dodir /usr/include/postgresql/${destdir}
+		fi
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} /usr/include/postgresql/${destdir}/
+	done
+}
diff --git a/dev-db/libpq/libpq-8.1.4.ebuild b/dev-db/libpq/libpq-8.1.4.ebuild
new file mode 100644
index 000000000000..d8b44f92982d
--- /dev/null
+++ b/dev-db/libpq/libpq-8.1.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.4.ebuild,v 1.1 2006/05/31 17:40:39 voxus Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+DESCRIPTION="Libraries of postgresql"
+HOMEPAGE="http://www.postgresql.org/"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2
+	mirror://postgresql/source/v${PV}/postgresql-opt-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl nls pam readline zlib kerberos threads"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	kerberos? ( virtual/krb5 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch from 8.1.3 is ok
+	epatch ${FILESDIR}/${P/4/3}-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	local myconf
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use kerberos && myconf="$myconf --with-krb5"
+	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)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--include=/usr/include/postgresql/libpq-${SLOT} \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		$myconf || die
+
+	cd ${S}/src/interfaces/libpq
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+}
+
+src_install() {
+	cd ${S}/src/interfaces/libpq
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+
+	cd ${S}/src/include
+	make DESTDIR=${D} install || die
+
+	cd ${S}
+	dodoc README HISTORY COPYRIGHT INSTALL
+
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
+
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	do
+		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
+	done
+
+	dodir /usr/include/libpq
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	do
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
+	done
+
+	cd ${D}/usr/include/postgresql/libpq-${SLOT}
+	for f in $(find * -name '*.h' -print) ; do
+		destdir=$(dirname $f)
+		if [ ! -d "${D}/usr/include/postgresql/${destdir}" ]; then
+			dodir /usr/include/postgresql/${destdir}
+		fi
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} /usr/include/postgresql/${destdir}/
+	done
+}