Deleting bad patches, will re-add momentarily

Package-Manager: portage-2.1.4

4 files changed, 9 insertions, 134 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index ab64d7586441..0bb3a7fde338 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.128 2008/01/13 21:45:10 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.129 2008/01/13 21:49:11 mjolnir Exp $
+
+  13 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
+  -files/libpq-7.3.21-gentoo.patch, -files/libpq-7.4.19-gentoo.patch:
+  Deleting bad patches, will re-add momentarily
 
   13 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
   files/libpq-7.4.19-gentoo.patch:
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 4cb01db0ee7f..0e4d2a4f59c9 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -2,18 +2,10 @@ AUX libpq-7.3.19-gentoo.patch 2145 RMD160 697f39977f0400c4ee2fdba9508d9c64d74466
 MD5 12b0d7b6fb93d3c6272210a95ae41e39 files/libpq-7.3.19-gentoo.patch 2145
 RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c files/libpq-7.3.19-gentoo.patch 2145
 SHA256 db52e0d1345977ff8cd58ee9a74d321356032cb344f080a93409f9922fefed14 files/libpq-7.3.19-gentoo.patch 2145
-AUX libpq-7.3.21-gentoo.patch 2172 RMD160 e021749402bcb625afcb3cc84b53c2ee64a07340 SHA1 1eaa5253fe8715de60bf4aa587c94dcc79f8620e SHA256 99adf86c83d29c2538e26a84e313c6cc4d1859e17c4e719e3715fbc9b0ae0f89
-MD5 8b5ac1c90a04db022b33f06cb7264299 files/libpq-7.3.21-gentoo.patch 2172
-RMD160 e021749402bcb625afcb3cc84b53c2ee64a07340 files/libpq-7.3.21-gentoo.patch 2172
-SHA256 99adf86c83d29c2538e26a84e313c6cc4d1859e17c4e719e3715fbc9b0ae0f89 files/libpq-7.3.21-gentoo.patch 2172
 AUX libpq-7.4.17-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 SHA1 02709ec494dbd51b0122510b483ea188ca3ea85f SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d
 MD5 8e845c6bb301c666f6db969f762a1ce8 files/libpq-7.4.17-gentoo.patch 2846
 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 files/libpq-7.4.17-gentoo.patch 2846
 SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d files/libpq-7.4.17-gentoo.patch 2846
-AUX libpq-7.4.19-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 SHA1 02709ec494dbd51b0122510b483ea188ca3ea85f SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d
-MD5 8e845c6bb301c666f6db969f762a1ce8 files/libpq-7.4.19-gentoo.patch 2846
-RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 files/libpq-7.4.19-gentoo.patch 2846
-SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d files/libpq-7.4.19-gentoo.patch 2846
 AUX libpq-8.0.13-gentoo.patch 2382 RMD160 ec7e86cb584598196e18904d4b626ccc64750ede SHA1 20c230bdc8c181caa5a524076f65f85e047a5bef SHA256 e4a257b30f1a970fbbea6311ca1ea51e626f1ae9ab79b1b61a04c7969093408e
 MD5 712084754fb5b7aa013d70c34cb21fec files/libpq-8.0.13-gentoo.patch 2382
 RMD160 ec7e86cb584598196e18904d4b626ccc64750ede files/libpq-8.0.13-gentoo.patch 2382
@@ -84,10 +76,10 @@ EBUILD libpq-8.2.6.ebuild 3191 RMD160 42b46e74ac37126afe54da8c7c63593436ac2d6a S
 MD5 f0db580b5d2d5c2091a1b8cbbe6cdad2 libpq-8.2.6.ebuild 3191
 RMD160 42b46e74ac37126afe54da8c7c63593436ac2d6a libpq-8.2.6.ebuild 3191
 SHA256 455950ead2a875bc774b30a6bb3f2627f449daa1e5190ed0799bc644bb4dcceb libpq-8.2.6.ebuild 3191
