changed package names.

Package-Manager: portage-2.0.51.21-r1

13 files changed, 297 insertions, 99 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index a348c45e7bbc..1f33cd58fdb5 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.4 2005/05/15 04:36:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.5 2005/05/16 03:49:32 nakano Exp $
+
+*libpq-8.0.1 (16 May 2005)
+*libpq-7.4.8 (16 May 2005)
+*libpq-7.3.10 (16 May 2005)
+
+  16 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/libpq-3.2-gentoo.patch, -files/libpq-4.0-gentoo.patch,
+  +files/libpq-7.3.10-gentoo.patch, +files/libpq-7.4.8-gentoo.patch,
+  +files/libpq-8.0.1-gentoo.patch, -libpq-3.2.ebuild, -libpq-4.0.ebuild,
+  +libpq-7.3.10.ebuild, +libpq-7.4.8.ebuild, +libpq-8.0.1.ebuild:
+  Changed pacakge name to PostgreSQL version base.
 
 *libpq-8.0.3 (15 May 2005)
 
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index c2d53062559c..06ef3ee8b3c8 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -1,11 +1,14 @@
-MD5 e8990a5be7de6a0bc73ff6ec53d869c4 libpq-3.2.ebuild 2867
-MD5 17574c69b3319df0f21ab1789cfdaca4 libpq-4.0.ebuild 2867
+MD5 6594394ef6b4474484e98a4161d00e51 libpq-8.0.1.ebuild 2928
+MD5 4a15525091e5e1c97843a6c1cf7a6eb1 libpq-7.4.8.ebuild 2928
 MD5 3212a26cb1e44ed9ced24cfee120c9ec libpq-8.0.3.ebuild 2928
-MD5 062f2a4864d4b4ed033275f9ead44a14 ChangeLog 840
+MD5 e4456386440ef5a725d7a94ec7617b80 ChangeLog 1298
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 274ce66e652b5474809116aabf02decd libpq-7.3.10.ebuild 2929
+MD5 582e557cd0b0ea25adf5798062de0f76 files/digest-libpq-7.4.8 75
+MD5 0540e6c42fdd652b981e236ea835c524 files/digest-libpq-8.0.1 75
 MD5 b8a68c8f7fbe4116f7d39a520a3da8c9 files/digest-libpq-8.0.3 75
-MD5 637716f510743dd4c21c51980eb76659 files/libpq-3.2-gentoo.patch 2300
+MD5 c13a1529ee010043fea810640fd7b1f3 files/libpq-7.3.10-gentoo.patch 2098
+MD5 a29e8334813c549e8d3d7bcc2e364a66 files/libpq-8.0.1-gentoo.patch 2306
 MD5 91bb6f54ae3772de8b4b98ef69b79f95 files/libpq-8.0.3-gentoo.patch 2306
