Cleanup.

(Portage version: 2.1.1_pre4)
 (Unsigned Manifest commit)

27 files changed, 0 insertions, 644 deletions

diff --git a/dev-db/libpq/files/digest-libpq-7.3.13 b/dev-db/libpq/files/digest-libpq-7.3.13
deleted file mode 100644
index ff4b2a59a0c4..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.3.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 458852cd6ebc5eb87ea71c73041fa4e9 postgresql-base-7.3.13.tar.bz2 5668650
diff --git a/dev-db/libpq/files/digest-libpq-7.3.14 b/dev-db/libpq/files/digest-libpq-7.3.14
deleted file mode 100644
index 3c444e3f78ad..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.3.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb925420098bd7921a8684d7f279bc97 postgresql-base-7.3.14.tar.bz2 5669000
diff --git a/dev-db/libpq/files/digest-libpq-7.4.11 b/dev-db/libpq/files/digest-libpq-7.4.11
deleted file mode 100644
index e5e0b30b4f36..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.4.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eba9721a4223c1c2fad003666c678395 postgresql-base-7.4.11.tar.bz2 6601862
diff --git a/dev-db/libpq/files/digest-libpq-7.4.12 b/dev-db/libpq/files/digest-libpq-7.4.12
deleted file mode 100644
index 07326ab6252a..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.4.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 289b9cbb231bc0adb757641edd9508a8 postgresql-base-7.4.12.tar.bz2 6601251
diff --git a/dev-db/libpq/files/digest-libpq-7.4.8 b/dev-db/libpq/files/digest-libpq-7.4.8
deleted file mode 100644
index 6c71d767adea..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c066dd74a746e15a49e0fded93a45329 postgresql-base-7.4.8.tar.bz2 6588745
diff --git a/dev-db/libpq/files/digest-libpq-7.4.8-r1 b/dev-db/libpq/files/digest-libpq-7.4.8-r1
deleted file mode 100644
index 6c71d767adea..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.4.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c066dd74a746e15a49e0fded93a45329 postgresql-base-7.4.8.tar.bz2 6588745
diff --git a/dev-db/libpq/files/digest-libpq-7.4.9 b/dev-db/libpq/files/digest-libpq-7.4.9
deleted file mode 100644
index 2cdf3e0eef27..000000000000
--- a/dev-db/libpq/files/digest-libpq-7.4.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 174761481d118d89f198d36afd1ca27d postgresql-base-7.4.9.tar.bz2 6601210
diff --git a/dev-db/libpq/files/digest-libpq-8.0.3 b/dev-db/libpq/files/digest-libpq-8.0.3
deleted file mode 100644
index 7fab68cb90d0..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 7fab68cb90d0..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 71b3ea1eb03d..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-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.6 b/dev-db/libpq/files/digest-libpq-8.0.6
deleted file mode 100644
index d76780488678..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 106faa96ca820ca7fb55936db394996b postgresql-base-8.0.6.tar.bz2 7825582
diff --git a/dev-db/libpq/files/digest-libpq-8.0.7 b/dev-db/libpq/files/digest-libpq-8.0.7
deleted file mode 100644
index ce3d15417ef7..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8d15064ffa1da6ee6629a444f782c7dd postgresql-base-8.0.7.tar.bz2 7824746
-RMD160 566afde711f5b1b4ed45533680575954e338fe2f postgresql-base-8.0.7.tar.bz2 7824746
-SHA256 638c303d0b18cd37d41971fd79581c01e59f9aa200836e50dfce288139ced7ee postgresql-base-8.0.7.tar.bz2 7824746
diff --git a/dev-db/libpq/files/digest-libpq-8.1.2 b/dev-db/libpq/files/digest-libpq-8.1.2
deleted file mode 100644
index 0804620696f5..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 8d3210ac005c..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-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.3-r1 b/dev-db/libpq/files/digest-libpq-8.1.3-r1
deleted file mode 100644
index decbb822d77b..000000000000
--- a/dev-db/libpq/files/digest-libpq-8.1.3-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-MD5 ad1dd1d66c9c608180418375e36aafcb postgresql-opt-8.1.3.tar.bz2 144608
-RMD160 0427f3b851c3bbaff53699baa0ebdf0c610303cf postgresql-opt-8.1.3.tar.bz2 144608
-SHA256 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525 postgresql-opt-8.1.3.tar.bz2 144608
diff --git a/dev-db/libpq/files/libpq-7.3.13-gentoo.patch b/dev-db/libpq/files/libpq-7.3.13-gentoo.patch
deleted file mode 100644
index b22514e42477..000000000000
--- a/dev-db/libpq/files/libpq-7.3.13-gentoo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naru postgresql-7.3.13.org/src/interfaces/libpq/Makefile postgresql-7.3.13/src/interfaces/libpq/Makefile
---- postgresql-7.3.13.org/src/interfaces/libpq/Makefile	2002-12-13 22:18:22.000000000 +0000
-+++ postgresql-7.3.13/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.13.org/src/interfaces/libpq/nls.mk postgresql-7.3.13/src/interfaces/libpq/nls.mk
---- postgresql-7.3.13.org/src/interfaces/libpq/nls.mk	2002-09-22 21:57:21.000000000 +0100
-+++ postgresql-7.3.13/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.13.org/src/Makefile.shlib postgresql-7.3.13/src/Makefile.shlib
---- postgresql-7.3.13.org/src/Makefile.shlib	2003-01-11 17:22:34.000000000 +0000
-+++ postgresql-7.3.13/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.3.14-gentoo.patch b/dev-db/libpq/files/libpq-7.3.14-gentoo.patch
deleted file mode 100644
index 017dc522a1c5..000000000000
--- a/dev-db/libpq/files/libpq-7.3.14-gentoo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naru postgresql-7.3.14.org/src/interfaces/libpq/Makefile postgresql-7.3.14/src/interfaces/libpq/Makefile
---- postgresql-7.3.14.org/src/interfaces/libpq/Makefile	2002-12-13 22:18:22.000000000 +0000
-+++ postgresql-7.3.14/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.14.org/src/interfaces/libpq/nls.mk postgresql-7.3.14/src/interfaces/libpq/nls.mk
---- postgresql-7.3.14.org/src/interfaces/libpq/nls.mk	2002-09-22 21:57:21.000000000 +0100
-+++ postgresql-7.3.14/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.14.org/src/Makefile.shlib postgresql-7.3.14/src/Makefile.shlib
---- postgresql-7.3.14.org/src/Makefile.shlib	2003-01-11 17:22:34.000000000 +0000
-+++ postgresql-7.3.14/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.11-gentoo.patch b/dev-db/libpq/files/libpq-7.4.11-gentoo.patch
deleted file mode 100644
index 88002bfbc1c7..000000000000
--- a/dev-db/libpq/files/libpq-7.4.11-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naru postgresql-7.4.11.org/src/interfaces/libpq/Makefile postgresql-7.4.11/src/interfaces/libpq/Makefile
---- postgresql-7.4.11.org/src/interfaces/libpq/Makefile	2003-09-27 16:32:48.000000000 +0100
-+++ postgresql-7.4.11/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.11.org/src/interfaces/libpq/nls.mk postgresql-7.4.11/src/interfaces/libpq/nls.mk
---- postgresql-7.4.11.org/src/interfaces/libpq/nls.mk	2004-10-30 09:22:16.000000000 +0100
-+++ postgresql-7.4.11/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.11.org/src/Makefile.shlib postgresql-7.4.11/src/Makefile.shlib
---- postgresql-7.4.11.org/src/Makefile.shlib	2003-10-20 02:34:33.000000000 +0100
-+++ postgresql-7.4.11/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-7.4.12-gentoo.patch b/dev-db/libpq/files/libpq-7.4.12-gentoo.patch
deleted file mode 100644
index 1af40d7077c7..000000000000
--- a/dev-db/libpq/files/libpq-7.4.12-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naru postgresql-7.4.12.org/src/interfaces/libpq/Makefile postgresql-7.4.12/src/interfaces/libpq/Makefile
---- postgresql-7.4.12.org/src/interfaces/libpq/Makefile	2003-09-27 16:32:48.000000000 +0100
-+++ postgresql-7.4.12/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.12.org/src/interfaces/libpq/nls.mk postgresql-7.4.12/src/interfaces/libpq/nls.mk
---- postgresql-7.4.12.org/src/interfaces/libpq/nls.mk	2004-10-30 09:22:16.000000000 +0100
-+++ postgresql-7.4.12/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.12.org/src/Makefile.shlib postgresql-7.4.12/src/Makefile.shlib
---- postgresql-7.4.12.org/src/Makefile.shlib	2003-10-20 02:34:33.000000000 +0100
-+++ postgresql-7.4.12/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-7.4.8-gentoo.patch b/dev-db/libpq/files/libpq-7.4.8-gentoo.patch
deleted file mode 100644
index 33271ff29d49..000000000000
--- a/dev-db/libpq/files/libpq-7.4.8-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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-7.4.9-gentoo.patch b/dev-db/libpq/files/libpq-7.4.9-gentoo.patch
deleted file mode 100644
index 1020cffea6ad..000000000000
--- a/dev-db/libpq/files/libpq-7.4.9-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Naru postgresql-7.4.9.org/src/interfaces/libpq/Makefile postgresql-7.4.9/src/interfaces/libpq/Makefile
---- postgresql-7.4.9.org/src/interfaces/libpq/Makefile	2003-09-27 16:32:48.000000000 +0100
-+++ postgresql-7.4.9/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.9.org/src/interfaces/libpq/nls.mk postgresql-7.4.9/src/interfaces/libpq/nls.mk
---- postgresql-7.4.9.org/src/interfaces/libpq/nls.mk	2004-10-30 09:22:16.000000000 +0100
-+++ postgresql-7.4.9/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.9.org/src/Makefile.shlib postgresql-7.4.9/src/Makefile.shlib
---- postgresql-7.4.9.org/src/Makefile.shlib	2003-10-20 02:34:33.000000000 +0100
-+++ postgresql-7.4.9/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-8.0.3-gentoo.patch b/dev-db/libpq/files/libpq-8.0.3-gentoo.patch
deleted file mode 100644
index fbc3de21c2b7..000000000000
--- a/dev-db/libpq/files/libpq-8.0.3-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur postgresql-8.0.3.orig/src/Makefile.shlib postgresql-8.0.3/src/Makefile.shlib
---- postgresql-8.0.3.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
-+++ postgresql-8.0.3/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.3.orig/src/interfaces/libpq/Makefile postgresql-8.0.3/src/interfaces/libpq/Makefile
---- postgresql-8.0.3.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
-+++ postgresql-8.0.3/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
-@@ -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 -Naur postgresql-8.0.3.orig/src/interfaces/libpq/nls.mk postgresql-8.0.3/src/interfaces/libpq/nls.mk
---- postgresql-8.0.3.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
-+++ postgresql-8.0.3/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
-+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 --git a/dev-db/libpq/files/libpq-8.0.4-gentoo.patch b/dev-db/libpq/files/libpq-8.0.4-gentoo.patch
deleted file mode 100644
index 27b83ae65494..000000000000
--- a/dev-db/libpq/files/libpq-8.0.4-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur postgresql-8.0.4.orig/src/Makefile.shlib postgresql-8.0.4/src/Makefile.shlib
---- postgresql-8.0.4.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
-+++ postgresql-8.0.4/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.4.orig/src/interfaces/libpq/Makefile postgresql-8.0.4/src/interfaces/libpq/Makefile
---- postgresql-8.0.4.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
-+++ postgresql-8.0.4/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
-@@ -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 -Naur postgresql-8.0.4.orig/src/interfaces/libpq/nls.mk postgresql-8.0.4/src/interfaces/libpq/nls.mk
---- postgresql-8.0.4.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
-+++ postgresql-8.0.4/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
-+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 --git a/dev-db/libpq/files/libpq-8.0.6-gentoo.patch b/dev-db/libpq/files/libpq-8.0.6-gentoo.patch
deleted file mode 100644
index 14bd848695a7..000000000000
--- a/dev-db/libpq/files/libpq-8.0.6-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur postgresql-8.0.6.orig/src/Makefile.shlib postgresql-8.0.6/src/Makefile.shlib
---- postgresql-8.0.6.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
-+++ postgresql-8.0.6/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.6.orig/src/interfaces/libpq/Makefile postgresql-8.0.6/src/interfaces/libpq/Makefile
---- postgresql-8.0.6.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
-+++ postgresql-8.0.6/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
-@@ -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 -Naur postgresql-8.0.6.orig/src/interfaces/libpq/nls.mk postgresql-8.0.6/src/interfaces/libpq/nls.mk
---- postgresql-8.0.6.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
-+++ postgresql-8.0.6/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
-+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 --git a/dev-db/libpq/files/libpq-8.0.7-gentoo.patch b/dev-db/libpq/files/libpq-8.0.7-gentoo.patch
deleted file mode 100644
index 3304772ae629..000000000000
--- a/dev-db/libpq/files/libpq-8.0.7-gentoo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur postgresql-8.0.7.orig/src/Makefile.shlib postgresql-8.0.7/src/Makefile.shlib
---- postgresql-8.0.7.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
-+++ postgresql-8.0.7/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.7.orig/src/interfaces/libpq/Makefile postgresql-8.0.7/src/interfaces/libpq/Makefile
---- postgresql-8.0.7.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
-+++ postgresql-8.0.7/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
-@@ -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 -Naur postgresql-8.0.7.orig/src/interfaces/libpq/nls.mk postgresql-8.0.7/src/interfaces/libpq/nls.mk
---- postgresql-8.0.7.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
-+++ postgresql-8.0.7/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
-+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 --git a/dev-db/libpq/files/libpq-8.1.2-gentoo.patch b/dev-db/libpq/files/libpq-8.1.2-gentoo.patch
deleted file mode 100644
index c859debb7907..000000000000
--- a/dev-db/libpq/files/libpq-8.1.2-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naru postgresql-8.1.2.org/src/Makefile.shlib postgresql-8.1.2/src/Makefile.shlib
---- postgresql-8.1.2.org/src/Makefile.shlib	2005-11-12 20:26:09.000000000 +0000
-+++ postgresql-8.1.2/src/Makefile.shlib	2005-11-12 20:28:28.000000000 +0000
-@@ -363,10 +363,10 @@
- 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
-+	ranlib lib$(NAME_STATIC_LIB).a
- endif
- 
- ifeq ($(enable_shared), yes)
-diff -Naru postgresql-8.1.2.org/src/interfaces/libpq/Makefile postgresql-8.1.2/src/interfaces/libpq/Makefile
---- postgresql-8.1.2.org/src/interfaces/libpq/Makefile	2005-11-12 20:26:09.000000000 +0000
-+++ postgresql-8.1.2/src/interfaces/libpq/Makefile	2005-11-12 20:28:02.000000000 +0000
-@@ -20,6 +20,8 @@
- SO_MINOR_VERSION= 1
- DLTYPE= library
- 
-+NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
-+
- override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
- ifneq ($(PORTNAME), win32)
- override CFLAGS += $(PTHREAD_CFLAGS)
-@@ -135,7 +137,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.1.2.org/src/interfaces/libpq/nls.mk postgresql-8.1.2/src/interfaces/libpq/nls.mk
---- postgresql-8.1.2.org/src/interfaces/libpq/nls.mk	2005-11-12 20:26:09.000000000 +0000
-+++ postgresql-8.1.2/src/interfaces/libpq/nls.mk	2005-11-12 20:28:02.000000000 +0000
-@@ -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 --git a/dev-db/libpq/files/libpq-8.1.3-gentoo.patch b/dev-db/libpq/files/libpq-8.1.3-gentoo.patch
deleted file mode 100644
index 2eff3bb4a535..000000000000
--- a/dev-db/libpq/files/libpq-8.1.3-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naru postgresql-8.1.3.org/src/Makefile.shlib postgresql-8.1.3/src/Makefile.shlib
---- postgresql-8.1.3.org/src/Makefile.shlib	2005-11-12 20:26:09.000000000 +0000
-+++ postgresql-8.1.3/src/Makefile.shlib	2005-11-12 20:28:28.000000000 +0000
-@@ -363,10 +363,10 @@
- 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
-+	ranlib lib$(NAME_STATIC_LIB).a
- endif
- 
- ifeq ($(enable_shared), yes)
-diff -Naru postgresql-8.1.3.org/src/interfaces/libpq/Makefile postgresql-8.1.3/src/interfaces/libpq/Makefile
---- postgresql-8.1.3.org/src/interfaces/libpq/Makefile	2005-11-12 20:26:09.000000000 +0000
-+++ postgresql-8.1.3/src/interfaces/libpq/Makefile	2005-11-12 20:28:02.000000000 +0000
-@@ -20,6 +20,8 @@
- SO_MINOR_VERSION= 1
- DLTYPE= library
- 
-+NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
-+
- override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
- ifneq ($(PORTNAME), win32)
- override CFLAGS += $(PTHREAD_CFLAGS)
-@@ -135,7 +137,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.1.3.org/src/interfaces/libpq/nls.mk postgresql-8.1.3/src/interfaces/libpq/nls.mk
---- postgresql-8.1.3.org/src/interfaces/libpq/nls.mk	2005-11-12 20:26:09.000000000 +0000
-+++ postgresql-8.1.3/src/interfaces/libpq/nls.mk	2005-11-12 20:28:02.000000000 +0000
-@@ -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