-MISC ChangeLog 21347 RMD160 c26c5936f57294563374067172cb9268142c9ff7 SHA1 07f1e8f2d5c9fa76b4c10b494b8ad5db580db6c0 SHA256 3a6f466548ee601c06713c432a4590a077d58ff30a8a9e4dc41bec7792374452
-MD5 630feed17fd1e4ae851ff61927e3510b ChangeLog 21347
-RMD160 c26c5936f57294563374067172cb9268142c9ff7 ChangeLog 21347
-SHA256 3a6f466548ee601c06713c432a4590a077d58ff30a8a9e4dc41bec7792374452 ChangeLog 21347
+MISC ChangeLog 21517 RMD160 fb3065ef588db8e7686dc4158df1b7e4ab2556d8 SHA1 8b58acaeaeeaa55d20559a368f2fce679a5adf15 SHA256 77d5b584959f1df3c7b65172ca7448b010893c61ce8e80c95bb93ae9e1140c58
+MD5 58da8e043b9513ce06dcf4efa945b868 ChangeLog 21517
+RMD160 fb3065ef588db8e7686dc4158df1b7e4ab2556d8 ChangeLog 21517
+SHA256 77d5b584959f1df3c7b65172ca7448b010893c61ce8e80c95bb93ae9e1140c58 ChangeLog 21517
 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.21-gentoo.patch b/dev-db/libpq/files/libpq-7.3.21-gentoo.patch
deleted file mode 100644
index 254dafd6a7ee..000000000000
--- a/dev-db/libpq/files/libpq-7.3.21-gentoo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Nru postgresql-7.3.16.orig/src/interfaces/libpq/Makefile postgresql-7.3.16/src/interfaces/libpq/Makefile
---- postgresql-7.3.16.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/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.16.orig/src/interfaces/libpq/nls.mk postgresql-7.3.16/src/interfaces/libpq/nls.mk
---- postgresql-7.3.16.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/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.16.orig/src/Makefile.shlib postgresql-7.3.16/src/Makefile.shlib
---- postgresql-7.3.16.orig/src/Makefile.shlib	2006-11-05 13:20:09.000000000 +0100
-+++ postgresql-7.3.16/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/files/libpq-7.4.19-gentoo.patch b/dev-db/libpq/files/libpq-7.4.19-gentoo.patch
deleted file mode 100644
index b2a9730021a0..000000000000
--- a/dev-db/libpq/files/libpq-7.4.19-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nru postgresql-7.4.14.orig/src/interfaces/libpq/Makefile postgresql-7.4.14/src/interfaces/libpq/Makefile
---- postgresql-7.4.14.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/interfaces/libpq/Makefile	2006-11-05 13:23:46.000000000 +0100
-@@ -18,6 +18,8 @@
- SO_MAJOR_VERSION= 3
- SO_MINOR_VERSION= 1
- 
-+NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
-+
- override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
- 
- OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
-@@ -66,7 +68,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 -Nru postgresql-7.4.14.orig/src/interfaces/libpq/nls.mk postgresql-7.4.14/src/interfaces/libpq/nls.mk
---- postgresql-7.4.14.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/interfaces/libpq/nls.mk	2006-11-05 13:23:46.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 -Nru postgresql-7.4.14.orig/src/Makefile.shlib postgresql-7.4.14/src/Makefile.shlib
---- postgresql-7.4.14.orig/src/Makefile.shlib	2006-11-05 13:20:18.000000000 +0100
-+++ postgresql-7.4.14/src/Makefile.shlib	2006-11-05 13:23:46.000000000 +0100
-@@ -229,7 +229,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)
- 
-@@ -239,7 +239,7 @@
- MK_NO_LORDER := true
- endif
- 
--lib$(NAME).a: $(OBJS)
-+lib$(NAME_STATIC_LIB).a: $(OBJS)
- ifdef MK_NO_LORDER
- 	$(LINK.static) $@ $^
- else
-@@ -310,11 +310,11 @@
- .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 ($(PORTNAME), darwin)
- 	cd $(DESTDIR)$(libdir) && \
--	ranlib lib$(NAME).a
-+	ranlib lib$(NAME_STATIC_LIB).a
- endif
- 
- ifeq ($(enable_shared), yes)