Update for sec bug 165482..more to come

Package-Manager: portage-2.1.2-r9

6 files changed, 220 insertions, 26 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 6553aa1d7741..620e11b490fc 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,12 @@
 # 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.88 2006/12/17 22:01:16 killerfox Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.89 2007/02/11 22:45:29 mjolnir Exp $
+
+*libpq-7.3.18 (11 Feb 2007)
+
+  11 Feb 2007; Martin Jackson <mjolnir@gentoo.org>
+  +files/libpq-7.3.18-gentoo.patch, +libpq-7.3.18.ebuild:
+  revbump for #165482
 
   17 Dec 2006; René Nussbaumer <killerfox@gentoo.org> libpq-7.3.16.ebuild,
   libpq-7.4.14.ebuild, libpq-8.0.9.ebuild:
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 64862eda2b14..58ceaa4bb635 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libpq-7.3.15-gentoo.patch 2072 RMD160 6b9be37042691c71a45cd1b8afdd5b527f377a1d SHA1 26ebf644d18024127658478f480b9068077a07a0 SHA256 60236cf5e6e3cd71ce3dd9a3a8980411bf59e417bb5a81def08163afbdce19db
 MD5 a5258e009dc50cac1d5e110fd78f4f8c files/libpq-7.3.15-gentoo.patch 2072
 RMD160 6b9be37042691c71a45cd1b8afdd5b527f377a1d files/libpq-7.3.15-gentoo.patch 2072
@@ -9,6 +6,10 @@ AUX libpq-7.3.16-gentoo.patch 2145 RMD160 697f39977f0400c4ee2fdba9508d9c64d74466
 MD5 12b0d7b6fb93d3c6272210a95ae41e39 files/libpq-7.3.16-gentoo.patch 2145
 RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c files/libpq-7.3.16-gentoo.patch 2145
 SHA256 db52e0d1345977ff8cd58ee9a74d321356032cb344f080a93409f9922fefed14 files/libpq-7.3.16-gentoo.patch 2145
+AUX libpq-7.3.18-gentoo.patch 2172 RMD160 1132c88b07362d9f6af54d136beaa3d1a340d2ef SHA1 27a3daed77865a0de37fa8b6faf89c176e8d3bca SHA256 eba2c9bb58bf97855e17faf6ae15d26523d5413c01ca54ca8e7e009fce7b3993
+MD5 36bf60a4bd1cfdd16db5785a32be3ca8 files/libpq-7.3.18-gentoo.patch 2172
+RMD160 1132c88b07362d9f6af54d136beaa3d1a340d2ef files/libpq-7.3.18-gentoo.patch 2172
+SHA256 eba2c9bb58bf97855e17faf6ae15d26523d5413c01ca54ca8e7e009fce7b3993 files/libpq-7.3.18-gentoo.patch 2172
 AUX libpq-7.4.13-gentoo.patch 2611 RMD160 c26e204bc27af9fe26a3580aebef558adaa7aa96 SHA1 0eb376094085c58f700754b171921a1214f01599 SHA256 219f59d3be934576c5d55cb824aae390b740110f838ad092743fbecca3abdad9
 MD5 421a67ed3acdb12296f6a6646d9cee6e files/libpq-7.4.13-gentoo.patch 2611
 RMD160 c26e204bc27af9fe26a3580aebef558adaa7aa96 files/libpq-7.4.13-gentoo.patch 2611
@@ -31,12 +32,14 @@ RMD160 8deafde0e17a8f5c4636bee5f25cd85c4d84b15f files/libpq-8.1.5-gentoo.patch 2
 SHA256 774cb22ebd5fd1436d0f227f5215af3ac790b0b193df419a1ee0067090736e99 files/libpq-8.1.5-gentoo.patch 2408
 DIST postgresql-base-7.3.15.tar.bz2 5695061 RMD160 55cc363e1ce26ea0c7f79c5adfd90714988afb46 SHA1 059f16d3e98df525e9c0962f29f2126a9397dc02 SHA256 81da1ab6c3d9e19aef068cc1db81ca696771dfa5c8ff262bcb1bf977ac7429dc
 DIST postgresql-base-7.3.16.tar.bz2 5696231 RMD160 aaf7e4743bc67c0a45d8d44cef840283e7ead6f9 SHA1 cc01fecb6d419b6f4d9f2c4f683ee6e066382640 SHA256 96046fc13596e4d9f7a4dcd5882fed51ec5905760cc828594443272a69c140e5