-MD5 5f9040f91914a9aba8ebee9bff295909 files/libpq-4.0-gentoo.patch 2300
-MD5 0540e6c42fdd652b981e236ea835c524 files/digest-libpq-3.2 75
-MD5 ed4897962e8062c29d0a6a2256597034 files/digest-libpq-4.0 75
+MD5 f7905db93301407b9caf37581e270d1f files/digest-libpq-7.3.10 76
+MD5 6442f1fc55758ba5de19a0da94e24bbd files/libpq-7.4.8-gentoo.patch 2619
diff --git a/dev-db/libpq/files/digest-libpq-4.0 b/dev-db/libpq/files/digest-libpq-4.0
deleted file mode 100644
index 62297c01d688..000000000000
--- a/dev-db/libpq/files/digest-libpq-4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39ef5bfca3d573b356c755b5429aea8b postgresql-base-8.0.2.tar.bz2 7806083
diff --git a/dev-db/libpq/files/digest-libpq-7.3.10 b/dev-db/libpq/files/digest-libpq-7.3.10
new file mode 100644
index 000000000000..621556a019be
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.3.10
@@ -0,0 +1 @@
+MD5 d0c5131bad7330b35a0168f871a87711 postgresql-base-7.3.10.tar.bz2 5645041
diff --git a/dev-db/libpq/files/digest-libpq-7.4.8 b/dev-db/libpq/files/digest-libpq-7.4.8
new file mode 100644
index 000000000000..6c71d767adea
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.4.8
@@ -0,0 +1 @@
+MD5 c066dd74a746e15a49e0fded93a45329 postgresql-base-7.4.8.tar.bz2 6588745
diff --git a/dev-db/libpq/files/digest-libpq-3.2 b/dev-db/libpq/files/digest-libpq-8.0.1
index 175762bb8eb2..175762bb8eb2 100644
--- a/dev-db/libpq/files/digest-libpq-3.2
+++ b/dev-db/libpq/files/digest-libpq-8.0.1
diff --git a/dev-db/libpq/files/libpq-4.0-gentoo.patch b/dev-db/libpq/files/libpq-4.0-gentoo.patch
deleted file mode 100644
index 88f97d5d16fa..000000000000
--- a/dev-db/libpq/files/libpq-4.0-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naru postgresql-8.0.2.org/src/interfaces/libpq/Makefile postgresql-8.0.2/src/interfaces/libpq/Makefile
---- postgresql-8.0.2.org/src/interfaces/libpq/Makefile	2005-03-25 00:35:19.000000000 +0000
-+++ postgresql-8.0.2/src/interfaces/libpq/Makefile	2005-05-04 10:26:38.000000000 +0100
-@@ -20,6 +20,8 @@
- SO_MINOR_VERSION= 0
- DLTYPE= library
- 
-+NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
-+
- override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
- override CFLAGS += $(PTHREAD_CFLAGS)
- 
-@@ -136,7 +138,7 @@
- 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
- 	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
- 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
--	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
-+	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-${SO_MAJOR_VERSION}.conf.sample
- 
- installdirs:
- 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
-diff -Naru postgresql-8.0.2.org/src/interfaces/libpq/nls.mk postgresql-8.0.2/src/interfaces/libpq/nls.mk
---- postgresql-8.0.2.org/src/interfaces/libpq/nls.mk	2005-01-14 08:57:06.000000000 +0000
-+++ postgresql-8.0.2/src/interfaces/libpq/nls.mk	2005-05-04 10:57:47.000000000 +0100
-@@ -1,5 +1,5 @@
- # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
--CATALOG_NAME	:= libpq
-+CATALOG_NAME	:= libpq-4
- AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
- GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
- GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
-diff -Naru postgresql-8.0.2.org/src/Makefile.shlib postgresql-8.0.2/src/Makefile.shlib
---- postgresql-8.0.2.org/src/Makefile.shlib	2004-11-20 21:13:04.000000000 +0000
-+++ postgresql-8.0.2/src/Makefile.shlib	2005-05-04 10:27:51.000000000 +0100
-@@ -355,7 +355,7 @@
- install-lib: install-lib-static install-lib-shared
- 
- install-lib-static: lib$(NAME).a
--	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
-+	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
- ifeq ($(PORTNAME), darwin)
- 	cd $(DESTDIR)$(libdir) && \
- 	ranlib lib$(NAME).a
diff --git a/dev-db/libpq/files/libpq-7.3.10-gentoo.patch b/dev-db/libpq/files/libpq-7.3.10-gentoo.patch
new file mode 100644
index 000000000000..44863455e070
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.3.10-gentoo.patch
@@ -0,0 +1,53 @@
+diff -Naru postgresql-7.3.10.org/src/interfaces/libpq/Makefile postgresql-7.3.10/src/interfaces/libpq/Makefile
+--- postgresql-7.3.10.org/src/interfaces/libpq/Makefile	2002-12-13 22:18:22.000000000 +0000
++++ postgresql-7.3.10/src/interfaces/libpq/Makefile	2005-05-16 04:12:52.000000000 +0100
+@@ -17,6 +17,7 @@
+ NAME= pq
+ SO_MAJOR_VERSION= 3
+ SO_MINOR_VERSION= 0
++NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
+ 
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+diff -Naru postgresql-7.3.10.org/src/interfaces/libpq/nls.mk postgresql-7.3.10/src/interfaces/libpq/nls.mk
+--- postgresql-7.3.10.org/src/interfaces/libpq/nls.mk	2002-09-22 21:57:21.000000000 +0100
++++ postgresql-7.3.10/src/interfaces/libpq/nls.mk	2005-05-16 04:13:08.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 -Naru postgresql-7.3.10.org/src/Makefile.shlib postgresql-7.3.10/src/Makefile.shlib
+--- postgresql-7.3.10.org/src/Makefile.shlib	2003-01-11 17:22:34.000000000 +0000
++++ postgresql-7.3.10/src/Makefile.shlib	2005-05-16 04:25:54.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/files/libpq-7.4.8-gentoo.patch b/dev-db/libpq/files/libpq-7.4.8-gentoo.patch
new file mode 100644
index 000000000000..33271ff29d49
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.4.8-gentoo.patch
@@ -0,0 +1,60 @@
+diff -Naru postgresql-7.4.8.org/src/interfaces/libpq/Makefile postgresql-7.4.8/src/interfaces/libpq/Makefile
+--- postgresql-7.4.8.org/src/interfaces/libpq/Makefile	2003-09-27 16:32:48.000000000 +0100
++++ postgresql-7.4.8/src/interfaces/libpq/Makefile	2005-05-16 04:37:16.000000000 +0100
+@@ -17,6 +17,7 @@
+ NAME= pq
+ SO_MAJOR_VERSION= 3
+ SO_MINOR_VERSION= 1
++NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
+ 
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+@@ -66,7 +67,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
+ 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
+-	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
++	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-${SO_MAJOR_VERSION}.conf.sample
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
+diff -Naru postgresql-7.4.8.org/src/interfaces/libpq/nls.mk postgresql-7.4.8/src/interfaces/libpq/nls.mk
+--- postgresql-7.4.8.org/src/interfaces/libpq/nls.mk	2004-10-30 09:22:16.000000000 +0100
++++ postgresql-7.4.8/src/interfaces/libpq/nls.mk	2005-05-16 04:37:23.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.13.2.1 2004/10/30 08:22:16 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-3
+ AVAIL_LANGUAGES	:= cs de es fr hr it nb pt_BR ru sl sv tr 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 pqInternalNotice:2
+diff -Naru postgresql-7.4.8.org/src/Makefile.shlib postgresql-7.4.8/src/Makefile.shlib
+--- postgresql-7.4.8.org/src/Makefile.shlib	2003-10-20 02:34:33.000000000 +0100
++++ postgresql-7.4.8/src/Makefile.shlib	2005-05-16 04:36:25.000000000 +0100
+@@ -224,7 +224,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)
+ 
+@@ -234,7 +234,7 @@
+ MK_NO_LORDER := true
+ endif
+ 
+-lib$(NAME).a: $(OBJS)
++lib$(NAME_STATIC_LIB).a: $(OBJS)
+ ifdef MK_NO_LORDER
+ 	$(LINK.static) $@ $^
+ else
+@@ -305,7 +305,7 @@
+ .PHONY: install-lib install-lib-static install-lib-shared
+ install-lib: install-lib-static install-lib-shared
+ 
+-install-lib-static: lib$(NAME).a
++install-lib-static: lib$(NAME_STATIC_LIB).a
+ 	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
+ ifeq ($(PORTNAME), darwin)
+ 	cd $(DESTDIR)$(libdir) && \
diff --git a/dev-db/libpq/files/libpq-3.2-gentoo.patch b/dev-db/libpq/files/libpq-8.0.1-gentoo.patch
index cff0aa8e4049..0ffcbc80b75e 100644
--- a/dev-db/libpq/files/libpq-3.2-gentoo.patch
+++ b/dev-db/libpq/files/libpq-8.0.1-gentoo.patch
@@ -1,6 +1,18 @@
-diff -Naru postgresql-8.0.1.org/src/interfaces/libpq/Makefile postgresql-8.0.1/src/interfaces/libpq/Makefile
---- postgresql-8.0.1.org/src/interfaces/libpq/Makefile	2005-03-25 00:35:19.000000000 +0000
-+++ postgresql-8.0.1/src/interfaces/libpq/Makefile	2005-05-04 10:26:38.000000000 +0100
+diff -Naur postgresql-8.0.1.orig/src/Makefile.shlib postgresql-8.0.1/src/Makefile.shlib
+--- postgresql-8.0.1.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
++++ postgresql-8.0.1/src/Makefile.shlib	2005-05-15 13:30:59.000000000 +0900
+@@ -355,7 +355,7 @@
+ install-lib: install-lib-static install-lib-shared
+ 
+ install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ ifeq ($(PORTNAME), darwin)
+ 	cd $(DESTDIR)$(libdir) && \
+ 	ranlib lib$(NAME).a
+diff -Naur postgresql-8.0.1.orig/src/interfaces/libpq/Makefile postgresql-8.0.1/src/interfaces/libpq/Makefile
+--- postgresql-8.0.1.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
++++ postgresql-8.0.1/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
 @@ -20,6 +20,8 @@
  SO_MINOR_VERSION= 0
  DLTYPE= library
