Remove patches to fix them.

3 files changed, 12 insertions, 125 deletions

diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index bbdc7a643a1d..57e60138ea79 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -2,14 +2,14 @@ AUX libpq-7.3.11-gentoo.patch 2072 RMD160 e34fbf6936a86883a4829205cb714c3daff46e
 MD5 7a29dc98f91e9ea7ee656e96625b0184 files/libpq-7.3.11-gentoo.patch 2072
 RMD160 e34fbf6936a86883a4829205cb714c3daff46ed5 files/libpq-7.3.11-gentoo.patch 2072
 SHA256 a4945fc21dc33bd42a01570c0839705d40231181a16daeda40fabb059e448ecc files/libpq-7.3.11-gentoo.patch 2072
-AUX libpq-7.3.15-gentoo.patch 2098 RMD160 ffa3d0eb09e8141e6c27f23f0136e047fca55c94 SHA1 6124d547b0f419a6b5ef5d4fb115e4e1c34c1098 SHA256 1a22d0b374bc0452adc8bf09cfba90da2aafab0cd65f3cbcf68739c28cad945c
-MD5 b2c59f22e81fa021655714daf8f61020 files/libpq-7.3.15-gentoo.patch 2098
-RMD160 ffa3d0eb09e8141e6c27f23f0136e047fca55c94 files/libpq-7.3.15-gentoo.patch 2098
-SHA256 1a22d0b374bc0452adc8bf09cfba90da2aafab0cd65f3cbcf68739c28cad945c files/libpq-7.3.15-gentoo.patch 2098
-AUX libpq-7.4.13-gentoo.patch 2632 RMD160 bc6152a80807dfe03d4c333bdb9e84376f052645 SHA1 183e1deaf49e670e8260fef20513a5b57c2b9c6b SHA256 5ce6d096a2ca837c2932c4dd69556f3141b2efc54993477288cabbe12474ca60
-MD5 0e956334090e6ca0d26ec3f5c9e8661c files/libpq-7.4.13-gentoo.patch 2632
-RMD160 bc6152a80807dfe03d4c333bdb9e84376f052645 files/libpq-7.4.13-gentoo.patch 2632
-SHA256 5ce6d096a2ca837c2932c4dd69556f3141b2efc54993477288cabbe12474ca60 files/libpq-7.4.13-gentoo.patch 2632
+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
+SHA256 60236cf5e6e3cd71ce3dd9a3a8980411bf59e417bb5a81def08163afbdce19db files/libpq-7.3.15-gentoo.patch 2072
+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
+SHA256 219f59d3be934576c5d55cb824aae390b740110f838ad092743fbecca3abdad9 files/libpq-7.4.13-gentoo.patch 2611
 AUX libpq-8.0.8-gentoo.patch 2306 RMD160 e4c121a1026a60709b829afbc112efa0fea19a3f SHA1 75d4782553f4619bd4fb71aa44f4204df24bec7a SHA256 3b0405d74be995639b9d021eebc9a40ad72eb717219a8e1c029c1c93e6b72602
 MD5 d923acd31e56034379046074dd88a09a files/libpq-8.0.8-gentoo.patch 2306
 RMD160 e4c121a1026a60709b829afbc112efa0fea19a3f files/libpq-8.0.8-gentoo.patch 2306
@@ -44,10 +44,10 @@ EBUILD libpq-8.1.4.ebuild 3244 RMD160 64ea9d39c230252cf40aff334c59e726383a481e S
 MD5 3ff74af431f3cb1791f002ffed3a3014 libpq-8.1.4.ebuild 3244
 RMD160 64ea9d39c230252cf40aff334c59e726383a481e libpq-8.1.4.ebuild 3244
 SHA256 9bf49f0ea98001c6ad73566e06d5cd652c1ac55c15a91daf7eb17e5968067cd0 libpq-8.1.4.ebuild 3244
-MISC ChangeLog 11981 RMD160 1f4eb19ab068e0b4d8e12f1b94528431c6a8d951 SHA1 f23fa0bebd10c644b9e3a442b5f6ffbb836bed86 SHA256 3ee26a3fea3131193457173d3c5f0fbca84a138ae5ce86a0bc275111043eb113
-MD5 df21ba5fe4d95cc25302644f321c30f7 ChangeLog 11981
-RMD160 1f4eb19ab068e0b4d8e12f1b94528431c6a8d951 ChangeLog 11981
-SHA256 3ee26a3fea3131193457173d3c5f0fbca84a138ae5ce86a0bc275111043eb113 ChangeLog 11981
+MISC ChangeLog 12118 RMD160 16980b2898528f0d98cce8bb586fddd015e85dcc SHA1 0f8231e63306704b16f8a3f7da1df39a97db791f SHA256 0c84f90f16af46bf66b7d6d377e371b12233144e450b1ec69f8ad4133b1c478a
+MD5 af3a0f4099dd1a0ec850e4cd17dc8c54 ChangeLog 12118
+RMD160 16980b2898528f0d98cce8bb586fddd015e85dcc ChangeLog 12118
+SHA256 0c84f90f16af46bf66b7d6d377e371b12233144e450b1ec69f8ad4133b1c478a ChangeLog 12118
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
diff --git a/dev-db/libpq/files/libpq-7.3.15-gentoo.patch b/dev-db/libpq/files/libpq-7.3.15-gentoo.patch
deleted file mode 100644
index 017dc522a1c5..000000000000
--- a/dev-db/libpq/files/libpq-7.3.15-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.13-gentoo.patch b/dev-db/libpq/files/libpq-7.4.13-gentoo.patch
deleted file mode 100644
index 1af40d7077c7..000000000000
--- a/dev-db/libpq/files/libpq-7.4.13-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) && \