+DIST postgresql-base-7.3.18.tar.bz2 5695073 RMD160 62607d50fbf97ae0b954943e2e27052bcf2c5aa0 SHA1 29e2121ee6383929e8b90b50e8f7bbac218f203e SHA256 648c7bddcab5477c5d7800795f8392a3ecdd361828c4374d9804bfa61a07b048
 DIST postgresql-base-7.4.13.tar.bz2 6576973 RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef SHA1 cb326a788833e805a54a80d87aeeb6fa00fb7b1e SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7
 DIST postgresql-base-7.4.14.tar.bz2 6575201 RMD160 c5b8ecd20ad2783c3f254f0e7402aab9ad722d0a SHA1 b737a35070bf13f478e8bca346a32243b9599b89 SHA256 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9
 DIST postgresql-base-8.0.8.tar.bz2 7823046 RMD160 2c60dc22f714bc0182051a94c3c1f513b30f574e SHA1 a5e5147497f0c2b548762d232d297b48d6e97d02 SHA256 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183
 DIST postgresql-base-8.0.9.tar.bz2 7824961 RMD160 40cbea0b0a3a0f67670dfbe1670e08b48dbb1999 SHA1 d11bb58349b3e42fd0a19ceb732e9381bba89b16 SHA256 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417
 DIST postgresql-base-8.1.5.tar.bz2 8044522 RMD160 3460f38b720ce3a9687052d5523bcbd027655d6e SHA1 7d6cc07ca1cb8cb57a366a7860310a892fe6a2ba SHA256 cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
 DIST postgresql-opt-7.3.16.tar.bz2 341908 RMD160 00e0f059910eed3021ba5b096e86bdc6878c34d6 SHA1 aac3126d50dfb1ea23984ecdff9cc6da7605b531 SHA256 0e1ab00b1439c5930b6c74ed5c4382c01fdb54434857ac3c1599d32fcce2c8d1
+DIST postgresql-opt-7.3.18.tar.bz2 342315 RMD160 fa7cb704ff7bb131f6108217c645821413ecd5b8 SHA1 5c1a8a103d696668abae7d8931c0dd687cdb7766 SHA256 6d422a3d4d56192952c035d01aff59b90c7ab7b3cdb7f300572e40dd20db5e4b
 DIST postgresql-opt-7.4.14.tar.bz2 333417 RMD160 a6279f5b9d52f72ce786bc468c114befb5a1f29a SHA1 becc575260128261dc7f8ed46f166f54f48b8732 SHA256 e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d
 DIST postgresql-opt-8.0.9.tar.bz2 134706 RMD160 be148e079c20c13aec1767180d993933b91c2116 SHA1 a1263b4ec563ec24165db4657dcc4faab567ef90 SHA256 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020
 DIST postgresql-opt-8.1.5.tar.bz2 144784 RMD160 5ac9b1ffdf1357316ceb1736f7b9be3ee339be3b SHA1 6d62463d6bcadcef1e515d740c15489ab4e428e7 SHA256 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
@@ -48,6 +51,10 @@ EBUILD libpq-7.3.16.ebuild 3288 RMD160 5cfc14fa3c3454caf072a65dacc21ea4cbc63ce1
 MD5 6a157b47871f85d2a72b16c51b10e287 libpq-7.3.16.ebuild 3288
 RMD160 5cfc14fa3c3454caf072a65dacc21ea4cbc63ce1 libpq-7.3.16.ebuild 3288
 SHA256 30dab99016dfc366c62a30828db76678739c7a9c34d02b83eab1124c059459d4 libpq-7.3.16.ebuild 3288
+EBUILD libpq-7.3.18.ebuild 3297 RMD160 d1e1379701878ecf1805ecc820e669f7707c1cd7 SHA1 710eafa63fe0761e631bbfc01b46d3c5b846dc76 SHA256 1d98d706804d5b47150f3a6fbfdb75ebab5e7e7f07580f42e27b18de686bdebf
+MD5 ba9e37c9c2b558608a2e66ff611abf37 libpq-7.3.18.ebuild 3297
+RMD160 d1e1379701878ecf1805ecc820e669f7707c1cd7 libpq-7.3.18.ebuild 3297
+SHA256 1d98d706804d5b47150f3a6fbfdb75ebab5e7e7f07580f42e27b18de686bdebf libpq-7.3.18.ebuild 3297
 EBUILD libpq-7.4.13.ebuild 3084 RMD160 1aaaefb56c0a7005fb20b351f03d1afc3c88031c SHA1 3b7a4ecdffc6712f201b76f7755fca13a02c30b2 SHA256 effee9c11b4ca11c01eab3c369da0db20747dbedc8080714c9c78520d06704e5
 MD5 36183272c56e26246addd3f2981cde57 libpq-7.4.13.ebuild 3084
 RMD160 1aaaefb56c0a7005fb20b351f03d1afc3c88031c libpq-7.4.13.ebuild 3084
