Fix patches - use -kb for 7.3 and 7.4

Package-Manager: portage-2.1.2-r9

3 files changed, 26 insertions, 32 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 37ce1cb51815..2023d1ea8994 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.94 2007/02/12 18:13:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.95 2007/02/13 01:45:28 mjolnir Exp $
+
+  13 Feb 2007; Martin Jackson <mjolnir@gentoo.org>
+  files/libpq-7.3.18-gentoo.patch, files/libpq-7.4.16-gentoo.patch:
+  Fix patches for 7.3 and 7.4 - should have been added with -kb
 
   12 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> libpq-8.0.12.ebuild:
   Stable on sparc wrt security #165482
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 852a3d433d92..1b6195b5114a 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,10 +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.3.18-gentoo.patch 2145 RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c SHA1 ac84864269c6e377d24f6c5e11bebfe2c3eb89d3 SHA256 db52e0d1345977ff8cd58ee9a74d321356032cb344f080a93409f9922fefed14
+MD5 12b0d7b6fb93d3c6272210a95ae41e39 files/libpq-7.3.18-gentoo.patch 2145
+RMD160 697f39977f0400c4ee2fdba9508d9c64d744662c files/libpq-7.3.18-gentoo.patch 2145
+SHA256 db52e0d1345977ff8cd58ee9a74d321356032cb344f080a93409f9922fefed14 files/libpq-7.3.18-gentoo.patch 2145
 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
@@ -21,10 +18,10 @@ AUX libpq-7.4.14-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe5637
 MD5 8e845c6bb301c666f6db969f762a1ce8 files/libpq-7.4.14-gentoo.patch 2846
 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 files/libpq-7.4.14-gentoo.patch 2846
 SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d files/libpq-7.4.14-gentoo.patch 2846
-AUX libpq-7.4.16-gentoo.patch 2868 RMD160 7a942bbf828163dde8407a90fd5ef12775ee0611 SHA1 08931ff2cf647447811a653fd4b3f32b8a2749de SHA256 4da340868fe316bb7f8d6ecdc9382894deda2160b9fd5a8622381dba3668c3f3
-MD5 a5bd3f594608dd77e7f190397afd0bd5 files/libpq-7.4.16-gentoo.patch 2868
-RMD160 7a942bbf828163dde8407a90fd5ef12775ee0611 files/libpq-7.4.16-gentoo.patch 2868
-SHA256 4da340868fe316bb7f8d6ecdc9382894deda2160b9fd5a8622381dba3668c3f3 files/libpq-7.4.16-gentoo.patch 2868
+AUX libpq-7.4.16-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 SHA1 02709ec494dbd51b0122510b483ea188ca3ea85f SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d
+MD5 8e845c6bb301c666f6db969f762a1ce8 files/libpq-7.4.16-gentoo.patch 2846
+RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 files/libpq-7.4.16-gentoo.patch 2846
+SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d files/libpq-7.4.16-gentoo.patch 2846
 AUX libpq-8.0.12-gentoo.patch 2382 RMD160 ec7e86cb584598196e18904d4b626ccc64750ede SHA1 20c230bdc8c181caa5a524076f65f85e047a5bef SHA256 e4a257b30f1a970fbbea6311ca1ea51e626f1ae9ab79b1b61a04c7969093408e
 MD5 712084754fb5b7aa013d70c34cb21fec files/libpq-8.0.12-gentoo.patch 2382
 RMD160 ec7e86cb584598196e18904d4b626ccc64750ede files/libpq-8.0.12-gentoo.patch 2382
@@ -107,10 +104,10 @@ EBUILD libpq-8.1.8.ebuild 3340 RMD160 29f47d5a81c8b3341c025180f42ab7bd5d86f4d2 S
 MD5 88cb26457fc8c809b73028d016709ce4 libpq-8.1.8.ebuild 3340
 RMD160 29f47d5a81c8b3341c025180f42ab7bd5d86f4d2 libpq-8.1.8.ebuild 3340
 SHA256 3a2568a98651e6d9d5a09b59e058c883421839a84574069924e0dbfde8ec6237 libpq-8.1.8.ebuild 3340
-MISC ChangeLog 15828 RMD160 3604b0248b9c95c3a4cee55a289768b40df8822c SHA1 0c6d8370783d7a6d4f7729e95e8eb520c2d4bc44 SHA256 5ef43f51b62f8a857de082b5314932615361b5fb474fe4a411465b21b18a02ab
-MD5 0133667323913860cb081dc0b83fa632 ChangeLog 15828
-RMD160 3604b0248b9c95c3a4cee55a289768b40df8822c ChangeLog 15828
-SHA256 5ef43f51b62f8a857de082b5314932615361b5fb474fe4a411465b21b18a02ab ChangeLog 15828
+MISC ChangeLog 16011 RMD160 10373d366a14514678e1d18e0a7a48b710658714 SHA1 d0fac0f3cf77d4b1e33c39c1d345f99a22e82f2c SHA256 6a4d388b6c386330a3b835df7fcf2133be396b3879085c617de173d56fb736ad
+MD5 ee501c22ca5ee9bb2859cbe942062da0 ChangeLog 16011
+RMD160 10373d366a14514678e1d18e0a7a48b710658714 ChangeLog 16011
+SHA256 6a4d388b6c386330a3b835df7fcf2133be396b3879085c617de173d56fb736ad ChangeLog 16011
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
@@ -148,10 +145,3 @@ SHA256 8ca2f139f05a66a5866c3f7cfc20e60722671b0f11834b363bdca58b0e7f2890 files/di
 MD5 6c0b0d447e93e09999656f1a1051cee2 files/digest-libpq-8.1.8 536
 RMD160 f57b64de6e9617feaa0ae8a5b891664e3e94feee files/digest-libpq-8.1.8 536
 SHA256 9c8b28c7160fe8b8ef6fd168faf72855b9bd57a29e69c0a8b6216e207f066c92 files/digest-libpq-8.1.8 536
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFF0K5lKRy60XGEcJIRAjEnAJ9xM2UDZ9jHKvwXxOtji1XNGpHG3wCdFYSG
-17tfpe10YKK1VAv6XDjpoIw=
-=UKDB
------END PGP SIGNATURE-----
diff --git a/dev-db/libpq/files/libpq-7.3.18-gentoo.patch b/dev-db/libpq/files/libpq-7.3.18-gentoo.patch
index b7fb5f15fbdd..254dafd6a7ee 100644
--- a/dev-db/libpq/files/libpq-7.3.18-gentoo.patch
+++ b/dev-db/libpq/files/libpq-7.3.18-gentoo.patch
@@ -1,6 +1,6 @@
-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
+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
@@ -10,9 +10,9 @@ diff -Nru postgresql-7.3.18.orig/src/interfaces/libpq/Makefile postgresql-7.3.18
  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
+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
@@ -20,9 +20,9 @@ diff -Nru postgresql-7.3.18.orig/src/interfaces/libpq/nls.mk postgresql-7.3.18/s
  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
+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