@@ -19,9 +31,9 @@ diff -Naru postgresql-8.0.1.org/src/interfaces/libpq/Makefile postgresql-8.0.1/s
  
  installdirs:
  	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
-diff -Naru postgresql-8.0.1.org/src/interfaces/libpq/nls.mk postgresql-8.0.1/src/interfaces/libpq/nls.mk
---- postgresql-8.0.1.org/src/interfaces/libpq/nls.mk	2005-01-14 08:57:06.000000000 +0000
-+++ postgresql-8.0.1/src/interfaces/libpq/nls.mk	2005-05-04 10:57:47.000000000 +0100
+diff -Naur postgresql-8.0.1.orig/src/interfaces/libpq/nls.mk postgresql-8.0.1/src/interfaces/libpq/nls.mk
+--- postgresql-8.0.1.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
++++ postgresql-8.0.1/src/interfaces/libpq/nls.mk	2005-05-15 13:30:32.000000000 +0900
 @@ -1,5 +1,5 @@
  # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
 -CATALOG_NAME	:= libpq
@@ -29,15 +41,3 @@ diff -Naru postgresql-8.0.1.org/src/interfaces/libpq/nls.mk postgresql-8.0.1/src
  AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
  GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
  GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
-diff -Naru postgresql-8.0.1.org/src/Makefile.shlib postgresql-8.0.1/src/Makefile.shlib
---- postgresql-8.0.1.org/src/Makefile.shlib	2004-11-20 21:13:04.000000000 +0000
-+++ postgresql-8.0.1/src/Makefile.shlib	2005-05-04 10:27:51.000000000 +0100
-@@ -355,7 +355,7 @@
- install-lib: install-lib-static install-lib-shared
- 
- install-lib-static: lib$(NAME).a
--	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
-+	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
- ifeq ($(PORTNAME), darwin)
- 	cd $(DESTDIR)$(libdir) && \
- 	ranlib lib$(NAME).a
diff --git a/dev-db/libpq/libpq-7.3.10.ebuild b/dev-db/libpq/libpq-7.3.10.ebuild
new file mode 100644
index 000000000000..dc648bb8c559
--- /dev/null
+++ b/dev-db/libpq/libpq-7.3.10.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.10.ebuild,v 1.1 2005/05/16 03:49:32 nakano 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="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+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"
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-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 \
+		--with-gnu-ld \
+		$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}/$(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-3.2.ebuild b/dev-db/libpq/libpq-7.4.8.ebuild
index a9d4b85378ed..3e8f4c9f3d50 100644
--- a/dev-db/libpq/libpq-3.2.ebuild
+++ b/dev-db/libpq/libpq-7.4.8.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-3.2.ebuild,v 1.3 2005/05/09 21:38:07 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.8.ebuild,v 1.1 2005/05/16 03:49:32 nakano Exp $
 
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
 DESCRIPTION="Libraries of postgresql"
 HOMEPAGE="http://www.postgresql.org/"
-MY_PV=${PV/_/}
-POSTGRESQL_VER="8.0.1"
-MY_P="postgresql"-${POSTGRESQL_VER}
-SRC_URI="mirror://postgresql/source/v${POSTGRESQL_VER}/postgresql-base-${POSTGRESQL_VER}.tar.bz2"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="3"
@@ -32,6 +30,7 @@ RDEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	kerberos? ( virtual/krb5 )"
 
+MAKEOPTS="${MAKEOPTS} -j1"
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -67,12 +66,12 @@ src_compile() {
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
-	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 }
 
 src_install() {
 	cd ${S}/src/interfaces/libpq
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
 
 	cd ${S}/src/include
 	make DESTDIR=${D} install || die
@@ -80,19 +79,25 @@ src_install() {
 	cd ${S}
 	dodoc README HISTORY COPYRIGHT INSTALL
 
-	dosym /usr/lib/libpq-${SLOT}.a /usr/lib/libpq.a
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
 
-	ln -s ${D}/usr/include/postgresql/libpq-${SLOT}/*.h ${D}/usr/include/
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	do
+		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
+	done
 
 	dodir /usr/include/libpq
-	ln -s ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h ${D}/usr/include/libpq
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	do
+		dosym ../postgresql/libpq-${SLOT}/$(basename $f) /usr/include/libpq/
+	done
 
 	cd ${D}/usr/include/postgresql/libpq-${SLOT}
-	for f in $(find . -name '*.h' -print) ; do
+	for f in $(find * -name '*.h' -print) ; do
 		destdir=$(dirname $f)
 		if [ ! -d "${D}/usr/include/postgresql/${destdir}" ]; then
-			mkdir -p ${D}/usr/include/postgresql/${destdir}
+			dodir /usr/include/postgresql/${destdir}
 		fi
-		ln -s ${D}/usr/include/postgresql/libpq-${SLOT}/${f} ${D}/usr/include/postgresql/${destdir}/
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} /usr/include/postgresql/${destdir}/
 	done
 }
diff --git a/dev-db/libpq/libpq-4.0.ebuild b/dev-db/libpq/libpq-8.0.1.ebuild
index c43c6db6a8b4..d4a1f1faeb1e 100644
--- a/dev-db/libpq/libpq-4.0.ebuild
+++ b/dev-db/libpq/libpq-8.0.1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-4.0.ebuild,v 1.3 2005/05/09 21:38:07 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.1.ebuild,v 1.1 2005/05/16 03:49:32 nakano Exp $
 
-inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
 DESCRIPTION="Libraries of postgresql"
 HOMEPAGE="http://www.postgresql.org/"
-MY_PV=${PV/_/}
-POSTGRESQL_VER="8.0.2"
-MY_P="postgresql"-${POSTGRESQL_VER}
-SRC_URI="mirror://postgresql/source/v${POSTGRESQL_VER}/postgresql-base-${POSTGRESQL_VER}.tar.bz2"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
-SLOT="4"
+SLOT="3"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
@@ -32,6 +30,7 @@ RDEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	kerberos? ( virtual/krb5 )"
 
+MAKEOPTS="${MAKEOPTS} -j1"
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -67,12 +66,12 @@ src_compile() {
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
-	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
+	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 }
 
 src_install() {
 	cd ${S}/src/interfaces/libpq
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
 
 	cd ${S}/src/include
 	make DESTDIR=${D} install || die
@@ -80,19 +79,25 @@ src_install() {
 	cd ${S}
 	dodoc README HISTORY COPYRIGHT INSTALL
 
-	dosym /usr/lib/libpq-${SLOT}.a /usr/lib/libpq.a
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
 
-	ln -s ${D}/usr/include/postgresql/libpq-${SLOT}/*.h ${D}/usr/include/
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	do
+		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
+	done
 
 	dodir /usr/include/libpq
-	ln -s ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h ${D}/usr/include/libpq
+	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	do
+		dosym ../postgresql/libpq-${SLOT}/$(basename $f) /usr/include/libpq/
+	done
 
 	cd ${D}/usr/include/postgresql/libpq-${SLOT}
-	for f in $(find . -name '*.h' -print) ; do
+	for f in $(find * -name '*.h' -print) ; do
 		destdir=$(dirname $f)
 		if [ ! -d "${D}/usr/include/postgresql/${destdir}" ]; then
-			mkdir -p ${D}/usr/include/postgresql/${destdir}
+			dodir /usr/include/postgresql/${destdir}
 		fi
-		ln -s ${D}/usr/include/postgresql/libpq-${SLOT}/${f} ${D}/usr/include/postgresql/${destdir}/
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} /usr/include/postgresql/${destdir}/
 	done
 }