@@ -68,10 +75,10 @@ EBUILD libpq-8.1.5.ebuild 3339 RMD160 71c2c80b5ea23532ce249a68257b6d3a2c4235b8 S
 MD5 baec1649c32e97f533801f1f0696209a libpq-8.1.5.ebuild 3339
 RMD160 71c2c80b5ea23532ce249a68257b6d3a2c4235b8 libpq-8.1.5.ebuild 3339
 SHA256 42a96033d541d176a30c439cf6fefeecab9d9774d74db74a9a4034abe6d97368 libpq-8.1.5.ebuild 3339
-MISC ChangeLog 14949 RMD160 183a4c273de9a4d49bd3c7dced9e2efe07183814 SHA1 db16642ff0c4818479a8e4b2bd57c09a2d48f613 SHA256 b90aeb2f0a49bfd418fbd5a93750651c69d1711d592e8b78ac3bfb51477c2f64
-MD5 9f0bc37fe6a354e406b0f00dadf4ae03 ChangeLog 14949
-RMD160 183a4c273de9a4d49bd3c7dced9e2efe07183814 ChangeLog 14949
-SHA256 b90aeb2f0a49bfd418fbd5a93750651c69d1711d592e8b78ac3bfb51477c2f64 ChangeLog 14949
+MISC ChangeLog 15108 RMD160 34550827ccf3d14818d0568b0f337fe30da098b0 SHA1 1b01cf3091cf7d4652b76e62adacb609f368e25a SHA256 e2c21e6dd1ea08a51afa533dae8009a3092acd6e289efe3eaaf0e36e2b1fbcea
+MD5 70602a44902d7c772cf6b07d711fac7e ChangeLog 15108
+RMD160 34550827ccf3d14818d0568b0f337fe30da098b0 ChangeLog 15108
+SHA256 e2c21e6dd1ea08a51afa533dae8009a3092acd6e289efe3eaaf0e36e2b1fbcea ChangeLog 15108
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
@@ -82,6 +89,9 @@ SHA256 636d9a567f3862de1977ae039df1258a41e38412804b0e6752fb551c7e8c30e1 files/di
 MD5 6ec645ac75ab83acfdee683049c12601 files/digest-libpq-7.3.16 542
 RMD160 89c84417b8f6258d28b4fd8f408477c2652a3891 files/digest-libpq-7.3.16 542
 SHA256 a789e2dde7d23018187b06c75430aa50e9cd325986f04ac3a1d7475db66d2660 files/digest-libpq-7.3.16 542
+MD5 6f1763f9230bffd911a68f57646f286c files/digest-libpq-7.3.18 542
+RMD160 4bbbd10cf2b08c8e4b629de86e2f170161ac8aa7 files/digest-libpq-7.3.18 542
+SHA256 438acb827392b58a871dd39b519563b23d0db3ebb1817bc09accaeaa26ecd4fc files/digest-libpq-7.3.18 542
 MD5 d4df809fed8eb6b6a5b0f65d9dd67236 files/digest-libpq-7.4.13 274
 RMD160 fb20fd4e3ccac6925532f1463eb03ceb95c6c11f files/digest-libpq-7.4.13 274
 SHA256 708a0dce96b98013656090a67385955fe6c5c7beafbe7de7b1d937564bf3db12 files/digest-libpq-7.4.13 274
@@ -97,10 +107,3 @@ SHA256 74415bb7fa5c2dbbd29ec057e56ca55d6d46c18fd5241a0d1fb9de3d1891babc files/di
 MD5 4dcefb74752b323c9ef89dd924045329 files/digest-libpq-8.1.5 536
 RMD160 4d1e620a685d7da7f1c15246fd549920503a11e8 files/digest-libpq-8.1.5 536
 SHA256 8ca2f139f05a66a5866c3f7cfc20e60722671b0f11834b363bdca58b0e7f2890 files/digest-libpq-8.1.5 536
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFx7pu8bi6rjpTunYRAqevAJ9Kb2PiRVOjwRIaNLtJBOeuqBaLeQCg0uuP
-Mcl8oF2J2Y08dhENv7rIlVM=
-=rHQF
------END PGP SIGNATURE-----
diff --git a/dev-db/libpq/files/digest-libpq-7.3.18 b/dev-db/libpq/files/digest-libpq-7.3.18
new file mode 100644
index 000000000000..288c12d0495a
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.3.18
@@ -0,0 +1,6 @@
+MD5 e9205d6835933401db4c5991504f264b postgresql-base-7.3.18.tar.bz2 5695073
+RMD160 62607d50fbf97ae0b954943e2e27052bcf2c5aa0 postgresql-base-7.3.18.tar.bz2 5695073
+SHA256 648c7bddcab5477c5d7800795f8392a3ecdd361828c4374d9804bfa61a07b048 postgresql-base-7.3.18.tar.bz2 5695073
+MD5 02c53c28a92b7bfc229c71c4b18dee49 postgresql-opt-7.3.18.tar.bz2 342315
+RMD160 fa7cb704ff7bb131f6108217c645821413ecd5b8 postgresql-opt-7.3.18.tar.bz2 342315
+SHA256 6d422a3d4d56192952c035d01aff59b90c7ab7b3cdb7f300572e40dd20db5e4b postgresql-opt-7.3.18.tar.bz2 342315
diff --git a/dev-db/libpq/files/libpq-7.3.18-gentoo.patch b/dev-db/libpq/files/libpq-7.3.18-gentoo.patch
new file mode 100644
index 000000000000..b7fb5f15fbdd
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.3.18-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Nru postgresql-7.3.18.orig/src/interfaces/libpq/Makefile postgresql-7.3.18/src/interfaces/libpq/Makefile
+--- postgresql-7.3.18.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.18/src/interfaces/libpq/Makefile	2006-11-05 13:21:19.000000000 +0100
+@@ -18,6 +18,8 @@
+ SO_MAJOR_VERSION= 3
+ SO_MINOR_VERSION= 0
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
+diff -Nru postgresql-7.3.18.orig/src/interfaces/libpq/nls.mk postgresql-7.3.18/src/interfaces/libpq/nls.mk
+--- postgresql-7.3.18.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.18/src/interfaces/libpq/nls.mk	2006-11-05 13:21:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.8 2002/09/22 20:57:21 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-3
+ AVAIL_LANGUAGES	:= cs de es fr pt_BR ru sv zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext
+diff -Nru postgresql-7.3.18.orig/src/Makefile.shlib postgresql-7.3.18/src/Makefile.shlib
+--- postgresql-7.3.18.orig/src/Makefile.shlib	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.18/src/Makefile.shlib	2006-11-05 13:23:20.000000000 +0100
+@@ -221,7 +221,7 @@
+ 
+ all-lib: all-static-lib all-shared-lib
+ 
+-all-static-lib: lib$(NAME).a
++all-static-lib: lib$(NAME_STATIC_LIB).a
+ 
+ all-shared-lib: $(shlib)
+ 
+@@ -231,7 +231,7 @@
+ MK_NO_LORDER := true
+ endif
+ 
+-lib$(NAME).a: $(OBJS)
++lib$(NAME_STATIC_LIB).a: $(OBJS)
+ ifdef MK_NO_LORDER
+ 	$(LINK.static) $@ $^
+ else
+@@ -302,8 +302,8 @@
+ .PHONY: install-lib install-lib-static install-lib-shared
+ install-lib: install-lib-static install-lib-shared
+ 
+-install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++install-lib-static: lib$(NAME_STATIC_LIB).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ 
+ ifeq ($(enable_shared), yes)
+ install-lib-shared: $(shlib)
diff --git a/dev-db/libpq/libpq-7.3.18.ebuild b/dev-db/libpq/libpq-7.3.18.ebuild
new file mode 100644
index 000000000000..6872d0dd8daa
--- /dev/null
+++ b/dev-db/libpq/libpq-7.3.18.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.18.ebuild,v 1.1 2007/02/11 22:45:29 mjolnir Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PostgreSQL libraries."
+HOMEPAGE="http://www.postgresql.org/"
+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="3"
+IUSE="kerberos nls pam pg-intdatetime readline ssl zlib"
+
+RDEPEND="!<=dev-db/postgresql-7.3.15-r1
+		kerberos? ( virtual/krb5 )
+		pam? ( virtual/pam )
+		readline? ( >=sys-libs/readline-4.1 )
+		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		zlib? ( >=sys-libs/zlib-1.1.3 )"
+DEPEND="${RDEPEND}
+		sys-devel/autoconf
+		>=sys-devel/bison-1.875
+		nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+pkg_preinst() {
+	# Removing wrong symlink created by previous ebuild
+	if [[ -L "${ROOT}/usr/include/libpq" ]] ; then
+		rm -f "${ROOT}/usr/include/libpq"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	cd "${S}"
+
+	./configure --prefix=/usr \
+		--includedir=/usr/include/postgresql/libpq-${SLOT} \
+		--sysconfdir=/etc/postgresql \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		$(use_with kerberos krb5) \
+		$(use_enable nls ) \
+		$(use_with pam) \
+		--without-perl \
+		$(use_enable pg-intdatetime integer-datetimes ) \
+		--without-python \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		--without-tcl \
+		--without-tk \
+		$(use_with zlib) \
+		|| die "configure failed"
+
+	cd "${S}/src/interfaces/libpq"
+	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake libpq failed"
+
+	cd "${S}/src/bin/pg_config"
+	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake pg_config failed"
+}
+
+src_install() {
+	cd "${S}/src/interfaces/libpq"
+	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "emake install libpq failed"
+
+	cd "${S}/src/include"
+	emake DESTDIR="${D}" install-all-headers || die "emake install headers failed"
+
+	cd "${S}/src/bin/pg_config"
+	emake DESTDIR="${D}" install || die "emake install pg_config failed"
+
+	cd "${S}"
+	dodoc README HISTORY
+
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
+
+	for f in $(ls -1 "${D}"/usr/include/postgresql/libpq-${SLOT}/*.h) ; do
+		dosym postgresql/libpq-${SLOT}/$(basename ${f}) /usr/include/
+	done
+
+	dodir /usr/include/libpq
+	for f in $(ls -1 "${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
+}
+
+src_test() {
+	einfo "No tests available for libpq."
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index a3a47f5557ed..bb9a6ea1ba89 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pg_autovacuum.conf-7.4 503 RMD160 ee3da3918e26113918a47cc6e2da544f97879bc2 SHA1 b47f6f3698ce12cbe955490b80ec98ac4cdd8afb SHA256 8141a1ab17a74e3916b4ba834f10eaf0bd925de374ead972d3d2f5e78078e090
 MD5 3e0310e00bfe34e77bb8c39903e16d6c files/pg_autovacuum.conf-7.4 503
 RMD160 ee3da3918e26113918a47cc6e2da544f97879bc2 files/pg_autovacuum.conf-7.4 503
@@ -33,6 +30,14 @@ AUX postgresql-7.3.16-gentoo.patch 2253 RMD160 c8ecc1797c7aefd94363cb4479bea1cc3
 MD5 d50cead2635608aa6893178d8c4ac8da files/postgresql-7.3.16-gentoo.patch 2253
 RMD160 c8ecc1797c7aefd94363cb4479bea1cc345fb622 files/postgresql-7.3.16-gentoo.patch 2253
 SHA256 801bc08232ea7cdaca8bd0179f28db6bb207702b2b394c895f6fccaff5402b8a files/postgresql-7.3.16-gentoo.patch 2253
+AUX postgresql-7.3.18-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
+MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3.18-cubeparse.patch 1296
+RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3.18-cubeparse.patch 1296
+SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada files/postgresql-7.3.18-cubeparse.patch 1296
+AUX postgresql-7.3.18-gentoo.patch 2253 RMD160 c8ecc1797c7aefd94363cb4479bea1cc345fb622 SHA1 59a9cbf9c3ca36f81ec8a88504eb6523f641639e SHA256 801bc08232ea7cdaca8bd0179f28db6bb207702b2b394c895f6fccaff5402b8a
+MD5 d50cead2635608aa6893178d8c4ac8da files/postgresql-7.3.18-gentoo.patch 2253
+RMD160 c8ecc1797c7aefd94363cb4479bea1cc345fb622 files/postgresql-7.3.18-gentoo.patch 2253
+SHA256 801bc08232ea7cdaca8bd0179f28db6bb207702b2b394c895f6fccaff5402b8a files/postgresql-7.3.18-gentoo.patch 2253
 AUX postgresql-7.4-gentoo.patch 1741 RMD160 202f7c21d984a45a1adec0ac92ae727bd75535c6 SHA1 205293bd138db9948220cbcdc401f202eb9814a5 SHA256 9bd9fefdb9d5d8a62ec00c8ac0175322ae66ca860c3571593fea81ffd4add8dc
 MD5 048439fadb678ce304dec9629829bcc2 files/postgresql-7.4-gentoo.patch 1741
 RMD160 202f7c21d984a45a1adec0ac92ae727bd75535c6 files/postgresql-7.4-gentoo.patch 1741
@@ -129,6 +134,7 @@ DIST hier-Pg7.4-0.5.3.tar.gz 34662 RMD160 758a67262ad3dbad649cc8a6b3ef610e6123dd
 DIST hier-Pg8.0.1-0.5.4.diff.gz 30662 RMD160 f212f840d06a914fd668398848baef5a269875eb SHA1 c1a1141363c1d3c14025d97993b5367166c85da4 SHA256 e6ec8792d6a33ec5f0031b530d794aa3877397c3f980f11dc958d480d2352eda
 DIST postgresql-base-7.3.15.tar.bz2 5695061 RMD160 55cc363e1ce26ea0c7f79c5adfd90714988afb46 SHA1 059f16d3e98df525e9c0962f29f2126a9397dc02 SHA256 81da1ab6c3d9e19aef068cc1db81ca696771dfa5c8ff262bcb1bf977ac7429dc
 DIST postgresql-base-7.3.16.tar.bz2 5696231 RMD160 aaf7e4743bc67c0a45d8d44cef840283e7ead6f9 SHA1 cc01fecb6d419b6f4d9f2c4f683ee6e066382640 SHA256 96046fc13596e4d9f7a4dcd5882fed51ec5905760cc828594443272a69c140e5
+DIST postgresql-base-7.3.18.tar.bz2 5695073 RMD160 62607d50fbf97ae0b954943e2e27052bcf2c5aa0 SHA1 29e2121ee6383929e8b90b50e8f7bbac218f203e SHA256 648c7bddcab5477c5d7800795f8392a3ecdd361828c4374d9804bfa61a07b048
 DIST postgresql-base-7.4.13.tar.bz2 6576973 RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef SHA1 cb326a788833e805a54a80d87aeeb6fa00fb7b1e SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7
 DIST postgresql-base-7.4.14.tar.bz2 6575201 RMD160 c5b8ecd20ad2783c3f254f0e7402aab9ad722d0a SHA1 b737a35070bf13f478e8bca346a32243b9599b89 SHA256 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9
 DIST postgresql-base-8.0.8.tar.bz2 7823046 RMD160 2c60dc22f714bc0182051a94c3c1f513b30f574e SHA1 a5e5147497f0c2b548762d232d297b48d6e97d02 SHA256 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183
@@ -136,6 +142,7 @@ DIST postgresql-base-8.0.9.tar.bz2 7824961 RMD160 40cbea0b0a3a0f67670dfbe1670e08
 DIST postgresql-base-8.1.5.tar.bz2 8044522 RMD160 3460f38b720ce3a9687052d5523bcbd027655d6e SHA1 7d6cc07ca1cb8cb57a366a7860310a892fe6a2ba SHA256 cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
 DIST postgresql-docs-7.3.15.tar.bz2 2361345 RMD160 7330f8f5e3d4061e28ec4fb28939011ae5038551 SHA1 3740ab265033d1827fd8e06eb0257b0275cd4ce4 SHA256 832239ebdef5501a8b32f3d2b2f1684c2e9c18fa6cec0370e950b20a62f07cf9
 DIST postgresql-docs-7.3.16.tar.bz2 2361886 RMD160 ae36bf748e8a8a0b4842ddab48c2d8a2471b2940 SHA1 09fdc7b582595fa7aea62e1888d64a741e2192cb SHA256 2d8cc0d745a3f8edd773a06c462f98c143388060feb1775e97ecf85bb5260b2f
+DIST postgresql-docs-7.3.18.tar.bz2 2363625 RMD160 5c95e654b7029f1d6289987ad0a08266ab6e54fa SHA1 0165ca2c16d3095fbc96a2fa5dd1800bd163071a SHA256 24f509b444dc1a9009ffdb6a8e484f038762b971cea60fb9bdc8943fd6a0fa55
 DIST postgresql-docs-7.4.13.tar.bz2 2426721 RMD160 4500c150a1638279394bf6f6882682f019ddf8ae SHA1 60c145ec822fca74cab03f3e11918df22752f899 SHA256 31d91342f23dc842839ee9f5b7475582a2e232c6831c6d514c3a414ed28ebdf8
 DIST postgresql-docs-7.4.14.tar.bz2 2427724 RMD160 dd67ae2c4552986ced80d1ba52df50a5ae63db9b SHA1 47296643429237d81a0565aac819ded106cca36b SHA256 6739dcb6876e1f76933f88feae0b7d0a5e528e9677dac4175e3223ef379ed789
 DIST postgresql-docs-8.0.8.tar.bz2 2260219 RMD160 e3dbde03b553000d5a263a93713c434e88dd4fe1 SHA1 2f845d6740c7ed88d0b9240b274a75d479658f7c SHA256 60a93ee5b2b80f517696328d85f4db24791cb1099d89a0adc375ee740201dc54
@@ -143,12 +150,14 @@ DIST postgresql-docs-8.0.9.tar.bz2 2262698 RMD160 55df79bfc347147c33db925a1138c2
 DIST postgresql-docs-8.1.5.tar.bz2 2489400 RMD160 a29a5d1738f6f776597d162d9fc6d69805c74943 SHA1 69a06691cae02ade3888c9c7f813ae5394be070a SHA256 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9
 DIST postgresql-opt-7.3.15.tar.bz2 341753 RMD160 8057276fff0ae87f49fb4853e6f3df681de405b9 SHA1 300ed5f2193367d5800c2fd1bdcab2e1764a2372 SHA256 9b513f3bdd2d63579698ecc9226866ca72fe2e13fd9f0367a07c5041dd8386f6
 DIST postgresql-opt-7.3.16.tar.bz2 341908 RMD160 00e0f059910eed3021ba5b096e86bdc6878c34d6 SHA1 aac3126d50dfb1ea23984ecdff9cc6da7605b531 SHA256 0e1ab00b1439c5930b6c74ed5c4382c01fdb54434857ac3c1599d32fcce2c8d1
+DIST postgresql-opt-7.3.18.tar.bz2 342315 RMD160 fa7cb704ff7bb131f6108217c645821413ecd5b8 SHA1 5c1a8a103d696668abae7d8931c0dd687cdb7766 SHA256 6d422a3d4d56192952c035d01aff59b90c7ab7b3cdb7f300572e40dd20db5e4b
 DIST postgresql-opt-7.4.13.tar.bz2 333860 RMD160 9fd1caacd6d842a473725450a0973173f68ae7b8 SHA1 79455e60f074a488ab3abafd10bfce4c63b33293 SHA256 8139a7161b2a55eba304b027896f0bfc81523dd41f7d1df222274b7a55e5aeab
 DIST postgresql-opt-7.4.14.tar.bz2 333417 RMD160 a6279f5b9d52f72ce786bc468c114befb5a1f29a SHA1 becc575260128261dc7f8ed46f166f54f48b8732 SHA256 e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d
 DIST postgresql-opt-8.0.8.tar.bz2 134600 RMD160 352f07aa25d0dcf1d2e3502f5cec7295c40bc3d5 SHA1 081d0b8d755a49395001b46ca0585c4e2b5ecf4f SHA256 427e82253b068b35e47235a1b78c521c89a9774b80dcc2433946f86220a34926
 DIST postgresql-opt-8.0.9.tar.bz2 134706 RMD160 be148e079c20c13aec1767180d993933b91c2116 SHA1 a1263b4ec563ec24165db4657dcc4faab567ef90 SHA256 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020
 DIST postgresql-opt-8.1.5.tar.bz2 144784 RMD160 5ac9b1ffdf1357316ceb1736f7b9be3ee339be3b SHA1 6d62463d6bcadcef1e515d740c15489ab4e428e7 SHA256 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
 DIST postgresql-test-7.3.16.tar.bz2 891104 RMD160 7510ed474d4c86610c14c232cf5be13c4ca0b32b SHA1 c79aec31949e54700c45ac436b4844bc8bf5ee4e SHA256 5844984770b326cfc62580d88f878196e304867fa339925fef20c017bb298d56
+DIST postgresql-test-7.3.18.tar.bz2 891032 RMD160 f18fa7025a37bf85936ba78f5cdbb4e26e0a9bfb SHA1 f9488d5c113083563b652e9d4d9c4f4918892aa3 SHA256 61bf71f0b09fa0a0dc667f636fe7a338f33d7b337159b16820a0a6240318a48e
 DIST postgresql-test-7.4.14.tar.bz2 902074 RMD160 c6e1f57c77815b5395882cd482ef8bc952adabbf SHA1 3b15dbebe4232f66a253ff03729ee4ec3ffbd877 SHA256 39c87c0227f8c757d29141bb8c24e2a95d3a06d9bc459667fdee4d0028d6d12d
 DIST postgresql-test-8.0.9.tar.bz2 931363 RMD160 ae38c2225daff32449ebe6b483096f2f35aa8067 SHA1 1a32090f302542daa92558a3f78129cd39782b98 SHA256 f2b81b3cf7ade17a748fa84570c295817d82fd05b53d2e0fb9d9e922b0c613ea
 DIST postgresql-test-8.1.5.tar.bz2 947271 RMD160 644b352354743eb5250bf422c62e1f2c340c1ed2 SHA1 8371da286f43e689b5bd84999185565cb7c37d19 SHA256 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166
@@ -160,6 +169,10 @@ EBUILD postgresql-7.3.16.ebuild 8009 RMD160 d45aae61fe062349255fa6724742b08e3926
 MD5 aeb0ff23710721ed5fc4fadded52b66a postgresql-7.3.16.ebuild 8009
 RMD160 d45aae61fe062349255fa6724742b08e3926be15 postgresql-7.3.16.ebuild 8009
 SHA256 6e6a63c3504ff340c188a72712d229ca1ffdd81f6f8ca00579af82501a25ca52 postgresql-7.3.16.ebuild 8009
+EBUILD postgresql-7.3.18.ebuild 8018 RMD160 a1d8cd3dfad02c9e00a2e6aba2f9c59a80fa3b98 SHA1 faa1b57a992d99e923cce4b394eb7d30dba260f8 SHA256 13f999127b1ad1e6493b675cde096107a5cc3bd6176ce849ae92f76e248433be
+MD5 f15bb5b22ed97a32f7fe96d4c2562aae postgresql-7.3.18.ebuild 8018
+RMD160 a1d8cd3dfad02c9e00a2e6aba2f9c59a80fa3b98 postgresql-7.3.18.ebuild 8018
+SHA256 13f999127b1ad1e6493b675cde096107a5cc3bd6176ce849ae92f76e248433be postgresql-7.3.18.ebuild 8018
 EBUILD postgresql-7.4.13.ebuild 10706 RMD160 b0d2ff978b1e4c1cadbd2e79c3229688bd1111e5 SHA1 a24d011c9c299c3fea73a124c6172937ba733317 SHA256 aaf22899f43a413ba55c771d6ca542986c64b0d21c3c41ac7301708156745240
 MD5 c970674fff433171fc0e2231e3be1035 postgresql-7.4.13.ebuild 10706
 RMD160 b0d2ff978b1e4c1cadbd2e79c3229688bd1111e5 postgresql-7.4.13.ebuild 10706
@@ -194,6 +207,9 @@ SHA256 a66b48d66ffd063ab443e0d2f7580fd25b357b2197da5f4f1125a503f0e073e2 files/di
 MD5 d4a43fc56d6061473457d6af8be17785 files/digest-postgresql-7.3.16 1087
 RMD160 78178ec6a10b48524e9bca46d01a17e4d8d72b51 files/digest-postgresql-7.3.16 1087
 SHA256 f7e827953703308dcf63a803c828370b879f5a7a8f8bb44ff4fbc7e663095000 files/digest-postgresql-7.3.16 1087
+MD5 aa806bfc274dd6877289ae8f0ba5f390 files/digest-postgresql-7.3.18 1087
+RMD160 f1269a2b0a808eaec3530694cf8fcc99d7dbc702 files/digest-postgresql-7.3.18 1087
+SHA256 bdb45b470c38cbd25b7c2659ac2bc3eb1d50c1856a8b1f3d7344e25d7a9be1a7 files/digest-postgresql-7.3.18 1087
 MD5 5785510b983e3724b1e7be4045bb5ef9 files/digest-postgresql-7.4.13 1063
 RMD160 cacfc7cab610de62e3ee63e3da217d54c1a7c357 files/digest-postgresql-7.4.13 1063
 SHA256 d4f40c91569847681ebd3254bf787f393f893c0e05b603d52eeb28e40d4fc2c4 files/digest-postgresql-7.4.13 1063
@@ -209,10 +225,3 @@ SHA256 54dd646bd90f8058c54f038aa030298f28ca6dd99f02203dfee80076b055debf files/di
 MD5 e4baa5814880c254728d082156c5629d files/digest-postgresql-8.1.5-r1 1075
 RMD160 f0beab2222381790f34942747b149d743b4dc992 files/digest-postgresql-8.1.5-r1 1075
 SHA256 89b2b19a00fa3f6b75aa6892b5cfe1f3cd83ec10bb32dcdaf7d8fcde4a18db1e files/digest-postgresql-8.1.5-r1 1075
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFx7s+8bi6rjpTunYRAmnkAKCRVO8iL2hFB3hgu4e0TRspcoXyCQCffbk6
-AyNsjwgWnRzc2fmVuGetfz0=
-=dUBK
------END PGP SIGNATURE-----